--- a/po/zh.po	Fri Mar 05 22:51:07 2010 +0800
+++ b/po/zh.po	Fri Mar 05 22:59:52 2010 +0800
@@ -7815,8 +7815,7 @@
 "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会对分歧更名产生警告，但是由你来决定在合并后如何解决分"
-"歧。"
+"注意虽然Mercurial会对分歧更名产生警告，但是由你来决定在合并后如何解决分歧。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:499
@@ -7831,11 +7830,14 @@
 "<emphasis>destination</emphasis>. In this case, Mercurial runs its normal "
 "merge machinery, and lets you guide it to a suitable resolution."
 msgstr ""
+"另一种更名冲突是两个人将不同的<emphasis>源</emphasis>文件改名为相同的"
+"<emphasis>目标</emphasis>文件。这种情况下，Mercurial会执行正常的合并过程，然后"
+"让你帮助他找到合适的解决方案。"
 
 #. 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