i18n: updated Chinese translation

i18n/zh.po

@@ -5,7 +5,7 b''
 # Copyright (C) 2009 the Mercurial team
 # Dongsheng Song <[e-mail]>, 2009
 #
-# $Id: zh.po 1185 2009-02-17 15:10:31Z dongsheng.song $
+# $Id: zh.po 1217 2009-03-11 09:20:30Z [e-mail] $
 #
 # Update with pot file:
 #    msgmerge --update zh.po hg.pot
@@ -26,8 +26,8 b''
 # Dictionary:
 # blame             追溯
 # branch            分支
-# changes           改变
-# changeset         改变集
+# changes           修改
+# changeset         修改集
 # checkout          检出
 # remove            移除(从版本库删除)
 # delete            删除(只从文件系统删除)
@@ -44,12 +44,13 b''
 # unversioned       未版本控制
 # versioned         受版本控制
 # working copy      工作副本
+# ...
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Mercurial 1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:43+0800\n"
+"POT-Creation-Date: 2009-03-20 14:26+0800\n"
 "PO-Revision-Date: 2009-02-17 23:05+0800\n"
 "Last-Translator: Dongsheng Song <[e-mail]>\n"
 "Language-Team: Chinese translation team <[e-mail]>\n"
@@ -94,7 +95,7 b' msgstr "acl: \xe5\xb7\xb2\xe5\x90\xaf\xe7\x94\xa8 %s, %d \xe9\xa1\xb9\xef\xbc\x8c\xe7\x94\xa8\xe6\x88\xb7 %s\\n"'
 
 #, python-format
 msgid "config error - hook type \"%s\" cannot stop incoming changesets"
-msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的改变集"
+msgstr "配置错误 - 钩子类型 \"%s\" 不能终止进入的修改集"
 
 #, python-format
 msgid "acl: changes have source \"%s\" - skipping\n"
@@ -106,7 +107,7 b' msgstr "acl: \xe7\x94\xa8\xe6\x88\xb7 %s \xe8\xa2\xab\xe6\x8b\x92\xe7\xbb\x9d\xe8\xae\xbf\xe9\x97\xae %s\\n"'
 
 #, python-format
 msgid "acl: access denied for changeset %s"
-msgstr "acl: 拒绝访问改变集 %s"
+msgstr "acl: 拒绝访问修改集 %s"
 
 #, python-format
 msgid "acl: user %s not allowed on %s\n"
@@ -114,7 +115,7 b' msgstr "acl: \xe7\x94\xa8\xe6\x88\xb7 %s \xe8\xa2\xab\xe6\x8b\x92\xe7\xbb\x9d\xe8\xae\xbf\xe9\x97\xae %s\\n"'
 
 #, python-format
 msgid "acl: allowing changeset %s\n"
-msgstr "acl: 允许改变集 %s\n"
+msgstr "acl: 允许修改集 %s\n"
 
 msgid ""
 "allow user-defined command aliases\n"
@@ -178,8 +179,7 b' msgstr ""'
 msgid ""
 "Parse .hg/bookmarks file and return a dictionary\n"
 "\n"
-"    Bookmarks are stored as {HASH}\\s{NAME}\n"
-" (localtags format) values\n"
+"    Bookmarks are stored as {HASH}\\s{NAME}\\n (localtags format) values\n"
 "    in the .hg/bookmarks file. They are read by the parse() method and\n"
 "    returned as a dictionary with name => hash values.\n"
 "\n"
@@ -282,7 +282,7 b' msgstr "\xe5\x88\xa0\xe9\x99\xa4\xe6\x8c\x87\xe5\xae\x9a\xe4\xb9\xa6\xe7\xad\xbe"'
 msgid "rename a given bookmark"
 msgstr "改名指定书签"
 
-msgid "hg bookmarks [-d] [-m NAME] [-r NAME] [NAME]"
+msgid "hg bookmarks [-f] [-d] [-m NAME] [-r REV] [NAME]"
 msgstr ""
 
 msgid ""
@@ -719,6 +719,7 b' msgid ""'
 "    - Monotone [mtn]\n"
 "    - GNU Arch [gnuarch]\n"
 "    - Bazaar [bzr]\n"
+"    - Perforce [p4]\n"
 "\n"
 "    Accepted destination formats [identifiers]:\n"
 "    - Mercurial [hg]\n"
@@ -785,8 +786,9 b' msgid ""'
 "        ignore integrity errors when reading. Use it to fix Mercurial\n"
 "        repositories with missing revlogs, by converting from and to\n"
 "        Mercurial.\n"
-"    --config convert.hg.saverev=True          (boolean)\n"
-"        allow target to preserve source revision ID\n"
+"    --config convert.hg.saverev=False          (boolean)\n"
+"        store original revision ID in changeset (forces target IDs to "
+"change)\n"
 "    --config convert.hg.startrev=0            (hg revision identifier)\n"
 "        convert start revision and its descendants\n"
 "\n"
@@ -863,6 +865,22 b' msgid ""'
 "    --config convert.svn.startrev=0           (svn revision number)\n"
 "        specify start Subversion revision.\n"
 "\n"
