zhaopingsun committed 414a81a

5.4.3 zh translated

Comments (0)

Files changed (1)

 "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 ""
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:499
 "<emphasis>destination</emphasis>. In this case, Mercurial runs its normal "
 "merge machinery, and lets you guide it to a suitable resolution."
 msgstr ""
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:509
 msgid "Other name-related corner cases"
-msgstr "其它名称相关的角落"
+msgstr "其它名称相关的情况"
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:511