zhaopingsun avatar zhaopingsun committed 06ed083

refine 5.4 ,first para of 5.5.0

Comments (0)

Files changed (1)

 "cmd\">hg rename</command>.)"
 msgstr ""
 "同时, Bob将它改名为<filename>quux</filename>。(记住<command role=\"hg-cmd"
-"\">hg mv</command>是<command role=\"hg-cmd\">hg rename</command>的别名。"
+"\">hg mv</command>是<command role=\"hg-cmd\">hg rename</command>的别名。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:482
 "when it merges changesets that contain divergent renames."
 msgstr ""
 "你觉得他们合并的时候会发生什么呢?在合并包含分歧更名的变更集的时候,Mercurial"
-"实际的行为是<emphasis>两</emphasis>个文件都保留。"
+"实际上会将<emphasis>两</emphasis>个文件都保留。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:493
 "same name.  This is documented as <ulink role=\"hg-bug\" url=\"http://www."
 "selenic.com/mercurial/bts/issue29\">issue 29</ulink>."
 msgstr ""
-"Mercurial很一直都有一个bug,如果它在进行合并的时候发现一边有一个文件,而另外"
-"一边有一个相同名称的目录,那么合并就会失败。这个问题记录在<ulink role=\"hg-bug"
+"Mercurial一直都有一个bug,如果它在进行合并的时候发现一边有一个文件,而另外一"
+"边有一个相同名称的目录,那么合并就会失败。这个问题记录在<ulink role=\"hg-bug"
 "\" url=\"http://www.selenic.com/mercurial/bts/issue29\">issue 29</ulink>。"
 
 #. type: Content of: <book><chapter><sect1><title>
 msgid ""
 "Mercurial has some useful commands that will help you to recover from some "
 "common mistakes."
-msgstr ""
+msgstr "Mercurial提供了一些有用的命令,它们可以帮助你从一些常见的错误中恢复。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:529
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.