+"    Perforce Source\n"
+"    ---------------\n"
+"\n"
+"    The Perforce (P4) importer can be given a p4 depot path or a client\n"
+"    specification as source. It will convert all files in the source to\n"
+"    a flat Mercurial repository, ignoring labels, branches and integrations.\n"
+"    Note that when a depot path is given you then usually should specify a\n"
+"    target directory, because otherwise the target may be named ...-hg.\n"
+"\n"
+"    It is possible to limit the amount of source history to be converted\n"
+"    by specifying an initial Perforce revision.\n"
+"\n"
+"    --config convert.p4.startrev=0           (perforce changelist number)\n"
+"        specify initial Perforce revision.\n"
+"\n"
+"\n"
 "    Mercurial Destination\n"
 "    ---------------------\n"
 "\n"
@@ -1210,6 +1228,12 b' msgstr "%s \xe4\xb8\x8d\xe5\x83\x8f\xe6\x98\xaf\xe5\x8d\x95\xe7\xba\xaf\xe7\x9a\x84 monotone \xe7\x89\x88\xe6\x9c\xac\xe5\xba\x93"'
 msgid "copying file in renamed dir from '%s' to '%s'"
 msgstr "从已改名的目录 '%s' 复制文件到 '%s'"
 
+msgid "reading p4 views\n"
+msgstr ""
+
+msgid "collecting p4 changelists\n"
+msgstr "正在搜索 p4 修改集\n"
+
 msgid "Subversion python bindings could not be loaded"
 msgstr "不能加载 svn 的 python 绑定"
 
@@ -1765,7 +1789,7 b' msgid "show the revision DAG"'
 msgstr "显示版本分支图"
 
 msgid "limit number of changes displayed"
-msgstr "限制显示的改变集数量"
+msgstr "限制显示的修改集数量"
 
 msgid "show patch"
 msgstr "显示补丁"
@@ -2836,7 +2860,7 b' msgstr ""'
 "\n"
 "    使用 '--force' 会覆盖已有的补丁。\n"
 "\n"
-"    可以使用 '--rev' 将已有的改变集置于 mq 控制下(例如 \n"
+"    可以使用 '--rev' 将已有的修改集置于 mq 控制下(例如 \n"
 "    'qimport --rev tip -n patch' 会将 tip 置于 mq 控制下)。当使用 '--git'\n"
 "    时，'--rev' 导入的补丁将会使用 git 差异格式。参见差异帮助主题，以了解\n"
 "    为什么这对于保留改名/复制信息和权限修改很重要。\n"
@@ -3444,7 +3468,7 b' msgid "force removal with local changes"'
 msgstr "强制删除，纵然有本地修改"
 
 msgid "bundle unrelated changesets"
-msgstr "打包不相关的改变集"
+msgstr "打包不相关的修改集"
 
 msgid "no backups"
 msgstr "不备份"
@@ -3691,7 +3715,7 b' msgid ""'
 "each patchbomb message in a pager or sending the messages directly,\n"
 "it will create a UNIX mailbox file with the patch emails.  This\n"
 "mailbox file can be previewed with any mail user agent which supports\n"
-"UNIX mbox files, i.e. with mutt:\n"
+"UNIX mbox files, e.g. with mutt:\n"
 "\n"
 "  % mutt -R -f mbox\n"
 "\n"
@@ -3809,7 +3833,7 b' msgstr ""'
 msgid "send patches as inline attachments"
 msgstr ""
 
-msgid "email addresses of blind copy recipients"
+msgid "email addresses of blind carbon copy recipients"
 msgstr ""
 
 msgid "email addresses of copy recipients"
@@ -4834,15 +4858,15 b' msgid ""'
 "    The files will be added to the repository at the next commit. To\n"
 "    undo an add before that, see hg revert.\n"
 "\n"
-"    If no names are given, add all files in the repository.\n"
+"    If no names are given, add all files to the repository.\n"
 "    "
 msgstr ""
 "增加指定文件用于下次提交\n"
 "\n"
 "    调度文件受版本控制，增加到版本库。\n"
 "\n"
-"    这些文件将于下次提交时增加到版本库。要在提交前撤销增加，\n"
-"    请参见 'hg revert'。\n"
+"    这些文件将于下次提交时增加到版本库。需要在提交前撤销增加，\n"
+"    参见 'hg revert'。\n"
 "\n"
 "    如果没有给出文件名称，就增加所有文件到版本库。\n"
 "    "
@@ -4883,7 +4907,7 b' msgid ""'
 "    anyway, probably with undesirable results.\n"
 "    "
 msgstr ""
-"显示指定文件每行的改变集信息\n"
+"显示指定文件每行的修改集信息\n"
 "\n"
 "    列出文件中的修改，为每行显示版本标识\n"
 "\n"
@@ -4950,7 +4974,7 b' 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\n"
-"    hand. The result of this merge is not committed, as for a normal\n"
+"    hand. The result of this merge is not committed, as with a normal\n"
 "    merge.\n"
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
@@ -5018,8 +5042,7 b' msgid ""'
 "exit\n"
 "    status is 0 the revision is marked as good, 125 - skipped, 127 (command "
 "not\n"
-"    found) - bisection will be aborted and any other status bigger than 0 "
-"will\n"
+"    found) - bisection will be aborted; any other status bigger than 0 will\n"
 "    mark revision as bad.\n"
 "    "
 msgstr ""
