Mercurial > hg
changeset 14813:53ed7b560564
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 29 Jun 2011 16:05:59 -0500 |
| parents | f70629146f79 (current diff) 7ba7459875cb (diff) |
| children | f5bfb27b64e3 |
| files | tests/test-wireprotocol.py tests/test-wireprotocol.py.out |
| diffstat | 29 files changed, 6304 insertions(+), 2852 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/check-code.py Tue Jun 28 10:02:39 2011 +0200 +++ b/contrib/check-code.py Wed Jun 29 16:05:59 2011 -0500 @@ -128,7 +128,9 @@ # (r'\w*[a-z][A-Z]\w*\s*=', "don't use camelcase in identifiers"), (r'^\s*(if|while|def|class|except|try)\s[^[]*:\s*[^\]#\s]+', "linebreak after :"), - (r'class\s[^(]:', "old-style class, use class foo(object)"), + (r'class\s[^( ]+:', "old-style class, use class foo(object)"), + (r'class\s[^( ]+\(\):', + "class foo() not available in Python 2.4, use class foo(object)"), (r'\b(%s)\(' % '|'.join(keyword.kwlist), "Python keyword is not a function"), (r',]', "unneeded trailing ',' in list"),
--- a/contrib/wix/guids.wxi Tue Jun 28 10:02:39 2011 +0200 +++ b/contrib/wix/guids.wxi Wed Jun 29 16:05:59 2011 -0500 @@ -29,7 +29,7 @@ <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?> <?define templates.gitweb.guid = {D8BFE3ED-06DD-4C4D-A00D-6D825955F922} ?> <?define templates.monoblue.guid = {A394B4D5-2AF7-4AAC-AEA8-E92176E5501E} ?> - <?define templates.paper.guid = {243CF61D-7028-4A25-93CC-7C402088EAE6} ?> + <?define templates.paper.guid = {D2591E56-709E-49F9-8A5F-1359E1CCD7E0} ?> <?define templates.raw.guid = {04DE03A2-FBFD-4c5f-8DEA-5436DDF4689D} ?> <?define templates.rss.guid = {A7D608DE-0CF6-44f4-AF1E-EE30CC237FDA} ?> <?define templates.spartan.guid = {80222625-FA8F-44b1-86CE-1781EF375D09} ?>
--- a/contrib/wix/templates.wxs Tue Jun 28 10:02:39 2011 +0200 +++ b/contrib/wix/templates.wxs Wed Jun 29 16:05:59 2011 -0500 @@ -114,6 +114,7 @@ <File Id="paper.branches.tmpl" Name="branches.tmpl" KeyPath="yes" /> <File Id="paper.bookmarks.tmpl" Name="bookmarks.tmpl" /> <File Id="paper.changeset.tmpl" Name="changeset.tmpl" /> + <File Id="paper.diffstat.tmpl" Name="diffstat.tmpl" /> <File Id="paper.error.tmpl" Name="error.tmpl" /> <File Id="paper.fileannotate.tmpl" Name="fileannotate.tmpl" /> <File Id="paper.filediff.tmpl" Name="filediff.tmpl" />
--- a/doc/hgmanpage.py Tue Jun 28 10:02:39 2011 +0200 +++ b/doc/hgmanpage.py Wed Jun 29 16:05:59 2011 -0500 @@ -104,7 +104,7 @@ self.output = visitor.astext() -class Table: +class Table(object): def __init__(self): self._rows = [] self._options = ['center'] @@ -300,7 +300,7 @@ pass def list_start(self, node): - class enum_char: + class enum_char(object): enum_style = { 'bullet' : '\\(bu', 'emdash' : '\\(em',
--- a/hgext/color.py Tue Jun 28 10:02:39 2011 +0200 +++ b/hgext/color.py Wed Jun 29 16:05:59 2011 -0500 @@ -75,6 +75,14 @@ Some may not be available for a given terminal type, and will be silently ignored. +Note that on some systems, terminfo mode may cause problems when using +color with the pager extension and less -R. less with the -R option +will only display ECMA-48 color codes, and terminfo mode may sometimes +emit codes that less doesn't understand. You can work around this by +either using ansi mode (or auto mode), or by using less -r (which will +pass through all terminal control codes, not just color control +codes). + Because there are only eight standard colors, this module allows you to define color names for other color slots which might be available for your terminal type, assuming terminfo mode. For instance:: @@ -89,15 +97,15 @@ defined colors may then be used as any of the pre-defined eight, including appending '_background' to set the background to that color. -The color extension will try to detect whether to use terminfo, ANSI -codes or Win32 console APIs, unless it is made explicit; e.g.:: +By default, the color extension will use ANSI mode (or win32 mode on +Windows) if it detects a terminal. To override auto mode (to enable +terminfo mode, for example), set the following configuration option:: [color] - mode = ansi + mode = terminfo Any value other than 'ansi', 'win32', 'terminfo', or 'auto' will disable color. - ''' import os @@ -168,15 +176,14 @@ if os.name == 'nt' and 'TERM' not in os.environ: # looks line a cmd.exe console, use win32 API or nothing realmode = 'win32' - elif not formatted: + else: realmode = 'ansi' - else: - realmode = 'terminfo' if realmode == 'win32': - if not w32effects and mode == 'win32': - # only warn if color.mode is explicitly set to win32 - ui.warn(_('warning: failed to set color mode to %s\n') % mode) + if not w32effects: + if mode == 'win32': + # only warn if color.mode is explicitly set to win32 + ui.warn(_('warning: failed to set color mode to %s\n') % mode) return None _effects.update(w32effects) elif realmode == 'ansi':
--- a/i18n/da.po Tue Jun 28 10:02:39 2011 +0200 +++ b/i18n/da.po Wed Jun 29 16:05:59 2011 -0500 @@ -18,7 +18,7 @@ "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" "POT-Creation-Date: 2011-04-19 09:32+0200\n" -"PO-Revision-Date: 2011-04-19 09:45+0200\n" +"PO-Revision-Date: 2011-06-28 09:26+0200\n" "Last-Translator: <mg@lazybytes.net>\n" "Language-Team: Danish\n" "Language: Danish\n" @@ -44,6 +44,9 @@ "This section contains help for extensions that are distributed together with " "Mercurial. Help for other extensions is available in the help system." msgstr "" +"Denne sektion indeholder hjælp for udviddelser distribueret sammen med\n" +"Mercurial. Hjælp til andre udviddelser er tilgængelig i\n" +"hjælpesystemet." msgid "Options:" msgstr "Valgmuligheder:"
--- a/i18n/ja.po Tue Jun 28 10:02:39 2011 +0200 +++ b/i18n/ja.po Wed Jun 29 16:05:59 2011 -0500 @@ -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,140 +386,235 @@ 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 "" -"timeout\n" +"bugzilla.timeout\n" " 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 "" -"bzdir\n" +"bugzilla.bzdir\n" " 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" -" 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,28 +710,22 @@ " 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" -" 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 +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,16 +796,12 @@ "\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 によりチェンジセットの処理が抑止されました" -#, 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,19 +965,19 @@ 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" -"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,16 +1071,22 @@ " 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" -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,10 +1904,45 @@ 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' へファイルを複製中" +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,25 +2167,25 @@ 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 "" -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 -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,12 +3830,42 @@ 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" +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,24 +4035,63 @@ 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` を使用してください。" +msgid "print patches not in series" +msgstr "パッチ管理領域中の未知のパッチファイルを表示" + +msgid "hg qseries [-ms]" +msgstr "hg qseries [-ms]" + msgid "print the entire series file" msgstr "既知のパッチ一覧の表示" +msgid "hg qtop [-s]" +msgstr "hg qtop [-s]" + 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 "現行パッチの「次」の既知のパッチの名前表示" +msgid "hg qprev [-s]" +msgstr "hg qprev [-s]" + 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,9 +4285,24 @@ 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 の実施" +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,9 +4350,36 @@ 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 "現行パッチないし指定パッチのヘッダ表示" +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,17 +4483,40 @@ 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" -" 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" -" --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,12 +4585,12 @@ " 場合にはパッチは適用されません。 例えば::" 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 "" -" 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,293 +4834,19 @@ 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 "パッチ管理リポジトリへの操作" -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,9 +5492,28 @@ msgid "%dy%02dw" msgstr "" +#, python-format +msgid "%d %s/sec" +msgstr "" + 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,17 +5727,23 @@ " 成功時のコマンド終了値は 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" -msgstr "--collapse は --abort や --continue と併用できません" +msgstr "--collapse と、 --abort や --continue は併用できません" 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" -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,48 +5808,27 @@ 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 "作業領域をブランチヘッドにリベース" -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 実行時に対話的な変更選択を行うコマンド" +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,11 +5935,23 @@ 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' エクステンションが読み込まれていません" -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,12 +5959,12 @@ 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]..." +msgid "interactively select changes to refresh" +msgstr "パッチ更新内容内容を対話的に選択" + msgid "recreates hardlinks between repository clones" msgstr "複製リポジトリ間でのハードリンクの再生成" @@ -5733,10 +6009,18 @@ 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" +#, 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,15 +6630,24 @@ 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" -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,10 +7445,12 @@ #, 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" -"全てを確認するには、 共通の祖先 %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,9 +7483,31 @@ 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" +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,18 +7625,43 @@ " 使用してください。 現ブランチを閉鎖する場合は\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" -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" +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,14 +8087,34 @@ " 成功時のコマンドの終了値は 0、 エラー発生時は 1 です。\n" " " +msgid "[INDEX] REV1 REV2" +msgstr "[INDEX] REV1 REV2" + msgid "find the ancestor revision of two revisions in a given index" msgstr "指定範囲における2つのリビジョンの祖先リビジョンの検索" msgid "either two or three arguments required" msgstr "2ないし3の引数が必要です" -msgid "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,36 +8150,25 @@ 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 "リポジトリが空ではありません" -#, 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,15 +8254,67 @@ 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 "日付の解析および表示" +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 "" +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,9 +8431,59 @@ 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 "指定パターンへのファイル合致状況の表示" +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,9 +8891,21 @@ 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" +#, 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,13 +8949,49 @@ "\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 "" -" 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." -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,15 +9115,21 @@ " 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 向けのパッチではありません" -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,15 +9621,37 @@ 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" +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" +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,77 +10044,60 @@ 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" -" 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" -" 本コマンドは、 あなたの期待するものと違う可能性が高いです。\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" -" 指定されたリビジョン時点の内容へと復旧します。 以前の変更内容の一部\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,14 +10967,13 @@ msgid "invalid event type in dag: %s" msgstr "" +msgid "nullid" +msgstr "" + 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,12 +11195,13 @@ 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" -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,95 +11578,25 @@ 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" -"設定ファイルは、 ``[セクション名]`` 形式のヘッダから始まるセクションから\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,28 +13496,29 @@ 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 "" -"- ``<{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,22 +15252,10 @@ 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 "" -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,14 +16439,14 @@ 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 +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,111 +16573,21 @@ 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 を使用できません" -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,19 +16684,59 @@ 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" -" 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,9 +16982,71 @@ msgid "not a symbol" msgstr "シンボル以外が指定されました" +#, python-format +msgid "invalid number of arguments: %s" +msgstr "" + 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,13 +17079,54 @@ msgid "remote: " msgstr "遠隔ホスト: " -msgid "unexpected response:" -msgstr "未知の応答:" - #, 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,75 +17403,21 @@ 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 -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,11 +17442,24 @@ msgid "impossible time zone offset: %d" msgstr "あり得ないタイムゾーン: %d" +msgid "dates cannot consist entirely of whitespace" +msgstr "空白文字だけで構成された日時指定は不正です" + +msgid "invalid day spec, use '<DATE'" +msgstr "不正な日付の指定です。 '<DATE' 形式で記述してください。" + +msgid "invalid day spec, use '>DATE'" +msgstr "不正な日付の指定です。 '>DATE' 形式で記述してください。" + #, python-format msgid "invalid day spec: %s" msgstr "不正な日付の指定です: %s" #, python-format +msgid "%s must be nonnegative (see 'hg help dates')" +msgstr "%s は正の値でなければなりません ('hg help dates' 参照)" + +#, python-format msgid "%.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 "ローカルリポジトリ以外は検証できません"
--- a/i18n/pt_BR.po Tue Jun 28 10:02:39 2011 +0200 +++ b/i18n/pt_BR.po Wed Jun 29 16:05:59 2011 -0500 @@ -11021,9 +11021,6 @@ msgid "no files or directories specified" msgstr "nenhum arquivo ou diretório especificados" -msgid "use --all to discard all changes" -msgstr "use --all para descartar todas as mudanças locais" - msgid "uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge" msgstr "mesclagem não consolidada, use --all para descartar todas as mudanças locais, ou 'hg update -C .' para abortar a mesclagem" @@ -11035,6 +11032,12 @@ msgid "use --all to revert all files, or 'hg update %s' to update" msgstr "use --all para reverter todos os arquivos, ou 'hg update %s' para atualizar a revisão" +msgid "uncommitted changes, use --all to discard all changes" +msgstr "mudanças não consolidadas, use --all para descartar todas as mudanças locais" + +msgid "use --all to revert all files" +msgstr "use --all para reverter todos os arquivos" + #, python-format msgid "forgetting %s\n" msgstr "esquecendo %s\n"
--- a/i18n/ru.po Tue Jun 28 10:02:39 2011 +0200 +++ b/i18n/ru.po Wed Jun 29 16:05:59 2011 -0500 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2011-06-27 21:37+0400\n" +"POT-Creation-Date: 2011-06-29 18:27+0400\n" "PO-Revision-Date: 2011-05-12 23:48+0400\n" "Last-Translator: Alexander Sauta <demosito@gmail.com>\n" "Language-Team: Russian\n" @@ -1590,13 +1590,16 @@ msgstr "hg debugcvsps [ПАРАМЕТР]... [ПУТЬ]..." msgid ":svnrev: String. Converted subversion revision number." -msgstr "" +msgstr ":svnrev: Строка. Номер сконвертированной ревизии subversion." msgid ":svnpath: String. Converted subversion revision project path." msgstr "" +":svnpath: Строка. Путь к проекту сконвертированной из subversion ревизии." msgid ":svnuuid: String. Converted subversion revision repository identifier." msgstr "" +":svnuuid: Строка. Идентификатор репозитория сконвертированной из\n" +" subversion ревизии." #, python-format msgid "%s does not look like a Bazaar repository" @@ -9642,9 +9645,6 @@ msgid "no files or directories specified" msgstr "не указаны файлы или каталоги" -msgid "use --all to discard all changes" -msgstr "используйте --all чтобы сбросить все изменения" - msgid "" "uncommitted merge, use --all to discard all changes, or 'hg update -C .' to " "abort the merge" @@ -9662,6 +9662,14 @@ "используйте --all чтобы восстановить все файлы, или 'hg update %s'\n" "чтобы обновиться" +#, fuzzy +msgid "uncommitted changes, use --all to discard all changes" +msgstr "используйте --all чтобы сбросить все изменения" + +#, fuzzy +msgid "use --all to revert all files" +msgstr "используйте --all чтобы сбросить все изменения" + #, python-format msgid "forgetting %s\n" msgstr "забываю %s\n" @@ -11084,7 +11092,7 @@ msgstr "Использование шаблонов" msgid "URL Paths" -msgstr "URL путей" +msgstr "Пути URL" msgid "Using additional features" msgstr "Использование дополнительных возможностей" @@ -15770,6 +15778,9 @@ "individually, or provided as a topologically continuous range,\n" "separated by the \":\" character." msgstr "" +"Если Mercurial принимает где-либо более одной ревизии, их можно\n" +"задавать по одной, либо в виде топологически непрерывного диапазона, \n" +"разделенного символом \":\"." msgid "" "The syntax of range notation is [BEGIN]:[END], where BEGIN and END are\n" @@ -15777,49 +15788,74 @@ "specified, it defaults to revision number 0. If END is not specified,\n" "it defaults to the tip. The range \":\" thus means \"all revisions\"." msgstr "" +"Запись диапазона ревизий имеет вид [НАЧАЛО]:[КОНЕЦ], где НАЧАЛО и\n" +"КОНЕЦ - идентификаторы ревизий. Оба этих идентификатора не обязательны.\n" +"Если не указан НАЧАЛО, по умолчанию он считается равным 0. Если не\n" +"указан КОНЕЦ, по умолчанию он считается равным оконечной ревизии (tip).\n" +"Таким образом, диапазон \":\" означает \"все ревизии\"." msgid "If BEGIN is greater than END, revisions are treated in reverse order." msgstr "" +"Если НАЧАЛО больше, чем КОНЕЦ, ревизии обрабатываются в обратном порядке." msgid "" "A range acts as a closed interval. This means that a range of 3:5\n" "gives 3, 4 and 5. Similarly, a range of 9:6 gives 9, 8, 7, and 6.\n" msgstr "" +"Диапазон интерпретируется как отрезок, т.е. крайние значения являются\n" +"его частью. Так, диапазон 3:5 соответствует 3, 4 и 5, а диапазон\n" +"9:6 дает 9, 8, 7 и 6.\n" msgid "" "Mercurial accepts several notations for identifying one or more files\n" "at a time." msgstr "" +"Mercurial понимает несколько форм задания одного или более файла\n" +"единовременно." msgid "" "By default, Mercurial treats filenames as shell-style extended glob\n" "patterns." msgstr "" +"По умолчанию Mercurial интерпретирует имена файлов как это делает\n" +"командная оболочка (bash и др.), выполняя подстановку шаблонов в\n" +"стиле glob." msgid "Alternate pattern notations must be specified explicitly." -msgstr "" +msgstr "Другая форма шаблонов должна указываться явно." msgid "" "To use a plain path name without any pattern matching, start it with\n" "``path:``. These path names must completely match starting at the\n" "current repository root." msgstr "" +"Чтобы использовать буквальный путь к файлу, в котором не выполняются\n" +"подстановки, начните его с ``path:``. Такие пути должны полностью\n" +"совпадать с именем файла относительно корня репозитория." msgid "" "To use an extended glob, start a name with ``glob:``. Globs are rooted\n" "at the current directory; a glob such as ``*.c`` will only match files\n" "in the current directory ending with ``.c``." msgstr "" +"Чтобы использовать расширенный glob, начните его с ``glob:``. Глобы\n" +"раскрываются относительно текущего каталога; глоб ``*.c`` совпадет\n" +"только с файлами в текущем каталоге, оканчивающимися на ``.c``." msgid "" "The supported glob syntax extensions are ``**`` to match any string\n" "across path separators and ``{a,b}`` to mean \"a or b\"." msgstr "" +"Поддерживается расширение обычных глобов в виде ``**``, которое\n" +"совпадает с любой строкой в пределах всего пути, включая разделители;\n" +"также поддерживается форма ``{a,b}``, означающая \"a или b\"." msgid "" "To use a Perl/Python regular expression, start a name with ``re:``.\n" "Regexp pattern matching is anchored at the root of the repository." msgstr "" +"Чтобы использовать регулярные выражения Perl/Python, начните имя с\n" +"``re:``. Такие шаблоны раскрываются относительно корня репозитория." msgid "" "To read name patterns from a file, use ``listfile:`` or ``listfile0:``.\n" @@ -15827,18 +15863,24 @@ "feeds. Each string read from the file is itself treated as a file\n" "pattern." msgstr "" +"Можно прочитать шаблоны имен из файла, используя ``listfile:`` или\n" +"``listfile0:``. Последний ожидает шаблонов, отделенных друг от друга\n" +"символом NUL, в то время как первый предполоает перевод строки. Каждая\n" +"прочитанная из файла строка интерпретируется как шаблон имени файла." msgid "Plain examples::" -msgstr "" +msgstr "Примеры буквальных путей::" msgid "" " path:foo/bar a name bar in a directory named foo in the root\n" " of the repository\n" " path:path:name a file or directory named \"path:name\"" msgstr "" +" path:foo/bar файл с именем bar в каталоге foo в корне репозитория\n" +" path:path:name файл или каталог с именем \"path:name\"" msgid "Glob examples::" -msgstr "" +msgstr "Примеры глобов::" msgid "" " glob:*.c any name ending in \".c\" in the current directory\n" @@ -15849,37 +15891,56 @@ " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" " including itself." msgstr "" +" glob:*.c любой файл, оканчивающийся на \".c\", в текущем каталоге\n" +" *.c любой файл, оканчивающийся на \".c\", в текущем каталоге\n" +" **.c любой файл, оканчивающийся на \".c\", в любом подкаталоге\n" +" текущего каталога, включая его самого.\n" +" foo/*.c любой файл, оканчивающийся на \".c\", в каталоге foo\n" +" foo/**.c любой файл, оканчивающийся на \".c\", в любом подкаталоге\n" +" foo, включая его самого." msgid "Regexp examples::" -msgstr "" +msgstr "Примеры regexp::" msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository" msgstr "" +" re:.*\\.c$ любой файл, оканчивающийся на \".c\",\n" +" находящийся где угодно в репозитории" msgid "File examples::" -msgstr "" +msgstr "Примеры шаблонов из файлов::" 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" msgstr "" +" listfile:list.txt читать шаблоны из файла list.txt, содержащего\n" +" под одному шаблону на строку\n" +" listfile0:list.txt читать шаблоны из файла list.txt, содержащего\n" +" шаблоны, разделенные символом NULL" msgid "See also :hg:`help filesets`.\n" -msgstr "" +msgstr "См. также :hg:`help filesetes`.\n" msgid "Mercurial supports several ways to specify individual revisions." -msgstr "" +msgstr "Mercurial поддерживает несколько способов задания отдельных ревизий." msgid "" "A plain integer is treated as a revision number. Negative integers are\n" "treated as sequential offsets from the tip, with -1 denoting the tip,\n" "-2 denoting the revision prior to the tip, and so forth." msgstr "" +"Простое целое число интерпретируется как номер ревизии. Отрицательные\n" +"целые чила интерпретируются как непрерывное смещение относительно\n" +"оконечной ревизии (tip). Так, -1 означает tip, -2 означает ревизию,\n" +"предшествующую tip и т.д." msgid "" "A 40-digit hexadecimal string is treated as a unique revision\n" "identifier." msgstr "" +"Шестнадцатиричная строка из 40 символов считается уникальным\n" +"идентификатором (ID) ревизии." msgid "" "A hexadecimal string less than 40 characters long is treated as a\n" @@ -15887,6 +15948,10 @@ "identifier. A short-form identifier is only valid if it is the prefix\n" "of exactly one full-length identifier." msgstr "" +"Шестнадцатиричная строка короче 40 символов считается сокращенной\n" +"формой уникального идентификатора ревизии. Такой идентификатор\n" +"является корректным, только если он является старшей частью\n" +"ровно одного полного ID ревизии." msgid "" "Any other string is treated as a tag or branch name. A tag name is a\n" @@ -15894,16 +15959,24 @@ "denotes the tipmost revision of that branch. Tag and branch names must\n" "not contain the \":\" character." msgstr "" +"Любая другая строка интерпретируется как имя ветви или метки. Имя\n" +"метки - это символьное имя, ассоциированное с некоторым ID ревизии.\n" +"Имя ветви означает последнюю ревизию на этой ветви. Имена ветви и\n" +"метки не должны содержать символа \":\"." msgid "" "The reserved name \"tip\" is a special tag that always identifies the\n" "most recent revision." msgstr "" +"Зарезервированное имя \"tip\" является специальной меткой, которая\n" +"всегда ссылается на самую последнюю ревизию." msgid "" "The reserved name \"null\" indicates the null revision. This is the\n" "revision of an empty repository, and the parent of revision 0." msgstr "" +"Зарезервированное имя \"null\" означает пустую ревизию. Это ревизия\n" +"пустого репозитория или родитель ревизии 0." msgid "" "The reserved name \".\" indicates the working directory parent. If no\n" @@ -15911,16 +15984,24 @@ "uncommitted merge is in progress, \".\" is the revision of the first\n" "parent.\n" msgstr "" +"Зарезервированное имя \".\" означает родителя рабочего каталога.\n" +"Если рабочий каталог ен извлечен, оно эквивалентно null. Если в\n" +"рабочем каталоге находится незакоммиченный результат слияния, \".\"\n" +"означает первого родителя.\n" msgid "" "Mercurial supports a functional language for selecting a set of\n" "revisions." msgstr "" +"Mercurial поддерживает функциональный язык для задания множества\n" +"ревизий." msgid "" "The language supports a number of predicates which are joined by infix\n" "operators. Parenthesis can be used for grouping." msgstr "" +"Язык поддерживает несколько предикатов, которые объединяются с помощью\n" +"инфиксных операторов. Можно использовать скобки для группировки." msgid "" "Identifiers such as branch names must be quoted with single or double\n" @@ -15928,11 +16009,17 @@ "``[._a-zA-Z0-9\\x80-\\xff]`` or if they match one of the predefined\n" "predicates." msgstr "" +"Идентификаторы, такие как имена ветвей, должны заключаться в одинарные\n" +"или двойные кавычки, если они содержат символы не из множества\n" +"``[._a-zA-Z0-9\\x80-\\xff]`` или если их имена совпадают с одним\n" +"из предопределенных предикатов." msgid "" "``not x``\n" " Changesets not in x. Short form is ``! x``." msgstr "" +"``not x``\n" +" Наборы изменений не в х. Краткая форма: ``! x``." msgid "" "``x::y``\n" @@ -15941,9 +16028,14 @@ " is left out, this is equivalent to ``ancestors(y)``, if the second\n" " is left out it is equivalent to ``descendants(x)``." msgstr "" +"``x::y``\n" +" Диапазон на графе ревизий, означающий все ревизии, являющиеся\n" +" предками y и потомками x, включая x и y. Если первая ревизия\n" +" опущена, это эквивалентно ``ancestors(y)``, если вторая ревизия\n" +" опущена, это эквивалентно ``descendats(x)``." msgid " An alternative syntax is ``x..y``." -msgstr "" +msgstr " Альтернативная форма: ``x..y``." msgid "" "``x:y``\n" @@ -15951,24 +16043,32 @@ " inclusive. Either endpoint can be left out, they default to 0 and\n" " tip." msgstr "" +"``x:y``\n" +" Все ревизии с номерами от x до y, включительно. Обе могут быть\n" +" опущены, по умолчанию считаются 0 и tip соответственно." msgid "" "``x and y``\n" " The intersection of changesets in x and y. Short form is ``x & y``." msgstr "" +"``x and y``\n" +" Пересечение множеств ревизий x и y. Краткая форма: ``x & y``." msgid "" "``x or y``\n" " The union of changesets in x and y. There are two alternative short\n" " forms: ``x | y`` and ``x + y``." msgstr "" +"``x or y``\n" +" Объединение множеств ревизий x и y. Возможны две краткие формы:\n" +" ``x | y`` и ``x + y``." msgid "" "``x - y``\n" " Changesets in x but not in y." msgstr "" "``x - y``\n" -" Наборы изменений, входящие в x, но не в y." +" Ревизии, входящие в x, но не в y." msgid "" "``x^n``\n" @@ -15976,42 +16076,56 @@ " 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 "" +" n-ый родитель x, n == 0, 1, или 2.\n" +" Если n == 0, соответствует x; если n == 1, соответствует первому\n" +" родителю каждой ревизии из x; если n == 2 - второму родителю." msgid "" "``x~n``\n" " The nth first ancestor of x; ``x~0`` is x; ``x~3`` is ``x^^^``." msgstr "" +"``x~n``\n" +" n-ый первый предок x; ``x~0`` соответствует x; ``x~3`` - ``x^^^``." msgid "There is a single postfix operator:" -msgstr "" +msgstr "Существует единственный постфиксный оператор:" msgid "" "``x^``\n" " Equivalent to ``x^1``, the first parent of each changeset in x." msgstr "" +"``x^``\n" +" То же, что ``x^1`` - первый родитель каждой ревизии из x." msgid "" "\n" "The following predicates are supported:" msgstr "" +"\n" +"Поддерживаются следующие предикаты:" 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 "" +"Можно определить новые предикаты (известные как псевдонимы или \"алиасы\"),\n" +"используя любые комбинации существующих предикатов или псевдонимов.\n" +"Определение псевдонима имеет вид::" msgid " <alias> = <definition>" -msgstr "" +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 "" +"в секции ``revsetalias`` конфига Mercurial. Аргументы вида `$1`, `$2`\n" +"и т.д. передаются из псевдонима в его определение." msgid "For example," -msgstr "" +msgstr "Например," msgid "" " [revsetalias]\n" @@ -16024,9 +16138,11 @@ "defines three aliases, ``h``, ``d``, and ``rs``. ``rs(0:tip, author)`` is\n" "exactly equivalent to ``reverse(sort(0:tip, author))``." msgstr "" +"определяет три псевдонима, ``h``, ``d`` и ``rs``. ``rs(0:tip, автор)`` -\n" +"это ровно то же самое, что ``reverse(sort(0:tip, автор))``." msgid "Command line equivalents for :hg:`log`::" -msgstr "" +msgstr "Аналоги командной строки для :hg:`log`::" msgid "" " -f -> ::.\n" @@ -16040,19 +16156,21 @@ msgstr "" msgid "- Changesets on the default branch::" -msgstr "" +msgstr "- Ревизии на ветви default::" msgid " hg log -r \"branch(default)\"" msgstr "" msgid "- Changesets on the default branch since tag 1.5 (excluding merges)::" msgstr "" +"- Ревизии на ветви default, начиная с ветки 1.5, не включая ревизии\n" +" слияния::" msgid " hg log -r \"branch(default) and 1.5:: and not merge()\"" msgstr "" msgid "- Open branch heads::" -msgstr "" +msgstr "- Головы открытых ветвей" msgid " hg log -r \"head() and not closed()\"" msgstr "" @@ -16061,12 +16179,14 @@ "- Changesets between tags 1.3 and 1.5 mentioning \"bug\" that affect\n" " ``hgext/*``::" msgstr "" +"- Ревизии между метками 1.3 и 1.5, содержащие в описании слово \"bug\",\n" +" в которых были изменены файлы ``hgext/*``::" msgid " hg log -r \"1.3::1.5 and keyword(bug) and file('hgext/*')\"" msgstr "" msgid "- Changesets committed in May 2008, sorted by user::" -msgstr "" +msgstr "- Ревизии, закомиченные в Мае 2008, отсортированные по пользователю::" msgid " hg log -r \"sort(date('May 2008'), user)\"" msgstr "" @@ -16074,7 +16194,7 @@ msgid "" "- Changesets mentioning \"bug\" or \"issue\" that are not in a tagged\n" " release::" -msgstr "" +msgstr "- Не помеченные ревизии, содержищие слова \"bug\" или \"issue\"::" msgid "" " hg log -r \"(keyword(bug) or keyword(issue)) and not ancestors(tagged())" @@ -16087,21 +16207,31 @@ "group. External Mercurial and Subversion projects are currently\n" "supported." msgstr "" +"Субрепозитории (подрепозитории) позволяют вложить несколько внешних\n" +"репозиториев или пректов в один репозиторий Mercurial и выполнять\n" +"над ними команды как над единой группой. В настоящее время поддерживаются\n" +"внешнии проекты Mercurial и Subversion." msgid "Subrepositories are made of three components:" -msgstr "" +msgstr "Субрепозитории включают три компонента:" msgid "" "1. Nested repository checkouts. They can appear anywhere in the\n" " parent working directory, and are Mercurial clones or Subversion\n" " checkouts." msgstr "" +"1. Извлеченные рабочие копии вложенных репозиториев. Они могут\n" +" находится где угодно в рабочем каталоге и являются либо клонами\n" +" Mercurial, либо рабочими копиями Subversion." msgid "" "2. Nested repository references. They are defined in ``.hgsub`` and\n" " tell where the subrepository checkouts come from. Mercurial\n" " subrepositories are referenced like:" msgstr "" +"2. Ссылки на вложенные репозитории. Они определены в ``.hgsub`` и\n" +" описывают, откуда были извлечены копии субрепозиториев.\n" +" Субрепозитории имеют такие пути:" msgid " path/to/nested = https://example.com/nested/repo/path" msgstr "" @@ -16112,6 +16242,11 @@ " is the source repository path. The source can also reference a\n" " filesystem path. Subversion repositories are defined with:" msgstr "" +" где ``path/to/nested`` - путь к извлеченной рабочей копии относительно\n" +" корня родительского репозитория Mercurial, а \n" +" ``https://example.com/nested/repo/path`` - путь к репозиторию-\n" +" источнику. Источник может быть также путем в файловой системе.\n" +" Репозитории Subversion определяются так:" msgid " path/to/nested = [svn]https://example.com/nested/trunk/path" msgstr "" @@ -16121,6 +16256,9 @@ " repositories, you have to create and add it to the parent\n" " repository before using subrepositories." msgstr "" +" Обратите внимание, что ``.hgsub`` по умолчанию не существует\n" +" в репозиториях Mercurial, вам надо создать его и добавть\n" +" в родительский репозиторий перед использованием субрепозиториев." msgid "" "3. Nested repository states. They are defined in ``.hgsubstate`` and\n" @@ -16129,17 +16267,27 @@ " repository changeset. Mercurial automatically record the nested\n" " repositories states when committing in the parent repository." msgstr "" +"3. Состояния вложенных репозиториев. Они определены в ``.hgsubstate``\n" +" и содержат информацию, необходимую для дальнейшего восстановления\n" +" субрепозиториев до состояния, в котором они были закоммичены в\n" +" родительский репозиторий. Mercurial записывает состояния вложенных\n" +" репозиториев автоматичски при коммите в родительский репозиторий." msgid "" " .. note::\n" " The ``.hgsubstate`` file should not be edited manually." msgstr "" +" .. note::\n" +" Файл ``.hgsubstate`` не следует редактировать вручную." msgid "" "\n" "Adding a Subrepository\n" "----------------------" msgstr "" +"\n" +"Добавление субрепозитория\n" +"-------------------------" msgid "" "If ``.hgsub`` does not exist, create it and add it to the parent\n" @@ -16149,11 +16297,21 @@ "subrepository is tracked and the next commit will record its state in\n" "``.hgsubstate`` and bind it to the committed changeset." msgstr "" +"Если файл ``.hgsub`` не существует, создайте его и добавьте в\n" +"родительский репозиторий. Клонируйте или извлеките внешние проекты\n" +"в каталог, в котором они будут размещаться в родительском репозитории.\n" +"Отредактируйте файл ``.hgsub``, добавив туда запись для субрепозитория\n" +"как описано выше. Начиная с этого момента, этот субрепозиторий\n" +"контролируется Mercurial, и при следующем коммите в файле ``.hgsubstate``\n" +"будет зафиксировано его состояние и выполнена привязка к нему\n" +"закомиченного набора изменений." msgid "" "Synchronizing a Subrepository\n" "-----------------------------" msgstr "" +"Синхронизация субрепозитория\n" +"----------------------------" msgid "" "Subrepos do not automatically track the latest changeset of their\n" @@ -16162,38 +16320,57 @@ "developers always get a consistent set of compatible code and\n" "libraries when they update." msgstr "" +"Субрепозитории не отслеживают автоматически изменения в их источниках.\n" +"Вместо этого они обновляются до ревизии, соответствующей ревизии,\n" +"извлеченной уровнем выше. Это сделано для того, чтобы разработчики\n" +"всегда имели целостный набор кода и библиотек, когда они обновляются." msgid "" "Thus, updating subrepos is a manual process. Simply check out target\n" "subrepo at the desired revision, test in the top-level repo, then\n" "commit in the parent repository to record the new combination." msgstr "" +"Таким образом, обновление субрепозитория необходимо выполнять вручную.\n" +"Просто извлеките желаемую ревизию субрепозитория, протестируйте ее\n" +"в родительском репозитории и выполните commit в родительском\n" +"репозитории, чтобы зафиксировать новую комбинацию." msgid "" "Deleting a Subrepository\n" "------------------------" msgstr "" +"Удаление субрепозитория\n" +"-----------------------" msgid "" "To remove a subrepository from the parent repository, delete its\n" "reference from ``.hgsub``, then remove its files." msgstr "" +"Чтобы удалить субрепозиторий из родительского репозитория, удалите\n" +"ссылку на него из файла ``.hgsub``, после чего удалите его файлы." msgid "" "Interaction with Mercurial Commands\n" "-----------------------------------" msgstr "" +"Взаимодействие с командами Mercurial\n" +"------------------------------------" msgid "" ":add: add does not recurse in subrepos unless -S/--subrepos is\n" " specified. Subversion subrepositories are currently silently\n" " ignored." msgstr "" +":add: add не обрабатывает субрепозитории рекурсивно, если не указана\n" +" опция -S/--subrepos. Субрепозитории Subversion в настоящее\n" +" время молча игнорируются." msgid "" ":archive: archive does not recurse in subrepositories unless\n" " -S/--subrepos is specified." msgstr "" +":archive: archive не обрабатывает субрепозитории рекурсивно, если\n" +" не указана опция -S/--subrepos." msgid "" ":commit: commit creates a consistent snapshot of the state of the\n" @@ -16204,6 +16381,13 @@ " content is modified by setting \"ui.commitsubrepos=no\" in a\n" " configuration file (see :hg:`help config`)." msgstr "" +":commit: commit создает целостный снисок состояния всего проекта и\n" +" его субрепозиториев. Она делает это сначала пытаясь закоммитить\n" +" все измененные субрепозитории, потом записывая из состояние,\n" +" после чего выполняет коммит в родительский репозиторий. Можно\n" +" заставить Mercurial отменять коммит, если содержимое хотя бы одного\n" +" субрепозиторий изменено, с помощью установки \"ui.commitsubrepos=no\"\n" +" в конфиге (см. :hg:`help config`)." msgid "" ":diff: diff does not recurse in subrepos unless -S/--subrepos is\n" @@ -16211,18 +16395,28 @@ " elements. Subversion subrepositories are currently silently\n" " ignored." msgstr "" +":diff: diff не обрабатывает субрепозитории рекурсивно, если не указана\n" +" опция -S/--subrepos. Различия отображаются как обычно для элементов " +"субрепозиториев. Репозитории Subversion в настоящее время молча\n" +" игнорируются." msgid "" ":incoming: incoming does not recurse in subrepos unless -S/--subrepos\n" " is specified. Subversion subrepositories are currently silently\n" " ignored." msgstr "" +":incoming: incoming не обрабатывает субрепозитории рекурсивно, если\n" +" не указана опция -S/--subrepos. Субрепозитории Subversion в\n" +" настоящее время молча игнорируются." msgid "" ":outgoing: outgoing does not recurse in subrepos unless -S/--subrepos\n" " is specified. Subversion subrepositories are currently silently\n" " ignored." msgstr "" +":outgoing: outgoing не обрабатывает субрепозитории рекурсивно, если\n" +" не указана опция -S/--subrepos. Субрепозитории Subversion в\n" +" настоящее время молча игнорируются." msgid "" ":pull: pull is not recursive since it is not clear what to pull prior\n" @@ -16231,6 +16425,11 @@ " changesets is expensive at best, impossible in the Subversion\n" " case." msgstr "" +":pull: pull не обрабатывает субрепозитории рекурсивно, т.к. до\n" +" выполнения :hg:`update` не ясно, что подтягивать. Перечисление и\n" +" передача изменений во всех субрепозиториях, на которые ссылаются\n" +" подтянуютые ревизии родительского репозитория в лучшем случае\n" +" дорого, и вообще не возможно в случае Subversion." msgid "" ":push: Mercurial will automatically push all subrepositories first\n" @@ -16238,6 +16437,10 @@ " subrepository changes are available when referenced by top-level\n" " repositories." msgstr "" +":push: Mercurial автоматически выполняет push для всех субрепозиториев\n" +" при выполнении push для родительского репозитория. Это позволяет\n" +" быть уверенным, что новые изменения в субрепозиториях будут доступны,\n" +" когда на них ссылаются репозиторие уровнем выше." msgid "" ":status: status does not recurse into subrepositories unless\n" @@ -16246,6 +16449,10 @@ " elements. Subversion subrepositories are currently silently\n" " ignored." msgstr "" +":status: status по умолчанию не обрабатывает субрепозитории рекурсивно,\n" +" если не указан -S/--subrepos. Изменения в субрепозиториях\n" +" отображаются как обычные изменения в элементах субрепозитория.\n" +" Репозитории Subversion в настоящее время молча игнорируются." msgid "" ":update: update restores the subrepos in the state they were\n" @@ -16254,11 +16461,18 @@ " will pull it in first before updating. This means that updating\n" " can require network access when using subrepositories." msgstr "" +":update: update восстанавливает субрепозитории до состояния,\n" +" в котором они были закоммичены в целевой ревизии. Если\n" +" записанная ревизия недоступна, Mercurial сначала подтянет\n" +" ее до обновления. Это значит, что обновление может потребовать\n" +" доступа к сети при использовании субрепозиториев." msgid "" "Remapping Subrepositories Sources\n" "---------------------------------" msgstr "" +"Переназначение источников субрепозиториев\n" +"-----------------------------------------" msgid "" "A subrepository source location may change during a project life,\n" @@ -16267,6 +16481,11 @@ "file or in Mercurial configuration. See the ``[subpaths]`` section in\n" "hgrc(5) for more details." msgstr "" +"Местоположение источников субрепозиториев может меняться в течение\n" +"жизни проекта, делая ссылки, хранящиеся в истории родительского\n" +"репозитория, некорректными. Чтобы исправить это, можно определить\n" +"правила переназначения в файле ``hgrc`` родительского репозитория\n" +"или в конфиге Mercurial. Подробенее см. секцию ``[subpaths]``." msgid "" "Mercurial allows you to customize output of commands through\n" @@ -16274,11 +16493,16 @@ "line, via the --template option, or select an existing\n" "template-style (--style)." msgstr "" +"Mercurial позволяет вам настраивать вывод команд с помощью шаблонов.\n" +"Вы можете передать шаблон через командную строку с помощью опции\n" +"--template, либо выбрать существующий шаблонный стиль (--style)." msgid "" "You can customize output for any \"log-like\" command: log,\n" "outgoing, incoming, tip, parents, heads and glog." msgstr "" +"Можно настроить вывод для любой команды, похожей на log: log,\n" +"outgoing, incoming, tip, parents, heads и glog." msgid "" "Four styles are packaged with Mercurial: default (the style used\n" @@ -16286,6 +16510,9 @@ "and xml.\n" "Usage::" msgstr "" +"С Mercurial поставляются четыре стиля: стиль по умолчанию (используется,\n" +"когда другой стиль явно указан), compact, changelog и xml.\n" +"Использование::" msgid " $ hg log -r1 --style changelog" msgstr "" @@ -16294,6 +16521,8 @@ "A template is a piece of text, with markup to invoke variable\n" "expansion::" msgstr "" +"Шаблон - это текст с разметкой, позволяющей выполнять подстановку\n" +"переменных::" msgid "" " $ hg log -r1 --template \"{node}\\n\"\n" @@ -16305,6 +16534,10 @@ "keywords depends on the exact context of the templater. These\n" "keywords are usually available for templating a log-like command:" msgstr "" +"Строки в фигурных скобках называются ключевыми словами. Ключевые\n" +"слова доступны в зависимости от контекста, в котором применяется\n" +"шаблон. Эти ключевые слова как правило доступны в шаблонах для\n" +"команд, похожих на log:" msgid ".. keywordsmarker" msgstr "" @@ -16317,6 +16550,14 @@ "applying a string-input filter to a list-like input variable.\n" "You can also use a chain of filters to get the desired output::" msgstr "" +"Ключевое слово \"date\" не создает читаемого вывода. Если вы хотите\n" +"использовать дату в выходном тексте, можно использовать для этого\n" +"фильтр. Фильтры - это функции, которые возвращают строку, основанную\n" +"на входной переменной. Убедитесь, что сначала используется фильтр,\n" +"преобразующий входные значения в строки, если вы хотите применить\n" +"фильтр, принимающий на вход строку, к входной переменной типа список.\n" +"Можно также использовать цепочку фильтров для получения желаемого\n" +"результата::" msgid "" " $ hg tip --template \"{date|isodate}\\n\"\n" @@ -16324,13 +16565,13 @@ msgstr "" msgid "List of filters:" -msgstr "" +msgstr "Список фильтров (вход, описание):" msgid ".. filtersmarker\n" msgstr "" msgid "Valid URLs are of the form::" -msgstr "" +msgstr "Возможные следующие формы URL::" msgid "" " local/filesystem/path[#revision]\n" @@ -16345,26 +16586,37 @@ "repositories or to bundle files (as created by :hg:`bundle` or :hg:`\n" "incoming --bundle`). See also :hg:`help paths`." msgstr "" +"Пути в локальной файловой системе могут указывать на репозитории\n" +"Mercurial или на файлы бандлов (созданных с помощью :hg:`bundle` или\n" +":hg:`incoming --bundle`). См. также :hg:`help paths`." msgid "" "An optional identifier after # indicates a particular branch, tag, or\n" "changeset to use from the remote repository. See also :hg:`help\n" "revisions`." msgstr "" +"Необязательный идентификатор после # указывает конкретную ветвь, метку\n" +"или набор изменений, которую следует использовать из удаленного\n" +"репозитория. См. также :hg:`help revisions`." msgid "" "Some features, such as pushing to http:// and https:// URLs are only\n" "possible if the feature is explicitly enabled on the remote Mercurial\n" "server." msgstr "" +"Некоторые функции, такие как выполнение push по URL вида http://\n" +"и https://, доступны только если эти функции явно включены на удаленном\n" +"сервере Mercurial." msgid "" "Note that the security of HTTPS URLs depends on proper configuration of\n" "web.cacerts." msgstr "" +"Обратите внимание, что безопасность работы с URL HTTPS зависит от\n" +"правильноых настроек в web.cacerts." msgid "Some notes about using SSH with Mercurial:" -msgstr "" +msgstr "Замечания относительно использования Mercurial по SSH:" msgid "" "- SSH requires an accessible shell account on the destination machine\n" @@ -16372,6 +16624,12 @@ "- path is relative to the remote user's home directory by default. Use\n" " an extra slash at the start of a path to specify an absolute path::" msgstr "" +"- SSH требует доступного пользовательского аккаунта на удаленной\n" +" машине и доступного исполняемого файла Mercurial (hg) по известным\n" +" на удаленной машине путям, либо заданного через remotecmd.\n" +"- пути по умолчанию задаются относительно домашнего каталога удаленного\n" +" пользователя. Используйте дополнительный слэш в начале пути, чтобы\n" +" задать абсолютный путь::" msgid " ssh://example.com//tmp/repository" msgstr "" @@ -16380,6 +16638,8 @@ "- Mercurial doesn't use its own compression via SSH; the right thing\n" " to do is to configure it in your ~/.ssh/config, e.g.::" msgstr "" +"- Mercurial не использует встроенное сжатие при работе по SSH; будет\n" +" правильным настроить его в вашем ~/.ssh/config, например::" msgid "" " Host *.mylocalnetwork.example.com\n" @@ -16392,11 +16652,16 @@ " Alternatively specify \"ssh -C\" as your ssh command in your\n" " configuration file or with the --ssh command line option." msgstr "" +" В качестве альтернативы можно указать \"ssh -C\" в качестве\n" +" вашей команды ssh в конфиге или и с помощью опции командной\n" +" строки --ssh." msgid "" "These URLs can all be stored in your configuration file with path\n" "aliases under the [paths] section like so::" msgstr "" +"Все эти URL могут храниться в вашем конфигурационном файле вместе с\n" +"краткими псевдонимами путей в секции [path]::" msgid "" " [paths]\n" @@ -16404,16 +16669,25 @@ " alias2 = URL2\n" " ..." msgstr "" +" [paths]\n" +" псевдоним1 = URL1\n" +" псевдоним2 = URL2\n" +" ..." msgid "" "You can then use the alias for any command that uses a URL (for\n" "example :hg:`pull alias1` will be treated as :hg:`pull URL1`)." msgstr "" +"Эти псевдонимы можно использовать в любой команде, которая ожидает\n" +"URL (например, :hg:`pull псевдоним1` означает то же, что и\n" +":hg:`pull URL1`)." msgid "" "Two path aliases are special because they are used as defaults when\n" "you do not provide the URL to a command:" msgstr "" +"Два псевдонима путей являются особыми, т.е. они используются по\n" +"умолчанию, если URL не указан при вызове команды:" msgid "" "default:\n" @@ -16422,12 +16696,20 @@ " 'default' path. This is then used when you omit path from push- and\n" " pull-like commands (including incoming and outgoing)." msgstr "" +"default:\n" +" Когда вы создаете репозиторий с помощью hg clone, команда clone\n" +" сохраняет адрес источника в качестве пути 'default' для нового\n" +" репозитория. Он используется, если вы опускаете путь в командах\n" +" вроде push и pull (т.ч. incoming и outgoing)." msgid "" "default-push:\n" " The push command will look for a path named 'default-push', and\n" " prefer it over 'default' if both are defined.\n" msgstr "" +"default-push:\n" +" Команда push сначала ищет путь с именем `default-push` и предпочтет\n" +" использовать его вместо 'default', если оба определены.\n" msgid "remote branch lookup not supported" msgstr "" @@ -17872,6 +18154,275 @@ msgid ".hg/cache/tags is corrupt, rebuilding it\n" msgstr "" +msgid "" +":addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" +" every line except the last." +msgstr "" +":addbreaks: Произвольный текст. Добавляет XHTML-тег \"<br />\" перед\n" +" окончанием каждой строки кроме последней." + +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" +" пути (игнорируя разделители на конце). Например, \"foo/bar/baz\"\n" +" преобразуется в \"baz\", а \"foo/bar//\" - в \"bar\"." + +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, включая часовой пояс:\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" +" email-адрес, и вычленяет из нее домен. Пример:\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" +" как email-адрес. Пример: ``User <user@example.com>`` преобразуется\n" +" в ``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 ":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 "" +":hex: Any text. Convert a binary Mercurial node identifier into\n" +" its long hexadecimal representation." +msgstr "" +":hex: Произвольный текст. Преобразует двоичный идентификатор ревизии\n" +" в длинную шестнадцатиричную форму." + +msgid "" +":hgdate: Date. Returns the date as a pair of numbers: \"1157407993\n" +" 25200\" (Unix timestamp, timezone offset)." +msgstr "" +":hgdate: Дата. Возвращает дату в виде пары чисел: \"1157407993\n" +" 25200\" (метка времени Unix, смещение часового пояса)." + +msgid "" +":isodate: Date. Returns the date in ISO 8601 format: \"2009-08-18 13:00\n" +" +0200\"." +msgstr "" +":isodate: Дата. Возвращает дату в формате ISO 8601: \"2009-08-18 13:00\n" +" +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 ":nonempty: Any text. Returns '(none)' if the string is empty." +msgstr "" +":nonempty: Произвольный текст. Возвращает '(none)' если входная\n" +" строка пуста." + +msgid "" +":obfuscate: Any text. Returns the input text rendered as a sequence of\n" +" XML entities." +msgstr "" +":obfuscate: Произвольный текст. Возвращает входной текст в виде\n" +" последовательности XML-сущностей." + +msgid ":person: Any text. Returns the text before an email address." +msgstr ":person: Произвольный текст. Возвращает текст перед email-адресом." + +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: Дата. Возвращает дату в Internet-формате, описанном\n" +" в RFC 3339: \"2009-08-18T13:00:13+02:00\"." + +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" +" email-сообщений: \"Tue, 18 Aug 2009 13:00:13 +0200\"." + +msgid "" +":short: Changeset hash. Returns the short form of a changeset hash,\n" +" i.e. a 12 hexadecimal digit string." +msgstr "" +":short: Хэш набора изменений. Возвращает хэш набора изменений в\n" +" сокращенной форме, т.е. строку из 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: Любой тип. Превращает значение в текст, путем конвертации\n" +" значений в текст и их объединения." + +msgid ":strip: Any text. Strips all leading and trailing whitespace." +msgstr "" +":strip: Произвольный текст. Удаляет ведущие и замыкающие пробельные\n" +" символы." + +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 "" +":tabindent: Any text. Returns the text, with every line except the\n" +" first starting with a tab character." +msgstr "" +":tabindent: Произвольный текст. Возвращает текст, каждая строка\n" +" которго, кроме первой, начинается с символа табуляции." + +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." +msgstr ":user: Произвольный текст. Возвращает пользователя из email-адреса." + +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 "" +":bookmarks: List of strings. Any bookmarks associated with the\n" +" changeset." +msgstr "" +":bookmarks: Список строк. Все закладки, ассоциированные с набором\n" +" изменений." + +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 ":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: Список строк. Файлы, скопированные в этом наборе\n" +" изменений, вместе с их источниками." + +msgid "" +":file_copies_switch: List of strings. Like \"file_copies\" but displayed\n" +" only if the --copied switch is set." +msgstr "" +":file_copies_switch: Список строк. То же, что \"file_copies\", но\n" +" отображается только если была установлена опция --copied." + +msgid ":file_dels: List of strings. Files removed by this changeset." +msgstr ":file_dels: Список строк. Файлы, удаленные этим набором изменений." + +msgid ":file_mods: List of strings. Files modified by this changeset." +msgstr ":file_mods: Список строк. Файлы, измененные этим набором изменений." + +msgid "" +":files: List of strings. All files modified, added, or removed by this\n" +" changeset." +msgstr "" +":files: Список строк. Все файлы, измененные, добавленные или удаленные\n" +" этим набором изменений." + +msgid "" +":latesttag: String. Most recent global tag in the ancestors of this\n" +" changeset." +msgstr "" +":latesttag: Строка. Последняя глобальная метка среди предков данного\n" +" набора изменений." + +msgid ":latesttagdistance: Integer. Longest path to the latest tag." +msgstr "" +":latesttagdistance: Целое чиcло. Самый длинный путь до последней\n" +" метки." + +msgid "" +":node: String. The changeset identification hash, as a 40 hexadecimal\n" +" digit string." +msgstr "" +":node: Строка. Хэш набора изменений в виде 40-значной шестнадцатиричной\n" +" строки." + +msgid ":rev: Integer. The repository-local changeset revision number." +msgstr ":rev: Целое число. Локальный номер ревизии в этом репозитории." + +msgid ":tags: List of strings. Any tags associated with the changeset." +msgstr ":tags: Список строк. Все метки, ассоциированные с набором изменений." + #, python-format msgid "unknown method '%s'" msgstr ""
--- a/i18n/sv.po Tue Jun 28 10:02:39 2011 +0200 +++ b/i18n/sv.po Wed Jun 29 16:05:59 2011 -0500 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Mercurial\n" "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n" -"POT-Creation-Date: 2011-06-23 22:17+0200\n" -"PO-Revision-Date: 2011-06-23 22:33+0200\n" +"POT-Creation-Date: 2011-06-29 09:21+0200\n" +"PO-Revision-Date: 2011-06-29 09:24+0200\n" "Last-Translator: Jens Bäckman <jens.backman@gmail.com>\n" "Language-Team: Swedish\n" "Language: Swedish\n" @@ -9561,8 +9561,32 @@ msgid "no files or directories specified" msgstr "inga filer eller kataloger angivna" +msgid "" +"uncommitted merge, use --all to discard all changes, or 'hg update -C .' to " +"abort the merge" +msgstr "" +"oarkiverad sammanfogning, använd --all för att kasta alla ändringar, eller " +"'hg update -C .' för att avbryta sammanfogningen" + +#, python-format +msgid "" +"uncommitted changes, use --all to discard all changes, or 'hg update %s' to " +"update" +msgstr "" +"oarkiverade ändringar, använd --all för att kasta alla ändringar, eller 'hg " +"update %s' för att uppdatera" + +#, python-format +msgid "use --all to revert all files, or 'hg update %s' to update" +msgstr "" +"använd --all för att återställa alla filer, eller 'hg update %s' för att " +"uppdatera" + +msgid "uncommitted changes, use --all to discard all changes" +msgstr "oarkiverade ändringar, använd --all för att kasta alla ändringar" + msgid "use --all to revert all files" -msgstr "använd --all för att återställa alla filer" +msgstr "använd --all för att återställa filer" #, python-format msgid "forgetting %s\n" @@ -10213,6 +10237,11 @@ msgstr "" msgid "" +" Update sets the working directory's parent revison to the specified\n" +" changeset (see :hg:`help parents`)." +msgstr "" + +msgid "" " The following rules apply when the working directory contains\n" " uncommitted changes:" msgstr "" @@ -10259,17 +10288,17 @@ " :hg:`clone -U`)." msgid "" -" If you want to update just one file to an older changeset, use\n" -" :hg:`revert`." -msgstr "" -" Om du vill uppdatera bara en fil till en äldre ändring, använd\n" -" :hg:`revert`." +" If you want to revert just one file to an older revision, use\n" +" :hg:`revert [-r REV] NAME`." +msgstr "" +" Om du vill uppdatera bara en fil till en äldre revision, använd\n" +" :hg:`revert [-r REV] NAMN`." msgid "cannot specify both -c/--check and -C/--clean" -msgstr "" +msgstr "kan inte både ange -c/--check och -C/--clean" msgid "uncommitted local changes" -msgstr "" +msgstr "oarkiverade lokala ändringar" msgid "verify the integrity of the repository" msgstr "verifiera arkivets integritet" @@ -10697,6 +10726,7 @@ " File that is modified according to status." msgstr "" +#. i18n: "modified" is a keyword msgid "modified takes no arguments" msgstr "modified tar inga argument" @@ -10705,6 +10735,7 @@ " File that is added according to status." msgstr "" +#. i18n: "added" is a keyword msgid "added takes no arguments" msgstr "added tar inga argument" @@ -10713,6 +10744,7 @@ " File that is removed according to status." msgstr "" +#. i18n: "removed" is a keyword msgid "removed takes no arguments" msgstr "removed tar inga argument" @@ -10721,6 +10753,7 @@ " File that is deleted according to status." msgstr "" +#. i18n: "deleted" is a keyword msgid "deleted takes no arguments" msgstr "deleted tar inga argument" @@ -10730,6 +10763,7 @@ " considered if this predicate is used." msgstr "" +#. i18n: "unknown" is a keyword msgid "unknown takes no arguments" msgstr "unknown tar inga argument" @@ -10739,6 +10773,7 @@ " considered if this predicate is used." msgstr "" +#. i18n: "ignored" is a keyword msgid "ignored takes no arguments" msgstr "ignored tar inga argument" @@ -10747,6 +10782,7 @@ " File that is clean according to status." msgstr "" +#. i18n: "clean" is a keyword msgid "clean takes no arguments" msgstr "clean tar inga argument" @@ -10759,6 +10795,7 @@ " File that appears to be binary (contails NUL bytes)." msgstr "" +#. i18n: "binary" is a keyword msgid "binary takes no arguments" msgstr "binary tar inga argument" @@ -10767,6 +10804,7 @@ " File that is marked as executable." msgstr "" +#. i18n: "exec" is a keyword msgid "exec takes no arguments" msgstr "exec tar inga argument" @@ -10775,6 +10813,7 @@ " File that is marked as a symlink." msgstr "" +#. i18n: "symlink" is a keyword msgid "symlink takes no arguments" msgstr "symlink tar inga argument" @@ -10783,6 +10822,7 @@ " File that is marked resolved according to the resolve state." msgstr "" +#. i18n: "resolved" is a keyword msgid "resolved takes no arguments" msgstr "resolved tar inga argument" @@ -10791,6 +10831,7 @@ " File that is marked unresolved according to the resolve state." msgstr "" +#. i18n: "unresolved" is a keyword msgid "unresolved takes no arguments" msgstr "unresolved tar inga argument" @@ -10810,7 +10851,8 @@ msgid "grep requires a pattern" msgstr "grep kräver ett mönster" -msgid "couldn't parse size" +#, python-format +msgid "couldn't parse size: %s" msgstr "" msgid "" @@ -10825,6 +10867,10 @@ " - 4k - 1MB (files from 4096 bytes to 1048576 bytes)" msgstr "" +#. i18n: "size" is a keyword +msgid "size requires an expression" +msgstr "size kräver ett uttryck" + msgid "" "``encoding(name)``\n" " File can be successfully decoded with the given character\n" @@ -10832,6 +10878,7 @@ " UTF-8." msgstr "" +#. i18n: "encoding" is a keyword msgid "encoding requires an encoding name" msgstr "" @@ -10844,6 +10891,10 @@ " File that is recorded as being copied." msgstr "" +#. i18n: "copied" is a keyword +msgid "copied takes no arguments" +msgstr "copied tar inga argument" + msgid "invalid token" msgstr "" @@ -13129,8 +13180,8 @@ msgid "" "Mercurial supports a functional language for selecting a set of\n" "files. " -msgstr "Mercurial stöder ett funktionellt språk för att välja en\n" -"uppsättning filer. " +msgstr "" +"Mercurial stöder ett funktionellt språk för att välja en uppsättning filer. " msgid "" "Like other file patterns, this pattern type is indicated by a prefix,\n" @@ -15789,6 +15840,9 @@ msgid "follow takes no arguments or a filename" msgstr "follow tar inga argument eller ett filnamn" +msgid "follow expected a filename" +msgstr "follow förväntade sig ett filnamn" + #. i18n: "follow" is a keyword msgid "follow takes no arguments" msgstr "follow tar inga argument" @@ -15932,6 +15986,10 @@ msgstr "" #. i18n: "outgoing" is a keyword +msgid "outgoing takes one or no arguments" +msgstr "outgoing tar ett eller inga argument" + +#. i18n: "outgoing" is a keyword msgid "outgoing requires a repository path" msgstr "" @@ -16048,8 +16106,9 @@ msgid "not a symbol" msgstr "inte en symbol" -msgid "invalid amount of arguments" -msgstr "felaktigt antal argument" +#, fuzzy, python-format +msgid "invalid number of arguments: %s" +msgstr "felaktigt antal argument: %s" msgid "empty query" msgstr "tom fråga" @@ -16095,8 +16154,8 @@ msgstr "filen .hg/requires är korrupt" #, python-format -msgid "unknown repository format: requires feature '%s' (upgrade Mercurial)" -msgstr "" +msgid "unknown repository format: requires features '%s' (upgrade Mercurial)" +msgstr "okänt arkivformat: kräver att '%s' fungerar (uppgradera Mercurial)" msgid "searching for changes\n" msgstr "söker efter ändringar\n"
--- a/mercurial/byterange.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/byterange.py Wed Jun 29 16:05:59 2011 -0500 @@ -64,7 +64,7 @@ # HTTP's Range Not Satisfiable error raise RangeError('Requested Range Not Satisfiable') -class RangeableFileObject: +class RangeableFileObject(object): """File object wrapper to enable raw range handling. This was implemented primarilary for handling range specifications for file:// urls. This object effectively makes
--- a/mercurial/dispatch.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/dispatch.py Wed Jun 29 16:05:59 2011 -0500 @@ -125,6 +125,8 @@ commands.help_(ui, 'shortlist') except error.RepoError, inst: ui.warn(_("abort: %s!\n") % inst) + if inst.hint: + ui.warn(_("(%s)\n") % inst.hint) except error.ResponseError, inst: ui.warn(_("abort: %s") % inst.args[0]) if not isinstance(inst.args[1], basestring):
--- a/mercurial/error.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/error.py Wed Jun 29 16:05:59 2011 -0500 @@ -43,7 +43,9 @@ 'Exception raised when parsing config files (msg[, pos])' class RepoError(Exception): - pass + def __init__(self, *args, **kw): + Exception.__init__(self, *args) + self.hint = kw.get('hint') class RepoLookupError(RepoError): pass
--- a/mercurial/hgweb/server.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/hgweb/server.py Wed Jun 29 16:05:59 2011 -0500 @@ -251,7 +251,7 @@ if hasattr(os, "fork"): _mixin = SocketServer.ForkingMixIn else: - class _mixin: + class _mixin(object): pass def openlog(opt, default):
--- a/mercurial/hgweb/webcommands.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/hgweb/webcommands.py Wed Jun 29 16:05:59 2011 -0500 @@ -432,10 +432,10 @@ if limit > 0 and count >= limit: return count += 1 - if ctx.node() not in heads: + if not web.repo.branchheads(ctx.branch()): + status = 'closed' + elif ctx.node() not in heads: status = 'inactive' - elif not web.repo.branchheads(ctx.branch()): - status = 'closed' else: status = 'open' yield {'parity': parity.next(),
--- a/mercurial/keepalive.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/keepalive.py Wed Jun 29 16:05:59 2011 -0500 @@ -124,7 +124,7 @@ HANDLE_ERRORS = 1 else: HANDLE_ERRORS = 0 -class ConnectionManager: +class ConnectionManager(object): """ The connection manager must be able to: * keep track of all existing @@ -187,7 +187,7 @@ else: return dict(self._hostmap) -class KeepAliveHandler: +class KeepAliveHandler(object): def __init__(self): self._cm = ConnectionManager() @@ -705,7 +705,7 @@ def test_timeout(url): global DEBUG dbbackup = DEBUG - class FakeLogger: + class FakeLogger(object): def debug(self, msg, *args): print msg % args info = warning = error = debug
--- a/mercurial/patch.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/patch.py Wed Jun 29 16:05:59 2011 -0500 @@ -1009,7 +1009,7 @@ def new(self, fuzz=0, toponly=False): return self.fuzzit(self.b, fuzz, toponly) -class binhunk: +class binhunk(object): 'A binary patch file. Only understands literals so far.' def __init__(self, lr): self.text = None
--- a/mercurial/subrepo.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/subrepo.py Wed Jun 29 16:05:59 2011 -0500 @@ -198,9 +198,9 @@ or on the top repo config. Abort or return None if no source found.""" if hasattr(repo, '_subparent'): source = util.url(repo._subsource) + if source.isabs(): + return str(source) source.path = posixpath.normpath(source.path) - if posixpath.isabs(source.path) or source.scheme: - return str(source) parent = _abssource(repo._subparent, push, abort=False) if parent: parent = util.url(parent)
--- a/mercurial/util.py Tue Jun 28 10:02:39 2011 +0200 +++ b/mercurial/util.py Wed Jun 29 16:05:59 2011 -0500 @@ -1555,6 +1555,17 @@ return (s, (None, (str(self), self.host), self.user, self.passwd or '')) + def isabs(self): + if self.scheme and self.scheme != 'file': + return True # remote URL + if hasdriveletter(self.path): + return True # absolute for our purposes - can't be joined() + if self.path.startswith(r'\\'): + return True # Windows UNC path + if self.path.startswith('/'): + return True # POSIX-style + return False + def localpath(self): if self.scheme == 'file' or self.scheme == 'bundle': path = self.path or '/'
--- a/tests/test-batching.py Tue Jun 28 10:02:39 2011 +0200 +++ b/tests/test-batching.py Wed Jun 29 16:05:59 2011 -0500 @@ -85,7 +85,7 @@ # server side # equivalent of wireproto's global functions -class server: +class server(object): def __init__(self, local): self.local = local def _call(self, name, args):
--- a/tests/test-check-code.t Tue Jun 28 10:02:39 2011 +0200 +++ b/tests/test-check-code.t Wed Jun 29 16:05:59 2011 -0500 @@ -27,8 +27,21 @@ > def any(x): > pass > EOF + $ cat > classstyle.py <<EOF + > class newstyle_class(object): + > pass + > + > class oldstyle_class: + > pass + > + > class empty(): + > pass + > + > no_class = 1: + > pass + > EOF $ check_code="$TESTDIR"/../contrib/check-code.py - $ "$check_code" ./wrong.py ./correct.py ./quote.py ./non-py24.py + $ "$check_code" ./wrong.py ./correct.py ./quote.py ./non-py24.py ./classstyle.py ./wrong.py:1: > def toto( arg1, arg2): gratuitous whitespace in () or [] @@ -51,6 +64,12 @@ ./non-py24.py:4: > y = format(x) any/all/format not available in Python 2.4 + ./classstyle.py:4: + > class oldstyle_class: + old-style class, use class foo(object) + ./classstyle.py:7: + > class empty(): + class foo() not available in Python 2.4, use class foo(object) [1] $ cat > is-op.py <<EOF
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-commandserver.py Wed Jun 29 16:05:59 2011 -0500 @@ -0,0 +1,130 @@ +import sys, os, struct, subprocess, cStringIO, re + +def connect(path=None): + cmdline = ['hg', 'serve', '--cmdserver', 'pipe'] + if path: + cmdline += ['-R', path] + + server = subprocess.Popen(cmdline, stdin=subprocess.PIPE, + stdout=subprocess.PIPE) + + return server + +def writeblock(server, data): + server.stdin.write(struct.pack('>I', len(data))) + server.stdin.write(data) + server.stdin.flush() + +def readchannel(server): + data = server.stdout.read(5) + if not data: + raise EOFError() + channel, length = struct.unpack('>cI', data) + if channel in 'IL': + return channel, length + else: + return channel, server.stdout.read(length) + +def runcommand(server, args, output=sys.stdout, error=sys.stderr, input=None): + server.stdin.write('runcommand\n') + writeblock(server, '\0'.join(args)) + + if not input: + input = cStringIO.StringIO() + + while True: + ch, data = readchannel(server) + if ch == 'o': + output.write(data) + output.flush() + elif ch == 'e': + error.write(data) + error.flush() + elif ch == 'I': + writeblock(server, input.read(data)) + elif ch == 'L': + writeblock(server, input.readline(data)) + elif ch == 'r': + return struct.unpack('>i', data)[0] + else: + print "unexpected channel %c: %r" % (ch, data) + if ch.isupper(): + return + +def check(func, repopath=None): + server = connect(repopath) + try: + return func(server) + finally: + server.stdin.close() + server.wait() + +def unknowncommand(server): + server.stdin.write('unknowncommand\n') + +def hellomessage(server): + ch, data = readchannel(server) + # escaping python tests output not supported + print '%c, %r' % (ch, re.sub('encoding: [a-zA-Z0-9-]+', 'encoding: ***', data)) + + # run an arbitrary command to make sure the next thing the server sends + # isn't part of the hello message + runcommand(server, ['id']) + +def checkruncommand(server): + # hello block + readchannel(server) + + # no args + runcommand(server, []) + + # global options + runcommand(server, ['id', '--quiet']) + + # make sure global options don't stick through requests + runcommand(server, ['id']) + + # --config + runcommand(server, ['id', '--config', 'ui.quiet=True']) + + # make sure --config doesn't stick + runcommand(server, ['id']) + +def inputeof(server): + readchannel(server) + server.stdin.write('runcommand\n') + # close stdin while server is waiting for input + server.stdin.close() + + # server exits with 1 if the pipe closed while reading the command + print 'server exit code =', server.wait() + +def serverinput(server): + readchannel(server) + + patch = """ +# HG changeset patch +# User test +# Date 0 0 +# Node ID c103a3dec114d882c98382d684d8af798d09d857 +# Parent 0000000000000000000000000000000000000000 +1 + +diff -r 000000000000 -r c103a3dec114 a +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/a Thu Jan 01 00:00:00 1970 +0000 +@@ -0,0 +1,1 @@ ++1 +""" + + runcommand(server, ['import', '-'], input=cStringIO.StringIO(patch)) + runcommand(server, ['log']) + +if __name__ == '__main__': + os.system('hg init') + + check(hellomessage) + check(unknowncommand) + check(checkruncommand) + check(inputeof) + check(serverinput)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-commandserver.py.out Wed Jun 29 16:05:59 2011 -0500 @@ -0,0 +1,38 @@ +o, 'capabilities: getencoding runcommand\nencoding: ***' +000000000000 tip +abort: unknown command unknowncommand +Mercurial Distributed SCM + +basic commands: + + add add the specified files on the next commit + annotate show changeset information by line for each file + clone make a copy of an existing repository + commit commit the specified files or all outstanding changes + diff diff repository (or selected files) + export dump the header and diffs for one or more changesets + forget forget the specified files on the next commit + init create a new repository in the given directory + log show revision history of entire repository or files + merge merge working directory with another revision + pull pull changes from the specified source + push push changes to the specified destination + remove remove the specified files on the next commit + serve start stand-alone webserver + status show changed files in the working directory + summary summarize working directory state + update update working directory (or switch revisions) + +use "hg help" for the full list of commands or "hg -v" for details +000000000000 +000000000000 tip +000000000000 +000000000000 tip +server exit code = 1 +applying patch from stdin +changeset: 0:eff892de26ec +tag: tip +user: test +date: Thu Jan 01 00:00:00 1970 +0000 +summary: 1 +
--- a/tests/test-duplicateoptions.py Tue Jun 28 10:02:39 2011 +0200 +++ b/tests/test-duplicateoptions.py Wed Jun 29 16:05:59 2011 -0500 @@ -1,7 +1,7 @@ import os from mercurial import ui, commands, extensions -ignore = set(['highlight', 'win32text']) +ignore = set(['highlight', 'inotify', 'win32text']) if os.name != 'nt': ignore.add('win32mbcs')
--- a/tests/test-revert.t Tue Jun 28 10:02:39 2011 +0200 +++ b/tests/test-revert.t Wed Jun 29 16:05:59 2011 -0500 @@ -12,6 +12,7 @@ abort: no files or directories specified (use --all to revert all files) [255] + $ hg revert --all $ echo 123 > b
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-wireproto.py Wed Jun 29 16:05:59 2011 -0500 @@ -0,0 +1,45 @@ +from mercurial import wireproto + +class proto(object): + def __init__(self, args): + self.args = args + def getargs(self, spec): + args = self.args + args.setdefault('*', {}) + names = spec.split() + return [args[n] for n in names] + +class clientrepo(wireproto.wirerepository): + def __init__(self, serverrepo): + self.serverrepo = serverrepo + def _call(self, cmd, **args): + return wireproto.dispatch(self.serverrepo, proto(args), cmd) + + @wireproto.batchable + def greet(self, name): + f = wireproto.future() + yield wireproto.todict(name=mangle(name)), f + yield unmangle(f.value) + +class serverrepo(object): + def greet(self, name): + return "Hello, " + name + +def mangle(s): + return ''.join(chr(ord(c) + 1) for c in s) +def unmangle(s): + return ''.join(chr(ord(c) - 1) for c in s) + +def greet(repo, proto, name): + return mangle(repo.greet(unmangle(name))) + +wireproto.commands['greet'] = (greet, 'name',) + +srv = serverrepo() +clt = clientrepo(srv) + +print clt.greet("Foobar") +b = clt.batch() +fs = [b.greet(s) for s in ["Fo, =;o", "Bar"]] +b.submit() +print [f.value for f in fs]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-wireproto.py.out Wed Jun 29 16:05:59 2011 -0500 @@ -0,0 +1,2 @@ +Hello, Foobar +['Hello, Fo, =;o', 'Hello, Bar']
--- a/tests/test-wireprotocol.py Tue Jun 28 10:02:39 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -from mercurial import wireproto - -class proto(): - def __init__(self, args): - self.args = args - def getargs(self, spec): - args = self.args - args.setdefault('*', {}) - names = spec.split() - return [args[n] for n in names] - -class clientrepo(wireproto.wirerepository): - def __init__(self, serverrepo): - self.serverrepo = serverrepo - def _call(self, cmd, **args): - return wireproto.dispatch(self.serverrepo, proto(args), cmd) - - @wireproto.batchable - def greet(self, name): - f = wireproto.future() - yield wireproto.todict(name=mangle(name)), f - yield unmangle(f.value) - -class serverrepo(): - def greet(self, name): - return "Hello, " + name - -def mangle(s): - return ''.join(chr(ord(c) + 1) for c in s) -def unmangle(s): - return ''.join(chr(ord(c) - 1) for c in s) - -def greet(repo, proto, name): - return mangle(repo.greet(unmangle(name))) - -wireproto.commands['greet'] = (greet, 'name',) - -srv = serverrepo() -clt = clientrepo(srv) - -print clt.greet("Foobar") -b = clt.batch() -fs = [b.greet(s) for s in ["Fo, =;o", "Bar"]] -b.submit() -print [f.value for f in fs]