diff --git a/i18n/ja.po b/i18n/ja.po index 5c046e4b96527276d389752247861410e69f6573_aTE4bi9qYS5wbw==..68a697421a57d12ae667263afab11a6812ed4527_aTE4bi9qYS5wbw== 100644 --- a/i18n/ja.po +++ b/i18n/ja.po @@ -104,7 +104,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2011-03-01 15:32+0900\n" +"POT-Creation-Date: 2011-06-29 21:47+0900\n" "PO-Revision-Date: 2009-11-16 21:24+0100\n" "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n" "Language-Team: Japanese\n" @@ -386,47 +386,209 @@ msgid "" "This hook extension adds comments on bugs in Bugzilla when changesets\n" -"that refer to bugs by Bugzilla ID are seen. The hook does not change\n" -"bug status." -msgstr "" - -msgid "" -"The hook updates the Bugzilla database directly. Only Bugzilla\n" -"installations using MySQL are supported." -msgstr "" - -msgid "" -"The hook relies on a Bugzilla script to send bug change notification\n" -"emails. That script changes between Bugzilla versions; the\n" -"'processmail' script used prior to 2.18 is replaced in 2.18 and\n" -"subsequent versions by 'config/sendbugmail.pl'. Note that these will\n" -"be run by Mercurial as the user pushing the change; you will need to\n" -"ensure the Bugzilla install file permissions are set appropriately." -msgstr "" - -msgid "" -"The extension is configured through three different configuration\n" -"sections. These keys are recognized in the [bugzilla] section:" -msgstr "" - -msgid "" -"host\n" -" Hostname of the MySQL server holding the Bugzilla database." -msgstr "" - -msgid "" -"db\n" -" Name of the Bugzilla database in MySQL. Default 'bugs'." -msgstr "" - -msgid "" -"user\n" -" Username to use to access MySQL server. Default 'bugs'." -msgstr "" - -msgid "" -"password\n" +"that refer to bugs by Bugzilla ID are seen. The comment is formatted using\n" +"the Mercurial template mechanism." +msgstr "" + +msgid "The hook does not change bug status." +msgstr "" + +msgid "Three basic modes of access to Bugzilla are provided:" +msgstr "" + +msgid "" +"1. Access via the Bugzilla XMLRPC interface. Requires Bugzilla 3.4 or later." +msgstr "" + +msgid "" +"2. Check data via the Bugzilla XMLRPC interface and submit bug change\n" +" via email to Bugzilla email interface. Requires Bugzilla 3.4 or later." +msgstr "" + +msgid "" +"3. Writing directly to the Bugzilla database. Only Bugzilla installations\n" +" using MySQL are supported. Requires Python MySQLdb." +msgstr "" + +msgid "" +"Writing directly to the database is susceptible to schema changes, and\n" +"relies on a Bugzilla contrib script to send out bug change\n" +"notification emails. This script runs as the user running Mercurial,\n" +"must be run on the host with the Bugzilla install, and requires\n" +"permission to read Bugzilla configuration details and the necessary\n" +"MySQL user and password to have full access rights to the Bugzilla\n" +"database. For these reasons this access mode is now considered\n" +"deprecated, and will not be updated for new Bugzilla versions going\n" +"forward." +msgstr "" + +msgid "" +"Access via XMLRPC needs a Bugzilla username and password to be specified\n" +"in the configuration. Comments are added under that username. Since the\n" +"configuration must be readable by all Mercurial users, it is recommended\n" +"that the rights of that user are restricted in Bugzilla to the minimum\n" +"necessary to add comments." +msgstr "" + +msgid "" +"Access via XMLRPC/email uses XMLRPC to query Bugzilla, but sends\n" +"email to the Bugzilla email interface to submit comments to bugs.\n" +"The From: address in the email is set to the email address of the Mercurial\n" +"user, so the comment appears to come from the Mercurial user. In the event\n" +"that the Mercurial user email is not recognised by Bugzilla as a Bugzilla\n" +"user, the email associated with the Bugzilla username used to log into\n" +"Bugzilla is used instead as the source of the comment." +msgstr "" + +msgid "Configuration items common to all access modes:" +msgstr "" + +msgid "" +"bugzilla.version\n" +" This access type to use. Values recognised are:" +msgstr "" + +msgid "" +" :``xmlrpc``: Bugzilla XMLRPC interface.\n" +" :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces.\n" +" :``3.0``: MySQL access, Bugzilla 3.0 and later.\n" +" :``2.18``: MySQL access, Bugzilla 2.18 and up to but not\n" +" including 3.0.\n" +" :``2.16``: MySQL access, Bugzilla 2.16 and up to but not\n" +" including 2.18." +msgstr "" + +msgid "" +"bugzilla.regexp\n" +" Regular expression to match bug IDs in changeset commit message.\n" +" Must contain one \"()\" group. The default expression matches ``Bug\n" +" 1234``, ``Bug no. 1234``, ``Bug number 1234``, ``Bugs 1234,5678``,\n" +" ``Bug 1234 and 5678`` and variations thereof. Matching is case\n" +" insensitive." +msgstr "" + +msgid "" +"bugzilla.style\n" +" The style file to use when formatting comments." +msgstr "" + +msgid "" +"bugzilla.template\n" +" Template to use when formatting comments. Overrides style if\n" +" specified. In addition to the usual Mercurial keywords, the\n" +" extension specifies:" +msgstr "" + +msgid "" +" :``{bug}``: The Bugzilla bug ID.\n" +" :``{root}``: The full pathname of the Mercurial repository.\n" +" :``{webroot}``: Stripped pathname of the Mercurial repository.\n" +" :``{hgweb}``: Base URL for browsing Mercurial repositories." +msgstr "" + +#, fuzzy +msgid "" +" Default ``changeset {node|short} in repo {root} refers to bug\n" +" {bug}.\\ndetails:\\n\\t{desc|tabindent}``" +msgstr "" +"リãƒã‚¸ãƒˆãƒª {root} ã®ãƒªãƒ“ジョン {node|short} ãŒãƒã‚° {bug} ã«é–¢é€£ã€‚\n" +"詳細:\n" +"\t{desc|tabindent}" + +msgid "" +"bugzilla.strip\n" +" The number of path separator characters to strip from the front of\n" +" the Mercurial repository path (``{root}`` in templates) to produce\n" +" ``{webroot}``. For example, a repository with ``{root}``\n" +" ``/var/local/my-project`` with a strip of 2 gives a value for\n" +" ``{webroot}`` of ``my-project``. Default 0." +msgstr "" + +msgid "" +"web.baseurl\n" +" Base URL for browsing Mercurial repositories. Referenced from\n" +" templates as ``{hgweb}``." +msgstr "" + +msgid "Configuration items common to XMLRPC+email and MySQL access modes:" +msgstr "" + +msgid "" +"bugzilla.usermap\n" +" Path of file containing Mercurial committer email to Bugzilla user email\n" +" mappings. If specified, the file should contain one mapping per\n" +" line::" +msgstr "" + +msgid " committer = Bugzilla user" +msgstr "" + +msgid " See also the ``[usermap]`` section." +msgstr "" + +msgid "" +"The ``[usermap]`` section is used to specify mappings of Mercurial\n" +"committer email to Bugzilla user email. See also ``bugzilla.usermap``.\n" +"Contains entries of the form ``committer = Bugzilla user``." +msgstr "" + +msgid "XMLRPC access mode configuration:" +msgstr "" + +msgid "" +"bugzilla.bzurl\n" +" The base URL for the Bugzilla installation.\n" +" Default ``http://localhost/bugzilla``." +msgstr "" + +msgid "" +"bugzilla.user\n" +" The username to use to log into Bugzilla via XMLRPC. Default\n" +" ``bugs``." +msgstr "" + +msgid "" +"bugzilla.password\n" +" The password for Bugzilla login." +msgstr "" + +msgid "" +"XMLRPC+email access mode uses the XMLRPC access mode configuration items,\n" +"and also:" +msgstr "" + +msgid "" +"bugzilla.bzemail\n" +" The Bugzilla email address." +msgstr "" + +msgid "" +"In addition, the Mercurial email settings must be configured. See the\n" +"documentation in hgrc(5), sections ``[email]`` and ``[smtp]``." +msgstr "" + +msgid "MySQL access mode configuration:" +msgstr "" + +msgid "" +"bugzilla.host\n" +" Hostname of the MySQL server holding the Bugzilla database.\n" +" Default ``localhost``." +msgstr "" + +msgid "" +"bugzilla.db\n" +" Name of the Bugzilla database in MySQL. Default ``bugs``." +msgstr "" + +msgid "" +"bugzilla.user\n" +" Username to use to access MySQL server. Default ``bugs``." +msgstr "" + +msgid "" +"bugzilla.password\n" " Password to use to access MySQL server." msgstr "" msgid "" @@ -429,9 +591,9 @@ " Password to use to access MySQL server." msgstr "" msgid "" -"timeout\n" +"bugzilla.timeout\n" " Database connection timeout (seconds). Default 5." msgstr "" msgid "" @@ -434,17 +596,10 @@ " Database connection timeout (seconds). Default 5." msgstr "" msgid "" -"version\n" -" Bugzilla version. Specify '3.0' for Bugzilla versions 3.0 and later,\n" -" '2.18' for Bugzilla versions from 2.18 and '2.16' for versions prior\n" -" to 2.18." -msgstr "" - -msgid "" -"bzuser\n" +"bugzilla.bzuser\n" " Fallback Bugzilla user name to record comments with, if changeset\n" " committer cannot be found as a Bugzilla user." msgstr "" msgid "" @@ -446,7 +601,7 @@ " Fallback Bugzilla user name to record comments with, if changeset\n" " committer cannot be found as a Bugzilla user." msgstr "" msgid "" -"bzdir\n" +"bugzilla.bzdir\n" " Bugzilla install directory. Used by default notify. Default\n" @@ -452,7 +607,7 @@ " Bugzilla install directory. Used by default notify. Default\n" -" '/var/www/html/bugzilla'." -msgstr "" - -msgid "" -"notify\n" +" ``/var/www/html/bugzilla``." +msgstr "" + +msgid "" +"bugzilla.notify\n" " The command to run to get Bugzilla to send bug change notification\n" @@ -458,68 +613,8 @@ " The command to run to get Bugzilla to send bug change notification\n" -" emails. Substitutes from a map with 3 keys, 'bzdir', 'id' (bug id)\n" -" and 'user' (committer bugzilla email). Default depends on version;\n" -" from 2.18 it is \"cd %(bzdir)s && perl -T contrib/sendbugmail.pl\n" -" %(id)s %(user)s\"." -msgstr "" - -msgid "" -"regexp\n" -" Regular expression to match bug IDs in changeset commit message.\n" -" Must contain one \"()\" group. The default expression matches 'Bug\n" -" 1234', 'Bug no. 1234', 'Bug number 1234', 'Bugs 1234,5678', 'Bug\n" -" 1234 and 5678' and variations thereof. Matching is case insensitive." -msgstr "" - -msgid "" -"style\n" -" The style file to use when formatting comments." -msgstr "" - -msgid "" -"template\n" -" Template to use when formatting comments. Overrides style if\n" -" specified. In addition to the usual Mercurial keywords, the\n" -" extension specifies::" -msgstr "" - -msgid "" -" {bug} The Bugzilla bug ID.\n" -" {root} The full pathname of the Mercurial repository.\n" -" {webroot} Stripped pathname of the Mercurial repository.\n" -" {hgweb} Base URL for browsing Mercurial repositories." -msgstr "" - -msgid "" -" Default 'changeset {node|short} in repo {root} refers '\n" -" 'to bug {bug}.\\ndetails:\\n\\t{desc|tabindent}'" -msgstr "" - -msgid "" -"strip\n" -" The number of slashes to strip from the front of {root} to produce\n" -" {webroot}. Default 0." -msgstr "" - -msgid "" -"usermap\n" -" Path of file containing Mercurial committer ID to Bugzilla user ID\n" -" mappings. If specified, the file should contain one mapping per\n" -" line, \"committer\"=\"Bugzilla user\". See also the [usermap] section." -msgstr "" - -msgid "" -"The [usermap] section is used to specify mappings of Mercurial\n" -"committer ID to Bugzilla user ID. See also [bugzilla].usermap.\n" -"\"committer\"=\"Bugzilla user\"" -msgstr "" - -msgid "Finally, the [web] section supports one entry:" -msgstr "" - -msgid "" -"baseurl\n" -" Base URL for browsing Mercurial repositories. Reference from\n" -" templates as {hgweb}." +" emails. Substitutes from a map with 3 keys, ``bzdir``, ``id`` (bug\n" +" id) and ``user`` (committer bugzilla email). Default depends on\n" +" version; from 2.18 it is \"cd %(bzdir)s && perl -T\n" +" contrib/sendbugmail.pl %(id)s %(user)s\"." msgstr "" msgid "Activating the extension::" @@ -536,13 +631,70 @@ " incoming.bugzilla = python:hgext.bugzilla.hook" msgstr "" -msgid "Example configuration:" -msgstr "" - -msgid "" -"This example configuration is for a collection of Mercurial\n" -"repositories in /var/local/hg/repos/ used with a local Bugzilla 3.2\n" -"installation in /opt/bugzilla-3.2. ::" +#, fuzzy +msgid "Example configurations:" +msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ«" + +msgid "" +"XMLRPC example configuration. This uses the Bugzilla at\n" +"``http://my-project.org/bugzilla``, logging in as user\n" +"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n" +"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n" +"with a web interface at ``http://my-project.org/hg``. ::" +msgstr "" + +msgid "" +" [bugzilla]\n" +" bzurl=http://my-project.org/bugzilla\n" +" user=bugmail@my-project.org\n" +" password=plugh\n" +" version=xmlrpc\n" +" template=Changeset {node|short} in {root|basename}.\n" +" {hgweb}/{webroot}/rev/{node|short}\\n\n" +" {desc}\\n\n" +" strip=5" +msgstr "" + +msgid "" +" [web]\n" +" baseurl=http://my-project.org/hg" +msgstr "" + +msgid "" +"XMLRPC+email example configuration. This uses the Bugzilla at\n" +"``http://my-project.org/bugzilla``, logging in as user\n" +"``bugmail@my-project.org`` with password ``plugh``. It is used with a\n" +"collection of Mercurial repositories in ``/var/local/hg/repos/``,\n" +"with a web interface at ``http://my-project.org/hg``. Bug comments\n" +"are sent to the Bugzilla email address\n" +"``bugzilla@my-project.org``. ::" +msgstr "" + +msgid "" +" [bugzilla]\n" +" bzurl=http://my-project.org/bugzilla\n" +" user=bugmail@my-project.org\n" +" password=plugh\n" +" version=xmlrpc\n" +" bzemail=bugzilla@my-project.org\n" +" template=Changeset {node|short} in {root|basename}.\n" +" {hgweb}/{webroot}/rev/{node|short}\\n\n" +" {desc}\\n\n" +" strip=5" +msgstr "" + +msgid "" +" [usermap]\n" +" user@emaildomain.com=user.name@bugzilladomain.com" +msgstr "" + +msgid "" +"MySQL example configuration. This has a local Bugzilla 3.2 installation\n" +"in ``/opt/bugzilla-3.2``. The MySQL database is on ``localhost``,\n" +"the Bugzilla database name is ``bugs`` and MySQL is\n" +"accessed with MySQL username ``bugs`` password ``XYZZY``. It is used\n" +"with a collection of Mercurial repositories in ``/var/local/hg/repos/``,\n" +"with a web interface at ``http://my-project.org/hg``. ::" msgstr "" msgid "" @@ -558,18 +710,8 @@ " strip=5" msgstr "" -msgid "" -" [web]\n" -" baseurl=http://dev.domain.com/hg" -msgstr "" - -msgid "" -" [usermap]\n" -" user@emaildomain.com=user.name@bugzilladomain.com" -msgstr "" - -msgid "Commits add a comment to the Bugzilla bug record of the form::" +msgid "All the above add a comment to the Bugzilla bug record of the form::" msgstr "" msgid "" " Changeset 3b16791d6642 in repository-name.\n" @@ -572,11 +714,11 @@ msgstr "" msgid "" " Changeset 3b16791d6642 in repository-name.\n" -" http://dev.domain.com/hg/repository-name/rev/3b16791d6642" +" http://my-project.org/hg/repository-name/rev/3b16791d6642" msgstr "" msgid " Changeset commit comment. Bug 1234.\n" msgstr "" #, python-format @@ -577,9 +719,13 @@ msgstr "" msgid " Changeset commit comment. Bug 1234.\n" msgstr "" #, python-format +msgid "python mysql support not available: %s" +msgstr "python mysql ã®ã‚µãƒãƒ¼ãƒˆãŒåˆ©ç”¨ã§ãã¾ã›ã‚“: %s" + +#, python-format msgid "connecting to %s:%s as %s, password %s\n" msgstr "%s:%s ã« %s ã¨ã—ã¦æŽ¥ç¶šã—ã¦ã„ã¾ã™ (パスワード:%s)\n" @@ -628,6 +774,14 @@ msgid "cannot find bugzilla user id for %s or %s" msgstr "%s ã‹ %s ã® buzilla ユーザ ID を見ã¤ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“" +#, fuzzy +msgid "configuration 'bzemail' missing" +msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ«" + +#, fuzzy, python-format +msgid "default bugzilla user %s email not found" +msgstr "副リãƒã‚¸ãƒˆãƒª %s ã® ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" + #, python-format msgid "bugzilla version %s not supported" msgstr "bugzilla ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" @@ -642,10 +796,6 @@ "\t{desc|tabindent}" #, python-format -msgid "python mysql support not available: %s" -msgstr "python mysql ã®ã‚µãƒãƒ¼ãƒˆãŒåˆ©ç”¨ã§ãã¾ã›ã‚“: %s" - -#, python-format msgid "hook type %s does not pass a changeset id" msgstr "フック種別 %s ã«ã‚ˆã‚Šãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®å‡¦ç†ãŒæŠ‘æ¢ã•ã‚Œã¾ã—ãŸ" @@ -649,9 +799,9 @@ msgid "hook type %s does not pass a changeset id" msgstr "フック種別 %s ã«ã‚ˆã‚Šãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®å‡¦ç†ãŒæŠ‘æ¢ã•ã‚Œã¾ã—ãŸ" -#, python-format -msgid "database error: %s" -msgstr "データベースエラー: %s" +#, fuzzy, python-format +msgid "Bugzilla error: %s" +msgstr "hg: 解æžã‚¨ãƒ©ãƒ¼: %s\n" msgid "command to display child changesets" msgstr "åãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆè¡¨ç¤ºã®ã‚³ãƒžãƒ³ãƒ‰" @@ -815,13 +965,12 @@ msgstr "コマンド出力ã®ã‚«ãƒ©ãƒ¼åŒ–" msgid "" -"This extension modifies the status and resolve commands to add color to " -"their\n" -"output to reflect file status, the qseries command to add color to reflect\n" -"patch status (applied, unapplied, missing), and to diff-related\n" -"commands to highlight additions, removals, diff headers, and trailing\n" -"whitespace." +"This extension modifies the status and resolve commands to add color\n" +"to their output to reflect file status, the qseries command to add\n" +"color to reflect patch status (applied, unapplied, missing), and to\n" +"diff-related commands to highlight additions, removals, diff headers,\n" +"and trailing whitespace." msgstr "" msgid "" "Other effects in addition to color, like bold and underlined text, are\n" @@ -824,10 +973,11 @@ msgstr "" msgid "" "Other effects in addition to color, like bold and underlined text, are\n" -"also available. Effects are rendered with the ECMA-48 SGR control\n" -"function (aka ANSI escape codes). This module also provides the\n" -"render_text function, which can be used to add effects to any text." +"also available. By default, the terminfo database is used to find the\n" +"terminal codes used to change color and effect. If terminfo is not\n" +"available, then effects are rendered with the ECMA-48 SGR control\n" +"function (aka ANSI escape codes)." msgstr "" msgid "Default effects may be overridden from your configuration file::" @@ -883,8 +1033,37 @@ msgstr "" msgid "" -"The color extension will try to detect whether to use ANSI codes or\n" -"Win32 console APIs, unless it is made explicit::" +"The available effects in terminfo mode are 'blink', 'bold', 'dim',\n" +"'inverse', 'invisible', 'italic', 'standout', and 'underline'; in\n" +"ECMA-48 mode, the options are 'bold', 'inverse', 'italic', and\n" +"'underline'. How each is rendered depends on the terminal emulator.\n" +"Some may not be available for a given terminal type, and will be\n" +"silently ignored." +msgstr "" + +msgid "" +"Because there are only eight standard colors, this module allows you\n" +"to define color names for other color slots which might be available\n" +"for your terminal type, assuming terminfo mode. For instance::" +msgstr "" + +msgid "" +" color.brightblue = 12\n" +" color.pink = 207\n" +" color.orange = 202" +msgstr "" + +msgid "" +"to set 'brightblue' to color slot 12 (useful for 16 color terminals\n" +"that have brighter colors defined in the upper eight) and, 'pink' and\n" +"'orange' to colors in 256-color xterm's default color cube. These\n" +"defined colors may then be used as any of the pre-defined eight,\n" +"including appending '_background' to set the background to that color." +msgstr "" + +msgid "" +"The color extension will try to detect whether to use terminfo, ANSI\n" +"codes or Win32 console APIs, unless it is made explicit; e.g.::" msgstr "" msgid "" @@ -892,10 +1071,19 @@ " mode = ansi" msgstr "" -msgid "Any value other than 'ansi', 'win32', or 'auto' will disable color." +msgid "" +"Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will\n" +"disable color." +msgstr "" + +msgid "no terminfo entry for setab/setaf: reverting to ECMA-48 color\n" +msgstr "" + +#, python-format +msgid "warning: failed to set color mode to %s\n" msgstr "" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" msgstr "未知ã®è‰²/効果指定 %r を無視(color.%s ã§è¨å®šè¨˜è¿°)\n" @@ -896,12 +1084,9 @@ msgstr "" #, python-format msgid "ignoring unknown color/effect %r (configured in color.%s)\n" msgstr "未知ã®è‰²/効果指定 %r を無視(color.%s ã§è¨å®šè¨˜è¿°)\n" -msgid "win32console not found, please install pywin32\n" -msgstr "" - #. i18n: 'always', 'auto', and 'never' are keywords and should #. not be translated msgid "when to colorize (boolean, always, auto, or never)" @@ -1363,6 +1548,15 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "hg debugcvsps [OPTION]... [PATH]..." +msgid ":svnrev: String. Converted subversion revision number." +msgstr "" + +msgid ":svnpath: String. Converted subversion revision project path." +msgstr "" + +msgid ":svnuuid: String. Converted subversion revision repository identifier." +msgstr "" + #, python-format msgid "%s does not look like a Bazaar repository" msgstr "%s 㯠Bazaar å½¢å¼ã§ã¯ãªã„ã¨æ€ã‚ã‚Œã¾ã™" @@ -1423,10 +1617,6 @@ msgstr "変æ›: %s\n" #, python-format -msgid "%s\n" -msgstr "%s\n" - -#, python-format msgid "%s: unknown repository type" msgstr "%s: 未知ã®ãƒªãƒã‚¸ãƒˆãƒªå½¢å¼" @@ -1698,6 +1888,10 @@ msgid "updating tags\n" msgstr "ã‚¿ã‚°ã®æ›´æ–°ä¸\n" +#, fuzzy +msgid "updating bookmarks\n" +msgstr "ブックマーク %s ã®æ›´æ–°ä¸\n" + #, python-format msgid "%s is not a valid start revision" msgstr "%s ã¯æ£ã—ã„開始リビジョンã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -1710,7 +1904,32 @@ msgid "%s does not look like a monotone repository" msgstr "%s 㯠monotone å½¢å¼ã§ã¯ãªã„ã¨æ€ã‚ã‚Œã¾ã™" +msgid "bad mtn packet - no end of commandnbr" +msgstr "" + +#, python-format +msgid "bad mtn packet - bad stream type %s" +msgstr "" + +msgid "bad mtn packet - no divider before size" +msgstr "" + +msgid "bad mtn packet - no end of packet size" +msgstr "" + +#, python-format +msgid "bad mtn packet - bad packet size %s" +msgstr "" + +#, python-format +msgid "bad mtn packet - unable to read full packet read %s of %s" +msgstr "" + +#, fuzzy, python-format +msgid "mtn command '%s' returned %s" +msgstr "コマンド '%s' 失敗: %s" + #, python-format msgid "copying file in renamed directory from '%s' to '%s'" msgstr "改å先ディレクトリ㮠'%s' ã‹ã‚‰ '%s' ã¸ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複製ä¸" @@ -1713,7 +1932,17 @@ #, python-format msgid "copying file in renamed directory from '%s' to '%s'" msgstr "改å先ディレクトリ㮠'%s' ã‹ã‚‰ '%s' ã¸ãƒ•ã‚¡ã‚¤ãƒ«ã‚’複製ä¸" +msgid "unable to determine mtn automate interface version" +msgstr "" + +#, python-format +msgid "mtn automate stdio header unexpected: %s" +msgstr "" + +msgid "failed to reach end of mtn automate stdio headers" +msgstr "" + #, python-format msgid "%s does not look like a P4 repository" msgstr "%s 㯠P4 å½¢å¼ã§ã¯ãªã„ã¨æ€ã‚ã‚Œã¾ã™" @@ -1923,11 +2152,13 @@ msgid "" "The ``win32text.forbid*`` hooks provided by the win32text extension\n" -"have been unified into a single hook named ``eol.hook``. The hook will\n" -"lookup the expected line endings from the ``.hgeol`` file, which means\n" -"you must migrate to a ``.hgeol`` file first before using the hook.\n" -"Remember to enable the eol extension in the repository where you\n" -"install the hook." +"have been unified into a single hook named ``eol.checkheadshook``. The\n" +"hook will lookup the expected line endings from the ``.hgeol`` file,\n" +"which means you must migrate to a ``.hgeol`` file first before using\n" +"the hook. ``eol.checkheadshook`` only checks heads, intermediate\n" +"invalid revisions will be pushed. To forbid them completely, use the\n" +"``eol.checkallhook`` hook. These hooks are best used as\n" +"``pretxnchangegroup`` hooks." msgstr "" msgid "" @@ -1936,14 +2167,10 @@ msgstr "パターンåˆè‡´ã«é–¢ã™ã‚‹è©³ç´°ã¯ :hg:`help patterns` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n" #, python-format -msgid "%s should not have CRLF line endings" -msgstr "" - -#, python-format -msgid "%s should not have LF line endings" +msgid "ignoring unknown EOL style '%s' from %s\n" msgstr "" #, python-format msgid "warning: ignoring .hgeol file due to parse error at %s: %s\n" msgstr "" @@ -1944,10 +2171,18 @@ msgstr "" #, python-format msgid "warning: ignoring .hgeol file due to parse error at %s: %s\n" msgstr "" -msgid "the eol extension is incompatible with the win32text extension" +#, python-format +msgid " %s in %s should not have %s line endings" +msgstr "" + +msgid "end-of-line check failed:\n" +msgstr "" + +#, fuzzy +msgid "the eol extension is incompatible with the win32text extension\n" msgstr "eol エクステンション㨠win32text エクステンションã¯ä½µç”¨ã§ãã¾ã›ã‚“" #, python-format @@ -1951,10 +2186,6 @@ msgstr "eol エクステンション㨠win32text エクステンションã¯ä½µç”¨ã§ãã¾ã›ã‚“" #, python-format -msgid "ignoring unknown EOL style '%s' from %s\n" -msgstr "" - -#, python-format msgid "inconsistent newline style in %s\n" msgstr "" @@ -1970,7 +2201,7 @@ msgstr "" msgid "" -"The extdiff extension also allows to configure new diff commands, so\n" +"The extdiff extension also allows you to configure new diff commands, so\n" "you do not need to type :hg:`extdiff -p kdiff3` always. ::" msgstr "" @@ -2008,6 +2239,7 @@ " $parent1, $plabel1 - filename, descriptive label of first parent\n" " $child, $clabel - filename, descriptive label of child revision\n" " $parent2, $plabel2 - filename, descriptive label of second parent\n" +" $root - repository root\n" " $parent is an alias for $parent1." msgstr "" @@ -2226,6 +2458,9 @@ msgid "%s Note: This key has expired (signed by: \"%s\")\n" msgstr "%s 備考: 有効期é™åˆ‡ã‚Œéµ(\"%s\" ã«ã‚ˆã‚‹ç½²å)\n" +msgid "hg sigs" +msgstr "hg sigs" + msgid "list signed changesets" msgstr "ç½²å済ã¿ãƒªãƒ“ジョンã®ä¸€è¦§è¡¨ç¤º" @@ -2233,6 +2468,9 @@ msgid "%s:%d node does not exist\n" msgstr "%s:%d ノードã¯å˜åœ¨ã—ã¾ã›ã‚“\n" +msgid "hg sigcheck REVISION" +msgstr "hg sigcheck REVISION" + msgid "verify all the signatures there may be for a particular revision" msgstr "特定リビジョンã«é–¢ã™ã‚‹å…¨ç½²åã®æ¤œè¨¼" @@ -2240,6 +2478,30 @@ msgid "No valid signature for %s\n" msgstr "%s ã®æ£ã—ã„ç½²åã§ã¯ã‚ã‚Šã¾ã›ã‚“\n" +msgid "make the signature local" +msgstr "自リãƒã‚¸ãƒˆãƒªãƒãƒ¼ã‚«ãƒ«ãªç½²å" + +msgid "sign even if the sigfile is modified" +msgstr "ç½²åファイルãŒå¤‰æ›´ã•ã‚Œã¦ã„ã¦ã‚‚ç½²åを実施" + +msgid "do not commit the sigfile after signing" +msgstr "ç½²å後ã®ç½²åファイルã®ã‚³ãƒŸãƒƒãƒˆã‚’抑æ¢" + +msgid "ID" +msgstr "ID" + +msgid "the key id to sign with" +msgstr "ç½²åã«ä½¿ç”¨ã™ã‚‹éµID" + +msgid "TEXT" +msgstr "テã‚スト" + +msgid "commit message" +msgstr "コミットメッセージ" + +msgid "hg sign [OPTION]... [REVISION]..." +msgstr "hg sign [OPTION]... [REVISION]..." + msgid "add a signature for the current or given revision" msgstr "指定リビジョンã¸ã®ç½²åã®ä»˜ä¸Ž" @@ -2274,36 +2536,6 @@ msgid "unknown signature version" msgstr "未知ã®ç½²åãƒãƒ¼ã‚¸ãƒ§ãƒ³" -msgid "make the signature local" -msgstr "自リãƒã‚¸ãƒˆãƒªãƒãƒ¼ã‚«ãƒ«ãªç½²å" - -msgid "sign even if the sigfile is modified" -msgstr "ç½²åファイルãŒå¤‰æ›´ã•ã‚Œã¦ã„ã¦ã‚‚ç½²åを実施" - -msgid "do not commit the sigfile after signing" -msgstr "ç½²å後ã®ç½²åファイルã®ã‚³ãƒŸãƒƒãƒˆã‚’抑æ¢" - -msgid "ID" -msgstr "ID" - -msgid "the key id to sign with" -msgstr "ç½²åã«ä½¿ç”¨ã™ã‚‹éµID" - -msgid "TEXT" -msgstr "テã‚スト" - -msgid "commit message" -msgstr "コミットメッセージ" - -msgid "hg sign [OPTION]... [REVISION]..." -msgstr "hg sign [OPTION]... [REVISION]..." - -msgid "hg sigcheck REVISION" -msgstr "hg sigcheck REVISION" - -msgid "hg sigs" -msgstr "hg sigs" - msgid "command to view revision graphs from a shell" msgstr "端末ã§ã®ãƒªãƒ“ジョングラフ表示ã®ã‚³ãƒžãƒ³ãƒ‰" @@ -2317,8 +2549,26 @@ "リビジョングラフãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" #, python-format -msgid "--graph option is incompatible with --%s" -msgstr "--graph 㨠--%s ã¯éžäº’æ›ã§ã™" +msgid "-G/--graph option is incompatible with --%s" +msgstr "-G/--graph 㨠--%s ã¯ä½µç”¨å‡ºæ¥ã¾ã›ã‚“" + +msgid "-G/--graph option is incompatible with --follow with file argument" +msgstr "-G/--graph ã¨ã€ãƒ•ã‚¡ã‚¤ãƒ«å指定付ãã® --follow ã¯ä½µç”¨å‡ºæ¥ã¾ã›ã‚“" + +msgid "NUM" +msgstr "数値" + +msgid "limit number of changes displayed" +msgstr "最大表示リビジョン数" + +msgid "show patch" +msgstr "パッãƒå½¢å¼ã§ã®è¡¨ç¤º" + +msgid "show the specified revision or range" +msgstr "指定ã•ã‚ŒãŸå˜ä¸€ã€ ãªã„ã—リビジョン区間ã®è¡¨ç¤º" + +msgid "hg glog [OPTION]... [FILE]" +msgstr "hg glog [OPTION]... [FILE]" msgid "show revision history alongside an ASCII revision graph" msgstr "ASCII æ–‡å—ã«ã‚ˆã‚‹ãƒªãƒ“ジョングラフ表示をæŒã¤å±¥æ´è¡¨ç¤º" @@ -2339,21 +2589,6 @@ msgid "show the revision DAG" msgstr "リビジョングラフã®è¡¨ç¤º" -msgid "NUM" -msgstr "数値" - -msgid "limit number of changes displayed" -msgstr "最大表示リビジョン数" - -msgid "show patch" -msgstr "パッãƒå½¢å¼ã§ã®è¡¨ç¤º" - -msgid "show the specified revision or range" -msgstr "指定ã•ã‚ŒãŸå˜ä¸€ã€ ãªã„ã—リビジョン区間ã®è¡¨ç¤º" - -msgid "hg glog [OPTION]... [FILE]" -msgstr "hg glog [OPTION]... [FILE]" - msgid "hooks for integrating with the CIA.vc notification service" msgstr "CIA.vc 通知サービスã¨ã®çµ±åˆå‘ã‘ã®ãƒ•ãƒƒã‚¯é›†" @@ -2373,7 +2608,7 @@ " # Append a diffstat to the log message (optional)\n" " #diffstat = False\n" " # Template to use for log messages (optional)\n" -" #template = {desc}\\n{baseurl}/rev/{node}-- {diffstat}\n" +" #template = {desc}\\n{baseurl}{webroot}/rev/{node}-- {diffstat}\n" " # Style to use (optional)\n" " #style = foo\n" " # The URL of the CIA notification service (optional)\n" @@ -2382,7 +2617,9 @@ " # Make sure to set email.from if you do this.\n" " #url = http://cia.vc/\n" " # print message instead of sending it (optional)\n" -" #test = False" +" #test = False\n" +" # number of slashes to strip for url paths\n" +" #strip = 0" msgstr "" msgid "" @@ -2829,17 +3066,17 @@ "を実行ã—ã¾ã™ã€‚ 使用å¯èƒ½ãªãƒ†ãƒ³ãƒ—レートやフィルタã«é–¢ã—ã¦ã¯\n" ":hg:`help templates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" -msgid "Three additional date template filters are provided::" -msgstr "テンプレートã§ã®æ—¥æ™‚用フィルタ㌠3 ã¤è¿½åŠ ã•ã‚Œã¾ã™::" - -msgid "" -" utcdate \"2006/09/18 15:13:13\"\n" -" svnutcdate \"2006-09-18 15:13:13Z\"\n" -" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" -msgstr "" -" utcdate \"2006/09/18 15:13:13\"\n" -" svnutcdate \"2006-09-18 15:13:13Z\"\n" -" svnisodate \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" +msgid "Three additional date template filters are provided:" +msgstr "テンプレートã§ã®æ—¥æ™‚用フィルタ㌠3 ã¤è¿½åŠ ã•ã‚Œã¾ã™:" + +msgid "" +":``utcdate``: \"2006/09/18 15:13:13\"\n" +":``svnutcdate``: \"2006-09-18 15:13:13Z\"\n" +":``svnisodate``: \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" +msgstr "" +":``utcdate``: \"2006/09/18 15:13:13\"\n" +":``svnutcdate``: \"2006-09-18 15:13:13Z\"\n" +":``svnisodate``: \"2006-09-18 08:13:13 -700 (Mon, 18 Sep 2006)\"" msgid "" "The default template mappings (view with :hg:`kwdemo -d`) can be\n" @@ -2888,6 +3125,15 @@ msgid "no [keyword] patterns configured" msgstr "[keyword] ã§ã®ãƒ‘ターンè¨å®šãŒã‚ã‚Šã¾ã›ã‚“" +msgid "show default keyword template maps" +msgstr "デフォルトã®ãƒ†ãƒ³ãƒ—レートマップã§è¡¨ç¤º" + +msgid "read maps from rcfile" +msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã®ãƒžãƒƒãƒ—è¨å®šã®èªã¿è¾¼ã¿" + +msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." +msgstr "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." + msgid "print [keywordmaps] configuration and an expansion example" msgstr "[keywordmaps] ã§ã®è¨å®šå†…容ãŠã‚ˆã³å±•é–‹ä¾‹ã®è¡¨ç¤º" @@ -2980,6 +3226,9 @@ "\n" "\tã‚ーワードを展開\n" +msgid "hg kwexpand [OPTION]... [FILE]..." +msgstr "hg kwexpand [OPTION]... [FILE]..." + msgid "expand keywords in the working directory" msgstr "作æ¥é ˜åŸŸã«ãŠã‘ã‚‹ã‚ーワードã®å±•é–‹" @@ -2993,6 +3242,18 @@ " 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ 実行ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n" " " +msgid "show keyword status flags of all files" +msgstr "全ファイルã®ã‚ーワード展開è¨å®šã‚’表示" + +msgid "show files excluded from expansion" +msgstr "ã‚ーワード展開対象外ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "only show unknown (not tracked) files" +msgstr "構æˆç®¡ç†å¯¾è±¡å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "hg kwfiles [OPTION]... [FILE]..." +msgstr "hg kwfiles [OPTION]... [FILE]..." + msgid "show files configured for keyword expansion" msgstr "ã‚ーワード展開対象ファイルã®è¡¨ç¤º" @@ -3037,6 +3298,9 @@ " i = 無視(構æˆç®¡ç†å¯¾è±¡å¤–)\n" " " +msgid "hg kwshrink [OPTION]... [FILE]..." +msgstr "hg kwshrink [OPTION]... [FILE]..." + msgid "revert expanded keywords in the working directory" msgstr "作æ¥é ˜åŸŸä¸ã®ã‚ーワード展開ã®å–り消ã—" @@ -3052,33 +3316,6 @@ " 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ 実行ã¯ä¸æ–ã•ã‚Œã¾ã™ã€‚\n" " " -msgid "show default keyword template maps" -msgstr "デフォルトã®ãƒ†ãƒ³ãƒ—レートマップã§è¡¨ç¤º" - -msgid "read maps from rcfile" -msgstr "è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰ã®ãƒžãƒƒãƒ—è¨å®šã®èªã¿è¾¼ã¿" - -msgid "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." -msgstr "hg kwdemo [-d] [-f RCFILE] [TEMPLATEMAP]..." - -msgid "hg kwexpand [OPTION]... [FILE]..." -msgstr "hg kwexpand [OPTION]... [FILE]..." - -msgid "show keyword status flags of all files" -msgstr "全ファイルã®ã‚ーワード展開è¨å®šã‚’表示" - -msgid "show files excluded from expansion" -msgstr "ã‚ーワード展開対象外ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "only show unknown (not tracked) files" -msgstr "構æˆç®¡ç†å¯¾è±¡å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "hg kwfiles [OPTION]... [FILE]..." -msgstr "hg kwfiles [OPTION]... [FILE]..." - -msgid "hg kwshrink [OPTION]... [FILE]..." -msgstr "hg kwshrink [OPTION]... [FILE]..." - msgid "manage a stack of patches" msgstr "パッãƒä½µç”¨ã®ç®¡ç†" @@ -3162,6 +3399,9 @@ "ã•ã‚Œã¾ã™ã€‚ :hg:`qqueue` を使ã†ã“ã¨ã§ã€ 相互ã«ç‹¬ç«‹ã—ãŸåˆ¥ã®ç®¡ç†ã‚ューを\n" "作æˆã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚\n" +msgid "print first line of patch header" +msgstr "パッãƒãƒ˜ãƒƒãƒ€ã®æœ€åˆã®è¡Œã‚’表示" + #, python-format msgid "malformated mq status line: %s\n" msgstr "ä¸æ£ãª MQ 状態行: %s\n" @@ -3202,12 +3442,12 @@ msgstr "%s ã‚’é©ç”¨ - åˆè‡´ã™ã‚‹ãƒã‚¬ãƒ†ã‚£ãƒ–ガードã¯ã‚ã‚Šã¾ã›ã‚“\n" #, python-format -msgid "allowing %s - guarded by %r\n" -msgstr "%s ã‚’é©ç”¨ - ガード %r ãŒé©ç”¨ã•ã‚Œã¾ã—ãŸ\n" - -#, python-format -msgid "skipping %s - guarded by %r\n" -msgstr "%s ã‚’æŠ‘æ¢ - ガード %r ãŒé©ç”¨ã•ã‚Œã¾ã—ãŸ\n" +msgid "allowing %s - guarded by %s\n" +msgstr "%s ã‚’é©ç”¨ - ガード %s ãŒé©ç”¨ã•ã‚Œã¾ã—ãŸ\n" + +#, python-format +msgid "skipping %s - guarded by %s\n" +msgstr "%s ã‚’æŠ‘æ¢ - ガード %s ãŒé©ç”¨ã•ã‚Œã¾ã—ãŸ\n" #, python-format msgid "skipping %s - no matching guards\n" @@ -3269,6 +3509,14 @@ msgstr "パッãƒãŒæ›–昧ãªãŸã‚〠é©ç”¨ã‚’ä¸æ¢\n" #, python-format +msgid "revision %s refers to unknown patches: %s\n" +msgstr "リビジョン %s ãŒæœªçŸ¥ã®ãƒ‘ッãƒã‚’å‚ç…§ã—ã¦ã„ã¾ã™: %s\n" + +#, python-format +msgid "unknown patches: %s\n" +msgstr "未知ã®ãƒ‘ッãƒã§ã™: %s\n" + +#, python-format msgid "revision %d is not managed" msgstr "リビジョン %d 㯠MQ 管ç†ä¸‹ã«ã‚ã‚Šã¾ã›ã‚“" @@ -3312,6 +3560,14 @@ msgstr "\"%s\" ã¯ãƒ‘ッãƒåã¨ã—ã¦ä½¿ç”¨ã§ãã¾ã›ã‚“" #, python-format +msgid "patch name cannot begin with \"%s\"" +msgstr "パッãƒåã®æœ€åˆã®æ–‡å—ã« \"%s\" ã¯ä½¿ç”¨å‡ºæ¥ã¾ã›ã‚“" + +#, python-format +msgid "\"%s\" cannot be used in the name of a patch" +msgstr "\"%s\" ã‚’å«ã‚€åå‰ã¯ãƒ‘ッãƒåã«ä½¿ç”¨å‡ºæ¥ã¾ã›ã‚“" + +#, python-format msgid "\"%s\" already exists as a directory" msgstr "\"%s\" ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã¨ã—ã¦æ—¢ã«å˜åœ¨ã—ã¾ã™" @@ -3353,8 +3609,8 @@ msgstr "é©ç”¨ä¸ã®ãƒ‘ッム%s ã®å†é©ç”¨ã¯ã§ãã¾ã›ã‚“" #, python-format -msgid "guarded by %r" -msgstr "ガード %r ãŒé©ç”¨ã•ã‚Œã¾ã—ãŸ" +msgid "guarded by %s" +msgstr "ガード %s ãŒé©ç”¨ã•ã‚Œã¾ã—ãŸ" msgid "no matching guards" msgstr "åˆè‡´ã™ã‚‹ã‚¬ãƒ¼ãƒ‰ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -3370,7 +3626,7 @@ msgstr "å…¨ã¦ã®ãƒ‘ッãƒãŒé©ç”¨ä¸ã§ã™\n" msgid "cannot use --exact and --move together" -msgstr "--exact 㨠--move ã®ä½µç”¨ã¯ã§ãã¾ã›ã‚“" +msgstr "--exact 㨠--move ã¯ä½µç”¨ã§ãã¾ã›ã‚“" msgid "cannot push --exact with applied patches" msgstr "パッãƒé©ç”¨ä¸ã«ã€ --exact 付ãã§ã®ãƒ‘ッãƒé©ç”¨ã¯ã§ãã¾ã›ã‚“" @@ -3531,6 +3787,15 @@ msgid "adding %s to series file\n" msgstr "パッム%s ã‚’è¿½åŠ ä¸\n" +msgid "keep patch file" +msgstr "パッãƒãƒ•ã‚¡ã‚¤ãƒ«ã®å‰Šé™¤ã‚’抑æ¢" + +msgid "stop managing a revision (DEPRECATED)" +msgstr "指定リビジョンを管ç†å¯¾è±¡ã‹ã‚‰é™¤å¤–(éžæŽ¨å¥¨)" + +msgid "hg qdelete [-k] [PATCH]..." +msgstr "hg qdelete [-k] [PATCH]..." + msgid "remove patches from queue" msgstr "管ç†å¯¾è±¡ã‹ã‚‰ã®ãƒ‘ッãƒé™¤å¤–" @@ -3550,6 +3815,12 @@ " 管ç†å¯¾è±¡å¤–ã¨ãªã£ãŸãƒ‘ッãƒã‚’通常リビジョン化ã™ã‚‹å ´åˆã¯ :hg:`qfinish`\n" " を使用ã—ã¦ãã ã•ã„。" +msgid "show only the last patch" +msgstr "最終é©ç”¨ãƒ‘ッãƒã®ã¿ã‚’表示" + +msgid "hg qapplied [-1] [-s] [PATCH]" +msgstr "hg qapplied [-1] [-s] [PATCH]" + msgid "print the patches already applied" msgstr "é©ç”¨ä¸ã®ãƒ‘ッãƒä¸€è¦§ã®è¡¨ç¤º" @@ -3559,9 +3830,15 @@ msgid "only one patch applied\n" msgstr "å˜ä¸€ã®ãƒ‘ッãƒã ã‘ãŒé©ç”¨ä¸ã§ã™\n" +msgid "show only the first patch" +msgstr "最åˆã®æœªé©ç”¨ãƒ‘ッãƒã®ã¿ã‚’表示" + +msgid "hg qunapplied [-1] [-s] [PATCH]" +msgstr "hg qunapplied [-1] [-s] [PATCH]" + msgid "print the patches not yet applied" msgstr "未é©ç”¨ã®ãƒ‘ッãƒä¸€è¦§ã®è¡¨ç¤º" msgid "all patches applied\n" msgstr "å…¨ã¦ã®ãƒ‘ッãƒãŒé©ç”¨ä¸ã§ã™\n" @@ -3562,9 +3839,33 @@ msgid "print the patches not yet applied" msgstr "未é©ç”¨ã®ãƒ‘ッãƒä¸€è¦§ã®è¡¨ç¤º" msgid "all patches applied\n" msgstr "å…¨ã¦ã®ãƒ‘ッãƒãŒé©ç”¨ä¸ã§ã™\n" +msgid "import file in patch directory" +msgstr "パッãƒç®¡ç†é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰å–ã‚Šè¾¼ã¿" + +msgid "NAME" +msgstr "åå‰" + +msgid "name of patch file" +msgstr "パッãƒãƒ•ã‚¡ã‚¤ãƒ«å" + +msgid "overwrite existing files" +msgstr "æ—¢å˜ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸Šæ›¸ã" + +msgid "place existing revisions under mq control" +msgstr "æ—¢å˜ãƒªãƒ“ジョンを MQ 管ç†ä¸‹ã«ç§»è¡Œ" + +msgid "use git extended diff format" +msgstr "git 拡張差分形å¼ã®ä½¿ç”¨" + +msgid "qpush after importing" +msgstr "パッãƒå–ã‚Šè¾¼ã¿å¾Œã«ãƒ‘ッãƒé©ç”¨(qpush)を実施" + +msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." +msgstr "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." + msgid "import a patch" msgstr "パッãƒã®å–ã‚Šè¾¼ã¿" @@ -3602,13 +3903,16 @@ " With -g/--git, patches imported with --rev will use the git diff\n" " format. See the diffs help topic for information on why this is\n" " important for preserving rename/copy information and permission\n" -" changes." -msgstr "" -" -r/--rev を指定ã™ã‚‹ã“ã¨ã§ã€ æ—¢å˜ã®é€šå¸¸ãƒªãƒ“ジョンを MQ 管ç†ä¸‹ã«ç½®ã\n" -" ã“ã¨ãŒã§ãã¾ã™(例: 'qimport --rev tip -n patch' ã¯ã€ tip ã‚’ MQ 管ç†\n" -" 下ã«ç½®ãã¾ã™)。 -g/--git 指定ã¯ã€ --rev 指定ã«ã‚ˆã‚‹å–ã‚Šè¾¼ã¿ã®éš›ã« git\n" -" 差分形å¼ã‚’使用ã—ã¾ã™ã€‚ 改åï¼è¤‡è£½æƒ…å ±ã‚„ã€ æ¨©é™è¨å®šã®æƒ…å ±ä¿æŒã«ã¨ã£ã¦ã®\n" -" git 差分形å¼ã®æœ‰ç”¨æ€§ã«é–¢ã—ã¦ã¯ã€ 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +" changes. Use :hg:`qfinish` to remove changesets from mq control." +msgstr "" +" -r/--rev を指定ã™ã‚‹ã“ã¨ã§ã€\n" +" æ—¢å˜ã®é€šå¸¸ãƒªãƒ“ジョンを MQ 管ç†ä¸‹ã«ç½®ãã“ã¨ãŒã§ãã¾ã™\n" +" (例: 'qimport --rev tip -n patch' ã¯ã€ tip ã‚’ MQ 管ç†ä¸‹ã«ç½®ãã¾ã™)。\n" +" -g/--git 指定ã¯ã€ --rev 指定ã«ã‚ˆã‚‹å–ã‚Šè¾¼ã¿ã®éš›ã«\n" +" git 差分形å¼ã‚’使用ã—ã¾ã™ã€‚\n" +" 改åï¼è¤‡è£½æƒ…å ±ã‚„ã€ æ¨©é™è¨å®šã®æƒ…å ±ä¿æŒã«ã¨ã£ã¦ã®\n" +" git 差分形å¼ã®æœ‰ç”¨æ€§ã«é–¢ã—ã¦ã¯ã€ 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n" +" リビジョンを MQ 管ç†ä¸‹ã‹ã‚‰é™¤å¤–ã™ã‚‹å ´åˆã€ :hg:`qfinish` を使用ã—ã¾ã™ã€‚" msgid "" " To import a patch from standard input, pass - as the patch file.\n" @@ -3631,6 +3935,12 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n" " " +msgid "create queue repository" +msgstr "パッãƒç®¡ç†è‡ªèº«ã‚’ Mercurial ã§æ§‹æˆç®¡ç†" + +msgid "hg qinit [-c]" +msgstr "hg qinit [-c]" + msgid "init a new queue repository (DEPRECATED)" msgstr "パッãƒç®¡ç†é ˜åŸŸã®åˆæœŸåŒ–(éžæŽ¨å¥¨)" @@ -3655,6 +3965,24 @@ " ã«ã‚ˆã£ã¦ä½œæˆã•ã‚Œã¾ã™ã€‚ -c 指定有りã§ã®ä½œæˆãªã‚‰ã°ã€ :hg:`init --mq`\n" " を使用ã—ã¦ãã ã•ã„。" +msgid "use pull protocol to copy metadata" +msgstr "メタデータ複製㫠pull プãƒãƒˆã‚³ãƒ«ã‚’使用" + +msgid "do not update the new working directories" +msgstr "æ–°è¦ä½œæ¥é ˜åŸŸã®æ›´æ–°ã‚’抑æ¢" + +msgid "use uncompressed transfer (fast over LAN)" +msgstr "éžåœ§ç¸®ã§ã®è»¢é€(LAN ã§ã®é«˜é€Ÿè»¢é€ç”¨)" + +msgid "REPO" +msgstr "リãƒã‚¸ãƒˆãƒª" + +msgid "location of source patch repository" +msgstr "複製元パッãƒç®¡ç†é ˜åŸŸä½ç½®" + +msgid "hg qclone [OPTION]... SOURCE [DEST]" +msgstr "hg qclone [OPTION]... SOURCE [DEST]" + msgid "clone main and patch repository at same time" msgstr "リãƒã‚¸ãƒˆãƒªã¨ãƒ‘ッãƒç®¡ç†é ˜åŸŸã®åŒæ™‚複製" @@ -3707,9 +4035,12 @@ msgid "updating destination repository\n" msgstr "複製先ã®ä½œæ¥é ˜åŸŸã‚’æ›´æ–°ä¸\n" +msgid "hg qcommit [OPTION]... [FILE]..." +msgstr "hg qcommit [OPTION]... [FILE]..." + msgid "commit changes in the queue repository (DEPRECATED)" msgstr "パッãƒç®¡ç†é ˜åŸŸã®å¤‰æ›´ã‚’コミット(éžæŽ¨å¥¨)" msgid " This command is deprecated; use :hg:`commit --mq` instead." msgstr " 本コマンドã¯éžæŽ¨å¥¨ã§ã™ã€‚ :hg:`commit --mq` を使用ã—ã¦ãã ã•ã„。" @@ -3710,9 +4041,15 @@ msgid "commit changes in the queue repository (DEPRECATED)" msgstr "パッãƒç®¡ç†é ˜åŸŸã®å¤‰æ›´ã‚’コミット(éžæŽ¨å¥¨)" msgid " This command is deprecated; use :hg:`commit --mq` instead." msgstr " 本コマンドã¯éžæŽ¨å¥¨ã§ã™ã€‚ :hg:`commit --mq` を使用ã—ã¦ãã ã•ã„。" +msgid "print patches not in series" +msgstr "パッãƒç®¡ç†é ˜åŸŸä¸ã®æœªçŸ¥ã®ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "hg qseries [-ms]" +msgstr "hg qseries [-ms]" + msgid "print the entire series file" msgstr "既知ã®ãƒ‘ッãƒä¸€è¦§ã®è¡¨ç¤º" @@ -3716,6 +4053,9 @@ msgid "print the entire series file" msgstr "既知ã®ãƒ‘ッãƒä¸€è¦§ã®è¡¨ç¤º" +msgid "hg qtop [-s]" +msgstr "hg qtop [-s]" + msgid "print the name of the current patch" msgstr "ç¾è¡Œãƒ‘ッãƒã®åå‰è¡¨ç¤º" @@ -3719,6 +4059,9 @@ msgid "print the name of the current patch" msgstr "ç¾è¡Œãƒ‘ッãƒã®åå‰è¡¨ç¤º" +msgid "hg qnext [-s]" +msgstr "hg qnext [-s]" + msgid "print the name of the next patch" msgstr "ç¾è¡Œãƒ‘ッãƒã®ã€Œæ¬¡ã€ã®æ—¢çŸ¥ã®ãƒ‘ッãƒã®åå‰è¡¨ç¤º" @@ -3722,6 +4065,9 @@ msgid "print the name of the next patch" msgstr "ç¾è¡Œãƒ‘ッãƒã®ã€Œæ¬¡ã€ã®æ—¢çŸ¥ã®ãƒ‘ッãƒã®åå‰è¡¨ç¤º" +msgid "hg qprev [-s]" +msgstr "hg qprev [-s]" + msgid "print the name of the previous patch" msgstr "ç¾è¡Œãƒ‘ッãƒã®ã€Œå‰ã€ã®æ—¢çŸ¥ã®ãƒ‘ッãƒã®åå‰è¡¨ç¤º" @@ -3725,6 +4071,27 @@ msgid "print the name of the previous patch" msgstr "ç¾è¡Œãƒ‘ッãƒã®ã€Œå‰ã€ã®æ—¢çŸ¥ã®ãƒ‘ッãƒã®åå‰è¡¨ç¤º" +msgid "import uncommitted changes (DEPRECATED)" +msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´å†…容ã®ãƒ‘ッãƒã¸ã®å–ã‚Šè¾¼ã¿(éžæŽ¨å¥¨)" + +msgid "add \"From: <current user>\" to patch" +msgstr "\"From: <ç¾ãƒ¦ãƒ¼ã‚¶å>\" をパッãƒã«è¿½åŠ " + +msgid "USER" +msgstr "ユーザ" + +msgid "add \"From: <USER>\" to patch" +msgstr "\"From: <ユーザ>\" をパッãƒã«è¿½åŠ " + +msgid "add \"Date: <current date>\" to patch" +msgstr "\"Date: <ç¾åœ¨æ™‚刻>\" をパッãƒã«è¿½åŠ " + +msgid "add \"Date: <DATE>\" to patch" +msgstr "\"Date: <日時>\" をパッãƒã«è¿½åŠ " + +msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." +msgstr "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." + msgid "create a new patch" msgstr "æ–°è¦ãƒ‘ッãƒã®ä½œæˆ" @@ -3778,6 +4145,24 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n" " " +msgid "refresh only files already in the patch and specified files" +msgstr "æ—¢å˜ã®ãƒ‘ッãƒå¯¾è±¡ã«åŠ ãˆã€æ˜Žç¤ºã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã«ã™ã‚‹" + +msgid "add/update author field in patch with current user" +msgstr "パッãƒä½œæˆè€…æƒ…å ±ã‚’ç¾è¡Œãƒ¦ãƒ¼ã‚¶ã«è¨å®š" + +msgid "add/update author field in patch with given user" +msgstr "パッãƒä½œæˆè€…æƒ…å ±ã‚’æŒ‡å®šãƒ¦ãƒ¼ã‚¶ã«è¨å®š" + +msgid "add/update date field in patch with current date" +msgstr "パッãƒä½œæˆæ—¥ä»˜æƒ…å ±ã‚’ç¾æ™‚刻ã«è¨å®š" + +msgid "add/update date field in patch with given date" +msgstr "パッãƒä½œæˆæ—¥ä»˜æƒ…å ±ã‚’æŒ‡å®šæ™‚åˆ»ã«è¨å®š" + +msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." +msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." + msgid "update the current patch" msgstr "ç¾è¡Œãƒ‘ッãƒã®æ›´æ–°" @@ -3821,7 +4206,10 @@ " 'help diffs' ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "option \"-e\" incompatible with \"-m\" or \"-l\"" -msgstr "\"-e\" ã¯ã€ \"-m\" ãªã„ã— \"-l\" ã¨ä½µç”¨ã§ãã¾ã›ã‚“" +msgstr "\"-e\" ã¨ã€ \"-m\" ãªã„ã— \"-l\" ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "hg qdiff [OPTION]... [FILE]..." +msgstr "hg qdiff [OPTION]... [FILE]..." msgid "diff of the current patch and subsequent modifications" msgstr "ç¾è¡Œãƒ‘ッãƒã¨ä½œæ¥é ˜åŸŸå¤‰æ›´ã®çµåˆçµæžœã®è¡¨ç¤º" @@ -3846,6 +4234,15 @@ " å ´åˆã¯ :hg:`diff` を〠作æ¥é ˜åŸŸã®å¤‰æ›´å†…容をå«ã¾ãªã„ç¾è¡Œãƒ‘ッãƒã®å†…容\n" " ã®ã¿ã‚’見ãŸã„å ´åˆã¯ :hg:`export qtip` を使用ã—ã¦ãã ã•ã„。" +msgid "edit patch header" +msgstr "パッãƒãƒ˜ãƒƒãƒ€å†…容ã®ç·¨é›†" + +msgid "keep folded patch files" +msgstr "çµåˆå¯¾è±¡ãƒ‘ッãƒã®ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«å‰Šé™¤ã‚’抑æ¢" + +msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." +msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." + msgid "fold the named patches into the current patch" msgstr "指定パッãƒã®ç¾è¡Œãƒ‘ッãƒã¸ã®çµ±åˆ" @@ -3888,6 +4285,12 @@ msgid "error folding patch %s" msgstr "パッム%s ã®çµ±åˆã«å¤±æ•—" +msgid "overwrite any local changes" +msgstr "作æ¥é ˜åŸŸä¸ã®å¤‰æ›´ã‚’上書ã" + +msgid "hg qgoto [OPTION]... PATCH" +msgstr "hg qgoto [OPTION]... PATCH" + msgid "push or pop patches until named patch is at top of stack" msgstr "指定パッãƒã‚’é©ç”¨ãƒ‘ッãƒã®æœ€ä¸Šä½ã«ã™ã‚‹ qpush/qpop ã®å®Ÿæ–½" @@ -3891,6 +4294,15 @@ msgid "push or pop patches until named patch is at top of stack" msgstr "指定パッãƒã‚’é©ç”¨ãƒ‘ッãƒã®æœ€ä¸Šä½ã«ã™ã‚‹ qpush/qpop ã®å®Ÿæ–½" +msgid "list all patches and guards" +msgstr "å…¨ã¦ã®ãƒ‘ッãƒã®ã‚¬ãƒ¼ãƒ‰çŠ¶æ³ã‚’一覧表示" + +msgid "drop all guards" +msgstr "å…¨ã¦ã®ã‚¬ãƒ¼ãƒ‰è¨å®šã‚’ç ´æ£„" + +msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]" +msgstr "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]" + msgid "set or print guards for a patch" msgstr "パッãƒã®ã‚¬ãƒ¼ãƒ‰è¨å®šãªã„ã—表示" @@ -3938,6 +4350,9 @@ msgid "no patch named %s" msgstr "パッム%s ã¯æœªçŸ¥ã®ãƒ‘ッãƒã§ã™" +msgid "hg qheader [PATCH]" +msgstr "hg qheader [PATCH]" + msgid "print the header of the topmost or specified patch" msgstr "ç¾è¡Œãƒ‘ッãƒãªã„ã—指定パッãƒã®ãƒ˜ãƒƒãƒ€è¡¨ç¤º" @@ -3941,6 +4356,30 @@ msgid "print the header of the topmost or specified patch" msgstr "ç¾è¡Œãƒ‘ッãƒãªã„ã—指定パッãƒã®ãƒ˜ãƒƒãƒ€è¡¨ç¤º" +msgid "apply on top of local changes" +msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´ã‚’ãã®ã¾ã¾ã§ãƒ‘ッãƒã‚’é©ç”¨" + +msgid "apply the target patch to its recorded parent" +msgstr "パッãƒã«è¨˜éŒ²ã•ã‚ŒãŸè¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦é©ç”¨" + +msgid "list patch name in commit text" +msgstr "コミットメッセージã¨ã—ã¦ãƒ‘ッãƒåを列挙" + +msgid "apply all patches" +msgstr "å…¨ã¦ã®ãƒ‘ッãƒã‚’é©ç”¨" + +msgid "merge from another queue (DEPRECATED)" +msgstr "ä»–ã®ãƒ‘ッãƒç®¡ç†é ˜åŸŸã¨ã®ãƒžãƒ¼ã‚¸(éžæŽ¨å¥¨)" + +msgid "merge queue name (DEPRECATED)" +msgstr "マージ対象ã®ãƒ‘ッãƒç®¡ç†é ˜åŸŸå(éžæŽ¨å¥¨)" + +msgid "reorder patch series and apply only the patch" +msgstr "パッãƒä¸€è¦§ã®é †åºå¤‰æ›´ã¨ãƒ‘ッãƒé©ç”¨" + +msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" +msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" + msgid "push the next patch onto the stack" msgstr "次ã®ãƒ‘ッãƒã®é©ç”¨" @@ -3951,13 +4390,6 @@ " -f/--force ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ パッãƒé©ç”¨å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã®ã€\n" " 作æ¥é ˜åŸŸã«ãŠã‘る変更内容ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚" -msgid "" -" Return 0 on succces.\n" -" " -msgstr "" -" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0 ã§ã™ã€‚\n" -" " - msgid "no saved queues found, please use -n\n" msgstr "ä¿å˜ã•ã‚ŒãŸãƒ‘ッãƒç®¡ç†é ˜åŸŸãŒã‚ã‚Šã¾ã›ã‚“。 -n を使用ã—ã¦ãã ã•ã„\n" @@ -3965,6 +4397,18 @@ msgid "merging with queue at: %s\n" msgstr "パッãƒç®¡ç†é ˜åŸŸ %s ã¨ãƒžãƒ¼ã‚¸ä¸\n" +msgid "pop all patches" +msgstr "å…¨ã¦ã®ãƒ‘ッãƒã®é©ç”¨ã‚’解除" + +msgid "queue name to pop (DEPRECATED)" +msgstr "パッãƒè§£é™¤å…ˆã®ãƒ‘ッãƒç®¡ç†é ˜åŸŸå(éžæŽ¨å¥¨)" + +msgid "forget any local changes to patched files" +msgstr "パッãƒå¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã™ã‚‹ä½œæ¥é ˜åŸŸä¸ã®å¤‰æ›´ã‚’ç ´æ£„" + +msgid "hg qpop [-a] [-f] [PATCH | INDEX]" +msgstr "hg qpop [-a] [-f] [PATCH | INDEX]" + msgid "pop the current patch off the stack" msgstr "ç¾è¡Œãƒ‘ッãƒã®é©ç”¨è§£é™¤" @@ -3981,6 +4425,9 @@ msgid "using patch queue: %s\n" msgstr "パッãƒç®¡ç†é ˜åŸŸ %s を使用ä¸\n" +msgid "hg qrename PATCH1 [PATCH2]" +msgstr "hg qrename PATCH1 [PATCH2]" + msgid "rename a patch" msgstr "パッãƒã®æ”¹å" @@ -3991,13 +4438,14 @@ " 引数ãŒ1ã¤ã®å ´åˆã€ ç¾è¡Œãƒ‘ッãƒã‚’指定ã•ã‚ŒãŸåå‰ã«æ”¹åã—ã¾ã™ã€‚\n" " 引数ãŒ2ã¤ã®å ´åˆã€ 1ã¤ç›®ã®ãƒ‘ッãƒã®åå‰ã‚’2ã¤ç›®ã«æ”¹åã—ã¾ã™ã€‚" -#, python-format -msgid "%s already exists" -msgstr "ファイル %s ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™" - -#, python-format -msgid "A patch named %s already exists in the series file" -msgstr "åŒåã®ãƒ‘ッム%s ãŒæ—¢ã«å˜åœ¨ã—ã¾ã™" +msgid "delete save entry" +msgstr "ä¿å˜ã‚¨ãƒ³ãƒˆãƒªã®ç ´æ£„" + +msgid "update queue working directory" +msgstr "パッãƒç®¡ç†é ˜åŸŸã®æ›´æ–°" + +msgid "hg qrestore [-d] [-u] REV" +msgstr "hg qrestore [-d] [-u] REV" msgid "restore the queue state saved by a revision (DEPRECATED)" msgstr "指定リビジョンã«ã‚ˆã£ã¦ä¿å˜ã•ã‚ŒãŸãƒ‘ッãƒç®¡ç†çŠ¶æ…‹ã®å¾©æ—§(éžæŽ¨å¥¨)" @@ -4005,6 +4453,21 @@ msgid " This command is deprecated, use :hg:`rebase` instead." msgstr " 本コマンドã¯éžæŽ¨å¥¨ã§ã™ã€‚ :hg:`rebase` を使用ã—ã¦ãã ã•ã„。" +msgid "copy patch directory" +msgstr "パッãƒç®¡ç†é ˜åŸŸã®è¤‡è£½" + +msgid "copy directory name" +msgstr "複製先ディレクトリå" + +msgid "clear queue status file" +msgstr "パッãƒçŠ¶æ…‹ãƒ•ã‚¡ã‚¤ãƒ«(status)ã®ã‚¯ãƒªã‚¢" + +msgid "force copy" +msgstr "複製ã®å¼·è¡Œ" + +msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" +msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" + msgid "save current queue state (DEPRECATED)" msgstr "パッãƒç®¡ç†çŠ¶æ…‹ã®ä¿å˜(éžæŽ¨å¥¨)" @@ -4020,8 +4483,29 @@ msgid "copy %s to %s\n" msgstr "%s ã‹ã‚‰ %s ã«è¤‡è£½ã—ã¾ã™\n" +msgid "force removal of changesets, discard uncommitted changes (no backup)" +msgstr "リビジョンを強制的ã«å‰Šé™¤ã—ã€ æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´å†…å®¹ã‚’ç ´æ£„(ä¿å˜ç„¡ã—)" + +msgid "" +"bundle only changesets with local revision number greater than REV which are " +"not descendants of REV (DEPRECATED)" +msgstr "" +"指定リビジョンよりリビジョン番å·ãŒå¤§ããåå«ä»¥å¤–ã®ã‚‚ã®ã‚’ bundle 化(éžæŽ¨å¥¨)" + +msgid "no backups" +msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã®æŠ‘æ¢" + +msgid "no backups (DEPRECATED)" +msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã®æŠ‘æ¢(éžæŽ¨å¥¨)" + +msgid "do not modify working copy during strip" +msgstr "処ç†ä¸ã®ä½œæ¥é ˜åŸŸæ›´æ–°ã‚’抑æ¢" + +msgid "hg strip [-k] [-f] [-n] REV..." +msgstr "hg strip [-k] [-f] [-n] REV..." + msgid "strip changesets and all their descendants from the repository" msgstr "リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®ã€ 特定リビジョンãŠã‚ˆã³ãã®åå«ã®é™¤å¤–" msgid "" " The strip command removes the specified changesets and all their\n" @@ -4023,10 +4507,11 @@ msgid "strip changesets and all their descendants from the repository" msgstr "リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®ã€ 特定リビジョンãŠã‚ˆã³ãã®åå«ã®é™¤å¤–" msgid "" " The strip command removes the specified changesets and all their\n" -" descendants. If the working directory has uncommitted changes,\n" -" the operation is aborted unless the --force flag is supplied." +" descendants. If the working directory has uncommitted changes, the\n" +" operation is aborted unless the --force flag is supplied, in which\n" +" case changes will be discarded." msgstr "" " :hg:`strip` ã¯æŒ‡å®šã®ãƒªãƒ“ジョンãŠã‚ˆã³ã€ 指定リビジョンã®åå«ã‚’\n" " å–り除ãã¾ã™ã€‚ 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ãŒã‚ã‚‹å ´åˆã€\n" @@ -4030,7 +4515,8 @@ msgstr "" " :hg:`strip` ã¯æŒ‡å®šã®ãƒªãƒ“ジョンãŠã‚ˆã³ã€ 指定リビジョンã®åå«ã‚’\n" " å–り除ãã¾ã™ã€‚ 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ãŒã‚ã‚‹å ´åˆã€\n" -" --force ãŒæŒ‡å®šã•ã‚Œãªã„é™ã‚Šã¯å‡¦ç†ã‚’ä¸æ–ã—ã¾ã™ã€‚" +" --force ãŒæŒ‡å®šã•ã‚Œãªã„é™ã‚Šã¯å‡¦ç†ã‚’ä¸æ–ã—ã¾ã™ã€‚\n" +" --force ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 変更内容ã¯ç ´æ£„ã•ã‚Œã¾ã™ã€‚" msgid "" " If a parent of the working directory is stripped, then the working\n" @@ -4067,6 +4553,21 @@ msgid "empty revision set" msgstr "指定ã«è©²å½“ã™ã‚‹ãƒªãƒ“ジョンã¯ã‚ã‚Šã¾ã›ã‚“" +msgid "disable all guards" +msgstr "å…¨ã¦ã®ã‚¬ãƒ¼ãƒ‰è¨å®šã‚’ç ´æ£„" + +msgid "list all guards in series file" +msgstr "å„パッãƒã«è¨å®šã•ã‚ŒãŸã‚¬ãƒ¼ãƒ‰ã‚’一覧化" + +msgid "pop to before first guarded applied patch" +msgstr "é©ç”¨å¯å¦ãŒå¤‰åŒ–ã™ã‚‹ãƒ‘ッãƒã®é©ç”¨ã‚’解除" + +msgid "pop, then reapply patches" +msgstr "qpop 実施後ã«å†åº¦ãƒ‘ッãƒã‚’é©ç”¨" + +msgid "hg qselect [OPTION]... [GUARD]..." +msgstr "hg qselect [OPTION]... [GUARD]..." + msgid "set or print guarded patches to push" msgstr "作æ¥é ˜åŸŸã«ãŠã‘るガードé¸æŠžã®è¨å®šãªã„ã—表示" @@ -4084,7 +4585,7 @@ " å ´åˆã«ã¯ãƒ‘ッãƒã¯é©ç”¨ã•ã‚Œã¾ã›ã‚“。 例ãˆã°::" msgid "" -" qguard foo.patch -stable (negative guard)\n" -" qguard bar.patch +stable (positive guard)\n" +" qguard foo.patch -- -stable (negative guard)\n" +" qguard bar.patch +stable (positive guard)\n" " qselect stable" msgstr "" @@ -4089,7 +4590,7 @@ " qselect stable" msgstr "" -" qguard foo.patch -stable (ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰)\n" -" qguard bar.patch +stable (「æ£ã€ã®ã‚¬ãƒ¼ãƒ‰)\n" +" qguard foo.patch -- -stable (ã€Œè² ã€ã®ã‚¬ãƒ¼ãƒ‰)\n" +" qguard bar.patch +stable (「æ£ã€ã®ã‚¬ãƒ¼ãƒ‰)\n" " qselect stable" msgid "" @@ -4168,6 +4669,12 @@ msgid "reapplying unguarded patches\n" msgstr "ガードãŒç„¡åŠ¹ãªãƒ‘ッãƒã‚’å†é©ç”¨ä¸\n" +msgid "finish all applied changesets" +msgstr "å…¨ã¦ã®é©ç”¨ä¸ãƒ‘ッãƒã‚’通常リビジョン化" + +msgid "hg qfinish [-a] [REV]..." +msgstr "hg qfinish [-a] [REV]..." + msgid "move applied patches into repository history" msgstr "é©ç”¨ä¸ãƒ‘ッãƒã®é€šå¸¸ãƒªãƒ“ジョン化" @@ -4201,6 +4708,24 @@ msgid "no revisions specified" msgstr "リビジョン指定ãŒã‚ã‚Šã¾ã›ã‚“" +msgid "list all available queues" +msgstr "有効ãªã‚ューã®ä¸€è¦§è¡¨ç¤º" + +msgid "create new queue" +msgstr "æ–°è¦ã‚ューã®ä½œæˆ" + +msgid "rename active queue" +msgstr "ç¾è¡Œã‚ューã®æ”¹å" + +msgid "delete reference to queue" +msgstr "ã‚ューã¸ã®å‚ç…§ã®å‰Šé™¤" + +msgid "delete queue, and remove patch dir" +msgstr "ã‚ューãŠã‚ˆã³ç®¡ç†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å‰Šé™¤" + +msgid "[OPTION] [QUEUE]" +msgstr "[OPTION] [QUEUE]" + msgid "manage multiple patch queues" msgstr "複数ã®ãƒ‘ッãƒã‚ューã®ç®¡ç†" @@ -4309,6 +4834,16 @@ msgid "mq: (empty queue)\n" msgstr "mq: (空ã‚ュー)\n" +msgid "" +"``mq()``\n" +" Changesets managed by MQ." +msgstr "" +"``mq()``\n" +" MQ 管ç†ä¸‹ã«ã‚るリビジョン" + +msgid "mq takes no arguments" +msgstr "mq 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + msgid "operate on patch repository" msgstr "パッãƒç®¡ç†ãƒªãƒã‚¸ãƒˆãƒªã¸ã®æ“作" @@ -4312,290 +4847,6 @@ msgid "operate on patch repository" msgstr "パッãƒç®¡ç†ãƒªãƒã‚¸ãƒˆãƒªã¸ã®æ“作" -msgid "print first line of patch header" -msgstr "パッãƒãƒ˜ãƒƒãƒ€ã®æœ€åˆã®è¡Œã‚’表示" - -msgid "show only the last patch" -msgstr "最終é©ç”¨ãƒ‘ッãƒã®ã¿ã‚’表示" - -msgid "hg qapplied [-1] [-s] [PATCH]" -msgstr "hg qapplied [-1] [-s] [PATCH]" - -msgid "use pull protocol to copy metadata" -msgstr "メタデータ複製㫠pull プãƒãƒˆã‚³ãƒ«ã‚’使用" - -msgid "do not update the new working directories" -msgstr "æ–°è¦ä½œæ¥é ˜åŸŸã®æ›´æ–°ã‚’抑æ¢" - -msgid "use uncompressed transfer (fast over LAN)" -msgstr "éžåœ§ç¸®ã§ã®è»¢é€(LAN ã§ã®é«˜é€Ÿè»¢é€ç”¨)" - -msgid "REPO" -msgstr "リãƒã‚¸ãƒˆãƒª" - -msgid "location of source patch repository" -msgstr "複製元パッãƒç®¡ç†é ˜åŸŸä½ç½®" - -msgid "hg qclone [OPTION]... SOURCE [DEST]" -msgstr "hg qclone [OPTION]... SOURCE [DEST]" - -msgid "hg qcommit [OPTION]... [FILE]..." -msgstr "hg qcommit [OPTION]... [FILE]..." - -msgid "hg qdiff [OPTION]... [FILE]..." -msgstr "hg qdiff [OPTION]... [FILE]..." - -msgid "keep patch file" -msgstr "パッãƒãƒ•ã‚¡ã‚¤ãƒ«ã®å‰Šé™¤ã‚’抑æ¢" - -msgid "stop managing a revision (DEPRECATED)" -msgstr "指定リビジョンを管ç†å¯¾è±¡ã‹ã‚‰é™¤å¤–(éžæŽ¨å¥¨)" - -msgid "hg qdelete [-k] [PATCH]..." -msgstr "hg qdelete [-k] [PATCH]..." - -msgid "edit patch header" -msgstr "パッãƒãƒ˜ãƒƒãƒ€å†…容ã®ç·¨é›†" - -msgid "keep folded patch files" -msgstr "çµåˆå¯¾è±¡ãƒ‘ッãƒã®ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«å‰Šé™¤ã‚’抑æ¢" - -msgid "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." -msgstr "hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH..." - -msgid "overwrite any local changes" -msgstr "作æ¥é ˜åŸŸä¸ã®å¤‰æ›´ã‚’上書ã" - -msgid "hg qgoto [OPTION]... PATCH" -msgstr "hg qgoto [OPTION]... PATCH" - -msgid "list all patches and guards" -msgstr "å…¨ã¦ã®ãƒ‘ッãƒã®ã‚¬ãƒ¼ãƒ‰çŠ¶æ³ã‚’一覧表示" - -msgid "drop all guards" -msgstr "å…¨ã¦ã®ã‚¬ãƒ¼ãƒ‰è¨å®šã‚’ç ´æ£„" - -msgid "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]" -msgstr "hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]" - -msgid "hg qheader [PATCH]" -msgstr "hg qheader [PATCH]" - -msgid "import file in patch directory" -msgstr "パッãƒç®¡ç†é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‹ã‚‰å–ã‚Šè¾¼ã¿" - -msgid "NAME" -msgstr "åå‰" - -msgid "name of patch file" -msgstr "パッãƒãƒ•ã‚¡ã‚¤ãƒ«å" - -msgid "overwrite existing files" -msgstr "æ—¢å˜ãƒ•ã‚¡ã‚¤ãƒ«ã®ä¸Šæ›¸ã" - -msgid "place existing revisions under mq control" -msgstr "æ—¢å˜ãƒªãƒ“ジョンを MQ 管ç†ä¸‹ã«ç§»è¡Œ" - -msgid "use git extended diff format" -msgstr "git 拡張差分形å¼ã®ä½¿ç”¨" - -msgid "qpush after importing" -msgstr "パッãƒå–ã‚Šè¾¼ã¿å¾Œã«ãƒ‘ッãƒé©ç”¨(qpush)を実施" - -msgid "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." -msgstr "hg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... FILE..." - -msgid "create queue repository" -msgstr "パッãƒç®¡ç†è‡ªèº«ã‚’ Mercurial ã§æ§‹æˆç®¡ç†" - -msgid "hg qinit [-c]" -msgstr "hg qinit [-c]" - -msgid "import uncommitted changes (DEPRECATED)" -msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´å†…容ã®ãƒ‘ッãƒã¸ã®å–ã‚Šè¾¼ã¿(éžæŽ¨å¥¨)" - -msgid "add \"From: <current user>\" to patch" -msgstr "\"From: <ç¾ãƒ¦ãƒ¼ã‚¶å>\" をパッãƒã«è¿½åŠ " - -msgid "USER" -msgstr "ユーザ" - -msgid "add \"From: <USER>\" to patch" -msgstr "\"From: <ユーザ>\" をパッãƒã«è¿½åŠ " - -msgid "add \"Date: <current date>\" to patch" -msgstr "\"Date: <ç¾åœ¨æ™‚刻>\" をパッãƒã«è¿½åŠ " - -msgid "add \"Date: <DATE>\" to patch" -msgstr "\"Date: <日時>\" をパッãƒã«è¿½åŠ " - -msgid "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." -msgstr "hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]..." - -msgid "hg qnext [-s]" -msgstr "hg qnext [-s]" - -msgid "hg qprev [-s]" -msgstr "hg qprev [-s]" - -msgid "pop all patches" -msgstr "å…¨ã¦ã®ãƒ‘ッãƒã®é©ç”¨ã‚’解除" - -msgid "queue name to pop (DEPRECATED)" -msgstr "パッãƒè§£é™¤å…ˆã®ãƒ‘ッãƒç®¡ç†é ˜åŸŸå(éžæŽ¨å¥¨)" - -msgid "forget any local changes to patched files" -msgstr "パッãƒå¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã™ã‚‹ä½œæ¥é ˜åŸŸä¸ã®å¤‰æ›´ã‚’ç ´æ£„" - -msgid "hg qpop [-a] [-f] [PATCH | INDEX]" -msgstr "hg qpop [-a] [-f] [PATCH | INDEX]" - -msgid "apply on top of local changes" -msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´ã‚’ãã®ã¾ã¾ã§ãƒ‘ッãƒã‚’é©ç”¨" - -msgid "apply the target patch to its recorded parent" -msgstr "パッãƒã«è¨˜éŒ²ã•ã‚ŒãŸè¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦é©ç”¨" - -msgid "list patch name in commit text" -msgstr "コミットメッセージã¨ã—ã¦ãƒ‘ッãƒåを列挙" - -msgid "apply all patches" -msgstr "å…¨ã¦ã®ãƒ‘ッãƒã‚’é©ç”¨" - -msgid "merge from another queue (DEPRECATED)" -msgstr "ä»–ã®ãƒ‘ッãƒç®¡ç†é ˜åŸŸã¨ã®ãƒžãƒ¼ã‚¸(éžæŽ¨å¥¨)" - -msgid "merge queue name (DEPRECATED)" -msgstr "マージ対象ã®ãƒ‘ッãƒç®¡ç†é ˜åŸŸå(éžæŽ¨å¥¨)" - -msgid "reorder patch series and apply only the patch" -msgstr "パッãƒä¸€è¦§ã®é †åºå¤‰æ›´ã¨ãƒ‘ッãƒé©ç”¨" - -msgid "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" -msgstr "hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]" - -msgid "refresh only files already in the patch and specified files" -msgstr "æ—¢å˜ã®ãƒ‘ッãƒå¯¾è±¡ã«åŠ ãˆã€æ˜Žç¤ºã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã«ã™ã‚‹" - -msgid "add/update author field in patch with current user" -msgstr "パッãƒä½œæˆè€…æƒ…å ±ã‚’ç¾è¡Œãƒ¦ãƒ¼ã‚¶ã«è¨å®š" - -msgid "add/update author field in patch with given user" -msgstr "パッãƒä½œæˆè€…æƒ…å ±ã‚’æŒ‡å®šãƒ¦ãƒ¼ã‚¶ã«è¨å®š" - -msgid "add/update date field in patch with current date" -msgstr "パッãƒä½œæˆæ—¥ä»˜æƒ…å ±ã‚’ç¾æ™‚刻ã«è¨å®š" - -msgid "add/update date field in patch with given date" -msgstr "パッãƒä½œæˆæ—¥ä»˜æƒ…å ±ã‚’æŒ‡å®šæ™‚åˆ»ã«è¨å®š" - -msgid "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." -msgstr "hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]..." - -msgid "hg qrename PATCH1 [PATCH2]" -msgstr "hg qrename PATCH1 [PATCH2]" - -msgid "delete save entry" -msgstr "ä¿å˜ã‚¨ãƒ³ãƒˆãƒªã®ç ´æ£„" - -msgid "update queue working directory" -msgstr "パッãƒç®¡ç†é ˜åŸŸã®æ›´æ–°" - -msgid "hg qrestore [-d] [-u] REV" -msgstr "hg qrestore [-d] [-u] REV" - -msgid "copy patch directory" -msgstr "パッãƒç®¡ç†é ˜åŸŸã®è¤‡è£½" - -msgid "copy directory name" -msgstr "複製先ディレクトリå" - -msgid "clear queue status file" -msgstr "パッãƒçŠ¶æ…‹ãƒ•ã‚¡ã‚¤ãƒ«(status)ã®ã‚¯ãƒªã‚¢" - -msgid "force copy" -msgstr "複製ã®å¼·è¡Œ" - -msgid "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" -msgstr "hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]" - -msgid "disable all guards" -msgstr "å…¨ã¦ã®ã‚¬ãƒ¼ãƒ‰è¨å®šã‚’ç ´æ£„" - -msgid "list all guards in series file" -msgstr "å„パッãƒã«è¨å®šã•ã‚ŒãŸã‚¬ãƒ¼ãƒ‰ã‚’一覧化" - -msgid "pop to before first guarded applied patch" -msgstr "é©ç”¨å¯å¦ãŒå¤‰åŒ–ã™ã‚‹ãƒ‘ッãƒã®é©ç”¨ã‚’解除" - -msgid "pop, then reapply patches" -msgstr "qpop 実施後ã«å†åº¦ãƒ‘ッãƒã‚’é©ç”¨" - -msgid "hg qselect [OPTION]... [GUARD]..." -msgstr "hg qselect [OPTION]... [GUARD]..." - -msgid "print patches not in series" -msgstr "パッãƒç®¡ç†é ˜åŸŸä¸ã®æœªçŸ¥ã®ãƒ‘ッãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "hg qseries [-ms]" -msgstr "hg qseries [-ms]" - -msgid "" -"force removal of changesets even if the working directory has uncommitted " -"changes" -msgstr "作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆä¿®æ£ãŒã‚ã£ã¦ã‚‚強制的ã«ãƒªãƒ“ジョンを除外" - -msgid "" -"bundle only changesets with local revision number greater than REV which are " -"not descendants of REV (DEPRECATED)" -msgstr "" -"指定リビジョンよりリビジョン番å·ãŒå¤§ããåå«ä»¥å¤–ã®ã‚‚ã®ã‚’ bundle 化(éžæŽ¨å¥¨)" - -msgid "no backups" -msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã®æŠ‘æ¢" - -msgid "no backups (DEPRECATED)" -msgstr "ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—作æˆã®æŠ‘æ¢(éžæŽ¨å¥¨)" - -msgid "do not modify working copy during strip" -msgstr "処ç†ä¸ã®ä½œæ¥é ˜åŸŸæ›´æ–°ã‚’抑æ¢" - -msgid "hg strip [-k] [-f] [-n] REV..." -msgstr "hg strip [-k] [-f] [-n] REV..." - -msgid "hg qtop [-s]" -msgstr "hg qtop [-s]" - -msgid "show only the first patch" -msgstr "最åˆã®æœªé©ç”¨ãƒ‘ッãƒã®ã¿ã‚’表示" - -msgid "hg qunapplied [-1] [-s] [PATCH]" -msgstr "hg qunapplied [-1] [-s] [PATCH]" - -msgid "finish all applied changesets" -msgstr "å…¨ã¦ã®é©ç”¨ä¸ãƒ‘ッãƒã‚’通常リビジョン化" - -msgid "hg qfinish [-a] [REV]..." -msgstr "hg qfinish [-a] [REV]..." - -msgid "list all available queues" -msgstr "有効ãªã‚ューã®ä¸€è¦§è¡¨ç¤º" - -msgid "create new queue" -msgstr "æ–°è¦ã‚ューã®ä½œæˆ" - -msgid "rename active queue" -msgstr "ç¾è¡Œã‚ューã®æ”¹å" - -msgid "delete reference to queue" -msgstr "ã‚ューã¸ã®å‚ç…§ã®å‰Šé™¤" - -msgid "delete queue, and remove patch dir" -msgstr "ã‚ューãŠã‚ˆã³ç®¡ç†ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã®å‰Šé™¤" - -msgid "[OPTION] [QUEUE]" -msgstr "[OPTION] [QUEUE]" - msgid "hooks for sending email notifications at commit/push time" msgstr "commit/push 契機ã§ã®ãƒ¡ãƒ¼ãƒ«é€šçŸ¥ç”¨ãƒ•ãƒƒã‚¯é›†" @@ -4619,7 +4870,9 @@ " # one email for each incoming changeset\n" " incoming.notify = python:hgext.notify.hook\n" " # batch emails when many changesets incoming at one time\n" -" changegroup.notify = python:hgext.notify.hook" +" changegroup.notify = python:hgext.notify.hook\n" +" # batch emails when many changesets outgoing at one time (client side)\n" +" outgoing.notify = python:hgext.notify.hook" msgstr "" msgid "" @@ -4643,7 +4896,8 @@ " style = ... # style file to use when formatting email\n" " template = ... # template to use when formatting email\n" " incoming = ... # template to use when run as incoming hook\n" -" changegroup = ... # template when run as changegroup hook\n" +" outgoing = ... # template to use when run as outgoing hook\n" +" changegroup = ... # template to use when run as changegroup hook\n" " maxdiff = 300 # max lines of diffs to include (0=none, -1=all)\n" " maxsubject = 67 # truncate subject line longer than this\n" " diffstat = True # add a diffstat before the diff content\n" @@ -4779,32 +5033,6 @@ msgid "when to paginate (boolean, always, auto, or never)" msgstr "" -msgid "interpret suffixes to refer to ancestor revisions" -msgstr "祖先リビジョンå‚ç…§ã®ãŸã‚ã®æŽ¥å°¾è¾žã®è§£é‡ˆ" - -msgid "" -"This extension allows you to use git-style suffixes to refer to the\n" -"ancestors of a specific revision." -msgstr "" - -msgid "For example, if you can refer to a revision as \"foo\", then::" -msgstr "" - -msgid "" -" foo^N = Nth parent of foo\n" -" foo^0 = foo\n" -" foo^1 = first parent of foo\n" -" foo^2 = second parent of foo\n" -" foo^ = foo^1" -msgstr "" - -msgid "" -" foo~N = Nth first grandparent of foo\n" -" foo~0 = foo\n" -" foo~1 = foo^1 = foo^ = first parent of foo\n" -" foo~2 = foo^1^1 = foo^^ = first parent of first parent of foo\n" -msgstr "" - msgid "command to send changesets as (a series of) patch emails" msgstr "é›»åメールã«ã‚ˆã‚‹å¤‰æ›´å†…容パッãƒé€ä»˜ã®ã‚³ãƒžãƒ³ãƒ‰" @@ -4843,11 +5071,11 @@ "メールアーカイブã«ãŠã„ã¦ã¯ã€ 一連ã®ã‚¹ãƒ¬ãƒƒãƒ‰ã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚" msgid "" -"To configure other defaults, add a section like this to your hgrc\n" -"file::" -msgstr "" -"以下ã®æ§˜ãªè¨˜è¿°ã‚’è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«è¿½åŠ ã™ã‚‹ã“ã¨ã§ã€ 無指定時ã®è¨å®šã‚’変更ã§ã\n" -"ã¾ã™::" +"To configure other defaults, add a section like this to your\n" +"configuration file::" +msgstr "" +"以下ã®æ§˜ãªè¨˜è¿°ã‚’è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«è¿½åŠ ã™ã‚‹ã“ã¨ã§ã€\n" +"無指定時ã®è¨å®šã‚’変更ã§ãã¾ã™::" msgid "" " [email]\n" @@ -4898,6 +5126,81 @@ msgid "Please enter a valid value.\n" msgstr "é©åˆ‡ãªå€¤ã‚’入力ã—ã¦ãã ã•ã„。\n" +msgid "send patches as attachments" +msgstr "添付ファイルã¨ã—ã¦ãƒ‘ッãƒã‚’é€ä¿¡" + +msgid "send patches as inline attachments" +msgstr "インライン添付ファイルã¨ã—ã¦ãƒ‘ッãƒã‚’é€ä¿¡" + +msgid "email addresses of blind carbon copy recipients" +msgstr "BCC 宛先ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹" + +msgid "email addresses of copy recipients" +msgstr "CC 宛先ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹" + +msgid "ask for confirmation before sending" +msgstr "é€ä¿¡å‰ã«ç¢ºèªã‚’実施" + +msgid "add diffstat output to messages" +msgstr "差分統計を出力ã«è¿½åŠ " + +msgid "use the given date as the sending date" +msgstr "メール㮠Date ヘッダ値ã«æŒ‡å®šæ—¥æ™‚ã‚’è¨å®š" + +msgid "use the given file as the series description" +msgstr "指定ファイルã®å†…容を説明文ã¨ã—ã¦ä½¿ç”¨" + +msgid "email address of sender" +msgstr "メール㮠From ヘッダ値" + +msgid "print messages that would be sent" +msgstr "é€ä¿¡äºˆå®šã®ãƒ¡ãƒ¼ãƒ«ã®å†…容を表示" + +msgid "write messages to mbox file instead of sending them" +msgstr "メールé€ä¿¡ã®ä»£ã‚ã‚Šã«ã€ mbox ファイルã«æ›¸ã出ã™" + +msgid "email addresses replies should be sent to" +msgstr "返信メールã®é€ä»˜å…ˆã‚¢ãƒ‰ãƒ¬ã‚¹" + +msgid "subject of first message (intro or single patch)" +msgstr "説明文ãªã„ã—å˜ä¸€ãƒ‘ッãƒé€ä¿¡ãƒ¡ãƒ¼ãƒ«ã® Subject ヘッダ値" + +msgid "message identifier to reply to" +msgstr "返信対象ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ID" + +msgid "flags to add in subject prefixes" +msgstr "subject 欄ã«ä»˜ä¸Žã™ã‚‹ãƒ•ãƒ©ã‚°" + +msgid "email addresses of recipients" +msgstr "TO 宛先ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹" + +msgid "omit hg patch header" +msgstr "Mercurial 固有ã®ãƒ‘ッãƒãƒ˜ãƒƒãƒ€ã‚’çœç•¥" + +msgid "send changes not found in the target repository" +msgstr "対象リãƒã‚¸ãƒˆãƒªã«ç„¡ã„リビジョンをパッãƒå½¢å¼ã§é€ä¿¡" + +msgid "send changes not in target as a binary bundle" +msgstr "対象リãƒã‚¸ãƒˆãƒªã«ç„¡ã„リビジョンをãƒãƒ³ãƒ‰ãƒ«å½¢å¼ã§é€ä¿¡" + +msgid "name of the bundle attachment file" +msgstr "ãƒãƒ³ãƒ‰ãƒ«å½¢å¼æ·»ä»˜ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ«å" + +msgid "a revision to send" +msgstr "é€ä¿¡ã™ã‚‹ãƒªãƒ“ジョン" + +msgid "run even when remote repository is unrelated (with -b/--bundle)" +msgstr "連æºå…ˆãŒç„¡é–¢ä¿‚ãªãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚é€ä¿¡(-b/--bundle 指定時)" + +msgid "a base changeset to specify instead of a destination (with -b/--bundle)" +msgstr "連æºå…ˆæŒ‡å®šã®ä»£ã‚ã‚Šã¨ãªã‚‹åŸºåº•ãƒªãƒ“ジョン(-b/--bundle 指定時)" + +msgid "send an introduction email for a single patch" +msgstr "説明文を独立ã—ãŸãƒ¡ãƒ¼ãƒ«ã§é€ä¿¡" + +msgid "hg email [OPTION]... [DEST]..." +msgstr "hg email [OPTION]... [DEST]...\"" + msgid "send changesets by email" msgstr "é›»åメールã«ã‚ˆã‚‹å¤‰æ›´å†…容ã®ãƒ‘ッãƒé€ä»˜" @@ -4999,6 +5302,8 @@ " In case email sending fails, you will find a backup of your series\n" " introductory message in ``.hg/last-email.txt``." msgstr "" +" メールé€ä¿¡ã«å¤±æ•—ã—ãŸå ´åˆã€\n" +" 導入メッセージ㯠``.hg/last-email.txt`` ã«ä¿å˜ã•ã‚Œã¾ã™ã€‚" msgid "" " hg email -r 3000 # send patch 3000 only\n" @@ -5123,81 +5428,6 @@ msgid "sending" msgstr "é€ä¿¡ä¸" -msgid "send patches as attachments" -msgstr "添付ファイルã¨ã—ã¦ãƒ‘ッãƒã‚’é€ä¿¡" - -msgid "send patches as inline attachments" -msgstr "インライン添付ファイルã¨ã—ã¦ãƒ‘ッãƒã‚’é€ä¿¡" - -msgid "email addresses of blind carbon copy recipients" -msgstr "BCC 宛先ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹" - -msgid "email addresses of copy recipients" -msgstr "CC 宛先ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹" - -msgid "ask for confirmation before sending" -msgstr "é€ä¿¡å‰ã«ç¢ºèªã‚’実施" - -msgid "add diffstat output to messages" -msgstr "差分統計を出力ã«è¿½åŠ " - -msgid "use the given date as the sending date" -msgstr "メール㮠Date ヘッダ値ã«æŒ‡å®šæ—¥æ™‚ã‚’è¨å®š" - -msgid "use the given file as the series description" -msgstr "指定ファイルã®å†…容を説明文ã¨ã—ã¦ä½¿ç”¨" - -msgid "email address of sender" -msgstr "メール㮠From ヘッダ値" - -msgid "print messages that would be sent" -msgstr "é€ä¿¡äºˆå®šã®ãƒ¡ãƒ¼ãƒ«ã®å†…容を表示" - -msgid "write messages to mbox file instead of sending them" -msgstr "メールé€ä¿¡ã®ä»£ã‚ã‚Šã«ã€ mbox ファイルã«æ›¸ã出ã™" - -msgid "email addresses replies should be sent to" -msgstr "返信メールã®é€ä»˜å…ˆã‚¢ãƒ‰ãƒ¬ã‚¹" - -msgid "subject of first message (intro or single patch)" -msgstr "説明文ãªã„ã—å˜ä¸€ãƒ‘ッãƒé€ä¿¡ãƒ¡ãƒ¼ãƒ«ã® Subject ヘッダ値" - -msgid "message identifier to reply to" -msgstr "返信対象ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ID" - -msgid "flags to add in subject prefixes" -msgstr "subject 欄ã«ä»˜ä¸Žã™ã‚‹ãƒ•ãƒ©ã‚°" - -msgid "email addresses of recipients" -msgstr "TO 宛先ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹" - -msgid "omit hg patch header" -msgstr "Mercurial 固有ã®ãƒ‘ッãƒãƒ˜ãƒƒãƒ€ã‚’çœç•¥" - -msgid "send changes not found in the target repository" -msgstr "対象リãƒã‚¸ãƒˆãƒªã«ç„¡ã„リビジョンをパッãƒå½¢å¼ã§é€ä¿¡" - -msgid "send changes not in target as a binary bundle" -msgstr "対象リãƒã‚¸ãƒˆãƒªã«ç„¡ã„リビジョンをãƒãƒ³ãƒ‰ãƒ«å½¢å¼ã§é€ä¿¡" - -msgid "name of the bundle attachment file" -msgstr "ãƒãƒ³ãƒ‰ãƒ«å½¢å¼æ·»ä»˜ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ•ã‚¡ã‚¤ãƒ«å" - -msgid "a revision to send" -msgstr "é€ä¿¡ã™ã‚‹ãƒªãƒ“ジョン" - -msgid "run even when remote repository is unrelated (with -b/--bundle)" -msgstr "連æºå…ˆãŒç„¡é–¢ä¿‚ãªãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚é€ä¿¡(-b/--bundle 指定時)" - -msgid "a base changeset to specify instead of a destination (with -b/--bundle)" -msgstr "連æºå…ˆæŒ‡å®šã®ä»£ã‚ã‚Šã¨ãªã‚‹åŸºåº•ãƒªãƒ“ジョン(-b/--bundle 指定時)" - -msgid "send an introduction email for a single patch" -msgstr "説明文を独立ã—ãŸãƒ¡ãƒ¼ãƒ«ã§é€ä¿¡" - -msgid "hg email [OPTION]... [DEST]..." -msgstr "hg email [OPTION]... [DEST]...\"" - msgid "show progress bars for some actions" msgstr "処ç†ã«ãŠã‘る進æ—状æ³è¡¨ç¤º" @@ -5226,9 +5456,9 @@ msgid "" "Valid entries for the format field are topic, bar, number, unit,\n" -"estimate, and item. item defaults to the last 20 characters of the\n" -"item, but this can be changed by adding either ``-<num>`` which would\n" -"take the last num characters, or ``+<num>`` for the first num\n" +"estimate, speed, and item. item defaults to the last 20 characters of\n" +"the item, but this can be changed by adding either ``-<num>`` which\n" +"would take the last num characters, or ``+<num>`` for the first num\n" "characters.\n" msgstr "" @@ -5262,6 +5492,10 @@ msgid "%dy%02dw" msgstr "" +#, python-format +msgid "%d %s/sec" +msgstr "" + msgid "command to delete untracked files from the working directory" msgstr "作æ¥é ˜åŸŸä¸ã®æœªç™»éŒ²ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰" @@ -5265,6 +5499,21 @@ msgid "command to delete untracked files from the working directory" msgstr "作æ¥é ˜åŸŸä¸ã®æœªç™»éŒ²ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰" +msgid "abort if an error occurs" +msgstr "エラーãŒç™ºç”Ÿã—ãŸå ´åˆã€ ä¸æ–ã™ã‚‹" + +msgid "purge ignored files too" +msgstr "無視ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚‚削除ã™ã‚‹" + +msgid "print filenames instead of deleting them" +msgstr "ファイル削除ã®å¤‰ã‚ã‚Šã«ãƒ•ã‚¡ã‚¤ãƒ«å表示を実施" + +msgid "end filenames with NUL, for use with xargs (implies -p/--print)" +msgstr "ファイルåã‚’NULæ–‡å—(0x00)ã§çµ‚端(xargs -p/--print ã¨ã®ä½µç”¨å‘ã‘)" + +msgid "hg purge [OPTION]... [DIR]..." +msgstr "hg purge [OPTION]... [DIR]...\"" + msgid "removes files not tracked by Mercurial" msgstr "Mercurial ã«ã‚ˆã‚‹ç®¡ç†å¯¾è±¡ã§ã¯ãªã„ファイルã®å‰Šé™¤" @@ -5320,21 +5569,6 @@ msgid "Removing directory %s\n" msgstr "ディレクトリ %s を削除ã—ã¦ã„ã¾ã™\n" -msgid "abort if an error occurs" -msgstr "エラーãŒç™ºç”Ÿã—ãŸå ´åˆã€ ä¸æ–ã™ã‚‹" - -msgid "purge ignored files too" -msgstr "無視ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚‚削除ã™ã‚‹" - -msgid "print filenames instead of deleting them" -msgstr "ファイル削除ã®å¤‰ã‚ã‚Šã«ãƒ•ã‚¡ã‚¤ãƒ«å表示を実施" - -msgid "end filenames with NUL, for use with xargs (implies -p/--print)" -msgstr "ファイルåã‚’NULæ–‡å—(0x00)ã§çµ‚端(xargs -p/--print ã¨ã®ä½µç”¨å‘ã‘)" - -msgid "hg purge [OPTION]... [DIR]..." -msgstr "hg purge [OPTION]... [DIR]...\"" - msgid "command to move sets of revisions to a different ancestor" msgstr "一連ã®ãƒªãƒ“ジョンを異ãªã‚‹å±¥æ´ãƒ„リー上ã®ä½ç½®ã«ç§»å‹•ã•ã›ã‚‹ã‚³ãƒžãƒ³ãƒ‰" @@ -5352,6 +5586,51 @@ "詳細ã¯ä»¥ä¸‹ã‚’å‚ç…§ã—ã¦ãã ã•ã„:\n" "http://mercurial.selenic.com/wiki/RebaseExtension\n" +msgid "rebase from the specified changeset" +msgstr "指定リビジョンã‹ã‚‰ç§»å‹•" + +msgid "" +"rebase from the base of the specified changeset (up to greatest common " +"ancestor of base and dest)" +msgstr "指定リビジョンã®å…ˆç¥–ã‹ã‚‰ç§»å‹• (移動先ã¨ã®å…±é€šç¥–å…ˆã¾ã§é¡ã‚Šã¾ã™)" + +msgid "rebase onto the specified changeset" +msgstr "複製先リビジョン" + +msgid "collapse the rebased changesets" +msgstr "リベース後ã«ç§»å‹•ãƒªãƒ“ジョンをå˜ä¸€åŒ–" + +msgid "use text as collapse commit message" +msgstr "指定テã‚ストをè¦ç´„コミットメッセージã¨ã—ã¦ä½¿ç”¨" + +msgid "read collapse commit message from file" +msgstr "è¦ç´„コミットメッセージをファイルã‹ã‚‰èªã¿è¾¼ã¿" + +msgid "keep original changesets" +msgstr "元リビジョンをç¶æŒ" + +msgid "keep original branch names" +msgstr "元ブランãƒåã‚’ç¶æŒ" + +msgid "force detaching of source from its original branch" +msgstr "リベース元を元ブランãƒã‹ã‚‰å¼·åˆ¶çš„ã«ç§»å‹•" + +msgid "specify merge tool" +msgstr "マージツールã®æŒ‡å®š" + +msgid "continue an interrupted rebase" +msgstr "ä¸æ–ã•ã‚ŒãŸãƒªãƒ™ãƒ¼ã‚¹ã‚’å†é–‹" + +msgid "abort an interrupted rebase" +msgstr "ä¸æ–ã•ã‚ŒãŸãƒªãƒ™ãƒ¼ã‚¹ã‚’ä¸æ¢" + +msgid "" +"hg rebase [-s REV | -b REV] [-d REV] [options]\n" +"hg rebase {-a|-c}" +msgstr "" +"hg rebase [-s REV | -b REV] [-d REV] [options]\n" +"hg rebase {-a|-c}" + msgid "move changeset (and descendants) to a different branch" msgstr "別ãªå±¥æ´ä½ç½®ã¸ã®ãƒªãƒ“ジョン(ãŠã‚ˆã³ãã®åå«)ã®ç§»å‹•" @@ -5448,7 +5727,10 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠移æ¤ãŒå®Ÿæ–½ã•ã‚Œãªã„å ´åˆã¯ 1 ã§ã™ã€‚\n" " " +msgid "message can only be specified with collapse" +msgstr "" + msgid "cannot use both abort and continue" msgstr "--abort 㨠--continue ã¯ä½µç”¨ã§ãã¾ã›ã‚“" msgid "cannot use collapse with continue or abort" @@ -5451,7 +5733,7 @@ msgid "cannot use both abort and continue" msgstr "--abort 㨠--continue ã¯ä½µç”¨ã§ãã¾ã›ã‚“" msgid "cannot use collapse with continue or abort" -msgstr "--collapse 㯠--abort ã‚„ --continue ã¨ä½µç”¨ã§ãã¾ã›ã‚“" +msgstr "--collapse ã¨ã€ --abort ã‚„ --continue ã¯ä½µç”¨ã§ãã¾ã›ã‚“" msgid "cannot use detach with continue or abort" @@ -5456,5 +5738,5 @@ msgid "cannot use detach with continue or abort" -msgstr "--detach 㯠--abort ã‚„ --continue ã¨ä½µç”¨ã§ãã¾ã›ã‚“" +msgstr "--detach ã¨ã€ --abort ã‚„ --continue ã¯ä½µç”¨ã§ãã¾ã›ã‚“" msgid "abort and continue do not allow specifying revisions" @@ -5459,6 +5741,9 @@ msgid "abort and continue do not allow specifying revisions" -msgstr "--abort ã‚„ --continue ã¯ã€ りビジョン指定ã¨ä½µç”¨ã§ãã¾ã›ã‚“" +msgstr "--abort ã‚„ --continue ã¨ã€ りビジョン指定ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "tool option will be ignored\n" +msgstr "" msgid "cannot specify both a revision and a base" msgstr "--soruce 㨠--base ã¯ä½µç”¨ã§ãã¾ã›ã‚“" @@ -5472,9 +5757,6 @@ msgid "nothing to rebase\n" msgstr "リベースã®å¿…è¦ã¯ã‚ã‚Šã¾ã›ã‚“\n" -msgid "cannot use both keepbranches and extrafn" -msgstr "--keepbranches 㨠--extrafn ã¯ä½µç”¨ã§ãã¾ã›ã‚“" - msgid "rebasing" msgstr "リベース実施ä¸" @@ -5482,7 +5764,7 @@ msgstr "ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ" msgid "unresolved conflicts (see hg resolve, then hg rebase --continue)" -msgstr "è¡çªãŒæœªè§£æ±ºã§ã™ (:hg:`resolve` 㨠:hg:`rebase --continue` å‚ç…§)" +msgstr "è¡çªãŒæœªè§£æ¶ˆã§ã™ (:hg:`resolve` 㨠:hg:`rebase --continue` å‚ç…§)" #, python-format msgid "no changes, revision %d skipped\n" @@ -5526,6 +5808,9 @@ msgid "source is descendant of destination" msgstr "移動元ã¯ç§»å‹•å…ˆã®åå«ã§ã™" +msgid "--tool can only be used with --rebase" +msgstr "--tool 㯠--rebase 指定時ã«ã—ã‹ä½¿ç”¨å‡ºæ¥ã¾ã›ã‚“" + msgid "rebase working directory to branch head" msgstr "作æ¥é ˜åŸŸã‚’ブランãƒãƒ˜ãƒƒãƒ‰ã«ãƒªãƒ™ãƒ¼ã‚¹" @@ -5529,42 +5814,9 @@ msgid "rebase working directory to branch head" msgstr "作æ¥é ˜åŸŸã‚’ブランãƒãƒ˜ãƒƒãƒ‰ã«ãƒªãƒ™ãƒ¼ã‚¹" -msgid "rebase from the specified changeset" -msgstr "指定リビジョンã‹ã‚‰ç§»å‹•" - -msgid "" -"rebase from the base of the specified changeset (up to greatest common " -"ancestor of base and dest)" -msgstr "指定リビジョンã®å…ˆç¥–ã‹ã‚‰ç§»å‹• (移動先ã¨ã®å…±é€šç¥–å…ˆã¾ã§é¡ã‚Šã¾ã™)" - -msgid "rebase onto the specified changeset" -msgstr "複製先リビジョン" - -msgid "collapse the rebased changesets" -msgstr "リベース後ã«ç§»å‹•ãƒªãƒ“ジョンをå˜ä¸€åŒ–" - -msgid "keep original changesets" -msgstr "元リビジョンをç¶æŒ" - -msgid "keep original branch names" -msgstr "元ブランãƒåã‚’ç¶æŒ" - -msgid "force detaching of source from its original branch" -msgstr "リベース元を元ブランãƒã‹ã‚‰å¼·åˆ¶çš„ã«ç§»å‹•" - -msgid "continue an interrupted rebase" -msgstr "ä¸æ–ã•ã‚ŒãŸãƒªãƒ™ãƒ¼ã‚¹ã‚’å†é–‹" - -msgid "abort an interrupted rebase" -msgstr "ä¸æ–ã•ã‚ŒãŸãƒªãƒ™ãƒ¼ã‚¹ã‚’ä¸æ¢" - -msgid "" -"hg rebase [-s REV | -b REV] [-d REV] [options]\n" -"hg rebase {-a|-c}" -msgstr "" -"hg rebase [-s REV | -b REV] [-d REV] [options]\n" -"hg rebase {-a|-c}" +msgid "specify merge tool for rebase" +msgstr "リベース用ã®ãƒžãƒ¼ã‚¸ãƒ„ールã®æŒ‡å®š" msgid "commands to interactively select changes for commit/qrefresh" msgstr "commit ã¾ãŸã¯ qrefresh 実行時ã«å¯¾è©±çš„ãªå¤‰æ›´é¸æŠžã‚’è¡Œã†ã‚³ãƒžãƒ³ãƒ‰" @@ -5567,7 +5819,16 @@ msgid "commands to interactively select changes for commit/qrefresh" msgstr "commit ã¾ãŸã¯ qrefresh 実行時ã«å¯¾è©±çš„ãªå¤‰æ›´é¸æŠžã‚’è¡Œã†ã‚³ãƒžãƒ³ãƒ‰" +msgid "ignore white space when comparing lines" +msgstr "差分判定ã®éš›ã«ç©ºç™½æ–‡å—を無視" + +msgid "ignore changes in the amount of white space" +msgstr "差分判定ã®éš›ã«ç©ºç™½æ–‡å—ã®æ•°ã‚’無視" + +msgid "ignore changes whose lines are all blank" +msgstr "差分判定ã®éš›ã«ç©ºç™½è¡Œã‚’無視" + msgid "this modifies a binary file (all or nothing)\n" msgstr "ã“ã‚Œã¯ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã™ã‚‹å¤‰æ›´ã§ã™(部分的ãªé¸æŠžã¯ä¸å¯èƒ½)\n" @@ -5623,6 +5884,9 @@ msgid "record change %d/%d to %r?" msgstr "ã“ã®å¤‰æ›´ (%d 件目 / %d 件ä¸) ã‚’ %r ã«è¨˜éŒ²ã—ã¾ã™ã‹ï¼Ÿ" +msgid "hg record [OPTION]... [FILE]..." +msgstr "hg record [OPTION]... [FILE]..." + msgid "interactively select changes to commit" msgstr "コミットã™ã‚‹å†…容を対話的ã«é¸æŠžã—ã¾ã™" @@ -5671,6 +5935,17 @@ msgid " This command is not available when committing a merge." msgstr " 本コマンドをマージã®ã‚³ãƒŸãƒƒãƒˆã«ä½¿ç”¨ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。" +msgid "interactively record a new patch" +msgstr "æ–°è¦ãƒ‘ッãƒã®ã‚³ãƒŸãƒƒãƒˆå†…容を対話的ã«é¸æŠž" + +msgid "" +" See :hg:`help qnew` & :hg:`help record` for more information and\n" +" usage.\n" +" " +msgstr "" +" 用法ç‰ã®è©³ç´°ã¯ :hg:`help qnew` ãŠã‚ˆã³ :hg:`help record`\n" +" ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + msgid "'mq' extension not loaded" msgstr "'mq' エクステンションãŒèªã¿è¾¼ã¾ã‚Œã¦ã„ã¾ã›ã‚“" @@ -5674,8 +5949,9 @@ msgid "'mq' extension not loaded" msgstr "'mq' エクステンションãŒèªã¿è¾¼ã¾ã‚Œã¦ã„ã¾ã›ã‚“" -msgid "running non-interactively, use commit instead" -msgstr "éžå¯¾è©±çš„ã«å®Ÿè¡Œã™ã‚‹å ´åˆã¯ commit を使用ã—ã¦ãã ã•ã„" +#, python-format +msgid "running non-interactively, use %s instead" +msgstr "éžå¯¾è©±çš„ã«å®Ÿè¡Œã™ã‚‹å ´åˆã¯ã€%s を使用ã—ã¦ãã ã•ã„" msgid "cannot partially commit a merge (use \"hg commit\" instead)" msgstr "マージã®éƒ¨åˆ†ã‚³ãƒŸãƒƒãƒˆã¯ã§ãã¾ã›ã‚“ (\"hg commit\" を使用ã—ã¦ãã ã•ã„)" @@ -5683,9 +5959,6 @@ msgid "no changes to record\n" msgstr "記録å¯èƒ½ãªå¤‰æ›´ãŒã‚ã‚Šã¾ã›ã‚“\n" -msgid "hg record [OPTION]... [FILE]..." -msgstr "hg record [OPTION]... [FILE]..." - msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "hg qrecord [OPTION]... PATCH [FILE]..." @@ -5689,6 +5962,9 @@ msgid "hg qrecord [OPTION]... PATCH [FILE]..." msgstr "hg qrecord [OPTION]... PATCH [FILE]..." +msgid "interactively select changes to refresh" +msgstr "パッãƒæ›´æ–°å†…容内容を対話的ã«é¸æŠž" + msgid "recreates hardlinks between repository clones" msgstr "複製リãƒã‚¸ãƒˆãƒªé–“ã§ã®ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ã®å†ç”Ÿæˆ" @@ -5733,7 +6009,11 @@ msgid "hardlinks are not supported on this system" msgstr "ã“ã®ã‚·ã‚¹ãƒ†ãƒ 上ã§ã¯ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ãŒæœªã‚µãƒãƒ¼ãƒˆã§ã™" +#, fuzzy +msgid "must specify local origin repository" +msgstr "%s ã¯ãƒãƒ¼ã‚«ãƒ«ã® Mercurial リãƒã‚¸ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“" + #, python-format msgid "relinking %s to %s\n" msgstr "%s ã‹ã‚‰ %s ã«ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ä¸\n" @@ -5736,7 +6016,11 @@ #, python-format msgid "relinking %s to %s\n" msgstr "%s ã‹ã‚‰ %s ã«ãƒãƒ¼ãƒ‰ãƒªãƒ³ã‚¯ä¸\n" +#, fuzzy +msgid "there is nothing to relink\n" +msgstr "マージã®å¿…è¦ãŒã‚ã‚Šã¾ã›ã‚“" + #, python-format msgid "tip has %d files, estimated total number of files: %s\n" msgstr "" @@ -5754,10 +6038,6 @@ msgid "source and destination are on different devices" msgstr "リンク元ã¨ãƒªãƒ³ã‚¯å…ˆãŒåŒä¸€ãƒ•ã‚¡ã‚¤ãƒ«ã‚·ã‚¹ãƒ†ãƒ 上ã«ã‚ã‚Šã¾ã›ã‚“" -#, python-format -msgid "not linkable: %s\n" -msgstr "リンクä¸å¯ãƒ•ã‚¡ã‚¤ãƒ«: %s\n" - msgid "pruning" msgstr "刈り込ã¿ä¸" @@ -5768,8 +6048,8 @@ msgid "relinking" msgstr "å†ãƒªãƒ³ã‚¯ä¸" -#, python-format -msgid "relinked %d files (%d bytes reclaimed)\n" +#, fuzzy, python-format +msgid "relinked %d files (%s reclaimed)\n" msgstr "%d ファイルをå†ãƒªãƒ³ã‚¯(%d ãƒã‚¤ãƒˆã®ç¯€ç´„)\n" msgid "[ORIGIN]" @@ -5829,6 +6109,10 @@ "same name.\n" msgstr "" +#, python-format +msgid "custom scheme %s:// conflicts with drive letter %s:\\\n" +msgstr "" + msgid "share a common history between several working directories" msgstr "複数作æ¥é ˜åŸŸã«ã‚ˆã‚‹å±¥æ´æƒ…å ±é ˜åŸŸã®å…±æœ‰" @@ -5921,6 +6205,9 @@ msgid "commit failed" msgstr "コミットã«å¤±æ•—" +msgid "filter corrupted changeset (no user or date)" +msgstr "" + msgid "" "y: transplant this changeset\n" "n: skip this changeset\n" @@ -5944,105 +6231,6 @@ msgid "no such option\n" msgstr "ãã®ã‚ˆã†ãªã‚ªãƒ—ションã¯ã‚ã‚Šã¾ã›ã‚“\n" -msgid "transplant changesets from another branch" -msgstr "別ã®ãƒ–ランãƒã¸ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ç§»æ¤" - -msgid "" -" Selected changesets will be applied on top of the current working\n" -" directory with the log of the original changeset. If --log is\n" -" specified, log messages will have a comment appended of the form::" -msgstr "" -" é¸æŠžã•ã‚ŒãŸãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã¯ã€ å…ƒãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ã‚³ãƒŸãƒƒãƒˆãƒã‚°ã¨ä¸€ç·’ã«\n" -" ç¾åœ¨ã®ä½œæ¥é ˜åŸŸä¸Šã«é©ç”¨ã•ã‚Œã¾ã™ã€‚ --log 指定ãŒã‚ã‚‹å ´åˆã€ 以下ã®å½¢å¼ã®\n" -" メッセージãŒè¿½åŠ ã•ã‚Œã¾ã™::" - -msgid " (transplanted from CHANGESETHASH)" -msgstr " (transplanted from CHANGESETHASH)" - -msgid "" -" You can rewrite the changelog message with the --filter option.\n" -" Its argument will be invoked with the current changelog message as\n" -" $1 and the patch as $2." -msgstr "" -" --filter ã«ã‚ˆã‚Šã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’改変ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 指定ã•ã‚ŒãŸå€¤ã¯\n" -" コマンド起動ã«ä½¿ç”¨ã•ã‚Œã€ 第1引数ã«ã¯ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã€ 第2引数ã«ã¯\n" -" パッãƒãŒæŒ‡å®šã•ã‚Œã¾ã™ã€‚" - -msgid "" -" If --source/-s is specified, selects changesets from the named\n" -" repository. If --branch/-b is specified, selects changesets from\n" -" the branch holding the named revision, up to that revision. If\n" -" --all/-a is specified, all changesets on the branch will be\n" -" transplanted, otherwise you will be prompted to select the\n" -" changesets you want." -msgstr "" -" --source/-s ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ç§»æ¤ã•ã‚Œã¾ã™ã€‚\n" -" --branch/-b ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã®åå‰ã‚’æŒã¤ãƒ–ランãƒã‹ã‚‰ç§»æ¤\n" -" ã•ã‚Œã¾ã™ã€‚ --all/-a ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸãƒ–ランãƒä¸ã®å…¨ã¦ã®\n" -" ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆãŒç§»æ¤å¯¾å‡¦ã¨ãªã‚Šã€ ãれ以外ã®å ´åˆã¯ç§»æ¤å¯¾è±¡ã¨ã™ã‚‹\n" -" ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®å•ã„åˆã‚ã›ãŒã‚ã‚Šã¾ã™ã€‚" - -msgid "" -" :hg:`transplant --branch REVISION --all` will rebase the selected\n" -" branch (up to the named revision) onto your current working\n" -" directory." -msgstr "" -" :hg:`transplant --branch REVISION --all` å½¢å¼ã§ã®èµ·å‹•ã®å ´åˆã€\n" -" 指定 REVISION ã¾ã§ã®ãƒ–ランãƒå…¨ä½“ãŒã€ ç¾åœ¨ã®ä½œæ¥é ˜åŸŸä¸Šã«ç§»æ¤ã•ã‚Œã¾ã™ã€‚" - -msgid "" -" You can optionally mark selected transplanted changesets as merge\n" -" changesets. You will not be prompted to transplant any ancestors\n" -" of a merged transplant, and you can merge descendants of them\n" -" normally instead of transplanting them." -msgstr "" -" é¸æŠžã—ãŸå¯¾è±¡ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ç§»æ¤ã‚’〠マージ実施ã¨ã¿ãªã™ã“ã¨ã‚‚å¯èƒ½\n" -" ã§ã™ã€‚ 移æ¤ã®éš›ã«ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã«é–¢ã™ã‚‹å•ã„åˆã‚ã›ã¯ç„¡ã〠移æ¤\n" -" 後ã®ç§»æ¤å…ƒã®åå«ã«å¯¾ã—ã¦ã¯ã€ 移æ¤ã§ã¯ãªã通常ã®ãƒžãƒ¼ã‚¸ãŒå¯èƒ½ã§ã™ã€‚" - -msgid "" -" If no merges or revisions are provided, :hg:`transplant` will\n" -" start an interactive changeset browser." -msgstr "" -" マージ対象もリビジョン指定もãªã„å ´åˆã€ :hg:`transplant` ã¯å¯¾è©±çš„ã«\n" -" 移æ¤ã‚’è¡Œãªã„ã¾ã™ã€‚" - -msgid "" -" If a changeset application fails, you can fix the merge by hand\n" -" and then resume where you left off by calling :hg:`transplant\n" -" --continue/-c`.\n" -" " -msgstr "" -" 移æ¤ã«å¤±æ•—ã—ãŸå ´åˆã€ 手動ã§ã®è¡çªè§£æ¶ˆå¾Œã« :hg:`transplant\n" -" --continue/-c` を実行ã™ã‚‹ã“ã¨ã§ã€ ä¸æ–ã•ã‚ŒãŸç§»æ¤ã‚’å†é–‹å¯èƒ½ã§ã™ã€‚\n" -" " - -msgid "--continue is incompatible with branch, all or merge" -msgstr "--continue 㯠--branch〠--all〠--merge ã¨ä½µç”¨ã§ãã¾ã›ã‚“" - -msgid "no source URL, branch tag or revision list provided" -msgstr "å…ƒ URL〠ブランãƒã‚¿ã‚°ã€ リビジョン指定ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œã¦ã„ã¾ã›ã‚“" - -msgid "--all requires a branch revision" -msgstr "--all 指定ã«ã¯ãƒ–ランãƒãƒªãƒ“ジョンãŒå¿…è¦ã§ã™" - -msgid "--all is incompatible with a revision list" -msgstr "--all ã¨ãƒªãƒ“ジョン指定ã¯ä½µç”¨ã§ãã¾ã›ã‚“" - -msgid "no revision checked out" -msgstr "作æ¥é ˜åŸŸãŒæœªæ›´æ–°ã§ã™" - -msgid "outstanding uncommitted merges" -msgstr "マージãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™" - -msgid "outstanding local changes" -msgstr "未コミットã®å¤‰æ›´ãŒã‚ã‚Šã¾ã™" - -msgid "" -"``transplanted(set)``\n" -" Transplanted changesets in set." -msgstr "" - msgid "pull patches from REPO" msgstr "パッãƒå–ã‚Šè¾¼ã¿å…ƒãƒªãƒã‚¸ãƒˆãƒªã®æŒ‡å®š" @@ -6073,6 +6261,112 @@ msgid "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." msgstr "hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgid "transplant changesets from another branch" +msgstr "別ã®ãƒ–ランãƒã¸ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ç§»æ¤" + +msgid "" +" Selected changesets will be applied on top of the current working\n" +" directory with the log of the original changeset. The changesets\n" +" are copied and will thus appear twice in the history. Use the\n" +" rebase extension instead if you want to move a whole branch of\n" +" unpublished changesets." +msgstr "" + +msgid "" +" If --log is specified, log messages will have a comment appended\n" +" of the form::" +msgstr "" + +msgid " (transplanted from CHANGESETHASH)" +msgstr " (transplanted from CHANGESETHASH)" + +msgid "" +" You can rewrite the changelog message with the --filter option.\n" +" Its argument will be invoked with the current changelog message as\n" +" $1 and the patch as $2." +msgstr "" +" --filter ã«ã‚ˆã‚Šã‚³ãƒŸãƒƒãƒˆãƒã‚°ã‚’改変ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ 指定ã•ã‚ŒãŸå€¤ã¯\n" +" コマンド起動ã«ä½¿ç”¨ã•ã‚Œã€ 第1引数ã«ã¯ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã€ 第2引数ã«ã¯\n" +" パッãƒãŒæŒ‡å®šã•ã‚Œã¾ã™ã€‚" + +msgid "" +" If --source/-s is specified, selects changesets from the named\n" +" repository. If --branch/-b is specified, selects changesets from\n" +" the branch holding the named revision, up to that revision. If\n" +" --all/-a is specified, all changesets on the branch will be\n" +" transplanted, otherwise you will be prompted to select the\n" +" changesets you want." +msgstr "" +" --source/-s ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã®ãƒªãƒã‚¸ãƒˆãƒªã‹ã‚‰ç§»æ¤ã•ã‚Œã¾ã™ã€‚\n" +" --branch/-b ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã®åå‰ã‚’æŒã¤ãƒ–ランãƒã‹ã‚‰ç§»æ¤\n" +" ã•ã‚Œã¾ã™ã€‚ --all/-a ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸãƒ–ランãƒä¸ã®å…¨ã¦ã®\n" +" ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆãŒç§»æ¤å¯¾å‡¦ã¨ãªã‚Šã€ ãれ以外ã®å ´åˆã¯ç§»æ¤å¯¾è±¡ã¨ã™ã‚‹\n" +" ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®å•ã„åˆã‚ã›ãŒã‚ã‚Šã¾ã™ã€‚" + +msgid "" +" :hg:`transplant --branch REVISION --all` will transplant the\n" +" selected branch (up to the named revision) onto your current\n" +" working directory." +msgstr "" + +msgid "" +" You can optionally mark selected transplanted changesets as merge\n" +" changesets. You will not be prompted to transplant any ancestors\n" +" of a merged transplant, and you can merge descendants of them\n" +" normally instead of transplanting them." +msgstr "" +" é¸æŠžã—ãŸå¯¾è±¡ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®ç§»æ¤ã‚’〠マージ実施ã¨ã¿ãªã™ã“ã¨ã‚‚å¯èƒ½\n" +" ã§ã™ã€‚ 移æ¤ã®éš›ã«ãƒžãƒ¼ã‚¸å¯¾è±¡ãƒªãƒ“ジョンã«é–¢ã™ã‚‹å•ã„åˆã‚ã›ã¯ç„¡ã〠移æ¤\n" +" 後ã®ç§»æ¤å…ƒã®åå«ã«å¯¾ã—ã¦ã¯ã€ 移æ¤ã§ã¯ãªã通常ã®ãƒžãƒ¼ã‚¸ãŒå¯èƒ½ã§ã™ã€‚" + +msgid "" +" If no merges or revisions are provided, :hg:`transplant` will\n" +" start an interactive changeset browser." +msgstr "" +" マージ対象もリビジョン指定もãªã„å ´åˆã€ :hg:`transplant` ã¯å¯¾è©±çš„ã«\n" +" 移æ¤ã‚’è¡Œãªã„ã¾ã™ã€‚" + +msgid "" +" If a changeset application fails, you can fix the merge by hand\n" +" and then resume where you left off by calling :hg:`transplant\n" +" --continue/-c`.\n" +" " +msgstr "" +" 移æ¤ã«å¤±æ•—ã—ãŸå ´åˆã€ 手動ã§ã®è¡çªè§£æ¶ˆå¾Œã« :hg:`transplant\n" +" --continue/-c` を実行ã™ã‚‹ã“ã¨ã§ã€ ä¸æ–ã•ã‚ŒãŸç§»æ¤ã‚’å†é–‹å¯èƒ½ã§ã™ã€‚\n" +" " + +msgid "--continue is incompatible with branch, all or merge" +msgstr "--continue 㨠--branch〠--all〠--merge ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "no source URL, branch tag or revision list provided" +msgstr "å…ƒ URL〠ブランãƒã‚¿ã‚°ã€ リビジョン指定ã®ã„ãšã‚Œã‚‚指定ã•ã‚Œã¦ã„ã¾ã›ã‚“" + +msgid "--all requires a branch revision" +msgstr "--all 指定ã«ã¯ãƒ–ランãƒãƒªãƒ“ジョンãŒå¿…è¦ã§ã™" + +msgid "--all is incompatible with a revision list" +msgstr "--all ã¨ãƒªãƒ“ジョンリスト指定ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + +msgid "no revision checked out" +msgstr "作æ¥é ˜åŸŸãŒæœªæ›´æ–°ã§ã™" + +msgid "outstanding uncommitted merges" +msgstr "マージãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™" + +msgid "outstanding local changes" +msgstr "未コミットã®å¤‰æ›´ãŒã‚ã‚Šã¾ã™" + +msgid "" +"``transplanted([set])``\n" +" Transplanted changesets in set, or all transplanted changesets." +msgstr "" + +msgid "" +":transplanted: String. The node identifier of the transplanted\n" +" changeset if any." +msgstr "" + msgid "allow the use of MBCS paths with problematic encodings" msgstr "å•é¡Œã®ã‚ã‚‹æ–‡å—コードã§ã®å¤šãƒã‚¤ãƒˆç¬¦å·åŒ–æ–‡å—を使用ã—ãŸãƒ‘スåã®æœ‰åŠ¹åŒ–" @@ -6336,9 +6630,21 @@ msgid "bookmark '%s' contains illegal character" msgstr "ブックマーク '%s' ã¯ä¸æ£ãªæ–‡å—ã‚’å«ã‚“ã§ã„ã¾ã™" +#, python-format +msgid "branch %s not found" +msgstr "ブランム%s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "updating bookmark %s\n" +msgstr "ブックマーク %s ã®æ›´æ–°ä¸\n" + +#, python-format +msgid "not updating divergent bookmark %s\n" +msgstr "è¡çªã™ã‚‹ãƒ–ックマーク %s ã¯æ›´æ–°ã—ã¾ã›ã‚“\n" + msgid "searching for changed bookmarks\n" msgstr "変更ã•ã‚ŒãŸãƒ–ックマークを探索ä¸\n" msgid "no changed bookmarks found\n" msgstr "変更ã•ã‚ŒãŸãƒ–ックマークã¯ã‚ã‚Šã¾ã›ã‚“\n" @@ -6339,12 +6645,9 @@ msgid "searching for changed bookmarks\n" msgstr "変更ã•ã‚ŒãŸãƒ–ックマークを探索ä¸\n" msgid "no changed bookmarks found\n" msgstr "変更ã•ã‚ŒãŸãƒ–ックマークã¯ã‚ã‚Šã¾ã›ã‚“\n" -msgid "invalid changegroup" -msgstr "ãƒã‚§ãƒ³ã‚¸ã‚°ãƒ«ãƒ¼ãƒ—ãŒä¸æ£ã§ã™" - msgid "unknown parent" msgstr "未知ã®è¦ª" @@ -6399,21 +6702,21 @@ msgid "invalid format spec '%%%s' in output filename" msgstr "出力ファイルåã«ä¸æ£ãªãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆ '%%%s' 指定" -#, python-format -msgid "adding %s\n" -msgstr "%s ã‚’è¿½åŠ ç™»éŒ²ä¸\n" - -#, python-format -msgid "removing %s\n" -msgstr "%s を登録除外ä¸\n" - -#, python-format -msgid "recording removal of %s as rename to %s (%d%% similar)\n" -msgstr "%s ã®å‰Šé™¤ã‚’ %s ã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«å変更ã¨ã—ã¦è¨˜éŒ²ä¸ (類似度 %d%%)\n" - -#, python-format -msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" -msgstr "%s ã¯æœªã‚³ãƒŸãƒƒãƒˆãªã®ã§ã€ %s ã®ã‚³ãƒ”ーデータã¯æ®‹ã‚Šã¾ã›ã‚“\n" +msgid "cannot specify --changelog and --manifest at the same time" +msgstr "--changelog 㨠--manifest ã¯åŒæ™‚ã«ã¯æŒ‡å®šå‡ºæ¥ã¾ã›ã‚“" + +msgid "cannot specify filename with --changelog or --manifest" +msgstr "--changelog ãªã„ã— --manifest ã¨ãƒ•ã‚¡ã‚¤ãƒ«åã¯åŒæ™‚ã«æŒ‡å®šå‡ºæ¥ã¾ã›ã‚“" + +msgid "cannot specify --changelog or --manifest without a repository" +msgstr "--changelog ãªã„ã— --manifest ã®æŒ‡å®šã¯ãƒªãƒã‚¸ãƒˆãƒªæŒ‡å®šãŒå¿…è¦ã§ã™" + +msgid "invalid arguments" +msgstr "引数ãŒä¸æ£ã§ã™" + +#, python-format +msgid "revlog '%s' not found" +msgstr "revlog '%s' ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" #, python-format msgid "%s: not copying - file is not managed\n" @@ -6556,6 +6859,10 @@ msgstr "ファイルåãŒæ˜Žç¤ºã•ã‚ŒãŸå ´åˆã®ã¿è¤‡è£½/改åを追跡å¯èƒ½ã§ã™" #, python-format +msgid "adding %s\n" +msgstr "%s ã‚’è¿½åŠ ç™»éŒ²ä¸\n" + +#, python-format msgid "skipping missing subrepository: %s\n" msgstr "å˜åœ¨ã—ãªã„副リãƒã‚¸ãƒˆãƒªã¸ã®å‡¦ç†ã‚’çœç•¥: %s\n" @@ -6599,6 +6906,138 @@ msgid "empty commit message" msgstr "コミットメッセージãŒã‚ã‚Šã¾ã›ã‚“" +msgid "repository root directory or name of overlay bundle file" +msgstr "リãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆä½ç½®ã€ ãªã„ã—ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ス" + +msgid "DIR" +msgstr "ディレクトリ" + +msgid "change working directory" +msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´" + +msgid "do not prompt, assume 'yes' for any required answers" +msgstr "å•ã„åˆã‚ã›ã‚’ã›ãšã€ 確èªäº‹é …ã¯å…¨ã¦ 'yes' ã¨ã¿ãªã™" + +msgid "suppress output" +msgstr "出力を抑æ¢" + +msgid "enable additional output" +msgstr "ä»˜åŠ çš„ãªå‡ºåŠ›ã‚’有効化" + +msgid "set/override config option (use 'section.name=value')" +msgstr "オプションè¨å®šã‚’指定ï¼ä¸Šæ›¸ã(指定形å¼ã¯ 'section.name=value')" + +msgid "CONFIG" +msgstr "è¨å®š" + +msgid "enable debugging output" +msgstr "デãƒãƒƒã‚°å‡ºåŠ›ã‚’有効化" + +msgid "start debugger" +msgstr "デãƒãƒƒã‚¬ã‚’開始" + +msgid "set the charset encoding" +msgstr "æ–‡å—エンコーディングã®è¨å®š" + +msgid "ENCODE" +msgstr "æ–‡å—コード" + +msgid "MODE" +msgstr "モード" + +msgid "set the charset encoding mode" +msgstr "æ–‡å—エンコーディングã®ãƒ¢ãƒ¼ãƒ‰è¨å®š" + +msgid "always print a traceback on exception" +msgstr "例外発生ã®éš›ã«å¸¸ã«ãƒˆãƒ¬ãƒ¼ã‚¹ãƒãƒƒã‚¯ã‚’表示" + +msgid "time how long the command takes" +msgstr "コマンド実行ã®æ‰€è¦æ™‚間を計測" + +msgid "print command execution profile" +msgstr "コマンド実行ã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "output version information and exit" +msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦çµ‚了" + +msgid "display help and exit" +msgstr "ãƒ˜ãƒ«ãƒ—æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦çµ‚了" + +msgid "do not perform actions, just print output" +msgstr "実施予定ã®å‡¦ç†å†…容ã®è¡¨ç¤ºã®ã¿ã§å‡¦ç†å®Ÿæ–½ã¯æŠ‘æ¢" + +msgid "specify ssh command to use" +msgstr "SSH 連æºã§ä½¿ç”¨ã™ã‚‹ ssh コマンド" + +msgid "specify hg command to run on the remote side" +msgstr "é 隔ホストå´ã§å®Ÿè¡Œã•ã‚Œã‚‹ hg コマンド" + +msgid "do not verify server certificate (ignoring web.cacerts config)" +msgstr "サーãƒè¨¼æ˜Žæ›¸ã®æ¤œè¨¼çœç•¥(web.cacerts è¨å®šã®ç„¡è¦–)" + +msgid "PATTERN" +msgstr "パターン" + +msgid "include names matching the given patterns" +msgstr "パターンã«åˆè‡´ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã«è¿½åŠ " + +msgid "exclude names matching the given patterns" +msgstr "パターンã«åˆè‡´ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã‹ã‚‰é™¤å¤–" + +msgid "use text as commit message" +msgstr "指定テã‚ストをコミットメッセージã¨ã—ã¦ä½¿ç”¨" + +msgid "read commit message from file" +msgstr "コミットメッセージをファイルã‹ã‚‰èªã¿è¾¼ã¿" + +msgid "record the specified date as commit date" +msgstr "指定日時をコミット日時ã¨ã—ã¦è¨˜éŒ²" + +msgid "record the specified user as committer" +msgstr "指定ユーザをコミットユーザã¨ã—ã¦è¨˜éŒ²" + +msgid "STYLE" +msgstr "スタイル" + +msgid "display using template map file" +msgstr "当該スタイルã§è¡¨ç¤ºã‚’カスタマイズ" + +msgid "display with template" +msgstr "当該テンプレートã§è¡¨ç¤ºã‚’カスタマイズ" + +msgid "do not show merges" +msgstr "マージ実施リビジョンã®è¡¨ç¤ºæŠ‘æ¢" + +msgid "output diffstat-style summary of changes" +msgstr "diffstat å½¢å¼ã®å¤‰æ›´æ¦‚è¦ã‚’生æˆ" + +msgid "treat all files as text" +msgstr "全ファイルをテã‚ストファイルã¨ä»®å®š" + +msgid "omit dates from diff headers" +msgstr "差分表示ã®éš›ã«æ—¥ä»˜æƒ…å ±ã®è¡¨ç¤ºã‚’抑æ¢" + +msgid "show which function each change is in" +msgstr "差分表示ã®éš›ã«é–¢æ•°åæƒ…å ±ã‚’è¡¨ç¤º" + +msgid "produce a diff that undoes the changes" +msgstr "変更をå–り消ã™ãŸã‚ã®å·®åˆ†ã‚’生æˆ" + +msgid "number of lines of context to show" +msgstr "差分コンテã‚ストã®è¡Œæ•°" + +msgid "SIMILARITY" +msgstr "類似度" + +msgid "guess renamed files by similarity (0<=s<=100)" +msgstr "ファイル改å推定ã®éš›ã®é¡žä¼¼åº¦(0 以上 100 以下)" + +msgid "recurse into subrepositories" +msgstr "副リãƒã‚¸ãƒˆãƒªã¸ã®å†å¸°çš„é©ç”¨" + +msgid "[OPTION]... [FILE]..." +msgstr "[OPTION]... [FILE]..." + msgid "add the specified files on the next commit" msgstr "指定ファイルã®è¿½åŠ 登録予約" @@ -6697,6 +7136,36 @@ msgid "similarity must be between 0 and 100" msgstr "類似度ã¯0ã‹ã‚‰100ã®é–“ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" +msgid "annotate the specified revision" +msgstr "当該リビジョン時点ã§ã®ç”±æ¥æƒ…å ±ã‚’è¡¨ç¤º" + +msgid "follow copies/renames and list the filename (DEPRECATED)" +msgstr "複製ï¼æ”¹å元ファイルã®å±¥æ´è¿½è·¡ã¨ã€ ファイルåã®è¡¨ç¤º(éžæŽ¨å¥¨)" + +msgid "don't follow copies and renames" +msgstr "複製ï¼æ”¹å元ファイル履æ´ã®è¿½è·¡ã‚’抑æ¢" + +msgid "list the author (long with -v)" +msgstr "ユーザåを表示(-v 指定時ã¯è©³ç´°è¡¨ç¤º)" + +msgid "list the filename" +msgstr "ファイルåを表示" + +msgid "list the date (short with -q)" +msgstr "日付を表示(-q 指定時ã¯ç°¡ç•¥è¡¨ç¤º)" + +msgid "list the revision number (default)" +msgstr "リビジョン番å·ã‚’表示(既定動作)" + +msgid "list the changeset" +msgstr "ãƒãƒƒã‚·ãƒ¥å€¤ã‚’表示" + +msgid "show line number at the first appearance" +msgstr "ç”±æ¥ãƒªãƒ“ジョンã§ã®åˆå‡ºæ™‚ã®è¡Œç•ªå·ã‚’表示" + +msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." +msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." + msgid "show changeset information by line for each file" msgstr "ファイル行毎ã®ãƒªãƒ“ã‚¸ãƒ§ãƒ³æƒ…å ±è¡¨ç¤º" @@ -6731,6 +7200,24 @@ msgid "%s: binary file\n" msgstr "%s: ãƒã‚¤ãƒŠãƒªãƒ•ã‚¡ã‚¤ãƒ«ã§ã™\n" +msgid "do not pass files through decoders" +msgstr "デコード処ç†ã‚’回é¿" + +msgid "directory prefix for files in archive" +msgstr "アーカイブファイルã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæŽ¥é 辞" + +msgid "PREFIX" +msgstr "接é 辞" + +msgid "revision to distribute" +msgstr "アーカイブ対象リビジョン" + +msgid "type of distribution to create" +msgstr "アーカイブ種別" + +msgid "[OPTION]... DEST" +msgstr "[OPTION]... DEST" + msgid "create an unversioned archive of a repository revision" msgstr "特定リビジョン時点ã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–ã®ãƒªãƒã‚¸ãƒˆãƒªå¤–ã¸ã®ç”Ÿæˆ" @@ -6794,6 +7281,18 @@ msgid "cannot archive plain files to stdout" msgstr "通常ファイルã®ã‚¢ãƒ¼ã‚«ã‚¤ãƒ–å…ˆã«æ¨™æº–出力を指定ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“" +msgid "merge with old dirstate parent after backout" +msgstr "打ã¡æ¶ˆã—リビジョンをç¾è¦ªãƒªãƒ“ジョンã¨ãƒžãƒ¼ã‚¸" + +msgid "parent to choose when backing out merge" +msgstr "打ã¡æ¶ˆã—リビジョンã¨ã®ãƒžãƒ¼ã‚¸å¯¾è±¡" + +msgid "revision to backout" +msgstr "打ã¡æ¶ˆã—対象リビジョン" + +msgid "[OPTION]... [-r] REV" +msgstr "[OPTION]... [-r] REV" + msgid "reverse effect of earlier changeset" msgstr "以å‰ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã«ãŠã‘る変更ã®æ‰“ã¡æ¶ˆã—" @@ -6872,6 +7371,30 @@ msgid "merging with changeset %s\n" msgstr "リビジョン %s ã¨ãƒžãƒ¼ã‚¸ä¸\n" +msgid "reset bisect state" +msgstr "探索状態ã®ãƒªã‚»ãƒƒãƒˆ" + +msgid "mark changeset good" +msgstr "対象リビジョンã®æŽ¢ç´¢çŠ¶æ…‹ã‚’ good 化" + +msgid "mark changeset bad" +msgstr "対象リビジョンã®æŽ¢ç´¢çŠ¶æ…‹ã‚’ bad 化" + +msgid "skip testing changeset" +msgstr "対象リビジョンã®åˆ¤å®šä½œæ¥ã‚’çœç•¥" + +msgid "extend the bisect range" +msgstr "探索範囲ã®æ‹¡å¼µ" + +msgid "use command to check changeset state" +msgstr "good/bad 判定用コマンド" + +msgid "do not update to target" +msgstr "対象リビジョンã«ã‚ˆã‚‹ä½œæ¥é ˜åŸŸå†…容ã®æ›´æ–°ã‚’抑æ¢" + +msgid "[-gbsr] [-U] [-c CMD] [REV]" +msgstr "[-gbsr] [-U] [-c CMD] [REV]" + msgid "subdivision search of changesets" msgstr "リビジョンã®åˆ†å‰²æŽ¢ç´¢" @@ -6922,6 +7445,7 @@ #, python-format msgid "" "Not all ancestors of this changeset have been checked.\n" -"To check the other ancestors, start from the common ancestor, %s.\n" +"Use bisect --extend to continue the bisection from\n" +"the common ancestor, %s.\n" msgstr "" "ã“ã®ãƒªãƒ“ジョンã®ç¥–å…ˆã«å¯¾ã™ã‚‹ç¢ºèªã¯å®Œå…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" @@ -6926,6 +7450,7 @@ msgstr "" "ã“ã®ãƒªãƒ“ジョンã®ç¥–å…ˆã«å¯¾ã™ã‚‹ç¢ºèªã¯å®Œå…¨ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -"å…¨ã¦ã‚’確èªã™ã‚‹ã«ã¯ã€ 共通ã®ç¥–å…ˆ %s ã‹ã‚‰æ¤œç´¢ã‚’開始ã—ã¦ãã ã•ã„。\n" +"共通ã®ç¥–å…ˆ %s ã‹ã‚‰æ¤œç´¢ã‚’継続ã™ã‚‹å ´åˆã€\n" +"--extend 付ã㧠:hg:`bisect` を実行ã—ã¦ãã ã•ã„。\n" msgid "Due to skipped revisions, the first good revision could be any of:\n" msgstr "検証çœç•¥ã«ã‚ˆã‚Šã€ 最åˆã® good ãªãƒªãƒ“ジョンã¯ä»¥ä¸‹ã‹ã‚‰é¸æŠžå¯èƒ½ã§ã™:\n" @@ -6958,6 +7483,13 @@ msgstr "リビジョン %d:%s: %s\n" #, python-format +msgid "Extending search to changeset %d:%s\n" +msgstr "探索範囲を %d:%s ã¾ã§æ‹¡å¼µ\n" + +msgid "nothing to extend" +msgstr "探索範囲ã¯æ‹¡å¼µã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ" + +#, python-format msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "リビジョン %d:%s を検証ä¸(検証残 %d〠検証済㿠%d)\n" @@ -6961,6 +7493,21 @@ msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "リビジョン %d:%s を検証ä¸(検証残 %d〠検証済㿠%d)\n" +msgid "force" +msgstr "強制実施" + +msgid "delete a given bookmark" +msgstr "指定ブックマークã®å‰Šé™¤" + +msgid "rename a given bookmark" +msgstr "指定ブックマークã®æ”¹å" + +msgid "do not mark a new bookmark active" +msgstr "æ–°è¦ãƒ–ックマークをアクティブ化ã—ãªã„" + +msgid "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]" +msgstr "hg bookmarks [-f] [-d] [-i] [-m NAME] [-r REV] [NAME]" + msgid "track a line of development with movable markers" msgstr "移動å¯èƒ½ãªãƒžãƒ¼ã‚ングã«ã‚ˆã‚‹å±¥æ´é€²å±•ã®è¿½è·¡" @@ -7005,11 +7552,13 @@ " bookmarks エクステンションを有効ã«ã—ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“。\n" " " -msgid "a bookmark of this name does not exist" -msgstr "ã“ã®åå‰ã®ãƒ–ックマークã¯å˜åœ¨ã—ã¾ã›ã‚“" - -msgid "a bookmark of the same name already exists" -msgstr "åŒã˜åå‰ã®ãƒ–ックマークãŒã™ã§ã«å˜åœ¨ã—ã¾ã™" +#, python-format +msgid "bookmark '%s' does not exist" +msgstr "ブックマーク '%s' ã¯å˜åœ¨ã—ã¾ã›ã‚“" + +#, python-format +msgid "bookmark '%s' already exists (use -f to force)" +msgstr "ブックマーク '%s' ã¯å˜åœ¨ã—ã¾ã™(強制実行ã™ã‚‹å ´åˆã¯ -f を指定)" msgid "new bookmark name required" msgstr "æ–°ã—ã„ブックマークåã‚’è¦æ±‚ã—ã¾ã—ãŸ" @@ -7029,6 +7578,15 @@ msgid "no bookmarks set\n" msgstr "ブックマークã¯å˜åœ¨ã—ã¾ã›ã‚“\n" +msgid "set branch name even if it shadows an existing branch" +msgstr "åŒåæ—¢å˜ãƒ–ランãƒãŒå˜åœ¨ã™ã‚‹å ´åˆã§ã‚‚ブランãƒä½œæˆã‚’実施" + +msgid "reset branch name to parent branch name" +msgstr "ブランãƒåè¨å®šã‚’解消ã—〠親リビジョンã®ãƒ–ランãƒã«æˆ»ã‚‹" + +msgid "[-fC] [NAME]" +msgstr "[-fC] [NAME]" + msgid "set or show the current branch name" msgstr "ブランãƒåã®è¨å®šã€ ãªã„ã—ç¾ãƒ–ランãƒåã®è¡¨ç¤º" @@ -7067,7 +7625,20 @@ " 使用ã—ã¦ãã ã•ã„。 ç¾ãƒ–ランãƒã‚’閉鎖ã™ã‚‹å ´åˆã¯\n" " :hg:`commit --close-branch` を使用ã—ã¦ãã ã•ã„。" +msgid " .. note::" +msgstr " .. note::" + +msgid "" +" Branch names are permanent. Use :hg:`bookmark` to create a\n" +" light-weight bookmark instead. See :hg:`help glossary` for more\n" +" information about named branches and bookmarks." +msgstr "" +" ブランãƒåã¯æ°¸ç¶šçš„ãªã‚‚ã®ã§ã™ã€‚軽é‡ãªåå‰ä»˜ã‘ã‚’ã™ã‚‹å ´åˆã¯ã€\n" +" :hg:`bookmark` ã§ãƒ–ックマークを作æˆã—ã¦ãã ã•ã„。\n" +" åå‰ä»˜ãブランãƒã¨ãƒ–ックマークã®è©³ç´°ã«é–¢ã—ã¦ã¯ã€\n" +" :hg:`help glossary` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + #, python-format msgid "reset working directory to branch %s\n" msgstr "作æ¥é ˜åŸŸã®ãƒ–ランãƒã‚’ %s ã«ãƒªã‚»ãƒƒãƒˆ\n" @@ -7070,12 +7641,15 @@ #, python-format msgid "reset working directory to branch %s\n" msgstr "作æ¥é ˜åŸŸã®ãƒ–ランãƒã‚’ %s ã«ãƒªã‚»ãƒƒãƒˆ\n" -msgid "" -"a branch of the same name already exists (use 'hg update' to switch to it)" -msgstr "åŒåã®ãƒ–ランãƒãŒå˜åœ¨ã—ã¾ã™(ブランãƒã®åˆ‡ã‚Šæ›¿ãˆã¯ :hg:`update`)" +msgid "a branch of the same name already exists" +msgstr "åŒã˜åå‰ã®ãƒ–ランãƒãŒã™ã§ã«å˜åœ¨ã—ã¾ã™" + +#. i18n: "it" refers to an existing branch +msgid "use 'hg update' to switch to it" +msgstr "作æ¥é ˜åŸŸã‚’æ—¢å˜ãƒ–ランãƒã«åˆ‡ã‚Šæ›¿ãˆã‚‹ã«ã¯ 'hg update' を使用ã—ã¦ãã ã•ã„" #, python-format msgid "marked working directory as branch %s\n" msgstr "作æ¥é ˜åŸŸã‚’ブランム%s ã«è¨å®š\n" @@ -7077,8 +7651,17 @@ #, python-format msgid "marked working directory as branch %s\n" msgstr "作æ¥é ˜åŸŸã‚’ブランム%s ã«è¨å®š\n" +msgid "show only branches that have unmerged heads" +msgstr "未マージãªãƒ˜ãƒƒãƒ‰ã‚’æŒã¤ãƒ–ランãƒã®ã¿ã‚’表示" + +msgid "show normal and closed branches" +msgstr "閉鎖ã—ãŸãƒ˜ãƒƒãƒ‰ã‚‚表示" + +msgid "[-ac]" +msgstr "[-ac]" + msgid "list repository named branches" msgstr "リãƒã‚¸ãƒˆãƒªä¸ã®åå‰ä»˜ãブランãƒã®ä¸€è¦§" @@ -7116,6 +7699,27 @@ msgid " (inactive)" msgstr " (éžã‚¢ã‚¯ãƒ†ã‚£ãƒ–)" +msgid "run even when the destination is unrelated" +msgstr "連æºå…ˆãŒç„¡é–¢ä¿‚ãªãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚実行" + +msgid "a changeset intended to be added to the destination" +msgstr "ãƒãƒ³ãƒ‰ãƒ«ã«å«ã‚ãŸã„リビジョン" + +msgid "a specific branch you would like to bundle" +msgstr "ãƒãƒ³ãƒ‰ãƒ«ã«å«ã‚ãŸã„ブランãƒ" + +msgid "a base changeset assumed to be available at the destination" +msgstr "連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã™ã‚‹ã“ã¨ã‚’仮定ã™ã‚‹ãƒªãƒ“ジョン" + +msgid "bundle all changesets in the repository" +msgstr "リãƒã‚¸ãƒˆãƒªä¸ã®å…¨ãƒªãƒ“ジョンをãƒãƒ³ãƒ‰ãƒ«ã«å«ã‚ã‚‹" + +msgid "bundle compression type to use" +msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®åœ§ç¸®å½¢å¼" + +msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]" +msgstr "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]" + msgid "create a changegroup file" msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ç”Ÿæˆ" @@ -7176,6 +7780,18 @@ msgid "unknown bundle type specified with --type" msgstr "--type ã«æœªçŸ¥ã®ãƒãƒ³ãƒ‰ãƒ«ç¨®åˆ¥ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" +msgid "print output to file with formatted name" +msgstr "ファイル内容ã®ä¿å˜å…ˆ" + +msgid "print the given revision" +msgstr "出力対象リビジョン" + +msgid "apply any matching decode filter" +msgstr "デコード処ç†ã‚’実施" + +msgid "[OPTION]... FILE..." +msgstr "[OPTION]... FILE..." + msgid "output the current or given revision of files" msgstr "指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®ãƒ•ã‚¡ã‚¤ãƒ«å†…容ã®å‡ºåŠ›" @@ -7207,6 +7823,21 @@ " :``%p``: 対象ファイルã®ãƒªãƒã‚¸ãƒˆãƒªãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®ç›¸å¯¾ãƒ‘ス\n" " " +msgid "the clone will include an empty working copy (only a repository)" +msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ç„¡ã—(管ç†é ˜åŸŸã®ã¿ã®è¤‡è£½)" + +msgid "revision, tag or branch to check out" +msgstr "作æ¥é ˜åŸŸæ›´æ–°ç”¨ãƒªãƒ“ジョン(ã‚¿ã‚°åï¼ãƒ–ランãƒå)" + +msgid "include the specified changeset" +msgstr "複製対象ã«å«ã‚るリビジョン" + +msgid "clone only the specified branch" +msgstr "指定ブランãƒã®ã¿ã‚’複製" + +msgid "[OPTION]... SOURCE [DEST]" +msgstr "[OPTION]... SOURCE [DEST]" + msgid "make a copy of an existing repository" msgstr "æ—¢å˜ãƒªãƒã‚¸ãƒˆãƒªã®è¤‡è£½" @@ -7339,6 +7970,12 @@ msgid "cannot specify both --noupdate and --updaterev" msgstr "--noupdate 㨠--updaterev ã¯ä½µç”¨ã§ãã¾ã›ã‚“" +msgid "mark new/missing files as added/removed before committing" +msgstr "コミットå‰ã«ã€ æ–°è¦ï¼ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’登録ï¼é™¤å¤–" + +msgid "mark a branch as closed, hiding it from the branch list" +msgstr "ブランãƒã‚’閉鎖ã—〠ブランãƒä¸€è¦§ã§ã®è¡¨ç¤ºã‹ã‚‰é™¤å¤–" + msgid "commit the specified files or all outstanding changes" msgstr "指定ファイルãªã„ã—å…¨ã¦ã®å¤‰æ›´å†…容ã®ãƒªãƒã‚¸ãƒˆãƒªã¸ã®è¨˜éŒ²" @@ -7387,6 +8024,10 @@ msgid "can only close branch heads" msgstr "ブランãƒãƒ˜ãƒƒãƒ‰ã®ã¿é–‰éŽ–ã§ãã¾ã™" +#, python-format +msgid "nothing changed (%d missing files, see 'hg status')\n" +msgstr "改変ã¯ã‚ã‚Šã¾ã›ã‚“ (%d 個ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒä¸åœ¨ã€‚ 'hg status' ã§ç¢ºèªã‚’)\n" + msgid "nothing changed\n" msgstr "変更ãªã—\n" @@ -7401,6 +8042,15 @@ msgid "committed changeset %d:%s\n" msgstr "コミット対象リビジョン %d:%s\n" +msgid "record a copy that has already occurred" +msgstr "手動ã§è¤‡è£½æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 複製ã®æ—¨ã‚’記録" + +msgid "forcibly copy over an existing managed file" +msgstr "åŒåã®ç™»éŒ²æ¸ˆã¿ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã—ã¦ã‚‚複製を実施" + +msgid "[OPTION]... [SOURCE]... DEST" +msgstr "[OPTION]... [SOURCE]... DEST" + msgid "mark files as copied for the next commit" msgstr "指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã®è¤‡è£½" @@ -7437,9 +8087,12 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰ã®çµ‚了値㯠0〠エラー発生時㯠1 ã§ã™ã€‚\n" " " +msgid "[INDEX] REV1 REV2" +msgstr "[INDEX] REV1 REV2" + msgid "find the ancestor revision of two revisions in a given index" msgstr "指定範囲ã«ãŠã‘ã‚‹2ã¤ã®ãƒªãƒ“ジョンã®ç¥–先リビジョンã®æ¤œç´¢" msgid "either two or three arguments required" msgstr "2ãªã„ã—3ã®å¼•æ•°ãŒå¿…è¦ã§ã™" @@ -7440,11 +8093,28 @@ msgid "find the ancestor revision of two revisions in a given index" msgstr "指定範囲ã«ãŠã‘ã‚‹2ã¤ã®ãƒªãƒ“ジョンã®ç¥–先リビジョンã®æ¤œç´¢" msgid "either two or three arguments required" msgstr "2ãªã„ã—3ã®å¼•æ•°ãŒå¿…è¦ã§ã™" -msgid "builds a repo with a given dag from scratch in the current empty repo" -msgstr "空リãƒã‚¸ãƒˆãƒªã‹ã‚‰æŒ‡å®šã•ã‚ŒãŸè¨˜å·ã«åŸºãリãƒã‚¸ãƒˆãƒªã®ç”Ÿæˆ" +msgid "add single file mergeable changes" +msgstr "" + +msgid "add single file all revs overwrite" +msgstr "" + +msgid "add new file at each rev" +msgstr "" + +msgid "[OPTION]... [TEXT]" +msgstr "" + +msgid "builds a repo with a given DAG from scratch in the current empty repo" +msgstr "" + +msgid "" +" The description of the DAG is read from stdin if not given on the\n" +" command line." +msgstr "" msgid " Elements:" msgstr " 表記:" @@ -7461,8 +8131,6 @@ " - \"/p2\" is a merge of the preceding node and p2\n" " - \":tag\" defines a local tag for the preceding node\n" " - \"@branch\" sets the named branch for subsequent nodes\n" -" - \"!command\" runs the command using your shell\n" -" - \"!!my command\\n\" is like \"!\", but to the end of the line\n" " - \"#...\\n\" is a comment up to the end of the line" msgstr "" @@ -7482,18 +8150,14 @@ msgid "" " All string valued-elements are either strictly alphanumeric, or must\n" -" be enclosed in double quotes (\"...\"), with \"\\\" as escape character." -msgstr "" - -msgid "" -" Note that the --overwritten-file and --appended-file options imply the\n" -" use of \"HGMERGE=internal:local\" during DAG buildup.\n" -" " -msgstr "" - -msgid "need at least one of -m, -a, -o, -n" -msgstr "-m, -a, -o, -n ã®ã„ãšã‚Œã‹1ã¤ã¯å¿…é ˆã§ã™" +" be enclosed in double quotes (\"...\"), with \"\\\" as escape " +"character.\n" +" " +msgstr "" + +msgid "reading DAG from stdin\n" +msgstr "" msgid "repository is not empty" msgstr "リãƒã‚¸ãƒˆãƒªãŒç©ºã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -7496,22 +8160,15 @@ msgid "repository is not empty" msgstr "リãƒã‚¸ãƒˆãƒªãŒç©ºã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#, python-format -msgid "%s command %s" -msgstr "" - -msgid "list all available commands and options" -msgstr "利用å¯èƒ½ãªã‚³ãƒžãƒ³ãƒ‰ãŠã‚ˆã³ã‚ªãƒ—ション一覧ã®è¡¨ç¤º" - -msgid "returns the completion list associated with the given command" -msgstr "指定コマンドã®è£œå®Œãƒªã‚¹ãƒˆã®ä½œæˆ" - -msgid "show information detected about current filesystem" -msgstr "ファイルシステムã«é–¢ã™ã‚‹æƒ…å ±ã®è¡¨ç¤º" - -msgid "rebuild the dirstate as it would look like for the given revision" -msgstr "指定リビジョン時点相当㮠dirstate ã®å†æ§‹ç¯‰" +msgid "building" +msgstr "" + +msgid "show all details" +msgstr "" + +msgid "lists the contents of a bundle" +msgstr "" msgid "validate the correctness of the current dirstate" msgstr "ç¾æ™‚点㮠dirstate ã®æ•´åˆæ€§æ¤œè¨¼" @@ -7535,73 +8192,35 @@ msgid ".hg/dirstate inconsistent with current parent's manifest" msgstr "親リビジョンã®ç®¡ç†æƒ…å ±ã¨ .hg/dirstate ã®é–“ã«ä¸æ•´åˆãŒã‚ã‚Šã¾ã™" -msgid "show combined config settings from all hgrc files" -msgstr "å…¨è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æœ€çµ‚çš„ãªè¨å®šå†…容ã®è¡¨ç¤º" - -msgid " With no arguments, print names and values of all config items." -msgstr "" -" 引数指定ãŒç„¡ã„å ´åˆã€ å…¨ã¦ã®è¨å®šé …ç›®ã«å¯¾ã—ã¦ã€ åå‰ã¨å€¤ã‚’表示ã—ã¾ã™ã€‚" - -msgid "" -" With one argument of the form section.name, print just the value\n" -" of that config item." -msgstr "" -" 'section.name' å½¢å¼ã«åˆè‡´ã™ã‚‹å¼•æ•°ã‚’1ã¤ã ã‘指定ã—ãŸå ´åˆã€ ãã®è¨å®šé …ç›®\n" -" 値ã®ã¿ã‚’表示ã—ã¾ã™ã€‚" - -msgid "" -" With multiple arguments, print names and values of all config\n" -" items with matching section names." -msgstr "" -" 複数ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãれらをセクションåã¨ã¿ãªã—〠該当ã™ã‚‹\n" -" セクションã®è¨å®šé …目を全ã¦è¡¨ç¤ºã—ã¾ã™ã€‚" - -msgid "" -" With --debug, the source (filename and line number) is printed\n" -" for each config item." -msgstr "" -" --debug 指定ãŒã‚ã‚‹å ´åˆã€ è¨å®šé …目毎ã«è¨˜è¿°ä½ç½®(ファイルåã¨è¡Œç•ªå·)ãŒ\n" -" 表示ã•ã‚Œã¾ã™ã€‚\n" -" " - -#, python-format -msgid "read config from: %s\n" -msgstr "è¨å®šèªã¿è¾¼ã¿å…ƒ: %s\n" - -msgid "only one config item permitted" -msgstr "複数ã®è¨å®šé …目指定ã¯ç„¡åŠ¹ã§ã™" - -msgid "access the pushkey key/value protocol" -msgstr "" - -msgid " With two args, list the keys in the given namespace." -msgstr "" - -msgid "" -" With five args, set a key to new if it currently is set to old.\n" -" Reports success or failure.\n" -" " -msgstr "" - -msgid "parse and apply a revision specification" -msgstr "リビジョン指定記述ã®è§£æžï¼é©ç”¨" - -msgid "manually set the parents of the current working directory" -msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®æ‰‹å‹•è¨å®š" - -msgid "" -" This is useful for writing repository conversion tools, but should\n" -" be used with care." -msgstr "" -" 本コマンドã¯ãƒªãƒã‚¸ãƒˆãƒªå¤‰æ›ãƒ„ールã®ä½œæˆã«æœ‰ç”¨ã§ã™ãŒã€ 利用ã«ã¯æ³¨æ„ãŒ\n" -" å¿…è¦ã§ã™ã€‚" - -msgid "show the contents of the current dirstate" -msgstr "ç¾æ™‚点㮠dirstate 内容ã®è¡¨ç¤º" - -#, python-format -msgid "copy: %s -> %s\n" -msgstr "%s ã‹ã‚‰ %s ã«è¤‡è£½\n" +msgid "[COMMAND]" +msgstr "[COMMAND]" + +msgid "list all available commands and options" +msgstr "利用å¯èƒ½ãªã‚³ãƒžãƒ³ãƒ‰ãŠã‚ˆã³ã‚ªãƒ—ション一覧ã®è¡¨ç¤º" + +msgid "show the command options" +msgstr "当該コマンドã®ã‚ªãƒ—ション一覧ã®è¡¨ç¤º" + +msgid "[-o] CMD" +msgstr "[-o] CMD" + +msgid "returns the completion list associated with the given command" +msgstr "指定コマンドã®è£œå®Œãƒªã‚¹ãƒˆã®ä½œæˆ" + +msgid "use tags as labels" +msgstr "" + +msgid "annotate with branch names" +msgstr "" + +msgid "use dots for runs" +msgstr "" + +msgid "separate elements by spaces" +msgstr "" + +msgid "[OPTION]... [FILE [REV]...]" +msgstr "[OPTION]... [FILE [REV]...]" msgid "format the changelog or an index DAG as a concise textual description" msgstr "" @@ -7619,6 +8238,15 @@ msgid "need repo for changelog dag" msgstr "" +msgid "open changelog" +msgstr "" + +msgid "open manifest" +msgstr "" + +msgid "-c|-m|FILE REV" +msgstr "" + msgid "dump the contents of a data file revision" msgstr "データファイルリビジョンã®å†…容表示" @@ -7626,6 +8254,12 @@ msgid "invalid revision identifier %s" msgstr "リビジョン指定 %s ã¯ä¸æ£ã§ã™" +msgid "try extended date formats" +msgstr "拡張日時形å¼ã®ä½¿ç”¨" + +msgid "[-e] DATE [RANGE]" +msgstr "[-e] DATE [RANGE]" + msgid "parse and display a date" msgstr "日付ã®è§£æžãŠã‚ˆã³è¡¨ç¤º" @@ -7629,9 +8263,49 @@ msgid "parse and display a date" msgstr "日付ã®è§£æžãŠã‚ˆã³è¡¨ç¤º" +msgid "use old-style discovery" +msgstr "" + +msgid "use old-style discovery with non-heads included" +msgstr "" + +msgid "[-l REV] [-r REV] [-b BRANCH]... [OTHER]" +msgstr "" + +msgid "runs the changeset discovery protocol in isolation" +msgstr "" + +msgid "parse and apply a fileset specification" +msgstr "" + +msgid "[PATH]" +msgstr "[PATH]" + +msgid "show information detected about current filesystem" +msgstr "ファイルシステムã«é–¢ã™ã‚‹æƒ…å ±ã®è¡¨ç¤º" + +msgid "id of head node" +msgstr "" + +msgid "id of common node" +msgstr "" + +msgid "REPO FILE [-H|-C ID]..." +msgstr "" + +msgid "retrieves a bundle from a repo" +msgstr "" + +msgid "" +" Every ID must be a full-length hex node id string. Saves the bundle to " +"the\n" +" given file.\n" +" " +msgstr "" + msgid "display the combined ignore pattern" msgstr "" msgid "no ignore patterns found" msgstr "" @@ -7632,9 +8306,15 @@ msgid "display the combined ignore pattern" msgstr "" msgid "no ignore patterns found" msgstr "" +msgid "revlog format" +msgstr "" + +msgid "[-f FORMAT] -c|-m|FILE" +msgstr "" + msgid "dump the contents of an index file" msgstr "インデックスファイルã®å†…容表示" @@ -7671,30 +8351,6 @@ msgid " (templates seem to have been installed incorrectly)\n" msgstr " (テンプレートã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãŒä¸é©åˆ‡ãªã‚ˆã†ã§ã™)\n" -msgid "Checking patch...\n" -msgstr "パッãƒã®æ¤œè¨¼ä¸...\n" - -msgid " patch call failed:\n" -msgstr " パッãƒé©ç”¨ãŒå¤±æ•—\n" - -msgid " unexpected patch output!\n" -msgstr " 想定ã¨ç•°ãªã‚‹ãƒ‘ッãƒå‡ºåŠ›ã§ã™\n" - -msgid " patch test failed!\n" -msgstr " パッãƒé©ç”¨è©¦é¨“ãŒå¤±æ•—\n" - -msgid "" -" (Current patch tool may be incompatible with patch, or misconfigured. " -"Please check your configuration file)\n" -msgstr " (ツールãŒæœªå¯¾å¿œãªãƒ‘ッãƒå½¢å¼ã‹ã€ è¨å®šãƒŸã‚¹ã§ã™ã€‚ è¨å®šç¢ºèªãŒå¿…è¦ã§ã™)\n" - -msgid "" -" Internal patcher failure, please report this error to http://mercurial." -"selenic.com/wiki/BugTracker\n" -msgstr "" -"内部パッãƒãƒ„ールãŒæ©Ÿèƒ½ã—ã¾ã›ã‚“。 http://mercurial.selenic.com/wiki/" -"BugTracker ã¸ã®ã‚¨ãƒ©ãƒ¼å ±å‘Šã«ã”å”力ãã ã•ã„\n" - msgid "Checking commit editor...\n" msgstr "メッセージ入力用エディタã®æ¤œè¨¼ä¸...\n" @@ -7721,6 +8377,49 @@ msgid "%s problems detected, please check your install!\n" msgstr "障害ãŒ%s件検出ã•ã‚Œã¾ã—ãŸã€‚ インストール内容を確èªã—ã¦ãã ã•ã„\n" +msgid "REPO ID..." +msgstr "" + +msgid "test whether node ids are known to a repo" +msgstr "" + +msgid "" +" Every ID must be a full-length hex node id string. Returns a list of 0s " +"and 1s\n" +" indicating unknown/known.\n" +" " +msgstr "" + +msgid "REPO NAMESPACE [KEY OLD NEW]" +msgstr "REPO NAMESPACE [KEY OLD NEW]" + +msgid "access the pushkey key/value protocol" +msgstr "" + +msgid " With two args, list the keys in the given namespace." +msgstr "" + +msgid "" +" With five args, set a key to new if it currently is set to old.\n" +" Reports success or failure.\n" +" " +msgstr "" + +msgid "revision to rebuild to" +msgstr "å†æ§‹ç¯‰å¯¾è±¡ãƒªãƒ“ジョン" + +msgid "[-r REV] [REV]" +msgstr "[-r REV] [REV]" + +msgid "rebuild the dirstate as it would look like for the given revision" +msgstr "指定リビジョン時点相当㮠dirstate ã®å†æ§‹ç¯‰" + +msgid "revision to debug" +msgstr "デãƒãƒƒã‚°å¯¾è±¡ãƒªãƒ“ジョン" + +msgid "[-r REV] FILE" +msgstr "[-r REV] FILE" + msgid "dump rename information" msgstr "改åæƒ…å ±ã®è¡¨ç¤º" @@ -7732,6 +8431,50 @@ msgid "%s not renamed\n" msgstr "%s ã¯æ”¹åã•ã‚Œã¦ã„ã¾ã›ã‚“\n" +msgid "dump index data" +msgstr "" + +msgid "-c|-m|FILE" +msgstr "" + +msgid "show data and statistics about a revlog" +msgstr "" + +msgid "parse and apply a revision specification" +msgstr "リビジョン指定記述ã®è§£æžï¼é©ç”¨" + +msgid "REV1 [REV2]" +msgstr "REV1 [REV2]" + +msgid "manually set the parents of the current working directory" +msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã®æ‰‹å‹•è¨å®š" + +msgid "" +" This is useful for writing repository conversion tools, but should\n" +" be used with care." +msgstr "" +" 本コマンドã¯ãƒªãƒã‚¸ãƒˆãƒªå¤‰æ›ãƒ„ールã®ä½œæˆã«æœ‰ç”¨ã§ã™ãŒã€ 利用ã«ã¯æ³¨æ„ãŒ\n" +" å¿…è¦ã§ã™ã€‚" + +msgid "do not display the saved mtime" +msgstr "記録ã•ã‚ŒãŸ mtime æƒ…å ±ã®è¡¨ç¤ºæŠ‘æ¢" + +msgid "sort by saved mtime" +msgstr "記録ã•ã‚ŒãŸ mtime æƒ…å ±ã§æ•´åˆ—" + +msgid "[OPTION]..." +msgstr "[OPTION]..." + +msgid "show the contents of the current dirstate" +msgstr "ç¾æ™‚点㮠dirstate 内容ã®è¡¨ç¤º" + +#, python-format +msgid "copy: %s -> %s\n" +msgstr "%s ã‹ã‚‰ %s ã«è¤‡è£½\n" + +msgid "revision to check" +msgstr "確èªå¯¾è±¡ãƒªãƒ“ジョン" + msgid "show how files match on given patterns" msgstr "指定パターンã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«åˆè‡´çŠ¶æ³ã®è¡¨ç¤º" @@ -7735,6 +8478,12 @@ msgid "show how files match on given patterns" msgstr "指定パターンã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«åˆè‡´çŠ¶æ³ã®è¡¨ç¤º" +msgid "REPO [OPTIONS]... [ONE [TWO]]" +msgstr "" + +msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." +msgstr "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." + msgid "diff repository (or selected files)" msgstr "作æ¥é ˜åŸŸå…¨ä½“(ãªã„ã—指定ファイル)ã®å·®åˆ†æŠ½å‡º" @@ -7778,6 +8527,15 @@ " git 拡張差分形å¼ã§è¡¨ç¤ºã™ã‚‹ã«ã¯ -g/--git を指定ã—ã¾ã™ã€‚ 詳細ã¯\n" " :hg:`help diffs` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +msgid "diff against the second parent" +msgstr "第2親ã¨ã®å·®åˆ†ã‚’使用" + +msgid "revisions to export" +msgstr "対象リビジョン" + +msgid "[OPTION]... [-o OUTFILESPEC] REV..." +msgstr "[OPTION]... [-o OUTFILESPEC] REV..." + msgid "dump the header and diffs for one or more changesets" msgstr "1ã¤ä»¥ä¸Šã®ãƒªãƒ“ジョンã«å¯¾ã™ã‚‹ãƒ˜ãƒƒãƒ€ãŠã‚ˆã³å¤‰æ›´å†…容ã®å‡ºåŠ›" @@ -7890,6 +8648,34 @@ msgid "not removing %s: file is already untracked\n" msgstr "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: æ—¢ã«æ§‹æˆç®¡ç†å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“\n" +#, python-format +msgid "removing %s\n" +msgstr "%s を登録除外ä¸\n" + +msgid "end fields with NUL" +msgstr "å„フィールドã®åŒºåˆ‡ã‚Šã«NULæ–‡å—(0x00)を使用" + +msgid "print all revisions that match" +msgstr "åˆè‡´ã™ã‚‹ãƒªãƒ“ジョンを全ã¦è¡¨ç¤º" + +msgid "follow changeset history, or file history across copies and renames" +msgstr "複製元や改åå…ƒã®å±¥æ´ã‚‚é¡ã‚‹" + +msgid "ignore case when matching" +msgstr "大文å—å°æ–‡å—を無視ã—ã¦æ¤œç´¢" + +msgid "print only filenames and revisions that match" +msgstr "åˆè‡´ã®éš›ã«ãƒ•ã‚¡ã‚¤ãƒ«åã¨ãƒªãƒ“ジョンã®ã¿ã‚’表示" + +msgid "print matching line numbers" +msgstr "åˆè‡´ã—ãŸè¡Œç•ªå·ã‚’表示" + +msgid "only search files changed within revision range" +msgstr "指定リビジョン範囲ã®ã¿ã‚’検索" + +msgid "[OPTION]... PATTERN [FILE]..." +msgstr "[OPTION]... PATTERN [FILE]..." + msgid "search for a pattern in specified files and revisions" msgstr "特定ã®ãƒ‘ターンã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¨ãƒªãƒ“ジョンã®æ¤œç´¢" @@ -7931,6 +8717,24 @@ msgid "grep: invalid match pattern: %s\n" msgstr "grep: '%s' ã¯ä¸æ£ãªãƒ‘ターンã§ã™\n" +msgid "STARTREV" +msgstr "開始リビジョン" + +msgid "show only heads which are descendants of STARTREV" +msgstr "指定リビジョンã®åå«ã¨ãªã‚‹ãƒ˜ãƒƒãƒ‰ã®ã¿ã‚’表示" + +msgid "show topological heads only" +msgstr "åã‚’æŒãŸãªã„å…¨ã¦ã®ãƒªãƒ“ジョンを表示" + +msgid "show active branchheads only (DEPRECATED)" +msgstr "アクティブãªãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã®ã¿ã‚’表示 (éžæŽ¨å¥¨)" + +msgid "show normal and closed branch heads" +msgstr "閉鎖ã—ãŸãƒ˜ãƒƒãƒ‰ã‚‚表示" + +msgid "[-ac] [-r STARTREV] [REV]..." +msgstr "[-ac] [-r STARTREV] [REV]..." + msgid "show current repository heads or show branch heads" msgstr "ç¾æ™‚点ã§ã®ãƒªãƒã‚¸ãƒˆãƒª(ãªã„ã—ブランãƒ)ã®ãƒ˜ãƒƒãƒ‰è¡¨ç¤º" @@ -7995,6 +8799,15 @@ msgid " (started at %s)" msgstr "(%s ã‹ã‚‰é–‹å§‹)" +msgid "show only help for extensions" +msgstr "エクステンションã®ãƒ˜ãƒ«ãƒ—ã®ã¿ã‚’表示" + +msgid "show only help for commands" +msgstr "コマンドã«é–¢ã™ã‚‹ãƒ˜ãƒ«ãƒ—ã®ã¿ã‚’表示" + +msgid "[-ec] [TOPIC]" +msgstr "[-ec] [TOPIC]" + msgid "show help for a given topic or a help overview" msgstr "指定ã•ã‚ŒãŸãƒˆãƒ”ックã®ãƒ˜ãƒ«ãƒ—や〠ヘルプ概è¦ã®è¡¨ç¤º" @@ -8026,6 +8839,10 @@ "全コマンドã®ä¸€è¦§ã¯ \"hg help\" ã§ã€ コマンド詳細㯠\"hg -v\" ã§è¡¨ç¤ºã•ã‚Œã¾ã™" #, python-format +msgid "use \"hg help %s\" to show the full help text" +msgstr "\"hg help %s\" ã§è©³ç´°ãªãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™" + +#, python-format msgid "use \"hg -v help%s\" to show builtin aliases and global options" msgstr "組ã¿è¾¼ã¿åˆ¥åãŠã‚ˆã³ã‚°ãƒãƒ¼ãƒãƒ«ã‚ªãƒ—ションã®è¡¨ç¤ºã¯ \"hg -v help%s\"" @@ -8074,6 +8891,10 @@ msgid "options:\n" msgstr "オプション:\n" +#, python-format +msgid "use \"hg help -e %s\" to show help for the %s extension" +msgstr "\"hg help -e %s\" ã«ã‚ˆã£ã¦ã‚¨ã‚¯ã‚¹ãƒ†ãƒ³ã‚·ãƒ§ãƒ³ %s ã®ãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™" + msgid "no commands defined\n" msgstr "コマンドãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" @@ -8077,6 +8898,14 @@ msgid "no commands defined\n" msgstr "コマンドãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“\n" +#, python-format +msgid "" +"\n" +"use \"hg help -c %s\" to see help for the %s command\n" +msgstr "" +"\n" +"\"hg help -c %s\" ã«ã‚ˆã£ã¦ã‚³ãƒžãƒ³ãƒ‰ %s ã®ãƒ˜ãƒ«ãƒ—ãŒè¡¨ç¤ºã•ã‚Œã¾ã™\n" + msgid "no help text available" msgstr "ヘルプã¯ã‚ã‚Šã¾ã›ã‚“" @@ -8120,7 +8949,28 @@ "\n" "è¿½åŠ ã®ãƒ˜ãƒ«ãƒ—トピック:" +msgid "identify the specified revision" +msgstr "当該リビジョンã®è˜åˆ¥æƒ…å ±ã‚’è¡¨ç¤º" + +msgid "show local revision number" +msgstr "リビジョン番å·ã‚’表示" + +msgid "show global revision id" +msgstr "ãƒãƒƒã‚·ãƒ¥å€¤ã‚’表示" + +msgid "show branch" +msgstr "ブランãƒåを表示" + +msgid "show tags" +msgstr "タグを表示" + +msgid "show bookmarks" +msgstr "ブックマークã®è¡¨ç¤º" + +msgid "[-nibtB] [-r REV] [SOURCE]" +msgstr "[-nibtB] [-r REV] [SOURCE]" + msgid "identify the working copy or specified revision" msgstr "作æ¥é ˜åŸŸãªã„ã—特定リビジョンã®è˜åˆ¥æƒ…å ±è¡¨ç¤º" msgid "" @@ -8123,6 +8973,20 @@ msgid "identify the working copy or specified revision" msgstr "作æ¥é ˜åŸŸãªã„ã—特定リビジョンã®è˜åˆ¥æƒ…å ±è¡¨ç¤º" msgid "" -" With no revision, print a summary of the current state of the\n" +" Print a summary identifying the repository state at REV using one or\n" +" two parent hash identifiers, followed by a \"+\" if the working\n" +" directory has uncommitted changes, the branch name (if not default),\n" +" a list of tags, and a list of bookmarks." +msgstr "" +" 1ã¤ãªã„ã—2ã¤ã®è¦ªãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ã‚’使用ã—ã¦ã€\n" +" 指定リビジョンã«ãŠã‘ã‚‹è¦ç´„æƒ…å ±ã‚’è¡¨ç¤ºã—ã¾ã™ã€‚\n" +" 親リビジョンãƒãƒƒã‚·ãƒ¥ã«ç¶šã‘ã¦ã€\n" +" 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®å¤‰æ›´ãŒã‚ã‚‹å ´åˆã¯ \"+\" ã€\n" +" default 以外ã®ãƒ–ランãƒã§ã‚ã‚Œã°ãƒ–ランãƒåã€\n" +" 付与ã•ã‚Œã¦ã„ã‚‹ã‚¿ã‚°ã®ä¸€è¦§ã€\n" +" ãŠã‚ˆã³ä»˜ä¸Žã•ã‚Œã¦ã„るブックマークã®ä¸€è¦§ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" + +msgid "" +" When REV is not given, print a summary of the current state of the\n" " repository." @@ -8128,5 +8992,6 @@ " repository." -msgstr " リビジョン指定無ã—ã®èµ·å‹•ã®éš›ã«ã¯ã€ 作æ¥é ˜åŸŸã®çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚" +msgstr "" +" リビジョン指定無ã—ã§èµ·å‹•ã•ã‚ŒãŸå ´åˆã¯ã€ 作æ¥é ˜åŸŸã®çŠ¶æ…‹ã‚’表示ã—ã¾ã™ã€‚" msgid "" " Specifying a path to a repository root or Mercurial bundle will\n" @@ -8135,20 +9000,37 @@ " パス指定有りã§ã®èµ·å‹•ã®éš›ã«ã¯ã€ ä»–ã®ãƒªãƒã‚¸ãƒˆãƒªãªã„ã—ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®\n" " 状態を表示ã—ã¾ã™ã€‚" -msgid "" -" This summary identifies the repository state using one or two\n" -" parent hash identifiers, followed by a \"+\" if there are\n" -" uncommitted changes in the working directory, a list of tags for\n" -" this revision and a branch name for non-default branches." -msgstr "" -" 本コマンドã®å‡ºåŠ›ã™ã‚‹è¦ç´„æƒ…å ±ã¯ã€ 1ã¤ãªã„ã—2ã¤ã®è¦ªãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥\n" -" 値を使用ã—ã¦ã€ 作æ¥é ˜åŸŸã®çŠ¶æ…‹ã‚’è˜åˆ¥ã—ã¾ã™ã€‚ 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆã®\n" -" 変更ãŒã‚ã‚‹å ´åˆã¯ \"+\"〠当該リビジョンã«ã‚¿ã‚°ãŒä»˜ã„ã¦ã„ã‚‹å ´åˆã¯ã‚¿ã‚°ã®\n" -" 一覧〠default 以外ã®ãƒ–ランãƒã®å ´åˆã«ã¯ãƒ–ランãƒåãŒã€ ãƒãƒƒã‚·ãƒ¥å€¤ã®å¾Œã«\n" -" 続ãã¾ã™ã€‚" - -msgid "can't query remote revision number, branch, tags, or bookmarks" -msgstr "リビジョン番å·/ブランãƒ/ã‚¿ã‚°/ブックマークã¯é éš”å•ã„åˆã‚ã›ã§ãã¾ã›ã‚“" +msgid "can't query remote revision number, branch, or tags" +msgstr "リビジョン番å·/ブランãƒ/ã‚¿ã‚°ã¯é éš”å•ã„åˆã‚ã›ã§ãã¾ã›ã‚“" + +msgid "" +"directory strip option for patch. This has the same meaning as the " +"corresponding patch option" +msgstr "パスè¦ç´ 除去数(patch コマンドã®åŒåオプションã¨åŒæ©Ÿèƒ½)" + +msgid "PATH" +msgstr "パス" + +msgid "base path (DEPRECATED)" +msgstr "基底パス (éžæŽ¨å¥¨)" + +msgid "skip check for outstanding uncommitted changes" +msgstr "作æ¥é ˜åŸŸä¸ã®æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã®ç¢ºèªã‚’çœç•¥" + +msgid "don't commit, just update the working directory" +msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ã®ã¿ã§ã€ コミット実施を抑æ¢" + +msgid "apply patch without touching the working directory" +msgstr "作æ¥é ˜åŸŸã‚’改変ã›ãšã«ãƒ‘ッãƒã‚’é©ç”¨" + +msgid "apply patch to the nodes from which it was generated" +msgstr "パッãƒä½œæˆæ™‚ã¨åŒã˜è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦é©ç”¨" + +msgid "use any branch information in patch (implied by --exact)" +msgstr "パッãƒä¸ã®ãƒ–ランãƒæƒ…å ±ã‚’åˆ©ç”¨(--exact 指定時ã¯è‡ªå‹•é©ç”¨)" + +msgid "[OPTION]... PATCH..." +msgstr "[OPTION]... PATCH..." msgid "import an ordered set of patches" msgstr "パッãƒã®é †æ¬¡å–ã‚Šè¾¼ã¿" @@ -8207,6 +9089,17 @@ " 発生ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚" msgid "" +" Use --bypass to apply and commit patches directly to the\n" +" repository, not touching the working directory. Without --exact,\n" +" patches will be applied on top of the working directory parent\n" +" revision." +msgstr "" +" --bypass 指定ã™ã‚‹ã“ã¨ã§ã€ 作æ¥é ˜åŸŸã‚’改変ã›ãšã«ã€\n" +" リãƒã‚¸ãƒˆãƒªã¸å¤‰æ›´å†…容を直接åæ˜ ã•ã›ã‚‹ã“ã¨ãŒå‡ºæ¥ã¾ã™ã€‚\n" +" --exact 指定ãŒç„¡ã„å ´åˆã€ 変更内容ã®é©ç”¨å¯¾è±¡ã¯ã€\n" +" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã«ãªã‚Šã¾ã™ã€‚" + +msgid "" " With -s/--similarity, hg will attempt to discover renames and\n" " copies in the patch in the same way as 'addremove'." msgstr "" @@ -8222,9 +9115,18 @@ " URL ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ パッãƒã‚’当該 URL ã‹ã‚‰ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã—ã¾ã™ã€‚\n" " -d/--date ã§ã®æ—¥æ™‚表記㯠:hg:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +msgid "cannot use --no-commit with --bypass" +msgstr "--no-commit 㨠--bypass ã¯ä½µç”¨å‡ºæ¥ã¾ã›ã‚“" + +msgid "cannot use --similarity with --bypass" +msgstr "--similarity 㨠--bypass ã¯ä½µç”¨å‡ºæ¥ã¾ã›ã‚“" + +msgid "patch is damaged or loses information" +msgstr "パッãƒã«ã¯ç ´æãªã„ã—æƒ…å ±ã®æ¬ è½ãŒã‚ã‚Šã¾ã™" + msgid "to working directory" msgstr "作æ¥é ˜åŸŸ" msgid "not a Mercurial patch" msgstr "Mercurial å‘ã‘ã®ãƒ‘ッãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“" @@ -8225,12 +9127,9 @@ msgid "to working directory" msgstr "作æ¥é ˜åŸŸ" msgid "not a Mercurial patch" msgstr "Mercurial å‘ã‘ã®ãƒ‘ッãƒã§ã¯ã‚ã‚Šã¾ã›ã‚“" -msgid "patch is damaged or loses information" -msgstr "パッãƒã«ã¯ç ´æãªã„ã—æƒ…å ±ã®æ¬ è½ãŒã‚ã‚Šã¾ã™" - msgid "applying patch from stdin\n" msgstr "標準入力ã‹ã‚‰ã®ãƒ‘ッãƒã‚’é©ç”¨ä¸\n" @@ -8241,6 +9140,27 @@ msgid "no diffs found" msgstr "差分ãŒã‚ã‚Šã¾ã›ã‚“" +msgid "run even if remote repository is unrelated" +msgstr "連æºå…ˆãŒç„¡é–¢ä¿‚ãªãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚実行" + +msgid "show newest record first" +msgstr "æ–°ã—ã„リビジョンã‹ã‚‰å…ˆã«è¡¨ç¤º" + +msgid "file to store the bundles into" +msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®æ›¸ã出ã—å…ˆ" + +msgid "a remote changeset intended to be added" +msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョン" + +msgid "compare bookmarks" +msgstr "ブックマークã®æ¯”較" + +msgid "a specific branch you would like to pull" +msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒ–ランãƒ" + +msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" +msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" + msgid "show new changesets found in source" msgstr "指定リãƒã‚¸ãƒˆãƒªä¸ã®æœªå–ã‚Šè¾¼ã¿ãƒªãƒ“ジョンã®æ¤œç´¢" @@ -8276,6 +9196,9 @@ msgid "remote doesn't support bookmarks\n" msgstr "連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã¯ãƒ–ックマークãŒæœªã‚µãƒãƒ¼ãƒˆã§ã™\n" +msgid "[-e CMD] [--remotecmd CMD] [DEST]" +msgstr "[-e CMD] [--remotecmd CMD] [DEST]" + msgid "create a new repository in the given directory" msgstr "指定ã•ã‚ŒãŸãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã®æ–°è¦ãƒªãƒã‚¸ãƒˆãƒªã®ä½œæˆ" @@ -8296,6 +9219,18 @@ " 複製先ã¨ã—㦠``ssh://`` URL å½¢å¼ã‚’指定ã™ã‚‹ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n" " 詳細ã«é–¢ã—ã¦ã¯ã€ :hg:`help urls` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +msgid "search the repository as it is in REV" +msgstr "当該リビジョン時点ã®ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‹ã‚‰æ¤œç´¢" + +msgid "end filenames with NUL, for use with xargs" +msgstr "ファイルåã‚’NULæ–‡å—(0x00)ã§çµ‚端(xargs ã¨ã®ä½µç”¨å‘ã‘)" + +msgid "print complete paths from the filesystem root" +msgstr "ファイルシステムã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®çµ¶å¯¾ãƒ‘スã§è¡¨ç¤º" + +msgid "[OPTION]... [PATTERN]..." +msgstr "[OPTION]... [PATTERN]..." + msgid "locate files matching specific patterns" msgstr "指定ã•ã‚ŒãŸãƒ‘ターンã«åˆè‡´ã™ã‚‹åå‰ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ã®ç‰¹å®š" @@ -8333,6 +9268,42 @@ " å«ã‚€å˜ä¸€ã®ãƒ•ã‚¡ã‚¤ãƒ«åを〠\"xargs\" ãŒè¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«åã«è§£é‡ˆã—ã¦\n" " ã—ã¾ã†å•é¡Œã¯ã€ ã“ã®ã‚ªãƒ—ションã«ã‚ˆã‚Šè§£æ¶ˆã•ã‚Œã¾ã™ã€‚" +msgid "only follow the first parent of merge changesets" +msgstr "マージã®éš›ã«ã¯ç¬¬1親ã®ã¿ã‚’é¡ã‚‹" + +msgid "show revisions matching date spec" +msgstr "指定日時ã«åˆè‡´ã™ã‚‹ãƒªãƒ“ジョンを表示" + +msgid "show copied files" +msgstr "複製ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "do case-insensitive search for a given text" +msgstr "指定ã‚ーワードã«ã‚ˆã‚‹æ¤œç´¢(大文å—å°æ–‡å—ã¯ç„¡è¦–)" + +msgid "include revisions where files were removed" +msgstr "ファイルãŒç™»éŒ²é™¤å¤–ã•ã‚ŒãŸãƒªãƒ“ジョンをå«ã‚ã‚‹" + +msgid "show only merges" +msgstr "マージ実施リビジョンã®ã¿ã‚’表示" + +msgid "revisions committed by user" +msgstr "当該ユーザã«ã‚ˆã£ã¦ã‚³ãƒŸãƒƒãƒˆã•ã‚ŒãŸãƒªãƒ“ジョンを表示" + +msgid "show only changesets within the given named branch (DEPRECATED)" +msgstr "指定ã®åå‰ä»˜ãブランãƒã«å±žã™ã‚‹ãƒªãƒ“ジョンã®ã¿ã‚’表示 (éžæŽ¨å¥¨)" + +msgid "show changesets within the given named branch" +msgstr "指定ã®åå‰ä»˜ãブランãƒã«å±žã™ã‚‹ãƒªãƒ“ジョンを表示" + +msgid "do not display revision or any of its ancestors" +msgstr "当該リビジョンã¨ãã®ç¥–å…ˆã®è¡¨ç¤ºã‚’抑æ¢" + +msgid "show hidden changesets" +msgstr "éš ã‚ŒãŸãƒªãƒ“ジョンã®è¡¨ç¤º" + +msgid "[OPTION]... [FILE]" +msgstr "[OPTION]... [FILE]" + msgid "show revision history of entire repository or files" msgstr "リãƒã‚¸ãƒˆãƒªå…¨ä½“ãªã„ã—ファイルã®å¤‰æ›´å±¥æ´ã®è¡¨ç¤º" @@ -8391,6 +9362,15 @@ " 固定ã•ã‚Œã¦ã„ã‚‹ãŸã‚ã§ã™ã€‚ ファイル一覧ãŒäºˆæœŸã›ã¬å†…容ã¨ãªã‚‹ã®ã¯ã€\n" " 親åŒå£«ã§å†…容ãŒç•°ãªã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã®ã¿ãŒåˆ—挙ã•ã‚Œã‚‹ãŸã‚ã§ã™ã€‚" +msgid "revision to display" +msgstr "表示対象リビジョン" + +msgid "list files from all revisions" +msgstr "関連ã™ã‚‹å…¨ãƒ•ã‚¡ã‚¤ãƒ«ã®è¡¨ç¤º" + +msgid "[-r REV]" +msgstr "[-r REV]" + msgid "output the current or given revision of the project manifest" msgstr "ç¾æ™‚点ãªã„ã—指定時点ã§ã®ãƒªãƒã‚¸ãƒˆãƒªãƒžãƒ‹ãƒ•ã‚§ã‚¹ãƒˆã®å‡ºåŠ›" @@ -8412,6 +9392,28 @@ " --debug ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ å„ファイルã®ãƒªãƒ“ジョンã®ãƒãƒƒã‚·ãƒ¥å€¤ãŒ\n" " 表示ã•ã‚Œã¾ã™ã€‚" +msgid "" +" If option --all is specified, the list of all files from all revisions\n" +" is printed. This includes deleted and renamed files." +msgstr "" +" --all ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ リビジョンã«é–¢ã‚る全ファイルãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚\n" +" ã“ã®å ´åˆã€ 削除ï¼æ”¹å対象ファイルもå«ã¾ã‚Œã¾ã™ã€‚" + +msgid "can't specify a revision with --all" +msgstr "リビジョン指定㨠--all ã¯ä½µç”¨å‡ºæ¥ã¾ã›ã‚“" + +msgid "force a merge with outstanding changes" +msgstr "作æ¥é ˜åŸŸä¸ã®æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã”ã¨ãƒžãƒ¼ã‚¸ã‚’実施" + +msgid "revision to merge" +msgstr "マージ対象リビジョン" + +msgid "review revisions to merge (no merge is performed)" +msgstr "マージ対象リビジョンã®ç¢ºèª(マージ処ç†ã¯æœªå®Ÿæ–½)" + +msgid "[-P] [-f] [[-r] REV]" +msgstr "[-P] [-f] [[-r] REV]" + msgid "merge working directory with another revision" msgstr "作æ¥é ˜åŸŸã®å†…容ã¨ä»–ã®ãƒªãƒ“ジョンã®ãƒžãƒ¼ã‚¸" @@ -8436,11 +9438,13 @@ msgid "" " ``--tool`` can be used to specify the merge tool used for file\n" " merges. It overrides the HGMERGE environment variable and your\n" -" configuration files." -msgstr "" -" ``--tool`` を使用ã™ã‚‹ã“ã¨ã§ã€ ファイルã®ãƒžãƒ¼ã‚¸ã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’\n" -" 指定å¯èƒ½ã§ã™ã€‚ ã“ã®ã‚ªãƒ—ションã«ã‚ˆã‚‹æŒ‡å®šã¯ã€ HGMERGE 環境変数や\n" -" è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æŒ‡å®šã‚’上書ãã—ã¾ã™ã€‚" +" configuration files. See :hg:`help merge-tools` for options." +msgstr "" +" ``--tool`` を使用ã™ã‚‹ã“ã¨ã§ã€\n" +" ファイルã®ãƒžãƒ¼ã‚¸ã«ä½¿ç”¨ã™ã‚‹ã‚³ãƒžãƒ³ãƒ‰ã‚’指定å¯èƒ½ã§ã™ã€‚\n" +" ã“ã®ã‚ªãƒ—ションã«ã‚ˆã‚‹æŒ‡å®šã¯ã€\n" +" HGMERGE 環境変数やè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æŒ‡å®šã‚’上書ãã—ã¾ã™ã€‚\n" +" 指定ã®è©³ç´°ã«é–¢ã—ã¦ã¯ã€ :hg:`help merge-tools` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" " If no revision is specified, the working directory's parent is a\n" @@ -8468,24 +9472,22 @@ " Returns 0 on success, 1 if there are unresolved files.\n" " " msgstr "" -" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠未解決ファイルãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n" -" " - -#, python-format -msgid "" -"branch '%s' has %d heads - please merge with an explicit rev\n" -"(run 'hg heads .' to see heads)" -msgstr "" -"ブランム'%s' ã«ã¯ %d 個ã®ãƒ˜ãƒƒãƒ‰ã‚ã‚Šã¾ã™ - 対象を明示ã—ã¦ãã ã•ã„\n" -"('hg heads' ã§ãƒ˜ãƒƒãƒ‰ä¸€è¦§ãŒè¡¨ç¤ºã•ã‚Œã¾ã™)" - -#, python-format -msgid "" -"branch '%s' has one head - please merge with an explicit rev\n" -"(run 'hg heads' to see all heads)" -msgstr "" -"ブランム'%s' ã¯å˜ä¸€ãƒ˜ãƒƒãƒ‰ã§ã™ - 対象を明示ã—ã¦ãã ã•ã„\n" -"('hg heads' ã§ãƒ˜ãƒƒãƒ‰ä¸€è¦§ãŒè¡¨ç¤ºã•ã‚Œã¾ã™)" +" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠未解消ファイルãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n" +" " + +#, python-format +msgid "branch '%s' has %d heads - please merge with an explicit rev" +msgstr "ブランム'%s' ã«ã¯ %d 個ã®ãƒ˜ãƒƒãƒ‰ã‚ã‚Šã¾ã™ - 対象を明示ã—ã¦ãã ã•ã„" + +msgid "run 'hg heads .' to see heads" +msgstr "'hg heads .' ã«ã‚ˆã‚Šãƒ˜ãƒƒãƒ‰ã‚’一覧表示出æ¥ã¾ã™" + +#, python-format +msgid "branch '%s' has one head - please merge with an explicit rev" +msgstr "ブランム'%s' ã¯å˜ä¸€ãƒ˜ãƒƒãƒ‰ã§ã™ - 対象を明示ã—ã¦ãã ã•ã„" + +msgid "run 'hg heads' to see all heads" +msgstr "'hg heads' ã«ã‚ˆã‚Šãƒ˜ãƒƒãƒ‰ã‚’一覧表示出æ¥ã¾ã™" msgid "there is nothing to merge" msgstr "マージã®å¿…è¦ãŒã‚ã‚Šã¾ã›ã‚“" @@ -8494,12 +9496,20 @@ msgid "%s - use \"hg update\" instead" msgstr "%s - \"hg update\" を使用ã—ã¦ãã ã•ã„" -msgid "" -"working dir not at a head rev - use \"hg update\" or merge with an explicit " -"rev" -msgstr "" -"作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¯ãƒ˜ãƒƒãƒ‰ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" -"リビジョンを明示ã—ã¦ã® \"hg update\" ãªã„ã—マージを実施ã—ã¦ãã ã•ã„。" +msgid "working directory not at a head revision" +msgstr "作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¯ã€ ヘッドã§ã¯ã‚ã‚Šã¾ã›ã‚“" + +msgid "use 'hg update' or merge with an explicit revision" +msgstr "リビジョンを明示ã—ã¦ã€'hg update' ãªã„ã—マージを実施ã—ã¦ãã ã•ã„" + +msgid "a changeset intended to be included in the destination" +msgstr "åæ˜ å¯¾è±¡ã¨ã™ã‚‹ãƒªãƒ“ジョン" + +msgid "a specific branch you would like to push" +msgstr "åæ˜ å¯¾è±¡ã¨ã™ã‚‹ãƒ–ランãƒ" + +msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" +msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" msgid "show changesets not found in the destination" msgstr "連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã«å«ã¾ã‚Œãªã„ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆã®è¡¨ç¤º" @@ -8524,6 +9534,12 @@ " 1 ã§ã™ã€‚\n" " " +msgid "show parents of the specified revision" +msgstr "親リビジョンã®è¡¨ç¤ºå¯¾è±¡" + +msgid "[-r REV] [FILE]" +msgstr "[-r REV] [FILE]" + msgid "show the parents of the working directory or revision" msgstr "作æ¥é ˜åŸŸ(ãªã„ã—指定リビジョン)ã®è¦ªãƒªãƒ“ジョンã®è¡¨ç¤º" @@ -8546,6 +9562,9 @@ msgid "'%s' not found in manifest!" msgstr "'%s' ã¯ç®¡ç†å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“" +msgid "[NAME]" +msgstr "[NAME]" + msgid "show aliases for remote repositories" msgstr "連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã®åˆ¥å一覧ã®è¡¨ç¤º" @@ -8557,6 +9576,14 @@ " シンボルåãŒæŒ‡å®šã•ã‚Œãªã„å ´åˆã€ å…¨ã¦ã®åˆ¥å定義ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" msgid "" +" Option -q/--quiet suppresses all output when searching for NAME\n" +" and shows only the path names when listing all definitions." +msgstr "" +" -q/--quiet ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€\n" +" シンボルå検索ã®éŽç¨‹ã«ãŠã‘る表示ã¯æŠ‘æ¢ã•ã‚Œã€\n" +" çµæžœè¡¨ç¤ºã‚‚シンボルåã®ã¿ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" + +msgid "" " Path names are defined in the [paths] section of your\n" " configuration file and in ``/etc/mercurial/hgrc``. If run inside a\n" " repository, ``.hg/hgrc`` is used, too." @@ -8594,9 +9621,10 @@ msgid "not found!\n" msgstr "指定シンボルã¯ä¸æ˜Žã§ã™\n" -msgid "not updating, since new heads added\n" -msgstr "æ–°è¦ãƒ˜ãƒƒãƒ‰ãŒè¿½åŠ ã•ã‚ŒãŸãŸã‚〠作æ¥é ˜åŸŸã¯æ›´æ–°ã—ã¾ã›ã‚“\n" +#, python-format +msgid "not updating: %s\n" +msgstr "æ›´æ–°ä¸æ–: %s\n" msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" msgstr "(ヘッド一覧表示㯠'hg heads'〠マージ実施㯠'hg merge')\n" @@ -8599,7 +9627,13 @@ msgid "(run 'hg heads' to see heads, 'hg merge' to merge)\n" msgstr "(ヘッド一覧表示㯠'hg heads'〠マージ実施㯠'hg merge')\n" +msgid "(run 'hg heads .' to see heads, 'hg merge' to merge)\n" +msgstr "(ヘッド一覧表示㯠'hg heads .'〠マージ実施㯠'hg merge')\n" + +msgid "(run 'hg heads' to see heads)\n" +msgstr "(ヘッド一覧表示㯠'hg heads')\n" + msgid "(run 'hg update' to get a working copy)\n" msgstr "(作æ¥é ˜åŸŸã®æ›´æ–°ã¯ 'hg update')\n" @@ -8603,6 +9637,21 @@ msgid "(run 'hg update' to get a working copy)\n" msgstr "(作æ¥é ˜åŸŸã®æ›´æ–°ã¯ 'hg update')\n" +msgid "update to new branch head if changesets were pulled" +msgstr "æ–°è¦å–ã‚Šè¾¼ã¿ã®éš›ã«ã¯ä½œæ¥é ˜åŸŸã‚’æ–°è¦ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã§æ›´æ–°" + +msgid "run even when remote repository is unrelated" +msgstr "連æºå…ˆãŒç„¡é–¢ä¿‚ãªãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚実行" + +msgid "BOOKMARK" +msgstr "ブックマーク" + +msgid "bookmark to pull" +msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒ–ックマーク" + +msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" +msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" + msgid "pull changes from the specified source" msgstr "指定リãƒã‚¸ãƒˆãƒªã‹ã‚‰ã®å¤‰æ›´å±¥æ´ã®å–ã‚Šè¾¼ã¿" @@ -8642,7 +9691,7 @@ " Returns 0 on success, 1 if an update had unresolved files.\n" " " msgstr "" -" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠更新ã§æœªè§£æ±ºãƒ•ã‚¡ã‚¤ãƒ«ãŒæ¤œå‡ºã•ã‚ŒãŸå ´åˆã¯\n" +" æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠更新ã§æœªè§£æ¶ˆãƒ•ã‚¡ã‚¤ãƒ«ãŒæ¤œå‡ºã•ã‚ŒãŸå ´åˆã¯\n" " 1 ã§ã™ã€‚\n" " " @@ -8659,6 +9708,18 @@ msgid "importing bookmark %s\n" msgstr "ブックマーク %s ã®å–ã‚Šè¾¼ã¿ä¸\n" +msgid "force push" +msgstr "åæ˜ å…ˆã«ãƒ˜ãƒƒãƒ‰ãŒå¢—ãˆã‚‹å ´åˆã§ã‚‚実施" + +msgid "bookmark to push" +msgstr "åæ˜ å¯¾è±¡ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯" + +msgid "allow pushing a new branch" +msgstr "æ–°è¦ãƒ–ランãƒã®åæ˜ ã‚’è¨±å¯" + +msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" +msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" + msgid "push changes to the specified destination" msgstr "指定リãƒã‚¸ãƒˆãƒªã¸ã®å¤‰æ›´å±¥æ´ã®åæ˜ " @@ -8763,6 +9824,12 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠修復ä¸è¦ãªã„ã—修復失敗時㯠1 ã§ã™ã€‚\n" " " +msgid "record delete for missing files" +msgstr "手動ã§å‰Šé™¤æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 登録除外ã®æ—¨ã‚’記録" + +msgid "remove (and delete) file even if added or modified" +msgstr "è¿½åŠ ç™»éŒ²ï¼å¤‰æ›´å¯¾è±¡ã§ã‚ã£ã¦ã‚‚登録除外(ファイルã¯å‰Šé™¤)" + msgid "remove the specified files on the next commit" msgstr "次回コミットã«ãŠã‘る指定ファイルã®ç™»éŒ²é™¤å¤–" @@ -8776,10 +9843,12 @@ " force deletion, and -Af can be used to remove files from the next\n" " revision without deleting them from the working directory." msgstr "" -" ç¾è¡Œãƒ–ランãƒã«ãŠã‘る登録除外ã§ã‚り〠リãƒã‚¸ãƒˆãƒªå±¥æ´ã‹ã‚‰æŠ¹æ¶ˆã•ã‚Œã‚‹\n" -" ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“。 手動ã§å‰Šé™¤ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’登録除外ã™ã‚‹ã«ã¯\n" -" -A/--after を〠強制的ã«ç™»éŒ²é™¤å¤–ã™ã‚‹ã«ã¯ -f/--force を〠作æ¥é ˜åŸŸä¸ã®\n" -" ファイルを削除ã™ã‚‹ã“ã¨ãªã登録除外ã™ã‚‹ã«ã¯ -Af を指定ã—ã¾ã™ã€‚" +" ç¾è¡Œãƒ–ランãƒã«ãŠã‘る登録除外ã§ã‚ã‚Šã€\n" +" リãƒã‚¸ãƒˆãƒªå±¥æ´ã‹ã‚‰æŠ¹æ¶ˆã•ã‚Œã‚‹ã‚ã‘ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n" +" 手動ã§å‰Šé™¤ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’登録除外ã™ã‚‹ã«ã¯ -A/--after ã‚’ã€\n" +" 強制的ã«ç™»éŒ²é™¤å¤–ã™ã‚‹ã«ã¯ -f/--force ã‚’ã€\n" +" 登録除外ã®éš›ã«ã€ä½œæ¥é ˜åŸŸä¸ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’削除ã—ãªã„å ´åˆã«ã¯\n" +" -Af を指定ã—ã¾ã™ã€‚" msgid "" " The following table details the behavior of remove for different\n" @@ -8788,9 +9857,10 @@ " reported by :hg:`status`). The actions are Warn, Remove (from\n" " branch) and Delete (from disk)::" msgstr "" -" ファイルã®çŠ¶æ…‹(横)ã¨ã‚ªãƒ—ション指定(縦)ã®çµ„ã¿åˆã‚ã›ã«ãŠã‘る挙動ã¯ã€\n" -" 以下ã®ä¸€è¦§ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 ファイルã®çŠ¶æ…‹ã¯ã€ :hg:`status` ã®è¡¨ç¤º\n" -" ã«å€£ã„ã€ è¿½åŠ (Added)[A]〠改変無ã—(Clean)[C]〠改変有り(Modified)[M]\n" +" ファイルã®çŠ¶æ…‹(横)ã¨ã€ オプション指定(縦)ã®çµ„ã¿åˆã‚ã›ã«ãŠã‘る挙動ã¯ã€\n" +" 以下ã®ä¸€è¦§ã‚’å‚ç…§ã—ã¦ãã ã•ã„。\n" +" ファイルã®çŠ¶æ…‹ã¯ã€ :hg:`status` ã®è¡¨ç¤ºã«å€£ã„ã€\n" +" è¿½åŠ (Added)[A]〠改変無ã—(Clean)[C]〠改変有り(Modified)[M]\n" " ãŠã‚ˆã³ä¸åœ¨(Missing)[!] ã§è¡¨ã—ã¾ã™ã€‚\n" " 挙動ã¯ã€ è¦å‘Š(Warn)[W]〠構æˆç®¡ç†ã‹ã‚‰ã®ç™»éŒ²é™¤å¤–(Remove)[R] ãŠã‚ˆã³\n" " 作æ¥é ˜åŸŸã‹ã‚‰ã®å‰Šé™¤(Delete)[D] ã§è¡¨ã—ã¾ã™::" @@ -8809,6 +9879,14 @@ " -Af R R R R" msgid "" +" Note that remove never deletes files in Added [A] state from the\n" +" working directory, not even if option --force is specified." +msgstr "" +" 作æ¥é ˜åŸŸã«ãŠã‘ã‚‹è¿½åŠ [A] 状態ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«é–¢ã—ã¦ã¯ã€\n" +" --force を指定ã—ãªãã¦ã‚‚ã€\n" +" 登録除外æ“作ã«ã‚ˆã£ã¦ç ´æ£„ã•ã‚Œã‚‹ã“ã¨ã¯ã‚ã‚Šã¾ã›ã‚“。" + +msgid "" " This command schedules the files to be removed at the next commit.\n" " To undo a remove before that, see :hg:`revert`." msgstr "" @@ -8841,6 +9919,12 @@ msgstr "" "%s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“: ファイルã¯è¿½åŠ 登録対象ã§ã™(削除ã®å¼·è¡Œã¯ -f を指定)\n" +msgid "record a rename that has already occurred" +msgstr "手動ã§æ”¹å済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 改åã®æ—¨ã‚’記録" + +msgid "[OPTION]... SOURCE... DEST" +msgstr "[OPTION]... SOURCE... DEST" + msgid "rename files; equivalent of copy + remove" msgstr "ファイルã®æ”¹å(copy + remove ã¨ç‰ä¾¡)" @@ -8860,6 +9944,21 @@ " 本コマンドã®å®Ÿè¡Œçµæžœã¯æ¬¡å›žã®ã‚³ãƒŸãƒƒãƒˆã®éš›ã«åŠ¹æžœã‚’発æ®ã—ã¾ã™ã€‚ 改å\n" " æ“作ã®ã‚³ãƒŸãƒƒãƒˆå‰å–り消ã—㯠:hg:`help revert` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" +msgid "select all unresolved files" +msgstr "è¡çªæœªè§£æ¶ˆã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã«ã™ã‚‹" + +msgid "list state of files needing merge" +msgstr "マージã®å¿…è¦ãªãƒ•ã‚¡ã‚¤ãƒ«ã®è§£æ¶ˆçŠ¶æ…‹ä¸€è¦§" + +msgid "mark files as resolved" +msgstr "当該ファイルをè¡çªè§£æ¶ˆæ¸ˆã¿çŠ¶æ…‹ã«è¨å®š" + +msgid "mark files as unresolved" +msgstr "当該ファイルをè¡çªæœªè§£æ¶ˆçŠ¶æ…‹ã«è¨å®š" + +msgid "hide status prefix" +msgstr "状態記å·ã®è¡¨ç¤ºã‚’抑æ¢" + msgid "redo merges or set/view the merge status of files" msgstr "マージã®å†å®Ÿæ–½ã€ ãªã„ã—å„ファイルã®ãƒžãƒ¼ã‚¸çŠ¶æ³ç®¡ç†" @@ -8945,8 +10044,23 @@ msgid "no files or directories specified; use --all to remerge all files" msgstr "å†ãƒžãƒ¼ã‚¸ã«ã¯ã€ ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã€ --all を指定ã—ã¦ãã ã•ã„" -msgid "restore individual files or directories to an earlier state" -msgstr "ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªçŠ¶æ…‹ã®å¾©æ—§" +msgid "revert all changes when no arguments given" +msgstr "引数指定ãŒç„¡ã„å ´åˆã«ã€ 全ファイルã®å†…容を復旧" + +msgid "tipmost revision matching date" +msgstr "当該日時ã®æœ€æ–°ãƒªãƒ“ジョンを使用" + +msgid "revert to the specified revision" +msgstr "当該リビジョン時点ã®å†…容ã§å¾©æ—§" + +msgid "do not save backup copies of files" +msgstr "å–り消ã—実施å‰å†…容ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—を抑æ¢" + +msgid "[OPTION]... [-r REV] [NAME]..." +msgstr "[OPTION]... [-r REV] [NAME]..." + +msgid "restore files to their checkout state" +msgstr "親リビジョンã®çŠ¶æ…‹ã§ãƒ•ã‚¡ã‚¤ãƒ«ã‚’復旧" msgid "" " .. note::\n" @@ -8950,11 +10064,7 @@ msgid "" " .. note::\n" -" This command is most likely not what you are looking for.\n" -" Revert will partially overwrite content in the working\n" -" directory without changing the working directory parents. Use\n" -" :hg:`update -r rev` to check out earlier revisions, or\n" -" :hg:`update --clean .` to undo a merge which has added another\n" -" parent." +" To check out earlier revisions, you should use :hg:`update REV`.\n" +" To cancel a merge (and lose your changes), use :hg:`update --clean .`." msgstr "" " .. note::\n" @@ -8959,30 +10069,29 @@ msgstr "" " .. note::\n" -" 本コマンドã¯ã€ ã‚ãªãŸã®æœŸå¾…ã™ã‚‹ã‚‚ã®ã¨é•ã†å¯èƒ½æ€§ãŒé«˜ã„ã§ã™ã€‚\n" -" 本コマンドã¯ã€ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¯ãã®ã¾ã¾ã§ã€ 作æ¥é ˜åŸŸã®\n" -" 一部を上書ãã—ã¾ã™ã€‚\n" -" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを変更ã™ã‚‹å ´åˆã¯ :hg:`update -r rev` ã‚’ã€\n" -" ä»–ã®ãƒªãƒ“ジョンã¨ã®ãƒžãƒ¼ã‚¸ã‚’å–り消ã™å ´åˆã¯\n" -" :hg:`update --clean .` を使用ã—ã¦ãã ã•ã„。" - -msgid "" -" With no revision specified, revert the named files or directories\n" -" to the contents they had in the parent of the working directory.\n" -" This restores the contents of the affected files to an unmodified\n" -" state and unschedules adds, removes, copies, and renames. If the\n" -" working directory has two parents, you must explicitly specify a\n" -" revision." -msgstr "" -" リビジョン指定ãŒç„¡ã„å ´åˆã€ 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’作æ¥\n" -" é ˜åŸŸã®è¦ªãƒªãƒ“ジョン時点ã®å†…容ã¸ã¨å¾©æ—§ã—ã¾ã™ã€‚ 本コマンドã¯å¯¾è±¡\n" -" ファイルã«å¯¾ã—ã¦ã€ 状態を「改変無ã—ã€ã¨ã—〠add/remove/copy/rename\n" -" 実行ã®åŠ¹æžœã‚’打ã¡æ¶ˆã—ã¾ã™ã€‚ 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンãŒ2ã¤ã‚ã‚‹å ´åˆã¯ã€\n" -" ã©ã¡ã‚‰ã®å†…容ã§å¾©æ—§ã™ã‚‹ã®ã‹ã‚’明示的ã«æŒ‡å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" - -msgid "" -" Using the -r/--rev option, revert the given files or directories\n" -" to their contents as of a specific revision. This can be helpful\n" -" to \"roll back\" some or all of an earlier change. See :hg:`help\n" -" dates` for a list of formats valid for -d/--date." +" 作æ¥é ˜åŸŸã‚’別リビジョン時点ã«å¤‰æ›´ã—ãŸã„å ´åˆã¯ã€\n" +" :hg:`update 対象リビジョン` を実行ã—ã¦ãã ã•ã„。\n" +" マージã®å®Ÿæ–½ã‚’å–り消ã™å ´åˆã¯ã€\n" +" :hg:`update --clean .` を実行ã—ã¦ãã ã•ã„\n" +" (マージã«ãŠã‘ã‚‹ä¿®æ£å†…容ã¯ç ´æ£„ã•ã‚Œã¾ã™)" + +msgid "" +" With no revision specified, revert the specified files or directories\n" +" to the state they had in the first parent of the working directory.\n" +" This restores the contents of files to an unmodified\n" +" state and unschedules adds, removes, copies, and renames." +msgstr "" +" リビジョン指定ãŒç„¡ã„å ´åˆã¯ã€ \n" +" 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã€\n" +" 作æ¥é ˜åŸŸã®ç¬¬1親リビジョン時点ã®å†…容ã¸ã¨å¾©æ—§ã—ã¾ã™ã€‚\n" +" 本コマンドã¯å¯¾è±¡ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 状態を「改変無ã—ã€ã¨ã—ã€\n" +" add/remove/copy/rename ã®å®Ÿæ–½äºˆå®šã‚’å–り消ã—ã¾ã™ã€‚" + +msgid "" +" Using the -r/--rev or -d/--date options, revert the given files or\n" +" directories to their states as of a specific revision. Because\n" +" revert does not change the working directory parents, this will\n" +" cause these files to appear modified. This can be helpful to \"back\n" +" out\" some or all of an earlier change. See :hg:`backout` for a\n" +" related method." msgstr "" " -r/--rev ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã€\n" @@ -8987,35 +10096,8 @@ msgstr "" " -r/--rev ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚’ã€\n" -" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®å†…容ã¸ã¨å¾©æ—§ã—ã¾ã™ã€‚ 以å‰ã®å¤‰æ›´å†…容ã®ä¸€éƒ¨\n" -" ãªã„ã—全部をå–り消ã™ç”¨é€”ã«ã‚‚使用ã§ãã¾ã™ã€‚ -d/--date ã§ã®æ—¥æ™‚表記ã¯\n" -" :hg:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" - -msgid "" -" Revert modifies the working directory. It does not commit any\n" -" changes, or change the parent of the working directory. If you\n" -" revert to a revision other than the parent of the working\n" -" directory, the reverted files will thus appear modified\n" -" afterwards." -msgstr "" -" 本コマンドã¯ä½œæ¥é ˜åŸŸã®å†…容ã¯å¤‰æ›´ã—ã¾ã™ãŒã€ 変更ã®ã‚³ãƒŸãƒƒãƒˆã‚„〠作æ¥\n" -" é ˜åŸŸã®è¦ªãƒªãƒ“ジョンã¯å¤‰æ›´ã—ã¾ã›ã‚“。 ãã®ãŸã‚〠作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョン\n" -" 以外ã®ãƒªãƒ“ジョンを指定ã—ã¦å¾©æ—§ã—ãŸå ´åˆã€ 復旧後ã®ãƒ•ã‚¡ã‚¤ãƒ«ã®çŠ¶æ…‹ã¯\n" -" 「改変有りã€ã¨ã—ã¦æ‰±ã‚ã‚Œã¾ã™ã€‚" - -msgid "" -" If a file has been deleted, it is restored. If the executable mode\n" -" of a file was changed, it is reset." -msgstr "" -" ファイルãŒå‰Šé™¤ã•ã‚Œã¦ã„ãŸå ´åˆã€ ファイルã¯å¾©æ—§ã•ã‚Œã¾ã™ã€‚ 実行権é™ãŒå¤‰æ›´\n" -" ã•ã‚Œã¦ã„ãŸå ´åˆã€ 変更å‰ã®çŠ¶æ…‹ã«å¾©æ—§ã•ã‚Œã¾ã™ã€‚" - -msgid "" -" If names are given, all files matching the names are reverted.\n" -" If no arguments are given, no files are reverted." -msgstr "" -" 復旧対象ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ 指定ã•ã‚ŒãŸåå‰ã«åˆè‡´ã™ã‚‹å…¨ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«ãŒ\n" -" 復旧対象ã¨ãªã‚Šã¾ã™ã€‚ 復旧対象ãŒæŒ‡å®šã•ã‚Œãªã‹ã£ãŸå ´åˆã¯ã€ ã„ãšã‚Œã®\n" -" ファイルも復旧ã•ã‚Œã¾ã›ã‚“。" +" 指定ã•ã‚ŒãŸãƒªãƒ“ジョン時点ã®å†…容ã¸ã¨å¾©æ—§ã—ã¾ã™ã€‚\n" +" 以å‰ã®å¤‰æ›´å†…容ã®ä¸€éƒ¨ãªã„ã—全部を〠å–り消ã™ç”¨é€”ã«ã‚‚使用ã§ãã¾ã™ã€‚\n" +" -d/--date ã§ã®æ—¥æ™‚表記㯠:hg:`help dates` ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" msgid "" " Modified files are saved with a .orig suffix before reverting.\n" @@ -9027,11 +10109,34 @@ msgid "you can't specify a revision and a date" msgstr "リビジョンã¨æ—¥æ™‚ã¯åŒæ™‚ã«ã¯æŒ‡å®šå‡ºæ¥ã¾ã›ã‚“" -msgid "uncommitted merge - use \"hg update\", see \"hg help revert\"" -msgstr "マージãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™(\"hg update\" 実施åˆã¯ \"hg help revert\" å‚ç…§)" - -msgid "no files or directories specified; use --all to revert the whole repo" -msgstr "復旧ã«ã¯ã€ ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‹ã€ --all を指定ã—ã¦ãã ã•ã„" +msgid "no files or directories specified" +msgstr "ファイルï¼ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæŒ‡å®šãŒã‚ã‚Šã¾ã›ã‚“" + +msgid "" +"uncommitted merge, use --all to discard all changes, or 'hg update -C .' to " +"abort the merge" +msgstr "" +"マージãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™ -å¤‰æ›´å…¨ç ´æ£„ãªã‚‰ --all 付ã実行ã€ãƒžãƒ¼ã‚¸å–ã‚Šã‚„ã‚ãªã‚‰ " +"'hg update -C .' 実行" + +#, python-format +msgid "" +"uncommitted changes, use --all to discard all changes, or 'hg update %s' to " +"update" +msgstr "" +"変更ãŒæœªã‚³ãƒŸãƒƒãƒˆã§ã™ -å¤‰æ›´å…¨ç ´æ£„ãªã‚‰ --all 付ã実行ã€ä½œæ¥é ˜åŸŸæ›´æ–°ãªã‚‰ 'hg " +"update %s' 実行" + +#, python-format +msgid "use --all to revert all files, or 'hg update %s' to update" +msgstr "" +"全ファイル復旧ãªã‚‰ --all 付ã実行ã€ä½œæ¥é ˜åŸŸæ›´æ–°ãªã‚‰ 'hg update %s' 実行" + +msgid "uncommitted changes, use --all to discard all changes" +msgstr "未コミット変更ãŒã‚ã‚Šã¾ã™ - å¤‰æ›´å…¨ç ´æ£„ãªã‚‰ --all 付ã実行" + +msgid "use --all to revert all files" +msgstr "全ファイル復旧ãªã‚‰ --all 付ã実行" #, python-format msgid "forgetting %s\n" @@ -9124,6 +10229,51 @@ msgid " Print the root directory of the current repository." msgstr " ç¾ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªä½ç½®ã‚’表示ã—ã¾ã™ã€‚" +msgid "name of access log file to write to" +msgstr "アクセスãƒã‚°ã®æ›¸ã出ã—先ファイル" + +msgid "name of error log file to write to" +msgstr "エラーãƒã‚°ã®æ›¸ã出ã—先ファイル" + +msgid "PORT" +msgstr "ãƒãƒ¼ãƒˆç•ªå·" + +msgid "port to listen on (default: 8000)" +msgstr "è¦æ±‚å—ã‘付ã‘ãƒãƒ¼ãƒˆç•ªå·(既定値: 8000)" + +msgid "address to listen on (default: all interfaces)" +msgstr "è¦æ±‚å—ã‘付ã‘アドレス(既定値: 全インタフェース)" + +msgid "ADDR" +msgstr "アドレス" + +msgid "prefix path to serve from (default: server root)" +msgstr "公開パス接é 辞(既定値: ルート)" + +msgid "name to show in web pages (default: working directory)" +msgstr "表示å(既定値: 作æ¥é ˜åŸŸã®ãƒ‘ス)" + +msgid "name of the hgweb config file (see \"hg help hgweb\")" +msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½®(\"hg help hgweb\" å‚ç…§)" + +msgid "name of the hgweb config file (DEPRECATED)" +msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½® (éžæŽ¨å¥¨)" + +msgid "for remote clients" +msgstr "(ホスト間連æºã§ã®å†…部用途å‘ã‘)" + +msgid "web templates to use" +msgstr "当該テンプレートã§è¡¨ç¤ºã‚’カスタマイズ" + +msgid "template style to use" +msgstr "当該スタイルã§è¡¨ç¤ºã‚’カスタマイズ" + +msgid "use IPv6 in addition to IPv4" +msgstr "IPv4 ã«åŠ ãˆã¦ IPv6 を使用" + +msgid "SSL certificate file" +msgstr "SSL 証明書ファイル" + msgid "start stand-alone webserver" msgstr "独立ã—ãŸã‚¦ã‚§ãƒ–サーãƒã®å®Ÿè¡Œé–‹å§‹" @@ -9168,6 +10318,9 @@ " サーãƒã«ç©ºããƒãƒ¼ãƒˆç•ªå·ã®æ¤œå‡ºãŠã‚ˆã³ä½¿ç”¨ã‚’ã•ã›ã‚‹å ´åˆã€ ãƒãƒ¼ãƒˆç•ªå·ã«ã¯\n" " 0 を指定ã—ã¾ã™ã€‚ ã“ã®å ´åˆã€ 使用ã™ã‚‹ãƒãƒ¼ãƒˆç•ªå·ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚" +msgid "cannot use --stdio with --cmdserver" +msgstr "--stdio 㨠--cmdserver ã¯ä½µç”¨ã§ãã¾ã›ã‚“" + msgid "There is no Mercurial repository here (.hg not found)" msgstr "Mercurial リãƒã‚¸ãƒˆãƒªãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“(.hg ãŒä¸åœ¨ã§ã™)" @@ -9175,6 +10328,77 @@ msgid "listening at http://%s%s/%s (bound to %s:%d)\n" msgstr "http://%s%s/%s ã§å¾…ã¡å—ã‘開始(ãƒã‚¤ãƒ³ãƒ‰å…ˆã¯ %s:%d)\n" +msgid "show untrusted configuration options" +msgstr "ä¿¡é ¼ã§ããªã„è¨å®šé …目も表示" + +msgid "[-u] [NAME]..." +msgstr "[-u] [NAME]..." + +msgid "show combined config settings from all hgrc files" +msgstr "å…¨è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚ˆã‚‹æœ€çµ‚çš„ãªè¨å®šå†…容ã®è¡¨ç¤º" + +msgid " With no arguments, print names and values of all config items." +msgstr "" +" 引数指定ãŒç„¡ã„å ´åˆã€ å…¨ã¦ã®è¨å®šé …ç›®ã«å¯¾ã—ã¦ã€ åå‰ã¨å€¤ã‚’表示ã—ã¾ã™ã€‚" + +msgid "" +" With one argument of the form section.name, print just the value\n" +" of that config item." +msgstr "" +" 'section.name' å½¢å¼ã«åˆè‡´ã™ã‚‹å¼•æ•°ã‚’1ã¤ã ã‘指定ã—ãŸå ´åˆã€ ãã®è¨å®šé …ç›®\n" +" 値ã®ã¿ã‚’表示ã—ã¾ã™ã€‚" + +msgid "" +" With multiple arguments, print names and values of all config\n" +" items with matching section names." +msgstr "" +" 複数ã®å¼•æ•°ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãれらをセクションåã¨ã¿ãªã—〠該当ã™ã‚‹\n" +" セクションã®è¨å®šé …目を全ã¦è¡¨ç¤ºã—ã¾ã™ã€‚" + +msgid "" +" With --debug, the source (filename and line number) is printed\n" +" for each config item." +msgstr "" +" --debug 指定ãŒã‚ã‚‹å ´åˆã€ è¨å®šé …目毎ã«è¨˜è¿°ä½ç½®(ファイルåã¨è¡Œç•ªå·)ãŒ\n" +" 表示ã•ã‚Œã¾ã™ã€‚\n" +" " + +msgid "only one config item permitted" +msgstr "複数ã®è¨å®šé …目指定ã¯ç„¡åŠ¹ã§ã™" + +msgid "show status of all files" +msgstr "å…¨ã¦ã®çŠ¶æ…‹ã‚’表示" + +msgid "show only modified files" +msgstr "変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "show only added files" +msgstr "è¿½åŠ ç™»éŒ²ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "show only removed files" +msgstr "登録除外ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "show only deleted (but tracked) files" +msgstr "削除ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«(登録除外ã¯æœªå®Ÿæ–½)を表示" + +msgid "show only files without changes" +msgstr "変更ã®ç„¡ã„ファイルを表示" + +msgid "show only unknown (not tracked) files" +msgstr "構æˆç®¡ç†å¯¾è±¡å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "show only ignored files" +msgstr "無視対象ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" + +msgid "show source of copied files" +msgstr "複製元ファイルを表示" + +msgid "show difference from revision" +msgstr "当該リビジョンã¨ã®å·®åˆ†ã§çŠ¶æ…‹ã‚’判定" + +msgid "list the changed files of a revision" +msgstr "指定リビジョンã«ãŠã‘る更新ファイルã®ä¸€è¦§" + msgid "show changed files in the working directory" msgstr "作æ¥é ˜åŸŸã®ãƒ•ã‚¡ã‚¤ãƒ«æ“作状æ³ã®è¡¨ç¤º" @@ -9248,6 +10472,9 @@ " I = 無視(Ignored)\n" " = ç›´å‰ã«è¡¨ç¤ºã•ã‚Œã‚‹æ–°è¦ç™»éŒ²äºˆå®šãƒ•ã‚¡ã‚¤ãƒ«(A)ã®è¤‡è£½å…ƒ" +msgid "check for push and pull" +msgstr "push/pull 実施çµæžœã®ç¢ºèª" + msgid "summarize working directory state" msgstr "作æ¥é ˜åŸŸçŠ¶æ…‹ã®æ¦‚è¦è¡¨ç¤º" @@ -9313,7 +10540,7 @@ #, python-format msgid "%d unresolved" -msgstr "è¡çªæœªè§£æ±ºãƒ•ã‚¡ã‚¤ãƒ« %d" +msgstr "è¡çªæœªè§£æ¶ˆãƒ•ã‚¡ã‚¤ãƒ« %d" #, python-format msgid "%d subrepos" @@ -9371,6 +10598,24 @@ msgid "remote: (synced)\n" msgstr "想定連æºçµæžœ : (åŒæœŸæ¸ˆã¿)\n" +msgid "force tag" +msgstr "タグ付ã‘ã®å¼·åˆ¶å®Ÿæ–½" + +msgid "make the tag local" +msgstr "ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã¨ã—ã¦ä½œæˆ" + +msgid "revision to tag" +msgstr "タグ付ã‘対象リビジョン" + +msgid "remove a tag" +msgstr "ã‚¿ã‚°ã®å‰Šé™¤" + +msgid "use <text> as commit message" +msgstr "コミットメッセージ" + +msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." +msgstr "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." + msgid "add one or more tags for the current or given revision" msgstr "ç¾ãƒªãƒ“ジョンãªã„ã—指定リビジョンã¸ã®ã‚¿ã‚°ã®ä»˜ä¸Ž" @@ -9472,6 +10717,9 @@ " -v/--verbose ãŒæŒ‡å®šã•ã‚ŒãŸå ´åˆã€ ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã«ã¯ \"local\" 表示ã®\n" " 第3ã®ã‚«ãƒ©ãƒ ãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚" +msgid "[-p] [-g]" +msgstr "[-p] [-g]" + msgid "show the tip revision" msgstr "tip リビジョンã®è¡¨ç¤º" @@ -9495,6 +10743,12 @@ " リãƒã‚¸ãƒˆãƒªã§ã® tip ãŒç¾ãƒªãƒã‚¸ãƒˆãƒªã® tip ã¨ãªã‚Šã¾ã™ã€‚ \"tip\" ã‚¿ã‚°ã¯\n" " 特別ãªã‚¿ã‚°ã§ã€ 改åや〠他ã®ãƒªãƒ“ジョンã¸ã®ä»˜ã‘替ãˆã¯ã§ãã¾ã›ã‚“。" +msgid "update to new branch head if changesets were unbundled" +msgstr "æ–°è¦å–ã‚Šè¾¼ã¿ã®éš›ã«ã¯ä½œæ¥é ˜åŸŸã‚’æ–°è¦ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã§ã§æ›´æ–°" + +msgid "[-u] FILE..." +msgstr "[-u] FILE..." + msgid "apply one or more changegroup files" msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®é©ç”¨" @@ -9510,6 +10764,15 @@ " æˆåŠŸæ™‚ã®ã‚³ãƒžãƒ³ãƒ‰çµ‚了値㯠0〠è¡çªæœªè§£æ¶ˆãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹å ´åˆã¯ 1 ã§ã™ã€‚\n" " " +msgid "discard uncommitted changes (no backup)" +msgstr "未コミット変更内容ã®ç ´æ£„(ä¿å˜ç„¡ã—)" + +msgid "update across branches if no uncommitted changes" +msgstr "未コミット変更ãŒç„¡ã„å ´åˆã€ ブランãƒæ¨ªæ–ã§ã‚‚更新を実施ã—ã¾ã™" + +msgid "[-c] [-C] [-d DATE] [[-r] REV]" +msgstr "[-c] [-C] [-d DATE] [[-r] REV]" + msgid "update working directory (or switch revisions)" msgstr "作æ¥é ˜åŸŸã®å†…容更新(ãªã„ã—リビジョンã®åˆ‡ã‚Šæ›¿ãˆ)" @@ -9535,6 +10798,13 @@ " 作æ¥é ˜åŸŸã‚’指定リビジョンã§æ›´æ–°ã—ã¾ã™ã€‚" msgid "" +" Update sets the working directory's parent revison to the specified\n" +" changeset (see :hg:`help parents`)." +msgstr "" +" 作æ¥é ˜åŸŸã®è¦ªãƒªãƒ“ジョンを〠指定ã•ã‚ŒãŸãƒªãƒ“ジョンã«æ›´æ–°ã—ã¾ã™\n" +" (:hg:`help parents` å‚ç…§)。" + +msgid "" " The following rules apply when the working directory contains\n" " uncommitted changes:" msgstr " 作æ¥é ˜åŸŸã«æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ãŒã‚ã‚‹å ´åˆã€ 以下ã®è¦å‰‡ãŒé©ç”¨ã•ã‚Œã¾ã™:" @@ -9578,11 +10848,11 @@ " (:hg:`clone -U` ã¨åŒç‰)。" msgid "" -" If you want to update just one file to an older changeset, use\n" -" :hg:`revert`." -msgstr "" -" 特定ã®ãƒ•ã‚¡ã‚¤ãƒ«ã ã‘を以å‰ã®çŠ¶æ…‹ã«æˆ»ã™å ´åˆã¯ :hg:`revert`\n" -" を使用ã—ã¦ãã ã•ã„。" +" If you want to revert just one file to an older revision, use\n" +" :hg:`revert [-r REV] NAME`." +msgstr "" +" 特定ã®ãƒ•ã‚¡ã‚¤ãƒ«ã ã‘を以å‰ã®çŠ¶æ…‹ã«æˆ»ã™å ´åˆã¯ã€\n" +" :hg:`revert [-r リビジョン] ファイルå` を使用ã—ã¦ãã ã•ã„。" msgid "cannot specify both -c/--check and -C/--clean" msgstr "-c/--check 㨠-C/--clean ã¯ä½µç”¨ã§ãã¾ã›ã‚“" @@ -9627,808 +10897,13 @@ "é ’å¸ƒæ¡ä»¶ã«é–¢ã—ã¦ã¯åŒæ¢±ã•ã‚Œã‚‹ãƒ©ã‚¤ã‚»ãƒ³ã‚¹æ¡é …ã‚’ãŠèªã¿ãã ã•ã„。\n" "å¸‚å ´é©åˆæ€§ã‚„特定用途ã¸ã®å¯å¦ã‚’å«ã‚〠本製å“ã¯ç„¡ä¿è¨¼ã§ã™ã€‚\n" -msgid "repository root directory or name of overlay bundle file" -msgstr "リãƒã‚¸ãƒˆãƒªã®ãƒ«ãƒ¼ãƒˆä½ç½®ã€ ãªã„ã—ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒ‘ス" - -msgid "DIR" -msgstr "ディレクトリ" - -msgid "change working directory" -msgstr "作æ¥é ˜åŸŸã®å¤‰æ›´" - -msgid "do not prompt, assume 'yes' for any required answers" -msgstr "å•ã„åˆã‚ã›ã‚’ã›ãšã€ 確èªäº‹é …ã¯å…¨ã¦ 'yes' ã¨ã¿ãªã™" - -msgid "suppress output" -msgstr "出力を抑æ¢" - -msgid "enable additional output" -msgstr "ä»˜åŠ çš„ãªå‡ºåŠ›ã‚’有効化" - -msgid "set/override config option (use 'section.name=value')" -msgstr "オプションè¨å®šã‚’指定ï¼ä¸Šæ›¸ã(指定形å¼ã¯ 'section.name=value')" - -msgid "CONFIG" -msgstr "è¨å®š" - -msgid "enable debugging output" -msgstr "デãƒãƒƒã‚°å‡ºåŠ›ã‚’有効化" - -msgid "start debugger" -msgstr "デãƒãƒƒã‚¬ã‚’開始" - -msgid "set the charset encoding" -msgstr "æ–‡å—エンコーディングã®è¨å®š" - -msgid "ENCODE" -msgstr "æ–‡å—コード" - -msgid "MODE" -msgstr "モード" - -msgid "set the charset encoding mode" -msgstr "æ–‡å—エンコーディングã®ãƒ¢ãƒ¼ãƒ‰è¨å®š" - -msgid "always print a traceback on exception" -msgstr "例外発生ã®éš›ã«å¸¸ã«ãƒˆãƒ¬ãƒ¼ã‚¹ãƒãƒƒã‚¯ã‚’表示" - -msgid "time how long the command takes" -msgstr "コマンド実行ã®æ‰€è¦æ™‚間を計測" - -msgid "print command execution profile" -msgstr "コマンド実行ã®ãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "output version information and exit" -msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦çµ‚了" - -msgid "display help and exit" -msgstr "ãƒ˜ãƒ«ãƒ—æƒ…å ±ã‚’è¡¨ç¤ºã—ã¦çµ‚了" - -msgid "do not perform actions, just print output" -msgstr "実施予定ã®å‡¦ç†å†…容ã®è¡¨ç¤ºã®ã¿ã§å‡¦ç†å®Ÿæ–½ã¯æŠ‘æ¢" - -msgid "specify ssh command to use" -msgstr "SSH 連æºã§ä½¿ç”¨ã™ã‚‹ ssh コマンド" - -msgid "specify hg command to run on the remote side" -msgstr "é 隔ホストå´ã§å®Ÿè¡Œã•ã‚Œã‚‹ hg コマンド" - -msgid "do not verify server certificate (ignoring web.cacerts config)" -msgstr "サーãƒè¨¼æ˜Žæ›¸ã®æ¤œè¨¼çœç•¥(web.cacerts è¨å®šã®ç„¡è¦–)" - -msgid "PATTERN" -msgstr "パターン" - -msgid "include names matching the given patterns" -msgstr "パターンã«åˆè‡´ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã«è¿½åŠ " - -msgid "exclude names matching the given patterns" -msgstr "パターンã«åˆè‡´ã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã‹ã‚‰é™¤å¤–" - -msgid "use text as commit message" -msgstr "指定テã‚ストをコミットメッセージã¨ã—ã¦ä½¿ç”¨" - -msgid "read commit message from file" -msgstr "コミットメッセージをファイルã‹ã‚‰èªã¿è¾¼ã¿" - -msgid "record datecode as commit date" -msgstr "記録ã•ã‚Œã‚‹æ—¥æ™‚æƒ…å ±" - -msgid "record the specified user as committer" -msgstr "記録ã•ã‚Œã‚‹ä½œæˆè€…æƒ…å ±" - -msgid "STYLE" -msgstr "スタイル" - -msgid "display using template map file" -msgstr "当該スタイルã§è¡¨ç¤ºã‚’カスタマイズ" - -msgid "display with template" -msgstr "当該テンプレートã§è¡¨ç¤ºã‚’カスタマイズ" - -msgid "do not show merges" -msgstr "マージ実施リビジョンã®è¡¨ç¤ºæŠ‘æ¢" - -msgid "output diffstat-style summary of changes" -msgstr "diffstat å½¢å¼ã®å¤‰æ›´æ¦‚è¦ã‚’生æˆ" - -msgid "treat all files as text" -msgstr "全ファイルをテã‚ストファイルã¨ä»®å®š" - -msgid "omit dates from diff headers" -msgstr "差分表示ã®éš›ã«æ—¥ä»˜æƒ…å ±ã®è¡¨ç¤ºã‚’抑æ¢" - -msgid "show which function each change is in" -msgstr "差分表示ã®éš›ã«é–¢æ•°åæƒ…å ±ã‚’è¡¨ç¤º" - -msgid "produce a diff that undoes the changes" -msgstr "変更をå–り消ã™ãŸã‚ã®å·®åˆ†ã‚’生æˆ" - -msgid "ignore white space when comparing lines" -msgstr "差分判定ã®éš›ã«ç©ºç™½æ–‡å—を無視" - -msgid "ignore changes in the amount of white space" -msgstr "差分判定ã®éš›ã«ç©ºç™½æ–‡å—ã®æ•°ã‚’無視" - -msgid "ignore changes whose lines are all blank" -msgstr "差分判定ã®éš›ã«ç©ºç™½è¡Œã‚’無視" - -msgid "number of lines of context to show" -msgstr "差分コンテã‚ストã®è¡Œæ•°" - -msgid "SIMILARITY" -msgstr "類似度" - -msgid "guess renamed files by similarity (0<=s<=100)" -msgstr "ファイル改å推定ã®éš›ã®é¡žä¼¼åº¦(0 以上 100 以下)" - -msgid "recurse into subrepositories" -msgstr "副リãƒã‚¸ãƒˆãƒªã¸ã®å†å¸°çš„é©ç”¨" - -msgid "[OPTION]... [FILE]..." -msgstr "[OPTION]... [FILE]..." - -msgid "annotate the specified revision" -msgstr "当該リビジョン時点ã§ã®ç”±æ¥æƒ…å ±ã‚’è¡¨ç¤º" - -msgid "follow copies/renames and list the filename (DEPRECATED)" -msgstr "複製ï¼æ”¹å元ファイルã®å±¥æ´è¿½è·¡ã¨ã€ ファイルåã®è¡¨ç¤º(éžæŽ¨å¥¨)" - -msgid "don't follow copies and renames" -msgstr "複製ï¼æ”¹å元ファイル履æ´ã®è¿½è·¡ã‚’抑æ¢" - -msgid "list the author (long with -v)" -msgstr "ユーザåを表示(-v 指定時ã¯è©³ç´°è¡¨ç¤º)" - -msgid "list the filename" -msgstr "ファイルåを表示" - -msgid "list the date (short with -q)" -msgstr "日付を表示(-q 指定時ã¯ç°¡ç•¥è¡¨ç¤º)" - -msgid "list the revision number (default)" -msgstr "リビジョン番å·ã‚’表示(既定動作)" - -msgid "list the changeset" -msgstr "ãƒãƒƒã‚·ãƒ¥å€¤ã‚’表示" - -msgid "show line number at the first appearance" -msgstr "ç”±æ¥ãƒªãƒ“ジョンã§ã®åˆå‡ºæ™‚ã®è¡Œç•ªå·ã‚’表示" - -msgid "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." -msgstr "[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE..." - -msgid "do not pass files through decoders" -msgstr "デコード処ç†ã‚’回é¿" - -msgid "PREFIX" -msgstr "接é 辞" - -msgid "directory prefix for files in archive" -msgstr "アーカイブファイルã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªæŽ¥é 辞" - -msgid "revision to distribute" -msgstr "アーカイブ対象リビジョン" - -msgid "type of distribution to create" -msgstr "アーカイブ種別" - -msgid "[OPTION]... DEST" -msgstr "[OPTION]... DEST" - -msgid "merge with old dirstate parent after backout" -msgstr "打ã¡æ¶ˆã—リビジョンをç¾è¦ªãƒªãƒ“ジョンã¨ãƒžãƒ¼ã‚¸" - -msgid "parent to choose when backing out merge" -msgstr "打ã¡æ¶ˆã—リビジョンã¨ã®ãƒžãƒ¼ã‚¸å¯¾è±¡" - -msgid "specify merge tool" -msgstr "マージツールã®æŒ‡å®š" - -msgid "revision to backout" -msgstr "打ã¡æ¶ˆã—対象リビジョン" - -msgid "[OPTION]... [-r] REV" -msgstr "[OPTION]... [-r] REV" - -msgid "reset bisect state" -msgstr "探索状態ã®ãƒªã‚»ãƒƒãƒˆ" - -msgid "mark changeset good" -msgstr "対象リビジョンã®æŽ¢ç´¢çŠ¶æ…‹ã‚’ good 化" - -msgid "mark changeset bad" -msgstr "対象リビジョンã®æŽ¢ç´¢çŠ¶æ…‹ã‚’ bad 化" - -msgid "skip testing changeset" -msgstr "対象リビジョンã®åˆ¤å®šä½œæ¥ã‚’çœç•¥" - -msgid "use command to check changeset state" -msgstr "good/bad 判定用コマンド" - -msgid "do not update to target" -msgstr "対象リビジョンã«ã‚ˆã‚‹ä½œæ¥é ˜åŸŸå†…容ã®æ›´æ–°ã‚’抑æ¢" - -msgid "[-gbsr] [-U] [-c CMD] [REV]" -msgstr "[-gbsr] [-U] [-c CMD] [REV]" - -msgid "force" -msgstr "強制実施" - -msgid "delete a given bookmark" -msgstr "指定ブックマークã®å‰Šé™¤" - -msgid "rename a given bookmark" -msgstr "指定ブックマークã®æ”¹å" - -msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" -msgstr "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" - -msgid "set branch name even if it shadows an existing branch" -msgstr "åŒåæ—¢å˜ãƒ–ランãƒãŒå˜åœ¨ã™ã‚‹å ´åˆã§ã‚‚ブランãƒä½œæˆã‚’実施" - -msgid "reset branch name to parent branch name" -msgstr "ブランãƒåè¨å®šã‚’解消ã—〠親リビジョンã®ãƒ–ランãƒã«æˆ»ã‚‹" - -msgid "[-fC] [NAME]" -msgstr "[-fC] [NAME]" - -msgid "show only branches that have unmerged heads" -msgstr "未マージãªãƒ˜ãƒƒãƒ‰ã‚’æŒã¤ãƒ–ランãƒã®ã¿ã‚’表示" - -msgid "show normal and closed branches" -msgstr "閉鎖ã—ãŸãƒ˜ãƒƒãƒ‰ã‚‚表示" - -msgid "[-ac]" -msgstr "[-ac]" - -msgid "run even when the destination is unrelated" -msgstr "連æºå…ˆãŒç„¡é–¢ä¿‚ãªãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚実行" - -msgid "a changeset intended to be added to the destination" -msgstr "ãƒãƒ³ãƒ‰ãƒ«ã«å«ã‚ãŸã„リビジョン" - -msgid "a specific branch you would like to bundle" -msgstr "ãƒãƒ³ãƒ‰ãƒ«ã«å«ã‚ãŸã„ブランãƒ" - -msgid "a base changeset assumed to be available at the destination" -msgstr "連æºå…ˆãƒªãƒã‚¸ãƒˆãƒªã«å˜åœ¨ã™ã‚‹ã“ã¨ã‚’仮定ã™ã‚‹ãƒªãƒ“ジョン" - -msgid "bundle all changesets in the repository" -msgstr "リãƒã‚¸ãƒˆãƒªä¸ã®å…¨ãƒªãƒ“ジョンをãƒãƒ³ãƒ‰ãƒ«ã«å«ã‚ã‚‹" - -msgid "bundle compression type to use" -msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®åœ§ç¸®å½¢å¼" - -msgid "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]" -msgstr "[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]" - -msgid "print output to file with formatted name" -msgstr "ファイル内容ã®ä¿å˜å…ˆ" - -msgid "print the given revision" -msgstr "出力対象リビジョン" - -msgid "apply any matching decode filter" -msgstr "デコード処ç†ã‚’実施" - -msgid "[OPTION]... FILE..." -msgstr "[OPTION]... FILE..." - -msgid "the clone will include an empty working copy (only a repository)" -msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ç„¡ã—(管ç†é ˜åŸŸã®ã¿ã®è¤‡è£½)" - -msgid "revision, tag or branch to check out" -msgstr "作æ¥é ˜åŸŸæ›´æ–°ç”¨ãƒªãƒ“ジョン(ã‚¿ã‚°åï¼ãƒ–ランãƒå)" - -msgid "include the specified changeset" -msgstr "複製対象ã«å«ã‚るリビジョン" - -msgid "clone only the specified branch" -msgstr "指定ブランãƒã®ã¿ã‚’複製" - -msgid "[OPTION]... SOURCE [DEST]" -msgstr "[OPTION]... SOURCE [DEST]" - -msgid "mark new/missing files as added/removed before committing" -msgstr "コミットå‰ã«ã€ æ–°è¦ï¼ä¸åœ¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’登録ï¼é™¤å¤–" - -msgid "mark a branch as closed, hiding it from the branch list" -msgstr "ブランãƒã‚’閉鎖ã—〠ブランãƒä¸€è¦§ã§ã®è¡¨ç¤ºã‹ã‚‰é™¤å¤–" - -msgid "record a copy that has already occurred" -msgstr "手動ã§è¤‡è£½æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 複製ã®æ—¨ã‚’記録" - -msgid "forcibly copy over an existing managed file" -msgstr "åŒåã®ç™»éŒ²æ¸ˆã¿ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã—ã¦ã‚‚複製を実施" - -msgid "[OPTION]... [SOURCE]... DEST" -msgstr "[OPTION]... [SOURCE]... DEST" - -msgid "[INDEX] REV1 REV2" -msgstr "[INDEX] REV1 REV2" - -msgid "add single file mergeable changes" -msgstr "" - -msgid "add single file all revs append to" -msgstr "" - -msgid "add single file all revs overwrite" -msgstr "" - -msgid "add new file at each rev" -msgstr "" - -msgid "[OPTION]... TEXT" -msgstr "[OPTION]... TEXT" - -msgid "[COMMAND]" -msgstr "[COMMAND]" - -msgid "show the command options" -msgstr "当該コマンドã®ã‚ªãƒ—ション一覧ã®è¡¨ç¤º" - -msgid "[-o] CMD" -msgstr "[-o] CMD" - -msgid "use tags as labels" -msgstr "" - -msgid "annotate with branch names" -msgstr "" - -msgid "use dots for runs" -msgstr "" - -msgid "separate elements by spaces" -msgstr "" - -msgid "[OPTION]... [FILE [REV]...]" -msgstr "[OPTION]... [FILE [REV]...]" - -msgid "try extended date formats" -msgstr "拡張日時形å¼ã®ä½¿ç”¨" - -msgid "[-e] DATE [RANGE]" -msgstr "[-e] DATE [RANGE]" - -msgid "FILE REV" -msgstr "FILE REV" - -msgid "[PATH]" -msgstr "[PATH]" - -msgid "revlog format" -msgstr "" - -msgid "REPO NAMESPACE [KEY OLD NEW]" -msgstr "REPO NAMESPACE [KEY OLD NEW]" - -msgid "revision to rebuild to" -msgstr "å†æ§‹ç¯‰å¯¾è±¡ãƒªãƒ“ジョン" - -msgid "[-r REV] [REV]" -msgstr "[-r REV] [REV]" - -msgid "revision to debug" -msgstr "デãƒãƒƒã‚°å¯¾è±¡ãƒªãƒ“ジョン" - -msgid "[-r REV] FILE" -msgstr "[-r REV] FILE" - -msgid "REV1 [REV2]" -msgstr "REV1 [REV2]" - -msgid "do not display the saved mtime" -msgstr "記録ã•ã‚ŒãŸ mtime æƒ…å ±ã®è¡¨ç¤ºæŠ‘æ¢" - -msgid "[OPTION]..." -msgstr "[OPTION]..." - -msgid "revision to check" -msgstr "確èªå¯¾è±¡ãƒªãƒ“ジョン" - -msgid "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." -msgstr "[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]..." - -msgid "diff against the second parent" -msgstr "第2親ã¨ã®å·®åˆ†ã‚’使用" - -msgid "revisions to export" -msgstr "対象リビジョン" - -msgid "[OPTION]... [-o OUTFILESPEC] REV..." -msgstr "[OPTION]... [-o OUTFILESPEC] REV..." - -msgid "end fields with NUL" -msgstr "å„フィールドã®åŒºåˆ‡ã‚Šã«NULæ–‡å—(0x00)を使用" - -msgid "print all revisions that match" -msgstr "åˆè‡´ã™ã‚‹ãƒªãƒ“ジョンを全ã¦è¡¨ç¤º" - -msgid "follow changeset history, or file history across copies and renames" -msgstr "複製元や改åå…ƒã®å±¥æ´ã‚‚é¡ã‚‹" - -msgid "ignore case when matching" -msgstr "大文å—å°æ–‡å—を無視ã—ã¦æ¤œç´¢" - -msgid "print only filenames and revisions that match" -msgstr "åˆè‡´ã®éš›ã«ãƒ•ã‚¡ã‚¤ãƒ«åã¨ãƒªãƒ“ジョンã®ã¿ã‚’表示" - -msgid "print matching line numbers" -msgstr "åˆè‡´ã—ãŸè¡Œç•ªå·ã‚’表示" - -msgid "only search files changed within revision range" -msgstr "指定リビジョン範囲ã®ã¿ã‚’検索" - -msgid "[OPTION]... PATTERN [FILE]..." -msgstr "[OPTION]... PATTERN [FILE]..." - -msgid "show only heads which are descendants of STARTREV" -msgstr "指定リビジョンã®åå«ã¨ãªã‚‹ãƒ˜ãƒƒãƒ‰ã®ã¿ã‚’表示" - -msgid "STARTREV" -msgstr "開始リビジョン" - -msgid "show topological heads only" -msgstr "åã‚’æŒãŸãªã„å…¨ã¦ã®ãƒªãƒ“ジョンを表示" - -msgid "show active branchheads only (DEPRECATED)" -msgstr "アクティブãªãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã®ã¿ã‚’表示 (éžæŽ¨å¥¨)" - -msgid "show normal and closed branch heads" -msgstr "閉鎖ã—ãŸãƒ˜ãƒƒãƒ‰ã‚‚表示" - -msgid "[-ac] [-r STARTREV] [REV]..." -msgstr "[-ac] [-r STARTREV] [REV]..." - -msgid "[TOPIC]" -msgstr "[TOPIC]" - -msgid "identify the specified revision" -msgstr "当該リビジョンã®è˜åˆ¥æƒ…å ±ã‚’è¡¨ç¤º" - -msgid "show local revision number" -msgstr "リビジョン番å·ã‚’表示" - -msgid "show global revision id" -msgstr "ãƒãƒƒã‚·ãƒ¥å€¤ã‚’表示" - -msgid "show branch" -msgstr "ブランãƒåを表示" - -msgid "show tags" -msgstr "タグを表示" - -msgid "show bookmarks" -msgstr "ブックマークã®è¡¨ç¤º" - -msgid "[-nibtB] [-r REV] [SOURCE]" -msgstr "[-nibtB] [-r REV] [SOURCE]" - -msgid "" -"directory strip option for patch. This has the same meaning as the " -"corresponding patch option" -msgstr "パスè¦ç´ 除去数(patch コマンドã®åŒåオプションã¨åŒæ©Ÿèƒ½)" - -msgid "PATH" -msgstr "パス" - -msgid "base path" -msgstr "基底パス" - -msgid "skip check for outstanding uncommitted changes" -msgstr "作æ¥é ˜åŸŸä¸ã®æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã®ç¢ºèªã‚’çœç•¥" - -msgid "don't commit, just update the working directory" -msgstr "作æ¥é ˜åŸŸã®æ›´æ–°ã®ã¿ã§ã€ コミット実施を抑æ¢" - -msgid "apply patch to the nodes from which it was generated" -msgstr "パッãƒä½œæˆæ™‚ã¨åŒã˜è¦ªãƒªãƒ“ジョンã«å¯¾ã—ã¦é©ç”¨" - -msgid "use any branch information in patch (implied by --exact)" -msgstr "パッãƒä¸ã®ãƒ–ランãƒæƒ…å ±ã‚’åˆ©ç”¨(--exact 指定時ã¯è‡ªå‹•é©ç”¨)" - -msgid "[OPTION]... PATCH..." -msgstr "[OPTION]... PATCH..." - -msgid "run even if remote repository is unrelated" -msgstr "連æºå…ˆãŒç„¡é–¢ä¿‚ãªãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚実行" - -msgid "show newest record first" -msgstr "æ–°ã—ã„リビジョンã‹ã‚‰å…ˆã«è¡¨ç¤º" - -msgid "file to store the bundles into" -msgstr "ãƒãƒ³ãƒ‰ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«ã®æ›¸ã出ã—å…ˆ" - -msgid "a remote changeset intended to be added" -msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒªãƒ“ジョン" - -msgid "compare bookmarks" -msgstr "ブックマークã®æ¯”較" - -msgid "a specific branch you would like to pull" -msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒ–ランãƒ" - -msgid "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" -msgstr "[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]" - -msgid "[-e CMD] [--remotecmd CMD] [DEST]" -msgstr "[-e CMD] [--remotecmd CMD] [DEST]" - -msgid "search the repository as it is in REV" -msgstr "当該リビジョン時点ã®ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã‹ã‚‰æ¤œç´¢" - -msgid "end filenames with NUL, for use with xargs" -msgstr "ファイルåã‚’NULæ–‡å—(0x00)ã§çµ‚端(xargs ã¨ã®ä½µç”¨å‘ã‘)" - -msgid "print complete paths from the filesystem root" -msgstr "ファイルシステムã®ãƒ«ãƒ¼ãƒˆã‹ã‚‰ã®çµ¶å¯¾ãƒ‘スã§è¡¨ç¤º" - -msgid "[OPTION]... [PATTERN]..." -msgstr "[OPTION]... [PATTERN]..." - -msgid "only follow the first parent of merge changesets" -msgstr "マージã®éš›ã«ã¯ç¬¬1親ã®ã¿ã‚’é¡ã‚‹" - -msgid "show revisions matching date spec" -msgstr "指定日時ã«åˆè‡´ã™ã‚‹ãƒªãƒ“ジョンを表示" - -msgid "show copied files" -msgstr "複製ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "do case-insensitive search for a given text" -msgstr "指定ã‚ーワードã«ã‚ˆã‚‹æ¤œç´¢(大文å—å°æ–‡å—ã¯ç„¡è¦–)" - -msgid "include revisions where files were removed" -msgstr "ファイルãŒç™»éŒ²é™¤å¤–ã•ã‚ŒãŸãƒªãƒ“ジョンをå«ã‚ã‚‹" - -msgid "show only merges" -msgstr "マージ実施リビジョンã®ã¿ã‚’表示" - -msgid "revisions committed by user" -msgstr "当該ユーザã«ã‚ˆã£ã¦ã‚³ãƒŸãƒƒãƒˆã•ã‚ŒãŸãƒªãƒ“ジョンを表示" - -msgid "show only changesets within the given named branch (DEPRECATED)" -msgstr "指定ã®åå‰ä»˜ãブランãƒã«å±žã™ã‚‹ãƒªãƒ“ジョンã®ã¿ã‚’表示 (éžæŽ¨å¥¨)" - -msgid "show changesets within the given named branch" -msgstr "指定ã®åå‰ä»˜ãブランãƒã«å±žã™ã‚‹ãƒªãƒ“ジョンを表示" - -msgid "do not display revision or any of its ancestors" -msgstr "当該リビジョンã¨ãã®ç¥–å…ˆã®è¡¨ç¤ºã‚’抑æ¢" - -msgid "[OPTION]... [FILE]" -msgstr "[OPTION]... [FILE]" - -msgid "revision to display" -msgstr "表示対象リビジョン" - -msgid "[-r REV]" -msgstr "[-r REV]" - -msgid "force a merge with outstanding changes" -msgstr "作æ¥é ˜åŸŸä¸ã®æœªã‚³ãƒŸãƒƒãƒˆå¤‰æ›´ã”ã¨ãƒžãƒ¼ã‚¸ã‚’実施" - -msgid "revision to merge" -msgstr "マージ対象リビジョン" - -msgid "review revisions to merge (no merge is performed)" -msgstr "マージ対象リビジョンã®ç¢ºèª(マージ処ç†ã¯æœªå®Ÿæ–½)" - -msgid "[-P] [-f] [[-r] REV]" -msgstr "[-P] [-f] [[-r] REV]" - -msgid "a changeset intended to be included in the destination" -msgstr "åæ˜ å¯¾è±¡ã¨ã™ã‚‹ãƒªãƒ“ジョン" - -msgid "a specific branch you would like to push" -msgstr "åæ˜ å¯¾è±¡ã¨ã™ã‚‹ãƒ–ランãƒ" - -msgid "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" -msgstr "[-M] [-p] [-n] [-f] [-r REV]... [DEST]" - -msgid "show parents of the specified revision" -msgstr "親リビジョンã®è¡¨ç¤ºå¯¾è±¡" - -msgid "[-r REV] [FILE]" -msgstr "[-r REV] [FILE]" - -msgid "[NAME]" -msgstr "[NAME]" - -msgid "update to new branch head if changesets were pulled" -msgstr "æ–°è¦å–ã‚Šè¾¼ã¿ã®éš›ã«ã¯ä½œæ¥é ˜åŸŸã‚’æ–°è¦ã®ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã§æ›´æ–°" - -msgid "run even when remote repository is unrelated" -msgstr "連æºå…ˆãŒç„¡é–¢ä¿‚ãªãƒªãƒã‚¸ãƒˆãƒªã§ã‚‚実行" - -msgid "BOOKMARK" -msgstr "ブックマーク" - -msgid "bookmark to pull" -msgstr "å–ã‚Šè¾¼ã¿å¯¾è±¡ãƒ–ックマーク" - -msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" -msgstr "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]" - -msgid "force push" -msgstr "åæ˜ å…ˆã«ãƒ˜ãƒƒãƒ‰ãŒå¢—ãˆã‚‹å ´åˆã§ã‚‚実施" - -msgid "bookmark to push" -msgstr "åæ˜ å¯¾è±¡ãƒ–ãƒƒã‚¯ãƒžãƒ¼ã‚¯" - -msgid "allow pushing a new branch" -msgstr "æ–°è¦ãƒ–ランãƒã®åæ˜ ã‚’è¨±å¯" - -msgid "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" -msgstr "[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]" - -msgid "record delete for missing files" -msgstr "手動ã§å‰Šé™¤æ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 登録除外ã®æ—¨ã‚’記録" - -msgid "remove (and delete) file even if added or modified" -msgstr "è¿½åŠ ç™»éŒ²ï¼å¤‰æ›´å¯¾è±¡ã§ã‚ã£ã¦ã‚‚登録除外(ファイルã¯å‰Šé™¤)" - -msgid "record a rename that has already occurred" -msgstr "手動ã§æ”¹å済ã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«å¯¾ã—ã¦ã€ 改åã®æ—¨ã‚’記録" - -msgid "[OPTION]... SOURCE... DEST" -msgstr "[OPTION]... SOURCE... DEST" - -msgid "select all unresolved files" -msgstr "è¡çªæœªè§£æ¶ˆã®å…¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’処ç†å¯¾è±¡ã«ã™ã‚‹" - -msgid "list state of files needing merge" -msgstr "マージã®å¿…è¦ãªãƒ•ã‚¡ã‚¤ãƒ«ã®è§£æ¶ˆçŠ¶æ…‹ä¸€è¦§" - -msgid "mark files as resolved" -msgstr "当該ファイルをè¡çªè§£æ¶ˆæ¸ˆã¿çŠ¶æ…‹ã«è¨å®š" - -msgid "mark files as unresolved" -msgstr "当該ファイルをè¡çªè§£æ¶ˆæ¸ˆã¿çŠ¶æ…‹ã«è¨å®š" - -msgid "hide status prefix" -msgstr "状態記å·ã®è¡¨ç¤ºã‚’抑æ¢" - -msgid "revert all changes when no arguments given" -msgstr "引数指定ãŒç„¡ã„å ´åˆã«ã€ 全ファイルã®å†…容を復旧" - -msgid "tipmost revision matching date" -msgstr "当該日時ã®æœ€æ–°ãƒªãƒ“ジョンを使用" - -msgid "revert to the specified revision" -msgstr "当該リビジョン時点ã®å†…容ã§å¾©æ—§" - -msgid "do not save backup copies of files" -msgstr "å–り消ã—実施å‰å†…容ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—を抑æ¢" - -msgid "[OPTION]... [-r REV] [NAME]..." -msgstr "[OPTION]... [-r REV] [NAME]..." - -msgid "name of access log file to write to" -msgstr "アクセスãƒã‚°ã®æ›¸ã出ã—先ファイル" - -msgid "name of error log file to write to" -msgstr "エラーãƒã‚°ã®æ›¸ã出ã—先ファイル" - -msgid "PORT" -msgstr "ãƒãƒ¼ãƒˆç•ªå·" - -msgid "port to listen on (default: 8000)" -msgstr "è¦æ±‚å—ã‘付ã‘ãƒãƒ¼ãƒˆç•ªå·(既定値: 8000)" - -msgid "ADDR" -msgstr "アドレス" - -msgid "address to listen on (default: all interfaces)" -msgstr "è¦æ±‚å—ã‘付ã‘アドレス(既定値: 全インタフェース)" - -msgid "prefix path to serve from (default: server root)" -msgstr "公開パス接é 辞(既定値: ルート)" - -msgid "name to show in web pages (default: working directory)" -msgstr "表示å(既定値: 作æ¥é ˜åŸŸã®ãƒ‘ス)" - -msgid "name of the hgweb config file (see \"hg help hgweb\")" -msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½®(\"hg help hgweb\" å‚ç…§)" - -msgid "name of the hgweb config file (DEPRECATED)" -msgstr "hgweb è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä½ç½® (éžæŽ¨å¥¨)" - -msgid "for remote clients" -msgstr "(ホスト間連æºã§ã®å†…部用途å‘ã‘)" - -msgid "web templates to use" -msgstr "当該テンプレートã§è¡¨ç¤ºã‚’カスタマイズ" - -msgid "template style to use" -msgstr "当該スタイルã§è¡¨ç¤ºã‚’カスタマイズ" - -msgid "use IPv6 in addition to IPv4" -msgstr "IPv4 ã«åŠ ãˆã¦ IPv6 を使用" - -msgid "SSL certificate file" -msgstr "SSL 証明書ファイル" - -msgid "show untrusted configuration options" -msgstr "ä¿¡é ¼ã§ããªã„è¨å®šé …目も表示" - -msgid "[-u] [NAME]..." -msgstr "[-u] [NAME]..." - -msgid "check for push and pull" -msgstr "push/pull 実施çµæžœã®ç¢ºèª" - -msgid "show status of all files" -msgstr "å…¨ã¦ã®çŠ¶æ…‹ã‚’表示" - -msgid "show only modified files" -msgstr "変更ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "show only added files" -msgstr "è¿½åŠ ç™»éŒ²ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "show only removed files" -msgstr "登録除外ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "show only deleted (but tracked) files" -msgstr "削除ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«(登録除外ã¯æœªå®Ÿæ–½)を表示" - -msgid "show only files without changes" -msgstr "変更ã®ç„¡ã„ファイルを表示" - -msgid "show only unknown (not tracked) files" -msgstr "構æˆç®¡ç†å¯¾è±¡å¤–ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "show only ignored files" -msgstr "無視対象ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’表示" - -msgid "show source of copied files" -msgstr "複製元ファイルを表示" - -msgid "show difference from revision" -msgstr "当該リビジョンã¨ã®å·®åˆ†ã§çŠ¶æ…‹ã‚’判定" - -msgid "list the changed files of a revision" -msgstr "指定リビジョンã«ãŠã‘る更新ファイルã®ä¸€è¦§" - -msgid "force tag" -msgstr "タグ付ã‘ã®å¼·åˆ¶å®Ÿæ–½" - -msgid "make the tag local" -msgstr "ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚°ã¨ã—ã¦ä½œæˆ" - -msgid "revision to tag" -msgstr "タグ付ã‘対象リビジョン" - -msgid "remove a tag" -msgstr "ã‚¿ã‚°ã®å‰Šé™¤" - -msgid "use <text> as commit message" -msgstr "コミットメッセージ" - -msgid "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." -msgstr "[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME..." - -msgid "[-p] [-g]" -msgstr "[-p] [-g]" - -msgid "update to new branch head if changesets were unbundled" -msgstr "æ–°è¦å–ã‚Šè¾¼ã¿ã®éš›ã«ã¯ä½œæ¥é ˜åŸŸã‚’æ–°è¦ãƒ–ランãƒãƒ˜ãƒƒãƒ‰ã§ã§æ›´æ–°" - -msgid "[-u] FILE..." -msgstr "[-u] FILE..." - -msgid "discard uncommitted changes (no backup)" -msgstr "未コミット変更内容ã®ç ´æ£„(ä¿å˜ç„¡ã—)" - -msgid "update across branches if no uncommitted changes" -msgstr "未コミット変更ãŒç„¡ã„å ´åˆã€ ブランãƒæ¨ªæ–ã§ã‚‚更新を実施ã—ã¾ã™" - -msgid "[-c] [-C] [-d DATE] [[-r] REV]" -msgstr "[-c] [-C] [-d DATE] [[-r] REV]" +#, python-format +msgid "unknown mode %s" +msgstr "未知ã®ãƒ¢ãƒ¼ãƒ‰ %s" + +#, python-format +msgid "unknown command %s" +msgstr "未知ã®ã‚³ãƒžãƒ³ãƒ‰ %s" #, python-format msgid "cannot include %s (%s)" @@ -10465,14 +10940,6 @@ msgstr "%s ã¯ç™»éŒ²æ¸ˆã§ã™!\n" #, python-format -msgid "%s not added!\n" -msgstr "%s ã¯è¿½åŠ 登録ã•ã‚Œã¾ã›ã‚“\n" - -#, python-format -msgid "%s still exists!\n" -msgstr "%s ã®å‰Šé™¤ã«å¤±æ•—ã—ã¾ã—ãŸ!\n" - -#, python-format msgid "%s not tracked!\n" msgstr "%s ã¯ç®¡ç†ã•ã‚Œã¦ã„ã¾ã›ã‚“!\n" @@ -10500,7 +10967,10 @@ msgid "invalid event type in dag: %s" msgstr "" +msgid "nullid" +msgstr "" + msgid "working directory state appears damaged!" msgstr "作æ¥é ˜åŸŸã®çŠ¶æ…‹ç®¡ç†ã«å•é¡ŒãŒã‚ã‚Šã¾ã™!" #, python-format @@ -10503,11 +10973,7 @@ msgid "working directory state appears damaged!" msgstr "作æ¥é ˜åŸŸã®çŠ¶æ…‹ç®¡ç†ã«å•é¡ŒãŒã‚ã‚Šã¾ã™!" #, python-format -msgid "'\\n' and '\\r' disallowed in filenames: %r" -msgstr "'\\n' 㨠'\\r' ã¯ãƒ•ã‚¡ã‚¤ãƒ«åã§ä½¿ç”¨ã—ãªã„ã§ãã ã•ã„: %r" - -#, python-format msgid "directory %r already in dirstate" msgstr "ディレクトリ %r ã¯æ—¢ã«ç®¡ç†å¯¾è±¡ã«å«ã¾ã‚Œã¦ã„ã¾ã™" @@ -10519,10 +10985,6 @@ msgid "setting %r to other parent only allowed in merges" msgstr "%r ã®åˆ¥è¦ªã¸ã®è¨å®šã¯ãƒžãƒ¼ã‚¸ã§ã®ã¿å¯èƒ½ã§ã™" -#, python-format -msgid "not in dirstate: %s\n" -msgstr "%s ã¯ç®¡ç†æƒ…å ±ä¸ã«ã‚ã‚Šã¾ã›ã‚“\n" - msgid "unknown" msgstr "未知" @@ -10545,24 +11007,6 @@ msgid "unsupported file type (type is %s)" msgstr "未サãƒãƒ¼ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ç¨®åˆ¥(%s)" -msgid "searching for changes\n" -msgstr "変更点を探索ä¸\n" - -msgid "queries" -msgstr "å•ã„åˆã‚ã›" - -msgid "searching" -msgstr "検索ä¸" - -msgid "already have changeset " -msgstr "æ—¢ã«ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆãŒã‚ã‚Šã¾ã™ " - -msgid "warning: repository is unrelated\n" -msgstr "è¦å‘Š: 無関係ãªãƒªãƒã‚¸ãƒˆãƒªã§ã™\n" - -msgid "repository is unrelated" -msgstr "無関係ãªãƒªãƒã‚¸ãƒˆãƒªã§ã™" - #, python-format msgid "push creates new remote branches: %s!" msgstr "連æºå…ˆã«æ–°ã—ã„ブランãƒãŒä½œæˆã•ã‚Œã¾ã™: %s!" @@ -10571,11 +11015,12 @@ msgstr "連æºå…ˆã¸ã®æ–°è¦ãƒ–ランãƒä½œæˆã¯ 'hg push --new-branch'" #, python-format -msgid "push creates new remote heads on branch '%s'!" -msgstr "連æºå…ˆã®ãƒ–ランム'%s' ã«æ–°ã—ã„ヘッドãŒä½œæˆã•ã‚Œã¾ã™!" - -msgid "push creates new remote heads!" -msgstr "連æºå…ˆã«æ–°ã—ã„ヘッドãŒä½œæˆã•ã‚Œã¾ã™!" +msgid "push creates new remote head %s on branch '%s'!" +msgstr "æ–°ã—ã„ヘッド %s ãŒé€£æºå…ˆã®ãƒ–ランム'%s' ã«ä½œæˆã•ã‚Œã¾ã™!" + +#, python-format +msgid "push creates new remote head %s!" +msgstr "æ–°ã—ã„ヘッド %s ãŒé€£æºå…ˆã«ä½œæˆã•ã‚Œã¾ã™!" msgid "you should pull and merge or use push -f to force" msgstr "pull 㨠merge を実施ã™ã‚‹ã‹ã€ push -f ã§å¼·åˆ¶å®Ÿè¡Œã—ã¦ãã ã•ã„" @@ -10707,11 +11152,6 @@ #, python-format msgid "" -"No argument found for substitution of %i variable in alias '%s' definition." -msgstr "%i 変数ã®ç½®æ›ã«å¯¾å¿œã™ã‚‹å¼•æ•°ãŒã‚ã‚Šã¾ã›ã‚“(別å '%s' 定義)" - -#, python-format -msgid "" "error in definition for alias '%s': %s may only be given on the command " "line\n" msgstr "別å定義 '%s' ã®ã‚¨ãƒ©ãƒ¼: %s ã¯ã‚³ãƒžãƒ³ãƒ‰è¡Œã§ã®ç›´æŽ¥æŒ‡å®šé™å®šã§ã™\n" @@ -10755,6 +11195,10 @@ msgid "repository '%s' is not local" msgstr "リãƒã‚¸ãƒˆãƒª '%s' ã¯ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“" +#, python-format +msgid "no repository found in %r (.hg not found)" +msgstr "%r é…下ã«ã¯ãƒªãƒã‚¸ãƒˆãƒªãŒã‚ã‚Šã¾ã›ã‚“ (.hg ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“)" + msgid "warning: --repository ignored\n" msgstr "è¦å‘Š: --repository 指定を無視ã—ã¾ã™\n" @@ -10758,9 +11202,6 @@ msgid "warning: --repository ignored\n" msgstr "è¦å‘Š: --repository 指定を無視ã—ã¾ã™\n" -msgid "invalid arguments" -msgstr "引数ãŒä¸æ£ã§ã™" - #, python-format msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "ä¸æ£ãªãƒ—ãƒãƒ•ã‚¡ã‚¤ãƒ«å½¢å¼ '%s' を無視ã—ã¾ã™\n" @@ -10770,7 +11211,7 @@ "misc/lsprof/" msgstr "" "lsprof ãŒåˆ©ç”¨ã§ãã¾ã›ã‚“ - http://codespeak.net/svn/user/arigo/hack/misc/" -"lsprof/ ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„" +"lsprof/ã‹ã‚‰ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã—ã¦ãã ã•ã„" #, python-format msgid "*** failed to import extension %s from %s: %s\n" @@ -10842,6 +11283,239 @@ msgid "merging %s failed!\n" msgstr "%s ã®ãƒžãƒ¼ã‚¸ã«å¤±æ•—!\n" +msgid "unterminated string" +msgstr "æ–‡å—列ãŒçµ‚端ã—ã¦ã„ã¾ã›ã‚“" + +msgid "syntax error" +msgstr "文法エラー" + +msgid "missing argument" +msgstr "引数ãŒã‚ã‚Šã¾ã›ã‚“" + +msgid "can't use a list in this context" +msgstr "ã“ã“ã§ã¯ãƒªã‚¹ãƒˆã‚’使用ã§ãã¾ã›ã‚“" + +msgid "" +"``modified()``\n" +" File that is modified according to status." +msgstr "" +"``modified()``\n" +" 更新ステータスをæŒã¤ãƒ•ã‚¡ã‚¤ãƒ«" + +#. i18n: "modified" is a keyword +msgid "modified takes no arguments" +msgstr "modified 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``added()``\n" +" File that is added according to status." +msgstr "" +"``added()``\n" +" è¿½åŠ ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã‚’æŒã¤ãƒ•ã‚¡ã‚¤ãƒ«" + +#. i18n: "added" is a keyword +msgid "added takes no arguments" +msgstr "added 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``removed()``\n" +" File that is removed according to status." +msgstr "" +"``removed()``\n" +" 削除ステータスをæŒã¤ãƒ•ã‚¡ã‚¤ãƒ«" + +#. i18n: "removed" is a keyword +msgid "removed takes no arguments" +msgstr "removed 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``deleted()``\n" +" File that is deleted according to status." +msgstr "" +"``deleted()``\n" +" 削除ステータスをæŒã¤ãƒ•ã‚¡ã‚¤ãƒ«" + +#. i18n: "deleted" is a keyword +msgid "deleted takes no arguments" +msgstr "deleted 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``unknown()``\n" +" File that is unknown according to status. These files will only be\n" +" considered if this predicate is used." +msgstr "" +"``unknown()``\n" +" 未知ステータスをæŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ã€‚\n" +" 本述語ãŒæŒ‡å®šã•ã‚ŒãŸæ™‚ã®ã¿ã€\n" +" 未知ファイル㌠Mercurial ã®å–り扱ã„対象ã«ãªã‚Šã¾ã™ã€‚" + +#. i18n: "unknown" is a keyword +msgid "unknown takes no arguments" +msgstr "unknown 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``ignored()``\n" +" File that is ignored according to status. These files will only be\n" +" considered if this predicate is used." +msgstr "" +"``ignored()``\n" +" 無視ステータスをæŒã¤ãƒ•ã‚¡ã‚¤ãƒ«ã€‚\n" +" 本述語ãŒæŒ‡å®šã•ã‚ŒãŸæ™‚ã®ã¿ã€\n" +" 無視ファイル㌠Mercurial ã®å–り扱ã„対象ã«ãªã‚Šã¾ã™ã€‚" + +#. i18n: "ignored" is a keyword +msgid "ignored takes no arguments" +msgstr "ignored 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``clean()``\n" +" File that is clean according to status." +msgstr "" +"``clean()``\n" +" 変更無ã—ステータスをæŒã¤ãƒ•ã‚¡ã‚¤ãƒ«" + +#. i18n: "clean" is a keyword +msgid "clean takes no arguments" +msgstr "clean 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +#, python-format +msgid "not a function: %s" +msgstr "関数ã§ã¯ã‚ã‚Šã¾ã›ã‚“: %s" + +msgid "" +"``binary()``\n" +" File that appears to be binary (contails NUL bytes)." +msgstr "" +"``binary()``\n" +" ãƒã‚¤ãƒŠãƒªã¨æ€ã‚れるファイル (NUL ãƒã‚¤ãƒˆã‚’å«ã‚€ãƒ•ã‚¡ã‚¤ãƒ«)" + +#. i18n: "binary" is a keyword +msgid "binary takes no arguments" +msgstr "binary 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``exec()``\n" +" File that is marked as executable." +msgstr "" +"``exec()``\n" +" 実行å¯èƒ½ãƒ“ットãŒç«‹ã£ã¦ã„るファイル" + +#. i18n: "exec" is a keyword +msgid "exec takes no arguments" +msgstr "exec 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``symlink()``\n" +" File that is marked as a symlink." +msgstr "" +"``symlink()``\n" +" シンボリックリンクã¨ã¿ãªã•ã‚Œã¦ã„るファイル" + +#. i18n: "symlink" is a keyword +msgid "symlink takes no arguments" +msgstr "symlink 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``resolved()``\n" +" File that is marked resolved according to the resolve state." +msgstr "" +"``resolved()``\n" +" マージステータスãŒè§£æ¶ˆæ¸ˆã¿ã®ãƒ•ã‚¡ã‚¤ãƒ«" + +#. i18n: "resolved" is a keyword +msgid "resolved takes no arguments" +msgstr "resolved 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``unresolved()``\n" +" File that is marked unresolved according to the resolve state." +msgstr "" +"``unresolved()``\n" +" マージステータスãŒæœªè§£æ¶ˆã®ãƒ•ã‚¡ã‚¤ãƒ«" + +#. i18n: "unresolved" is a keyword +msgid "unresolved takes no arguments" +msgstr "unresolved 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``hgignore()``\n" +" File that matches the active .hgignore pattern." +msgstr "" +"``hgignore()``\n" +" 有効㪠.hgignore パターンã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«" + +msgid "hgignore takes no arguments" +msgstr "hgignore 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``grep(regex)``\n" +" File contains the given regular expression." +msgstr "" +"``grep(regex)``\n" +" æ£è¦è¡¨ç¾ regexp ã«åˆè‡´ã™ã‚‹å†…容をæŒã¤ãƒ•ã‚¡ã‚¤ãƒ«" + +msgid "grep requires a pattern" +msgstr "grep ã«ã¯ãƒ‘ターン指定ãŒå¿…è¦ã§ã™" + +#, python-format +msgid "couldn't parse size: %s" +msgstr "サイズ指定ã®è§£æžã«å¤±æ•—: %s" + +msgid "" +"``size(expression)``\n" +" File size matches the given expression. Examples:" +msgstr "" +"``size(expression)``\n" +" サイズãŒæŒ‡å®šæ¡ä»¶ã«åˆè‡´ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã€‚æ¡ä»¶ä¾‹:" + +msgid "" +" - 1k (files from 1024 to 2047 bytes)\n" +" - < 20k (files less than 20480 bytes)\n" +" - >= .5MB (files at least 524288 bytes)\n" +" - 4k - 1MB (files from 4096 bytes to 1048576 bytes)" +msgstr "" +" - 1k (1024 〜 2047 ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«)\n" +" - < 20k (20480 ãƒã‚¤ãƒˆæœªæº€ã®ãƒ•ã‚¡ã‚¤ãƒ«)\n" +" - >= .5MB (524288 ãƒã‚¤ãƒˆä»¥ä¸Šã®ãƒ•ã‚¡ã‚¤ãƒ«)\n" +" - 4k - 1MB (4096 〜 1048576 ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«)" + +#. i18n: "size" is a keyword +msgid "size requires an expression" +msgstr "size ã«ã¯æ¡ä»¶æŒ‡å®šãŒå¿…è¦ã§ã™" + +msgid "" +"``encoding(name)``\n" +" File can be successfully decoded with the given character\n" +" encoding. May not be useful for encodings other than ASCII and\n" +" UTF-8." +msgstr "" +"``encoding(name)``\n" +" 指定エンコーディング方å¼ã§ãƒ‡ã‚³ãƒ¼ãƒ‰å¯èƒ½ãªãƒ•ã‚¡ã‚¤ãƒ«ã€‚\n" +" ASCII ã‚„ UTF-8 以外ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã«å¯¾ã—ã¦ã¯ã€\n" +" 無益ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。" + +#. i18n: "encoding" is a keyword +msgid "encoding requires an encoding name" +msgstr "encoding ã«ã¯ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°åãŒå¿…è¦ã§ã™" + +#, python-format +msgid "unknown encoding '%s'" +msgstr "ä¸æ˜Žãªã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚° '%s' ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" + +msgid "" +"``copied()``\n" +" File that is recorded as being copied." +msgstr "" +"``copied()``\n" +" 複製ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«" + +#. i18n: "copied" is a keyword +msgid "copied takes no arguments" +msgstr "copied 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "invalid token" +msgstr "ä¸æ£ãªè¨˜è¿°" + msgid "starting revisions are not directly related" msgstr "開始リビジョンã¨ç›´æŽ¥ã®é–¢é€£ãŒã‚ã‚Šã¾ã›ã‚“" @@ -10877,6 +11551,9 @@ msgid "Specifying Revision Sets" msgstr "複数リビジョンã®æŒ‡å®š" +msgid "Specifying File Sets" +msgstr "複数ファイルã®æŒ‡å®š" + msgid "Diff Formats" msgstr "差分形å¼" @@ -10901,90 +11578,19 @@ msgid "Glossary" msgstr "用語集" -msgid "" -"Mercurial reads configuration data from several files, if they exist.\n" -"Below we list the most specific file first." -msgstr "" -"Mercurial ã¯è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’複数ã®å ´æ‰€ã‹ã‚‰èªã¿è¾¼ã¿ã¾ã™ã€‚\n" -"å„ªå…ˆåº¦é †ã«èªã¿è¾¼ã¿ä½ç½®ã‚’並ã¹ãŸã‚‚ã®ã‚’以下ã«ç¤ºã—ã¾ã™ã€‚" - -msgid "On Windows, these configuration files are read:" -msgstr "Windows 環境ã§ã¯ä»¥ä¸‹ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™:" - -msgid "" -"- ``<repo>\\.hg\\hgrc``\n" -"- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\mercurial.ini``\n" -"- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\mercurial.ini``\n" -"- ``C:\\mercurial\\mercurial.ini`` (unless regkey or hgrc.d\\ or mercurial." -"ini found)\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (unless hgrc.d\\ or mercurial." -"ini found)\n" -"- ``<hg.exe-dir>\\hgrc.d\\*.rc`` (unless mercurial.ini found)\n" -"- ``<hg.exe-dir>\\mercurial.ini``" -msgstr "" -"- ``<リãƒã‚¸ãƒˆãƒª>\\.hg\\hgrc``\n" -"- ``%USERPROFILE%\\.hgrc``\n" -"- ``%USERPROFILE%\\mercurial.ini``\n" -"- ``%HOME%\\.hgrc``\n" -"- ``%HOME%\\mercurial.ini``\n" -"- ``C:\\mercurial\\mercurial.ini`` (regkey, hgrc.d\\, mercurial.ini ä¸åœ¨æ™‚)\n" -"- ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial`` (hgrc.d\\, mercurial.ini ä¸åœ¨" -"時)\n" -"- ``<インストール先>\\hgrc.d\\*.rc`` (mercurial.ini ä¸åœ¨æ™‚)\n" -"- ``<インストール先>\\mercurial.ini``" - -msgid "On Unix, these files are read:" -msgstr "Unix 環境ã§ã¯ä»¥ä¸‹ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒèªã¿è¾¼ã¾ã‚Œã¾ã™:" - -msgid "" -"- ``<repo>/.hg/hgrc``\n" -"- ``$HOME/.hgrc``\n" -"- ``/etc/mercurial/hgrc``\n" -"- ``/etc/mercurial/hgrc.d/*.rc``\n" -"- ``<install-root>/etc/mercurial/hgrc``\n" -"- ``<install-root>/etc/mercurial/hgrc.d/*.rc``" -msgstr "" -"- ``<リãƒã‚¸ãƒˆãƒª>/.hg/hgrc``\n" -"- ``$HOME/.hgrc``\n" -"- ``/etc/mercurial/hgrc``\n" -"- ``/etc/mercurial/hgrc.d/*.rc``\n" -"- ``<インストール先>/etc/mercurial/hgrc``\n" -"- ``<インストール先>/etc/mercurial/hgrc.d/*.rc``" - -msgid "" -"If there is a per-repository configuration file which is not owned by\n" -"the active user, Mercurial will warn you that the file is skipped::" -msgstr "" -"実行ユーザ以外ãŒæ‰€æœ‰ã¨ãªã£ã¦ã„るリãƒã‚¸ãƒˆãƒªæ¯Žè¨å®šãƒ•ã‚¡ã‚¤ãƒ«ãŒã‚ã‚‹å ´åˆã€\n" -"Mercurial ã¯å½“該ファイルをèªã¿è¾¼ã¾ãªã„æ—¨ã®è¦å‘Šã‚’表示ã—ã¾ã™::" - -msgid "" -" not trusting file <repo>/.hg/hgrc from untrusted user USER, group GROUP" -msgstr " ä¿¡é ¼ã§ããªã„ファイル <repo>/.hg/hgrc (所有者 USER, グループ GROUP)" - -msgid "" -"If this bothers you, the warning can be silenced (the file would still\n" -"be ignored) or trust can be established. Use one of the following\n" -"settings, the syntax is explained below:" -msgstr "" -"ãã®ã‚ˆã†ãªãƒ•ã‚¡ã‚¤ãƒ«ã‚’æ„図的ã«ä½¿ç”¨ã—ã¦ã„ã‚‹å ´åˆã€ è¦å‘Šè¡¨ç¤ºã‚’抑æ¢ã™ã‚‹(但ã—\n" -"ファイルã¯èªã¿è¾¼ã¾ã‚Œã¾ã›ã‚“)ã“ã¨ã‚‚ã€ ä¿¡é ¼ã—ã¦èªã¿è¾¼ã‚€ã“ã¨ã‚‚å¯èƒ½ã§ã™ã€‚\n" -"以下ã®æ–‡æ³•ã«å¾“ã„è¨å®šã‚’è¡Œã£ã¦ãã ã•ã„:" - -msgid "" -"- ``ui.report_untrusted = False``\n" -"- ``trusted.users = USER``\n" -"- ``trusted.groups = GROUP``" -msgstr "" -"- ``ui.report_untrusted = False``\n" -"- ``trusted.users = ユーザ``\n" -"- ``trusted.groups = グループ``" - -msgid "" -"The configuration files for Mercurial use a simple ini-file format. A\n" -"configuration file consists of sections, led by a ``[section]`` header\n" -"and followed by ``name = value`` entries::" +msgid "syntax for Mercurial ignore files" +msgstr "Mercurial ã®ç„¡è¦–指定ファイルã®æ–‡æ³•" + +msgid "" +"The Mercurial system uses a set of configuration files to control\n" +"aspects of its behavior." +msgstr "" +"Mercurial ã§ã¯ã€ 挙動を制御ã™ã‚‹ãŸã‚ã«ã€\n" +"複数ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã—ã¾ã™ã€‚" + +msgid "" +"The configuration files use a simple ini-file format. A configuration\n" +"file consists of sections, led by a ``[section]`` header and followed\n" +"by ``name = value`` entries::" msgstr "" "Mercurial ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ ã„ã‚ゆる ini ファイル形å¼ã§è¨˜è¿°ã•ã‚Œã¾ã™ã€‚\n" @@ -10989,7 +11595,8 @@ msgstr "" "Mercurial ã®è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ ã„ã‚ゆる ini ファイル形å¼ã§è¨˜è¿°ã•ã‚Œã¾ã™ã€‚\n" -"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ ``[セクションå]`` å½¢å¼ã®ãƒ˜ãƒƒãƒ€ã‹ã‚‰å§‹ã¾ã‚‹ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‹ã‚‰\n" -"構æˆã•ã‚Œã€ ``åå‰ = 値`` å½¢å¼ã®è¦ç´ ãŒåˆ—挙ã•ã‚Œã¾ã™::" +"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€\n" +"``[セクションå]`` å½¢å¼ã®ãƒ˜ãƒƒãƒ€ã«ã‚ˆã£ã¦å§‹ã¾ã‚‹ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‹ã‚‰æ§‹æˆã•ã‚Œã€\n" +"セクションã«ã¯ ``åå‰ = 値`` å½¢å¼ã®è¦ç´ ãŒåˆ—挙ã•ã‚Œã¾ã™::" msgid "" " [ui]\n" @@ -11002,19 +11609,1843 @@ msgid "" "The above entries will be referred to as ``ui.username`` and\n" -"``ui.verbose``, respectively. Please see the hgrc man page for a full\n" -"description of the possible configuration values:" -msgstr "" -"上記記述ã¯ãã‚Œãžã‚Œã€ ``ui.username`` ãŠã‚ˆã³ ``ui.verbose`` ã¨ã—ã¦\n" -"å‚ç…§ã•ã‚Œã¾ã™ã€‚ è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã§æŒ‡å®šå¯èƒ½ãªå€¤ã®è©³ç´°ã«é–¢ã—ã¦ã¯ã€\n" -"hgrc ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’å‚ç…§ã—ã¦ãã ã•ã„:" - -msgid "" -"- on Unix-like systems: ``man hgrc``\n" -"- online: http://www.selenic.com/mercurial/hgrc.5.html\n" -msgstr "" -"- Unix 系システム: ``man hgrc``\n" -"- オンライン版: http://www.selenic.com/mercurial/hgrc.5.html\n" +"``ui.verbose``, respectively. See the Syntax section below." +msgstr "" +"上記記述ã¯ãã‚Œãžã‚Œã€\n" +"``ui.username`` ãŠã‚ˆã³ ``ui.verbose`` ã¨ã—ã¦å‚ç…§ã•ã‚Œã¾ã™ã€‚\n" +"後述ã™ã‚‹æ–‡æ³•ã®è©³ç´°ã‚’å‚ç…§ã—ã¦ãã ã•ã„。" + +msgid "" +"Files\n" +"-----" +msgstr "" +"ファイル\n" +"-----" + +msgid "" +"Mercurial reads configuration data from several files, if they exist.\n" +"These files do not exist by default and you will have to create the\n" +"appropriate configuration files yourself: global configuration like\n" +"the username setting is typically put into\n" +"``%USERPROFILE%\\mercurial.ini`` or ``$HOME/.hgrc`` and local\n" +"configuration is put into the per-repository ``<repo>/.hg/hgrc`` file." +msgstr "" + +msgid "" +"The names of these files depend on the system on which Mercurial is\n" +"installed. ``*.rc`` files from a single directory are read in\n" +"alphabetical order, later ones overriding earlier ones. Where multiple\n" +"paths are given below, settings from earlier paths override later\n" +"ones." +msgstr "" + +msgid "| (Unix, Windows) ``<repo>/.hg/hgrc``" +msgstr "" + +msgid "" +" Per-repository configuration options that only apply in a\n" +" particular repository. This file is not version-controlled, and\n" +" will not get transferred during a \"clone\" operation. Options in\n" +" this file override options in all other configuration files. On\n" +" Unix, most of this file will be ignored if it doesn't belong to a\n" +" trusted user or to a trusted group. See the documentation for the\n" +" ``[trusted]`` section below for more details." +msgstr "" + +msgid "" +"| (Unix) ``$HOME/.hgrc``\n" +"| (Windows) ``%USERPROFILE%\\.hgrc``\n" +"| (Windows) ``%USERPROFILE%\\Mercurial.ini``\n" +"| (Windows) ``%HOME%\\.hgrc``\n" +"| (Windows) ``%HOME%\\Mercurial.ini``" +msgstr "" + +msgid "" +" Per-user configuration file(s), for the user running Mercurial. On\n" +" Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these\n" +" files apply to all Mercurial commands executed by this user in any\n" +" directory. Options in these files override per-system and per-" +"installation\n" +" options." +msgstr "" + +msgid "" +"| (Unix) ``/etc/mercurial/hgrc``\n" +"| (Unix) ``/etc/mercurial/hgrc.d/*.rc``" +msgstr "" + +msgid "" +" Per-system configuration files, for the system on which Mercurial\n" +" is running. Options in these files apply to all Mercurial commands\n" +" executed by any user in any directory. Options in these files\n" +" override per-installation options." +msgstr "" + +msgid "" +"| (Unix) ``<install-root>/etc/mercurial/hgrc``\n" +"| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``" +msgstr "" + +msgid "" +" Per-installation configuration files, searched for in the\n" +" directory where Mercurial is installed. ``<install-root>`` is the\n" +" parent directory of the **hg** executable (or symlink) being run. For\n" +" example, if installed in ``/shared/tools/bin/hg``, Mercurial will look\n" +" in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply\n" +" to all Mercurial commands executed by any user in any directory." +msgstr "" + +msgid "" +"| (Windows) ``<install-dir>\\Mercurial.ini`` **or**\n" +"| (Windows) ``<install-dir>\\hgrc.d\\*.rc`` **or**\n" +"| (Windows) ``HKEY_LOCAL_MACHINE\\SOFTWARE\\Mercurial``" +msgstr "" + +msgid "" +" Per-installation/system configuration files, for the system on\n" +" which Mercurial is running. Options in these files apply to all\n" +" Mercurial commands executed by any user in any directory. Registry\n" +" keys contain PATH-like strings, every part of which must reference\n" +" a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will\n" +" be read. Mercurial checks each of these locations in the specified\n" +" order until one or more configuration files are detected. If the\n" +" pywin32 extensions are not installed, Mercurial will only look for\n" +" site-wide configuration in ``C:\\Mercurial\\Mercurial.ini``." +msgstr "" + +msgid "" +"Syntax\n" +"------" +msgstr "" + +msgid "" +"A configuration file consists of sections, led by a ``[section]`` header\n" +"and followed by ``name = value`` entries (sometimes called\n" +"``configuration keys``)::" +msgstr "" +"è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€\n" +"``[セクションå]`` å½¢å¼ã®ãƒ˜ãƒƒãƒ€ã«ã‚ˆã£ã¦å§‹ã¾ã‚‹ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã‹ã‚‰æ§‹æˆã•ã‚Œã€\n" +"セクションã«ã¯ ``åå‰ = 値`` å½¢å¼ã®è¦ç´ (``è¨å®šã‚ー`` ã¨å‘¼ç§°ã•ã‚Œã‚‹äº‹ã‚‚)\n" +"ãŒåˆ—挙ã•ã‚Œã¾ã™::" + +msgid "" +" [spam]\n" +" eggs=ham\n" +" green=\n" +" eggs" +msgstr "" + +msgid "" +"Each line contains one entry. If the lines that follow are indented,\n" +"they are treated as continuations of that entry. Leading whitespace is\n" +"removed from values. Empty lines are skipped. Lines beginning with\n" +"``#`` or ``;`` are ignored and may be used to provide comments." +msgstr "" + +msgid "" +"Configuration keys can be set multiple times, in which case Mercurial\n" +"will use the value that was configured last. As an example::" +msgstr "" + +msgid "" +" [spam]\n" +" eggs=large\n" +" ham=serrano\n" +" eggs=small" +msgstr "" + +msgid "This would set the configuration key named ``eggs`` to ``small``." +msgstr "" + +msgid "" +"It is also possible to define a section multiple times. A section can\n" +"be redefined on the same and/or on different configuration files. For\n" +"example::" +msgstr "" + +msgid "" +" [foo]\n" +" eggs=large\n" +" ham=serrano\n" +" eggs=small" +msgstr "" + +msgid "" +" [bar]\n" +" eggs=ham\n" +" green=\n" +" eggs" +msgstr "" + +msgid "" +" [foo]\n" +" ham=prosciutto\n" +" eggs=medium\n" +" bread=toasted" +msgstr "" + +msgid "" +"This would set the ``eggs``, ``ham``, and ``bread`` configuration keys\n" +"of the ``foo`` section to ``medium``, ``prosciutto``, and ``toasted``,\n" +"respectively. As you can see there only thing that matters is the last\n" +"value that was set for each of the configuration keys." +msgstr "" + +msgid "" +"If a configuration key is set multiple times in different\n" +"configuration files the final value will depend on the order in which\n" +"the different configuration files are read, with settings from earlier\n" +"paths overriding later ones as described on the ``Files`` section\n" +"above." +msgstr "" + +msgid "" +"A line of the form ``%include file`` will include ``file`` into the\n" +"current configuration file. The inclusion is recursive, which means\n" +"that included files can include other files. Filenames are relative to\n" +"the configuration file in which the ``%include`` directive is found.\n" +"Environment variables and ``~user`` constructs are expanded in\n" +"``file``. This lets you do something like::" +msgstr "" + +msgid " %include ~/.hgrc.d/$HOST.rc" +msgstr "" + +msgid "to include a different configuration file on each computer you use." +msgstr "" + +msgid "" +"A line with ``%unset name`` will remove ``name`` from the current\n" +"section, if it has been set previously." +msgstr "" + +msgid "" +"The values are either free-form text strings, lists of text strings,\n" +"or Boolean values. Boolean values can be set to true using any of \"1\",\n" +"\"yes\", \"true\", or \"on\" and to false using \"0\", \"no\", \"false\", or " +"\"off\"\n" +"(all case insensitive)." +msgstr "" + +msgid "" +"List values are separated by whitespace or comma, except when values are\n" +"placed in double quotation marks::" +msgstr "" + +msgid " allow_read = \"John Doe, PhD\", brian, betty" +msgstr "" + +msgid "" +"Quotation marks can be escaped by prefixing them with a backslash. Only\n" +"quotation marks at the beginning of a word is counted as a quotation\n" +"(e.g., ``foo\"bar baz`` is the list of ``foo\"bar`` and ``baz``)." +msgstr "" + +msgid "" +"Sections\n" +"--------" +msgstr "" + +msgid "" +"This section describes the different sections that may appear in a\n" +"Mercurial configuration file, the purpose of each section, its possible\n" +"keys, and their possible values." +msgstr "" + +msgid "" +"``alias``\n" +"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Defines command aliases.\n" +"Aliases allow you to define your own commands in terms of other\n" +"commands (or aliases), optionally including arguments. Positional\n" +"arguments in the form of ``$1``, ``$2``, etc in the alias definition\n" +"are expanded by Mercurial before execution. Positional arguments not\n" +"already used by ``$N`` in the definition are put at the end of the\n" +"command to be executed." +msgstr "" + +msgid "Alias definitions consist of lines of the form::" +msgstr "" + +msgid " <alias> = <command> [<argument>]..." +msgstr "" + +msgid "For example, this definition::" +msgstr "" + +msgid " latest = log --limit 5" +msgstr "" + +msgid "" +"creates a new command ``latest`` that shows only the five most recent\n" +"changesets. You can define subsequent aliases using earlier ones::" +msgstr "" + +msgid " stable5 = latest -b stable" +msgstr "" + +msgid "" +".. note:: It is possible to create aliases with the same names as\n" +" existing commands, which will then override the original\n" +" definitions. This is almost always a bad idea!" +msgstr "" + +msgid "" +"An alias can start with an exclamation point (``!``) to make it a\n" +"shell alias. A shell alias is executed with the shell and will let you\n" +"run arbitrary commands. As an example, ::" +msgstr "" + +msgid " echo = !echo" +msgstr "" + +msgid "" +"will let you do ``hg echo foo`` to have ``foo`` printed in your\n" +"terminal. A better example might be::" +msgstr "" + +msgid " purge = !$HG status --no-status --unknown -0 | xargs -0 rm" +msgstr "" + +msgid "" +"which will make ``hg purge`` delete all unknown files in the\n" +"repository in the same manner as the purge extension." +msgstr "" + +msgid "" +"Shell aliases are executed in an environment where ``$HG`` expand to\n" +"the path of the Mercurial that was used to execute the alias. This is\n" +"useful when you want to call further Mercurial commands in a shell\n" +"alias, as was done above for the purge alias. In addition,\n" +"``$HG_ARGS`` expand to the arguments given to Mercurial. In the ``hg\n" +"echo foo`` call above, ``$HG_ARGS`` would expand to ``echo foo``." +msgstr "" + +msgid "" +"``auth``\n" +"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Authentication credentials for HTTP authentication. This section\n" +"allows you to store usernames and passwords for use when logging\n" +"*into* HTTP servers. See the ``[web]`` configuration section if\n" +"you want to configure *who* can login to your HTTP server." +msgstr "" + +msgid "Each line has the following format::" +msgstr "" + +msgid " <name>.<argument> = <value>" +msgstr "" + +msgid "" +"where ``<name>`` is used to group arguments into authentication\n" +"entries. Example::" +msgstr "" + +msgid "" +" foo.prefix = hg.intevation.org/mercurial\n" +" foo.username = foo\n" +" foo.password = bar\n" +" foo.schemes = http https" +msgstr "" + +msgid "" +" bar.prefix = secure.example.org\n" +" bar.key = path/to/file.key\n" +" bar.cert = path/to/file.cert\n" +" bar.schemes = https" +msgstr "" + +msgid "Supported arguments:" +msgstr "" + +msgid "" +"``prefix``\n" +" Either ``*`` or a URI prefix with or without the scheme part.\n" +" The authentication entry with the longest matching prefix is used\n" +" (where ``*`` matches everything and counts as a match of length\n" +" 1). If the prefix doesn't include a scheme, the match is performed\n" +" against the URI with its scheme stripped as well, and the schemes\n" +" argument, q.v., is then subsequently consulted." +msgstr "" + +msgid "" +"``username``\n" +" Optional. Username to authenticate with. If not given, and the\n" +" remote site requires basic or digest authentication, the user will\n" +" be prompted for it. Environment variables are expanded in the\n" +" username letting you do ``foo.username = $USER``." +msgstr "" + +msgid "" +"``password``\n" +" Optional. Password to authenticate with. If not given, and the\n" +" remote site requires basic or digest authentication, the user\n" +" will be prompted for it." +msgstr "" + +msgid "" +"``key``\n" +" Optional. PEM encoded client certificate key file. Environment\n" +" variables are expanded in the filename." +msgstr "" + +msgid "" +"``cert``\n" +" Optional. PEM encoded client certificate chain file. Environment\n" +" variables are expanded in the filename." +msgstr "" + +msgid "" +"``schemes``\n" +" Optional. Space separated list of URI schemes to use this\n" +" authentication entry with. Only used if the prefix doesn't include\n" +" a scheme. Supported schemes are http and https. They will match\n" +" static-http and static-https respectively, as well.\n" +" Default: https." +msgstr "" + +msgid "" +"If no suitable authentication entry is found, the user is prompted\n" +"for credentials as usual if required by the remote." +msgstr "" + +msgid "" +"\n" +"``decode/encode``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Filters for transforming files on checkout/checkin. This would\n" +"typically be used for newline processing or other\n" +"localization/canonicalization of files." +msgstr "" + +msgid "" +"Filters consist of a filter pattern followed by a filter command.\n" +"Filter patterns are globs by default, rooted at the repository root.\n" +"For example, to match any file ending in ``.txt`` in the root\n" +"directory only, use the pattern ``*.txt``. To match any file ending\n" +"in ``.c`` anywhere in the repository, use the pattern ``**.c``.\n" +"For each file only the first matching filter applies." +msgstr "" + +msgid "" +"The filter command can start with a specifier, either ``pipe:`` or\n" +"``tempfile:``. If no specifier is given, ``pipe:`` is used by default." +msgstr "" + +msgid "" +"A ``pipe:`` command must accept data on stdin and return the transformed\n" +"data on stdout." +msgstr "" + +msgid "Pipe example::" +msgstr "" + +msgid "" +" [encode]\n" +" # uncompress gzip files on checkin to improve delta compression\n" +" # note: not necessarily a good idea, just an example\n" +" *.gz = pipe: gunzip" +msgstr "" + +msgid "" +" [decode]\n" +" # recompress gzip files when writing them to the working dir (we\n" +" # can safely omit \"pipe:\", because it's the default)\n" +" *.gz = gzip" +msgstr "" + +msgid "" +"A ``tempfile:`` command is a template. The string ``INFILE`` is replaced\n" +"with the name of a temporary file that contains the data to be\n" +"filtered by the command. The string ``OUTFILE`` is replaced with the name\n" +"of an empty temporary file, where the filtered data must be written by\n" +"the command." +msgstr "" + +msgid "" +".. note:: The tempfile mechanism is recommended for Windows systems,\n" +" where the standard shell I/O redirection operators often have\n" +" strange effects and may corrupt the contents of your files." +msgstr "" + +msgid "" +"This filter mechanism is used internally by the ``eol`` extension to\n" +"translate line ending characters between Windows (CRLF) and Unix (LF)\n" +"format. We suggest you use the ``eol`` extension for convenience." +msgstr "" + +msgid "" +"\n" +"``defaults``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "(defaults are deprecated. Don't use them. Use aliases instead)" +msgstr "" + +msgid "" +"Use the ``[defaults]`` section to define command defaults, i.e. the\n" +"default options/arguments to pass to the specified commands." +msgstr "" + +msgid "" +"The following example makes :hg:`log` run in verbose mode, and\n" +":hg:`status` show only the modified files, by default::" +msgstr "" + +msgid "" +" [defaults]\n" +" log = -v\n" +" status = -m" +msgstr "" + +msgid "" +"The actual commands, instead of their aliases, must be used when\n" +"defining command defaults. The command defaults will also be applied\n" +"to the aliases of the commands defined." +msgstr "" + +msgid "" +"\n" +"``diff``\n" +"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Settings used when displaying diffs. Everything except for ``unified`` is a\n" +"Boolean and defaults to False." +msgstr "" + +msgid "" +"``git``\n" +" Use git extended diff format." +msgstr "" + +msgid "" +"``nodates``\n" +" Don't include dates in diff headers." +msgstr "" + +msgid "" +"``showfunc``\n" +" Show which function each change is in." +msgstr "" + +msgid "" +"``ignorews``\n" +" Ignore white space when comparing lines." +msgstr "" + +msgid "" +"``ignorewsamount``\n" +" Ignore changes in the amount of white space." +msgstr "" + +msgid "" +"``ignoreblanklines``\n" +" Ignore changes whose lines are all blank." +msgstr "" + +msgid "" +"``unified``\n" +" Number of lines of context to show." +msgstr "" + +msgid "" +"``email``\n" +"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "Settings for extensions that send email messages." +msgstr "" + +msgid "" +"``from``\n" +" Optional. Email address to use in \"From\" header and SMTP envelope\n" +" of outgoing messages." +msgstr "" + +msgid "" +"``to``\n" +" Optional. Comma-separated list of recipients' email addresses." +msgstr "" + +msgid "" +"``cc``\n" +" Optional. Comma-separated list of carbon copy recipients'\n" +" email addresses." +msgstr "" + +msgid "" +"``bcc``\n" +" Optional. Comma-separated list of blind carbon copy recipients'\n" +" email addresses." +msgstr "" + +msgid "" +"``method``\n" +" Optional. Method to use to send email messages. If value is ``smtp``\n" +" (default), use SMTP (see the ``[smtp]`` section for configuration).\n" +" Otherwise, use as name of program to run that acts like sendmail\n" +" (takes ``-f`` option for sender, list of recipients on command line,\n" +" message on stdin). Normally, setting this to ``sendmail`` or\n" +" ``/usr/sbin/sendmail`` is enough to use sendmail to send messages." +msgstr "" + +msgid "" +"``charsets``\n" +" Optional. Comma-separated list of character sets considered\n" +" convenient for recipients. Addresses, headers, and parts not\n" +" containing patches of outgoing messages will be encoded in the\n" +" first character set to which conversion from local encoding\n" +" (``$HGENCODING``, ``ui.fallbackencoding``) succeeds. If correct\n" +" conversion fails, the text in question is sent as is. Defaults to\n" +" empty (explicit) list." +msgstr "" + +msgid " Order of outgoing email character sets:" +msgstr "" + +msgid "" +" 1. ``us-ascii``: always first, regardless of settings\n" +" 2. ``email.charsets``: in order given by user\n" +" 3. ``ui.fallbackencoding``: if not in email.charsets\n" +" 4. ``$HGENCODING``: if not in email.charsets\n" +" 5. ``utf-8``: always last, regardless of settings" +msgstr "" + +msgid "Email example::" +msgstr "" + +msgid "" +" [email]\n" +" from = Joseph User <joe.user@example.com>\n" +" method = /usr/sbin/sendmail\n" +" # charsets for western Europeans\n" +" # us-ascii, utf-8 omitted, as they are tried first and last\n" +" charsets = iso-8859-1, iso-8859-15, windows-1252" +msgstr "" + +msgid "" +"\n" +"``extensions``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Mercurial has an extension mechanism for adding new features. To\n" +"enable an extension, create an entry for it in this section." +msgstr "" + +msgid "" +"If you know that the extension is already in Python's search path,\n" +"you can give the name of the module, followed by ``=``, with nothing\n" +"after the ``=``." +msgstr "" + +msgid "" +"Otherwise, give a name that you choose, followed by ``=``, followed by\n" +"the path to the ``.py`` file (including the file name extension) that\n" +"defines the extension." +msgstr "" + +msgid "" +"To explicitly disable an extension that is enabled in an hgrc of\n" +"broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``\n" +"or ``foo = !`` when path is not supplied." +msgstr "" + +msgid "Example for ``~/.hgrc``::" +msgstr "" + +msgid "" +" [extensions]\n" +" # (the mq extension will get loaded from Mercurial's path)\n" +" mq =\n" +" # (this extension will get loaded from the file specified)\n" +" myfeature = ~/.hgext/myfeature.py" +msgstr "" + +msgid "" +"\n" +"``hostfingerprints``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Fingerprints of the certificates of known HTTPS servers.\n" +"A HTTPS connection to a server with a fingerprint configured here will\n" +"only succeed if the servers certificate matches the fingerprint.\n" +"This is very similar to how ssh known hosts works.\n" +"The fingerprint is the SHA-1 hash value of the DER encoded certificate.\n" +"The CA chain and web.cacerts is not used for servers with a fingerprint." +msgstr "" + +msgid "For example::" +msgstr "" + +msgid "" +" [hostfingerprints]\n" +" hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:" +"d6:4b:ee:cc" +msgstr "" + +msgid "This feature is only supported when using Python 2.6 or later." +msgstr "" + +msgid "" +"\n" +"``format``\n" +"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"``usestore``\n" +" Enable or disable the \"store\" repository format which improves\n" +" compatibility with systems that fold case or otherwise mangle\n" +" filenames. Enabled by default. Disabling this option will allow\n" +" you to store longer filenames in some situations at the expense of\n" +" compatibility and ensures that the on-disk format of newly created\n" +" repositories will be compatible with Mercurial before version 0.9.4." +msgstr "" + +msgid "" +"``usefncache``\n" +" Enable or disable the \"fncache\" repository format which enhances\n" +" the \"store\" repository format (which has to be enabled to use\n" +" fncache) to allow longer filenames and avoids using Windows\n" +" reserved names, e.g. \"nul\". Enabled by default. Disabling this\n" +" option ensures that the on-disk format of newly created\n" +" repositories will be compatible with Mercurial before version 1.1." +msgstr "" + +msgid "" +"``dotencode``\n" +" Enable or disable the \"dotencode\" repository format which enhances\n" +" the \"fncache\" repository format (which has to be enabled to use\n" +" dotencode) to avoid issues with filenames starting with ._ on\n" +" Mac OS X and spaces on Windows. Enabled by default. Disabling this\n" +" option ensures that the on-disk format of newly created\n" +" repositories will be compatible with Mercurial before version 1.7." +msgstr "" + +msgid "" +"``merge-patterns``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"This section specifies merge tools to associate with particular file\n" +"patterns. Tools matched here will take precedence over the default\n" +"merge tool. Patterns are globs by default, rooted at the repository\n" +"root." +msgstr "" + +msgid "" +" [merge-patterns]\n" +" **.c = kdiff3\n" +" **.jpg = myimgmerge" +msgstr "" + +msgid "" +"``merge-tools``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"This section configures external merge tools to use for file-level\n" +"merges." +msgstr "" + +#, fuzzy +msgid "Example ``~/.hgrc``::" +msgstr "記述例::" + +msgid "" +" [merge-tools]\n" +" # Override stock tool location\n" +" kdiff3.executable = ~/bin/kdiff3\n" +" # Specify command line\n" +" kdiff3.args = $base $local $other -o $output\n" +" # Give higher priority\n" +" kdiff3.priority = 1" +msgstr "" + +msgid "" +" # Define new tool\n" +" myHtmlTool.args = -m $local $other $base $output\n" +" myHtmlTool.regkey = Software\\FooSoftware\\HtmlMerge\n" +" myHtmlTool.priority = 1" +msgstr "" + +msgid "" +"``priority``\n" +" The priority in which to evaluate this tool.\n" +" Default: 0." +msgstr "" + +msgid "" +"``executable``\n" +" Either just the name of the executable or its pathname. On Windows,\n" +" the path can use environment variables with ${ProgramFiles} syntax.\n" +" Default: the tool name." +msgstr "" + +msgid "" +"``args``\n" +" The arguments to pass to the tool executable. You can refer to the\n" +" files being merged as well as the output file through these\n" +" variables: ``$base``, ``$local``, ``$other``, ``$output``.\n" +" Default: ``$local $base $other``" +msgstr "" + +msgid "" +"``premerge``\n" +" Attempt to run internal non-interactive 3-way merge tool before\n" +" launching external tool. Options are ``true``, ``false``, or ``keep``\n" +" to leave markers in the file if the premerge fails.\n" +" Default: True" +msgstr "" + +msgid "" +"``binary``\n" +" This tool can merge binary files. Defaults to False, unless tool\n" +" was selected by file pattern match." +msgstr "" + +msgid "" +"``symlink``\n" +" This tool can merge symlinks. Defaults to False, even if tool was\n" +" selected by file pattern match." +msgstr "" + +msgid "" +"``check``\n" +" A list of merge success-checking options:" +msgstr "" + +msgid "" +" ``changed``\n" +" Ask whether merge was successful when the merged file shows no changes.\n" +" ``conflicts``\n" +" Check whether there are conflicts even though the tool reported " +"success.\n" +" ``prompt``\n" +" Always prompt for merge success, regardless of success reported by tool." +msgstr "" + +msgid "" +"``checkchanged``\n" +" True is equivalent to ``check = changed``.\n" +" Default: False" +msgstr "" + +msgid "" +"``checkconflicts``\n" +" True is equivalent to ``check = conflicts``.\n" +" Default: False" +msgstr "" + +msgid "" +"``fixeol``\n" +" Attempt to fix up EOL changes caused by the merge tool.\n" +" Default: False" +msgstr "" + +msgid "" +"``gui``\n" +" This tool requires a graphical interface to run. Default: False" +msgstr "" + +msgid "" +"``regkey``\n" +" Windows registry key which describes install location of this\n" +" tool. Mercurial will search for this key first under\n" +" ``HKEY_CURRENT_USER`` and then under ``HKEY_LOCAL_MACHINE``.\n" +" Default: None" +msgstr "" + +msgid "" +"``regkeyalt``\n" +" An alternate Windows registry key to try if the first key is not\n" +" found. The alternate key uses the same ``regname`` and ``regappend``\n" +" semantics of the primary key. The most common use for this key\n" +" is to search for 32bit applications on 64bit operating systems.\n" +" Default: None" +msgstr "" + +msgid "" +"``regname``\n" +" Name of value to read from specified registry key. Defaults to the\n" +" unnamed (default) value." +msgstr "" + +msgid "" +"``regappend``\n" +" String to append to the value read from the registry, typically\n" +" the executable name of the tool.\n" +" Default: None" +msgstr "" + +msgid "" +"\n" +"``hooks``\n" +"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Commands or Python functions that get automatically executed by\n" +"various actions such as starting or finishing a commit. Multiple\n" +"hooks can be run for the same action by appending a suffix to the\n" +"action. Overriding a site-wide hook can be done by changing its\n" +"value or setting it to an empty string." +msgstr "" + +msgid "Example ``.hg/hgrc``::" +msgstr "" + +msgid "" +" [hooks]\n" +" # update working directory after adding changesets\n" +" changegroup.update = hg update\n" +" # do not use the site-wide hook\n" +" incoming =\n" +" incoming.email = /my/email/hook\n" +" incoming.autobuild = /my/build/hook" +msgstr "" + +msgid "" +"Most hooks are run with environment variables set that give useful\n" +"additional information. For each hook below, the environment\n" +"variables it is passed are listed with names of the form ``$HG_foo``." +msgstr "" + +msgid "" +"``changegroup``\n" +" Run after a changegroup has been added via push, pull or unbundle.\n" +" ID of the first new changeset is in ``$HG_NODE``. URL from which\n" +" changes came is in ``$HG_URL``." +msgstr "" + +msgid "" +"``commit``\n" +" Run after a changeset has been created in the local repository. ID\n" +" of the newly created changeset is in ``$HG_NODE``. Parent changeset\n" +" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``." +msgstr "" + +msgid "" +"``incoming``\n" +" Run after a changeset has been pulled, pushed, or unbundled into\n" +" the local repository. The ID of the newly arrived changeset is in\n" +" ``$HG_NODE``. URL that was source of changes came is in ``$HG_URL``." +msgstr "" + +msgid "" +"``outgoing``\n" +" Run after sending changes from local repository to another. ID of\n" +" first changeset sent is in ``$HG_NODE``. Source of operation is in\n" +" ``$HG_SOURCE``; see \"preoutgoing\" hook for description." +msgstr "" + +msgid "" +"``post-<command>``\n" +" Run after successful invocations of the associated command. The\n" +" contents of the command line are passed as ``$HG_ARGS`` and the result\n" +" code in ``$HG_RESULT``. Parsed command line arguments are passed as \n" +" ``$HG_PATS`` and ``$HG_OPTS``. These contain string representations of\n" +" the python data internally passed to <command>. ``$HG_OPTS`` is a \n" +" dictionary of options (with unspecified options set to their defaults).\n" +" ``$HG_PATS`` is a list of arguments. Hook failure is ignored." +msgstr "" + +msgid "" +"``pre-<command>``\n" +" Run before executing the associated command. The contents of the\n" +" command line are passed as ``$HG_ARGS``. Parsed command line arguments\n" +" are passed as ``$HG_PATS`` and ``$HG_OPTS``. These contain string\n" +" representations of the data internally passed to <command>. ``$HG_OPTS``\n" +" is a dictionary of options (with unspecified options set to their\n" +" defaults). ``$HG_PATS`` is a list of arguments. If the hook returns \n" +" failure, the command doesn't execute and Mercurial returns the failure\n" +" code." +msgstr "" + +msgid "" +"``prechangegroup``\n" +" Run before a changegroup is added via push, pull or unbundle. Exit\n" +" status 0 allows the changegroup to proceed. Non-zero status will\n" +" cause the push, pull or unbundle to fail. URL from which changes\n" +" will come is in ``$HG_URL``." +msgstr "" + +msgid "" +"``precommit``\n" +" Run before starting a local commit. Exit status 0 allows the\n" +" commit to proceed. Non-zero status will cause the commit to fail.\n" +" Parent changeset IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``." +msgstr "" + +msgid "" +"``prelistkeys``\n" +" Run before listing pushkeys (like bookmarks) in the\n" +" repository. Non-zero status will cause failure. The key namespace is\n" +" in ``$HG_NAMESPACE``." +msgstr "" + +msgid "" +"``preoutgoing``\n" +" Run before collecting changes to send from the local repository to\n" +" another. Non-zero status will cause failure. This lets you prevent\n" +" pull over HTTP or SSH. Also prevents against local pull, push\n" +" (outbound) or bundle commands, but not effective, since you can\n" +" just copy files instead then. Source of operation is in\n" +" ``$HG_SOURCE``. If \"serve\", operation is happening on behalf of remote\n" +" SSH or HTTP repository. If \"push\", \"pull\" or \"bundle\", operation\n" +" is happening on behalf of repository on same system." +msgstr "" + +msgid "" +"``prepushkey``\n" +" Run before a pushkey (like a bookmark) is added to the\n" +" repository. Non-zero status will cause the key to be rejected. The\n" +" key namespace is in ``$HG_NAMESPACE``, the key is in ``$HG_KEY``,\n" +" the old value (if any) is in ``$HG_OLD``, and the new value is in\n" +" ``$HG_NEW``." +msgstr "" + +msgid "" +"``pretag``\n" +" Run before creating a tag. Exit status 0 allows the tag to be\n" +" created. Non-zero status will cause the tag to fail. ID of\n" +" changeset to tag is in ``$HG_NODE``. Name of tag is in ``$HG_TAG``. Tag " +"is\n" +" local if ``$HG_LOCAL=1``, in repository if ``$HG_LOCAL=0``." +msgstr "" + +msgid "" +"``pretxnchangegroup``\n" +" Run after a changegroup has been added via push, pull or unbundle,\n" +" but before the transaction has been committed. Changegroup is\n" +" visible to hook program. This lets you validate incoming changes\n" +" before accepting them. Passed the ID of the first new changeset in\n" +" ``$HG_NODE``. Exit status 0 allows the transaction to commit. Non-zero\n" +" status will cause the transaction to be rolled back and the push,\n" +" pull or unbundle will fail. URL that was source of changes is in\n" +" ``$HG_URL``." +msgstr "" + +msgid "" +"``pretxncommit``\n" +" Run after a changeset has been created but the transaction not yet\n" +" committed. Changeset is visible to hook program. This lets you\n" +" validate commit message and changes. Exit status 0 allows the\n" +" commit to proceed. Non-zero status will cause the transaction to\n" +" be rolled back. ID of changeset is in ``$HG_NODE``. Parent changeset\n" +" IDs are in ``$HG_PARENT1`` and ``$HG_PARENT2``." +msgstr "" + +msgid "" +"``preupdate``\n" +" Run before updating the working directory. Exit status 0 allows\n" +" the update to proceed. Non-zero status will prevent the update.\n" +" Changeset ID of first new parent is in ``$HG_PARENT1``. If merge, ID\n" +" of second new parent is in ``$HG_PARENT2``." +msgstr "" + +msgid "" +"``listkeys``\n" +" Run after listing pushkeys (like bookmarks) in the repository. The\n" +" key namespace is in ``$HG_NAMESPACE``. ``$HG_VALUES`` is a\n" +" dictionary containing the keys and values." +msgstr "" + +msgid "" +"``pushkey``\n" +" Run after a pushkey (like a bookmark) is added to the\n" +" repository. The key namespace is in ``$HG_NAMESPACE``, the key is in\n" +" ``$HG_KEY``, the old value (if any) is in ``$HG_OLD``, and the new\n" +" value is in ``$HG_NEW``." +msgstr "" + +msgid "" +"``tag``\n" +" Run after a tag is created. ID of tagged changeset is in ``$HG_NODE``.\n" +" Name of tag is in ``$HG_TAG``. Tag is local if ``$HG_LOCAL=1``, in\n" +" repository if ``$HG_LOCAL=0``." +msgstr "" + +msgid "" +"``update``\n" +" Run after updating the working directory. Changeset ID of first\n" +" new parent is in ``$HG_PARENT1``. If merge, ID of second new parent is\n" +" in ``$HG_PARENT2``. If the update succeeded, ``$HG_ERROR=0``. If the\n" +" update failed (e.g. because conflicts not resolved), ``$HG_ERROR=1``." +msgstr "" + +msgid "" +".. note:: It is generally better to use standard hooks rather than the\n" +" generic pre- and post- command hooks as they are guaranteed to be\n" +" called in the appropriate contexts for influencing transactions.\n" +" Also, hooks like \"commit\" will be called in all contexts that\n" +" generate a commit (e.g. tag) and not just the commit command." +msgstr "" + +msgid "" +".. note:: Environment variables with empty values may not be passed to\n" +" hooks on platforms such as Windows. As an example, ``$HG_PARENT2``\n" +" will have an empty value under Unix-like platforms for non-merge\n" +" changesets, while it will not be available at all under Windows." +msgstr "" + +msgid "The syntax for Python hooks is as follows::" +msgstr "" + +msgid "" +" hookname = python:modulename.submodule.callable\n" +" hookname = python:/path/to/python/module.py:callable" +msgstr "" + +msgid "" +"Python hooks are run within the Mercurial process. Each hook is\n" +"called with at least three keyword arguments: a ui object (keyword\n" +"``ui``), a repository object (keyword ``repo``), and a ``hooktype``\n" +"keyword that tells what kind of hook is used. Arguments listed as\n" +"environment variables above are passed as keyword arguments, with no\n" +"``HG_`` prefix, and names in lower case." +msgstr "" + +msgid "" +"If a Python hook returns a \"true\" value or raises an exception, this\n" +"is treated as a failure." +msgstr "" + +msgid "" +"\n" +"``http_proxy``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Used to access web-based Mercurial repositories through a HTTP\n" +"proxy." +msgstr "" + +msgid "" +"``host``\n" +" Host name and (optional) port of the proxy server, for example\n" +" \"myproxy:8000\"." +msgstr "" + +msgid "" +"``no``\n" +" Optional. Comma-separated list of host names that should bypass\n" +" the proxy." +msgstr "" + +msgid "" +"``passwd``\n" +" Optional. Password to authenticate with at the proxy server." +msgstr "" + +msgid "" +"``user``\n" +" Optional. User name to authenticate with at the proxy server." +msgstr "" + +msgid "" +"``always``\n" +" Optional. Always use the proxy, even for localhost and any entries\n" +" in ``http_proxy.no``. True or False. Default: False." +msgstr "" + +msgid "" +"``smtp``\n" +"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "Configuration for extensions that need to send email messages." +msgstr "" + +msgid "" +"``host``\n" +" Host name of mail server, e.g. \"mail.example.com\"." +msgstr "" + +msgid "" +"``port``\n" +" Optional. Port to connect to on mail server. Default: 25." +msgstr "" + +msgid "" +"``tls``\n" +" Optional. Method to enable TLS when connecting to mail server: " +"starttls,\n" +" smtps or none. Default: none." +msgstr "" + +msgid "" +"``username``\n" +" Optional. User name for authenticating with the SMTP server.\n" +" Default: none." +msgstr "" + +msgid "" +"``password``\n" +" Optional. Password for authenticating with the SMTP server. If not\n" +" specified, interactive sessions will prompt the user for a\n" +" password; non-interactive sessions will fail. Default: none." +msgstr "" + +msgid "" +"``local_hostname``\n" +" Optional. It's the hostname that the sender can use to identify\n" +" itself to the MTA." +msgstr "" + +msgid "" +"\n" +"``patch``\n" +"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Settings used when applying patches, for instance through the 'import'\n" +"command or with Mercurial Queues extension." +msgstr "" + +msgid "" +"``eol``\n" +" When set to 'strict' patch content and patched files end of lines\n" +" are preserved. When set to ``lf`` or ``crlf``, both files end of\n" +" lines are ignored when patching and the result line endings are\n" +" normalized to either LF (Unix) or CRLF (Windows). When set to\n" +" ``auto``, end of lines are again ignored while patching but line\n" +" endings in patched files are normalized to their original setting\n" +" on a per-file basis. If target file does not exist or has no end\n" +" of line, patch line endings are preserved.\n" +" Default: strict." +msgstr "" + +msgid "" +"\n" +"``paths``\n" +"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Assigns symbolic names to repositories. The left side is the\n" +"symbolic name, and the right gives the directory or URL that is the\n" +"location of the repository. Default paths can be declared by setting\n" +"the following entries." +msgstr "" + +msgid "" +"``default``\n" +" Directory or URL to use when pulling if no source is specified.\n" +" Default is set to repository from which the current repository was\n" +" cloned." +msgstr "" + +msgid "" +"``default-push``\n" +" Optional. Directory or URL to use when pushing if no destination\n" +" is specified." +msgstr "" + +msgid "" +"\n" +"``profiling``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Specifies profiling format and file output. In this section\n" +"description, 'profiling data' stands for the raw data collected\n" +"during profiling, while 'profiling report' stands for a statistical\n" +"text report generated from the profiling data. The profiling is done\n" +"using lsprof." +msgstr "" + +msgid "" +"``format``\n" +" Profiling format.\n" +" Default: text." +msgstr "" + +msgid "" +" ``text``\n" +" Generate a profiling report. When saving to a file, it should be\n" +" noted that only the report is saved, and the profiling data is\n" +" not kept.\n" +" ``kcachegrind``\n" +" Format profiling data for kcachegrind use: when saving to a\n" +" file, the generated file can directly be loaded into\n" +" kcachegrind." +msgstr "" + +msgid "" +"``output``\n" +" File path where profiling data or report should be saved. If the\n" +" file exists, it is replaced. Default: None, data is printed on\n" +" stderr" +msgstr "" + +msgid "" +"``revsetalias``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "Alias definitions for revsets. See :hg:`help revsets` for details." +msgstr "" + +msgid "" +"``server``\n" +"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "Controls generic server settings." +msgstr "" + +msgid "" +"``uncompressed``\n" +" Whether to allow clients to clone a repository using the\n" +" uncompressed streaming protocol. This transfers about 40% more\n" +" data than a regular clone, but uses less memory and CPU on both\n" +" server and client. Over a LAN (100 Mbps or better) or a very fast\n" +" WAN, an uncompressed streaming clone is a lot faster (~10x) than a\n" +" regular clone. Over most WAN connections (anything slower than\n" +" about 6 Mbps), uncompressed streaming is slower, because of the\n" +" extra data transfer overhead. This mode will also temporarily hold\n" +" the write lock while determining what data to transfer.\n" +" Default is True." +msgstr "" + +msgid "" +"``validate``\n" +" Whether to validate the completeness of pushed changesets by\n" +" checking that all new file revisions specified in manifests are\n" +" present. Default is False." +msgstr "" + +msgid "" +"``subpaths``\n" +"\"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "Defines subrepositories source locations rewriting rules of the form::" +msgstr "" + +msgid " <pattern> = <replacement>" +msgstr "" + +msgid "" +"Where ``pattern`` is a regular expression matching the source and\n" +"``replacement`` is the replacement string used to rewrite it. Groups\n" +"can be matched in ``pattern`` and referenced in ``replacements``. For\n" +"instance::" +msgstr "" + +msgid " http://server/(.*)-hg/ = http://hg.server/\\1/" +msgstr "" + +msgid "rewrites ``http://server/foo-hg/`` into ``http://hg.server/foo/``." +msgstr "" + +msgid "All patterns are applied in definition order." +msgstr "" + +msgid "" +"``trusted``\n" +"\"\"\"\"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Mercurial will not use the settings in the\n" +"``.hg/hgrc`` file from a repository if it doesn't belong to a trusted\n" +"user or to a trusted group, as various hgrc features allow arbitrary\n" +"commands to be run. This issue is often encountered when configuring\n" +"hooks or extensions for shared repositories or servers. However,\n" +"the web interface will use some safe settings from the ``[web]``\n" +"section." +msgstr "" + +msgid "" +"This section specifies what users and groups are trusted. The\n" +"current user is always trusted. To trust everybody, list a user or a\n" +"group with name ``*``. These settings must be placed in an\n" +"*already-trusted file* to take effect, such as ``$HOME/.hgrc`` of the\n" +"user or service running Mercurial." +msgstr "" + +msgid "" +"``users``\n" +" Comma-separated list of trusted users." +msgstr "" + +msgid "" +"``groups``\n" +" Comma-separated list of trusted groups." +msgstr "" + +msgid "" +"\n" +"``ui``\n" +"\"\"\"\"\"\"" +msgstr "" + +msgid "User interface controls." +msgstr "" + +msgid "" +"``archivemeta``\n" +" Whether to include the .hg_archival.txt file containing meta data\n" +" (hashes for the repository base and for tip) in archives created\n" +" by the :hg:`archive` command or downloaded via hgweb.\n" +" Default is True." +msgstr "" + +msgid "" +"``askusername``\n" +" Whether to prompt for a username when committing. If True, and\n" +" neither ``$HGUSER`` nor ``$EMAIL`` has been specified, then the user " +"will\n" +" be prompted to enter a username. If no username is entered, the\n" +" default ``USER@HOST`` is used instead.\n" +" Default is False." +msgstr "" + +msgid "" +"``commitsubrepos``\n" +" Whether to commit modified subrepositories when committing the\n" +" parent repository. If False and one subrepository has uncommitted\n" +" changes, abort the commit.\n" +" Default is True." +msgstr "" + +msgid "" +"``debug``\n" +" Print debugging information. True or False. Default is False." +msgstr "" + +msgid "" +"``editor``\n" +" The editor to use during a commit. Default is ``$EDITOR`` or ``vi``." +msgstr "" + +msgid "" +"``fallbackencoding``\n" +" Encoding to try if it's not possible to decode the changelog using\n" +" UTF-8. Default is ISO-8859-1." +msgstr "" + +msgid "" +"``ignore``\n" +" A file to read per-user ignore patterns from. This file should be\n" +" in the same format as a repository-wide .hgignore file. This\n" +" option supports hook syntax, so if you want to specify multiple\n" +" ignore files, you can do so by setting something like\n" +" ``ignore.other = ~/.hgignore2``. For details of the ignore file\n" +" format, see the ``hgignore(5)`` man page." +msgstr "" + +msgid "" +"``interactive``\n" +" Allow to prompt the user. True or False. Default is True." +msgstr "" + +msgid "" +"``logtemplate``\n" +" Template string for commands that print changesets." +msgstr "" + +msgid "" +"``merge``\n" +" The conflict resolution program to use during a manual merge.\n" +" For more information on merge tools see :hg:`help merge-tools`.\n" +" For configuring merge tools see the ``[merge-tools]`` section." +msgstr "" + +msgid "" +"``portablefilenames``\n" +" Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``.\n" +" Default is ``warn``.\n" +" If set to ``warn`` (or ``true``), a warning message is printed on POSIX\n" +" platforms, if a file with a non-portable filename is added (e.g. a file\n" +" with a name that can't be created on Windows because it contains " +"reserved\n" +" parts like ``AUX``, reserved characters like ``:``, or would cause a " +"case\n" +" collision with an existing file).\n" +" If set to ``ignore`` (or ``false``), no warning is printed.\n" +" If set to ``abort``, the command is aborted.\n" +" On Windows, this configuration option is ignored and the command aborted." +msgstr "" + +msgid "" +"``quiet``\n" +" Reduce the amount of output printed. True or False. Default is False." +msgstr "" + +msgid "" +"``remotecmd``\n" +" remote command to use for clone/push/pull operations. Default is ``hg``." +msgstr "" + +msgid "" +"``report_untrusted``\n" +" Warn if a ``.hg/hgrc`` file is ignored due to not being owned by a\n" +" trusted user or group. True or False. Default is True." +msgstr "" + +msgid "" +"``slash``\n" +" Display paths using a slash (``/``) as the path separator. This\n" +" only makes a difference on systems where the default path\n" +" separator is not the slash character (e.g. Windows uses the\n" +" backslash character (``\\``)).\n" +" Default is False." +msgstr "" + +msgid "" +"``ssh``\n" +" command to use for SSH connections. Default is ``ssh``." +msgstr "" + +msgid "" +"``strict``\n" +" Require exact command names, instead of allowing unambiguous\n" +" abbreviations. True or False. Default is False." +msgstr "" + +msgid "" +"``style``\n" +" Name of style to use for command output." +msgstr "" + +msgid "" +"``timeout``\n" +" The timeout used when a lock is held (in seconds), a negative value\n" +" means no timeout. Default is 600." +msgstr "" + +msgid "" +"``traceback``\n" +" Mercurial always prints a traceback when an unknown exception\n" +" occurs. Setting this to True will make Mercurial print a traceback\n" +" on all exceptions, even those recognized by Mercurial (such as\n" +" IOError or MemoryError). Default is False." +msgstr "" + +msgid "" +"``username``\n" +" The committer of a changeset created when running \"commit\".\n" +" Typically a person's name and email address, e.g. ``Fred Widget\n" +" <fred@example.com>``. Default is ``$EMAIL`` or ``username@hostname``. " +"If\n" +" the username in hgrc is empty, it has to be specified manually or\n" +" in a different hgrc file (e.g. ``$HOME/.hgrc``, if the admin set\n" +" ``username =`` in the system hgrc). Environment variables in the\n" +" username are expanded." +msgstr "" + +msgid "" +"``verbose``\n" +" Increase the amount of output printed. True or False. Default is False." +msgstr "" + +msgid "" +"\n" +"``web``\n" +"\"\"\"\"\"\"\"" +msgstr "" + +msgid "" +"Web interface configuration. The settings in this section apply to\n" +"both the builtin webserver (started by :hg:`serve`) and the script you\n" +"run through a webserver (``hgweb.cgi`` and the derivatives for FastCGI\n" +"and WSGI)." +msgstr "" + +msgid "" +"The Mercurial webserver does no authentication (it does not prompt for\n" +"usernames and passwords to validate *who* users are), but it does do\n" +"authorization (it grants or denies access for *authenticated users*\n" +"based on settings in this section). You must either configure your\n" +"webserver to do authentication for you, or disable the authorization\n" +"checks." +msgstr "" + +msgid "" +"For a quick setup in a trusted environment, e.g., a private LAN, where\n" +"you want it to accept pushes from anybody, you can use the following\n" +"command line::" +msgstr "" + +msgid " $ hg --config web.allow_push=* --config web.push_ssl=False serve" +msgstr "" + +msgid "" +"Note that this will allow anybody to push anything to the server and\n" +"that this should not be used for public servers." +msgstr "" + +msgid "The full set of options is:" +msgstr "" + +msgid "" +"``accesslog``\n" +" Where to output the access log. Default is stdout." +msgstr "" + +msgid "" +"``address``\n" +" Interface address to bind to. Default is all." +msgstr "" + +msgid "" +"``allow_archive``\n" +" List of archive format (bz2, gz, zip) allowed for downloading.\n" +" Default is empty." +msgstr "" + +msgid "" +"``allowbz2``\n" +" (DEPRECATED) Whether to allow .tar.bz2 downloading of repository\n" +" revisions.\n" +" Default is False." +msgstr "" + +msgid "" +"``allowgz``\n" +" (DEPRECATED) Whether to allow .tar.gz downloading of repository\n" +" revisions.\n" +" Default is False." +msgstr "" + +msgid "" +"``allowpull``\n" +" Whether to allow pulling from the repository. Default is True." +msgstr "" + +msgid "" +"``allow_push``\n" +" Whether to allow pushing to the repository. If empty or not set,\n" +" push is not allowed. If the special value ``*``, any remote user can\n" +" push, including unauthenticated users. Otherwise, the remote user\n" +" must have been authenticated, and the authenticated user name must\n" +" be present in this list. The contents of the allow_push list are\n" +" examined after the deny_push list." +msgstr "" + +msgid "" +"``allow_read``\n" +" If the user has not already been denied repository access due to\n" +" the contents of deny_read, this list determines whether to grant\n" +" repository access to the user. If this list is not empty, and the\n" +" user is unauthenticated or not present in the list, then access is\n" +" denied for the user. If the list is empty or not set, then access\n" +" is permitted to all users by default. Setting allow_read to the\n" +" special value ``*`` is equivalent to it not being set (i.e. access\n" +" is permitted to all users). The contents of the allow_read list are\n" +" examined after the deny_read list." +msgstr "" + +msgid "" +"``allowzip``\n" +" (DEPRECATED) Whether to allow .zip downloading of repository\n" +" revisions. Default is False. This feature creates temporary files." +msgstr "" + +msgid "" +"``baseurl``\n" +" Base URL to use when publishing URLs in other locations, so\n" +" third-party tools like email notification hooks can construct\n" +" URLs. Example: ``http://hgserver/repos/``." +msgstr "" + +msgid "" +"``cacerts``\n" +" Path to file containing a list of PEM encoded certificate\n" +" authority certificates. Environment variables and ``~user``\n" +" constructs are expanded in the filename. If specified on the\n" +" client, then it will verify the identity of remote HTTPS servers\n" +" with these certificates. The form must be as follows::" +msgstr "" + +msgid "" +" -----BEGIN CERTIFICATE-----\n" +" ... (certificate in base64 PEM encoding) ...\n" +" -----END CERTIFICATE-----\n" +" -----BEGIN CERTIFICATE-----\n" +" ... (certificate in base64 PEM encoding) ...\n" +" -----END CERTIFICATE-----" +msgstr "" + +msgid "" +" This feature is only supported when using Python 2.6 or later. If you " +"wish\n" +" to use it with earlier versions of Python, install the backported\n" +" version of the ssl library that is available from\n" +" ``http://pypi.python.org``." +msgstr "" + +msgid "" +" You can use OpenSSL's CA certificate file if your platform has one.\n" +" On most Linux systems this will be ``/etc/ssl/certs/ca-certificates." +"crt``.\n" +" Otherwise you will have to generate this file manually." +msgstr "" + +msgid "" +" To disable SSL verification temporarily, specify ``--insecure`` from\n" +" command line." +msgstr "" + +msgid "" +"``cache``\n" +" Whether to support caching in hgweb. Defaults to True." +msgstr "" + +msgid "" +"``contact``\n" +" Name or email address of the person in charge of the repository.\n" +" Defaults to ui.username or ``$EMAIL`` or \"unknown\" if unset or empty." +msgstr "" + +msgid "" +"``deny_push``\n" +" Whether to deny pushing to the repository. If empty or not set,\n" +" push is not denied. If the special value ``*``, all remote users are\n" +" denied push. Otherwise, unauthenticated users are all denied, and\n" +" any authenticated user name present in this list is also denied. The\n" +" contents of the deny_push list are examined before the allow_push list." +msgstr "" + +msgid "" +"``deny_read``\n" +" Whether to deny reading/viewing of the repository. If this list is\n" +" not empty, unauthenticated users are all denied, and any\n" +" authenticated user name present in this list is also denied access to\n" +" the repository. If set to the special value ``*``, all remote users\n" +" are denied access (rarely needed ;). If deny_read is empty or not set,\n" +" the determination of repository access depends on the presence and\n" +" content of the allow_read list (see description). If both\n" +" deny_read and allow_read are empty or not set, then access is\n" +" permitted to all users by default. If the repository is being\n" +" served via hgwebdir, denied users will not be able to see it in\n" +" the list of repositories. The contents of the deny_read list have\n" +" priority over (are examined before) the contents of the allow_read\n" +" list." +msgstr "" + +msgid "" +"``descend``\n" +" hgwebdir indexes will not descend into subdirectories. Only " +"repositories\n" +" directly in the current path will be shown (other repositories are " +"still\n" +" available from the index corresponding to their containing path)." +msgstr "" + +msgid "" +"``description``\n" +" Textual description of the repository's purpose or contents.\n" +" Default is \"unknown\"." +msgstr "" + +msgid "" +"``encoding``\n" +" Character encoding name. Default is the current locale charset.\n" +" Example: \"UTF-8\"" +msgstr "" + +msgid "" +"``errorlog``\n" +" Where to output the error log. Default is stderr." +msgstr "" + +msgid "" +"``hidden``\n" +" Whether to hide the repository in the hgwebdir index.\n" +" Default is False." +msgstr "" + +msgid "" +"``ipv6``\n" +" Whether to use IPv6. Default is False." +msgstr "" + +msgid "" +"``logourl``\n" +" Base URL to use for logos. If unset, ``http://mercurial.selenic.com/``\n" +" will be used." +msgstr "" + +msgid "" +"``name``\n" +" Repository name to use in the web interface. Default is current\n" +" working directory." +msgstr "" + +msgid "" +"``maxchanges``\n" +" Maximum number of changes to list on the changelog. Default is 10." +msgstr "" + +msgid "" +"``maxfiles``\n" +" Maximum number of files to list per changeset. Default is 10." +msgstr "" + +msgid "" +"``port``\n" +" Port to listen on. Default is 8000." +msgstr "" + +msgid "" +"``prefix``\n" +" Prefix path to serve from. Default is '' (server root)." +msgstr "" + +msgid "" +"``push_ssl``\n" +" Whether to require that inbound pushes be transported over SSL to\n" +" prevent password sniffing. Default is True." +msgstr "" + +msgid "" +"``staticurl``\n" +" Base URL to use for static files. If unset, static files (e.g. the\n" +" hgicon.png favicon) will be served by the CGI script itself. Use\n" +" this setting to serve them directly with the HTTP server.\n" +" Example: ``http://hgserver/static/``." +msgstr "" + +msgid "" +"``stripes``\n" +" How many lines a \"zebra stripe\" should span in multiline output.\n" +" Default is 1; set to 0 to disable." +msgstr "" + +msgid "" +"``style``\n" +" Which template map style to use." +msgstr "" + +msgid "" +"``templates``\n" +" Where to find the HTML templates. Default is install path.\n" +msgstr "" msgid "Some commands allow the user to specify a date, e.g.:" msgstr "以下ã®ã‚³ãƒžãƒ³ãƒ‰ã§æ—¥æ™‚指定ãŒå¯èƒ½ã§ã™:" @@ -11065,16 +13496,17 @@ msgstr "- ``1165432709 0`` (2006å¹´12月6æ—¥ 13:18:29 UTC)" msgid "" -"This is the internal representation format for dates. unixtime is the\n" -"number of seconds since the epoch (1970-01-01 00:00 UTC). offset is\n" -"the offset of the local timezone, in seconds west of UTC (negative if\n" -"the timezone is east of UTC)." -msgstr "" -"ã“ã‚Œã¯æ—¥æ™‚ã®å†…部表ç¾å½¢å¼ã§ã™ã€‚ 基点ã¨ãªã‚‹ 1970å¹´1月1æ—¥ 00:00 UTC ã‹ã‚‰ã®\n" -"経éŽç§’数を表㙠unixtime å½¢å¼éƒ¨åˆ†ã¨ã€ ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ゾーンã®ã‚ªãƒ•ã‚»ãƒƒãƒˆå€¤\n" -"(UTC よりもæ±å´ã®åœ°åŸŸã¯è² 値)を表ã™ã‚ªãƒ•ã‚»ãƒƒãƒˆéƒ¨åˆ†ã‹ã‚‰æ§‹æˆã•ã‚Œã¦ã„ã¾ã™ã€‚" +"This is the internal representation format for dates. The first number\n" +"is the number of seconds since the epoch (1970-01-01 00:00 UTC). The\n" +"second is the offset of the local timezone, in seconds west of UTC\n" +"(negative if the timezone is east of UTC)." +msgstr "" +"ã“ã‚Œã¯æ—¥æ™‚ã®å†…部表ç¾å½¢å¼ã§ã™ã€‚\n" +"最åˆã®æ•°å€¤ã¯ã€ 基準時 (1970å¹´1月1æ—¥ 00:00 UTC) ã‹ã‚‰ã®çµŒéŽç§’æ•°ã§ã™ã€‚\n" +"次ã®æ•°å€¤ã¯ã€ UTC ã«å¯¾ã™ã‚‹ãƒãƒ¼ã‚«ãƒ«ã‚¿ã‚¤ãƒ ゾーンã®ã‚ªãƒ•ã‚»ãƒƒãƒˆå€¤\n" +"(å˜ä½: 分) ã§ã™ (UTC よりもæ±å´ã®åœ°åŸŸã¯è² 値)" msgid "The log command also accepts date ranges:" msgstr "log コマンドã«ã¯ã€ 日時範囲指定å¯èƒ½ã§ã™:" msgid "" @@ -11076,17 +13508,17 @@ msgid "The log command also accepts date ranges:" msgstr "log コマンドã«ã¯ã€ 日時範囲指定å¯èƒ½ã§ã™:" msgid "" -"- ``<{datetime}`` - at or before a given date/time\n" -"- ``>{datetime}`` - on or after a given date/time\n" -"- ``{datetime} to {datetime}`` - a date range, inclusive\n" -"- ``-{days}`` - within a given number of days of today\n" -msgstr "" -"- ``<{datetime}`` - 指定日時以å‰(指定日時å«ã‚€)\n" -"- ``>{datetime}`` - 指定日時以後(指定日時å«ã‚€)\n" -"- ``{datetime} to {datetime}`` - 指定日時範囲(指定日時å«ã‚€)\n" -"- ``-{days}`` - 本日ã‹ã‚‰æŒ‡å®šæ—¥æ•°ä»¥å†…\n" +"- ``<DATE`` - at or before a given date/time\n" +"- ``>DATE`` - on or after a given date/time\n" +"- ``DATE to DATE`` - a date range, inclusive\n" +"- ``-DAYS`` - within a given number of days of today\n" +msgstr "" +"- ``<日時指定`` - 指定日時以å‰(指定日時å«ã‚€)\n" +"- ``>日時指定`` - 指定日時以後(指定日時å«ã‚€)\n" +"- ``日時指定 to 日時指定`` - 指定日時範囲(指定日時å«ã‚€)\n" +"- ``-日数`` - 本日ã‹ã‚‰æŒ‡å®šæ—¥æ•°ä»¥å†…\n" msgid "" "Mercurial's default format for showing changes between two versions of\n" @@ -11287,6 +13719,18 @@ " å ´åˆã«ã¯ã€ ã“ららã¯ç„¡è¦–ã•ã‚Œã¾ã›ã‚“。" msgid "" +"HGPLAINEXCEPT\n" +" This is a comma-separated list of features to preserve when\n" +" HGPLAIN is enabled. Currently the only value supported is \"i18n\",\n" +" which preserves internationalization in plain mode." +msgstr "" + +msgid "" +" Setting HGPLAINEXCEPT to anything (even an empty string) will\n" +" enable plain mode." +msgstr "" + +msgid "" "HGUSER\n" " This is the string used as the author of a commit. If not set,\n" " available values will be considered in this order:" @@ -11433,6 +13877,110 @@ " baz = !\n" msgid "" +"Mercurial supports a functional language for selecting a set of\n" +"files. " +msgstr "" +"Mercurial ã¯ã€ 複数ã®ãƒ•ã‚¡ã‚¤ãƒ«ã‚’一括指定ã™ã‚‹ãŸã‚ã®ã€\n" +"å•ã„åˆã‚ã›è¨€èªžã‚’æä¾›ã—ã¦ã„ã¾ã™ã€‚" + +msgid "" +"Like other file patterns, this pattern type is indicated by a prefix,\n" +"'set:'. The language supports a number of predicates which are joined\n" +"by infix operators. Parenthesis can be used for grouping." +msgstr "" + +msgid "" +"Identifiers such as filenames or patterns must be quoted with single\n" +"or double quotes if they contain characters outside of\n" +"``[.*{}[]?/\\_a-zA-Z0-9\\x80-\\xff]`` or if they match one of the\n" +"predefined predicates. This generally applies to file patterns other\n" +"than globs and arguments for predicates." +msgstr "" + +msgid "" +"Special characters can be used in quoted identifiers by escaping them,\n" +"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" +"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." +msgstr "" + +msgid "There is a single prefix operator:" +msgstr "" + +msgid "" +"``not x``\n" +" Files not in x. Short form is ``! x``." +msgstr "" + +msgid "These are the supported infix operators:" +msgstr "" + +msgid "" +"``x and y``\n" +" The intersection of files in x and y. Short form is ``x & y``." +msgstr "" + +msgid "" +"``x or y``\n" +" The union of files in x and y. There are two alternative short\n" +" forms: ``x | y`` and ``x + y``." +msgstr "" + +msgid "" +"``x - y``\n" +" Files in x but not in y." +msgstr "" + +msgid "The following predicates are supported:" +msgstr "" + +msgid ".. predicatesmarker" +msgstr "" + +msgid "Some sample queries:" +msgstr "" + +#, fuzzy +msgid "" +"- Show status of files that appear to be binary in the working directory::" +msgstr "作æ¥é ˜åŸŸã®ãƒ•ã‚¡ã‚¤ãƒ«æ“作状æ³ã®è¡¨ç¤º" + +msgid " hg status -A \"set:binary()\"" +msgstr "" + +msgid "- Forget files that are in .hgignore but are already tracked::" +msgstr "" + +msgid " hg forget \"set:hgignore() and not ignored()\"" +msgstr "" + +msgid "- Find text files that contain a string::" +msgstr "" + +msgid " hg locate \"set:grep(magic) and not binary()\"" +msgstr "" + +msgid "- Find C files in a non-standard encoding::" +msgstr "" + +msgid " hg locate \"set:**.c and not encoding(ascii)\"" +msgstr "" + +msgid "- Revert copies of large binary files::" +msgstr "" + +msgid " hg revert \"set:copied() and binary() and size('>1M')\"" +msgstr "" + +msgid "- Remove files listed in files.lst that contain the letter a or b::" +msgstr "" + +msgid " hg remove \"set: 'listfile:foo.lst' and (**a* or **b*)\"" +msgstr "" + +msgid "See also :hg:`help patterns`.\n" +msgstr "" + +msgid "" "Ancestor\n" " Any changeset that can be reached by an unbroken chain of parent\n" " changesets from a given changeset. More precisely, the ancestors\n" @@ -11446,6 +13994,29 @@ " 直接ã®è¦ªãƒªãƒ“ジョンã¯ç¥–å…ˆã§ã‚り〠祖先(ï¼ç›´æŽ¥ã®è¦ªãƒªãƒ“ジョンå«ã‚€)ã®\n" " 親リビジョンも祖先ã¨ãªã‚Šã¾ã™ã€‚ 'Descendant' ã‚‚å‚ç…§ã®ã“ã¨ã€‚" +#, fuzzy +msgid "" +"Bookmark\n" +" Bookmarks are pointers to certain commits that move when\n" +" committing. They are similar to tags in that it is possible to use\n" +" bookmark names in all places where Mercurial expects a changeset\n" +" ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n" +" when you make a commit." +msgstr "" +" ブックマーク (bookmark) ã¯ã€ コミットæ“作ã«è¿½å¾“ã—ã¦ç§»å‹•ã™ã‚‹ã€\n" +" リビジョン特定用ã®æƒ…å ±ã§ã™ã€‚\n" +" ブックマークã®ãƒªãƒã‚¸ãƒˆãƒªé–“ä¼æ’ã¯ã€ 自動的ã«ã¯è¡Œã‚ã‚Œã¾ã›ã‚“。\n" +" ブックマークã«å¯¾ã—ã¦ã¯ã€ 改åï¼è¤‡è£½ï¼å‰Šé™¤ãŒå¯èƒ½ã§ã™ã€‚\n" +" :hg:`merge` ã‚„ :hg:`update` ã¸ã®ãƒªãƒ“ジョン指定ã«ãŠã„ã¦ã€\n" +" ブックマークを使用ã™ã‚‹ã“ã¨ãŒå¯èƒ½ã§ã™ã€‚" + +msgid "" +" Bookmarks can be renamed, copied and deleted. Bookmarks are local,\n" +" unless they are explicitly pushed or pulled between repositories.\n" +" Pushing and pulling bookmarks allow you to collaborate with others\n" +" on a branch without creating a named branch." +msgstr "" + msgid "" "Branch\n" " (Noun) A child changeset that has been created from a parent that\n" @@ -12041,6 +14612,14 @@ msgstr "" msgid "" +"Tag\n" +" An alternative name given to a changeset. Tags can be used in all\n" +" places where Mercurial expects a changeset ID, e.g., with\n" +" :hg:`update`. The creation of a tag is stored in the history and\n" +" will thus automatically be shared with other using push and pull." +msgstr "" + +msgid "" "Tip\n" " The changeset with the highest revision number. It is the changeset\n" " most recently added in a repository." @@ -12083,6 +14662,122 @@ msgstr "" msgid "" +"Synopsis\n" +"--------" +msgstr "" + +msgid "" +"The Mercurial system uses a file called ``.hgignore`` in the root\n" +"directory of a repository to control its behavior when it searches\n" +"for files that it is not currently tracking." +msgstr "" + +msgid "" +"Description\n" +"-----------" +msgstr "" + +msgid "" +"The working directory of a Mercurial repository will often contain\n" +"files that should not be tracked by Mercurial. These include backup\n" +"files created by editors and build products created by compilers.\n" +"These files can be ignored by listing them in a ``.hgignore`` file in\n" +"the root of the working directory. The ``.hgignore`` file must be\n" +"created manually. It is typically put under version control, so that\n" +"the settings will propagate to other repositories with push and pull." +msgstr "" + +msgid "" +"An untracked file is ignored if its path relative to the repository\n" +"root directory, or any prefix path of that path, is matched against\n" +"any pattern in ``.hgignore``." +msgstr "" + +msgid "" +"For example, say we have an untracked file, ``file.c``, at\n" +"``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``\n" +"if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``." +msgstr "" + +msgid "" +"In addition, a Mercurial configuration file can reference a set of\n" +"per-user or global ignore files. See the ``ignore`` configuration\n" +"key on the ``[ui]`` section of :hg:`help config` for details of how to\n" +"configure these files." +msgstr "" + +msgid "" +"To control Mercurial's handling of files that it manages, many\n" +"commands support the ``-I`` and ``-X`` options; see\n" +":hg:`help <command>` and :hg:`help patterns` for details." +msgstr "" + +msgid "" +"An ignore file is a plain text file consisting of a list of patterns,\n" +"with one pattern per line. Empty lines are skipped. The ``#``\n" +"character is treated as a comment character, and the ``\\`` character\n" +"is treated as an escape character." +msgstr "" + +msgid "" +"Mercurial supports several pattern syntaxes. The default syntax used\n" +"is Python/Perl-style regular expressions." +msgstr "" + +msgid "To change the syntax used, use a line of the following form::" +msgstr "" + +msgid " syntax: NAME" +msgstr "" + +msgid "where ``NAME`` is one of the following:" +msgstr "" + +msgid "" +"``regexp``\n" +" Regular expression, Python/Perl syntax.\n" +"``glob``\n" +" Shell-style glob." +msgstr "" + +msgid "" +"The chosen syntax stays in effect when parsing all patterns that\n" +"follow, until another syntax is selected." +msgstr "" + +msgid "" +"Neither glob nor regexp patterns are rooted. A glob-syntax pattern of\n" +"the form ``*.c`` will match a file ending in ``.c`` in any directory,\n" +"and a regexp pattern of the form ``\\.c$`` will do the same. To root a\n" +"regexp pattern, start it with ``^``." +msgstr "" + +msgid "" +"Example\n" +"-------" +msgstr "" + +msgid "Here is an example ignore file. ::" +msgstr "" + +msgid "" +" # use glob syntax.\n" +" syntax: glob" +msgstr "" + +msgid "" +" *.elc\n" +" *.pyc\n" +" *~" +msgstr "" + +msgid "" +" # switch to regexp syntax.\n" +" syntax: regexp\n" +" ^\\.pc/\n" +msgstr "" + +msgid "" "Mercurial's internal web server, hgweb, can serve either a single\n" "repository, or a collection of them. In the latter case, a special\n" "configuration file can be used to specify the repository paths to use\n" @@ -12090,8 +14785,8 @@ msgstr "" msgid "" -"This file uses the same syntax as hgrc configuration files, but only\n" -"the following sections are recognized:" +"This file uses the same syntax as other Mercurial configuration files,\n" +"but only the following sections are recognized:" msgstr "" msgid "" @@ -12102,7 +14797,8 @@ msgid "" "The ``web`` section can specify all the settings described in the web\n" -"section of the hgrc documentation." +"section of the hgrc(5) documentation. See :hg:`help config` for\n" +"information on where to find the manual page." msgstr "" msgid "" @@ -12466,10 +15162,13 @@ msgid "" " listfile:list.txt read list from list.txt with one file pattern per line\n" -" listfile0:list.txt read list from list.txt with null byte delimiters\n" -msgstr "" -" listfile:list.txt 1è¡Œ1 file パターン㧠list.txt ã‹ã‚‰èªã¿è¾¼ã¿\n" -" listfile0:list.txt null æ–‡å—区切り㧠file パターンをèªã¿è¾¼ã¿\n" +" listfile0:list.txt read list from list.txt with null byte delimiters" +msgstr "" +" listfile:list.txt 1è¡Œ 1 file パターン㧠list.txt ã‹ã‚‰èªã¿è¾¼ã¿\n" +" listfile0:list.txt null æ–‡å—区切り㧠file パターンをèªã¿è¾¼ã¿" + +msgid "See also :hg:`help filesets`.\n" +msgstr ":hg:`help filesets` ã‚‚å‚ç…§ã—ã¦ãã ã•ã„。\n" msgid "Mercurial supports several ways to specify individual revisions." msgstr "Mercurial ã«å€‹ã€…ã®ãƒªãƒ“ジョン指定ã™ã‚‹éš›ã«ã¯è¤‡æ•°ã®è¨˜æ³•ãŒä½¿ç”¨ã§ãã¾ã™ã€‚" @@ -12553,16 +15252,7 @@ msgstr "" msgid "" -"Special characters can be used in quoted identifiers by escaping them,\n" -"e.g., ``\\n`` is interpreted as a newline. To prevent them from being\n" -"interpreted, strings can be prefixed with ``r``, e.g. ``r'...'``." -msgstr "" - -msgid "There is a single prefix operator:" -msgstr "" - -msgid "" "``not x``\n" " Changesets not in x. Short form is ``! x``." msgstr "" @@ -12565,10 +15255,7 @@ "``not x``\n" " Changesets not in x. Short form is ``! x``." msgstr "" -msgid "These are the supported infix operators:" -msgstr "" - msgid "" "``x::y``\n" " A DAG range, meaning all changesets that are descendants of x and\n" @@ -12603,10 +15290,59 @@ " Changesets in x but not in y." msgstr "" -msgid "The following predicates are supported:" -msgstr "" - -msgid ".. predicatesmarker" +msgid "" +"``x^n``\n" +" The nth parent of x, n == 0, 1, or 2.\n" +" For n == 0, x; for n == 1, the first parent of each changeset in x;\n" +" for n == 2, the second parent of changeset in x." +msgstr "" + +msgid "" +"``x~n``\n" +" The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``." +msgstr "" + +msgid "There is a single postfix operator:" +msgstr "" + +msgid "" +"``x^``\n" +" Equivalent to ``x^1``, the first parent of each changeset in x." +msgstr "" + +msgid "" +"\n" +"The following predicates are supported:" +msgstr "" + +msgid "" +"New predicates (known as \"aliases\") can be defined, using any combination " +"of\n" +"existing predicates or other aliases. An alias definition looks like::" +msgstr "" + +msgid " <alias> = <definition>" +msgstr "" + +msgid "" +"in the ``revsetalias`` section of a Mercurial configuration file. Arguments\n" +"of the form `$1`, `$2`, etc. are substituted from the alias into the\n" +"definition." +msgstr "" + +msgid "For example," +msgstr "" + +msgid "" +" [revsetalias]\n" +" h = heads()\n" +" d($1) = sort($1, date)\n" +" rs($1, $2) = reverse(sort($1, $2))" +msgstr "" + +msgid "" +"defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n" +"exactly equivalent to ``reverse(sort(0:tip, author))``." msgstr "" msgid "Command line equivalents for :hg:`log`::" @@ -12623,9 +15359,6 @@ " -l x -> limit(expr, x)" msgstr "" -msgid "Some sample queries:" -msgstr "" - msgid "- Changesets on the default branch::" msgstr "" @@ -12652,7 +15385,7 @@ msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\"" msgstr "" -msgid "- Changesets in committed May 2008, sorted by user::" +msgid "- Changesets committed in May 2008, sorted by user::" msgstr "" msgid " hg log -r \"sort(date('May 2008'), user)\"" @@ -12906,88 +15639,8 @@ "å¯å¦ã¯ã€ テンプレートã®åˆ©ç”¨ã•ã‚Œã‚‹çŠ¶æ³ã«ä¾å˜ã—ã¾ã™ã€‚ 以下ã®ã‚ーワードã¯\n" "log çš„ãªã‚³ãƒžãƒ³ãƒ‰ã§ã®ãƒ†ãƒ³ãƒ—レート利用ã®éš›ã«ã¯å¸¸ã«ä½¿ç”¨å¯èƒ½ã§ã™:" -msgid ":author: String. The unmodified author of the changeset." -msgstr ":author: æ–‡å—列。 リビジョンã®ä½œè€…å(è¨˜éŒ²æƒ…å ±ãã®ã¾ã¾)。" - -msgid "" -":branch: String. The name of the branch on which the changeset was\n" -" committed." -msgstr ":branch: æ–‡å—列。 リビジョンã®å±žã™ã‚‹ãƒ–ランãƒå。" - -msgid "" -":branches: List of strings. The name of the branch on which the\n" -" changeset was committed. Will be empty if the branch name was\n" -" default." -msgstr "" -":branches: æ–‡å—列列挙。 リビジョンã®å±žã™ã‚‹ãƒ–ランãƒå。\n" -" 所属ブランãƒãŒ default ã®å ´åˆã¯ç©ºã€‚" - -msgid ":children: List of strings. The children of the changeset." -msgstr ":children: æ–‡å—列列挙。 リビジョンã®å供。" - -msgid ":date: Date information. The date when the changeset was committed." -msgstr ":date: æ—¥æ™‚æƒ…å ±ã€‚ リビジョンãŒè¨˜éŒ²ã•ã‚ŒãŸæ—¥æ™‚。" - -msgid ":desc: String. The text of the changeset description." -msgstr ":desc: æ–‡å—列。 リビジョンã®ã‚³ãƒŸãƒƒãƒˆãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã€‚" - -msgid "" -":diffstat: String. Statistics of changes with the following format:\n" -" \"modified files: +added/-removed lines\"" -msgstr "" -":diffstat: æ–‡å—列。 以下ã®å½¢å¼ã§ã®å¤‰æ›´æ¦‚è¦ã€‚\n" -" \"変更対象ファイル: +è¿½åŠ è¡Œæ•°/-削除行数\"" - -msgid "" -":files: List of strings. All files modified, added, or removed by this\n" -" changeset." -msgstr "" -":files: æ–‡å—列列挙。 当該リビジョンã§ã®ã€ 変更ï¼è¿½åŠ 登録ãªã„ã—\n" -" 登録除外ファイルã®ä¸€è¦§ã€‚" - -msgid ":file_adds: List of strings. Files added by this changeset." -msgstr ":file_adds: æ–‡å—列列挙。 当該リビジョンã§ã®è¿½åŠ ファイル一覧。" - -msgid "" -":file_copies: List of strings. Files copied in this changeset with\n" -" their sources." -msgstr ":file_copies: æ–‡å—列列挙。 当該リビジョンã§ã®è¤‡è£½å…ƒãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã€‚" - -msgid "" -":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n" -" only if the --copied switch is set." -msgstr "" -":file_copies_switch: æ–‡å—列列挙。 \"file_copies\" ã¨åŒç¾©ã ãŒã€\n" -" --copied 指定ã®ã‚る時ã®ã¿è¡¨ç¤ºã€‚" - -msgid ":file_mods: List of strings. Files modified by this changeset." -msgstr ":file_mods: æ–‡å—列列挙。 当該リビジョンã§ã®å¤‰æ›´ãƒ•ã‚¡ã‚¤ãƒ«ä¸€è¦§ã€‚" - -msgid ":file_dels: List of strings. Files removed by this changeset." -msgstr ":file_dels: æ–‡å—列列挙。 当該リビジョンã§ã®ç™»éŒ²é™¤å¤–ファイル一覧。" - -msgid "" -":node: String. The changeset identification hash, as a 40 hexadecimal\n" -" digit string." -msgstr ":node: æ–‡å—列。 リビジョンè˜åˆ¥ç”¨ã® 40 æ¡ 16 進数ãƒãƒƒã‚·ãƒ¥å€¤ã€‚" - -msgid ":parents: List of strings. The parents of the changeset." -msgstr ":parents: æ–‡å—列列挙。 リビジョンã®è¦ªã€‚" - -msgid ":rev: Integer. The repository-local changeset revision number." -msgstr ":rev: 整数。 å„リãƒã‚¸ãƒˆãƒªå›ºæœ‰ã®ãƒªãƒ“ジョン番å·ã€‚" - -msgid ":tags: List of strings. Any tags associated with the changeset." -msgstr ":tags: æ–‡å—列列挙。 当該リビジョンã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°ã®ä¸€è¦§ã€‚" - -msgid "" -":latesttag: String. Most recent global tag in the ancestors of this\n" -" changeset." -msgstr "" -":latesttag: æ–‡å—列。 当該リビジョンã®å…ˆç¥–ã«å¯¾ã—ã¦æœ€ã‚‚最近ã«ä»˜ä¸Žã•ã‚ŒãŸã‚¿ã‚°" - -msgid ":latesttagdistance: Integer. Longest path to the latest tag." -msgstr ":latesttagdistance: 整数。 最新タグã¸ã®æœ€é•·ãƒ‘ス" +msgid ".. keywordsmarker" +msgstr "" msgid "" "The \"date\" keyword does not produce human-readable output. If you\n" @@ -13014,167 +15667,8 @@ msgid "List of filters:" msgstr "フィルター一覧(入力ã¨ã€ ãã‚Œã«å¯¾ã™ã‚‹å‡ºåŠ›):" -msgid "" -":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" -" every line except the last." -msgstr "" -":addbreaks: æ–‡å—列。 最終行を除ãå„è¡Œã®è¡Œæœ«ã« XHTML ã®\n" -" \"<br />\" ã‚¿ã‚°ã‚’è¿½åŠ ã—ã¾ã™ã€‚" - -msgid "" -":age: Date. Returns a human-readable date/time difference between the\n" -" given date/time and the current date/time." -msgstr "" -":age: æ—¥æ™‚æƒ…å ±ã€‚ 与ãˆã‚‰ã‚ŒãŸæ—¥æ™‚ã¨ã€ ç¾åœ¨æ—¥æ™‚ã¨ã®å·®åˆ†ã‚’表ã™\n" -" å¯èªå½¢å¼ã®æ–‡å—列を生æˆã—ã¾ã™ã€‚" - -msgid "" -":basename: Any text. Treats the text as a path, and returns the last\n" -" component of the path after splitting by the path separator\n" -" (ignoring trailing separators). For example, \"foo/bar/baz\" becomes\n" -" \"baz\" and \"foo/bar//\" becomes \"bar\"." -msgstr "" -":basename: æ–‡å—列。 与ãˆã‚‰ã‚ŒãŸæ–‡å—列をパスã¨ã¿ãªã—〠パス区切りã§\n" -" 区切られãŸæœ€å¾Œã®è¦ç´ ã ã‘ã‚’å–り出ã—ã¾ã™(末尾パス\n" -" 区切りã¯ç„¡è¦–ã•ã‚Œã¾ã™)。\n" -" 例) \"foo/bar/baz\" 㯠\"baz\"〠\"foo/bar//\" 㯠\"bar\"" - -msgid "" -":stripdir: Treat the text as path and strip a directory level, if\n" -" possible. For example, \"foo\" and \"foo/bar\" becomes \"foo\"." -msgstr "" -":stripdir: æ–‡å—列。 与ãˆã‚‰ã‚ŒãŸæ–‡å—列をパスã¨ã¿ãªã—〠ディレクトリ\n" -" 階層ãŒã‚ã‚Œã°ãれをå–り除ãã¾ã™ã€‚\n" -" 例) \"foo\" ãŠã‚ˆã³ \"foo/bar\" 㯠\"foo\"" - -msgid "" -":date: Date. Returns a date in a Unix date format, including the\n" -" timezone: \"Mon Sep 04 15:13:13 2006 0700\"." -msgstr "" -":date: æ—¥æ™‚æƒ…å ±ã€‚ タイムゾーン込ã¿ã® Unix date コマンド形å¼ã«ã—ã¾ã™ã€‚\n" -" 例) \"Mon Sep 04 15:13:13 2006 0700\"" - -msgid "" -":domain: Any text. Finds the first string that looks like an email\n" -" address, and extracts just the domain component. Example: ``User\n" -" <user@example.com>`` becomes ``example.com``." -msgstr "" -":domain: æ–‡å—列。 メールアドレスã¨æ€ã—ã最åˆã®æ–‡å—列部分ã‹ã‚‰\n" -" ドメイン部分ã ã‘ã‚’å–り出ã—ã¾ã™ã€‚\n" -" 例) ``User <user@example.com>`` 㯠``example.com``" - -msgid "" -":email: Any text. Extracts the first string that looks like an email\n" -" address. Example: ``User <user@example.com>`` becomes\n" -" ``user@example.com``." -msgstr "" -":email: æ–‡å—列。 メールアドレスã¨æ€ã—ã最åˆã®éƒ¨åˆ†ã‚’å–り出ã—ã¾ã™ã€‚\n" -" 例) ``User <user@example.com>`` 㯠``user@example.com``" - -msgid "" -":escape: Any text. Replaces the special XML/XHTML characters \"&\", \"<\"\n" -" and \">\" with XML entities." -msgstr "" -":escape: æ–‡å—列。 XML/XHTML ã®ç‰¹æ®Šæ–‡å—ã§ã‚ã‚‹ \"&\"〠\"<\" ãŠã‚ˆã³\n" -" \">\" ã‚’ XML ã®ã‚¨ãƒ³ãƒ†ã‚£ãƒ†ã‚£å½¢å¼ã«å¤‰æ›ã—ã¾ã™ã€‚" - -msgid "" -":hex: Any text. Convert a binary Mercurial node identifier into\n" -" its long hexadecimal representation." -msgstr "" -":hex: æ–‡å—列。 Mercurial ã® node æƒ…å ±ã‚’ 40 æ¡ 16 進文å—列ã«å¤‰æ›ã—ã¾ã™ã€‚" - -msgid ":fill68: Any text. Wraps the text to fit in 68 columns." -msgstr ":fill68: æ–‡å—列。 68 æ¡ã«åŽã¾ã‚‹ã‚ˆã†ã«æ–‡å—列を折り返ã—ã¾ã™ã€‚" - -msgid ":fill76: Any text. Wraps the text to fit in 76 columns." -msgstr ":fill76: æ–‡å—列。 76 æ¡ã«åŽã¾ã‚‹ã‚ˆã†ã«æ–‡å—列を折り返ã—ã¾ã™ã€‚" - -msgid ":firstline: Any text. Returns the first line of text." -msgstr ":firstline: æ–‡å—列。 最åˆã®è¡Œã®ã¿ã‚’å–り出ã—ã¾ã™ã€‚" - -msgid ":nonempty: Any text. Returns '(none)' if the string is empty." -msgstr ":nonempty: æ–‡å—列。 与ãˆã‚‰ã‚ŒãŸæ–‡å—列ãŒç©ºã®å ´åˆ '(none)'ã¨ãªã‚Šã¾ã™ã€‚" - -msgid "" -":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n" -" 25200\" (Unix timestamp, timezone offset)." -msgstr "" -":hgdate: æ—¥æ™‚æƒ…å ±ã€‚ Unix タイムスタンプã¨ã‚¿ã‚¤ãƒ ゾーンオフセットã«ã‚ˆã‚‹\n" -" 数値対形å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚\n" -" 例) \"1157407993 25200\"" - -msgid "" -":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n" -" +0200\"." -msgstr "" -":isodate: æ—¥æ™‚æƒ…å ±ã€‚ ISO 8601 å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n" -" 例) \"2009-08-18 13:00 +0200\"" - -msgid "" -":isodatesec: Date. Returns the date in ISO 8601 format, including\n" -" seconds: \"2009-08-18 13:00:13 +0200\". See also the rfc3339date\n" -" filter." -msgstr "" -":isodatesec: æ—¥æ™‚æƒ…å ±ã€‚ ç§’æƒ…å ±ä»˜ãã® ISO 8601 å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n" -" 例) \"2009-08-18 13:00:13 +0200\"\n" -" ※ 後述ã™ã‚‹ rfc3339date フィルタã®èª¬æ˜Žã‚‚å‚ç…§ã—ã¦ãã ã•ã„。" - -msgid ":localdate: Date. Converts a date to local date." -msgstr ":localdate: æ—¥æ™‚æƒ…å ±ã€‚ ãƒãƒ¼ã‚«ãƒ«æ—¥æ™‚ã§å¯èªåŒ–ã—ã¾ã™ã€‚" - -msgid "" -":obfuscate: Any text. Returns the input text rendered as a sequence of\n" -" XML entities." -msgstr ":obfuscate: æ–‡å—列。 å…¨ã¦ã®æ–‡å—ã‚’ XML エンティティ形å¼ã«å¤‰æ›ã—ã¾ã™ã€‚" - -msgid ":person: Any text. Returns the text before an email address." -msgstr ":person: æ–‡å—列。 メールアドレス直å‰ã®éƒ¨åˆ†ã ã‘ã‚’å–り出ã—ã¾ã™ã€‚" - -msgid "" -":rfc822date: Date. Returns a date using the same format used in email\n" -" headers: \"Tue, 18 Aug 2009 13:00:13 +0200\"." -msgstr "" -":rfc822date: æ—¥æ™‚æƒ…å ±ã€‚ メールã®ãƒ˜ãƒƒãƒ€ã¨åŒå½¢å¼ã§å¯èªåŒ–ã—ã¾ã™:\n" -" 例) \"Tue, 18 Aug 2009 13:00:13 +0200\"." - -msgid "" -":rfc3339date: Date. Returns a date using the Internet date format\n" -" specified in RFC 3339: \"2009-08-18T13:00:13+02:00\"." -msgstr "" -":rfc3339date: æ—¥ä»˜æƒ…å ±ã€‚ RFC 3339 ã§å®šã‚られãŸæ—¥ä»˜å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚\n" -" 例) \"2009-08-18T13:00:13+02:00\"." - -msgid "" -":short: Changeset hash. Returns the short form of a changeset hash,\n" -" i.e. a 12 hexadecimal digit string." -msgstr ":short: リビジョンãƒãƒƒã‚·ãƒ¥ 値。 12 æ¡ç¨‹åº¦ã®çŸç¸®å½¢å¼ã«ã—ã¾ã™ã€‚" - -msgid ":shortdate: Date. Returns a date like \"2006-09-18\"." -msgstr ":shortdate: æ—¥æ™‚æƒ…å ±ã€‚ \"2006-09-18\" å½¢å¼ã§å¯èªåŒ–ã—ã¾ã™ã€‚" - -msgid "" -":stringify: Any type. Turns the value into text by converting values into\n" -" text and concatenating them." -msgstr ":stringify: ä»»æ„ã®ãƒ‡ãƒ¼ã‚¿ã€‚ 値を文å—列化ã—ã¦é€£çµã—ã¾ã™" - -msgid ":strip: Any text. Strips all leading and trailing whitespace." -msgstr ":strip: æ–‡å—列。 å…ˆé ï¼æœ«å°¾ã®ç©ºç™½æ–‡å—ã‚’å–り除ãã¾ã™ã€‚" - -msgid "" -":tabindent: Any text. Returns the text, with every line except the\n" -" first starting with a tab character." -msgstr ":tabindent: æ–‡å—列。 タブ文å—以外ã§å§‹ã¾ã‚‹è¡Œã‚’タブ文å—ã§å—下ã’ã—ã¾ã™ã€‚" - -msgid "" -":urlescape: Any text. Escapes all \"special\" characters. For example,\n" -" \"foo bar\" becomes \"foo%20bar\"." -msgstr "" -":urlescape: æ–‡å—列。 å…¨ã¦ã®ã€Œç‰¹æ®Šã€æ–‡å—を変æ›ã—ã¾ã™ã€‚\n" -" 例ãˆã° \"foo bar\" 㯠\"foo%20bar\" ã¨ãªã‚Šã¾ã™ã€‚" - -msgid ":user: Any text. Returns the user portion of an email address.\n" -msgstr ":user: æ–‡å—列。 メールアドレスã®ãƒ¦ãƒ¼ã‚¶å部分をå–り出ã—ã¾ã™ã€‚\n" +msgid ".. filtersmarker\n" +msgstr "" msgid "Valid URLs are of the form::" msgstr "有効㪠URL 指定ã¯ä»¥ä¸‹ã®å½¢å¼ã§ã™::" @@ -13372,7 +15866,7 @@ #, python-format msgid "" "%d files updated, %d files merged, %d files removed, %d files unresolved\n" -msgstr "ファイル状態: æ›´æ–°æ•° %d〠マージ数 %d〠削除数 %d〠è¡çªæœªè§£æ±ºæ•° %d\n" +msgstr "ファイル状態: æ›´æ–°æ•° %d〠マージ数 %d〠削除数 %d〠è¡çªæœªè§£æ¶ˆæ•° %d\n" msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "'hg resolve' ã§ãƒžãƒ¼ã‚¸ã®è¡çªã‚’解消ã—ã¦ãã ã•ã„\n" @@ -13409,6 +15903,10 @@ msgstr "'%s:%d' ã§ã®ã‚µãƒ¼ãƒèµ·å‹•ã«å¤±æ•—: %s" #, python-format +msgid " %d files changed, %d insertions(+), %d deletions(-)\n" +msgstr " %d ãƒ•ã‚¡ã‚¤ãƒ«å¤‰æ›´ã€ è¿½åŠ %d è¡Œ(+)〠削除 %d è¡Œ(-)\n" + +#, python-format msgid "calling hook %s: %s\n" msgstr "フック %s:%s 呼ã³å‡ºã—ä¸\n" @@ -13462,6 +15960,13 @@ msgid "warning: %s hook %s\n" msgstr "è¦å‘Š: %s フック %s\n" +msgid "kb" +msgstr "ã‚ãƒãƒã‚¤ãƒˆ" + +#, python-format +msgid "ignoring invalid [auth] key '%s'\n" +msgstr "ä¸æ£ãª [auth] セクションã®ã‚ー'%s' を無視ã—ã¾ã™\n" + msgid "connection ended unexpectedly" msgstr "予期ã›ã¬æŽ¥ç¶šçµ‚了" @@ -13502,6 +16007,9 @@ msgid "'%s' uses newer protocol %s" msgstr "'%s' ã¯æ–°ã—ã„プãƒãƒˆã‚³ãƒ« %s を使ã„ã¾ã™" +msgid "unexpected response:" +msgstr "未知ã®å¿œç”:" + #, python-format msgid "push failed: %s" msgstr "å±¥æ´åæ˜ ã«å¤±æ•—: %s" @@ -13529,10 +16037,6 @@ msgstr "%sã¨ã„ã†ãƒªãƒã‚¸ãƒˆãƒªã¯æ—¢ã«å˜åœ¨ã—ã¦ã„ã¾ã™" #, python-format -msgid "requirement '%s' not supported" -msgstr "å¿…é ˆæ©Ÿèƒ½ '%s' ãŒæœªã‚µãƒãƒ¼ãƒˆã§ã™" - -#, python-format msgid ".hg/sharedpath points to nonexistent directory %s" msgstr ".hg/sharedpath ã®å‚照先 %s ã¯å˜åœ¨ã—ã¾ã›ã‚“" @@ -13580,7 +16084,7 @@ msgstr "未知ã®ãƒˆãƒ©ãƒ³ã‚¶ã‚¯ã‚·ãƒ§ãƒ³ã®å·»ã戻ã—ä¸\n" #, python-format -msgid "Named branch could not be reset, current branch still is: %s\n" +msgid "named branch could not be reset, current branch is still: %s\n" msgstr "åå‰ã¤ãブランãƒã¯ãƒªã‚»ãƒƒãƒˆã§ãã¾ã›ã‚“ã®ã§ã€ %s ã®ã¾ã¾ã§ã™\n" #, python-format @@ -13629,8 +16133,8 @@ msgid "file not tracked!" msgstr "ファイルã¯æœªç™»éŒ²ã§ã™!" -msgid "unresolved merge conflicts (see hg resolve)" -msgstr "未解決ã®è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ (hg resolveã‚’å‚ç…§ã—ã¦ãã ã•ã„)" +msgid "unresolved merge conflicts (see hg help resolve)" +msgstr "未解消ã®è¡çªãŒæ®‹ã£ã¦ã„ã¾ã™ (hg help resolveã‚’å‚ç…§ã—ã¦ãã ã•ã„)" #, python-format msgid "committing subrepository %s\n" @@ -13653,14 +16157,6 @@ msgstr "連æºå…ˆã® changegroupsubset 機能未対応ã«ã‚ˆã‚Šã€ 部分å–ã‚Šè¾¼ã¿ã§ãã¾ã›ã‚“。" #, python-format -msgid "updating bookmark %s\n" -msgstr "ブックマーク %s ã®æ›´æ–°ä¸\n" - -#, python-format -msgid "not updating divergent bookmark %s\n" -msgstr "è¡çªã™ã‚‹ãƒ–ックマーク %s ã¯æ›´æ–°ã—ã¾ã›ã‚“\n" - -#, python-format msgid "%d changesets found\n" msgstr "%d 個ã®ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆ\n" @@ -13771,6 +16267,10 @@ msgstr "ä¸æ£ãªãƒãƒ¼ã‚«ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹: %s" #, python-format +msgid "'\\n' and '\\r' disallowed in filenames: %r" +msgstr "'\\n' 㨠'\\r' ã¯ãƒ•ã‚¡ã‚¤ãƒ«åã§ä½¿ç”¨ã—ãªã„ã§ãã ã•ã„: %r" + +#, python-format msgid "failed to remove %s from manifest" msgstr "マニフェストã‹ã‚‰ %s を削除ã§ãã¾ã›ã‚“ã§ã—ãŸ" @@ -13863,10 +16363,6 @@ msgid "note: possible conflict - %s was renamed multiple times to:\n" msgstr "備考: è¡çªã®å¯èƒ½æ€§ - %s ãŒè¤‡æ•°ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«æ”¹åã•ã‚Œã¾ã—ãŸ:\n" -#, python-format -msgid "branch %s not found" -msgstr "ブランム%s ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“" - msgid "merging with a working directory ancestor has no effect" msgstr "作æ¥é ˜åŸŸã®å…ˆç¥–ã¨ã®ãƒžãƒ¼ã‚¸ã¯æ„味ãŒã‚ã‚Šã¾ã›ã‚“" @@ -13884,8 +16380,8 @@ msgstr "" "ブランãƒæ¨ªæ–ã®æ›´æ–° (マージã™ã‚‹ã‹ã€ --clean 指定ã§å¤‰æ›´ã‚’ç ´æ£„ã—ã¦ãã ã•ã„)" -msgid "crosses branches (merge branches or use --check to force update)" -msgstr "ブランãƒæ¨ªæ–ã®æ›´æ–° (マージã™ã‚‹ã‹ã€ --check 指定ã§å¼·åˆ¶æ›´æ–°ã—ã¦ãã ã•ã„)" +msgid "crosses branches (merge branches or update --check to force update)" +msgstr "ブランãƒæ¨ªæ–ã®æ›´æ–° (マージã‹ã€ update --check ã§å¼·åˆ¶æ›´æ–°ã—ã¦ãã ã•ã„)" msgid "Attention:" msgstr "注æ„:" @@ -13915,12 +16411,24 @@ msgstr "è¦å‘Š!" #, python-format -msgid "cannot create %s: destination already exists" -msgstr "%s を作æˆã§ãã¾ã›ã‚“: 作æ¥å…ˆã«ã™ã§ã«å˜åœ¨ã—ã¾ã™" - -#, python-format -msgid "cannot create %s: unable to create destination directory" -msgstr "%s を作æˆã§ãã¾ã›ã‚“: ディレクトリを作æˆã§ãã¾ã›ã‚“" +msgid "unexpected token: %s" +msgstr "未知ã®è¨˜è¿°: %s" + +#, python-format +msgid "not a prefix: %s" +msgstr "" + +#, python-format +msgid "not an infix: %s" +msgstr "" + +#, python-format +msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" +msgstr "%d 個ã®ãƒãƒ³ã‚¯(ç·æ•° %d)ãŒé©ç”¨å¤±æ•— -- 失敗ãƒãƒ³ã‚¯ã¯ %s ã«ä¿å˜\n" + +#, python-format +msgid "cannot patch %s: file is not tracked" +msgstr "%s ã«ãƒ‘ッãƒé©ç”¨å‡ºæ¥ã¾ã›ã‚“: 構æˆç®¡ç†å¯¾è±¡ã§ã¯ã‚ã‚Šã¾ã›ã‚“" #, python-format msgid "unable to find '%s' for patching\n" @@ -13931,11 +16439,7 @@ msgstr "ファイル %s をパッãƒé©ç”¨ã—ã¦ã„ã¾ã™\n" #, python-format -msgid "%d out of %d hunks FAILED -- saving rejects to file %s\n" -msgstr "%d 個ã®ãƒãƒ³ã‚¯(ç·æ•° %d)ãŒé©ç”¨å¤±æ•— -- 失敗ãƒãƒ³ã‚¯ã¯ %s ã«ä¿å˜\n" - -#, python-format msgid "bad hunk #%d %s (%d %d %d %d)" msgstr "ä¸æ£ãªãƒãƒ³ã‚¯: #%d %s (%d %d %d %d)" #, python-format @@ -13938,7 +16442,11 @@ msgid "bad hunk #%d %s (%d %d %d %d)" msgstr "ä¸æ£ãªãƒãƒ³ã‚¯: #%d %s (%d %d %d %d)" #, python-format +msgid "cannot create %s: destination already exists\n" +msgstr "%s を作æˆã§ãã¾ã›ã‚“: 作æ¥å…ˆã«ã™ã§ã«å˜åœ¨ã—ã¾ã™\n" + +#, python-format msgid "file %s already exists\n" msgstr "ファイル %s ã¯æ—¢ã«å˜åœ¨ã—ã¾ã™\n" @@ -13977,8 +16485,8 @@ msgstr "パッãƒå¯¾è±¡ã®ãƒ•ã‚¡ã‚¤ãƒ«åãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" #, python-format -msgid "malformed patch %s %s" -msgstr "ä¸æ£ãªãƒ‘ッãƒ: %s %s" +msgid "cannot create %s: destination already exists" +msgstr "%s を作æˆã§ãã¾ã›ã‚“: 作æ¥å…ˆã«ã™ã§ã«å˜åœ¨ã—ã¾ã™" #, python-format msgid "unsupported parser state: %s" @@ -13996,10 +16504,6 @@ msgstr "パッãƒã®é©ç”¨ã«å¤±æ•—" #, python-format -msgid " %d files changed, %d insertions(+), %d deletions(-)\n" -msgstr " %d ãƒ•ã‚¡ã‚¤ãƒ«å¤‰æ›´ã€ è¿½åŠ %d è¡Œ(+)〠削除 %d è¡Œ(-)\n" - -#, python-format msgid "exited with status %d" msgstr "終了コード %d ã§çµ‚了ã—ã¾ã—ãŸ" @@ -14069,19 +16573,10 @@ msgid "consistency error in delta" msgstr "å·®åˆ†æƒ…å ±ã®ä¸æ•´åˆ" -msgid "unknown base" -msgstr "未知ã®ãƒ™ãƒ¼ã‚¹ãƒªãƒ“ジョン" - -msgid "unterminated string" -msgstr "æ–‡å—列ãŒçµ‚端ã—ã¦ã„ã¾ã›ã‚“" - -msgid "syntax error" -msgstr "文法エラー" - -msgid "missing argument" -msgstr "引数ãŒã‚ã‚Šã¾ã›ã‚“" +msgid "unknown delta base" +msgstr "未知ã®å·®åˆ†ãƒ™ãƒ¼ã‚¹" #, python-format msgid "can't use %s here" msgstr "ã“ã“ã§ã¯ %s を使用ã§ãã¾ã›ã‚“" @@ -14083,97 +16578,16 @@ #, python-format msgid "can't use %s here" msgstr "ã“ã“ã§ã¯ %s を使用ã§ãã¾ã›ã‚“" -msgid "can't use a list in this context" -msgstr "ã“ã“ã§ã¯ãƒªã‚¹ãƒˆã‚’使用ã§ãã¾ã›ã‚“" - -#, python-format -msgid "not a function: %s" -msgstr "関数ã§ã¯ã‚ã‚Šã¾ã›ã‚“: %s" - -msgid "" -"``id(string)``\n" -" Revision non-ambiguously specified by the given hex string prefix." -msgstr "" - -#. i18n: "id" is a keyword -msgid "id requires one argument" -msgstr "id 指定ã«ã¯1ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" - -#. i18n: "id" is a keyword -msgid "id requires a string" -msgstr "id 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" - -msgid "" -"``rev(number)``\n" -" Revision with the given numeric identifier." -msgstr "" - -#. i18n: "rev" is a keyword -msgid "rev requires one argument" -msgstr "rev 指定ã«ã¯1ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" - -#. i18n: "rev" is a keyword -msgid "rev requires a number" -msgstr "rev 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" - -#. i18n: "rev" is a keyword -msgid "rev expects a number" -msgstr "rev 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" - -msgid "" -"``p1([set])``\n" -" First parent of changesets in set, or the working directory." -msgstr "" - -msgid "" -"``p2([set])``\n" -" Second parent of changesets in set, or the working directory." -msgstr "" - -msgid "" -"``parents([set])``\n" -" The set of all parents for all changesets in set, or the working " -"directory." -msgstr "" - -msgid "" -"``max(set)``\n" -" Changeset with highest revision number in set." -msgstr "" - -msgid "" -"``min(set)``\n" -" Changeset with lowest revision number in set." -msgstr "" - -msgid "" -"``limit(set, n)``\n" -" First n members of set." -msgstr "" - -#. i18n: "limit" is a keyword -msgid "limit requires two arguments" -msgstr "limit 指定ã«ã¯2ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" - -#. i18n: "limit" is a keyword -msgid "limit requires a number" -msgstr "limit 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" - -#. i18n: "limit" is a keyword -msgid "limit expects a number" -msgstr "limit 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" - -msgid "" -"``children(set)``\n" -" Child changesets of changesets in set." -msgstr "" - -msgid "" -"``branch(set)``\n" -" All changesets belonging to the branches of changesets in set." -msgstr "" +msgid "" +"``adds(pattern)``\n" +" Changesets that add a file matching pattern." +msgstr "" + +#. i18n: "adds" is a keyword +msgid "adds requires a pattern" +msgstr "adds 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" msgid "" "``ancestor(single, single)``\n" @@ -14193,19 +16607,72 @@ " Changesets that are ancestors of a changeset in set." msgstr "" -msgid "" -"``descendants(set)``\n" -" Changesets which are descendants of changesets in set." -msgstr "" - -msgid "" -"``follow()``\n" -" An alias for ``::.`` (ancestors of the working copy's first parent)." -msgstr "" - -#. i18n: "follow" is a keyword -msgid "follow takes no arguments" -msgstr "follow 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" +msgid "~ expects a number" +msgstr "" + +msgid "" +"``author(string)``\n" +" Alias for ``user(string)``." +msgstr "" + +#. i18n: "author" is a keyword +msgid "author requires a string" +msgstr "author 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "" +"``bisected(string)``\n" +" Changesets marked in the specified bisect state (good, bad, skip)." +msgstr "" + +msgid "bisect requires a string" +msgstr "bisect 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "invalid bisect state" +msgstr "" + +msgid "" +"``bookmark([name])``\n" +" The named bookmark or all bookmarks." +msgstr "" + +#. i18n: "bookmark" is a keyword +msgid "bookmark takes one or no arguments" +msgstr "bookmark 指定ã«ã¯1個ãªã„ã—2個ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + +#. i18n: "bookmark" is a keyword +msgid "the argument to bookmark must be a string" +msgstr "" + +msgid "" +"``branch(string or set)``\n" +" All changesets belonging to the given branch or the branches of the " +"given\n" +" changesets." +msgstr "" + +msgid "" +"``children(set)``\n" +" Child changesets of changesets in set." +msgstr "" + +msgid "" +"``closed()``\n" +" Changeset is closed." +msgstr "" + +#. i18n: "closed" is a keyword +msgid "closed takes no arguments" +msgstr "closed 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``contains(pattern)``\n" +" Revision contains a file matching pattern. See :hg:`help patterns`\n" +" for information about file patterns." +msgstr "" + +#. i18n: "contains" is a keyword +msgid "contains requires a pattern" +msgstr "contains 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" msgid "" "``date(interval)``\n" @@ -14217,15 +16684,54 @@ msgstr "date 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" msgid "" -"``keyword(string)``\n" -" Search commit message, user name, and names of changed files for\n" -" string." -msgstr "" - -#. i18n: "keyword" is a keyword -msgid "keyword requires a string" -msgstr "keyword 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" +"``desc(string)``\n" +" Search commit message for string. The match is case-insensitive." +msgstr "" + +#. i18n: "desc" is a keyword +msgid "desc requires a string" +msgstr "desc 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "" +"``descendants(set)``\n" +" Changesets which are descendants of changesets in set." +msgstr "" + +msgid "" +"``filelog(pattern)``\n" +" Changesets connected to the specified filelog." +msgstr "" + +msgid "filelog requires a pattern" +msgstr "filelog 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "" +"``follow([file])``\n" +" An alias for ``::.`` (ancestors of the working copy's first parent).\n" +" If a filename is specified, the history of the given file is followed,\n" +" including copies." +msgstr "" + +#. i18n: "follow" is a keyword +msgid "follow takes no arguments or a filename" +msgstr "follow 指定ã«ã¯å¼•æ•°ã‚‚ファイルåも指定ã§ãã¾ã›ã‚“" + +msgid "follow expected a filename" +msgstr "follow 指定ã¯ãƒ•ã‚¡ã‚¤ãƒ«åã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +#. i18n: "follow" is a keyword +msgid "follow takes no arguments" +msgstr "follow 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``all()``\n" +" All changesets, the same as ``0:tip``." +msgstr "" + +#. i18n: "all" is a keyword +msgid "all takes no arguments" +msgstr "all 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" msgid "" "``grep(regex)``\n" " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" @@ -14228,8 +16734,9 @@ msgid "" "``grep(regex)``\n" " Like ``keyword(string)`` but accepts a regex. Use ``grep(r'...')``\n" -" to ensure special escape characters are handled correctly." +" to ensure special escape characters are handled correctly. Unlike\n" +" ``keyword(string)``, the match is case-sensitive." msgstr "" #. i18n: "grep" is a keyword @@ -14241,20 +16748,6 @@ msgstr "ä¸æ£ãªãƒžãƒƒãƒãƒ³ã‚°ãƒ‘ターン: %s" msgid "" -"``author(string)``\n" -" Alias for ``user(string)``." -msgstr "" - -#. i18n: "author" is a keyword -msgid "author requires a string" -msgstr "author 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" - -msgid "" -"``user(string)``\n" -" User name is string." -msgstr "" - -msgid "" "``file(pattern)``\n" " Changesets affecting files matched by pattern." msgstr "" @@ -14264,13 +16757,81 @@ msgstr "file 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" msgid "" -"``contains(pattern)``\n" -" Revision contains pattern." -msgstr "" - -#. i18n: "contains" is a keyword -msgid "contains requires a pattern" -msgstr "contains 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" +"``head()``\n" +" Changeset is a named branch head." +msgstr "" + +#. i18n: "head" is a keyword +msgid "head takes no arguments" +msgstr "head 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``heads(set)``\n" +" Members of set with no children in set." +msgstr "" + +msgid "" +"``keyword(string)``\n" +" Search commit message, user name, and names of changed files for\n" +" string. The match is case-insensitive." +msgstr "" + +#. i18n: "keyword" is a keyword +msgid "keyword requires a string" +msgstr "keyword 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "" +"``limit(set, n)``\n" +" First n members of set." +msgstr "" + +#. i18n: "limit" is a keyword +msgid "limit requires two arguments" +msgstr "limit 指定ã«ã¯2ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + +#. i18n: "limit" is a keyword +msgid "limit requires a number" +msgstr "limit 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +#. i18n: "limit" is a keyword +msgid "limit expects a number" +msgstr "limit 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "" +"``last(set, n)``\n" +" Last n members of set." +msgstr "" + +#. i18n: "last" is a keyword +msgid "last requires two arguments" +msgstr "last 指定ã«ã¯2ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + +#. i18n: "last" is a keyword +msgid "last requires a number" +msgstr "last 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +#. i18n: "last" is a keyword +msgid "last expects a number" +msgstr "last 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "" +"``max(set)``\n" +" Changeset with highest revision number in set." +msgstr "" + +msgid "" +"``merge()``\n" +" Changeset is a merge changeset." +msgstr "" + +#. i18n: "merge" is a keyword +msgid "merge takes no arguments" +msgstr "merge 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" + +msgid "" +"``min(set)``\n" +" Changeset with lowest revision number in set." +msgstr "" msgid "" "``modifies(pattern)``\n" @@ -14282,13 +16843,56 @@ msgstr "modifies 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" msgid "" -"``adds(pattern)``\n" -" Changesets that add a file matching pattern." -msgstr "" - -#. i18n: "adds" is a keyword -msgid "adds requires a pattern" -msgstr "adds 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" +"``id(string)``\n" +" Revision non-ambiguously specified by the given hex string prefix." +msgstr "" + +#. i18n: "id" is a keyword +msgid "id requires one argument" +msgstr "id 指定ã«ã¯1ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + +#. i18n: "id" is a keyword +msgid "id requires a string" +msgstr "id 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "" +"``outgoing([path])``\n" +" Changesets not found in the specified destination repository, or the\n" +" default push location." +msgstr "" + +#. i18n: "outgoing" is a keyword +msgid "outgoing takes one or no arguments" +msgstr "" + +#. i18n: "outgoing" is a keyword +msgid "outgoing requires a repository path" +msgstr "outgoing 指定ã¯ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‘スã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +msgid "" +"``p1([set])``\n" +" First parent of changesets in set, or the working directory." +msgstr "" + +msgid "" +"``p2([set])``\n" +" Second parent of changesets in set, or the working directory." +msgstr "" + +msgid "" +"``parents([set])``\n" +" The set of all parents for all changesets in set, or the working " +"directory." +msgstr "" + +msgid "^ expects a number 0, 1, or 2" +msgstr "" + +msgid "" +"``present(set)``\n" +" An empty set, if any revision in set isn't found; otherwise,\n" +" all revisions in set." +msgstr "" msgid "" "``removes(pattern)``\n" @@ -14300,31 +16904,21 @@ msgstr "removes 指定ã¯ãƒ‘ターンã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" msgid "" -"``merge()``\n" -" Changeset is a merge changeset." -msgstr "" - -#. i18n: "merge" is a keyword -msgid "merge takes no arguments" -msgstr "merge 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" - -msgid "" -"``closed()``\n" -" Changeset is closed." -msgstr "" - -#. i18n: "closed" is a keyword -msgid "closed takes no arguments" -msgstr "closed 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" - -msgid "" -"``head()``\n" -" Changeset is a named branch head." -msgstr "" - -#. i18n: "head" is a keyword -msgid "head takes no arguments" -msgstr "head 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" +"``rev(number)``\n" +" Revision with the given numeric identifier." +msgstr "" + +#. i18n: "rev" is a keyword +msgid "rev requires one argument" +msgstr "rev 指定ã«ã¯1ã¤ã®å¼•æ•°ãŒå¿…è¦ã§ã™" + +#. i18n: "rev" is a keyword +msgid "rev requires a number" +msgstr "rev 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" + +#. i18n: "rev" is a keyword +msgid "rev expects a number" +msgstr "rev 指定ã¯æ•°å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" msgid "" "``reverse(set)``\n" @@ -14332,9 +16926,8 @@ msgstr "" msgid "" -"``present(set)``\n" -" An empty set, if any revision in set isn't found; otherwise,\n" -" all revisions in set." +"``roots(set)``\n" +" Changesets with no parent changeset in set." msgstr "" msgid "" @@ -14366,36 +16959,7 @@ msgstr "未知ã®æ•´åˆ—æ–¹å¼ %r" msgid "" -"``all()``\n" -" All changesets, the same as ``0:tip``." -msgstr "" - -#. i18n: "all" is a keyword -msgid "all takes no arguments" -msgstr "all 指定ã«ã¯å¼•æ•°ãŒæŒ‡å®šã§ãã¾ã›ã‚“" - -msgid "" -"``heads(set)``\n" -" Members of set with no children in set." -msgstr "" - -msgid "" -"``roots(set)``\n" -" Changesets with no parent changeset in set." -msgstr "" - -msgid "" -"``outgoing([path])``\n" -" Changesets not found in the specified destination repository, or the\n" -" default push location." -msgstr "" - -#. i18n: "outgoing" is a keyword -msgid "outgoing requires a repository path" -msgstr "outgoing 指定ã¯ãƒªãƒã‚¸ãƒˆãƒªã®ãƒ‘スã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" - -msgid "" -"``tag(name)``\n" +"``tag([name])``\n" " The specified tag by name, or all tagged revisions if no name is given." msgstr "" @@ -14408,16 +16972,8 @@ msgstr "tag 指定ã¯æ–‡å—列ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“" msgid "" -"``bookmark([name])``\n" -" The named bookmark or all bookmarks." -msgstr "" - -#. i18n: "bookmark" is a keyword -msgid "bookmark takes one or no arguments" -msgstr "bookmark 指定ã«ã¯1個ãªã„ã—2個ã®å¼•æ•°ãŒå¿…è¦ã§ã™" - -#. i18n: "bookmark" is a keyword -msgid "the argument to bookmark must be a string" +"``user(string)``\n" +" User name contains string. The match is case-insensitive." msgstr "" msgid "can't negate that" @@ -14426,6 +16982,10 @@ msgid "not a symbol" msgstr "シンボル以外ãŒæŒ‡å®šã•ã‚Œã¾ã—ãŸ" +#, python-format +msgid "invalid number of arguments: %s" +msgstr "" + msgid "empty query" msgstr "å•ã„åˆã‚ã›ãŒç©ºã§ã™" @@ -14429,6 +16989,64 @@ msgid "empty query" msgstr "å•ã„åˆã‚ã›ãŒç©ºã§ã™" +#, python-format +msgid "ui.portablefilenames value is invalid ('%s')" +msgstr "ui.portablefilenames 値ãŒä¸æ£ã§ã™ ('%s')" + +#, python-format +msgid "possible case-folding collision for %s" +msgstr "ファイルåã®æ–‡å—大å°ã®å•é¡Œã§ %s ãŒè¡çªã—ã¾ã™" + +#, python-format +msgid "path ends in directory separator: %s" +msgstr "パスã®æœ«å°¾ãŒåŒºåˆ‡ã‚Šæ–‡å—ã§ã™: %s" + +#, python-format +msgid "path contains illegal component: %s" +msgstr "パスã«ä¸æ£ãªè¦ç´ ãŒå«ã¾ã‚Œã¦ã„ã¾ã™: %s" + +#, python-format +msgid "path %r is inside nested repo %r" +msgstr "パス %r ã¯å…¥ã‚Œåリãƒã‚¸ãƒˆãƒª %r 内ã«ã‚ã‚Šã¾ã™" + +#, python-format +msgid "path %r traverses symbolic link %r" +msgstr "パス %r ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ '%r' ãŒå«ã¾ã‚Œã¦ã„ã¾ã™" + +#, python-format +msgid "could not symlink to %r: %s" +msgstr "%r ã«å¯¾ã—ã¦ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã§ãã¾ã›ã‚“: %s" + +#, python-format +msgid "recording removal of %s as rename to %s (%d%% similar)\n" +msgstr "%s ã®å‰Šé™¤ã‚’ %s ã¸ã®ãƒ•ã‚¡ã‚¤ãƒ«å変更ã¨ã—ã¦è¨˜éŒ²ä¸ (類似度 %d%%)\n" + +#, python-format +msgid "%s has not been committed yet, so no copy data will be stored for %s.\n" +msgstr "%s ã¯æœªã‚³ãƒŸãƒƒãƒˆãªã®ã§ã€ %s ã®ã‚³ãƒ”ーデータã¯æ®‹ã‚Šã¾ã›ã‚“\n" + +msgid ".hg/requires file is corrupt" +msgstr ".hg/requires ファイルãŒç ´æã—ã¦ã„ã¾ã™" + +#, python-format +msgid "unknown repository format: requires features '%s' (upgrade Mercurial)" +msgstr "未知ã®ãƒªãƒã‚¸ãƒˆãƒªå½¢å¼ã§ã™: '%s' サãƒãƒ¼ãƒˆãŒå¿…è¦ (è¦ Mercurial æ›´æ–°)" + +msgid "searching for changes\n" +msgstr "変更点を探索ä¸\n" + +msgid "queries" +msgstr "å•ã„åˆã‚ã›" + +msgid "searching" +msgstr "検索ä¸" + +msgid "repository is unrelated" +msgstr "無関係ãªãƒªãƒã‚¸ãƒˆãƒªã§ã™" + +msgid "warning: repository is unrelated\n" +msgstr "è¦å‘Š: 無関係ãªãƒªãƒã‚¸ãƒˆãƒªã§ã™\n" + msgid "searching for exact renames" msgstr "厳密ãªæ”¹åを探索ä¸" @@ -14461,10 +17079,7 @@ msgid "remote: " msgstr "é 隔ホスト: " -msgid "unexpected response:" -msgstr "未知ã®å¿œç”:" - #, python-format msgid "push refused: %s" msgstr "å±¥æ´åæ˜ ãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸ: %s" @@ -14467,7 +17082,51 @@ #, python-format msgid "push refused: %s" msgstr "å±¥æ´åæ˜ ãŒæ‹’å¦ã•ã‚Œã¾ã—ãŸ: %s" +msgid "certificate checking requires Python 2.6" +msgstr "証明書検証ã«ã¯ Python 2.6 ãŒå¿…è¦ã§ã™" + +msgid "no certificate received" +msgstr "証明書ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" + +#, python-format +msgid "certificate is for %s" +msgstr "%s 用ã®è¨¼æ˜Žæ›¸ãƒ•ã‚¡ã‚¤ãƒ«" + +msgid "IDN in certificate not supported" +msgstr "証明書㮠IDN ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" + +msgid "no commonName or subjectAltName found in certificate" +msgstr "証明書㫠commonName ã‚„ subjectAltName ãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“" + +#, python-format +msgid "could not find web.cacerts: %s" +msgstr "web.cacerts ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %s" + +#, python-format +msgid "%s certificate error: %s (use --insecure to connect insecurely)" +msgstr "%s ã®è¨¼æ˜Žæ›¸ä¸æ£: %s (éžã‚»ã‚ュア接続ã§ç¶™ç¶šã™ã‚‹ãªã‚‰ --insecure 指定)" + +#, python-format +msgid "invalid certificate for %s with fingerprint %s" +msgstr "%s ã®è¨¼æ˜Žæ›¸(fingerprint 㯠%s)ãŒä¸æ£" + +#, python-format +msgid "" +"warning: %s certificate with fingerprint %s not verified (check " +"hostfingerprints or web.cacerts config setting)\n" +msgstr "" +"è¦å‘Š: %s ã®è¨¼æ˜Žæ›¸(fingerprint 㯠%s)検証ã¯çœç•¥ (è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® " +"hostfingerprints ãªã„ã— web.cacerts è¨å®šã‚’確èªã®ã“ã¨)\n" + +#, python-format +msgid "host fingerprint for %s can't be verified (Python too old)" +msgstr "ホスト %s ã®ãƒ•ã‚£ãƒ³ã‚¬ãƒ¼ãƒ—リントãŒæ¤œè¨¼å‡ºæ¥ã¾ã›ã‚“ (Python ãŒå¤ã„ãŸã‚)" + +#, python-format +msgid "warning: certificate for %s can't be verified (Python too old)\n" +msgstr "è¦å‘Š: %s ã®è¨¼æ˜Žæ›¸ã¯æ¤œè¨¼å‡ºæ¥ã¾ã›ã‚“ (Python ãŒå¤ã„ãŸã‚)\n" + #, python-format msgid "'%s' does not appear to be an hg repository" msgstr "'%s' 㯠Mercurial リãƒã‚¸ãƒˆãƒªå½¢å¼ã¨ã¯æ€ã‚ã‚Œã¾ã›ã‚“" @@ -14561,6 +17220,10 @@ msgstr "副リãƒã‚¸ãƒˆãƒªã® %s を登録除外ä¸\n" #, python-format +msgid "cloning subrepo %s from %s\n" +msgstr "副リãƒã‚¸ãƒˆãƒª %s ã« %s ã‹ã‚‰è¤‡è£½ä¸\n" + +#, python-format msgid "pulling subrepo %s from %s\n" msgstr "副リãƒã‚¸ãƒˆãƒª %s ã« %s ã‹ã‚‰å–ã‚Šè¾¼ã¿ä¸\n" @@ -14568,6 +17231,9 @@ msgid "pushing subrepo %s to %s\n" msgstr "副リãƒã‚¸ãƒˆãƒª %s ã‹ã‚‰ %s ã¸åæ˜ ä¸\n" +msgid "cannot retrieve svn tool version" +msgstr "svn ツールã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ãŒå–得出æ¥ã¾ã›ã‚“" + msgid "cannot commit svn externals" msgstr "svn 外部リãƒã‚¸ãƒˆãƒªã« commit ã§ãã¾ã›ã‚“" @@ -14576,14 +17242,6 @@ msgstr "変更ãŒå«ã¾ã‚Œã¦ã„ã‚‹ãŸã‚〠リãƒã‚¸ãƒˆãƒª %s ã¯å‰Šé™¤ã•ã‚Œã¾ã›ã‚“\n" #, python-format -msgid "cloning subrepo %s\n" -msgstr "副リãƒã‚¸ãƒˆãƒª %s を複製ä¸\n" - -#, python-format -msgid "pulling subrepo %s\n" -msgstr "副リãƒã‚¸ãƒˆãƒª %s ã®æ›´æ–°å–ã‚Šè¾¼ã¿ä¸\n" - -#, python-format msgid "revision %s does not exist in subrepo %s\n" msgstr "リビジョン %s ã¯å‰¯ãƒªãƒã‚¸ãƒˆãƒª %s ã«ã¯å˜åœ¨ã—ã¾ã›ã‚“\n" @@ -14595,6 +17253,10 @@ msgstr "" #, python-format +msgid "subrepo %s is missing" +msgstr "" + +#, python-format msgid "unrelated git branch checked out in subrepo %s\n" msgstr "副リãƒã‚¸ãƒˆãƒª %s ã¯ã€ 無関係㪠git ブランãƒã§æ›´æ–°ã•ã‚Œã¦ã„ã¾ã™\n" @@ -14671,6 +17333,9 @@ msgid "rollback failed - please run hg recover\n" msgstr "ãƒãƒ¼ãƒ«ãƒãƒƒã‚¯ã«å¤±æ•—ã—ã¾ã—㟠- 'hg recover' ã—ã¦ãã ã•ã„\n" +msgid "already have changeset " +msgstr "æ—¢ã«ãƒã‚§ãƒ³ã‚¸ã‚»ãƒƒãƒˆãŒã‚ã‚Šã¾ã™ " + #, python-format msgid "Not trusting file %s from untrusted user %s, group %s\n" msgstr "ä¿¡é ¼ã§ããªã„ファイル %s (所有者 %s, グループ %s)\n" @@ -14684,12 +17349,12 @@ msgstr "(パス定義 %s=%s(%s ç”±æ¥) ã«ãŠã„ã¦ã€ éžæŽ¨å¥¨ãª '%%' ãŒä½¿ç”¨)\n" #, python-format -msgid "ignoring untrusted configuration option %s.%s = %s\n" -msgstr "ä¿¡é ¼ã§ããªã„è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ä¸ã® '%s.%s = %s' è¨å®šã‚’無視\n" - -#, python-format -msgid "%s.%s not a boolean ('%s')" -msgstr "%s.%s ã®å€¤ '%s' ã¯çœŸå½å€¤ã§ã¯ã‚ã‚Šã¾ã›ã‚“" +msgid "%s.%s is not a boolean ('%s')" +msgstr "%s.%s ã®å€¤ ('%s') ã¯çœŸå½å€¤ã§ã¯ã‚ã‚Šã¾ã›ã‚“" + +#, python-format +msgid "%s.%s is not an integer ('%s')" +msgstr "%s.%s ã®å€¤ ('%s') ã¯æ•´æ•°å€¤ã§ã¯ã‚ã‚Šã¾ã›ã‚“" msgid "enter a commit username:" msgstr "コミットã™ã‚‹ãƒ¦ãƒ¼ã‚¶åを入力ã—ã¦ãã ã•ã„:" @@ -14717,10 +17382,6 @@ msgid "edit failed" msgstr "編集ã«å¤±æ•—" -#, python-format -msgid "ignoring invalid [auth] key '%s'\n" -msgstr "ä¸æ£ãª [auth] セクションã®ã‚ー'%s' を無視ã—ã¾ã™\n" - msgid "http authorization required" msgstr "HTTP èªè¨¼ã«å¤±æ•—" @@ -14742,54 +17403,8 @@ msgid "http auth: user %s, password %s\n" msgstr "HTTP èªè¨¼: ユーザå %s, パスワード %s\n" -msgid "kb" -msgstr "ã‚ãƒãƒã‚¤ãƒˆ" - -msgid "certificate checking requires Python 2.6" -msgstr "証明書検証ã«ã¯ Python 2.6 ãŒå¿…è¦ã§ã™" - -msgid "no certificate received" -msgstr "証明書ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" - -#, python-format -msgid "certificate is for %s" -msgstr "%s 用ã®è¨¼æ˜Žæ›¸ãƒ•ã‚¡ã‚¤ãƒ«" - -msgid "IDN in certificate not supported" -msgstr "証明書㮠IDN ã¯æœªã‚µãƒãƒ¼ãƒˆã§ã™" - -msgid "no commonName or subjectAltName found in certificate" -msgstr "証明書㫠commonName ã‚„ subjectAltName ãŒå«ã¾ã‚Œã¦ã„ã¾ã›ã‚“" - -#, python-format -msgid "%s certificate error: %s (use --insecure to connect insecurely)" -msgstr "%s ã®è¨¼æ˜Žæ›¸ä¸æ£: %s (éžã‚»ã‚ュア接続ã§ç¶™ç¶šã™ã‚‹ãªã‚‰ --insecure 指定)" - -#, python-format -msgid "invalid certificate for %s with fingerprint %s" -msgstr "%s ã®è¨¼æ˜Žæ›¸(fingerprint 㯠%s)ãŒä¸æ£" - -#, python-format -msgid "" -"warning: %s certificate with fingerprint %s not verified (check " -"hostfingerprints or web.cacerts config setting)\n" -msgstr "" -"è¦å‘Š: %s ã®è¨¼æ˜Žæ›¸(fingerprint 㯠%s)検証ã¯çœç•¥ (è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® " -"hostfingerprints ãªã„ã— web.cacerts è¨å®šã‚’確èªã®ã“ã¨)\n" - -#, python-format -msgid "no certificate for %s with configured hostfingerprint" -msgstr "hostfingerprint è¨å®šã•ã‚ŒãŸ %s ã®è¨¼æ˜Žæ›¸ãŒå–å¾—ã§ãã¾ã›ã‚“" - -#, python-format -msgid "" -"warning: %s certificate not verified (check web.cacerts config setting)\n" -msgstr "" -"è¦å‘Š: %s ã®è¨¼æ˜Žæ›¸æ¤œè¨¼ã¯çœç•¥ (è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã® hostfingerprints ãªã„ã— web." -"cacerts è¨å®šã‚’確èªã®ã“ã¨)\n" - #, python-format msgid "command '%s' failed: %s" msgstr "コマンド '%s' 失敗: %s" #, python-format @@ -14791,26 +17406,18 @@ #, python-format msgid "command '%s' failed: %s" msgstr "コマンド '%s' 失敗: %s" #, python-format -msgid "path ends in directory separator: %s" -msgstr "パスã®æœ«å°¾ãŒåŒºåˆ‡ã‚Šæ–‡å—ã§ã™: %s" - -#, python-format -msgid "path contains illegal component: %s" -msgstr "パスã«ä¸æ£ãªè¦ç´ ãŒå«ã¾ã‚Œã¦ã„ã¾ã™: %s" - -#, python-format -msgid "path %r is inside repo %r" -msgstr "パス %r ã¯ãƒªãƒã‚¸ãƒˆãƒª %r 内ã«ã‚ã‚Šã¾ã™" - -#, python-format -msgid "path %r traverses symbolic link %r" -msgstr "パス %r ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ '%r' ãŒå«ã¾ã‚Œã¦ã„ã¾ã™" - -#, python-format -msgid "could not symlink to %r: %s" -msgstr "%r ã«å¯¾ã—ã¦ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ã§ãã¾ã›ã‚“: %s" +msgid "filename contains '%s', which is reserved on Windows" +msgstr "ファイルåã«ã€Windows ã§äºˆç´„ã•ã‚Œã¦ã„ã‚‹ '%s' ãŒå«ã¾ã‚Œã¾ã™" + +#, python-format +msgid "filename contains %r, which is invalid on Windows" +msgstr "ファイルåã«ã€Windows 上ã§ä¸æ£ãª %r ãŒå«ã¾ã‚Œã¾ã™" + +#, python-format +msgid "filename ends with '%s', which is not allowed on Windows" +msgstr "ファイルåã®æœ«å°¾ãŒã€ Windows 上ã§ä¸æ£ãª '%s' ã§ã™" msgid "check your clock" msgstr "システムã®æ™‚刻è¨å®šã‚’確èªã—ã¦ãã ã•ã„" @@ -14835,8 +17442,17 @@ msgid "impossible time zone offset: %d" msgstr "ã‚ã‚Šå¾—ãªã„タイムゾーン: %d" +msgid "dates cannot consist entirely of whitespace" +msgstr "空白文å—ã ã‘ã§æ§‹æˆã•ã‚ŒãŸæ—¥æ™‚指定ã¯ä¸æ£ã§ã™" + +msgid "invalid day spec, use '<DATE'" +msgstr "ä¸æ£ãªæ—¥ä»˜ã®æŒ‡å®šã§ã™ã€‚ '<DATE' å½¢å¼ã§è¨˜è¿°ã—ã¦ãã ã•ã„。" + +msgid "invalid day spec, use '>DATE'" +msgstr "ä¸æ£ãªæ—¥ä»˜ã®æŒ‡å®šã§ã™ã€‚ '>DATE' å½¢å¼ã§è¨˜è¿°ã—ã¦ãã ã•ã„。" + #, python-format msgid "invalid day spec: %s" msgstr "ä¸æ£ãªæ—¥ä»˜ã®æŒ‡å®šã§ã™: %s" #, python-format @@ -14838,8 +17454,12 @@ #, python-format msgid "invalid day spec: %s" msgstr "ä¸æ£ãªæ—¥ä»˜ã®æŒ‡å®šã§ã™: %s" #, python-format +msgid "%s must be nonnegative (see 'hg help dates')" +msgstr "%s ã¯æ£ã®å€¤ã§ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ ('hg help dates' å‚ç…§)" + +#, python-format msgid "%.0f GB" msgstr "%.0f GB" @@ -14883,6 +17503,9 @@ msgid "no port number associated with service '%s'" msgstr "サービス '%s' 用ã®ãƒãƒ¼ãƒˆç•ªå·ãŒä¸æ˜Ž" +msgid "file:// URLs can only refer to localhost" +msgstr "file:// URL ãŒå‚照出æ¥ã‚‹ã®ã¯ãƒãƒ¼ã‚«ãƒ«ãƒ›ã‚¹ãƒˆã®ã¿ã§ã™" + msgid "cannot verify bundle or remote repos" msgstr "ãƒãƒ¼ã‚«ãƒ«ãƒªãƒã‚¸ãƒˆãƒªä»¥å¤–ã¯æ¤œè¨¼ã§ãã¾ã›ã‚“"