@@ -5104,7 +5127,7 b' msgid ""'
 "create a changegroup file\n"
 "\n"
 "    Generate a compressed changegroup file collecting changesets not\n"
-"    found in the other repository.\n"
+"    known to be in another repository.\n"
 "\n"
 "    If no destination repository is specified the destination is\n"
 "    assumed to have all the nodes specified by one or more --base\n"
@@ -5236,7 +5259,7 b' msgid ""'
 "    file names or -I/-X filters.\n"
 "\n"
 "    If no commit message is specified, the configured editor is started to\n"
-"    enter a message.\n"
+"    prompt you for a message.\n"
 "\n"
 "    See 'hg help dates' for a list of formats valid for -d/--date.\n"
 "    "
@@ -5255,7 +5278,7 b' msgstr ""'
 "    "
 
 msgid "created new head\n"
-msgstr ""
+msgstr "已经创建新顶点\n"
 
 #, python-format
 msgid "committed changeset %d:%s\n"
@@ -5266,13 +5289,13 b' msgid ""'
 "\n"
 "    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"
-"    there can only be one source.\n"
+"    the source must be a single file.\n"
 "\n"
 "    By default, this command copies the contents of files as they\n"
 "    stand in the working directory. If invoked with --after, the\n"
 "    operation is recorded, but no copying is performed.\n"
 "\n"
-"    This command takes effect in the next commit. To undo a copy\n"
+"    This command takes effect with the next commit. To undo a copy\n"
 "    before that, see hg revert.\n"
 "    "
 msgstr ""
@@ -5281,10 +5304,10 b' msgid "find the ancestor revision of two'
 msgstr ""
 
 msgid "There is no Mercurial repository here (.hg not found)"
-msgstr ""
+msgstr "此处没有水银版本库(没有找到 .hg)"
 
 msgid "either two or three arguments required"
-msgstr ""
+msgstr "需要两个或三个参数"
 
 msgid "returns the completion list associated with the given command"
 msgstr ""
@@ -5469,7 +5492,7 b' msgid ""'
 "    probably with undesirable results.\n"
 "\n"
 "    Use the --git option to generate diffs in the git extended diff\n"
-"    format. Read the diffs help topic for more information.\n"
+"    format. For more information, read hg help diffs.\n"
 "    "
 msgstr ""
 "在版本库中比较(指定的文件)\n"
@@ -5488,8 +5511,8 b' msgstr ""'
 "    当没有选项 '-a' 时，将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
 "    时，可能会有不合需要的结果。\n"
 "\n"
-"    使用选项 '--git' 会使用 git 扩展差异格式。请阅读差异帮助主题以了解\n"
-"    更多信息。\n"
+"    使用选项 '--git' 会使用 git 扩展差异格式。请阅读 'hg help diffs' 以\n"
+"    了解更多信息。\n"
 "    "
 
 msgid ""
@@ -5526,26 +5549,26 b' msgid ""'
 "    parent. It can be useful to review a merge.\n"
 "    "
 msgstr ""
-"为一个或多个改变集输出标题和差异\n"
+"为一个或多个修改集输出标题和差异\n"
 "\n"
 "    为一个或多个版本输出标题和差异。\n"
 "\n"
-"    在改变集标题中显示的信息是: 作者，改变集哈希，父亲和提交日志。\n"
-"\n"
-"    注意: 对于合并改变集，导出可能产生不期望的差异输出，因为它只会将合并\n"
-"    改变集与其第一个父亲比较。\n"
+"    在修改集标题中显示的信息是: 作者，修改集哈希，父亲和提交日志。\n"
+"\n"
+"    注意: 对于合并修改集，导出可能产生不期望的差异输出，因为它只会将合并\n"
+"    修改集与其第一个父亲比较。\n"
 "\n"
 "    可以输出到文件，这时会使用指定的格式化字符串构造文件名称。格式化规则\n"
 "    如下:\n"
 "\n"
 "    %%   字符 \"%\"\n"
-"    %H   改变集哈希 (40 位十六进制数字)\n"
+"    %H   修改集哈希 (40 位十六进制数字)\n"
 "    %N   产生的补丁号\n"
-"    %R   改变集版本号\n"
+"    %R   修改集版本号\n"
 "    %b   待导出的版本库的基本名称\n"
-"    %h   短改变集哈希(12 位十六进制数字)\n"
+"    %h   短修改集哈希(12 位十六进制数字)\n"
 "    %n   从 1 开始补 0 的序列号\n"
-"    %r   补 0 的改变集版本号\n"
+"    %r   补 0 的修改集版本号\n"
 "\n"
 "    当没有选项 '-a' 时，将会避免处理检测为二进制的文件。当使用选项 '-a'\n"
 "    时，可能会有不合需要的结果。\n"
@@ -5847,8 +5870,8 b' msgid ""'
 "    files and full commit message is shown.\n"
 "\n"
 "    NOTE: log -p may generate unexpected diff output for merge\n"
-"    changesets, as it will compare the merge changeset against its\n"
-"    first parent only. Also, the files: list will only reflect files\n"
+"    changesets, as it will only compare the merge changeset against\n"
+"    its first parent. Also, the files: list will only reflect files\n"
 "    that are different from BOTH parents.\n"
 "\n"
 "    "
