# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1259154500 18000
# Node ID 5b6b0d5fc1b8a3087f9cb138d5268b6e9f71e2e9
# Parent  510b7db1c6830e9deb8bf697140905df532fa9c4
2.7.3 zh translated

diff -r 510b7db1c683 -r 5b6b0d5fc1b8 po/zh.po
--- a/po/zh.po	Tue Nov 24 22:25:01 2009 -0500
+++ b/po/zh.po	Wed Nov 25 08:08:20 2009 -0500
@@ -4782,6 +4782,9 @@
 "<emphasis>doesn't</emphasis> follow this guideline, and hence has a summary "
 "that is not readable."
 msgstr ""
+"因为<command role=\"hg-cmd\">hg log</command>命令在缺省情况下仅会输出提交日志"
+"的第一行，所以最好日志的第一行是独立的。下面是一个日志的实例，它<emphasis>没有"
+"</emphasis>遵守这个规则，因此摘要可读性很差。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:697
@@ -4791,6 +4794,8 @@
 "about the contents of the commit message, though your project may have "
 "policies that dictate a certain kind of formatting."
 msgstr ""
+"至于日志的其他部分的内容，没有严格的规定。Mercurial并不解释或者关心日志的内"
+"容，虽然你的项目可能有某种格式的规定。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:702
@@ -4799,6 +4804,8 @@
 "tell me something that I can't figure out with a quick glance at the output "
 "of <command role=\"hg-cmd\">hg log --patch</command>."
 msgstr ""
+"我个人喜欢简短，而又信息量大的日志，它能告诉我一些我不能通过快速浏览<command "
+"role=\"hg-cmd\">hg log --patch</command>的输出而得到的信息。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:706
@@ -4808,11 +4815,14 @@
 "<command role=\"hg-cmd\">hg status</command> and <command role=\"hg-cmd\">hg "
 "diff</command>."
 msgstr ""
+"如果我们运行<command role=\"hg-cmd\">hg commit</command>命令的时候没有指定文"
+"件，它会提交我们做的所有修改，与<command role=\"hg-cmd\">hg status</command>和"
+"<command role=\"hg-cmd\">hg diff</command>这两个命令的输出一样。"
 
 #. type: Content of: <book><chapter><sect1><sect2><note><title>
 #: ../en/ch02-tour-basic.xml:713
 msgid "A surprise for Subversion users"
-msgstr ""
+msgstr "Subversion用户的困惑"
 
 #. type: Content of: <book><chapter><sect1><sect2><note><para>
 #: ../en/ch02-tour-basic.xml:715
@@ -4823,6 +4833,10 @@
 "the Subversion or CVS world, since you might expect it to operate only on the "
 "current directory that you happen to be visiting and its subdirectories."
 msgstr ""
+"和所有的Mercurial命令一样，如果我们不明确指出<command role=\"hg-cmd\">hg "
+"commit</command>命令要提交的文件名，它会在整个版本库的工作目录上执行。如果你以"
+"前使用过CVS或者Subversion，那一定要注意，你可能仅仅希望提交当前目录与其子目录"
+"的修改。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:726