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