Commits

zhaopingsun committed f384b0a

3.1 2 paras zh translated

  • Participants
  • Parent commits a729ab2

Comments (0)

Files changed (1)

 "illustrated in <xref linkend=\"fig:tour-merge:sep-repos\"/>.  Here is a copy "
 "of our file from one repository."
 msgstr ""
+"现在<filename>hello.c</filename>有了内容不尽相同的两份拷贝。 两个版本库的历史"
+"也出现差异,就像在<xref linkend=\"fig:tour-merge:sep-repos\"/>中显示的那样。下"
+"面是文件在一个版本库中的拷贝。 "
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:51
 msgid "And here is our slightly different version from the other repository."
-msgstr ""
+msgstr "下面是该文件在另外一个版本库中稍微不同的版本。"
 
 #. type: Content of: <book><chapter><sect1><figure><title>
 #: ../en/ch03-tour-merge.xml:57