zhaopingsun avatar zhaopingsun committed f5e46bc

5.6.1 first 3 param zh tranlsated

Comments (0)

Files changed (1)

 "When a merge occurs, most files will usually remain unmodified.  For each "
 "file where Mercurial has to do something, it tracks the state of the file."
 msgstr ""
+"合并发生时,大多数文件没有任何变化。Mercurial对于每个需要进行操作的文件,都会"
+"跟踪它的状态。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch05-daily.xml:626
 "A <emphasis>resolved</emphasis> file has been successfully merged, either "
 "automatically by Mercurial or manually with human intervention."
 msgstr ""
+"<emphasis>resolved</emphasis>表示文件已经成功合并,不管是Mercurial自动完成的还"
+"是手工修改完成的。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch05-daily.xml:631
 msgid ""
 "An <emphasis>unresolved</emphasis> file was not merged successfully, and "
 "needs more attention."
-msgstr ""
+msgstr "<emphasis>unresolved</emphasis>表示文件没有成功的合并,需要特别注意。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:636
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.