@@ -5867,12 +5890,12 b' msgstr ""'
 "\n"
 "    参见 'hg help dates' 以获得 '-d/--date' 的有效格式列表。\n"
 "\n"
-"    此命令缺省输出: 改变集标识和哈希，标签，父亲，提交者，日期和时间，\n"
+"    此命令缺省输出: 修改集标识和哈希，标签，父亲，提交者，日期和时间，\n"
 "    以及每次提交的概要信息。当使用选项 '-v/--verbose' 时，会显示文件\n"
 "    变更列表和完整的提交信息。\n"
 "\n"
-"    注意: 对于合并改变集，'log -p' 可能产生不期望的差异输出，因为它只\n"
-"    会将合并改变集与其第一个父亲比较。而且，只显示对所有父亲都不同的\n"
+"    注意: 对于合并修改集，'log -p' 可能产生不期望的差异输出，因为它只\n"
+"    会将合并修改集与其第一个父亲比较。而且，只显示对所有父亲都不同的\n"
 "    文件列表。\n"
 "\n"
 "    "
@@ -6016,9 +6039,9 b' msgid ""'
 "    See 'hg help urls' for more information.\n"
 "    "
 msgstr ""
-"从指定版本库取得改变集\n"
-"\n"
-"    从远程版本库取得改变集到本地版本库。\n"
+"从指定版本库取得修改集\n"
+"\n"
+"    从远程版本库取得修改集到本地版本库。\n"
 "\n"
 "    查找位于指定路径或位置的版本库的全部修改，增加到版本版本库。默认不\n"
 "    更新工作目录。\n"
@@ -6065,7 +6088,7 b' msgstr ""'
 "    推送默认拒绝导致增加远程版本库顶点数目的操作。这通常表明客户端在推送\n"
 "    之前忘记取得远程版本库的修改，并且合并。\n"
 "\n"
-"    如果使用了选项 '-r'，此命名改变集以及其祖先都会被推送到远程版本库。\n"
+"    如果使用了选项 '-r'，此命名修改集以及其祖先都会被推送到远程版本库。\n"
 "    \n"
 "\n"
 "    参见主题 'urls' 的帮助信息，以了解位置 'ssh://' 的重要详情。如果没有\n"
@@ -6174,10 +6197,10 b' msgid ""'
 "    a file, there can only be one source.\n"
 "\n"
 "    By default, this command copies the contents of files as they\n"
-"    stand in the working directory. If invoked with --after, the\n"
+"    exist in the working directory. If invoked with --after, the\n"
 "    operation is recorded, but no copying is performed.\n"
 "\n"
-"    This command takes effect in the next commit. To undo a rename\n"
+"    This command takes effect at the next commit. To undo a rename\n"
 "    before that, see hg revert.\n"
 "    "
 msgstr ""
@@ -6537,12 +6560,12 b' msgstr "\xe5\x88\x86\xe5\xb8\x83\xe5\xbc\x8f\xe8\xbd\xaf\xe4\xbb\xb6\xe9\x85\x8d\xe7\xbd\xae\xe7\xae\xa1\xe7\x90\x86\xe5\xb7\xa5\xe5\x85\xb7 - \xe6\xb0\xb4\xe9\x93\xb6 (\xe7\x89\x88\xe6\x9c\xac %s)\\n"'
 
 msgid ""
 "\n"
-"Copyright (C) 2005-2008 Matt Mackall <[e-mail]> and others\n"
+"Copyright (C) 2005-2009 Matt Mackall <[e-mail]> and others\n"
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
 msgstr ""
 "\n"
-"版权所有 (C) 2005-2008 Matt Mackall <[e-mail]> 和其他人。\n"
+"版权所有 (C) 2005-2009 Matt Mackall <[e-mail]> 和其他人。\n"
 "这是自由软件，具体参见版权条款。这里没有任何担保，甚至没有适合\n"
 "特定目的的隐含的担保。\n"
 
@@ -6673,7 +6696,7 b' msgid "list the revision number (default'
 msgstr "列出版本号 (默认)"
 
 msgid "list the changeset"
-msgstr "列出改变集"
+msgstr "列出修改集"
 
 msgid "show line number at the first appearance"
 msgstr "列出首次出现时的行号"
@@ -6778,7 +6801,7 b' msgid "the clone will only contain a rep'
 msgstr "只复制版本库(没有工作副本)"
 
 msgid "a changeset you would like to have after cloning"
-msgstr "复制后你期望有的改变集"
+msgstr "复制后你期望有的修改集"
 
 msgid "[OPTION]... SOURCE [DEST]"
 msgstr ""
@@ -6865,7 +6888,7 b' msgid "print all revisions that match"'
 msgstr ""
 
 msgid "follow changeset history, or file history across copies and renames"
-msgstr "跟踪改变集历史，或者跟踪文件的复制与改名操作"
+msgstr "跟踪修改集历史，或者跟踪文件的复制与改名操作"
 
 msgid "ignore case when matching"
 msgstr ""
@@ -6963,7 +6986,7 b' msgid "[OPTION]... [PATTERN]..."'
 msgstr ""
 
 msgid "only follow the first parent of merge changesets"
