# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1259067070 18000
# Node ID 40b0b761519d0c2d023b4296d9c5fb73273c6ec5
# Parent  b1ad5970253086f44902af7ea91522e972fe7da4
2.7.1 zh translated 1 fuzzy

diff -r b1ad59702530 -r 40b0b761519d po/zh.po
--- a/po/zh.po	Mon Nov 23 23:31:53 2009 -0500
+++ b/po/zh.po	Tue Nov 24 07:51:10 2009 -0500
@@ -4591,13 +4591,16 @@
 "entry, that will be used next.  To see what the contents of this file should "
 "look like, refer to <xref linkend=\"sec:tour-basic:username\"/> below."
 msgstr ""
+"如果你在主目录创建了名字为<filename role=\"special\">.hgrc</filename>的文件，"
+"其中包括<envar role=\"rc-item-ui\">username</envar>条目，那就用它。如果想知道"
+"这个文件的格式，请参考下面的<xref linkend=\"sec:tour-basic:username\"/>。"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:568
 msgid ""
 "If you have set the <envar>EMAIL</envar> environment variable, this will be "
 "used next."
-msgstr ""
+msgstr "如果你设置了<envar>EMAIL</envar>环境变量，那就用它。"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:571
@@ -4607,6 +4610,8 @@
 "results in a username that is not very useful, it will print a warning if it "
 "has to do this."
 msgstr ""
+"Mercurial会查询你的系统，找出主机名和你的用户名，然后用他们创建一个用户名。这"
+"样的用户名不怎么有用，所以在只能这样生成用户名的时候，它会打印出一条告警信息。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:578
@@ -4615,6 +4620,8 @@
 "message.  In this case, it will not let you commit until you set up a "
 "username."
 msgstr ""
+"如果所有的这些机制都失败了，Mercurial会执行失败退出，打印出一条错误信息这种情"
+"况下，只有你设定了用户名之后才能提交。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:582
@@ -4626,6 +4633,10 @@
 "most robust way to set a username for yourself is by creating a <filename "
 "role=\"special\">.hgrc</filename> file; see below for details."
 msgstr ""
+"当你需要覆盖Mercurial缺省的用户时，可以考虑<envar>HGUSER</envar>环境变量和"
+"<command role=\"hg-cmd\">hg commit</command>命令的<option role=\"hg-opt-commit"
+"\">-u</option>选项。正常使用的情况下，最简单实用的方法就是创建<filename role="
+"\"special\">.hgrc</filename>文件来设定用户名；步骤如下。"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
 #: ../en/ch02-tour-basic.xml:591