# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1259117983 18000
# Node ID f01108de23c3f70a3731445cdb9cc0e02dcb6dd4
# Parent  902bfd461a6366ab6be400aabc77e45c80391979
2.7.1.2 zh translated

diff -r 902bfd461a63 -r f01108de23c3 po/zh.po
--- a/po/zh.po	Tue Nov 24 21:44:37 2009 -0500
+++ b/po/zh.po	Tue Nov 24 21:59:43 2009 -0500
@@ -4713,6 +4713,9 @@
 "not be interpreted by Mercurial.  The convention that most people follow is "
 "to use their name and email address, as in the example above."
 msgstr ""
+"<literal>username</literal>配置项的值可以是你喜欢的任意文字，因为这项信息主要"
+"是给其他用户阅读的，所以Mercurial不会去解释它。大多数人的习惯是采用用户名加上"
+"邮件地址的格式，就像上面的例子一样。"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
 #: ../en/ch02-tour-basic.xml:641
@@ -4722,6 +4725,9 @@
 "likelihood that you'll start receiving more junk email if you publish a "
 "Mercurial repository on the web."
 msgstr ""
+"Mercurial内置的网络服务器会混淆邮件地址，让垃圾邮件发送者用的邮件地址抓取工具"
+"很难获取你的邮件地址。当你把Mercurial的版本库在网路上发布的时候，这可以减小你"
+"接收到垃圾邮件的风险。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:650