-msgstr "只跟踪改变集的第一个父亲"
+msgstr "只跟踪修改集的第一个父亲"
 
 msgid "show revs matching date spec"
 msgstr "显示匹配日期的版本"
@@ -6984,7 +7007,7 b' msgid "revs committed by user"'
 msgstr "指定用户提交的版本"
 
 msgid "show only changesets within the given named branch"
-msgstr "只显示位于指定命名分支中的改变集"
+msgstr "只显示位于指定命名分支中的修改集"
 
 msgid "do not display revision or any of its ancestors"
 msgstr "不显示指定版本或其祖先"
@@ -7023,7 +7046,7 b' msgid "[NAME]"'
 msgstr ""
 
 msgid "update to new tip if changesets were pulled"
-msgstr "如果有新的改变集，就更新到最新版本"
+msgstr "如果有新的修改集，就更新到最新版本"
 
 msgid "[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]"
 msgstr ""
@@ -7509,9 +7532,9 b' msgid ""'
 "\n"
 "    The log command also accepts date ranges:\n"
 "\n"
-"    \"<{date}\" - on or before a given date\n"
-"    \">{date}\" - on or after a given date\n"
-"    \"{date} to {date}\" - a date range, inclusive\n"
+"    \"<{datetime}\" - at or before a given date/time\n"
+"    \">{datetime}\" - on or after a given date/time\n"
+"    \"{datetime} to {datetime}\" - a date range, inclusive\n"
 "    \"-{days}\" - within a given number of days of today\n"
 "    "
 msgstr ""
@@ -7529,16 +7552,16 b' msgid ""'
 "\n"
 "    Alternate pattern notations must be specified explicitly.\n"
 "\n"
-"    To use a plain path name without any pattern matching, start a\n"
-"    name with \"path:\".  These path names must match completely, from\n"
-"    the root of the current repository.\n"
-"\n"
-"    To use an extended glob, start a name with \"glob:\".  Globs are\n"
-"    rooted at the current directory; a glob such as \"*.c\" will match\n"
-"    files ending in \".c\" in the current directory only.\n"
+"    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"
+"    To use an extended glob, start a name with \"glob:\". Globs are\n"
+"    rooted at the current directory; a glob such as \"*.c\" will only\n"
+"    match files in the current directory ending with \".c\".\n"
 "\n"
 "    The supported glob syntax extensions are \"**\" to match any string\n"
-"    across path separators, and \"{a,b}\" to mean \"a or b\".\n"
+"    across path separators and \"{a,b}\" to mean \"a or b\".\n"
 "\n"
 "    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"
@@ -7553,11 +7576,11 b' msgid ""'
 "\n"
 "    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 the current directory, or\n"
-"                   any subdirectory\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 the directory foo, or any\n"
-"                   subdirectory\n"
+"    foo/**.c       any name ending in \".c\" in any subdirectory of foo\n"
+"                   including itself.\n"
 "\n"
 "    Regexp examples:\n"
 "\n"
@@ -7573,11 +7596,13 b' msgid ""'
 "\n"
 "HG::\n"
 "    Path to the 'hg' executable, automatically passed when running hooks,\n"
-"    extensions or external tools. If unset or empty, an executable named\n"
-"    'hg' (with com/exe/bat/cmd extension on Windows) is searched.\n"
+"    extensions or external tools. If unset or empty, this is the hg\n"
+"    executable's name if it's frozen, or an executable named 'hg'\n"
+"    (with %PATHEXT% [defaulting to COM/EXE/BAT/CMD] extensions on\n"
+"    Windows) is searched.\n"
 "\n"
 "HGEDITOR::\n"
-"    This is the name of the editor to use when committing. See EDITOR.\n"
+"    This is the name of the editor to run when committing. See EDITOR.\n"
 "\n"
 "    (deprecated, use .hgrc)\n"
 "\n"
@@ -7589,8 +7614,8 b' msgid ""'
 "\n"
 "HGENCODINGMODE::\n"
 "    This sets Mercurial's behavior for handling unknown characters\n"
-"    while transcoding user inputs. The default is \"strict\", which\n"
-"    causes Mercurial to abort if it can't translate a character. Other\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"
@@ -7603,26 +7628,32 b' msgid ""'
 "    (deprecated, use .hgrc)\n"
 "\n"
 "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 .hg/hgrc of\n"
-"    current repository is read.\n"
-"\n"
-"    For each element in path, if a directory, all entries in directory\n"
-"    ending with \".rc\" are added to path.  Else, element itself is\n"
-"    added to path.\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"
+"    * if it's a directory, all directories ending with .rc are added\n"
+"    * otherwise, the directory itself will be added\n"
 "\n"
 "HGUSER::\n"
-"    This is the string used for the author of a commit.\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"
+"    * 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"
 "EMAIL::\n"
-"    If HGUSER is not set, this will be used as the author for a commit.\n"
+"    May be used as the author of a commit; see HGUSER.\n"
 "\n"
 "LOGNAME::\n"
-"    If neither HGUSER nor EMAIL is set, LOGNAME will be used (with\n"
-"    '@hostname' appended) as the author value for a commit.\n"
+"    May be used as the author of a commit; see HGUSER.\n"
 "\n"
 "VISUAL::\n"
 "    This is the name of the editor to use when committing. See EDITOR.\n"
