# HG changeset patch
# User zhaopingsun
# Date 1257822503 18000
# Node ID 4615159a8385d284026ed2af70378b883331722b
# Parent  b08a63383d044c3ff2b7663ce852405ad7bb8b12
1.6.1 2 final para translated

diff -r b08a63383d04 -r 4615159a8385 po/zh.po
--- a/po/zh.po	Mon Nov 09 21:53:10 2009 -0500
+++ b/po/zh.po	Mon Nov 09 22:08:23 2009 -0500
@@ -3181,7 +3181,8 @@
 "a file, so that they temporarily have the exclusive right to commit changes "
 "to it, can be a significant advantage to a project where binary files are "
 "widely used."
-msgstr ""
+msgstr "另外，合并不同版本的二进制文件非常困难，换句话说，基本事实不可能。Subversion"
+"提供锁定功能，用户锁定一个文件，这样他就取得了对这个文件临时的独占的提交权限，这对于广泛使用二进制文件的项目而言是个优势。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch01-intro.xml:478
@@ -3192,7 +3193,9 @@
 "parallel before deciding to switch.  History conversion is incremental, so "
 "you can perform an initial conversion, then small additional conversions "
 "afterwards to bring in new changes."
-msgstr ""
+msgstr "Mercurial可以从Subversion的版本库中导入历史版本。它也可以向Subversion的版本库输出历史版本。"
+"这样在决定转换之前很容易先<quote>试一下水</quote>，同时并行的使用Mercurial和Subversion。版本史的转换是"
+"递增的，你可以先构造一个初始版本，每次有了新的更改后加入一个小的转换。"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch01-intro.xml:490 ../en/ch01-intro.xml:629