Mercurial > hg
changeset 11400:e5b7841e0008
i18n-zh_CN: split messages into paragraphs
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Sat, 19 Jun 2010 17:19:15 +0200 |
| parents | 0ebc8be6f52a |
| children | 3bc892f740d6 |
| files | i18n/zh_CN.po |
| diffstat | 1 files changed, 3805 insertions(+), 1720 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/zh_CN.po Sat Jun 19 17:19:15 2010 +0200 +++ b/i18n/zh_CN.po Sat Jun 19 17:19:15 2010 +0200 @@ -1,26 +1,25 @@ -# # Chinese (simplified) translation for Mercurial # This file is distributed under the same license as Mercurial -# +# # Copyright (C) 2009 the Mercurial team # Dongsheng Song <dongsheng.song@gmail.com>, 2009 -# +# # Update with pot file: # msgmerge --update zh_CN.po hg.pot # msgfmt --statistics -c zh_CN.po -# +# # Please test your translation before commit: # python setup.py build_py -c -d . build_ext -i build_mo # LC_ALL=zh_CN.UTF-8 ./hg -# +# # Please format your translation before commit: # msgcat --width=80 --sort-by-file -o zh_CN_new.po zh_CN.po # mv -f zh_CN_new.po zh_CN.po -# +# # Please remove '#: filename:line' lines before submit to hg: # msgcat --width=80 --no-location -o zh_CN_new.po zh_CN.po # mv -f zh_CN_new.po zh_CN.po -# +# # Dictionary: # blame 追溯 # branch 分支 @@ -43,7 +42,7 @@ # versioned 受版本控制 # working copy 工作副本 # ... -# +# msgid "" msgstr "" "Project-Id-Version: Mercurial 1.3\n" @@ -55,8 +54,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Chinese\n" "Generated-By: pygettext.py 1.5\n" -"X-Poedit-Language: Chinese\n" "X-Poedit-Country: CHINA\n" #, python-format @@ -69,62 +68,72 @@ msgid "COMMANDS" msgstr "命令" -msgid "" -" options:\n" -"\n" -msgstr "" -" 选项:\n" -"\n" - -#, python-format -msgid "" -" aliases: %s\n" -"\n" -msgstr "" -" 别名: %s\n" -"\n" - -msgid "" -"hooks for controlling repository access\n" -"\n" +msgid " options:" +msgstr " 选项:" + +#, python-format +msgid " aliases: %s" +msgstr " 别名: %s" + +msgid "hooks for controlling repository access" +msgstr "" + +msgid "" "This hook makes it possible to allow or deny write access to portions\n" -"of a repository when receiving incoming changesets.\n" -"\n" +"of a repository when receiving incoming changesets." +msgstr "" + +msgid "" "The authorization is matched based on the local user name on the\n" "system where the hook runs, and not the committer of the original\n" -"changeset (since the latter is merely informative).\n" -"\n" +"changeset (since the latter is merely informative)." +msgstr "" + +msgid "" "The acl hook is best used along with a restricted shell like hgsh,\n" "preventing authenticating users from doing anything other than\n" "pushing or pulling. The hook is not safe to use if users have\n" "interactive shell access, as they can then disable the hook.\n" "Nor is it safe if remote users share an account, because then there\n" -"is no way to distinguish them.\n" -"\n" -"To use this hook, configure the acl extension in your hgrc like this::\n" -"\n" +"is no way to distinguish them." +msgstr "" + +msgid "To use this hook, configure the acl extension in your hgrc like this::" +msgstr "" + +msgid "" " [extensions]\n" -" acl =\n" -"\n" +" acl =" +msgstr "" + +msgid "" " [hooks]\n" -" pretxnchangegroup.acl = python:hgext.acl.hook\n" -"\n" +" pretxnchangegroup.acl = python:hgext.acl.hook" +msgstr "" + +msgid "" " [acl]\n" " # Check whether the source of incoming changes is in this list\n" " # (\"serve\" == ssh or http, \"push\", \"pull\", \"bundle\")\n" -" sources = serve\n" -"\n" +" sources = serve" +msgstr "" + +msgid "" "The allow and deny sections take a subtree pattern as key (with a glob\n" "syntax by default), and a comma separated list of users as the\n" "corresponding value. The deny list is checked before the allow list\n" -"is. ::\n" -"\n" +"is. ::" +msgstr "" + +msgid "" " [acl.allow]\n" " # If acl.allow is not present, all users are allowed by default.\n" " # An empty acl.allow section means no users allowed.\n" " docs/** = doc_writer\n" -" .hgtags = release_engineer\n" -"\n" +" .hgtags = release_engineer" +msgstr "" + +msgid "" " [acl.deny]\n" " # If acl.deny is not present, no users are refused by default.\n" " # An empty acl.deny section means all users allowed.\n" @@ -164,38 +173,47 @@ msgid "acl: allowing changeset %s\n" msgstr "acl: 允许修改集 %s\n" -msgid "" -"track a line of development with movable markers\n" -"\n" +msgid "track a line of development with movable markers" +msgstr "" + +msgid "" "Bookmarks are local movable markers to changesets. Every bookmark\n" "points to a changeset identified by its hash. If you commit a\n" "changeset that is based on a changeset that has a bookmark on it, the\n" -"bookmark shifts to the new changeset.\n" -"\n" +"bookmark shifts to the new changeset." +msgstr "" + +msgid "" "It is possible to use bookmark names in every revision lookup (e.g. hg\n" -"merge, hg update).\n" -"\n" +"merge, hg update)." +msgstr "" + +msgid "" "By default, when several bookmarks point to the same changeset, they\n" "will all move forward together. It is possible to obtain a more\n" "git-like experience by adding the following configuration option to\n" -"your .hgrc::\n" -"\n" +"your .hgrc::" +msgstr "" + +msgid "" " [bookmarks]\n" -" track.current = True\n" -"\n" +" track.current = True" +msgstr "" + +msgid "" "This will cause Mercurial to track the bookmark that you are currently\n" "using, and only update it. This is similar to git's approach to\n" "branching.\n" msgstr "" msgid "" -"track a line of development with movable markers\n" -"\n" " Bookmarks are pointers to certain commits that move when\n" " committing. Bookmarks are local. They can be renamed, copied and\n" " deleted. It is possible to use bookmark names in 'hg merge' and\n" -" 'hg update' to merge and update respectively to a given bookmark.\n" -"\n" +" 'hg update' to merge and update respectively to a given bookmark." +msgstr "" + +msgid "" " You can use 'hg bookmark NAME' to set a bookmark on the working\n" " directory's parent revision with the given name. If you specify\n" " a revision using -r REV (where REV may be an existing bookmark),\n" @@ -236,117 +254,171 @@ msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]" msgstr "" -msgid "" -"hooks for integrating with the Bugzilla bug tracker\n" -"\n" +msgid "hooks for integrating with the Bugzilla bug tracker" +msgstr "" + +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.\n" -"\n" +"bug status." +msgstr "" + +msgid "" "The hook updates the Bugzilla database directly. Only Bugzilla\n" -"installations using MySQL are supported.\n" -"\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.\n" -"\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:\n" -"\n" +"sections. These keys are recognized in the [bugzilla] section:" +msgstr "" + +msgid "" "host\n" -" Hostname of the MySQL server holding the Bugzilla database.\n" -"\n" +" Hostname of the MySQL server holding the Bugzilla database." +msgstr "" + +msgid "" "db\n" -" Name of the Bugzilla database in MySQL. Default 'bugs'.\n" -"\n" +" Name of the Bugzilla database in MySQL. Default 'bugs'." +msgstr "" + +msgid "" "user\n" -" Username to use to access MySQL server. Default 'bugs'.\n" -"\n" +" Username to use to access MySQL server. Default 'bugs'." +msgstr "" + +msgid "" "password\n" -" Password to use to access MySQL server.\n" -"\n" +" Password to use to access MySQL server." +msgstr "" + +msgid "" "timeout\n" -" Database connection timeout (seconds). Default 5.\n" -"\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.\n" -"\n" +" to 2.18." +msgstr "" + +msgid "" "bzuser\n" " Fallback Bugzilla user name to record comments with, if changeset\n" -" committer cannot be found as a Bugzilla user.\n" -"\n" +" committer cannot be found as a Bugzilla user." +msgstr "" + +msgid "" "bzdir\n" " Bugzilla install directory. Used by default notify. Default\n" -" '/var/www/html/bugzilla'.\n" -"\n" +" '/var/www/html/bugzilla'." +msgstr "" + +msgid "" "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\".\n" -"\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.\n" -"\n" +" 1234 and 5678' and variations thereof. Matching is case insensitive." +msgstr "" + +msgid "" "style\n" -" The style file to use when formatting comments.\n" -"\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::\n" -"\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.\n" -"\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}'\n" -"\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.\n" -"\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.\n" -"\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\"\n" -"\n" -"Finally, the [web] section supports one entry:\n" -"\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}.\n" -"\n" -"Activating the extension::\n" -"\n" +" templates as {hgweb}." +msgstr "" + +msgid "Activating the extension::" +msgstr "" + +msgid "" " [extensions]\n" -" bugzilla =\n" -"\n" +" bugzilla =" +msgstr "" + +msgid "" " [hooks]\n" " # run bugzilla hook on every change pulled or pushed in here\n" -" incoming.bugzilla = python:hgext.bugzilla.hook\n" -"\n" -"Example configuration:\n" -"\n" +" 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. ::\n" -"\n" +"installation in /opt/bugzilla-3.2. ::" +msgstr "" + +msgid "" " [bugzilla]\n" " host=localhost\n" " password=XYZZY\n" @@ -356,20 +428,28 @@ " template=Changeset {node|short} in {root|basename}.\n" " {hgweb}/{webroot}/rev/{node|short}\\n\n" " {desc}\\n\n" -" strip=5\n" -"\n" +" strip=5" +msgstr "" + +msgid "" " [web]\n" -" baseurl=http://dev.domain.com/hg\n" -"\n" +" baseurl=http://dev.domain.com/hg" +msgstr "" + +msgid "" " [usermap]\n" -" user@emaildomain.com=user.name@bugzilladomain.com\n" -"\n" -"Commits add a comment to the Bugzilla bug record of the form::\n" -"\n" +" user@emaildomain.com=user.name@bugzilladomain.com" +msgstr "" + +msgid "Commits 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\n" -"\n" -" Changeset commit comment. Bug 1234.\n" +" http://dev.domain.com/hg/repository-name/rev/3b16791d6642" +msgstr "" + +msgid " Changeset commit comment. Bug 1234.\n" msgstr "" #, python-format @@ -447,9 +527,11 @@ msgstr "列出子修改集的命令" #, fuzzy -msgid "" -"show the children of the given or working directory revision\n" -"\n" +msgid "show the children of the given or working directory revision" +msgstr "显示工作目录或指定版本的父亲" + +#, fuzzy +msgid "" " Print the children of the working directory's revisions. If a\n" " revision is given via -r/--rev, the children of that revision will\n" " be printed. If a file argument is given, revision in which the\n" @@ -457,8 +539,6 @@ " argument to --rev if given) is printed.\n" " " msgstr "" -"显示工作目录或指定版本的父亲\n" -"\n" " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本，就显示此版本的\n" " 父亲。如果指定了文件，那么使用此文件最后修改的版本(工作目录的起源\n" " 版本，或 '--rev' 指定的版本)。\n" @@ -481,38 +561,55 @@ msgid "generating stats: %d%%" msgstr "" -msgid "" -"histogram of changes to the repository\n" -"\n" +msgid "histogram of changes to the repository" +msgstr "" + +msgid "" " This command will display a histogram representing the number\n" " of changed lines or revisions, grouped according to the given\n" " template. The default template will group changes by author.\n" " The --dateformat option may be used to group the results by\n" -" date instead.\n" -"\n" +" date instead." +msgstr "" + +msgid "" " Statistics are based on the number of changed lines, or\n" " alternatively the number of matching revisions if the\n" -" --changesets option is specified.\n" -"\n" -" Examples::\n" -"\n" +" --changesets option is specified." +msgstr "" + +msgid " Examples::" +msgstr "" + +msgid "" " # display count of changed lines for every committer\n" -" hg churn -t '{author|email}'\n" -"\n" +" hg churn -t '{author|email}'" +msgstr "" + +msgid "" " # display daily activity graph\n" -" hg churn -f '%H' -s -c\n" -"\n" +" hg churn -f '%H' -s -c" +msgstr "" + +msgid "" " # display activity of developers by month\n" -" hg churn -f '%Y-%m' -s -c\n" -"\n" +" hg churn -f '%Y-%m' -s -c" +msgstr "" + +msgid "" " # display count of lines changed in every year\n" -" hg churn -f '%Y' -s\n" -"\n" +" hg churn -f '%Y' -s" +msgstr "" + +msgid "" " It is possible to map alternate email addresses to a main address\n" -" by providing a file using the following format::\n" -"\n" -" <alias email> <actual email>\n" -"\n" +" by providing a file using the following format::" +msgstr "" + +msgid " <alias email> <actual email>" +msgstr "" + +msgid "" " Such a file may be specified with the --aliases option, otherwise\n" " a .hgchurn file will be looked for in the working directory root.\n" " " @@ -550,38 +647,50 @@ msgid "hg churn [-d DATE] [-r REV] [--aliases FILE] [--progress] [FILE]" msgstr "" -msgid "" -"colorize output from some commands\n" -"\n" +msgid "colorize output from some commands" +msgstr "" + +msgid "" "This extension modifies the status command to add color to its output\n" "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.\n" -"\n" +"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.\n" -"\n" -"Default effects may be overridden from the .hgrc file::\n" -"\n" +"render_text function, which can be used to add effects to any text." +msgstr "" + +msgid "Default effects may be overridden from the .hgrc file::" +msgstr "" + +msgid "" " [color]\n" " status.modified = blue bold underline red_background\n" " status.added = green bold\n" " status.removed = red bold blue_background\n" " status.deleted = cyan bold underline\n" " status.unknown = magenta bold underline\n" -" status.ignored = black bold\n" -"\n" +" status.ignored = black bold" +msgstr "" + +msgid "" " # 'none' turns off all effects\n" " status.clean = none\n" -" status.copied = none\n" -"\n" +" status.copied = none" +msgstr "" + +msgid "" " qseries.applied = blue bold underline\n" " qseries.unapplied = black bold\n" -" qseries.missing = red bold\n" -"\n" +" qseries.missing = red bold" +msgstr "" + +msgid "" " diff.diffline = bold\n" " diff.extended = cyan bold\n" " diff.file_a = red bold\n" @@ -606,11 +715,13 @@ msgid "import revisions from foreign VCS repositories into Mercurial" msgstr "" -msgid "" -"convert a foreign SCM repository to a Mercurial one.\n" -"\n" -" Accepted source formats [identifiers]:\n" -"\n" +msgid "convert a foreign SCM repository to a Mercurial one." +msgstr "" + +msgid " Accepted source formats [identifiers]:" +msgstr "" + +msgid "" " - Mercurial [hg]\n" " - CVS [cvs]\n" " - Darcs [darcs]\n" @@ -619,72 +730,103 @@ " - Monotone [mtn]\n" " - GNU Arch [gnuarch]\n" " - Bazaar [bzr]\n" -" - Perforce [p4]\n" -"\n" -" Accepted destination formats [identifiers]:\n" -"\n" +" - Perforce [p4]" +msgstr "" + +msgid " Accepted destination formats [identifiers]:" +msgstr "" + +msgid "" " - Mercurial [hg]\n" -" - Subversion [svn] (history on branches is not preserved)\n" -"\n" +" - Subversion [svn] (history on branches is not preserved)" +msgstr "" + +msgid "" " If no revision is given, all revisions will be converted.\n" " Otherwise, convert will only import up to the named revision\n" -" (given in a format understood by the source).\n" -"\n" +" (given in a format understood by the source)." +msgstr "" + +msgid "" " If no destination directory name is specified, it defaults to the\n" " basename of the source with '-hg' appended. If the destination\n" -" repository doesn't exist, it will be created.\n" -"\n" +" repository doesn't exist, it will be created." +msgstr "" + +msgid "" " By default, all sources except Mercurial will use --branchsort.\n" " Mercurial uses --sourcesort to preserve original revision numbers\n" -" order. Sort modes have the following effects:\n" -"\n" +" order. Sort modes have the following effects:" +msgstr "" + +msgid "" " --branchsort convert from parent to child revision when possible,\n" " which means branches are usually converted one after\n" -" the other. It generates more compact repositories.\n" -"\n" +" the other. It generates more compact repositories." +msgstr "" + +msgid "" " --datesort sort revisions by date. Converted repositories have\n" " good-looking changelogs but are often an order of\n" " magnitude larger than the same ones generated by\n" -" --branchsort.\n" -"\n" +" --branchsort." +msgstr "" + +msgid "" " --sourcesort try to preserve source revisions order, only\n" -" supported by Mercurial sources.\n" -"\n" +" supported by Mercurial sources." +msgstr "" + +msgid "" " If <REVMAP> isn't given, it will be put in a default location\n" " (<dest>/.hg/shamap by default). The <REVMAP> is a simple text file\n" " that maps each source commit ID to the destination ID for that\n" -" revision, like so::\n" -"\n" -" <source ID> <destination ID>\n" -"\n" +" revision, like so::" +msgstr "" + +msgid " <source ID> <destination ID>" +msgstr "" + +msgid "" " If the file doesn't exist, it's automatically created. It's\n" " updated on each commit copied, so convert-repo can be interrupted\n" -" and can be run repeatedly to copy new commits.\n" -"\n" +" and can be run repeatedly to copy new commits." +msgstr "" + +msgid "" " The [username mapping] file is a simple text file that maps each\n" " source commit author to a destination commit author. It is handy\n" " for source SCMs that use unix logins to identify authors (eg:\n" " CVS). One line per author mapping and the line format is:\n" -" srcauthor=whatever string you want\n" -"\n" +" srcauthor=whatever string you want" +msgstr "" + +msgid "" " The filemap is a file that allows filtering and remapping of files\n" " and directories. Comment lines start with '#'. Each line can\n" -" contain one of the following directives::\n" -"\n" -" include path/to/file\n" -"\n" -" exclude path/to/file\n" -"\n" -" rename from/file to/file\n" -"\n" +" contain one of the following directives::" +msgstr "" + +msgid " include path/to/file" +msgstr "" + +msgid " exclude path/to/file" +msgstr "" + +msgid " rename from/file to/file" +msgstr "" + +msgid "" " The 'include' directive causes a file, or all files under a\n" " directory, to be included in the destination repository, and the\n" " exclusion of all other files and directories not explicitly\n" " included. The 'exclude' directive causes files or directories to\n" " be omitted. The 'rename' directive renames a file or directory. To\n" " rename from a subdirectory into the root of the repository, use\n" -" '.' as the path to rename to.\n" -"\n" +" '.' as the path to rename to." +msgstr "" + +msgid "" " The splicemap is a file that allows insertion of synthetic\n" " history, letting you specify the parents of a revision. This is\n" " useful if you want to e.g. give a Subversion merge two parents, or\n" @@ -694,8 +836,10 @@ " revision control system whose parents should be modified (same\n" " format as a key in .hg/shamap). The values are the revision IDs\n" " (in either the source or destination revision control system) that\n" -" should be used as the new parents for that node.\n" -"\n" +" should be used as the new parents for that node." +msgstr "" + +msgid "" " The branchmap is a file that allows you to rename a branch when it is\n" " being brought in from whatever external repository. When used in\n" " conjunction with a splicemap, it allows for a powerful combination\n" @@ -705,11 +849,15 @@ " \"original_branch_name\" is the name of the branch in the source\n" " repository, and \"new_branch_name\" is the name of the branch is the\n" " destination repository. This can be used to (for instance) move code\n" -" in one repository from \"default\" to a named branch.\n" -"\n" +" in one repository from \"default\" to a named branch." +msgstr "" + +msgid "" " Mercurial Source\n" -" ----------------\n" -"\n" +" ----------------" +msgstr "" + +msgid "" " --config convert.hg.ignoreerrors=False (boolean)\n" " ignore integrity errors when reading. Use it to fix Mercurial\n" " repositories with missing revlogs, by converting from and to\n" @@ -718,11 +866,15 @@ " store original revision ID in changeset (forces target IDs to\n" " change)\n" " --config convert.hg.startrev=0 (hg revision identifier)\n" -" convert start revision and its descendants\n" -"\n" +" convert start revision and its descendants" +msgstr "" + +msgid "" " CVS Source\n" -" ----------\n" -"\n" +" ----------" +msgstr "" + +msgid "" " CVS source will use a sandbox (i.e. a checked-out copy) from CVS\n" " to indicate the starting point of what will be converted. Direct\n" " access to the repository files is not needed, unless of course the\n" @@ -731,25 +883,35 @@ " commands to find files to convert. This means that unless a\n" " filemap is given, all files under the starting directory will be\n" " converted, and that any directory reorganization in the CVS\n" -" sandbox is ignored.\n" -"\n" +" sandbox is ignored." +msgstr "" + +msgid "" " Because CVS does not have changesets, it is necessary to collect\n" " individual commits to CVS and merge them into changesets. CVS\n" " source uses its internal changeset merging code by default but can\n" -" be configured to call the external 'cvsps' program by setting::\n" -"\n" -" --config convert.cvsps='cvsps -A -u --cvs-direct -q'\n" -"\n" -" This option is deprecated and will be removed in Mercurial 1.4.\n" -"\n" -" The options shown are the defaults.\n" -"\n" -" Internal cvsps is selected by setting ::\n" -"\n" -" --config convert.cvsps=builtin\n" -"\n" -" and has a few more configurable options:\n" -"\n" +" be configured to call the external 'cvsps' program by setting::" +msgstr "" + +msgid " --config convert.cvsps='cvsps -A -u --cvs-direct -q'" +msgstr "" + +msgid " This option is deprecated and will be removed in Mercurial 1.4." +msgstr "" + +msgid " The options shown are the defaults." +msgstr "" + +msgid " Internal cvsps is selected by setting ::" +msgstr "" + +msgid " --config convert.cvsps=builtin" +msgstr "" + +msgid " and has a few more configurable options:" +msgstr "" + +msgid "" " --config convert.cvsps.cache=True (boolean)\n" " Set to False to disable remote log caching, for testing and\n" " debugging purposes.\n" @@ -767,15 +929,21 @@ " Specify a regular expression to which commit log messages are\n" " matched. If a match occurs, then the conversion process will\n" " add the most recent revision on the branch indicated in the\n" -" regex as the second parent of the changeset.\n" -"\n" +" regex as the second parent of the changeset." +msgstr "" + +msgid "" " The hgext/convert/cvsps wrapper script allows the builtin\n" " changeset merging code to be run without doing a conversion. Its\n" -" parameters and output are similar to that of cvsps 2.1.\n" -"\n" +" parameters and output are similar to that of cvsps 2.1." +msgstr "" + +msgid "" " Subversion Source\n" -" -----------------\n" -"\n" +" -----------------" +msgstr "" + +msgid "" " Subversion source detects classical trunk/branches/tags layouts.\n" " By default, the supplied \"svn://repo/path/\" source URL is\n" " converted as a single branch. If \"svn://repo/path/trunk\" exists it\n" @@ -785,58 +953,80 @@ " converted branches. Default \"trunk\", \"branches\" and \"tags\" values\n" " can be overridden with following options. Set them to paths\n" " relative to the source URL, or leave them blank to disable auto\n" -" detection.\n" -"\n" +" detection." +msgstr "" + +msgid "" " --config convert.svn.branches=branches (directory name)\n" " specify the directory containing branches\n" " --config convert.svn.tags=tags (directory name)\n" " specify the directory containing tags\n" " --config convert.svn.trunk=trunk (directory name)\n" -" specify the name of the trunk branch\n" -"\n" +" specify the name of the trunk branch" +msgstr "" + +msgid "" " Source history can be retrieved starting at a specific revision,\n" " instead of being integrally converted. Only single branch\n" -" conversions are supported.\n" -"\n" +" conversions are supported." +msgstr "" + +msgid "" " --config convert.svn.startrev=0 (svn revision number)\n" -" specify start Subversion revision.\n" -"\n" +" specify start Subversion revision." +msgstr "" + +msgid "" " Perforce Source\n" -" ---------------\n" -"\n" +" ---------------" +msgstr "" + +msgid "" " The Perforce (P4) importer can be given a p4 depot path or a\n" " client specification as source. It will convert all files in the\n" " source to a flat Mercurial repository, ignoring labels, branches\n" " and integrations. Note that when a depot path is given you then\n" " usually should specify a target directory, because otherwise the\n" -" target may be named ...-hg.\n" -"\n" +" target may be named ...-hg." +msgstr "" + +msgid "" " It is possible to limit the amount of source history to be\n" -" converted by specifying an initial Perforce revision.\n" -"\n" +" converted by specifying an initial Perforce revision." +msgstr "" + +msgid "" " --config convert.p4.startrev=0 (perforce changelist number)\n" -" specify initial Perforce revision.\n" -"\n" +" specify initial Perforce revision." +msgstr "" + +msgid "" " Mercurial Destination\n" -" ---------------------\n" -"\n" +" ---------------------" +msgstr "" + +msgid "" " --config convert.hg.clonebranches=False (boolean)\n" " dispatch source branches in separate clones.\n" " --config convert.hg.tagsbranch=default (branch name)\n" " tag revisions branch name\n" " --config convert.hg.usebranchnames=True (boolean)\n" -" preserve branch names\n" -"\n" -" " -msgstr "" - -msgid "" -"create changeset information from CVS\n" -"\n" +" preserve branch names" +msgstr "" + +msgid " " +msgstr "" + +msgid "create changeset information from CVS" +msgstr "" + +msgid "" " This command is intended as a debugging tool for the CVS to\n" " Mercurial converter, and can be used as a direct replacement for\n" -" cvsps.\n" -"\n" +" cvsps." +msgstr "" + +msgid "" " Hg debugcvsps reads the CVS rlog for current directory (or any\n" " named directory) in the CVS repository, and converts the log to a\n" " series of changesets based on matching commit log entries and\n" @@ -909,9 +1099,7 @@ msgid "hg debugcvsps [OPTION]... [PATH]..." msgstr "" -msgid "" -"warning: lightweight checkouts may cause conversion failures, try with a " -"regular branch instead.\n" +msgid "warning: lightweight checkouts may cause conversion failures, try with a regular branch instead.\n" msgstr "" msgid "bzr source type could not be determined\n" @@ -1015,9 +1203,7 @@ msgid "--sourcesort is not supported by this data source" msgstr "" -msgid "" -"warning: support for external cvsps is deprecated and will be removed in " -"Mercurial 1.4\n" +msgid "warning: support for external cvsps is deprecated and will be removed in Mercurial 1.4\n" msgstr "" #, python-format @@ -1035,8 +1221,7 @@ msgstr "" #, python-format -msgid "" -"unexpected response from CVS server (expected \"Valid-requests\", but got %r)" +msgid "unexpected response from CVS server (expected \"Valid-requests\", but got %r)" msgstr "" #, python-format @@ -1154,8 +1339,7 @@ msgstr "" #, python-format -msgid "" -"tree analysis stopped because it points to an unregistered archive %s...\n" +msgid "tree analysis stopped because it points to an unregistered archive %s...\n" msgstr "" #, python-format @@ -1359,37 +1543,50 @@ msgid "XXX TAGS NOT IMPLEMENTED YET\n" msgstr "" -msgid "" -"command to allow external programs to compare revisions\n" -"\n" +msgid "command to allow external programs to compare revisions" +msgstr "" + +msgid "" "The extdiff Mercurial extension allows you to use external programs\n" "to compare revisions, or revision with working directory. The external\n" "diff programs are called with a configurable set of options and two\n" "non-option arguments: paths to directories containing snapshots of\n" -"files to compare.\n" -"\n" +"files to compare." +msgstr "" + +msgid "" "The extdiff extension also allows to configure new diff commands, so\n" -"you do not need to type \"hg extdiff -p kdiff3\" always. ::\n" -"\n" +"you do not need to type \"hg extdiff -p kdiff3\" always. ::" +msgstr "" + +msgid "" " [extdiff]\n" " # add new command that runs GNU diff(1) in 'context diff' mode\n" " cdiff = gdiff -Nprc5\n" " ## or the old way:\n" " #cmd.cdiff = gdiff\n" -" #opts.cdiff = -Nprc5\n" -"\n" +" #opts.cdiff = -Nprc5" +msgstr "" + +msgid "" " # add new command called vdiff, runs kdiff3\n" -" vdiff = kdiff3\n" -"\n" +" vdiff = kdiff3" +msgstr "" + +msgid "" " # add new command called meld, runs meld (no need to name twice)\n" -" meld =\n" -"\n" +" meld =" +msgstr "" + +msgid "" " # add new command called vimdiff, runs gvimdiff with DirDiff plugin\n" " # (see http://www.vim.org/scripts/script.php?script_id=102) Non\n" " # English user, be sure to put \"let g:DirDiffDynamicDiffText = 1\" in\n" " # your .vimrc\n" -" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'\n" -"\n" +" vimdiff = gvim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)'" +msgstr "" + +msgid "" "You can use -I/-X and list of file or directory names like normal \"hg\n" "diff\" command. The extdiff extension makes snapshots of only needed\n" "files, so running the external diff program will actually be pretty\n" @@ -1418,18 +1615,23 @@ msgid "cleaning up temp directory\n" msgstr "" -msgid "" -"use external program to diff repository (or selected files)\n" -"\n" +msgid "use external program to diff repository (or selected files)" +msgstr "" + +msgid "" " Show differences between revisions for the specified files, using\n" " an external program. The default program used is diff, with\n" -" default options \"-Npru\".\n" -"\n" +" default options \"-Npru\"." +msgstr "" + +msgid "" " To select a different program, use the -p/--program option. The\n" " program will be passed the names of two directories to compare. To\n" " pass additional options to the program, use -o/--option. These\n" -" will be passed before the names of the directories to compare.\n" -"\n" +" will be passed before the names of the directories to compare." +msgstr "" + +msgid "" " When two revision arguments are given, then changes are shown\n" " between those revisions. If only one revision is specified then\n" " that revision is compared to the working directory, and, when no\n" @@ -1450,12 +1652,17 @@ msgstr "" #, python-format -msgid "" -"use %(path)s to diff repository (or selected files)\n" -"\n" +msgid "use %(path)s to diff repository (or selected files)" +msgstr "" + +#, python-format +msgid "" " Show differences between revisions for the specified files, using the\n" -" %(path)s program.\n" -"\n" +" %(path)s program." +msgstr "" + +#, python-format +msgid "" " When two revision arguments are given, then changes are shown between\n" " those revisions. If only one revision is specified then that revision is\n" " compared to the working directory, and, when no revisions are specified,\n" @@ -1469,28 +1676,34 @@ msgid "pull, update and merge in one command" msgstr "" -msgid "" -"pull changes from a remote repository, merge new changes if needed.\n" -"\n" +msgid "pull changes from a remote repository, merge new changes if needed." +msgstr "" + +msgid "" " This finds all changes from the repository at the specified path\n" -" or URL and adds them to the local repository.\n" -"\n" +" or URL and adds them to the local repository." +msgstr "" + +msgid "" " If the pulled changes add a new branch head, the head is\n" " automatically merged, and the result of the merge is committed.\n" " Otherwise, the working directory is updated to include the new\n" -" changes.\n" -"\n" +" changes." +msgstr "" + +msgid "" " When a merge occurs, the newly pulled changes are assumed to be\n" " \"authoritative\". The head of the new changes is used as the first\n" " parent, with local changes as the second. To switch the merge\n" -" order, use --switch-parent.\n" -"\n" +" order, use --switch-parent." +msgstr "" + +msgid "" " See 'hg help dates' for a list of formats valid for -d/--date.\n" " " msgstr "" -msgid "" -"working dir not at branch tip (use \"hg update\" to check out branch tip)" +msgid "working dir not at branch tip (use \"hg update\" to check out branch tip)" msgstr "" msgid "outstanding uncommitted merge" @@ -1502,23 +1715,18 @@ msgid "working directory is missing some files" msgstr "" -msgid "" -"multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" +msgid "multiple heads in this branch (use \"hg heads .\" and \"hg merge\" to merge)" msgstr "" #, python-format msgid "pulling from %s\n" msgstr "正在拉自 %s\n" -msgid "" -"Other repository doesn't support revision lookup, so a rev cannot be " -"specified." -msgstr "" - -#, python-format -msgid "" -"not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge" -"\" to merge them)\n" +msgid "Other repository doesn't support revision lookup, so a rev cannot be specified." +msgstr "" + +#, python-format +msgid "not merging with %d other new branch heads (use \"hg heads .\" and \"hg merge\" to merge them)\n" msgstr "" #, python-format @@ -1580,14 +1788,12 @@ msgid "No valid signature for %s\n" msgstr "" -msgid "" -"add a signature for the current or given revision\n" -"\n" +msgid "add a signature for the current or given revision" +msgstr "" + +msgid "" " If no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" or tip if no revision is checked out." msgstr "" msgid "uncommitted merge - please provide a specific revision" @@ -1596,9 +1802,7 @@ msgid "Error while signing" msgstr "" -msgid "" -"working copy of .hgsigs is changed (please commit .hgsigs manually or use --" -"force)" +msgid "working copy of .hgsigs is changed (please commit .hgsigs manually or use --force)" msgstr "" msgid "unknown signature version" @@ -1628,9 +1832,10 @@ msgid "hg sigs" msgstr "" -msgid "" -"command to view revision graphs from a shell\n" -"\n" +msgid "command to view revision graphs from a shell" +msgstr "" + +msgid "" "This extension adds a --graph option to the incoming, outgoing and log\n" "commands. When this options is given, an ASCII representation of the\n" "revision graph is also shown.\n" @@ -1640,12 +1845,15 @@ msgid "--graph option is incompatible with --%s" msgstr "" -msgid "" -"show revision history alongside an ASCII revision graph\n" -"\n" +msgid "show revision history alongside an ASCII revision graph" +msgstr "" + +msgid "" " Print a revision history alongside a revision graph drawn with\n" -" ASCII characters.\n" -"\n" +" ASCII characters." +msgstr "" + +msgid "" " Nodes printed as an @ character are parents of the working\n" " directory.\n" " " @@ -1673,12 +1881,15 @@ msgid "hg glog [OPTION]... [FILE]" msgstr "" -msgid "" -"hooks for integrating with the CIA.vc notification service\n" -"\n" +msgid "hooks for integrating with the CIA.vc notification service" +msgstr "" + +msgid "" "This is meant to be run as a changegroup or incoming hook. To\n" -"configure it, set the following options in your hgrc::\n" -"\n" +"configure it, set the following options in your hgrc::" +msgstr "" + +msgid "" " [cia]\n" " # your registered CIA user name\n" " user = foo\n" @@ -1698,13 +1909,17 @@ " # 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\n" -"\n" +" #test = False" +msgstr "" + +msgid "" " [hooks]\n" " # one of these:\n" " changegroup.cia = python:hgcia.hook\n" -" #incoming.cia = python:hgcia.hook\n" -"\n" +" #incoming.cia = python:hgcia.hook" +msgstr "" + +msgid "" " [web]\n" " # If you want hyperlinks (optional)\n" " baseurl = http://server/path/to/repo\n" @@ -1723,32 +1938,45 @@ msgid "cia: no project specified" msgstr "" -msgid "" -"browse the repository in a graphical way\n" -"\n" +msgid "browse the repository in a graphical way" +msgstr "" + +msgid "" "The hgk extension allows browsing the history of a repository in a\n" "graphical way. It requires Tcl/Tk version 8.4 or later. (Tcl/Tk is not\n" -"distributed with Mercurial.)\n" -"\n" +"distributed with Mercurial.)" +msgstr "" + +msgid "" "hgk consists of two parts: a Tcl script that does the displaying and\n" "querying of information, and an extension to Mercurial named hgk.py,\n" "which provides hooks for hgk to get information. hgk can be found in\n" "the contrib directory, and the extension is shipped in the hgext\n" -"repository, and needs to be enabled.\n" -"\n" +"repository, and needs to be enabled." +msgstr "" + +msgid "" "The hg view command will launch the hgk Tcl script. For this command\n" "to work, hgk must be in your search path. Alternately, you can specify\n" -"the path to hgk in your .hgrc file::\n" -"\n" +"the path to hgk in your .hgrc file::" +msgstr "" + +msgid "" " [hgk]\n" -" path=/location/of/hgk\n" -"\n" +" path=/location/of/hgk" +msgstr "" + +msgid "" "hgk can make use of the extdiff extension to visualize revisions.\n" -"Assuming you had already configured extdiff vdiff command, just add::\n" -"\n" +"Assuming you had already configured extdiff vdiff command, just add::" +msgstr "" + +msgid "" " [hgk]\n" -" vdiff=vdiff\n" -"\n" +" vdiff=vdiff" +msgstr "" + +msgid "" "Revisions context menu will now display additional entries to fire\n" "vdiff on hovered and selected revisions.\n" msgstr "" @@ -1834,18 +2062,23 @@ msgid "hg debug-rev-list [OPTION]... REV..." msgstr "" -msgid "" -"syntax highlighting for hgweb (requires Pygments)\n" -"\n" +msgid "syntax highlighting for hgweb (requires Pygments)" +msgstr "" + +msgid "" "It depends on the Pygments syntax highlighting library:\n" -"http://pygments.org/\n" -"\n" -"There is a single configuration option::\n" -"\n" +"http://pygments.org/" +msgstr "" + +msgid "There is a single configuration option::" +msgstr "" + +msgid "" " [web]\n" -" pygments_style = <style>\n" -"\n" -"The default is 'colorful'.\n" +" pygments_style = <style>" +msgstr "" + +msgid "The default is 'colorful'.\n" msgstr "" msgid "accelerate status report using Linux's inotify service" @@ -1854,9 +2087,10 @@ msgid "start an inotify server for this repository" msgstr "为此版本库启动服务 'inotify'" -msgid "" -"debugging information for inotify extension\n" -"\n" +msgid "debugging information for inotify extension" +msgstr "" + +msgid "" " Prints the list of directories being watched by the inotify server.\n" " " msgstr "" @@ -2018,20 +2252,24 @@ msgid "finished setup\n" msgstr "" -msgid "" -"expand expressions into changelog and summaries\n" -"\n" +msgid "expand expressions into changelog and summaries" +msgstr "" + +msgid "" "This extension allows the use of a special syntax in summaries, which\n" "will be automatically expanded into links or any other arbitrary\n" -"expression, much like InterWiki does.\n" -"\n" +"expression, much like InterWiki does." +msgstr "" + +msgid "" "A few example patterns (link to bug tracking, etc.) that may be used\n" -"in your hgrc::\n" -"\n" +"in your hgrc::" +msgstr "" + +msgid "" " [interhg]\n" " issues = s!issue(\\d+)!<a href=\"http://bts/issue\\1\">issue\\1</a>!\n" -" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!" -"i\n" +" bugzilla = s!((?:bug|b=|(?=#?\\d{4,}))(?:\\s*#?)(\\d+))!<a..=\\2\">\\1</a>!i\n" " boldify = s!(^|\\s)#(\\d+)\\b! <b>#\\2</b>!\n" msgstr "" @@ -2043,52 +2281,76 @@ msgid "interhg: invalid regexp for %s: %s\n" msgstr "" -msgid "" -"expand keywords in tracked files\n" -"\n" +msgid "expand keywords in tracked files" +msgstr "" + +msgid "" "This extension expands RCS/CVS-like or self-customized $Keywords$ in\n" -"tracked text files selected by your configuration.\n" -"\n" +"tracked text files selected by your configuration." +msgstr "" + +msgid "" "Keywords are only expanded in local repositories and not stored in the\n" "change history. The mechanism can be regarded as a convenience for the\n" -"current user or for archive distribution.\n" -"\n" +"current user or for archive distribution." +msgstr "" + +msgid "" "Configuration is done in the [keyword] and [keywordmaps] sections of\n" -"hgrc files.\n" -"\n" -"Example::\n" -"\n" +"hgrc files." +msgstr "" + +msgid "Example::" +msgstr "" + +msgid "" " [keyword]\n" " # expand keywords in every python file except those matching \"x*\"\n" " **.py =\n" -" x* = ignore\n" -"\n" +" x* = ignore" +msgstr "" + +msgid "" "NOTE: the more specific you are in your filename patterns the less you\n" -"lose speed in huge repositories.\n" -"\n" +"lose speed in huge repositories." +msgstr "" + +msgid "" "For [keywordmaps] template mapping and expansion demonstration and\n" "control run \"hg kwdemo\". See \"hg help templates\" for a list of\n" -"available templates and filters.\n" -"\n" +"available templates and filters." +msgstr "" + +msgid "" "An additional date template filter {date|utcdate} is provided. It\n" -"returns a date like \"2006/09/18 15:13:13\".\n" -"\n" +"returns a date like \"2006/09/18 15:13:13\"." +msgstr "" + +msgid "" "The default template mappings (view with \"hg kwdemo -d\") can be\n" "replaced with customized keywords and templates. Again, run \"hg\n" -"kwdemo\" to control the results of your config changes.\n" -"\n" +"kwdemo\" to control the results of your config changes." +msgstr "" + +msgid "" "Before changing/disabling active keywords, run \"hg kwshrink\" to avoid\n" "the risk of inadvertently storing expanded keywords in the change\n" -"history.\n" -"\n" +"history." +msgstr "" + +msgid "" "To force expansion after enabling it, or a configuration change, run\n" -"\"hg kwexpand\".\n" -"\n" +"\"hg kwexpand\"." +msgstr "" + +msgid "" "Also, when committing with the record extension or using mq's qrecord,\n" "be aware that keywords cannot be updated. Again, run \"hg kwexpand\" on\n" "the files in question to update keyword expansions after all changes\n" -"have been checked in.\n" -"\n" +"have been checked in." +msgstr "" + +msgid "" "Expansions spanning more than one line and incremental expansions,\n" "like CVS' $Log$, are not supported. A keyword template map \"Log =\n" "{desc}\" expands to the first line of the changeset description.\n" @@ -2108,17 +2370,23 @@ msgid "no [keyword] patterns configured" msgstr "" -msgid "" -"print [keywordmaps] configuration and an expansion example\n" -"\n" +msgid "print [keywordmaps] configuration and an expansion example" +msgstr "" + +msgid "" " Show current, custom, or default keyword template maps and their\n" -" expansions.\n" -"\n" +" expansions." +msgstr "" + +msgid "" " Extend the current configuration by specifying maps as arguments\n" -" and using -f/--rcfile to source an external hgrc file.\n" -"\n" -" Use -d/--default to disable current configuration.\n" -"\n" +" and using -f/--rcfile to source an external hgrc file." +msgstr "" + +msgid " Use -d/--default to disable current configuration." +msgstr "" + +msgid "" " See \"hg help templates\" for information on templates and filters.\n" " " msgstr "" @@ -2173,33 +2441,45 @@ "\n" "正在删除临时版本库 %s\n" -msgid "" -"expand keywords in the working directory\n" -"\n" -" Run after (re)enabling keyword expansion.\n" -"\n" +msgid "expand keywords in the working directory" +msgstr "" + +msgid " Run after (re)enabling keyword expansion." +msgstr "" + +msgid "" " kwexpand refuses to run if given files contain local changes.\n" " " msgstr "" -msgid "" -"show files configured for keyword expansion\n" -"\n" +msgid "show files configured for keyword expansion" +msgstr "" + +msgid "" " List which files in the working directory are matched by the\n" -" [keyword] configuration patterns.\n" -"\n" +" [keyword] configuration patterns." +msgstr "" + +msgid "" " Useful to prevent inadvertent keyword expansion and to speed up\n" " execution by including only files that are actual candidates for\n" -" expansion.\n" -"\n" +" expansion." +msgstr "" + +msgid "" " See \"hg help keyword\" on how to construct patterns both for\n" -" inclusion and exclusion of files.\n" -"\n" -" Use -u/--untracked to list untracked files as well.\n" -"\n" +" inclusion and exclusion of files." +msgstr "" + +msgid " Use -u/--untracked to list untracked files as well." +msgstr "" + +msgid "" " With -a/--all and -v/--verbose the codes used to show the status\n" -" of files are::\n" -"\n" +" of files are::" +msgstr "" + +msgid "" " K = keyword expansion candidate\n" " k = keyword expansion candidate (untracked)\n" " I = ignored\n" @@ -2207,12 +2487,15 @@ " " msgstr "" -msgid "" -"revert expanded keywords in the working directory\n" -"\n" +msgid "revert expanded keywords in the working directory" +msgstr "" + +msgid "" " Run before changing/disabling active keywords or if you experience\n" -" problems with \"hg import\" or \"hg merge\".\n" -"\n" +" problems with \"hg import\" or \"hg merge\"." +msgstr "" + +msgid "" " kwshrink refuses to run if given files contain local changes.\n" " " msgstr "" @@ -2244,25 +2527,35 @@ msgid "hg kwshrink [OPTION]... [FILE]..." msgstr "" -msgid "" -"manage a stack of patches\n" -"\n" +msgid "manage a stack of patches" +msgstr "" + +msgid "" "This extension lets you work with a stack of patches in a Mercurial\n" "repository. It manages two stacks of patches - all known patches, and\n" -"applied patches (subset of known patches).\n" -"\n" +"applied patches (subset of known patches)." +msgstr "" + +msgid "" "Known patches are represented as patch files in the .hg/patches\n" -"directory. Applied patches are both patch files and changesets.\n" -"\n" -"Common tasks (use \"hg help command\" for more details)::\n" -"\n" +"directory. Applied patches are both patch files and changesets." +msgstr "" + +msgid "Common tasks (use \"hg help command\" for more details)::" +msgstr "" + +msgid "" " prepare repository to work with patches qinit\n" " create new patch qnew\n" -" import existing patch qimport\n" -"\n" +" import existing patch qimport" +msgstr "" + +msgid "" " print patch series qseries\n" -" print applied patches qapplied\n" -"\n" +" print applied patches qapplied" +msgstr "" + +msgid "" " add known patch to applied stack qpush\n" " remove patch from applied stack qpop\n" " refresh contents of top applied patch qrefresh\n" @@ -2508,8 +2801,7 @@ msgid "cannot refresh a revision with children" msgstr "" -msgid "" -"refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" +msgid "refresh interrupted while patch was popped! (revert --all, qpush to recover)\n" msgstr "" msgid "patch queue directory already exists" @@ -2603,13 +2895,15 @@ msgid "adding %s to series file\n" msgstr "" -msgid "" -"remove patches from queue\n" -"\n" -" The patches must not be applied, and at least one patch is required. " -"With\n" -" -k/--keep, the patch files are preserved in the patch directory.\n" -"\n" +msgid "remove patches from queue" +msgstr "" + +msgid "" +" The patches must not be applied, and at least one patch is required. With\n" +" -k/--keep, the patch files are preserved in the patch directory." +msgstr "" + +msgid "" " To stop managing a patch and move it into permanent history,\n" " use the qfinish command." msgstr "" @@ -2627,29 +2921,142 @@ msgstr "" #, fuzzy -msgid "" -"import a patch\n" -"\n" +msgid "import a patch" +msgstr "" +"导入补丁\n" +"\n" +" 此补丁插入到最近一次应用的补丁序列中。\n" +" 如果尚无应用补丁，qimport 会插入补丁到序列开始。\n" +"\n" +" 除非你使用 '--name' 给出补丁名称，否则就与源文件同名。\n" +"\n" +" 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n" +"\n" +" 使用 '--force' 会覆盖已有的补丁。\n" +"\n" +" 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n" +" 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n" +" 时，'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题，以了解\n" +" 为什么这对于保留改名/复制信息和权限修改很重要。\n" +" " + +#, fuzzy +msgid "" " The patch is inserted into the series after the last applied\n" " patch. If no patches have been applied, qimport prepends the patch\n" -" to the series.\n" -"\n" +" to the series." +msgstr "" +"导入补丁\n" +"\n" +" 此补丁插入到最近一次应用的补丁序列中。\n" +" 如果尚无应用补丁，qimport 会插入补丁到序列开始。\n" +"\n" +" 除非你使用 '--name' 给出补丁名称，否则就与源文件同名。\n" +"\n" +" 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n" +"\n" +" 使用 '--force' 会覆盖已有的补丁。\n" +"\n" +" 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n" +" 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n" +" 时，'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题，以了解\n" +" 为什么这对于保留改名/复制信息和权限修改很重要。\n" +" " + +#, fuzzy +msgid "" " The patch will have the same name as its source file unless you\n" -" give it a new one with -n/--name.\n" -"\n" +" give it a new one with -n/--name." +msgstr "" +"导入补丁\n" +"\n" +" 此补丁插入到最近一次应用的补丁序列中。\n" +" 如果尚无应用补丁，qimport 会插入补丁到序列开始。\n" +"\n" +" 除非你使用 '--name' 给出补丁名称，否则就与源文件同名。\n" +"\n" +" 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n" +"\n" +" 使用 '--force' 会覆盖已有的补丁。\n" +"\n" +" 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n" +" 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n" +" 时，'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题，以了解\n" +" 为什么这对于保留改名/复制信息和权限修改很重要。\n" +" " + +#, fuzzy +msgid "" " You can register an existing patch inside the patch directory with\n" -" the -e/--existing flag.\n" -"\n" +" the -e/--existing flag." +msgstr "" +"导入补丁\n" +"\n" +" 此补丁插入到最近一次应用的补丁序列中。\n" +" 如果尚无应用补丁，qimport 会插入补丁到序列开始。\n" +"\n" +" 除非你使用 '--name' 给出补丁名称，否则就与源文件同名。\n" +"\n" +" 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n" +"\n" +" 使用 '--force' 会覆盖已有的补丁。\n" +"\n" +" 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n" +" 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n" +" 时，'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题，以了解\n" +" 为什么这对于保留改名/复制信息和权限修改很重要。\n" +" " + +#, fuzzy +msgid "" " With -f/--force, an existing patch of the same name will be\n" -" overwritten.\n" -"\n" +" overwritten." +msgstr "" +"导入补丁\n" +"\n" +" 此补丁插入到最近一次应用的补丁序列中。\n" +" 如果尚无应用补丁，qimport 会插入补丁到序列开始。\n" +"\n" +" 除非你使用 '--name' 给出补丁名称，否则就与源文件同名。\n" +"\n" +" 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n" +"\n" +" 使用 '--force' 会覆盖已有的补丁。\n" +"\n" +" 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n" +" 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n" +" 时，'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题，以了解\n" +" 为什么这对于保留改名/复制信息和权限修改很重要。\n" +" " + +#, fuzzy +msgid "" " An existing changeset may be placed under mq control with -r/--rev\n" " (e.g. qimport --rev tip -n patch will place tip under mq control).\n" " 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.\n" -"\n" +" changes." +msgstr "" +"导入补丁\n" +"\n" +" 此补丁插入到最近一次应用的补丁序列中。\n" +" 如果尚无应用补丁，qimport 会插入补丁到序列开始。\n" +"\n" +" 除非你使用 '--name' 给出补丁名称，否则就与源文件同名。\n" +"\n" +" 你可以使用 '--existing' 注册一个已在补丁目录中的补丁。\n" +"\n" +" 使用 '--force' 会覆盖已有的补丁。\n" +"\n" +" 可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n" +" 'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n" +" 时，'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题，以了解\n" +" 为什么这对于保留改名/复制信息和权限修改很重要。\n" +" " + +#, fuzzy +msgid "" " To import a patch from standard input, pass - as the patch file.\n" " When importing from standard input, a patch name must be specified\n" " using the --name flag.\n" @@ -2673,33 +3080,38 @@ " " #, fuzzy -msgid "" -"init a new queue repository\n" -"\n" +msgid "init a new queue repository" +msgstr "初始化队列仓库" + +#, fuzzy +msgid "" " The queue repository is unversioned by default. If\n" " -c/--create-repo is specified, qinit will create a separate nested\n" " repository for patches (qinit -c may also be run later to convert\n" " an unversioned patch repository into a versioned one). You can use\n" " qcommit to commit changes to this queue repository." msgstr "" -"初始化队列仓库\n" -"\n" " 默认队列仓库不受版本控制。如果指定了 '-c'，那么 qinit 会为补丁创建一个\n" " 单独的嵌套版本库(也可以稍后运行 'qinit -c' 来将不受版本控制的补丁仓库\n" " 转换成受版本控制)。你可以使用 'qcommit' 提交改变到此队列版本库。" -msgid "" -"clone main and patch repository at same time\n" -"\n" +msgid "clone main and patch repository at same time" +msgstr "" + +msgid "" " If source is local, destination will have no patches applied. If\n" " source is remote, this command can not check if patches are\n" " applied in source, so cannot guarantee that patches are not\n" " applied in destination. If you clone remote repository, be sure\n" -" before that it has no patches applied.\n" -"\n" +" before that it has no patches applied." +msgstr "" + +msgid "" " Source patch repository is looked for in <src>/.hg/patches by\n" -" default. Use -p <url> to change.\n" -"\n" +" default. Use -p <url> to change." +msgstr "" + +msgid "" " The patch directory must be a nested Mercurial repository, as\n" " would be created by qinit -c.\n" " " @@ -2738,25 +3150,32 @@ msgid "print the name of the previous patch" msgstr "" -msgid "" -"create a new patch\n" -"\n" +msgid "create a new patch" +msgstr "" + +msgid "" " qnew creates a new patch on top of the currently-applied patch (if\n" " any). It will refuse to run if there are any outstanding changes\n" " unless -f/--force is specified, in which case the patch will be\n" " initialized with them. You may also use -I/--include,\n" " -X/--exclude, and/or a list of files after the patch name to add\n" " only changes to matching files to the new patch, leaving the rest\n" -" as uncommitted modifications.\n" -"\n" +" as uncommitted modifications." +msgstr "" + +msgid "" " -u/--user and -d/--date can be used to set the (given) user and\n" " date, respectively. -U/--currentuser and -D/--currentdate set user\n" -" to current user and date to current date.\n" -"\n" +" to current user and date to current date." +msgstr "" + +msgid "" " -e/--edit, -m/--message or -l/--logfile set the patch header as\n" " well as the commit message. If none is specified, the header is\n" -" empty and the commit message is '[mq]: PATCH'.\n" -"\n" +" empty and the commit message is '[mq]: PATCH'." +msgstr "" + +msgid "" " Use the -g/--git option to keep the patch in the git extended diff\n" " format. Read the diffs help topic for more information on why this\n" " is important for preserving permission changes and copy/rename\n" @@ -2765,29 +3184,32 @@ msgstr "" #, fuzzy -msgid "" -"update the current patch\n" -"\n" +msgid "update the current patch" +msgstr "更新当前补丁" + +#, fuzzy +msgid "" " If any file patterns are provided, the refreshed patch will\n" " contain only the modifications that match those patterns; the\n" -" remaining modifications will remain in the working directory.\n" -"\n" +" remaining modifications will remain in the working directory." +msgstr "" +" 如果提供了文件匹配模式，更新后的补丁只包含匹配这些模式的修改，其它\n" +" 的修改仍旧在工作目录中。" + +#, fuzzy +msgid "" " If -s/--short is specified, files currently included in the patch\n" -" will be refreshed just like matched files and remain in the patch.\n" -"\n" +" will be refreshed just like matched files and remain in the patch." +msgstr " 如果指定了 '--short'，只更新已经在补丁中的文件，与文件匹配模式类似。" + +#, fuzzy +msgid "" " hg add/remove/copy/rename work as usual, though you might want to\n" " use git-style patches (-g/--git or [diff] git=1) to track copies\n" " and renames. See the diffs help topic for more information on the\n" " git diff format.\n" " " msgstr "" -"更新当前补丁\n" -"\n" -" 如果提供了文件匹配模式，更新后的补丁只包含匹配这些模式的修改，其它\n" -" 的修改仍旧在工作目录中。\n" -"\n" -" 如果指定了 '--short'，只更新已经在补丁中的文件，与文件匹配模式类似。\n" -"\n" " 'hg add/remove/copy/rename' 如常工作，你可能想使用 git 格式补丁(使\n" " 用选项 '--git' 或在配置文件的 [diff] 区中设置 git=1)以跟踪复制和改\n" " 名。请参见差异帮助主题，以了解关于 git 差异格式的更多信息。\n" @@ -2797,39 +3219,44 @@ msgstr "" #, fuzzy -msgid "" -"diff of the current patch and subsequent modifications\n" -"\n" +msgid "diff of the current patch and subsequent modifications" +msgstr "显式当前的补丁和后续的修改" + +#, fuzzy +msgid "" " Shows a diff which includes the current patch as well as any\n" " changes which have been made in the working directory since the\n" " last refresh (thus showing what the current patch would become\n" -" after a qrefresh).\n" -"\n" +" after a qrefresh)." +msgstr "" +" 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n" +" 显示当前的补丁)。" + +#, fuzzy +msgid "" " Use 'hg diff' if you only want to see the changes made since the\n" " last qrefresh, or 'hg export qtip' if you want to see changes made\n" " by the current patch without including changes made since the\n" " qrefresh.\n" " " msgstr "" -"显式当前的补丁和后续的修改\n" -"\n" -" 显示当前的补丁和最近一次刷新之后的修改(因而在执行 'qrefresh' 之后就只\n" -" 显示当前的补丁)。\n" -"\n" " 如果你只想看到最近一次刷新之后的修改请使用 'hg diff'，如果你只想看到当\n" " 前的补丁请使用 'hg export qtip'。\n" " " -msgid "" -"fold the named patches into the current patch\n" -"\n" +msgid "fold the named patches into the current patch" +msgstr "" + +msgid "" " Patches must not yet be applied. Each patch will be successively\n" " applied to the current patch in the order given. If all the\n" " patches apply successfully, the current patch will be refreshed\n" " with the new cumulative patch, and the folded patches will be\n" " deleted. With -k/--keep, the folded patch files will not be\n" -" removed afterwards.\n" -"\n" +" removed afterwards." +msgstr "" + +msgid "" " The header for each folded patch will be concatenated with the\n" " current patch header, separated by a line of '* * *'." msgstr "" @@ -2855,19 +3282,24 @@ msgid "push or pop patches until named patch is at top of stack" msgstr "" -msgid "" -"set or print guards for a patch\n" -"\n" +msgid "set or print guards for a patch" +msgstr "" + +msgid "" " Guards control whether a patch can be pushed. A patch with no\n" " guards is always pushed. A patch with a positive guard (\"+foo\") is\n" " pushed only if the qselect command has activated it. A patch with\n" " a negative guard (\"-foo\") is never pushed if the qselect command\n" -" has activated it.\n" -"\n" +" has activated it." +msgstr "" + +msgid "" " With no arguments, print the currently active guards.\n" " With arguments, set guards for the named patch.\n" -" NOTE: Specifying negative guards now requires '--'.\n" -"\n" +" NOTE: Specifying negative guards now requires '--'." +msgstr "" + +msgid "" " To set guards on another patch:\n" " hg qguard -- other.patch +2.6.17 -stable\n" " " @@ -2887,15 +3319,15 @@ msgstr "" #, fuzzy -msgid "" -"push the next patch onto the stack\n" -"\n" +msgid "push the next patch onto the stack" +msgstr "将下个补丁压入堆栈" + +#, fuzzy +msgid "" " When -f/--force is applied, all local changes in patched files\n" " will be lost.\n" " " msgstr "" -"将下个补丁压入堆栈\n" -"\n" " 当指定 '--force' 时，所有在补丁文件中的本地修改都会丢失。\n" " " @@ -2907,16 +3339,16 @@ msgstr "" #, fuzzy -msgid "" -"pop the current patch off the stack\n" -"\n" +msgid "pop the current patch off the stack" +msgstr "将当前补丁弹出堆栈" + +#, fuzzy +msgid "" " By default, pops off the top of the patch stack. If given a patch\n" " name, keeps popping off patches until the named patch is at the\n" " top of the stack.\n" " " msgstr "" -"将当前补丁弹出堆栈\n" -"\n" " 默认将补丁堆栈的顶部弹出。如果指定了补丁名称，那么就会一直弹出，直到此\n" " 补丁位于堆栈顶部。\n" " " @@ -2925,9 +3357,10 @@ msgid "using patch queue: %s\n" msgstr "" -msgid "" -"rename a patch\n" -"\n" +msgid "rename a patch" +msgstr "" + +msgid "" " With one argument, renames the current patch to PATCH1.\n" " With two arguments, renames PATCH1 to PATCH2." msgstr "" @@ -2959,49 +3392,62 @@ msgstr "" #, fuzzy -msgid "" -"strip a revision and all its descendants from the repository\n" -"\n" +msgid "strip a revision and all its descendants from the repository" +msgstr "从版本库删除一个版本以及它的子孙" + +#, fuzzy +msgid "" " If one of the working directory's parent revisions is stripped, the\n" " working directory will be updated to the parent of the stripped\n" " revision.\n" " " msgstr "" -"从版本库删除一个版本以及它的子孙\n" -"\n" " 如果有工作目录的父版本被删除，那么此目录会被更新到已删除版本的父版本。\n" " " -msgid "" -"set or print guarded patches to push\n" -"\n" +msgid "set or print guarded patches to push" +msgstr "" + +msgid "" " Use the qguard command to set or print guards on patch, then use\n" " qselect to tell mq which guards to use. A patch will be pushed if\n" " it has no guards or any positive guards match the currently\n" " selected guard, but will not be pushed if any negative guards\n" -" match the current guard. For example:\n" -"\n" +" match the current guard. For example:" +msgstr "" + +msgid "" " qguard foo.patch -stable (negative guard)\n" " qguard bar.patch +stable (positive guard)\n" -" qselect stable\n" -"\n" +" qselect stable" +msgstr "" + +msgid "" " This activates the \"stable\" guard. mq will skip foo.patch (because\n" " it has a negative match) but push bar.patch (because it has a\n" -" positive match).\n" -"\n" +" positive match)." +msgstr "" + +msgid "" " With no arguments, prints the currently active guards.\n" -" With one argument, sets the active guard.\n" -"\n" +" With one argument, sets the active guard." +msgstr "" + +msgid "" " Use -n/--none to deactivate guards (no other arguments needed).\n" " When no guards are active, patches with positive guards are\n" -" skipped and patches with negative guards are pushed.\n" -"\n" +" skipped and patches with negative guards are pushed." +msgstr "" + +msgid "" " qselect can change the guards on applied patches. It does not pop\n" " guarded patches by default. Use --pop to pop back to the last\n" " applied patch that is not guarded. Use --reapply (which implies\n" " --pop) to push back to the current patch afterwards, but skip\n" -" guarded patches.\n" -"\n" +" guarded patches." +msgstr "" + +msgid "" " Use -s/--series to print a list of all guards in the series file\n" " (no other arguments needed). Use -v for more information." msgstr "" @@ -3035,18 +3481,23 @@ msgid "reapplying unguarded patches\n" msgstr "" -msgid "" -"move applied patches into repository history\n" -"\n" +msgid "move applied patches into repository history" +msgstr "" + +msgid "" " Finishes the specified revisions (corresponding to applied\n" " patches) by moving them out of mq control into regular repository\n" -" history.\n" -"\n" +" history." +msgstr "" + +msgid "" " Accepts a revision range or the -a/--applied option. If --applied\n" " is specified, all applied mq revisions are removed from mq\n" " control. Otherwise, the given revisions must be at the base of the\n" -" stack of applied patches.\n" -"\n" +" stack of applied patches." +msgstr "" + +msgid "" " This can be especially useful if your changes have been applied to\n" " an upstream repository, or if you are about to push your changes\n" " to upstream.\n" @@ -3321,33 +3772,47 @@ msgid "hg qfinish [-a] [REV]..." msgstr "" -msgid "" -"hooks for sending email notifications at commit/push time\n" -"\n" +msgid "hooks for sending email notifications at commit/push time" +msgstr "" + +msgid "" "Subscriptions can be managed through a hgrc file. Default mode is to\n" -"print messages to stdout, for testing and configuring.\n" -"\n" +"print messages to stdout, for testing and configuring." +msgstr "" + +msgid "" "To use, configure the notify extension and enable it in hgrc like\n" -"this::\n" -"\n" +"this::" +msgstr "" + +msgid "" " [extensions]\n" -" notify =\n" -"\n" +" notify =" +msgstr "" + +msgid "" " [hooks]\n" " # 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\n" -"\n" +" changegroup.notify = python:hgext.notify.hook" +msgstr "" + +msgid "" " [notify]\n" -" # config items go here\n" -"\n" -"Required configuration items::\n" -"\n" -" config = /path/to/file # file containing subscriptions\n" -"\n" -"Optional configuration items::\n" -"\n" +" # config items go here" +msgstr "" + +msgid "Required configuration items::" +msgstr "" + +msgid " config = /path/to/file # file containing subscriptions" +msgstr "" + +msgid "Optional configuration items::" +msgstr "" + +msgid "" " test = True # print messages to stdout for testing\n" " strip = 3 # number of slashes to strip for url paths\n" " domain = example.com # domain to use if committer missing domain\n" @@ -3363,24 +3828,34 @@ " [email]\n" " from = user@host.com # email address to send as if none given\n" " [web]\n" -" baseurl = http://hgserver/... # root of hg web site for browsing commits\n" -"\n" +" baseurl = http://hgserver/... # root of hg web site for browsing commits" +msgstr "" + +msgid "" "The notify config file has same format as a regular hgrc file. It has\n" "two sections so you can express subscriptions in whatever way is\n" -"handier for you.\n" -"\n" -"::\n" -"\n" +"handier for you." +msgstr "" + +msgid "::" +msgstr "" + +msgid "" " [usersubs]\n" " # key is subscriber email, value is \",\"-separated list of glob patterns\n" -" user@host = pattern\n" -"\n" +" user@host = pattern" +msgstr "" + +msgid "" " [reposubs]\n" " # key is glob pattern, value is \",\"-separated list of subscriber emails\n" -" pattern = user@host\n" -"\n" -"Glob patterns are matched against path to repository root.\n" -"\n" +" pattern = user@host" +msgstr "" + +msgid "Glob patterns are matched against path to repository root." +msgstr "" + +msgid "" "If you like, you can put notify config file in repository that users\n" "can push changes to, they can manage their own subscriptions.\n" msgstr "" @@ -3396,15 +3871,13 @@ #, python-format msgid "" "\n" -"diffs (truncated from %d to %d lines):\n" -"\n" -msgstr "" - -#, python-format -msgid "" -"\n" -"diffs (%d lines):\n" -"\n" +"diffs (truncated from %d to %d lines):" +msgstr "" + +#, python-format +msgid "" +"\n" +"diffs (%d lines):" msgstr "" #, python-format @@ -3415,119 +3888,170 @@ msgid "notify: changes have source \"%s\" - skipping\n" msgstr "" -msgid "" -"browse command output with an external pager\n" -"\n" -"To set the pager that should be used, set the application variable::\n" -"\n" +msgid "browse command output with an external pager" +msgstr "" + +msgid "To set the pager that should be used, set the application variable::" +msgstr "" + +msgid "" " [pager]\n" -" pager = LESS='FSRX' less\n" -"\n" +" pager = LESS='FSRX' less" +msgstr "" + +msgid "" "If no pager is set, the pager extensions uses the environment variable\n" -"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used.\n" -"\n" +"$PAGER. If neither pager.pager, nor $PAGER is set, no pager is used." +msgstr "" + +msgid "" "If you notice \"BROKEN PIPE\" error messages, you can disable them by\n" -"setting::\n" -"\n" +"setting::" +msgstr "" + +msgid "" " [pager]\n" -" quiet = True\n" -"\n" +" quiet = True" +msgstr "" + +msgid "" "You can disable the pager for certain commands by adding them to the\n" -"pager.ignore list::\n" -"\n" +"pager.ignore list::" +msgstr "" + +msgid "" " [pager]\n" -" ignore = version, help, update\n" -"\n" +" ignore = version, help, update" +msgstr "" + +msgid "" "You can also enable the pager only for certain commands using\n" -"pager.attend::\n" -"\n" +"pager.attend::" +msgstr "" + +msgid "" " [pager]\n" -" attend = log\n" -"\n" -"If pager.attend is present, pager.ignore will be ignored.\n" -"\n" +" attend = log" +msgstr "" + +msgid "If pager.attend is present, pager.ignore will be ignored." +msgstr "" + +msgid "" "To ignore global commands like \"hg version\" or \"hg help\", you have to\n" "specify them in the global .hgrc\n" msgstr "" -msgid "" -"interpret suffixes to refer to ancestor revisions\n" -"\n" +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.\n" -"\n" -"For example, if you can refer to a revision as \"foo\", then::\n" -"\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\n" -"\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\n" -"\n" +msgid "command to send changesets as (a series of) patch emails" +msgstr "" + +msgid "" "The series is started off with a \"[PATCH 0 of N]\" introduction, which\n" -"describes the series as a whole.\n" -"\n" +"describes the series as a whole." +msgstr "" + +msgid "" "Each patch email has a Subject line of \"[PATCH M of N] ...\", using the\n" "first line of the changeset description as the subject text. The\n" -"message contains two or three body parts:\n" -"\n" +"message contains two or three body parts:" +msgstr "" + +msgid "" "- The changeset description.\n" "- [Optional] The result of running diffstat on the patch.\n" -"- The patch itself, as generated by \"hg export\".\n" -"\n" +"- The patch itself, as generated by \"hg export\"." +msgstr "" + +msgid "" "Each message refers to the first in the series using the In-Reply-To\n" "and References headers, so they will show up as a sequence in threaded\n" -"mail and news readers, and in mail archives.\n" -"\n" +"mail and news readers, and in mail archives." +msgstr "" + +msgid "" "With the -d/--diffstat option, you will be prompted for each changeset\n" "with a diffstat summary and the changeset summary, so you can be sure\n" -"you are sending the right changes.\n" -"\n" +"you are sending the right changes." +msgstr "" + +msgid "" "To configure other defaults, add a section like this to your hgrc\n" -"file::\n" -"\n" +"file::" +msgstr "" + +msgid "" " [email]\n" " from = My Name <my@email>\n" " to = recipient1, recipient2, ...\n" " cc = cc1, cc2, ...\n" -" bcc = bcc1, bcc2, ...\n" -"\n" +" bcc = bcc1, bcc2, ..." +msgstr "" + +msgid "" "Then you can use the \"hg email\" command to mail a series of changesets\n" -"as a patchbomb.\n" -"\n" +"as a patchbomb." +msgstr "" + +msgid "" "To avoid sending patches prematurely, it is a good idea to first run\n" "the \"email\" command with the \"-n\" option (test only). You will be\n" "prompted for an email recipient address, a subject and an introductory\n" "message describing the patches of your patchbomb. Then when all is\n" "done, patchbomb messages are displayed. If the PAGER environment\n" "variable is set, your pager will be fired up once for each patchbomb\n" -"message, so you can verify everything is alright.\n" -"\n" +"message, so you can verify everything is alright." +msgstr "" + +msgid "" "The -m/--mbox option is also very useful. Instead of previewing each\n" "patchbomb message in a pager or sending the messages directly, it will\n" "create a UNIX mailbox file with the patch emails. This mailbox file\n" "can be previewed with any mail user agent which supports UNIX mbox\n" -"files, e.g. with mutt::\n" -"\n" -" % mutt -R -f mbox\n" -"\n" +"files, e.g. with mutt::" +msgstr "" + +msgid " % mutt -R -f mbox" +msgstr "" + +msgid "" "When you are previewing the patchbomb messages, you can use ``formail``\n" "(a utility that is commonly installed as part of the procmail\n" -"package), to send each message out::\n" -"\n" -" % formail -s sendmail -bm -t < mbox\n" -"\n" -"That should be all. Now your patchbomb is on its way out.\n" -"\n" +"package), to send each message out::" +msgstr "" + +msgid " % formail -s sendmail -bm -t < mbox" +msgstr "" + +msgid "That should be all. Now your patchbomb is on its way out." +msgstr "" + +msgid "" "You can also either configure the method option in the email section\n" "to be a sendmail compatible mailer or fill out the [smtp] section so\n" "that the patchbomb extension can automatically send patchbombs\n" @@ -3544,53 +4068,66 @@ msgid "diffstat rejected" msgstr "" -msgid "" -"send changesets by email\n" -"\n" +msgid "send changesets by email" +msgstr "" + +msgid "" " By default, diffs are sent in the format generated by hg export,\n" " one per message. The series starts with a \"[PATCH 0 of N]\"\n" -" introduction, which describes the series as a whole.\n" -"\n" +" introduction, which describes the series as a whole." +msgstr "" + +msgid "" " Each patch email has a Subject line of \"[PATCH M of N] ...\", using\n" " the first line of the changeset description as the subject text.\n" " The message contains two or three parts. First, the changeset\n" " description. Next, (optionally) if the diffstat program is\n" " installed and -d/--diffstat is used, the result of running\n" " diffstat on the patch. Finally, the patch itself, as generated by\n" -" \"hg export\".\n" -"\n" +" \"hg export\"." +msgstr "" + +msgid "" " By default the patch is included as text in the email body for\n" " easy reviewing. Using the -a/--attach option will instead create\n" " an attachment for the patch. With -i/--inline an inline attachment\n" -" will be created.\n" -"\n" +" will be created." +msgstr "" + +msgid "" " With -o/--outgoing, emails will be generated for patches not found\n" " in the destination repository (or only those which are ancestors\n" -" of the specified revisions if any are provided)\n" -"\n" +" of the specified revisions if any are provided)" +msgstr "" + +msgid "" " With -b/--bundle, changesets are selected as for --outgoing, but a\n" " single email containing a binary Mercurial bundle as an attachment\n" -" will be sent.\n" -"\n" -" Examples::\n" -"\n" +" will be sent." +msgstr "" + +msgid "" " hg email -r 3000 # send patch 3000 only\n" " hg email -r 3000 -r 3001 # send patches 3000 and 3001\n" " hg email -r 3000:3005 # send patches 3000 through 3005\n" -" hg email 3000 # send patch 3000 (deprecated)\n" -"\n" +" hg email 3000 # send patch 3000 (deprecated)" +msgstr "" + +msgid "" " hg email -o # send all patches not in default\n" " hg email -o DEST # send all patches not in DEST\n" " hg email -o -r 3000 # send all ancestors of 3000 not in default\n" -" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST\n" -"\n" +" hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST" +msgstr "" + +msgid "" " hg email -b # send bundle of all patches not in default\n" " hg email -b DEST # send bundle of all patches not in DEST\n" -" hg email -b -r 3000 # bundle of all ancestors of 3000 not in " -"default\n" -" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in " -"DEST\n" -"\n" +" hg email -b -r 3000 # bundle of all ancestors of 3000 not in default\n" +" hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST" +msgstr "" + +msgid "" " Before using this command, you will need to enable email in your\n" " hgrc. See the [email] section in hgrc(5) for details.\n" " " @@ -3610,14 +4147,11 @@ msgid "" "\n" -"Write the introductory message for the patch series.\n" -"\n" -msgstr "" - -#, python-format -msgid "" -"This patch series consists of %d patches.\n" -"\n" +"Write the introductory message for the patch series." +msgstr "" + +#, python-format +msgid "This patch series consists of %d patches." msgstr "" msgid "Final summary:\n" @@ -3705,27 +4239,38 @@ msgid "command to delete untracked files from the working directory" msgstr "" -msgid "" -"removes files not tracked by Mercurial\n" -"\n" +msgid "removes files not tracked by Mercurial" +msgstr "" + +msgid "" " Delete files not known to Mercurial. This is useful to test local\n" -" and uncommitted changes in an otherwise-clean source tree.\n" -"\n" -" This means that purge will delete:\n" -"\n" +" and uncommitted changes in an otherwise-clean source tree." +msgstr "" + +msgid " This means that purge will delete:" +msgstr "" + +msgid "" " - Unknown files: files marked with \"?\" by \"hg status\"\n" " - Empty directories: in fact Mercurial ignores directories unless\n" -" they contain files under source control management\n" -"\n" -" But it will leave untouched:\n" -"\n" +" they contain files under source control management" +msgstr "" + +msgid " But it will leave untouched:" +msgstr "" + +msgid "" " - Modified and unmodified tracked files\n" " - Ignored files (unless --all is specified)\n" -" - New files added to the repository (with \"hg add\")\n" -"\n" +" - New files added to the repository (with \"hg add\")" +msgstr "" + +msgid "" " If directories are given on the command line, only files in these\n" -" directories are considered.\n" -"\n" +" directories are considered." +msgstr "" + +msgid "" " Be careful with purge, as you could irreversibly delete some files\n" " you forgot to add to the repository. If you only want to print the\n" " list of files that this program would delete, use the --print\n" @@ -3765,12 +4310,15 @@ msgid "hg purge [OPTION]... [DIR]..." msgstr "" -msgid "" -"command to move sets of revisions to a different ancestor\n" -"\n" +msgid "command to move sets of revisions to a different ancestor" +msgstr "" + +msgid "" "This extension lets you rebase changesets in an existing Mercurial\n" -"repository.\n" -"\n" +"repository." +msgstr "" + +msgid "" "For more information:\n" "http://mercurial.selenic.com/wiki/RebaseExtension\n" msgstr "" @@ -3778,13 +4326,16 @@ msgid "first revision, do not change ancestor\n" msgstr "" -msgid "" -"move changeset (and descendants) to a different branch\n" -"\n" +msgid "move changeset (and descendants) to a different branch" +msgstr "" + +msgid "" " Rebase uses repeated merging to graft changesets from one part of\n" " history onto another. This can be useful for linearizing local\n" -" changes relative to a master development tree.\n" -"\n" +" changes relative to a master development tree." +msgstr "" + +msgid "" " If a rebase is interrupted to manually resolve a merge, it can be\n" " continued with --continue/-c or aborted with --abort/-a.\n" " " @@ -3936,9 +4487,7 @@ msgid "abort an interrupted rebase" msgstr "" -msgid "" -"hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | " -"[-c] | [-a]" +msgid "hg rebase [-s REV | -b REV] [-d REV] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]" msgstr "" msgid "commands to interactively select changes for commit/qrefresh" @@ -4007,30 +4556,41 @@ msgid "record change %d/%d to %r?" msgstr "不需要改变 %s\n" -msgid "" -"interactively select changes to commit\n" -"\n" +msgid "interactively select changes to commit" +msgstr "" + +msgid "" " If a list of files is omitted, all changes reported by \"hg status\"\n" -" will be candidates for recording.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -"\n" +" will be candidates for recording." +msgstr "" + +msgid " See 'hg help dates' for a list of formats valid for -d/--date." +msgstr "" + +msgid "" " You will be prompted for whether to record changes to each\n" " modified file, and for files with multiple changes, for each\n" " change to use. For each query, the following responses are\n" -" possible::\n" -"\n" +" possible::" +msgstr "" + +msgid "" " y - record this change\n" -" n - skip this change\n" -"\n" +" n - skip this change" +msgstr "" + +msgid "" " s - skip remaining changes to this file\n" -" f - record remaining changes to this file\n" -"\n" +" f - record remaining changes to this file" +msgstr "" + +msgid "" " d - done, skip remaining changes and files\n" " a - record all changes to all remaining files\n" -" q - quit, recording no changes\n" -"\n" -" ? - display help" +" q - quit, recording no changes" +msgstr "" + +msgid " ? - display help" msgstr "" msgid "'mq' extension not loaded" @@ -4065,12 +4625,15 @@ msgid "share a common history between several working directories" msgstr "" -msgid "" -"create a new shared repository (experimental)\n" -"\n" +msgid "create a new shared repository (experimental)" +msgstr "" + +msgid "" " Initialize a new repository and working directory that shares its\n" -" history with another repository.\n" -"\n" +" history with another repository." +msgstr "" + +msgid "" " NOTE: actions that change history such as rollback or moving the\n" " source may confuse sharers.\n" " " @@ -4082,11 +4645,13 @@ msgid "[-U] SOURCE [DEST]" msgstr "" -msgid "" -"command to transplant changesets from another branch\n" -"\n" -"This extension allows you to transplant patches from another branch.\n" -"\n" +msgid "command to transplant changesets from another branch" +msgstr "" + +msgid "This extension allows you to transplant patches from another branch." +msgstr "" + +msgid "" "Transplanted patches are recorded in .hg/transplant/transplants, as a\n" "map from a changeset hash to its hash in the source repository.\n" msgstr "" @@ -4141,38 +4706,52 @@ msgid "apply changeset? [ynmpcq?]:" msgstr "" -msgid "" -"transplant changesets from another branch\n" -"\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::\n" -"\n" -" (transplanted from CHANGESETHASH)\n" -"\n" +" specified, log messages will have a comment appended of the form::" +msgstr "" + +msgid " (transplanted from CHANGESETHASH)" +msgstr "" + +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.\n" -"\n" +" $1 and the patch as $2." +msgstr "" + +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.\n" -"\n" +" changesets you want." +msgstr "" + +msgid "" " hg transplant --branch REVISION --all will rebase the selected\n" " branch (up to the named revision) onto your current working\n" -" directory.\n" -"\n" +" 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.\n" -"\n" +" normally instead of transplanting them." +msgstr "" + +msgid "" " If no merges or revisions are provided, hg transplant will start\n" -" an interactive changeset browser.\n" -"\n" +" an interactive changeset browser." +msgstr "" + +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" @@ -4224,38 +4803,49 @@ msgid "filter changesets through FILTER" msgstr "" -msgid "" -"hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." -msgstr "" - -msgid "" -"allow the use of MBCS paths with problematic encodings\n" -"\n" +msgid "hg transplant [-s REPOSITORY] [-b BRANCH [-a]] [-p REV] [-m REV] [REV]..." +msgstr "" + +msgid "allow the use of MBCS paths with problematic encodings" +msgstr "" + +msgid "" "Some MBCS encodings are not good for some path operations (i.e.\n" "splitting path, case conversion, etc.) with its encoded bytes. We call\n" "such a encoding (i.e. shift_jis and big5) as \"problematic encoding\".\n" "This extension can be used to fix the issue with those encodings by\n" "wrapping some functions to convert to Unicode string before path\n" -"operation.\n" -"\n" -"This extension is useful for:\n" -"\n" +"operation." +msgstr "" + +msgid "This extension is useful for:" +msgstr "" + +msgid "" "- Japanese Windows users using shift_jis encoding.\n" "- Chinese Windows users using big5 encoding.\n" "- All users who use a repository with one of problematic encodings on\n" -" case-insensitive file system.\n" -"\n" -"This extension is not needed for:\n" -"\n" +" case-insensitive file system." +msgstr "" + +msgid "This extension is not needed for:" +msgstr "" + +msgid "" "- Any user who use only ASCII chars in path.\n" -"- Any user who do not use any of problematic encodings.\n" -"\n" -"Note that there are some limitations on using this extension:\n" -"\n" +"- Any user who do not use any of problematic encodings." +msgstr "" + +msgid "Note that there are some limitations on using this extension:" +msgstr "" + +msgid "" "- You should use single encoding in one repository.\n" "- You should set same encoding for the repository by locale or\n" -" HGENCODING.\n" -"\n" +" HGENCODING." +msgstr "" + +msgid "" "Path encoding conversion are done between Unicode and\n" "encoding.encoding which is decided by Mercurial from current locale\n" "setting or HGENCODING.\n" @@ -4272,31 +4862,41 @@ msgid "[win32mbcs] activated with encoding: %s\n" msgstr "" -msgid "" -"perform automatic newline conversion\n" -"\n" -"To perform automatic newline conversion, use::\n" -"\n" +msgid "perform automatic newline conversion" +msgstr "" + +msgid "To perform automatic newline conversion, use::" +msgstr "" + +msgid "" " [extensions]\n" " win32text =\n" " [encode]\n" " ** = cleverencode:\n" -" # or ** = macencode:\n" -"\n" +" # or ** = macencode:" +msgstr "" + +msgid "" " [decode]\n" " ** = cleverdecode:\n" -" # or ** = macdecode:\n" -"\n" -"If not doing conversion, to make sure you do not commit CRLF/CR by " -"accident::\n" -"\n" +" # or ** = macdecode:" +msgstr "" + +msgid "If not doing conversion, to make sure you do not commit CRLF/CR by accident::" +msgstr "" + +msgid "" " [hooks]\n" " pretxncommit.crlf = python:hgext.win32text.forbidcrlf\n" -" # or pretxncommit.cr = python:hgext.win32text.forbidcr\n" -"\n" +" # or pretxncommit.cr = python:hgext.win32text.forbidcr" +msgstr "" + +msgid "" "To do the same check on a server to prevent CRLF/CR from being\n" -"pushed or pulled::\n" -"\n" +"pushed or pulled::" +msgstr "" + +msgid "" " [hooks]\n" " pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf\n" " # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr\n" @@ -4322,13 +4922,21 @@ msgid "" "\n" "To prevent this mistake in your local repository,\n" -"add to Mercurial.ini or .hg/hgrc:\n" -"\n" +"add to Mercurial.ini or .hg/hgrc:" +msgstr "" + +#, python-format +msgid "" "[hooks]\n" -"pretxncommit.%s = python:hgext.win32text.forbid%s\n" -"\n" -"and also consider adding:\n" -"\n" +"pretxncommit.%s = python:hgext.win32text.forbid%s" +msgstr "" + +#, python-format +msgid "and also consider adding:" +msgstr "" + +#, python-format +msgid "" "[extensions]\n" "win32text =\n" "[encode]\n" @@ -4337,21 +4945,29 @@ "** = %sdecode:\n" msgstr "" -msgid "" -"discover and advertise repositories on the local network\n" -"\n" +msgid "discover and advertise repositories on the local network" +msgstr "" + +msgid "" "Zeroconf enabled repositories will be announced in a network without\n" "the need to configure a server or a service. They can be discovered\n" -"without knowing their actual IP address.\n" -"\n" +"without knowing their actual IP address." +msgstr "" + +msgid "" "To allow other people to discover your repository using run \"hg serve\"\n" -"in your repository::\n" -"\n" +"in your repository::" +msgstr "" + +msgid "" " $ cd test\n" -" $ hg serve\n" -"\n" -"You can discover zeroconf enabled repositories by running \"hg paths\"::\n" -"\n" +" $ hg serve" +msgstr "" + +msgid "You can discover zeroconf enabled repositories by running \"hg paths\"::" +msgstr "" + +msgid "" " $ hg paths\n" " zc-test = http://example.com:8000/test\n" msgstr "" @@ -4612,38 +5228,46 @@ msgstr "空的提交日志" #, fuzzy -msgid "" -"add the specified files on the next commit\n" -"\n" +msgid "add the specified files on the next commit" +msgstr "增加指定文件用于下次提交" + +#, fuzzy +msgid "" " Schedule files to be version controlled and added to the\n" -" repository.\n" -"\n" +" repository." +msgstr " 调度文件受版本控制，增加到版本库。" + +#, fuzzy +msgid "" " The files will be added to the repository at the next commit. To\n" -" undo an add before that, see hg forget.\n" -"\n" +" undo an add before that, see hg forget." +msgstr "" +" 这些文件将于下次提交时增加到版本库。需要在提交前撤销增加，\n" +" 参见 'hg revert'。" + +#, fuzzy +msgid "" " If no names are given, add all files to the repository.\n" " " msgstr "" -"增加指定文件用于下次提交\n" -"\n" -" 调度文件受版本控制，增加到版本库。\n" -"\n" -" 这些文件将于下次提交时增加到版本库。需要在提交前撤销增加，\n" -" 参见 'hg revert'。\n" -"\n" " 如果没有给出文件名称，就增加所有文件到版本库。\n" " " -msgid "" -"add all new files, delete all missing files\n" -"\n" +msgid "add all new files, delete all missing files" +msgstr "" + +msgid "" " Add all new files and remove all missing files from the\n" -" repository.\n" -"\n" +" repository." +msgstr "" + +msgid "" " New files are ignored if they match any of the patterns in\n" " .hgignore. As with add, these changes take effect at the next\n" -" commit.\n" -"\n" +" commit." +msgstr "" + +msgid "" " Use the -s/--similarity option to detect renamed files. With a\n" " parameter greater than 0, this compares every removed file with\n" " every added file and records those similar enough as renames. This\n" @@ -4660,27 +5284,29 @@ msgstr "" #, fuzzy -msgid "" -"show changeset information by line for each file\n" -"\n" +msgid "show changeset information by line for each file" +msgstr "显示指定文件每行的修改集信息" + +#, fuzzy +msgid "" " List changes in files, showing the revision id responsible for\n" -" each line\n" -"\n" +" each line" +msgstr " 列出文件中的修改，为每行显示版本标识" + +#, fuzzy +msgid "" " This command is useful for discovering when a change was made and\n" -" by whom.\n" -"\n" +" by whom." +msgstr " 此命令用于查找谁做出的修改，或者什么时候发生的修改" + +#, fuzzy +msgid "" " Without the -a/--text option, annotate will avoid processing files\n" " it detects as binary. With -a, annotate will annotate the file\n" " anyway, although the results will probably be neither useful\n" " nor desirable.\n" " " msgstr "" -"显示指定文件每行的修改集信息\n" -"\n" -" 列出文件中的修改，为每行显示版本标识\n" -"\n" -" 此命令用于查找谁做出的修改，或者什么时候发生的修改\n" -"\n" " 当没有选项 '-a' 时，annotate 会避免处理检测为二进制的文件\n" " 当使用选项 '-a' 时，annotate 会直接产生追溯，可能会有不合需要的结果\n" " " @@ -4695,25 +5321,34 @@ msgid "%s: binary file\n" msgstr "" -msgid "" -"create an unversioned archive of a repository revision\n" -"\n" +msgid "create an unversioned archive of a repository revision" +msgstr "" + +msgid "" " By default, the revision used is the parent of the working\n" -" directory; use -r/--rev to specify a different revision.\n" -"\n" +" directory; use -r/--rev to specify a different revision." +msgstr "" + +msgid "" " To specify the type of archive to create, use -t/--type. Valid\n" -" types are::\n" -"\n" +" types are::" +msgstr "" + +msgid "" " \"files\" (default): a directory full of files\n" " \"tar\": tar archive, uncompressed\n" " \"tbz2\": tar archive, compressed using bzip2\n" " \"tgz\": tar archive, compressed using gzip\n" " \"uzip\": zip archive, uncompressed\n" -" \"zip\": zip archive, compressed using deflate\n" -"\n" +" \"zip\": zip archive, compressed using deflate" +msgstr "" + +msgid "" " The exact name of the destination archive or directory is given\n" -" using a format string; see 'hg help export' for details.\n" -"\n" +" using a format string; see 'hg help export' for details." +msgstr "" + +msgid "" " Each member added to an archive file has a directory prefix\n" " prepended. Use -p/--prefix to specify a format string for the\n" " prefix. The default is the basename of the archive, with suffixes\n" @@ -4730,23 +5365,25 @@ msgid "cannot archive plain files to stdout" msgstr "" -msgid "" -"reverse effect of earlier changeset\n" -"\n" +msgid "reverse effect of earlier changeset" +msgstr "" + +msgid "" " Commit the backed out changes as a new changeset. The new\n" -" changeset is a child of the backed out changeset.\n" -"\n" +" changeset is a child of the backed out changeset." +msgstr "" + +msgid "" " If you backout a changeset other than the tip, a new head is\n" " created. This head will be the new tip and you should merge this\n" -" backout changeset with another head.\n" -"\n" +" backout changeset with another head." +msgstr "" + +msgid "" " The --merge option remembers the parent of the working directory\n" " before starting the backout, then merges the new head with that\n" " changeset afterwards. This saves you from doing the merge by hand.\n" -" The result of this merge is not committed, as with a normal merge.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" The result of this merge is not committed, as with a normal merge." msgstr "" msgid "please specify just one revision" @@ -4785,9 +5422,10 @@ msgid "(use \"backout --merge\" if you want to auto-merge)\n" msgstr "" -msgid "" -"subdivision search of changesets\n" -"\n" +msgid "subdivision search of changesets" +msgstr "" + +msgid "" " This command helps to find changesets which introduce problems. To\n" " use, mark the earliest changeset you know exhibits the problem as\n" " bad, then mark the latest changeset which is free from the problem\n" @@ -4795,11 +5433,15 @@ " for testing (unless the -U/--noupdate option is specified). Once\n" " you have performed tests, mark the working directory as good or\n" " bad, and bisect will either update to another candidate changeset\n" -" or announce that it has found the bad revision.\n" -"\n" +" or announce that it has found the bad revision." +msgstr "" + +msgid "" " As a shortcut, you can also use the revision argument to mark a\n" -" revision as good or bad without checking it out first.\n" -"\n" +" revision as good or bad without checking it out first." +msgstr "" + +msgid "" " If you supply a command, it will be used for automatic bisection.\n" " Its exit status will be used to mark revisions as good or bad:\n" " status 0 means good, 125 means to skip the revision, 127\n" @@ -4852,22 +5494,29 @@ msgid "Testing changeset %d:%s (%d changesets remaining, ~%d tests)\n" msgstr "" -msgid "" -"set or show the current branch name\n" -"\n" +msgid "set or show the current branch name" +msgstr "" + +msgid "" " With no argument, show the current branch name. With one argument,\n" " set the working directory branch name (the branch will not exist\n" " in the repository until the next commit). Standard practice\n" " recommends that primary development take place on the 'default'\n" -" branch.\n" -"\n" +" branch." +msgstr "" + +msgid "" " Unless -f/--force is specified, branch will not let you set a\n" -" branch name that already exists, even if it's inactive.\n" -"\n" +" branch name that already exists, even if it's inactive." +msgstr "" + +msgid "" " Use -C/--clean to reset the working directory branch to that of\n" " the parent of the working directory, negating a previous branch\n" -" change.\n" -"\n" +" change." +msgstr "" + +msgid "" " Use the command 'hg update' to switch to an existing branch. Use\n" " 'hg commit --close-branch' to mark this branch as closed.\n" " " @@ -4884,40 +5533,54 @@ msgid "marked working directory as branch %s\n" msgstr "" -msgid "" -"list repository named branches\n" -"\n" +msgid "list repository named branches" +msgstr "" + +msgid "" " List the repository's named branches, indicating which ones are\n" " inactive. If -c/--closed is specified, also list branches which have\n" -" been marked closed (see hg commit --close-branch).\n" -"\n" +" been marked closed (see hg commit --close-branch)." +msgstr "" + +msgid "" " If -a/--active is specified, only show active branches. A branch\n" -" is considered active if it contains repository heads.\n" -"\n" +" is considered active if it contains repository heads." +msgstr "" + +msgid "" " Use the command 'hg update' to switch to an existing branch.\n" " " msgstr "" -msgid "" -"create a changegroup file\n" -"\n" +msgid "create a changegroup file" +msgstr "" + +msgid "" " Generate a compressed changegroup file collecting changesets not\n" -" known to be in another repository.\n" -"\n" +" known to be in another repository." +msgstr "" + +msgid "" " If no destination repository is specified the destination is\n" " assumed to have all the nodes specified by one or more --base\n" " parameters. To create a bundle containing all changesets, use\n" -" -a/--all (or --base null).\n" -"\n" +" -a/--all (or --base null)." +msgstr "" + +msgid "" " You can change compression method with the -t/--type option.\n" " The available compression methods are: none, bzip2, and\n" -" gzip (by default, bundles are compressed using bzip2).\n" -"\n" +" gzip (by default, bundles are compressed using bzip2)." +msgstr "" + +msgid "" " The bundle file can then be transferred using conventional means\n" " and applied to another repository with the unbundle or pull\n" " command. This is useful when direct push and pull are not\n" -" available or when exporting an entire repository is undesirable.\n" -"\n" +" available or when exporting an entire repository is undesirable." +msgstr "" + +msgid "" " Applying bundles preserves all changeset contents including\n" " permissions, copy/rename information, and revision history.\n" " " @@ -4929,62 +5592,85 @@ msgid "unknown bundle type specified with --type" msgstr "" -msgid "" -"output the current or given revision of files\n" -"\n" +msgid "output the current or given revision of files" +msgstr "" + +msgid "" " Print the specified files as they were at the given revision. If\n" " no revision is given, the parent of the working directory is used,\n" -" or tip if no revision is checked out.\n" -"\n" +" or tip if no revision is checked out." +msgstr "" + +msgid "" " Output may be to a file, in which case the name of the file is\n" " given using a format string. The formatting rules are the same as\n" -" for the export command, with the following additions::\n" -"\n" +" for the export command, with the following additions::" +msgstr "" + +msgid "" " %s basename of file being printed\n" " %d dirname of file being printed, or '.' if in repository root\n" " %p root-relative path name of file being printed\n" " " msgstr "" -msgid "" -"make a copy of an existing repository\n" -"\n" -" Create a copy of an existing repository in a new directory.\n" -"\n" +msgid "make a copy of an existing repository" +msgstr "" + +msgid " Create a copy of an existing repository in a new directory." +msgstr "" + +msgid "" " If no destination directory name is specified, it defaults to the\n" -" basename of the source.\n" -"\n" +" basename of the source." +msgstr "" + +msgid "" " The location of the source is added to the new repository's\n" -" .hg/hgrc file, as the default to be used for future pulls.\n" -"\n" +" .hg/hgrc file, as the default to be used for future pulls." +msgstr "" + +msgid "" " If you use the -r/--rev option to clone up to a specific revision,\n" " no subsequent revisions (including subsequent tags) will be\n" " present in the cloned repository. This option implies --pull, even\n" -" on local repositories.\n" -"\n" +" on local repositories." +msgstr "" + +msgid "" " By default, clone will check out the head of the 'default' branch.\n" " If the -U/--noupdate option is used, the new clone will contain\n" " only a repository (.hg) and no working copy (the working copy\n" -" parent is the null revision).\n" -"\n" -" See 'hg help urls' for valid source format details.\n" -"\n" +" parent is the null revision)." +msgstr "" + +msgid " See 'hg help urls' for valid source format details." +msgstr "" + +msgid "" " It is possible to specify an ssh:// URL as the destination, but no\n" " .hg/hgrc and working directory will be created on the remote side.\n" -" Please see 'hg help urls' for important details about ssh:// URLs.\n" -"\n" +" Please see 'hg help urls' for important details about ssh:// URLs." +msgstr "" + +msgid "" " For efficiency, hardlinks are used for cloning whenever the source\n" " and destination are on the same filesystem (note this applies only\n" " to the repository data, not to the checked out files). Some\n" " filesystems, such as AFS, implement hardlinking incorrectly, but\n" " do not report errors. In these cases, use the --pull option to\n" -" avoid hardlinking.\n" -"\n" +" avoid hardlinking." +msgstr "" + +msgid "" " In some cases, you can clone repositories and checked out files\n" -" using full hardlinks with ::\n" -"\n" -" $ cp -al REPO REPOCLONE\n" -"\n" +" using full hardlinks with ::" +msgstr "" + +msgid " $ cp -al REPO REPOCLONE" +msgstr "" + +msgid "" " This is the fastest way to clone, but it is not always safe. The\n" " operation is not atomic (making sure REPO is not modified during\n" " the operation is up to you) and you have to make sure your editor\n" @@ -4995,37 +5681,33 @@ msgstr "" #, fuzzy -msgid "" -"commit the specified files or all outstanding changes\n" -"\n" +msgid "commit the specified files or all outstanding changes" +msgstr "提交指定文件的修改或全部修改" + +#, fuzzy +msgid "" " Commit changes to the given files into the repository. Unlike a\n" " centralized RCS, this operation is a local operation. See hg push\n" -" for a way to actively distribute your changes.\n" -"\n" +" for a way to actively distribute your changes." +msgstr " 将指定文件的修改提交到版本库。" + +#, fuzzy +msgid "" " If a list of files is omitted, all changes reported by \"hg status\"\n" -" will be committed.\n" -"\n" +" will be committed." +msgstr " 如果省略了文件列表，那么 \"hg status\" 报告的所有修改都被提交。" + +#, fuzzy +msgid "" " If you are committing the result of a merge, do not provide any\n" -" filenames or -I/-X filters.\n" -"\n" +" filenames or -I/-X filters." +msgstr " 如果你要提交合并结果，请不要提供任何文件名称或过滤器 '-I/-X'。" + +#, fuzzy +msgid "" " If no commit message is specified, the configured editor is\n" -" started to prompt you for a message.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " -msgstr "" -"提交指定文件的修改或全部修改\n" -"\n" -" 将指定文件的修改提交到版本库。\n" -"\n" -" 如果省略了文件列表，那么 \"hg status\" 报告的所有修改都被提交。\n" -"\n" -" 如果你要提交合并结果，请不要提供任何文件名称或过滤器 '-I/-X'。\n" -"\n" -" 如果没有指定提交日志，将会启动配置的编辑器，让你输入信息。\n" -"\n" -" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" -" " +" started to prompt you for a message." +msgstr " 如果没有指定提交日志，将会启动配置的编辑器，让你输入信息。" msgid "nothing changed\n" msgstr "没有改变\n" @@ -5037,17 +5719,22 @@ msgid "committed changeset %d:%s\n" msgstr "提交修改集 %d:%s\n" -msgid "" -"mark files as copied for the next commit\n" -"\n" +msgid "mark files as copied for the next commit" +msgstr "" + +msgid "" " Mark dest as having copies of source files. If dest is a\n" " directory, copies are put in that directory. If dest is a file,\n" -" the source must be a single file.\n" -"\n" +" the source must be a single file." +msgstr "" + +msgid "" " By default, this command copies the contents of files as they\n" " exist in the working directory. If invoked with -A/--after, the\n" -" operation is recorded, but no copying is performed.\n" -"\n" +" operation is recorded, but no copying is performed." +msgstr "" + +msgid "" " This command takes effect with the next commit. To undo a copy\n" " before that, see hg revert.\n" " " @@ -5090,17 +5777,23 @@ msgid ".hg/dirstate inconsistent with current parent's manifest" msgstr "" -msgid "" -"show combined config settings from all hgrc files\n" -"\n" -" With no arguments, print names and values of all config items.\n" -"\n" +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.\n" -"\n" +" of that config item." +msgstr "" + +msgid "" " With multiple arguments, print names and values of all config\n" -" items with matching section names.\n" -"\n" +" items with matching section names." +msgstr "" + +msgid "" " With --debug, the source (filename and line number) is printed\n" " for each config item.\n" " " @@ -5109,9 +5802,10 @@ msgid "only one config item permitted" msgstr "" -msgid "" -"manually set the parents of the current working directory\n" -"\n" +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.\n" " " @@ -5177,14 +5871,10 @@ msgid " patch test failed!\n" msgstr "" -msgid "" -" (Current patch tool may be incompatible with patch, or misconfigured. Please " -"check your .hgrc file)\n" -msgstr "" - -msgid "" -" Internal patcher failure, please report this error to http://mercurial." -"selenic.com/bts/\n" +msgid " (Current patch tool may be incompatible with patch, or misconfigured. Please check your .hgrc file)\n" +msgstr "" + +msgid " Internal patcher failure, please report this error to http://mercurial.selenic.com/bts/\n" msgstr "" msgid "Checking commit editor...\n" @@ -5228,67 +5918,78 @@ msgstr "" #, fuzzy -msgid "" -"diff repository (or selected files)\n" -"\n" -" Show differences between revisions for the specified files.\n" -"\n" -" Differences between files are shown using the unified diff format.\n" -"\n" +msgid "diff repository (or selected files)" +msgstr "在版本库中比较(指定的文件)" + +#, fuzzy +msgid " Show differences between revisions for the specified files." +msgstr " 显示指定文件在版本间的差异。" + +#, fuzzy +msgid " Differences between files are shown using the unified diff format." +msgstr " 文件间的差异使用同一差异格式显示。" + +#, fuzzy +msgid "" " NOTE: diff may generate unexpected results for merges, as it will\n" " default to comparing against the working directory's first parent\n" -" changeset if no revisions are specified.\n" -"\n" -" When two revision arguments are given, then changes are shown\n" -" between those revisions. If only one revision is specified then\n" -" that revision is compared to the working directory, and, when no\n" -" revisions are specified, the working directory files are compared\n" -" to its parent.\n" -"\n" +" changeset if no revisions are specified." +msgstr "" +" 注意: 对合并的比较可能会产生不期望的结果，因为没有指定版本时，默认\n" +" 与工作目录的直接父亲比较。" + +#, fuzzy +msgid "" " Without the -a/--text option, diff will avoid generating diffs of\n" " files it detects as binary. With -a, diff will generate a diff\n" -" anyway, probably with undesirable results.\n" -"\n" +" anyway, probably with undesirable results." +msgstr "" +" 当没有选项 '-a' 时，将会避免处理检测为二进制的文件。当使用选项 '-a'\n" +" 时，可能会有不合需要的结果。" + +#, fuzzy +msgid "" " Use the -g/--git option to generate diffs in the git extended diff\n" " format. For more information, read 'hg help diffs'.\n" " " msgstr "" -"在版本库中比较(指定的文件)\n" -"\n" -" 显示指定文件在版本间的差异。\n" -"\n" -" 文件间的差异使用同一差异格式显示。\n" -"\n" -" 注意: 对合并的比较可能会产生不期望的结果，因为没有指定版本时，默认\n" -" 与工作目录的直接父亲比较。\n" -"\n" -" 当给出两个版本参数时，会显示在这些版本间的修改。如果只给出一个版本，\n" -" 那么它将与工作目录比较。当没有指定版本时，将比较工作目录中的文件与\n" -" 它的直接父亲。\n" -"\n" -" 当没有选项 '-a' 时，将会避免处理检测为二进制的文件。当使用选项 '-a'\n" -" 时，可能会有不合需要的结果。\n" -"\n" " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读 'hg help diffs' 以\n" " 了解更多信息。\n" " " #, fuzzy -msgid "" -"dump the header and diffs for one or more changesets\n" -"\n" -" Print the changeset header and diffs for one or more revisions.\n" -"\n" +msgid "dump the header and diffs for one or more changesets" +msgstr "为一个或多个修改集输出标题和差异" + +#, fuzzy +msgid " Print the changeset header and diffs for one or more revisions." +msgstr " 为一个或多个版本输出标题和差异。" + +#, fuzzy +msgid "" " The information shown in the changeset header is: author,\n" -" changeset hash, parent(s) and commit comment.\n" -"\n" +" changeset hash, parent(s) and commit comment." +msgstr " 在修改集标题中显示的信息是: 作者，修改集哈希，父亲和提交日志。" + +#, fuzzy +msgid "" " NOTE: export may generate unexpected diff output for merge\n" " changesets, as it will compare the merge changeset against its\n" -" first parent only.\n" -"\n" +" first parent only." +msgstr "" +" 注意: 对于合并修改集，导出可能产生不期望的差异输出，因为它只会将合并\n" +" 修改集与其第一个父亲比较。" + +#, fuzzy +msgid "" " Output may be to a file, in which case the name of the file is\n" -" given using a format string. The formatting rules are as follows::\n" -"\n" +" given using a format string. The formatting rules are as follows::" +msgstr "" +" 可以输出到文件，这时会使用指定的格式化字符串构造文件名称。格式化规则\n" +" 如下:" + +#, fuzzy +msgid "" " %% literal \"%\" character\n" " %H changeset hash (40 bytes of hexadecimal)\n" " %N number of patches being generated\n" @@ -5296,31 +5997,8 @@ " %b basename of the exporting repository\n" " %h short-form changeset hash (12 bytes of hexadecimal)\n" " %n zero-padded sequence number, starting at 1\n" -" %r zero-padded changeset revision number\n" -"\n" -" Without the -a/--text option, export will avoid generating diffs\n" -" of files it detects as binary. With -a, export will generate a\n" -" diff anyway, probably with undesirable results.\n" -"\n" -" Use the -g/--git option to generate diffs in the git extended diff\n" -" format. See 'hg help diffs' for more information.\n" -"\n" -" With the --switch-parent option, the diff will be against the\n" -" second parent. It can be useful to review a merge.\n" -" " -msgstr "" -"为一个或多个修改集输出标题和差异\n" -"\n" -" 为一个或多个版本输出标题和差异。\n" -"\n" -" 在修改集标题中显示的信息是: 作者，修改集哈希，父亲和提交日志。\n" -"\n" -" 注意: 对于合并修改集，导出可能产生不期望的差异输出，因为它只会将合并\n" -" 修改集与其第一个父亲比较。\n" -"\n" -" 可以输出到文件，这时会使用指定的格式化字符串构造文件名称。格式化规则\n" -" 如下:\n" -"\n" +" %r zero-padded changeset revision number" +msgstr "" " %% 字符 \"%\"\n" " %H 修改集哈希 (40 位十六进制数字)\n" " %N 产生的补丁号\n" @@ -5328,14 +6006,31 @@ " %b 待导出的版本库的基本名称\n" " %h 短修改集哈希(12 位十六进制数字)\n" " %n 从 1 开始补 0 的序列号\n" -" %r 补 0 的修改集版本号\n" -"\n" +" %r 补 0 的修改集版本号" + +#, fuzzy +msgid "" +" Without the -a/--text option, export will avoid generating diffs\n" +" of files it detects as binary. With -a, export will generate a\n" +" diff anyway, probably with undesirable results." +msgstr "" " 当没有选项 '-a' 时，将会避免处理检测为二进制的文件。当使用选项 '-a'\n" -" 时，可能会有不合需要的结果。\n" -"\n" +" 时，可能会有不合需要的结果。" + +#, fuzzy +msgid "" +" Use the -g/--git option to generate diffs in the git extended diff\n" +" format. See 'hg help diffs' for more information." +msgstr "" " 使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n" -" 更多信息。\n" -"\n" +" 更多信息。" + +#, fuzzy +msgid "" +" With the --switch-parent option, the diff will be against the\n" +" second parent. It can be useful to review a merge.\n" +" " +msgstr "" " 使用选项 '--switch-parent'，将会与第二个父亲比较。对于复审合并很有用。\n" " " @@ -5348,16 +6043,21 @@ msgid "exporting patch:\n" msgstr "" -msgid "" -"forget the specified files on the next commit\n" -"\n" +msgid "forget the specified files on the next commit" +msgstr "" + +msgid "" " Mark the specified files so they will no longer be tracked\n" -" after the next commit.\n" -"\n" +" after the next commit." +msgstr "" + +msgid "" " This only removes files from the current branch, not from the\n" " entire project history, and it does not delete them from the\n" -" working directory.\n" -"\n" +" working directory." +msgstr "" + +msgid "" " To undo a forget before the next commit, see hg add.\n" " " msgstr "" @@ -5369,16 +6069,20 @@ msgid "not removing %s: file is already untracked\n" msgstr "" -msgid "" -"search for a pattern in specified files and revisions\n" -"\n" -" Search revisions of files for a regular expression.\n" -"\n" +msgid "search for a pattern in specified files and revisions" +msgstr "" + +msgid " Search revisions of files for a regular expression." +msgstr "" + +msgid "" " This command behaves differently than Unix grep. It only accepts\n" " Python/Perl regexps. It searches repository history, not the\n" " working directory. It always prints the revision number in which a\n" -" match appears.\n" -"\n" +" match appears." +msgstr "" + +msgid "" " By default, grep only prints output for the first revision of a\n" " file in which it finds a match. To get it to print every revision\n" " that contains a change in match status (\"-\" for a match that\n" @@ -5391,28 +6095,38 @@ msgid "grep: invalid match pattern: %s\n" msgstr "" -msgid "" -"show current repository heads or show branch heads\n" -"\n" -" With no arguments, show all repository head changesets.\n" -"\n" +msgid "show current repository heads or show branch heads" +msgstr "" + +msgid " With no arguments, show all repository head changesets." +msgstr "" + +msgid "" " Repository \"heads\" are changesets with no child changesets. They are\n" " where development generally takes place and are the usual targets\n" -" for update and merge operations.\n" -"\n" +" for update and merge operations." +msgstr "" + +msgid "" " If one or more REV is given, the \"branch heads\" will be shown for\n" -" the named branch associated with the specified changeset(s).\n" -"\n" +" the named branch associated with the specified changeset(s)." +msgstr "" + +msgid "" " Branch heads are changesets on a named branch with no descendants on\n" " the same branch. A branch head could be a \"true\" (repository) head,\n" " or it could be the last changeset on that branch before it was\n" " merged into another branch, or it could be the last changeset on the\n" " branch before a new branch was created. If none of the branch heads\n" -" are true heads, the branch is considered inactive.\n" -"\n" +" are true heads, the branch is considered inactive." +msgstr "" + +msgid "" " If -c/--closed is specified, also show branch heads marked closed\n" -" (see hg commit --close-branch).\n" -"\n" +" (see hg commit --close-branch)." +msgstr "" + +msgid "" " If STARTREV is specified, only those heads that are descendants of\n" " STARTREV will be displayed.\n" " " @@ -5433,11 +6147,13 @@ msgid "no changes on branch %s are reachable from %s\n" msgstr "" -msgid "" -"show help for a given topic or a help overview\n" -"\n" -" With no arguments, print a list of commands with short help messages.\n" -"\n" +msgid "show help for a given topic or a help overview" +msgstr "" + +msgid " With no arguments, print a list of commands with short help messages." +msgstr "" + +msgid "" " Given a topic, extension, or command name, print help for that\n" " topic." msgstr "" @@ -5459,12 +6175,8 @@ msgid "use \"hg -v help %s\" to show global options" msgstr "使用 \"hg -v help %s\" 显示全局选项" -msgid "" -"list of commands:\n" -"\n" -msgstr "" -"命令列表:\n" -"\n" +msgid "list of commands:" +msgstr "命令列表:" #, python-format msgid "" @@ -5494,39 +6206,36 @@ msgstr "没有可用的帮助信息" #, fuzzy, python-format -msgid "" -"%s extension - %s\n" -"\n" +msgid "%s extension - %s" msgstr "** 已加载的扩展: %s\n" msgid "Mercurial Distributed SCM\n" msgstr "分布式软件配置管理工具 - 水银\n" -msgid "" -"basic commands:\n" -"\n" -msgstr "" -"基本命令:\n" -"\n" - -msgid "" -"\n" -"additional help topics:\n" -"\n" -msgstr "" -"\n" -"额外的帮助主题:\n" -"\n" - -msgid "" -"identify the working copy or specified revision\n" -"\n" +msgid "basic commands:" +msgstr "基本命令:" + +msgid "" +"\n" +"additional help topics:" +msgstr "" +"\n" +"额外的帮助主题:" + +msgid "identify the working copy or specified revision" +msgstr "" + +msgid "" " With no revision, print a summary of the current state of the\n" -" repository.\n" -"\n" +" repository." +msgstr "" + +msgid "" " Specifying a path to a repository root or Mercurial bundle will\n" -" cause lookup to operate on that repository/bundle.\n" -"\n" +" cause lookup to operate on that repository/bundle." +msgstr "" + +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" @@ -5534,35 +6243,47 @@ " " msgstr "" -msgid "" -"import an ordered set of patches\n" -"\n" -" Import a list of patches and commit them individually.\n" -"\n" +msgid "import an ordered set of patches" +msgstr "" + +msgid " Import a list of patches and commit them individually." +msgstr "" + +msgid "" " If there are outstanding changes in the working directory, import\n" -" will abort unless given the -f/--force flag.\n" -"\n" +" will abort unless given the -f/--force flag." +msgstr "" + +msgid "" " You can import a patch straight from a mail message. Even patches\n" " as attachments work (to use the body part, it must have type\n" " text/plain or text/x-patch). From and Subject headers of email\n" " message are used as default committer and commit message. All\n" " text/plain body parts before first diff are added to commit\n" -" message.\n" -"\n" +" message." +msgstr "" + +msgid "" " If the imported patch was generated by hg export, user and\n" " description from patch override values from message headers and\n" " body. Values given on command line with -m/--message and -u/--user\n" -" override these.\n" -"\n" +" override these." +msgstr "" + +msgid "" " If --exact is specified, import will set the working directory to\n" " the parent of each patch before applying it, and will abort if the\n" " resulting changeset has a different ID than the one recorded in\n" " the patch. This may happen due to character set problems or other\n" -" deficiencies in the text patch format.\n" -"\n" +" deficiencies in the text patch format." +msgstr "" + +msgid "" " With -s/--similarity, hg will attempt to discover renames and\n" -" copies in the patch in the same way as 'addremove'.\n" -"\n" +" copies in the patch in the same way as 'addremove'." +msgstr "" + +msgid "" " To read a patch from standard input, use \"-\" as the patch name. If\n" " a URL is specified, the patch will be downloaded from it.\n" " See 'hg help dates' for a list of formats valid for -d/--date.\n" @@ -5588,56 +6309,69 @@ msgid "patch is damaged or loses information" msgstr "" -msgid "" -"show new changesets found in source\n" -"\n" +msgid "show new changesets found in source" +msgstr "" + +msgid "" " Show new changesets found in the specified path/URL or the default\n" " pull location. These are the changesets that would have been pulled\n" -" if a pull at the time you issued this command.\n" -"\n" +" if a pull at the time you issued this command." +msgstr "" + +msgid "" " For remote repository, using --bundle avoids downloading the\n" -" changesets twice if the incoming is followed by a pull.\n" -"\n" +" changesets twice if the incoming is followed by a pull." +msgstr "" + +msgid "" " See pull for valid source format details.\n" " " msgstr "" #, fuzzy -msgid "" -"create a new repository in the given directory\n" -"\n" +msgid "create a new repository in the given directory" +msgstr "在指定目录创建新版本库" + +#, fuzzy +msgid "" " Initialize a new repository in the given directory. If the given\n" -" directory does not exist, it will be created.\n" -"\n" -" If no directory is given, the current directory is used.\n" -"\n" +" directory does not exist, it will be created." +msgstr " 在指定目录初始化新版本库。如果指定的目录不存在，那么会被创建。" + +#, fuzzy +msgid " If no directory is given, the current directory is used." +msgstr " 如果没有指定目录，就使用当前目录。" + +#, fuzzy +msgid "" " It is possible to specify an ssh:// URL as the destination.\n" " See 'hg help urls' for more information.\n" " " msgstr "" -"在指定目录创建新版本库\n" -"\n" -" 在指定目录初始化新版本库。如果指定的目录不存在，那么会被创建。\n" -"\n" -" 如果没有指定目录，就使用当前目录。\n" -"\n" " 可以指定位置 'ssh://' 作为目标。参见命令 'hg help urls' 的帮助信息，\n" " 以了解位置 'ssh://' 的重要详情。\n" " " -msgid "" -"locate files matching specific patterns\n" -"\n" +msgid "locate files matching specific patterns" +msgstr "" + +msgid "" " Print files under Mercurial control in the working directory whose\n" -" names match the given patterns.\n" -"\n" +" names match the given patterns." +msgstr "" + +msgid "" " By default, this command searches all directories in the working\n" " directory. To search just the current directory and its\n" -" subdirectories, use \"--include .\".\n" -"\n" +" subdirectories, use \"--include .\"." +msgstr "" + +msgid "" " If no patterns are given to match, this command prints the names\n" -" of all files under Mercurial control in the working directory.\n" -"\n" +" of all files under Mercurial control in the working directory." +msgstr "" + +msgid "" " If you want to feed the output of this command into the \"xargs\"\n" " command, use the -0 option to both this command and \"xargs\". This\n" " will avoid the problem of \"xargs\" treating single filenames that\n" @@ -5646,29 +6380,156 @@ msgstr "" #, fuzzy -msgid "" -"show revision history of entire repository or files\n" -"\n" +msgid "show revision history of entire repository or files" +msgstr "" +"显示全部版本库或指定文件的版本历史\n" +"\n" +" 显示全部版本库或指定文件的版本历史。\n" +"\n" +" 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n" +" 会跟踪改名或复制的历史。当不给出文件名称时，使用 '--follow' 只显\n" +" 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n" +" 个父亲。\n" +"\n" +" 如果没有指定版本范围，默认是 'tip:0'。当使用 '--follow' 时，使用\n" +" 工作目录的父亲作为开始版本。\n" +"\n" +" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" +"\n" +" 此命令缺省输出: 修改集标识和哈希，标签，父亲，提交者，日期和时间，\n" +" 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时，会显示文件\n" +" 变更列表和完整的提交信息。\n" +"\n" +" 注意: 对于合并修改集，'log -p' 可能产生不期望的差异输出，因为它只\n" +" 会将合并修改集与其第一个父亲比较。而且，只显示对所有父亲都不同的\n" +" 文件列表。\n" +"\n" +" " + +#, fuzzy +msgid "" " Print the revision history of the specified files or the entire\n" -" project.\n" -"\n" +" project." +msgstr "" +"显示全部版本库或指定文件的版本历史\n" +"\n" +" 显示全部版本库或指定文件的版本历史。\n" +"\n" +" 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n" +" 会跟踪改名或复制的历史。当不给出文件名称时，使用 '--follow' 只显\n" +" 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n" +" 个父亲。\n" +"\n" +" 如果没有指定版本范围，默认是 'tip:0'。当使用 '--follow' 时，使用\n" +" 工作目录的父亲作为开始版本。\n" +"\n" +" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" +"\n" +" 此命令缺省输出: 修改集标识和哈希，标签，父亲，提交者，日期和时间，\n" +" 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时，会显示文件\n" +" 变更列表和完整的提交信息。\n" +"\n" +" 注意: 对于合并修改集，'log -p' 可能产生不期望的差异输出，因为它只\n" +" 会将合并修改集与其第一个父亲比较。而且，只显示对所有父亲都不同的\n" +" 文件列表。\n" +"\n" +" " + +#, fuzzy +msgid "" " File history is shown without following rename or copy history of\n" " files. Use -f/--follow with a filename to follow history across\n" " renames and copies. --follow without a filename will only show\n" " ancestors or descendants of the starting revision. --follow-first\n" -" only follows the first parent of merge revisions.\n" -"\n" +" only follows the first parent of merge revisions." +msgstr "" +"显示全部版本库或指定文件的版本历史\n" +"\n" +" 显示全部版本库或指定文件的版本历史。\n" +"\n" +" 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n" +" 会跟踪改名或复制的历史。当不给出文件名称时，使用 '--follow' 只显\n" +" 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n" +" 个父亲。\n" +"\n" +" 如果没有指定版本范围，默认是 'tip:0'。当使用 '--follow' 时，使用\n" +" 工作目录的父亲作为开始版本。\n" +"\n" +" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" +"\n" +" 此命令缺省输出: 修改集标识和哈希，标签，父亲，提交者，日期和时间，\n" +" 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时，会显示文件\n" +" 变更列表和完整的提交信息。\n" +"\n" +" 注意: 对于合并修改集，'log -p' 可能产生不期望的差异输出，因为它只\n" +" 会将合并修改集与其第一个父亲比较。而且，只显示对所有父亲都不同的\n" +" 文件列表。\n" +"\n" +" " + +#, fuzzy +msgid "" " If no revision range is specified, the default is tip:0 unless\n" " --follow is set, in which case the working directory parent is\n" -" used as the starting revision.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -"\n" +" used as the starting revision." +msgstr "" +"显示全部版本库或指定文件的版本历史\n" +"\n" +" 显示全部版本库或指定文件的版本历史。\n" +"\n" +" 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n" +" 会跟踪改名或复制的历史。当不给出文件名称时，使用 '--follow' 只显\n" +" 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n" +" 个父亲。\n" +"\n" +" 如果没有指定版本范围，默认是 'tip:0'。当使用 '--follow' 时，使用\n" +" 工作目录的父亲作为开始版本。\n" +"\n" +" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" +"\n" +" 此命令缺省输出: 修改集标识和哈希，标签，父亲，提交者，日期和时间，\n" +" 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时，会显示文件\n" +" 变更列表和完整的提交信息。\n" +"\n" +" 注意: 对于合并修改集，'log -p' 可能产生不期望的差异输出，因为它只\n" +" 会将合并修改集与其第一个父亲比较。而且，只显示对所有父亲都不同的\n" +" 文件列表。\n" +"\n" +" " + +#, fuzzy +msgid "" " By default this command prints revision number and changeset id,\n" " tags, non-trivial parents, user, date and time, and a summary for\n" " each commit. When the -v/--verbose switch is used, the list of\n" -" changed files and full commit message are shown.\n" -"\n" +" changed files and full commit message are shown." +msgstr "" +"显示全部版本库或指定文件的版本历史\n" +"\n" +" 显示全部版本库或指定文件的版本历史。\n" +"\n" +" 显示文件历史的时候不跟踪改名或复制。对文件名称使用 '-f/--follow'\n" +" 会跟踪改名或复制的历史。当不给出文件名称时，使用 '--follow' 只显\n" +" 示开始版本的直系祖先。使用 '--follow-first' 只显示合并版本的第一\n" +" 个父亲。\n" +"\n" +" 如果没有指定版本范围，默认是 'tip:0'。当使用 '--follow' 时，使用\n" +" 工作目录的父亲作为开始版本。\n" +"\n" +" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" +"\n" +" 此命令缺省输出: 修改集标识和哈希，标签，父亲，提交者，日期和时间，\n" +" 以及每次提交的概要信息。当使用选项 '-v/--verbose' 时，会显示文件\n" +" 变更列表和完整的提交信息。\n" +"\n" +" 注意: 对于合并修改集，'log -p' 可能产生不期望的差异输出，因为它只\n" +" 会将合并修改集与其第一个父亲比较。而且，只显示对所有父亲都不同的\n" +" 文件列表。\n" +"\n" +" " + +#, fuzzy +msgid "" " NOTE: log -p/--patch may generate unexpected diff output for merge\n" " changesets, as it will only compare the merge changeset against\n" " its first parent. Also, only files different from BOTH parents\n" @@ -5699,30 +6560,65 @@ "\n" " " -msgid "" -"output the current or given revision of the project manifest\n" -"\n" +msgid "output the current or given revision of the project manifest" +msgstr "" + +msgid "" " Print a list of version controlled files for the given revision.\n" " If no revision is given, the first parent of the working directory\n" -" is used, or the null revision if no revision is checked out.\n" -"\n" +" is used, or the null revision if no revision is checked out." +msgstr "" + +msgid "" " With -v, print file permissions, symlink and executable bits.\n" " With --debug, print file revision hashes.\n" " " msgstr "" #, fuzzy -msgid "" -"merge working directory with another revision\n" -"\n" +msgid "merge working directory with another revision" +msgstr "" +"将工作目录与其它版本合并\n" +"\n" +" 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n" +" 下次提交标记为已修改，在提交之前不允许再执行更新。\n" +"\n" +" 如果没有指定版本，那么工作目录的父亲是一个合并顶点，另一个在当前分支\n" +" 中，合并后的内容是新的顶点。否则，必须明确的指定要合并的版本。\n" +" " + +#, fuzzy +msgid "" " The current working directory is updated with all changes made in\n" -" the requested revision since the last common predecessor revision.\n" -"\n" +" the requested revision since the last common predecessor revision." +msgstr "" +"将工作目录与其它版本合并\n" +"\n" +" 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n" +" 下次提交标记为已修改，在提交之前不允许再执行更新。\n" +"\n" +" 如果没有指定版本，那么工作目录的父亲是一个合并顶点，另一个在当前分支\n" +" 中，合并后的内容是新的顶点。否则，必须明确的指定要合并的版本。\n" +" " + +#, fuzzy +msgid "" " Files that changed between either parent are marked as changed for\n" " the next commit and a commit must be performed before any further\n" " updates to the repository are allowed. The next commit will have\n" -" two parents.\n" -"\n" +" two parents." +msgstr "" +"将工作目录与其它版本合并\n" +"\n" +" 将当前工作目录中的内容与指定版本合并。对任一父亲而言改变的文件都会对\n" +" 下次提交标记为已修改，在提交之前不允许再执行更新。\n" +"\n" +" 如果没有指定版本，那么工作目录的父亲是一个合并顶点，另一个在当前分支\n" +" 中，合并后的内容是新的顶点。否则，必须明确的指定要合并的版本。\n" +" " + +#, fuzzy +msgid "" " If no revision is specified, the working directory's parent is a\n" " head revision, and the current branch contains exactly one other\n" " head, the other head is merged with by default. Otherwise, an\n" @@ -5753,26 +6649,29 @@ msgid "%s - use \"hg update\" instead" msgstr "" -msgid "" -"working dir not at a head rev - use \"hg update\" or merge with an explicit " -"rev" -msgstr "" - -msgid "" -"show changesets not found in destination\n" -"\n" +msgid "working dir not at a head rev - use \"hg update\" or merge with an explicit rev" +msgstr "" + +msgid "show changesets not found in destination" +msgstr "" + +msgid "" " Show changesets not found in the specified destination repository\n" " or the default push location. These are the changesets that would\n" -" be pushed if a push was requested.\n" -"\n" +" be pushed if a push was requested." +msgstr "" + +msgid "" " See pull for valid destination format details.\n" " " msgstr "" #, fuzzy -msgid "" -"show the parents of the working directory or revision\n" -"\n" +msgid "show the parents of the working directory or revision" +msgstr "显示工作目录或指定版本的父亲" + +#, fuzzy +msgid "" " Print the working directory's parent revisions. If a revision is\n" " given via -r/--rev, the parent of that revision will be printed.\n" " If a file argument is given, the revision in which the file was\n" @@ -5780,8 +6679,6 @@ " argument to --rev if given) is printed.\n" " " msgstr "" -"显示工作目录或指定版本的父亲\n" -"\n" " 显示工作目录的父亲版本。如果使用 '--rev' 指定版本，就显示此版本的\n" " 父亲。如果指定了文件，那么使用此文件最后修改的版本(工作目录的起源\n" " 版本，或 '--rev' 指定的版本)。\n" @@ -5794,15 +6691,20 @@ msgid "'%s' not found in manifest!" msgstr "" -msgid "" -"show aliases for remote repositories\n" -"\n" +msgid "show aliases for remote repositories" +msgstr "" + +msgid "" " Show definition of symbolic path name NAME. If no name is given,\n" -" show definition of all available names.\n" -"\n" +" show definition of all available names." +msgstr "" + +msgid "" " Path names are defined in the [paths] section of /etc/mercurial/hgrc\n" -" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too.\n" -"\n" +" and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too." +msgstr "" + +msgid "" " See 'hg help urls' for more information.\n" " " msgstr "" @@ -5820,21 +6722,71 @@ msgstr "" #, fuzzy -msgid "" -"pull changes from the specified source\n" -"\n" -" Pull changes from a remote repository to a local one.\n" -"\n" +msgid "pull changes from the specified source" +msgstr "" +"从指定版本库取得修改集\n" +"\n" +" 从远程版本库取得修改集到本地版本库。\n" +"\n" +" 查找位于指定路径或位置的版本库的全部修改，增加到版本版本库。默认不\n" +" 更新工作目录。\n" +"\n" +" 如果没有指定位置，就使用路径 'default'。参见 'hg help urls' 以了解\n" +" 更多信息。\n" +" " + +#, fuzzy +msgid " Pull changes from a remote repository to a local one." +msgstr "" +"从指定版本库取得修改集\n" +"\n" +" 从远程版本库取得修改集到本地版本库。\n" +"\n" +" 查找位于指定路径或位置的版本库的全部修改，增加到版本版本库。默认不\n" +" 更新工作目录。\n" +"\n" +" 如果没有指定位置，就使用路径 'default'。参见 'hg help urls' 以了解\n" +" 更多信息。\n" +" " + +#, fuzzy +msgid "" " This finds all changes from the repository at the specified path\n" " or URL and adds them to a local repository (the current one unless\n" " -R is specified). By default, this does not update the copy of the\n" -" project in the working directory.\n" -"\n" +" project in the working directory." +msgstr "" +"从指定版本库取得修改集\n" +"\n" +" 从远程版本库取得修改集到本地版本库。\n" +"\n" +" 查找位于指定路径或位置的版本库的全部修改，增加到版本版本库。默认不\n" +" 更新工作目录。\n" +"\n" +" 如果没有指定位置，就使用路径 'default'。参见 'hg help urls' 以了解\n" +" 更多信息。\n" +" " + +#, fuzzy +msgid "" " Use hg incoming if you want to see what would have been added by a\n" " pull at the time you issued this command. If you then decide to\n" " added those changes to the repository, you should use pull -r X\n" -" where X is the last changeset listed by hg incoming.\n" -"\n" +" where X is the last changeset listed by hg incoming." +msgstr "" +"从指定版本库取得修改集\n" +"\n" +" 从远程版本库取得修改集到本地版本库。\n" +"\n" +" 查找位于指定路径或位置的版本库的全部修改，增加到版本版本库。默认不\n" +" 更新工作目录。\n" +"\n" +" 如果没有指定位置，就使用路径 'default'。参见 'hg help urls' 以了解\n" +" 更多信息。\n" +" " + +#, fuzzy +msgid "" " If SOURCE is omitted, the 'default' path will be used.\n" " See 'hg help urls' for more information.\n" " " @@ -5851,41 +6803,47 @@ " " #, fuzzy -msgid "" -"push changes to the specified destination\n" -"\n" -" Push changes from the local repository to the given destination.\n" -"\n" +msgid "push changes to the specified destination" +msgstr "推送改变到指定位置" + +#, fuzzy +msgid " Push changes from the local repository to the given destination." +msgstr " 从本地版本库推送改变到指定位置。" + +#, fuzzy +msgid "" " This is the symmetrical operation for pull. It moves changes from\n" " the current repository to a different one. If the destination is\n" " local this is identical to a pull in that directory from the\n" -" current one.\n" -"\n" +" current one." +msgstr "" +" 这是 'pull' 的对称操作。它从当前版本库推送改变到其它版本库。如果目标\n" +" 是本地版本库，那么此操作与在目标版本库从当前版本库执行 'pull' 操作等\n" +" 同。" + +#, fuzzy +msgid "" " By default, push will refuse to run if it detects the result would\n" " increase the number of remote heads. This generally indicates the\n" -" user forgot to pull and merge before pushing.\n" -"\n" +" user forgot to pull and merge before pushing." +msgstr "" +" 推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n" +" 之前忘记取得远程版本库的修改，并且合并。" + +#, fuzzy +msgid "" " If -r/--rev is used, the named revision and all its ancestors will\n" -" be pushed to the remote repository.\n" -"\n" +" be pushed to the remote repository." +msgstr "" +" 如果使用了选项 '-r'，此命名修改集以及其祖先都会被推送到远程版本库。\n" +" " + +#, fuzzy +msgid "" " Please see 'hg help urls' for important details about ssh://\n" " URLs. If DESTINATION is omitted, a default path will be used.\n" " " msgstr "" -"推送改变到指定位置\n" -"\n" -" 从本地版本库推送改变到指定位置。\n" -"\n" -" 这是 'pull' 的对称操作。它从当前版本库推送改变到其它版本库。如果目标\n" -" 是本地版本库，那么此操作与在目标版本库从当前版本库执行 'pull' 操作等\n" -" 同。\n" -"\n" -" 推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n" -" 之前忘记取得远程版本库的修改，并且合并。\n" -"\n" -" 如果使用了选项 '-r'，此命名修改集以及其祖先都会被推送到远程版本库。\n" -" \n" -"\n" " 参见主题 'urls' 的帮助信息，以了解位置 'ssh://' 的重要详情。如果没有\n" " 给出目标位置，那么使用默认路径。参见 'hg help urls' 以了解更多信息。\n" " " @@ -5894,11 +6852,13 @@ msgid "pushing to %s\n" msgstr "正在推到 %s\n" -msgid "" -"roll back an interrupted transaction\n" -"\n" -" Recover from an interrupted commit or pull.\n" -"\n" +msgid "roll back an interrupted transaction" +msgstr "" + +msgid " Recover from an interrupted commit or pull." +msgstr "" + +msgid "" " This command tries to fix the repository status after an\n" " interrupted operation. It should only be necessary when Mercurial\n" " suggests it.\n" @@ -5906,51 +6866,57 @@ msgstr "" #, fuzzy -msgid "" -"remove the specified files on the next commit\n" -"\n" -" Schedule the indicated files for removal from the repository.\n" -"\n" +msgid "remove the specified files on the next commit" +msgstr "在下次提交时删除指定文件" + +#, fuzzy +msgid " Schedule the indicated files for removal from the repository." +msgstr " 调度从版本库删除指定文件。" + +#, fuzzy +msgid "" " This only removes files from the current branch, not from the\n" " entire project history. -A/--after can be used to remove only\n" " files that have already been deleted, -f/--force can be used to\n" " force deletion, and -Af can be used to remove files from the next\n" -" revision without deleting them from the working directory.\n" -"\n" +" revision without deleting them from the working directory." +msgstr "" +" 它只从当前分支删除文件，不删除历史。'-A' 用于只移除已经删除的文\n" +" 件，'-f' 用于强制删除，'-Af' 用于从下个版本移除文件，但是不删除\n" +" 它们。" + +#, fuzzy +msgid "" " The following table details the behavior of remove for different\n" " file states (columns) and option combinations (rows). The file\n" " states are Added [A], Clean [C], Modified [M] and Missing [!] (as\n" " reported by hg status). The actions are Warn, Remove (from branch)\n" -" and Delete (from disk)::\n" -"\n" +" and Delete (from disk)::" +msgstr "" +" 下表给出了删除不同状态(列)文件的行为和可选的组合(行)。文件状态\n" +" ('hg status' 报告的状态)是增加(A)，干净(C)，已修改(M)，丢失(!)。\n" +" 动作是警告(W)，移除(R，从分支)，以及删除(D，从磁盘)。" + +#, fuzzy +msgid "" " A C M !\n" " none W RD W R\n" " -f R RD RD R\n" " -A W W W R\n" -" -Af R R R R\n" -"\n" -" This command schedules the files to be removed at the next commit.\n" -" To undo a remove before that, see hg revert.\n" -" " -msgstr "" -"在下次提交时删除指定文件\n" -"\n" -" 调度从版本库删除指定文件。\n" -"\n" -" 它只从当前分支删除文件，不删除历史。'-A' 用于只移除已经删除的文\n" -" 件，'-f' 用于强制删除，'-Af' 用于从下个版本移除文件，但是不删除\n" -" 它们。\n" -"\n" -" 下表给出了删除不同状态(列)文件的行为和可选的组合(行)。文件状态\n" -" ('hg status' 报告的状态)是增加(A)，干净(C)，已修改(M)，丢失(!)。\n" -" 动作是警告(W)，移除(R，从分支)，以及删除(D，从磁盘)。\n" -"\n" +" -Af R R R R" +msgstr "" " A C M !\n" " none W RD W R\n" " -f R RD RD R\n" " -A W W W R\n" -" -Af R R R R\n" -"\n" +" -Af R R R R" + +#, fuzzy +msgid "" +" This command schedules the files to be removed at the next commit.\n" +" To undo a remove before that, see hg revert.\n" +" " +msgstr "" " 此命令调度下次提交时删除文件。\n" " 要在此之前撤销删除，请参见 'hg revert'。\n" " " @@ -5972,39 +6938,46 @@ msgid "has been marked for add" msgstr "" -msgid "" -"rename files; equivalent of copy + remove\n" -"\n" +msgid "rename files; equivalent of copy + remove" +msgstr "" + +msgid "" " Mark dest as copies of sources; mark sources for deletion. If dest\n" " is a directory, copies are put in that directory. If dest is a\n" -" file, there can only be one source.\n" -"\n" -" By default, this command copies the contents of files as they\n" -" exist in the working directory. If invoked with -A/--after, the\n" -" operation is recorded, but no copying is performed.\n" -"\n" +" file, there can only be one source." +msgstr "" + +msgid "" " This command takes effect at the next commit. To undo a rename\n" " before that, see hg revert.\n" " " msgstr "" -msgid "" -"retry file merges from a merge or update\n" -"\n" +msgid "retry file merges from a merge or update" +msgstr "" + +msgid "" " This command will cleanly retry unresolved file merges using file\n" " revisions preserved from the last update or merge. To attempt to\n" -" resolve all unresolved files, use the -a/--all switch.\n" -"\n" +" resolve all unresolved files, use the -a/--all switch." +msgstr "" + +msgid "" " If a conflict is resolved manually, please note that the changes\n" " will be overwritten if the merge is retried with resolve. The\n" -" -m/--mark switch should be used to mark the file as resolved.\n" -"\n" +" -m/--mark switch should be used to mark the file as resolved." +msgstr "" + +msgid "" " This command also allows listing resolved files and manually\n" " indicating whether or not files are resolved. All files must be\n" -" marked as resolved before a commit is permitted.\n" -"\n" -" The codes used to show the status of files are::\n" -"\n" +" marked as resolved before a commit is permitted." +msgstr "" + +msgid " The codes used to show the status of files are::" +msgstr "" + +msgid "" " U = unresolved\n" " R = resolved\n" " " @@ -6019,36 +6992,49 @@ msgid "no files or directories specified; use --all to remerge all files" msgstr "" -msgid "" -"restore individual files or directories to an earlier state\n" -"\n" +msgid "restore individual files or directories to an earlier state" +msgstr "" + +msgid "" " (Use update -r to check out earlier revisions, revert does not\n" -" change the working directory parents.)\n" -"\n" +" change the working directory parents.)" +msgstr "" + +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 the\n" -" revision to revert to.\n" -"\n" +" revision to revert to." +msgstr "" + +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" -"\n" +" dates' for a list of formats valid for -d/--date." +msgstr "" + +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.\n" -"\n" +" afterwards." +msgstr "" + +msgid "" " If a file has been deleted, it is restored. If the executable mode\n" -" of a file was changed, it is reset.\n" -"\n" +" of a file was changed, it is reset." +msgstr "" + +msgid "" " If names are given, all files matching the names are reverted.\n" -" If no arguments are given, no files are reverted.\n" -"\n" +" If no arguments are given, no files are reverted." +msgstr "" + +msgid "" " Modified files are saved with a .orig suffix before reverting.\n" " To disable these backups, use --no-backup.\n" " " @@ -6084,26 +7070,33 @@ msgid "no changes needed to %s\n" msgstr "不需要改变 %s\n" -msgid "" -"roll back the last transaction\n" -"\n" +msgid "roll back the last transaction" +msgstr "" + +msgid "" " This command should be used with care. There is only one level of\n" " rollback, and there is no way to undo a rollback. It will also\n" " restore the dirstate at the time of the last transaction, losing\n" " any dirstate changes since that time. This command does not alter\n" -" the working directory.\n" -"\n" +" the working directory." +msgstr "" + +msgid "" " Transactions are used to encapsulate the effects of all commands\n" " that create new changesets or propagate existing changesets into a\n" " repository. For example, the following commands are transactional,\n" -" and their effects can be rolled back::\n" -"\n" +" and their effects can be rolled back::" +msgstr "" + +msgid "" " commit\n" " import\n" " pull\n" " push (with this repository as destination)\n" -" unbundle\n" -"\n" +" unbundle" +msgstr "" + +msgid "" " This command is not intended for use on public repositories. Once\n" " changes are visible for pull by other users, rolling a transaction\n" " back locally is ineffective (someone else may already have pulled\n" @@ -6113,28 +7106,29 @@ " " msgstr "" -msgid "" -"print the root (top) of the current working directory\n" -"\n" +msgid "print the root (top) of the current working directory" +msgstr "" + +msgid "" " Print the root directory of the current repository.\n" " " msgstr "" #, fuzzy -msgid "" -"export the repository via HTTP\n" -"\n" -" Start a local HTTP repository browser and pull server.\n" -"\n" +msgid "export the repository via HTTP" +msgstr "通过 HTTP 发布版本库" + +#, fuzzy +msgid " Start a local HTTP repository browser and pull server." +msgstr " 启动本地 HTTP 版本库浏览器和发布服务器。" + +#, fuzzy +msgid "" " By default, the server logs accesses to stdout and errors to\n" " stderr. Use the -A/--accesslog and -E/--errorlog options to log to\n" " files.\n" " " msgstr "" -"通过 HTTP 发布版本库\n" -"\n" -" 启动本地 HTTP 版本库浏览器和发布服务器。\n" -"\n" " 默认服务器访问日志输出到 stdout，错误日志输出到 stderr。\n" " 可以使用选项 \"-A\" 和 \"-E\"，将这些日志输出到文件。\n" " " @@ -6144,30 +7138,172 @@ msgstr "" #, fuzzy -msgid "" -"show changed files in the working directory\n" -"\n" +msgid "show changed files in the working directory" +msgstr "" +"显示工作目录中已改变的文件\n" +"\n" +" 显示版本库中的文件状态。如果指定文件名称，只显示匹配的文件。干净的\n" +" 文件，被忽略的文件，复制/移动的源文件，不会被显示，除非使用了选项\n" +" '-c' (干净的)，'-i' (被忽略的)，'-C' (复制源) 或者 '-A' (全部)。除\n" +" 非使用了选项 \"只显示 ...\"，否则就使用选项 '-mardu'。\n" +"\n" +" 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件，除非明确地使用选\n" +" 项 '-u/--unknown' 或 ‘-i/-ignored’。\n" +"\n" +" 注意: 如果修改了权限或者执行了合并，'status' 与 'diff' 的显示可能\n" +" 不一致。标准差异格式不报告权限的改变，'diff' 只报告相对于一个合并\n" +" 父亲的改变。\n" +"\n" +" 如果给出 1 个版本，就用于基础版本。如果给出 2 个版本，就显示其差异。\n" +"\n" +" 显示文件状态的代码是:\n" +" M = 已修改\n" +" A = 已增加\n" +" R = 已移除\n" +" C = 干净的\n" +" ! = 已删除，仍旧被跟踪\n" +" ? = 未跟踪\n" +" I = 已忽略\n" +" = 早先增加的文件自此复制\n" +" " + +#, fuzzy +msgid "" " Show status of files in the repository. If names are given, only\n" " files that match are shown. Files that are clean or ignored or\n" " the source of a copy/move operation, are not listed unless\n" " -c/--clean, -i/--ignored, -C/--copies or -A/--all are given.\n" " Unless options described with \"show only ...\" are given, the\n" -" options -mardu are used.\n" -"\n" +" options -mardu are used." +msgstr "" +"显示工作目录中已改变的文件\n" +"\n" +" 显示版本库中的文件状态。如果指定文件名称，只显示匹配的文件。干净的\n" +" 文件，被忽略的文件，复制/移动的源文件，不会被显示，除非使用了选项\n" +" '-c' (干净的)，'-i' (被忽略的)，'-C' (复制源) 或者 '-A' (全部)。除\n" +" 非使用了选项 \"只显示 ...\"，否则就使用选项 '-mardu'。\n" +"\n" +" 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件，除非明确地使用选\n" +" 项 '-u/--unknown' 或 ‘-i/-ignored’。\n" +"\n" +" 注意: 如果修改了权限或者执行了合并，'status' 与 'diff' 的显示可能\n" +" 不一致。标准差异格式不报告权限的改变，'diff' 只报告相对于一个合并\n" +" 父亲的改变。\n" +"\n" +" 如果给出 1 个版本，就用于基础版本。如果给出 2 个版本，就显示其差异。\n" +"\n" +" 显示文件状态的代码是:\n" +" M = 已修改\n" +" A = 已增加\n" +" R = 已移除\n" +" C = 干净的\n" +" ! = 已删除，仍旧被跟踪\n" +" ? = 未跟踪\n" +" I = 已忽略\n" +" = 早先增加的文件自此复制\n" +" " + +#, fuzzy +msgid "" " Option -q/--quiet hides untracked (unknown and ignored) files\n" -" unless explicitly requested with -u/--unknown or -i/--ignored.\n" -"\n" +" unless explicitly requested with -u/--unknown or -i/--ignored." +msgstr "" +"显示工作目录中已改变的文件\n" +"\n" +" 显示版本库中的文件状态。如果指定文件名称，只显示匹配的文件。干净的\n" +" 文件，被忽略的文件，复制/移动的源文件，不会被显示，除非使用了选项\n" +" '-c' (干净的)，'-i' (被忽略的)，'-C' (复制源) 或者 '-A' (全部)。除\n" +" 非使用了选项 \"只显示 ...\"，否则就使用选项 '-mardu'。\n" +"\n" +" 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件，除非明确地使用选\n" +" 项 '-u/--unknown' 或 ‘-i/-ignored’。\n" +"\n" +" 注意: 如果修改了权限或者执行了合并，'status' 与 'diff' 的显示可能\n" +" 不一致。标准差异格式不报告权限的改变，'diff' 只报告相对于一个合并\n" +" 父亲的改变。\n" +"\n" +" 如果给出 1 个版本，就用于基础版本。如果给出 2 个版本，就显示其差异。\n" +"\n" +" 显示文件状态的代码是:\n" +" M = 已修改\n" +" A = 已增加\n" +" R = 已移除\n" +" C = 干净的\n" +" ! = 已删除，仍旧被跟踪\n" +" ? = 未跟踪\n" +" I = 已忽略\n" +" = 早先增加的文件自此复制\n" +" " + +#, fuzzy +msgid "" " NOTE: status may appear to disagree with diff if permissions have\n" " changed or a merge has occurred. The standard diff format does not\n" " report permission changes and diff only reports changes relative\n" -" to one merge parent.\n" -"\n" +" to one merge parent." +msgstr "" +"显示工作目录中已改变的文件\n" +"\n" +" 显示版本库中的文件状态。如果指定文件名称，只显示匹配的文件。干净的\n" +" 文件，被忽略的文件，复制/移动的源文件，不会被显示，除非使用了选项\n" +" '-c' (干净的)，'-i' (被忽略的)，'-C' (复制源) 或者 '-A' (全部)。除\n" +" 非使用了选项 \"只显示 ...\"，否则就使用选项 '-mardu'。\n" +"\n" +" 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件，除非明确地使用选\n" +" 项 '-u/--unknown' 或 ‘-i/-ignored’。\n" +"\n" +" 注意: 如果修改了权限或者执行了合并，'status' 与 'diff' 的显示可能\n" +" 不一致。标准差异格式不报告权限的改变，'diff' 只报告相对于一个合并\n" +" 父亲的改变。\n" +"\n" +" 如果给出 1 个版本，就用于基础版本。如果给出 2 个版本，就显示其差异。\n" +"\n" +" 显示文件状态的代码是:\n" +" M = 已修改\n" +" A = 已增加\n" +" R = 已移除\n" +" C = 干净的\n" +" ! = 已删除，仍旧被跟踪\n" +" ? = 未跟踪\n" +" I = 已忽略\n" +" = 早先增加的文件自此复制\n" +" " + +#, fuzzy +msgid "" " If one revision is given, it is used as the base revision.\n" " If two revisions are given, the differences between them are\n" -" shown.\n" -"\n" -" The codes used to show the status of files are::\n" -"\n" +" shown." +msgstr "" +"显示工作目录中已改变的文件\n" +"\n" +" 显示版本库中的文件状态。如果指定文件名称，只显示匹配的文件。干净的\n" +" 文件，被忽略的文件，复制/移动的源文件，不会被显示，除非使用了选项\n" +" '-c' (干净的)，'-i' (被忽略的)，'-C' (复制源) 或者 '-A' (全部)。除\n" +" 非使用了选项 \"只显示 ...\"，否则就使用选项 '-mardu'。\n" +"\n" +" 选项 '-q/--quiet' 隐藏未跟踪(未知或被忽略)的文件，除非明确地使用选\n" +" 项 '-u/--unknown' 或 ‘-i/-ignored’。\n" +"\n" +" 注意: 如果修改了权限或者执行了合并，'status' 与 'diff' 的显示可能\n" +" 不一致。标准差异格式不报告权限的改变，'diff' 只报告相对于一个合并\n" +" 父亲的改变。\n" +"\n" +" 如果给出 1 个版本，就用于基础版本。如果给出 2 个版本，就显示其差异。\n" +"\n" +" 显示文件状态的代码是:\n" +" M = 已修改\n" +" A = 已增加\n" +" R = 已移除\n" +" C = 干净的\n" +" ! = 已删除，仍旧被跟踪\n" +" ? = 未跟踪\n" +" I = 已忽略\n" +" = 早先增加的文件自此复制\n" +" " + +#, fuzzy +msgid "" " M = modified\n" " A = added\n" " R = removed\n" @@ -6205,26 +7341,29 @@ " = 早先增加的文件自此复制\n" " " -msgid "" -"add one or more tags for the current or given revision\n" -"\n" -" Name a particular revision using <name>.\n" -"\n" +msgid "add one or more tags for the current or given revision" +msgstr "" + +msgid " Name a particular revision using <name>." +msgstr "" + +msgid "" " Tags are used to name particular revisions of the repository and are\n" " very useful to compare different revisions, to go back to significant\n" -" earlier versions or to mark branch points as releases, etc.\n" -"\n" +" earlier versions or to mark branch points as releases, etc." +msgstr "" + +msgid "" " If no revision is given, the parent of the working directory is\n" -" used, or tip if no revision is checked out.\n" -"\n" +" used, or tip if no revision is checked out." +msgstr "" + +msgid "" " To facilitate version control, distribution, and merging of tags,\n" " they are stored as a file named \".hgtags\" which is managed\n" " similarly to other project files and can be hand-edited if\n" " necessary. The file '.hg/localtags' is used for local tags (not\n" -" shared among repositories).\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " +" shared among repositories)." msgstr "" msgid "tag names must be unique" @@ -6253,21 +7392,25 @@ msgid "tag '%s' already exists (use -f to force)" msgstr "" -msgid "" -"list repository tags\n" -"\n" +msgid "list repository tags" +msgstr "" + +msgid "" " This lists both regular and local tags. When the -v/--verbose\n" " switch is used, a third column \"local\" is printed for local tags.\n" " " msgstr "" -msgid "" -"show the tip revision\n" -"\n" +msgid "show the tip revision" +msgstr "" + +msgid "" " The tip revision (usually just called the tip) is the changeset\n" " most recently added to the repository (and therefore the most\n" -" recently changed head).\n" -"\n" +" recently changed head)." +msgstr "" + +msgid "" " If you have just made a commit, that commit will be the tip. If\n" " you have just pulled changes from another repository, the tip of\n" " that repository becomes the current tip. The \"tip\" tag is special\n" @@ -6275,66 +7418,68 @@ " " msgstr "" -msgid "" -"apply one or more changegroup files\n" -"\n" +msgid "apply one or more changegroup files" +msgstr "" + +msgid "" " Apply one or more compressed changegroup files generated by the\n" " bundle command.\n" " " msgstr "" #, fuzzy -msgid "" -"update working directory\n" -"\n" +msgid "update working directory" +msgstr "更新工作目录" + +#, fuzzy +msgid "" " Update the repository's working directory to the specified\n" " revision, or the tip of the current branch if none is specified.\n" " Use null as the revision to remove the working copy (like 'hg\n" -" clone -U').\n" -"\n" +" clone -U')." +msgstr "" +" 更新工作目录到指定版本，或者到当前分支的顶点。使用 'null' 作为版本可以\n" +" 删除工作副本(类似于 'hg clone -U')。" + +#, fuzzy +msgid "" " When the working directory contains no uncommitted changes, it\n" " will be replaced by the state of the requested revision from the\n" " repository. When the requested revision is on a different branch,\n" " the working directory will additionally be switched to that\n" -" branch.\n" -"\n" +" branch." +msgstr "" +" 当工作目录包含未提交的修改时，它会被版本库中指定版本的状态替换。当请求\n" +" 的版本位于不同分支时，工作目录会被切换到此分支。" + +#, fuzzy +msgid "" " When there are uncommitted changes, use option -C/--clean to\n" " discard them, forcibly replacing the state of the working\n" " directory with the requested revision. Alternately, use -c/--check\n" -" to abort.\n" -"\n" +" to abort." +msgstr "" +" 可以使用选项 '-C' 来丢弃未提交的修改，强制使用请求的版本替换工作目录的\n" +" 状态。" + +#, fuzzy +msgid "" " When there are uncommitted changes and option -C/--clean is not\n" " used, and the parent revision and requested revision are on the\n" " same branch, and one of them is an ancestor of the other, then the\n" " new working directory will contain the requested revision merged\n" " with the uncommitted changes. Otherwise, the update will fail with\n" -" a suggestion to use 'merge' or 'update -C' instead.\n" -"\n" -" If you want to update just one file to an older revision, use\n" -" revert.\n" -"\n" -" See 'hg help dates' for a list of formats valid for -d/--date.\n" -" " -msgstr "" -"更新工作目录\n" -"\n" -" 更新工作目录到指定版本，或者到当前分支的顶点。使用 'null' 作为版本可以\n" -" 删除工作副本(类似于 'hg clone -U')。\n" -"\n" -" 当工作目录包含未提交的修改时，它会被版本库中指定版本的状态替换。当请求\n" -" 的版本位于不同分支时，工作目录会被切换到此分支。\n" -"\n" -" 可以使用选项 '-C' 来丢弃未提交的修改，强制使用请求的版本替换工作目录的\n" -" 状态。\n" -"\n" +" a suggestion to use 'merge' or 'update -C' instead." +msgstr "" " 当有未提交的修改，没有使用选项 '-C'，父版本和请求版本位于不同分支，并且\n" " 其中一个是另一个的祖先时，那么新的工作目录包含请求版本与未提交的修改的\n" -" 合并结果。否则，更新会失败，建议使用 'merge' 或 'update -C'。\n" -"\n" -" 如果你只想更新一个文件到旧版本，请使用 'revert'。\n" -"\n" -" 参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n" -" " +" 合并结果。否则，更新会失败，建议使用 'merge' 或 'update -C'。" + +#, fuzzy +msgid "" +" If you want to update just one file to an older revision, use\n" +" revert." +msgstr " 如果你只想更新一个文件到旧版本，请使用 'revert'。" msgid "cannot specify both -c/--check and -C/--clean" msgstr "" @@ -6343,11 +7488,13 @@ msgid "uncommitted local changes" msgstr "提交修改集 %d:%s\n" -msgid "" -"verify the integrity of the repository\n" -"\n" -" Verify the integrity of the current repository.\n" -"\n" +msgid "verify the integrity of the repository" +msgstr "" + +msgid " Verify the integrity of the current repository." +msgstr "" + +msgid "" " This will perform an extensive check of the repository's\n" " integrity, validating the hashes and checksums of each entry in\n" " the changelog, manifest, and tracked files, as well as the\n" @@ -6749,9 +7896,7 @@ msgid "[-nibt] [-r REV] [SOURCE]" msgstr "" -msgid "" -"directory strip option for patch. This has the same meaning as the " -"corresponding patch option" +msgid "directory strip option for patch. This has the same meaning as the corresponding patch option" msgstr "" msgid "base path" @@ -7242,11 +8387,8 @@ msgstr "选项 '--cwd' 不能简短!" #, fuzzy -msgid "" -"Option -R has to be separated from other options (e.g. not -qR) and --" -"repository may only be abbreviated as --repo!" -msgstr "" -"选项 -R 必须隔离使用(也就是不能 -qR)，并且 --repository 只能简短为 --repo!" +msgid "Option -R has to be separated from other options (e.g. not -qR) and --repository may only be abbreviated as --repo!" +msgstr "选项 -R 必须隔离使用(也就是不能 -qR)，并且 --repository 只能简短为 --repo!" #, python-format msgid "Time: real %.3f secs (user %.3f+%.3f sys %.3f+%.3f)\n" @@ -7263,11 +8405,8 @@ msgid "unrecognized profiling format '%s' - Ignored\n" msgstr "" -msgid "" -"lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/" -"misc/lsprof/" -msgstr "" -"lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装" +msgid "lsprof not available - install from http://codespeak.net/svn/user/arigo/hack/misc/lsprof/" +msgstr "lsprof 不可用 - 从 http://codespeak.net/svn/user/arigo/hack/misc/lsprof/ 安装" #, python-format msgid "*** failed to import extension %s from %s: %s\n" @@ -7355,31 +8494,44 @@ " Mercurial has the ability to add new features through the use of\n" " extensions. Extensions may add new commands, add options to\n" " existing commands, change the default behavior of commands, or\n" -" implement hooks.\n" -"\n" +" implement hooks." +msgstr "" + +msgid "" " Extensions are not loaded by default for a variety of reasons:\n" " they can increase startup overhead; they may be meant for advanced\n" " usage only; they may provide potentially dangerous abilities (such\n" " as letting you destroy or modify history); they might not be ready\n" " for prime time; or they may alter some usual behaviors of stock\n" " Mercurial. It is thus up to the user to activate extensions as\n" -" needed.\n" -"\n" +" needed." +msgstr "" + +msgid "" " To enable the \"foo\" extension, either shipped with Mercurial or in\n" " the Python search path, create an entry for it in your hgrc, like\n" -" this::\n" -"\n" +" this::" +msgstr "" + +msgid "" " [extensions]\n" -" foo =\n" -"\n" -" You may also specify the full path to an extension::\n" -"\n" +" foo =" +msgstr "" + +msgid " You may also specify the full path to an extension::" +msgstr "" + +msgid "" " [extensions]\n" -" myfeature = ~/.hgext/myfeature.py\n" -"\n" +" myfeature = ~/.hgext/myfeature.py" +msgstr "" + +msgid "" " To explicitly disable an extension enabled in an hgrc of broader\n" -" scope, prepend its path with !::\n" -"\n" +" scope, prepend its path with !::" +msgstr "" + +msgid "" " [extensions]\n" " # disabling extension bar residing in /path/to/extension/bar.py\n" " bar = !/path/to/extension/bar.py\n" @@ -7400,13 +8552,18 @@ msgid "" "\n" -" Some commands allow the user to specify a date, e.g.:\n" -"\n" +" Some commands allow the user to specify a date, e.g.:" +msgstr "" + +msgid "" " - backout, commit, import, tag: Specify the commit date.\n" -" - log, revert, update: Select revision(s) by date.\n" -"\n" -" Many date formats are valid. Here are some examples::\n" -"\n" +" - log, revert, update: Select revision(s) by date." +msgstr "" + +msgid " Many date formats are valid. Here are some examples::" +msgstr "" + +msgid "" " \"Wed Dec 6 13:18:29 2006\" (local timezone assumed)\n" " \"Dec 6 13:18 -0600\" (year assumed, time offset provided)\n" " \"Dec 6 13:18 UTC\" (UTC and GMT are aliases for +0000)\n" @@ -7419,19 +8576,26 @@ " \"2006-12-6\"\n" " \"12-6\"\n" " \"12/6\"\n" -" \"12/6/6\" (Dec 6 2006)\n" -"\n" -" Lastly, there is Mercurial's internal format::\n" -"\n" -" \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)\n" -"\n" +" \"12/6/6\" (Dec 6 2006)" +msgstr "" + +msgid " Lastly, there is Mercurial's internal format::" +msgstr "" + +msgid " \"1165432709 0\" (Wed Dec 6 13:18:29 2006 UTC)" +msgstr "" + +msgid "" " This is the internal representation format for dates. unixtime is\n" " the number of seconds since the epoch (1970-01-01 00:00 UTC).\n" " offset is the offset of the local timezone, in seconds west of UTC\n" -" (negative if the timezone is east of UTC).\n" -"\n" -" The log command also accepts date ranges::\n" -"\n" +" (negative if the timezone is east of UTC)." +msgstr "" + +msgid " The log command also accepts date ranges::" +msgstr "" + +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" @@ -7445,48 +8609,65 @@ msgid "" "\n" " Mercurial accepts several notations for identifying one or more\n" -" files at a time.\n" -"\n" +" files at a time." +msgstr "" + +msgid "" " By default, Mercurial treats filenames as shell-style extended\n" -" glob patterns.\n" -"\n" -" Alternate pattern notations must be specified explicitly.\n" -"\n" +" glob patterns." +msgstr "" + +msgid " Alternate pattern notations must be specified explicitly." +msgstr "" + +msgid "" " To use a plain path name without any pattern matching, start it\n" " with \"path:\". These path names must completely match starting at\n" -" the current repository root.\n" -"\n" +" the current repository root." +msgstr "" + +msgid "" " To use an extended glob, start a name with \"glob:\". Globs are\n" " rooted at the current directory; a glob such as \"``*.c``\" will\n" -" only match files in the current directory ending with \".c\".\n" -"\n" +" only match files in the current directory ending with \".c\"." +msgstr "" + +msgid "" " The supported glob syntax extensions are \"``**``\" to match any\n" -" string across path separators and \"{a,b}\" to mean \"a or b\".\n" -"\n" +" string across path separators and \"{a,b}\" to mean \"a or b\"." +msgstr "" + +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.\n" -"\n" -" Plain examples::\n" -"\n" +" Regexp pattern matching is anchored at the root of the repository." +msgstr "" + +msgid " Plain examples::" +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\"\n" -"\n" -" Glob examples::\n" -"\n" +" path:path:name a file or directory named \"path:name\"" +msgstr "" + +msgid " Glob examples::" +msgstr "" + +msgid "" " glob:*.c any name ending in \".c\" in the current directory\n" " *.c any name ending in \".c\" in the current directory\n" " **.c any name ending in \".c\" in any subdirectory of the\n" " current directory including itself.\n" " foo/*.c any name ending in \".c\" in the directory foo\n" " foo/**.c any name ending in \".c\" in any subdirectory of foo\n" -" including itself.\n" -"\n" -" Regexp examples::\n" -"\n" -" re:.*\\.c$ any name ending in \".c\", anywhere in the repository\n" -"\n" -" " +" including itself." +msgstr "" + +msgid " Regexp examples::" +msgstr "" + +msgid " re:.*\\.c$ any name ending in \".c\", anywhere in the repository" msgstr "" msgid "Environment Variables" @@ -7499,74 +8680,98 @@ " hooks, extensions or external tools. If unset or empty, this is\n" " the hg executable's name if it's frozen, or an executable named\n" " 'hg' (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n" -" Windows) is searched.\n" -"\n" +" Windows) is searched." +msgstr "" + +msgid "" "HGEDITOR\n" -" This is the name of the editor to run when committing. See EDITOR.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" This is the name of the editor to run when committing. See EDITOR." +msgstr "" + +msgid " (deprecated, use .hgrc)" +msgstr "" + +msgid "" "HGENCODING\n" " This overrides the default locale setting detected by Mercurial.\n" " This setting is used to convert data including usernames,\n" " changeset descriptions, tag names, and branches. This setting can\n" -" be overridden with the --encoding command-line option.\n" -"\n" +" be overridden with the --encoding command-line option." +msgstr "" + +msgid "" "HGENCODINGMODE\n" " This sets Mercurial's behavior for handling unknown characters\n" " while transcoding user input. The default is \"strict\", which\n" " causes Mercurial to abort if it can't map a character. Other\n" " settings include \"replace\", which replaces unknown characters, and\n" " \"ignore\", which drops them. This setting can be overridden with\n" -" the --encodingmode command-line option.\n" -"\n" +" the --encodingmode command-line option." +msgstr "" + +msgid "" "HGMERGE\n" " An executable to use for resolving merge conflicts. The program\n" " will be executed with three arguments: local file, remote file,\n" -" ancestor file.\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" ancestor file." +msgstr "" + +msgid "" "HGRCPATH\n" " A list of files or directories to search for hgrc files. Item\n" " separator is \":\" on Unix, \";\" on Windows. If HGRCPATH is not set,\n" " platform default search path is used. If empty, only the .hg/hgrc\n" -" from the current repository is read.\n" -"\n" -" For each element in HGRCPATH:\n" -"\n" +" from the current repository is read." +msgstr "" + +msgid " For each element in HGRCPATH:" +msgstr "" + +msgid "" " - if it's a directory, all files ending with .rc are added\n" -" - otherwise, the file itself will be added\n" -"\n" +" - otherwise, the file itself will be added" +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:\n" -"\n" +" available values will be considered in this order:" +msgstr "" + +msgid "" " - HGUSER (deprecated)\n" " - hgrc files from the HGRCPATH\n" " - EMAIL\n" " - interactive prompt\n" -" - LOGNAME (with '@hostname' appended)\n" -"\n" -" (deprecated, use .hgrc)\n" -"\n" +" - LOGNAME (with '@hostname' appended)" +msgstr "" + +msgid "" "EMAIL\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" +" May be used as the author of a commit; see HGUSER." +msgstr "" + +msgid "" "LOGNAME\n" -" May be used as the author of a commit; see HGUSER.\n" -"\n" +" May be used as the author of a commit; see HGUSER." +msgstr "" + +msgid "" "VISUAL\n" -" This is the name of the editor to use when committing. See EDITOR.\n" -"\n" +" This is the name of the editor to use when committing. See EDITOR." +msgstr "" + +msgid "" "EDITOR\n" " Sometimes Mercurial needs to open a text file in an editor for a\n" " user to modify, for example when writing commit messages. The\n" " editor it uses is determined by looking at the environment\n" " variables HGEDITOR, VISUAL and EDITOR, in that order. The first\n" " non-empty one is chosen. If all of them are empty, the editor\n" -" defaults to 'vi'.\n" -"\n" +" defaults to 'vi'." +msgstr "" + +msgid "" "PYTHONPATH\n" " This is used by Python to find imported modules and may need to be\n" " set appropriately if this Mercurial is not installed system-wide.\n" @@ -7578,31 +8783,45 @@ msgid "" "\n" -" Mercurial supports several ways to specify individual revisions.\n" -"\n" +" Mercurial supports several ways to specify individual revisions." +msgstr "" + +msgid "" " A plain integer is treated as a revision number. Negative integers\n" " are treated as sequential offsets from the tip, with -1 denoting\n" -" the tip, -2 denoting the revision prior to the tip, and so forth.\n" -"\n" +" the tip, -2 denoting the revision prior to the tip, and so forth." +msgstr "" + +msgid "" " A 40-digit hexadecimal string is treated as a unique revision\n" -" identifier.\n" -"\n" +" identifier." +msgstr "" + +msgid "" " A hexadecimal string less than 40 characters long is treated as a\n" " unique revision identifier and is referred to as a short-form\n" " identifier. A short-form identifier is only valid if it is the\n" -" prefix of exactly one full-length identifier.\n" -"\n" +" prefix of exactly one full-length identifier." +msgstr "" + +msgid "" " Any other string is treated as a tag or branch name. A tag name is\n" " a symbolic name associated with a revision identifier. A branch\n" " name denotes the tipmost revision of that branch. Tag and branch\n" -" names must not contain the \":\" character.\n" -"\n" +" names must not contain the \":\" character." +msgstr "" + +msgid "" " The reserved name \"tip\" is a special tag that always identifies\n" -" the most recent revision.\n" -"\n" +" the most recent revision." +msgstr "" + +msgid "" " The reserved name \"null\" indicates the null revision. This is the\n" -" revision of an empty repository, and the parent of revision 0.\n" -"\n" +" revision of an empty repository, and the parent of revision 0." +msgstr "" + +msgid "" " The reserved name \".\" indicates the working directory parent. If\n" " no working directory is checked out, it is equivalent to null. If\n" " an uncommitted merge is in progress, \".\" is the revision of the\n" @@ -7618,32 +8837,36 @@ "\n" " When Mercurial accepts more than one revision, they may be\n" " specified individually, or provided as a topologically continuous\n" -" range, separated by the \":\" character.\n" -"\n" +" range, separated by the \":\" character." +msgstr "" +"\n" +" 当水银接受多个版本时，它们可以单独给出，或者以字符 \":\" 分割的拓扑连续\n" +" 范围格式提供。" + +#, fuzzy +msgid "" " The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n" " are revision identifiers. Both BEGIN and END are optional. If\n" " BEGIN is not specified, it defaults to revision number 0. If END\n" " is not specified, it defaults to the tip. The range \":\" thus means\n" -" \"all revisions\".\n" -"\n" +" \"all revisions\"." +msgstr "" +" 范围的语法是 '[BEGIN]:[END]'，其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n" +" 和 'END' 都是可选的。'BEGIN' 默认是 0，'END' 默认是 'tip'。因此范围 \":\"\n" +" 意味着全部版本。" + +#, fuzzy +msgid "" " If BEGIN is greater than END, revisions are treated in reverse\n" -" order.\n" -"\n" +" order." +msgstr " 如果 'BEGIN' 大于 'END'，版本视为反序。" + +#, fuzzy +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" -" 当水银接受多个版本时，它们可以单独给出，或者以字符 \":\" 分割的拓扑连续\n" -" 范围格式提供。\n" -"\n" -" 范围的语法是 '[BEGIN]:[END]'，其中 'BEGIN' 和 'END' 是版本标识。'BEGIN'\n" -" 和 'END' 都是可选的。'BEGIN' 默认是 0，'END' 默认是 'tip'。因此范围 \":" -"\"\n" -" 意味着全部版本。\n" -"\n" -" 如果 'BEGIN' 大于 'END'，版本视为反序。\n" -"\n" " 范围是闭区间。即范围 '3:5' 是 '3'，'4'，'5'。同样，范围 '9:6' 是 '9'，\n" " '8'，'7' 和 '6'。\n" " " @@ -7657,29 +8880,57 @@ " Mercurial's default format for showing changes between two\n" " versions of a file is compatible with the unified format of GNU\n" " diff, which can be used by GNU patch and many other standard\n" -" tools.\n" -"\n" +" tools." +msgstr "" +"\n" +" 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容，可用于\n" +" GNU patch 和许多标准工具。" + +#, fuzzy +msgid "" " While this standard format is often enough, it does not encode the\n" -" following information:\n" -"\n" +" following information:" +msgstr " 虽然标准格式在大多数情况下都能满足要求，但是它不包含下述信息:" + +#, fuzzy +msgid "" " - executable status and other permission bits\n" " - copy or rename information\n" " - changes in binary files\n" -" - creation or deletion of empty files\n" -"\n" +" - creation or deletion of empty files" +msgstr "" +" - 可执行状态和其它权限位\n" +" - 复制或改名信息\n" +" - 二进制文件的修改\n" +" - 创建或删除空文件" + +#, fuzzy +msgid "" " Mercurial also supports the extended diff format from the git VCS\n" " which addresses these limitations. The git diff format is not\n" " produced by default because a few widespread tools still do not\n" -" understand this format.\n" -"\n" +" understand this format." +msgstr "" +" 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n" +" 此格式，所以它不是默认格式。" + +#, fuzzy +msgid "" " This means that when generating diffs from a Mercurial repository\n" " (e.g. with \"hg export\"), you should be careful about things like\n" " file copies and renames or other things mentioned above, because\n" " when applying a standard diff to a different repository, this\n" " extra information is lost. Mercurial's internal operations (like\n" " push and pull) are not affected by this, because they use an\n" -" internal binary format for communicating changes.\n" -"\n" +" internal binary format for communicating changes." +msgstr "" +" 这意味着当从水银版本库(例如 \"hg export\")产生差异时，在其它版本库应用标\n" +" 准差异时，会丢失文件复制或改名等额外信息，所以你要小心处理。水银的内部\n" +" 操作(例如 push 和 pull)在传达改变时，使用内部的二进制格式，所以不受影\n" +" 响。" + +#, fuzzy +msgid "" " To make Mercurial produce the git extended diff format, use the\n" " --git option available for many commands, or set 'git = True' in\n" " the [diff] section of your hgrc. You do not need to set this\n" @@ -7687,25 +8938,6 @@ " extension.\n" " " msgstr "" -"\n" -" 水银显示文件不同版本之间差异的格式与 GNU diff 标准格式兼容，可用于\n" -" GNU patch 和许多标准工具。\n" -"\n" -" 虽然标准格式在大多数情况下都能满足要求，但是它不包含下述信息:\n" -"\n" -" - 可执行状态和其它权限位\n" -" - 复制或改名信息\n" -" - 二进制文件的修改\n" -" - 创建或删除空文件\n" -"\n" -" 水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n" -" 此格式，所以它不是默认格式。\n" -"\n" -" 这意味着当从水银版本库(例如 \"hg export\")产生差异时，在其它版本库应用标\n" -" 准差异时，会丢失文件复制或改名等额外信息，所以你要小心处理。水银的内部\n" -" 操作(例如 push 和 pull)在传达改变时，使用内部的二进制格式，所以不受影\n" -" 响。\n" -"\n" " 要让水银产生 git 扩展差异格式，可以对许多命令使用选项 '--git'，或者在\n" " 你的 hgrc 文件中的节 '[diff]' 中增加 'git = True'。当你从此格式导入时，\n" " 或在 mq 扩展中使用时，不需要设置此选项。\n" @@ -7720,27 +8952,56 @@ " Mercurial allows you to customize output of commands through\n" " templates. You can either pass in a template from the command\n" " line, via the --template option, or select an existing\n" -" template-style (--style).\n" -"\n" +" template-style (--style)." +msgstr "" +"\n" +" 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n" +" 来使用模版，或者选择已有的模版样式(--style)。" + +#, fuzzy +msgid "" " You can customize output for any \"log-like\" command: log,\n" -" outgoing, incoming, tip, parents, heads and glog.\n" -"\n" +" outgoing, incoming, tip, parents, heads and glog." +msgstr "" +" 你可以定制任意输出与日志信息类似的命令，即: log，outgoing，incoming，\n" +" tip，parents，heads 和 glog。" + +#, fuzzy +msgid "" " Three styles are packaged with Mercurial: default (the style used\n" " when no explicit preference is passed), compact and changelog.\n" -" Usage::\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" +" Usage::" +msgstr " 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:" + +#, fuzzy +msgid " $ hg log -r1 --style changelog" +msgstr " $ hg log -r1 --style changelog" + +#, fuzzy +msgid "" " A template is a piece of text, with markup to invoke variable\n" -" expansion::\n" -"\n" +" expansion::" +msgstr " 模版是文本片断，其中的标记用于变量扩展:" + +#, fuzzy +msgid "" " $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746" +msgstr "" +" $ hg log -r1 --template \"{node}\\n\"\n" +" b56ce7b07c52de7d5fd79fb89701ea538af65746" + +#, fuzzy +msgid "" " Strings in curly braces are called keywords. The availability of\n" " keywords depends on the exact context of the templater. These\n" -" keywords are usually available for templating a log-like command:\n" -"\n" +" keywords are usually available for templating a log-like command:" +msgstr "" +" 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n" +" 可用于输出与日志信息类似的命令:" + +#, fuzzy +msgid "" " :author: String. The unmodified author of the changeset.\n" " :branches: String. The name of the branch on which the changeset\n" " was committed. Will be empty if the branch name was\n" @@ -7761,19 +9022,47 @@ " :rev: Integer. The repository-local changeset revision\n" " number.\n" " :tags: List of strings. Any tags associated with the\n" -" changeset.\n" -"\n" +" changeset." +msgstr "" +" - author: 字符串。修改集的作者。\n" +" - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n" +" - date: 日期信息。修改集的日期。\n" +" - desc: 字符串。修改集的描述。\n" +" - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n" +" - file_adds: 字符串列表。修改集中被增加的文件。\n" +" - file_mods: 字符串列表。修改集中被修改的文件\n" +" - file_dels: 字符串列表。修改集中被删除的文件\n" +" - node: 字符串。修改集的哈系标识，40 个字符的 16 进制字符串。\n" +" - parents: 字符串列表。修改集的父亲。\n" +" - rev: 整数。本地版本库的修改集的版本号。\n" +" - tags: 字符串列表。修改集的标签。" + +#, fuzzy +msgid "" " The \"date\" keyword does not produce human-readable output. If you\n" " want to use a date in your output, you can use a filter to process\n" " it. Filters are functions which return a string based on the input\n" " variable. You can also use a chain of filters to get the desired\n" -" output::\n" -"\n" +" output::" +msgstr "" +" 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期，可以使用\n" +" 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n" +" 链来产生理想的输出:" + +#, fuzzy +msgid "" " $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" List of filters:\n" -"\n" +" 2008-08-21 18:22 +0000" +msgstr "" +" $ hg tip --template \"{date|isodate}\\n\"\n" +" 2008-08-21 18:22 +0000" + +#, fuzzy +msgid " List of filters:" +msgstr " 过滤器列表:" + +#, fuzzy +msgid "" " :addbreaks: Any text. Add an XHTML \"<br />\" tag before the end of\n" " every line except the last.\n" " :age: Date. Returns a human-readable date/time difference\n" @@ -7829,53 +9118,11 @@ " address.\n" " " msgstr "" -"\n" -" 水银允许你通过模版定制命令的输出。你可以通过命令行选项 '--template'\n" -" 来使用模版，或者选择已有的模版样式(--style)。\n" -"\n" -" 你可以定制任意输出与日志信息类似的命令，即: log，outgoing，incoming，\n" -" tip，parents，heads 和 glog。\n" -"\n" -" 水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:\n" -"\n" -" $ hg log -r1 --style changelog\n" -"\n" -" 模版是文本片断，其中的标记用于变量扩展:\n" -"\n" -" $ hg log -r1 --template \"{node}\\n\"\n" -" b56ce7b07c52de7d5fd79fb89701ea538af65746\n" -"\n" -" 花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\n" -" 可用于输出与日志信息类似的命令:\n" -"\n" -" - author: 字符串。修改集的作者。\n" -" - branches: 字符串。修改集的分支。如果分支名称为 'default' 则为空。\n" -" - date: 日期信息。修改集的日期。\n" -" - desc: 字符串。修改集的描述。\n" -" - files: 字符串列表。修改集中被修改、增加和删除的全部文件。\n" -" - file_adds: 字符串列表。修改集中被增加的文件。\n" -" - file_mods: 字符串列表。修改集中被修改的文件\n" -" - file_dels: 字符串列表。修改集中被删除的文件\n" -" - node: 字符串。修改集的哈系标识，40 个字符的 16 进制字符串。\n" -" - parents: 字符串列表。修改集的父亲。\n" -" - rev: 整数。本地版本库的修改集的版本号。\n" -" - tags: 字符串列表。修改集的标签。\n" -"\n" -" 关键字 \"date\" 不产生人工可读的输出。如果你想在输出中使用日期，可以使用\n" -" 过滤器来处理它。过滤器是根据输入变量返回字符串的函数。你还可以使用过滤\n" -" 链来产生理想的输出:\n" -"\n" -" $ hg tip --template \"{date|isodate}\\n\"\n" -" 2008-08-21 18:22 +0000\n" -"\n" -" 过滤器列表:\n" -"\n" " - addbreaks: 输入任意文本。除了最后一行，在每行的结尾增加 XHTML 标签\n" " \"<br />\"。\n" " - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n" " - basename: 输入任意文本。将输入视为路径，返回被路径分隔符隔开的最后\n" -" 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz" -"\"，\n" +" 一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz\"，\n" " \"foo/bar//\" 成为 \"bar\"。\n" " - date: 输入日期。返回指定日期的 Unix 日期格式字符串，包含时区，例如: \n" " \"Mon Sep 04 15:13:13 2006 0700\"。\n" @@ -7911,69 +9158,915 @@ #, fuzzy msgid "" "\n" -" Valid URLs are of the form::\n" -"\n" +" Valid URLs are of the form::" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " local/filesystem/path[#revision]\n" " file://local/filesystem/path[#revision]\n" " http://[user[:pass]@]host[:port]/[path][#revision]\n" " https://[user[:pass]@]host[:port]/[path][#revision]\n" -" ssh://[user[:pass]@]host[:port]/[path][#revision]\n" -"\n" +" ssh://[user[:pass]@]host[:port]/[path][#revision]" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " Paths in the local filesystem can either point to Mercurial\n" " repositories or to bundle files (as created by 'hg bundle' or 'hg\n" -" incoming --bundle').\n" -"\n" +" incoming --bundle')." +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " An optional identifier after # indicates a particular branch, tag,\n" " or changeset to use from the remote repository. See also 'hg help\n" -" revisions'.\n" -"\n" +" revisions'." +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " Some features, such as pushing to http:// and https:// URLs are\n" " only possible if the feature is explicitly enabled on the remote\n" -" Mercurial server.\n" -"\n" -" Some notes about using SSH with Mercurial:\n" -"\n" +" Mercurial server." +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid " Some notes about using SSH with Mercurial:" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " - SSH requires an accessible shell account on the destination\n" " machine and a copy of hg in the remote path or specified with as\n" " remotecmd.\n" " - path is relative to the remote user's home directory by default.\n" " Use an extra slash at the start of a path to specify an absolute\n" -" path::\n" -"\n" +" path::" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid " ssh://example.com//tmp/repository" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" " ssh://example.com//tmp/repository\n" -"\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " - Mercurial doesn't use its own compression via SSH; the right\n" -" thing to do is to configure it in your ~/.ssh/config, e.g.::\n" -"\n" +" thing to do is to configure it in your ~/.ssh/config, e.g.::" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" " Host *.mylocalnetwork.example.com\n" " Compression no\n" " Host *\n" " Compression yes\n" -"\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " Alternatively specify \"ssh -C\" as your ssh command in your hgrc\n" -" or with the --ssh command line option.\n" -"\n" +" or with the --ssh command line option." +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " These URLs can all be stored in your hgrc with path aliases under\n" -" the [paths] section like so::\n" -"\n" +" the [paths] section like so::" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " [paths]\n" " alias1 = URL1\n" " alias2 = URL2\n" -" ...\n" -"\n" +" ..." +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " You can then use the alias for any command that uses a URL (for\n" -" example 'hg pull alias1' would pull from the 'alias1' path).\n" -"\n" +" example 'hg pull alias1' would pull from the 'alias1' path)." +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " Two path aliases are special because they are used as defaults\n" -" when you do not provide the URL to a command:\n" -"\n" +" when you do not provide the URL to a command:" +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +msgid "" " default:\n" " When you create a repository with hg clone, the clone command\n" " saves the location of the source repository as the new\n" " repository's 'default' path. This is then used when you omit\n" " path from push- and pull-like commands (including incoming and\n" -" outgoing).\n" -"\n" +" outgoing)." +msgstr "" +"\n" +" 有效的位置格式:\n" +"\n" +" local/filesystem/path (or file://local/filesystem/path)\n" +" http://[user[:pass]@]host[:port]/[path]\n" +" https://[user[:pass]@]host[:port]/[path]\n" +" ssh://[user[:pass]@]host[:port]/[path]\n" +"\n" +" 位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n" +" 'hg bundle' 或 'hg incoming --bundle' 创建)。\n" +"\n" +" 在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n" +" 修改集。\n" +"\n" +" 仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n" +"\n" +" 在水银中使用 SSH 的一些提示:\n" +" - 使用 SSH 时，需要在远程主机上有可登录帐号，远程路径中还需要有\n" +" hg，或者有指定的远程命令。\n" +" - 默认 'path' 是相对于远程主机上的用户家目录。\n" +" 可以在路径前增加一个斜线指定绝对路径:\n" +" ssh://example.com//tmp/repository\n" +" - 水银使用 SSH 时不使用压缩，所以你可以在 ~/.ssh/config 中配置\n" +" SSH 执行压缩，例如:\n" +" Host *.mylocalnetwork.example.com\n" +" Compression no\n" +" Host *\n" +" Compression yes\n" +" 另一个方法是在你的 hgrc 中将 \"ssh -C\" 作为你的 ssh 命令，或\n" +" 用于命令行参数 '--ssh' 中。\n" +"\n" +" 这些路径可以在你的 'hgrc' 中的节 '[paths]' 中定义别名:\n" +" [paths]\n" +" alias1 = URL1\n" +" alias2 = URL2\n" +" ...\n" +"\n" +" 然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n" +" 会从 'alias1' 定义的路径取得指定版本)。\n" +"\n" +" 因为用于默认路径，所以这 2 个路径别名比较特殊:\n" +"\n" +" default:\n" +" 当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n" +" 为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n" +" 的命令省略路径(包含进和出)。\n" +"\n" +" default-push:\n" +" 命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n" +" " + +#, fuzzy +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" @@ -8057,9 +10150,7 @@ msgid "destination '%s' is not empty" msgstr "非本地版本库 '%s'" -msgid "" -"src repository does not support revision lookup and so doesn't support clone " -"by revision" +msgid "src repository does not support revision lookup and so doesn't support clone by revision" msgstr "" msgid "clone from remote to remote not supported" @@ -8084,9 +10175,7 @@ msgid "use 'hg resolve' to retry unresolved file merges\n" msgstr "" -msgid "" -"use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to " -"abandon\n" +msgid "use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon\n" msgstr "" msgid "(branch merge, don't forget to commit)\n" @@ -8438,9 +10527,7 @@ msgid "requesting all changes\n" msgstr "正在请求全部修改\n" -msgid "" -"Partial pull cannot be done because other repository doesn't support " -"changegroupsubset." +msgid "Partial pull cannot be done because other repository doesn't support changegroupsubset." msgstr "" #, python-format @@ -8577,9 +10664,7 @@ msgstr "" #, python-format -msgid "" -"untracked file in working directory differs from file in requested revision: " -"'%s'" +msgid "untracked file in working directory differs from file in requested revision: '%s'" msgstr "" #, python-format