@@ -7637,7 +7668,7 b' msgid ""'
 "\n"
 "PYTHONPATH::\n"
 "    This is used by Python to find imported modules and may need to be set\n"
-"    appropriately if Mercurial is not installed system-wide.\n"
+"    appropriately if this Mercurial is not installed system-wide.\n"
 "    "
 msgstr ""
 
@@ -7646,12 +7677,14 b' msgstr ""'
 
 msgid ""
 "\n"
-"    Mercurial accepts several notations for identifying individual\n"
+"    Mercurial supports several ways to specify individual\n"
 "    revisions.\n"
 "\n"
 "    A plain integer is treated as a revision number. Negative\n"
-"    integers are treated as offsets from the tip, with -1 denoting the\n"
-"    tip.\n"
+"    integers are treated as toplogical offsets from the tip, with\n"
+"    -1 denoting the tip. As such, negative numbers are only useful\n"
+"    if you've memorized your local tree numbers and want to save\n"
+"    typing a single digit. This editor suggests copy and paste.\n"
 "\n"
 "    A 40-digit hexadecimal string is treated as a unique revision\n"
 "    identifier.\n"
@@ -7659,7 +7692,7 b' msgid ""'
 "    A hexadecimal string less than 40 characters long is treated as a\n"
 "    unique revision identifier, and referred to as a short-form\n"
 "    identifier. A short-form identifier is only valid if it is the\n"
-"    prefix of one full-length identifier.\n"
+"    prefix of exactly one full-length identifier.\n"
 "\n"
 "    Any other string is treated as a tag name, which is a symbolic\n"
 "    name associated with a revision identifier. Tag names may not\n"
@@ -7684,8 +7717,8 b' msgstr "\xe6\x8c\x87\xe5\xae\x9a\xe5\xa4\x9a\xe4\xb8\xaa\xe7\x89\x88\xe6\x9c\xac"'
 msgid ""
 "\n"
 "    When Mercurial accepts more than one revision, they may be\n"
-"    specified individually, or provided as a continuous range,\n"
-"    separated by the \":\" character.\n"
+"    specified individually, or provided as a topologically continuous\n"
+"    range, separated by the \":\" character.\n"
 "\n"
 "    The syntax of range notation is [BEGIN]:[END], where BEGIN and END\n"
 "    are revision identifiers. Both BEGIN and END are optional. If\n"
@@ -7697,12 +7730,12 b' msgid ""'
 "    order.\n"
 "\n"
 "    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 4:2 gives 4, 3, and 2.\n"
-"    "
-msgstr ""
-"\n"
-"    当水银接受多个版本时，它们可以单独给出，或者以字符 \":\" 分割的连续范围\n"
-"    格式提供。\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'。因此范围 \":"
@@ -7711,8 +7744,8 b' msgstr ""'
 "\n"
 "    如果 'BEGIN' 大于 'END'，版本视为反序。\n"
 "\n"
-"    范围是闭区间。即范围 '3:5' 是 '3'，'4'，'5'。同样，范围 '4:2' 是 '4'，\n"
-"    '3'，'2'。\n"
+"    范围是闭区间。即范围 '3:5' 是 '3'，'4'，'5'。同样，范围 '9:6' 是 '9'，\n"
+"    '8'，'7' 和 '6'。\n"
 "    "
 
 msgid "Diff Formats"
@@ -7727,14 +7760,14 b' msgid ""'
 "    While this standard format is often enough, it does not encode the\n"
 "    following information:\n"
 "\n"
-"     - executable status\n"
+"     - 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"
 "    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 there are very few tools which\n"
+"    produced by default because a few widespread tools still do not\n"
 "    understand this format.\n"
 "\n"
 "    This means that when generating diffs from a Mercurial repository\n"
@@ -7757,13 +7790,13 b' msgstr ""'
 "\n"
 "    虽然标准格式在大多数情况下都能满足要求，但是它不包含下述信息:\n"
 "\n"
-"     - 可执行状态\n"
+"     - 可执行状态和其它权限位\n"
 "     - 复制或改名信息\n"
 "     - 二进制文件的修改\n"
 "     - 创建或删除空文件\n"
 "\n"
-"    水银也支持解决这些限制的 git 扩展差异格式。由于支持 git 差异格式的工具\n"
-"    很少，所以它不是默认格式。\n"
+"    水银也支持解决这些限制的 git 扩展差异格式。由于一些常用的工具还不支持\n"
+"    此格式，所以它不是默认格式。\n"
 "\n"
 "    这意味着当从水银版本库(例如 \"hg export\")产生差异时，在其它版本库应用标\n"
 "    准差异时，会丢失文件复制或改名等额外信息，所以你要小心处理。水银的内部\n"
@@ -7786,7 +7819,7 b' msgid ""'
 "style).\n"
 "\n"
 "    You can customize output for any \"log-like\" command: log, outgoing,\n"
-"    incoming, tip, parents, heads and glog are all template-enabled.\n"
+"    incoming, tip, parents, heads and glog.\n"
 "\n"
 "    Three styles are packaged with Mercurial: default (the style used\n"
 "    when no explicit preference is passed), compact and changelog. Usage:\n"
@@ -7821,7 +7854,7 b' 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 it.\n"
 "    Filters are functions which return a string based on the input variable.\n"
