zhaopingsun avatar zhaopingsun committed bf5325b

3.3 first 3 para zh translated

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 ""
+"如果有可能的话,最好能够减少需要的步骤。实际上,Mercurial发布的时候有一个扩展"
+"叫做<literal role=\"hg-ext\">fetch</literal>可以完成这个工作。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:388
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.