# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1258947132 18000
# Node ID d3f3979b3dabc56aa543822ec8478e25c11c3fb9
# Parent  3c3a2bd7c14e8053be07c77fb42dcd4a146bfa9e
2.6 zh 2 paras  translated

diff -r 3c3a2bd7c14e -r d3f3979b3dab po/zh.po
--- a/po/zh.po	Sun Nov 22 21:46:53 2009 -0500
+++ b/po/zh.po	Sun Nov 22 22:32:12 2009 -0500
@@ -4379,7 +4379,7 @@
 #. type: Content of: <book><chapter><sect1><note><title>
 #: ../en/ch02-tour-basic.xml:432
 msgid "Option naming consistency"
-msgstr ""
+msgstr "选项命名的一致性"
 
 #. type: Content of: <book><chapter><sect1><note><para>
 #: ../en/ch02-tour-basic.xml:434
@@ -4394,7 +4394,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch02-tour-basic.xml:445
 msgid "Making and reviewing changes"
-msgstr "创建和复审修改"
+msgstr "创建和复审变更"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:447
@@ -4402,6 +4402,8 @@
 "Now that we have a grasp of viewing history in Mercurial, let's take a look "
 "at making some changes and examining them."
 msgstr ""
+"现在我们已经对查看Mercurial的版本历史有了一些了解，现在我们开始做些修改并且检"
+"查这些修改。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:451
@@ -4435,6 +4437,10 @@
 "there's almost no overhead to cloning and destroying repositories whenever "
 "you want."
 msgstr ""
+"说句题外话，保留远程版本库的一份<quote>原始</quote>拷贝是一个很好的习惯，这样"
+"你就可以为每个任务都创建临时的克隆作为沙盒。直到认务完成并且你准备好提交到版本"
+"库, 每个任务都和其他的独立，这样你可以并行工作。因为本地的克隆很方便，在任何时"
+"候克隆和销毁一个版本库都基本上没有什么负担。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:477