Commits

zhaopingsun  committed 78d0fae

3.2.1 zh translated

  • Participants
  • Parent commits 230dfc4

Comments (0)

Files changed (1)

 "conflicts, with some sensible merger of the <quote>ours</quote> and "
 "<quote>theirs</quote> versions of the file."
 msgstr ""
+"它们下面的方格是合并的当前<emphasis>结果</emphasis>。我们任务就是替换所有的红"
+"色文字,它们标志着未解决的冲突,我们必须在<quote>我们的</quote>和<quote>他们的"
+"</quote>版本中进行合理的合并。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:267
 "scroll vertically or horizontally in any of them, the others are updated to "
 "display the corresponding sections of their respective files."
 msgstr ""
+"这四格都是<emphasis>关联</emphasis>的,如果我们将其中任意一个垂直或水平滚动,"
+"其他的格也会更新对应文件的相关部分的显示。"
 
 #. type: Content of: <book><chapter><sect1><sect2><figure><title>
 #: ../en/ch03-tour-merge.xml:273
 "theirs.  We can also manually edit the merged file at any time, in case we "
 "need to make further modifications."
 msgstr ""
+"对于文件的每个冲突,我们可以用基版本,我们的版本或者他们的版本的一些文字的组合"
+"来解决冲突。也可以在任何时候手工编辑合并后的文件。这种情况下我们需要进一步的修"
+"改。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:290
 "containing plain text, while a few are aimed at specialised file formats "
 "(generally XML)."
 msgstr ""
+"有<emphasis>许多</emphasis>可以选择的合并工具,篇幅有限,这里就不多介绍了。他"
+"们适应于不同的平台,各有其优点和缺点。大多数软件都是针对合并纯文本文件优化的,"
+"另外一些则是针对特殊的格式(通常是XML)进行了优化。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch03-tour-merge.xml:299