-"    You can also use a chain of filters to get the wanted output:\n"
+"    You can also use a chain of filters to get the desired output:\n"
 "\n"
 "       $ hg tip --template \"{date|isodate}\\n\"\n"
 "       2008-08-21 18:22 +0000\n"
@@ -7830,15 +7863,20 b' msgid ""'
 "\n"
 "    - 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 age for the given date.\n"
+"    - age: Date. Returns a human-readable date/time difference between\n"
+"          the given date/time and the current date/time.\n"
 "    - basename: Any text. Treats the text as a path, and returns the\n"
-"          basename. For example, \"foo/bar/baz\" becomes \"baz\".\n"
-"    - date: Date. Returns a date in a Unix date command format, including\n"
+"          last component of the path after splitting by the path\n"
+"          separator (ignoring trailing seprators). For example,\n"
+"          \"foo/bar/baz\" becomes \"baz\" and \"foo/bar//\" becomes \"bar\".\n"
+"    - date: Date. Returns a date in a Unix date format, including\n"
 "          the timezone: \"Mon Sep 04 15:13:13 2006 0700\".\n"
 "    - domain: Any text. Finds the first string that looks like an email\n"
 "          address, and extracts just the domain component.\n"
+"          Example: 'User <[e-mail]>' becomes 'example.com'.\n"
 "    - email: Any text. Extracts the first string that looks like an email\n"
-"          address.\n"
+"          address. Example: 'User <[e-mail]>' becomes\n"
+"          '[e-mail]'.\n"
 "    - escape: Any text. Replaces the special XML/XHTML characters \"&\",\n"
 "          \"<\" and \">\" with XML entities.\n"
 "    - fill68: Any text. Wraps the text to fit in 68 columns.\n"
@@ -7854,7 +7892,7 b' msgid ""'
 "          in email headers.\n"
 "    - short: Changeset hash. Returns the short form of a changeset hash,\n"
 "          i.e. a 12-byte hexadecimal string.\n"
-"    - shortdate: Date. Returns a date like \"2006-09-04\".\n"
+"    - shortdate: Date. Returns a date like \"2006-09-18\".\n"
 "    - strip: Any text. Strips all leading and trailing whitespace.\n"
 "    - tabindent: Any text. Returns the text, with every line except the\n"
 "          first starting with a tab character.\n"
@@ -7868,7 +7906,7 b' msgstr ""'
 "    来使用模版，或者选择已有的模版样式(--style)。\n"
 "\n"
 "    你可以定制任意输出与日志信息类似的命令，即: log，outgoing，incoming，\n"
-"    tip，parents，heads 和 glog 这些启用模版的命令。\n"
+"    tip，parents，heads 和 glog。\n"
 "\n"
 "    水银中内置了 3 种样式: default (默认), compact 和 changelog。用法:\n"
 "\n"
@@ -7882,22 +7920,22 b' msgstr ""'
 "    花括号中的字符串称为关键字。可用的关键字依赖于模版的上下文。下述关键字\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"
+"    - 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"
 "\n"
 "       $ hg tip --template \"{date|isodate}\\n\"\n"
 "       2008-08-21 18:22 +0000\n"
@@ -7906,13 +7944,17 b' msgstr ""'
 "\n"
 "    - addbreaks: 输入任意文本。除了最后一行，在每行的结尾增加 XHTML 标签\n"
 "          \"<br />\"。\n"
-"    - age: 输入日期。返回指定日期的人工可读的字符串。\n"
-"    - basename: 输入任意文本。将输入视为路径，返回基础名称。例如\n"
-"          \"foo/bar/baz\" 成为 \"baz\"。\n"
-"    - date: 输入日期。返回指定日期的 Unix 命令 'date' 格式字符串，包含时\n"
-"          区，例如: \"Mon Sep 04 15:13:13 2006 0700\"。\n"
-"    - domain: 输入任意文本。找到第一个 email 地址，返回其域名。\n"
-"    - email: 输入任意文本。返回第一个 email 地址。\n"
+"    - age: 输入日期。返回指定日期与当前日期差异的人工可读的字符串。\n"
+"    - basename: 输入任意文本。将输入视为路径，返回被路径分隔符隔开的最后\n"
+"          一个组件的名称(忽略结尾的分隔符)。例如 \"foo/bar/baz\" 成为 \"baz"
+"\"，\n"
+"          \"foo/bar//\" 成为 \"bar\"。\n"
+"    - date: 输入日期。返回指定日期的 Unix 日期格式字符串，包含时区，例如: \n"
+"          \"Mon Sep 04 15:13:13 2006 0700\"。\n"
+"    - domain: 输入任意文本。找到第一个 email 地址，返回其域名。例如: \n"
+"          'User <[e-mail]>' 成为 'example.com'。\n"
+"    - email: 输入任意文本。返回第一个 email 地址。例如: \n"
+"          'User <[e-mail]>' 成为 '[e-mail]'。\n"
 "    - escape: 输入任意文本。用 XML 实体来封装 XML/XHTML 的特殊字符 \"&\"，\n"
 "          \"<\" 和 \">\"。\n"
 "    - fill68: 输入任意文本。格式化为 68 列文本。\n"
