# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1259037113 18000
# Node ID b1ad5970253086f44902af7ea91522e972fe7da4
# Parent  7640e10b212880c116d50523b7acd7799b1675bd
2.7.1  1 fuzzy

diff -r 7640e10b2128 -r b1ad59702530 po/zh.po
--- a/po/zh.po	Mon Nov 23 23:15:02 2009 -0500
+++ b/po/zh.po	Mon Nov 23 23:31:53 2009 -0500
@@ -4560,6 +4560,10 @@
 "figure out a sensible username to commit the change with.  It will attempt "
 "each of the following methods, in order:"
 msgstr ""
+"当你准备第一次运行<command role=\"hg-cmd\">hg commit</command>命令时，不一定会"
+"成功。对于你提交的每个变更，Mercurial都会记录你的名字和邮件地址，这样你和其他"
+"人以后就能分开是谁做的哪个变更。Mercurial会自动尝试找出一个有意义的用户名来提"
+"交。它会依次尝试以下方法："
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:552
@@ -4568,13 +4572,16 @@
 "<command role=\"hg-cmd\">hg commit</command> command on the command line, "
 "followed by a username, this is always given the highest precedence."
 msgstr ""
+"如果你给<command role=\"hg-cmd\">hg commit</command>命令加上了<option role="
+"\"hg-opt-commit\">-u</option>选项，接着是一个用户名，Mercurial会使用这个用户"
+"名，这是最高的优先级。"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:557
 msgid ""
 "If you have set the <envar>HGUSER</envar> environment variable, this is "
 "checked next."
-msgstr ""
+msgstr "接下来测试你是否设定了<envar>HGUSER</envar>环境变量。"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:560