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