# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1257728199 18000
# Node ID dcf0d7d91c28468a62641e801bfbdbdb5bfe51ed
# Parent  c84e50397ae80c413dcfa400ffd94f2aa1513791
1.6.1 zh partly translated

diff -r c84e50397ae8 -r dcf0d7d91c28 po/zh.po
--- a/po/zh.po	Sun Nov 08 18:02:22 2009 -0500
+++ b/po/zh.po	Sun Nov 08 19:56:39 2009 -0500
@@ -3083,6 +3083,8 @@
 "one of the revision control tools listed below, in most cases for several "
 "years at a time."
 msgstr ""
+"在你继续阅读之前，请理解本节完全反映了我的个人经验，兴趣，和偏好（我敢说）。下"
+"面列的每个版本控制工具我都使用过，大多数情况下都用过好几年。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:418
@@ -3090,6 +3092,8 @@
 "Subversion is a popular revision control tool, developed to replace CVS.  It "
 "has a centralised client/server architecture."
 msgstr ""
+"Subversion是一个流行的版本控制工具，是用来替代CVS的，它采用的是集中式的客户/服"
+"务器结构。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:422
@@ -3098,6 +3102,8 @@
 "same operations, so if you're familiar with one, it is easy to learn to use "
 "the other.  Both tools are portable to all popular operating systems."
 msgstr ""
+"Subversion和Mercurial相同操作的命令的命名上非常相似，所以如果你熟悉一个，很容"
+"易学会另外一个，两个工具都可以在大多数平台上运行。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:427
@@ -3107,6 +3113,10 @@
 "url=\"http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced."
 "html#svn.branchmerge.advanced.finalword\">complicated and buggy</ulink>."
 msgstr ""
+"在1.5版之前，Subversion对合并的支持并不好。在我写本书的时候，它刚新增了并跟踪"
+"的功能，出名的<ulink url=\"http://svnbook.red-bean.com/nightly/en/svn."
+"branchmerge.advanced.html#svn.branchmerge.advanced.finalword\">复杂和容易出错"
+"</ulink>。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:433
@@ -3121,6 +3131,12 @@
 "Subversion does not have useful replication facilities, server capacity and "
 "network bandwidth become bottlenecks for modestly large projects."
 msgstr ""
+"在我测量过的每个版本控制操作上Mercurial都比Subversion有很大的性能优势。差距从"
+"两个数量级到六个数量级不等，我用的是Subversion 1.4.3的<emphasis>ra_local</"
+"emphasis>文件存储方式，这是已知的最快的存取方式了。在实际的部署中包括网络存"
+"储，那么Subversion的劣势更大。因为很多Subversion命令必须和主机交互，并且因为"
+"Subversion没有好的复制机制，使得对于中的等大小的项目而言，服务器容量和网络带宽"
+"成为主要瓶颈。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:446