Commits

zhaopingsun committed 583c504

5.4.2 zh translated

  • Participants
  • Parent commits dba76e0

Comments (0)

Files changed (1)

 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:462
 msgid "Divergent renames and merging"
-msgstr "重命名与合并的分歧"
+msgstr "分歧的更名与合并"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:464
 "file&emdash;let's call it <filename>foo</filename>&emdash;in their respective "
 "repositories."
 msgstr ""
+"分歧更名是这样的情况,假设两个开发者的版本库中有一个文件&emdash;文件名为"
+"<filename>foo</filename>。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:471
 "<command role=\"hg-cmd\">hg mv</command> is an alias for <command role=\"hg-"
 "cmd\">hg rename</command>.)"
 msgstr ""
+"同时, Bob将它改名为<filename>quux</filename>。(记住<command role=\"hg-cmd"
+"\">hg mv</command>是<command role=\"hg-cmd\">hg rename</command>的别名。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:482
 msgid ""
 "I like to think of this as a conflict because each developer has expressed "
 "different intentions about what the file ought to be named."
-msgstr ""
+msgstr "我认为这是一个冲突,因为开发者对这个文件应该如何命名有了不同的意见。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:486
 "actual behavior is that it always preserves <emphasis>both</emphasis> names "
 "when it merges changesets that contain divergent renames."
 msgstr ""
+"你觉得他们合并的时候会发生什么呢?在合并包含分歧更名的变更集的时候,Mercurial"
+"实际的行为是<emphasis>两</emphasis>个文件都保留。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:493
 "Notice that while Mercurial warns about the divergent renames, it leaves it "
 "up to you to do something about the divergence after the merge."
 msgstr ""
+"注意虽然Mercurial会对分歧更名产生警告,但是由你来决定在合并后如何解决分"
+"歧。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:499