changeset 1158:16b351489acd

chap 3 zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Sun, 14 Feb 2010 23:49:37 +0800
parents 458f60397a26
children 451437ae28d3
files po/zh.po
diffstat 1 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh.po	Sun Feb 14 23:20:22 2010 +0800
+++ b/po/zh.po	Sun Feb 14 23:49:37 2010 +0800
@@ -5997,6 +5997,8 @@
 "files and directories. This can be as simple as renaming a single file, or as "
 "complex as restructuring the entire hierarchy of files within the project."
 msgstr ""
+"在一个项目的生命里,我们经常需要更改它的文件和目录的布局。这可能很简单,仅仅是"
+"对文件改名,或者非常复杂,像对整个项目的文件层次重新规划。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:436
@@ -6006,6 +6008,10 @@
 "<command>hg rename</command><placeholder type=\"footnote\" id=\"0\"/> command "
 "to rename it, so that Mercurial can do the right thing later when we merge."
 msgstr ""
+"Mercurial对这种复杂的变更支持的很好,只要你告诉它你想干什么就可以了。如果你想"
+"要给一个文件改名,只要用<command>hg rename</command><placeholder type="
+"\"footnote\" id=\"0\"/>给它改名就可以了,在以后需要合并的时候,Mercurial知道该"
+"怎么做。"
 
 #. type: Content of: <book><chapter><sect1><para><footnote><para>
 #: ../en/ch03-tour-merge.xml:439
@@ -6013,13 +6019,15 @@
 "If you're a Unix user, you'll be glad to know that the <command>hg rename</"
 "command> command can be abbreviated as <command>hg mv</command>."
 msgstr ""
+"如果你是一个Unix用户,你会很高兴的发现<command>hg rename</command>可以简写为"
+"<command>hg mv</command>。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:445
 msgid ""
 "We will cover the use of these commands in more detail in <xref linkend="
 "\"chap:daily.copy\"/>."
-msgstr ""
+msgstr "我们将在<xref linkend=\"chap:daily.copy\"/>中详细介绍这些命令的使用。"
 
 #. type: Content of: <book><chapter><title>
 #: ../en/ch04-concepts.xml:5