Commits

zhaopingsun committed 230dfc4

3.2.1 first 4 para zh translated

  • Participants
  • Parent commits 9136d57

Comments (0)

Files changed (1)

 "are three different versions of the file of interest to us.  The tool thus "
 "splits the upper portion of the window into three panes:"
 msgstr ""
+"我比较喜欢的图形化的合并工具是<command>kdiff3</command>。我会用它来描述图形化"
+"合并工具的一般特征。你可以在<xref linkend=\"fig:tour-merge:kdiff3\"/>看到正在"
+"使用中的<command>kdiff3</command>的截图. 它正在进行的这种合并叫<emphasis>三路"
+"合并</emphasis>。因为我们感兴趣的文件有三种不同的版本。所以它把窗口的上半部分"
+"为3格。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch03-tour-merge.xml:248
 "most recent version from which the two versions we're trying to merge are "
 "descended."
 msgstr ""
+"左边是文件的<emphasis>基</emphasis>版本,也就是我们合并的两个版本的最新的父版"
+"本。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch03-tour-merge.xml:253
 msgid ""
 "In the middle is <quote>our</quote> version of the file, with the contents "
 "that we modified."
-msgstr ""
+msgstr "中间是<quote>我们的</quote>版本,其内容已经被我们修改。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch03-tour-merge.xml:256
 msgid ""
 "On the right is <quote>their</quote> version of the file, the one that from "
 "the changeset that we're trying to merge with."
-msgstr ""
+msgstr "右边是<quote>他们的</quote>版本,就是从我们试图进行合并的变更集。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:260