--- a/po/zh.po	Mon Feb 15 19:57:53 2010 +0800
+++ b/po/zh.po	Tue Feb 16 00:04:27 2010 +0800
@@ -25,7 +25,7 @@
 # patchset          补丁集
 # pushing to        推到
 # pulling from      拉自，抓取
-# rename            改名
+# rename            重命名 
 # repository        版本库
 # revert            恢复
 # revision          版本
@@ -5988,7 +5988,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch03-tour-merge.xml:429
 msgid "Renaming, copying, and merging"
-msgstr "改名，复制与合并"
+msgstr "重命名，复制与合并"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:431
@@ -6720,7 +6720,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch04-concepts.xml:529
 msgid "Merging and renames"
-msgstr "合并与改名"
+msgstr "合并与重命名"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch04-concepts.xml:531
@@ -7644,7 +7644,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch05-daily.xml:394
 msgid "Renaming files"
-msgstr "改名文件"
+msgstr "重命名文件"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:396
@@ -7655,6 +7655,10 @@
 "essentially the same way as a copy.  Therefore, knowing what Mercurial does "
 "when you copy a file tells you what to expect when you rename a file."
 msgstr ""
+"与拷贝文件比起来，重命名文件使用频率更高。我在讨论重命名文件之前讨论<command "
+"role=\"hg-cmd\">hg copy</command>命令是因为Mercurial对于拷贝和重命名的处理方式"
+"相同。因此知道了Mercurial怎么处理拷贝文件也就知道了Mercurial怎么处理重命名文"
+"件。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:404
@@ -7663,6 +7667,8 @@
 "Mercurial makes a copy of each source file, then deletes it and marks the "
 "file as removed."
 msgstr ""
+"在你运行<command role=\"hg-cmd\">hg rename</command>命令的时候，Mercurial 首先"
+"对每个源文件都做一份拷贝，然后删除它，并将其标识为删除。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:410
@@ -7670,6 +7676,8 @@
 "The <command role=\"hg-cmd\">hg status</command> command shows the newly "
 "copied file as added, and the copied-from file as removed."
 msgstr ""
+"<command role=\"hg-cmd\">hg status</command>命令显示新拷贝的文件的状态是添加，"
+"拷贝的那个文件的状态是删除。 "
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:416
@@ -7702,7 +7710,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:440
 msgid "Renaming files and merging changes"
-msgstr "改名文件与合并修改"
+msgstr "重命名文件与合并变更"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:442
@@ -7734,7 +7742,7 @@
 #. 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
@@ -7782,7 +7790,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch05-daily.xml:499
 msgid "Convergent renames and merging"
-msgstr "收敛改名与合并"
+msgstr "收敛重命名与合并"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch05-daily.xml:501
@@ -8030,7 +8038,7 @@
 "Consider the case where we use <command role=\"hg-cmd\">hg rename</command> "
 "to rename a file."
 msgstr ""
-"设想我们使用 <command role=\"hg-cmd\">hg rename</command> 命令来改名文件。"
+"设想我们使用 <command role=\"hg-cmd\">hg rename</command> 命令来重命名文件。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:692