@@ -7924,9 +7966,9 b' msgstr ""'
 "    - obfuscate: 输入任意文本。返回其 XML 实体序列。\n"
 "    - person: 输入任意文本。返回 email 地址前的文本。\n"
 "    - rfc822date: 输入日期。返回 email 头部使用的日期格式。\n"
-"    - short: 改变集哈系。返回改变集哈系的短格式。例如 12 字符的 16 进制\n"
+"    - short: 修改集哈系。返回修改集哈系的短格式。例如 12 字符的 16 进制\n"
 "          字符串。\n"
-"    - shortdate: 输入日期。返回格式类似于 \"2006-09-04\"。\n"
+"    - shortdate: 输入日期。返回格式类似于 \"2006-09-18\"。\n"
 "    - strip: 输入任意文本。删除全部行首与行尾空白。\n"
 "    - tabindent: 输入任意文本。除了首行，在每行的开始增加制表符号。\n"
 "    - urlescape: 输入任意文本。封装全部特殊字符。例如\n"
@@ -7951,7 +7993,7 b' msgid ""'
 "    'hg incoming --bundle').\n"
 "\n"
 "    An optional identifier after # indicates a particular branch, tag,\n"
-"    or changeset to deal with in the remote repository.\n"
+"    or changeset to use from the remote repository.\n"
 "\n"
 "    Some features, such as pushing to http:// and https:// URLs are\n"
 "    only possible if the feature is explicitly enabled on the\n"
@@ -7982,13 +8024,14 b' msgid ""'
 "    You can then use the alias for any command that uses a url (for example\n"
 "    'hg pull alias1' would pull from the 'alias1' path).\n"
 "\n"
-"    Two path aliases are more important because they are used as defaults\n"
+"    Two path aliases are special because they are used as defaults\n"
 "    when you do not provide the url to a command:\n"
 "\n"
 "    default:\n"
 "      When you create a repository with hg clone, the clone command saves\n"
-"      the location of the source repository as the 'default' path. This is\n"
-"      then used when you omit a path from the push and pull commands.\n"
+"      the location of the source repository as the new repository's\n"
+"      'default' path. This is then used when you omit path from push-\n"
+"      and pull-like commands (including in and out).\n"
 "\n"
 "    default-push:\n"
 "      The push command will look for a path named 'default-push', and\n"
@@ -8006,7 +8049,8 b' msgstr ""'
 "    位于本地文件系统中的路径可以指向版本库，也可以指向打包的文件(被\n"
 "    'hg bundle' 或 'hg incoming --bundle' 创建)。\n"
 "\n"
-"    在 '#' 后面可选的标识符用于指定要取得的分支，标签或改变集。\n"
+"    在 '#' 后面可选的标识符用于指定要取得的远程版本库的分支，标签或\n"
+"    修改集。\n"
 "\n"
 "    仅当远程水银服务器显式启用时，才能推到 'http://' 和 'https://'。\n"
 "\n"
@@ -8034,11 +8078,12 b' msgstr ""'
 "    然后你就可以在任意命令中使用这些别名作为路径(例如 'hg pull alias1'\n"
 "    会从 'alias1' 定义的路径取得指定版本)。\n"
 "\n"
-"    因为用于默认路径，所以这 2 个路径别名特别重要:\n"
+"    因为用于默认路径，所以这 2 个路径别名比较特殊:\n"
 "\n"
 "    default:\n"
-"      当你使用 'hg clone' 创建版本库时，此命令会将源版本库的路径保存\n"
-"      为别名 'default'，然后你可以对命令 'push' 和 'pull' 省略路径。\n"
+"      当你使用 'hg clone' 创建版本库时，此命令会将源版本库的位置保存\n"
+"      为新版本库的 'default' 路径，然后你可以对类似 'push' 和 'pull'\n"
+"      的命令省略路径(包含进和出)。\n"
 "\n"
 "    default-push:\n"
 "      命令 'push' 会查找别名是 'default-push' 的路径，它覆盖定义 'default'。\n"
@@ -8082,6 +8127,11 b' msgstr "%d \xe4\xb8\xaa\xe6\x96\x87\xe4\xbb\xb6%s"'
 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"
+msgstr ""
+
 msgid "(branch merge, don't forget to commit)\n"
 msgstr ""
 
@@ -8447,7 +8497,7 b' msgstr ""'
 
 #, python-format
 msgid "%d changesets found\n"
-msgstr "已发现 %d 个改变集\n"
+msgstr "已发现 %d 个修改集\n"
 
 msgid "list of changesets:\n"
 msgstr ""
@@ -8485,7 +8535,7 b' msgstr ""'
 
 #, python-format
 msgid "added %d changesets with %d changes to %d files%s\n"
-msgstr "已增加 %d 个改变集，包含 %d 个改变，修改了 %d 个文件%s\n"
+msgstr "已增加 %d 个修改集，包含 %d 个改变，修改了 %d 个文件%s\n"
 
 msgid "updating the branch cache\n"
 msgstr ""
@@ -9152,6 +9202,10 b' msgstr ""'
 msgid "cannot decode filename '%s'"
 msgstr ""
 
+#, python-format
+msgid "broken revlog! (%s)"
+msgstr ""
+
 msgid "missing revlog!"
 msgstr ""