Commits

zhaopingsun  committed 2adec7e

 3.2.2 first some paras zh translated

  • Participants
  • Parent commits 78d0fae

Comments (0)

Files changed (1)

 "linkend=\"fig:tour-merge:conflict\"/> above.  Let's begin by creating a "
 "repository with a base version of our document."
 msgstr ""
+"在本例中,我们将重建<xref linkend=\"fig:tour-merge:conflict\"/>的修改历史。我"
+"们从创建文档基版本的版本库开始。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:308
 msgid "We'll clone the repository and make a change to the file."
-msgstr ""
+msgstr "我们克隆版本库并且修改文件。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:313
 "when you isolate tasks in separate repositories, and indeed to find and "
 "resolve conflicts while doing so.)"
 msgstr ""
+"让另外一个克隆去模拟别人修改文件(这意味着当你利用不同的版本库处理不同任务的时"
+"候,常常需要和自己合并,实际上也就是找到并解决冲突。)"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:321
 msgid ""
 "Having created two different versions of the file, we'll set up an "
 "environment suitable for running our merge."
-msgstr ""
+msgstr "这个文件已经有了两个不同的版本,我们来设置适合进行合并的环境。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:327
 "bother setting <envar>HGMERGE</envar>.  You'll get dropped into a GUI file "
 "merge tool instead, which is much preferable.)"
 msgstr ""
+"在本例中,我们设置<envar>HGMERGE</envar>告诉MERCURIAL用非交互式的<command>合并"
+"</command>命令。许多类似Unix系统都有这个功能。(如果你在电脑上,不必设置"
+"<envar>HGMERGE</envar>,直接使用GUI会更好)"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:337
 "indicating which lines have conflicts, and whether they came from our version "
 "of the file or theirs."
 msgstr ""
+"由于合并解决不了冲突的变更,所以冲突文件会有标记,表明哪些行存在冲突,他们来自"
+"我们的文件还是他们的文件。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:343