# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1258949236 18000
# Node ID 12cbf4daac41f2e400b0c990b0145ed8c44360d5
# Parent  d3f3979b3dabc56aa543822ec8478e25c11c3fb9
2.6 zh translated

diff -r d3f3979b3dab -r 12cbf4daac41 po/zh.po
--- a/po/zh.po	Sun Nov 22 22:32:12 2009 -0500
+++ b/po/zh.po	Sun Nov 22 23:07:16 2009 -0500
@@ -4440,7 +4440,7 @@
 "说句题外话，保留远程版本库的一份<quote>原始</quote>拷贝是一个很好的习惯，这样"
 "你就可以为每个任务都创建临时的克隆作为沙盒。直到认务完成并且你准备好提交到版本"
 "库, 每个任务都和其他的独立，这样你可以并行工作。因为本地的克隆很方便，在任何时"
-"候克隆和销毁一个版本库都基本上没有什么负担。"
+"候克隆和销毁一个版本库都只有很小的开销。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:477
@@ -4449,11 +4449,14 @@
 "a file <filename>hello.c</filename> that contains the classic <quote>hello, "
 "world</quote> program."
 msgstr ""
+"在我们的<filename class=\"directory\">my-hello</filename>版本库中，有一个叫"
+"<filename>hello.c</filename>的文件，它包含了经典的<quote>hello, world</quote>"
+"程序。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:483
 msgid "Let's edit this file so that it prints a second line of output."
-msgstr ""
+msgstr "我们编辑这个文件，让它打印第二行输出。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:488
@@ -4461,6 +4464,8 @@
 "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us "
 "what Mercurial knows about the files in the repository."
 msgstr ""
+"Mercurial的<command role=\"hg-cmd\">hg status</command>命令能告诉我们它对版本"
+"库中的文件有多少了解。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:494
@@ -4471,6 +4476,10 @@
 "\">hg status</command> will not print any output for files that have not been "
 "modified."
 msgstr ""
+"<command role=\"hg-cmd\">hg status</command>命令对有些文件没有输出信息，但是对"
+"文件<filename>hello.c</filename>，有一行以<quote><literal>M</literal></quote>"
+"为开头的输出。除非你明确告诉它，命令<command role=\"hg-cmd\">hg status</"
+"command>不会输出那些没有修改的文件的信息。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:501
@@ -4481,6 +4490,9 @@
 "before we started, or that we had modified the file after we were done; it "
 "was able to figure this out itself."
 msgstr ""
+"<quote><literal>M</literal></quote>表明Mercurial已经发现我们修改了"
+"<filename>hello.c</filename>。我们不需要在改文件之前，或者在修改完之后"
+"<emphasis>通知</emphasis>Mercurial;它自己能处理。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:509
@@ -4490,6 +4502,9 @@
 "changes we've made to it.  To do this, we use the <command role=\"hg-cmd\">hg "
 "diff</command> command."
 msgstr ""
+"知道文件<filename>hello.c</filename>被修改了很有用，但有时候我们想知道做了"
+"<emphasis>什么</emphasis>样的修改。这时，我们应该使用 <command role=\"hg-cmd"
+"\">hg diff</command>命令。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch02-tour-basic.xml:518 ../en/ch12-mq.xml:187
@@ -4501,7 +4516,7 @@
 msgid ""
 "Remember to take a look at <xref linkend=\"sec:mq:patch\"/> if you don't know "
 "how to read output above."
-msgstr ""
+msgstr "如果你不知道如何理解以上信息，请参考<xref linkend=\"sec:mq:patch\"/>。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch02-tour-basic.xml:526