zhaopingsun  committed bf5325b

3.3 first 3 para zh translated

  • Participants
  • Parent commits c3dc720
  • Branches default

Comments (0)

Files changed (1)

 msgid ""
 "The process of merging changes as outlined above is straightforward, but "
 "requires running three commands in sequence."
-msgstr ""
+msgstr "上面讨论的合并变更的过程非常简单,但是需要按照顺序允许三个命令"
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:379
 "In the case of the final commit, you also need to enter a commit message, "
 "which is almost always going to be a piece of uninteresting "
 "<quote>boilerplate</quote> text."
-msgstr ""
+msgstr "在最后提交的时候,你需要输入一条提交信息,这通常并不怎么有趣。"
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:383
 "possible.  Indeed, Mercurial is distributed with an extension called <literal "
 "role=\"hg-ext\">fetch</literal> that does just this."
 msgstr ""
+"叫做<literal role=\"hg-ext\">fetch</literal>可以完成这个工作。"
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:388