Mercurial > public > src > hgbook

changeset 1162:6c93d647337b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
5.4.0 4th para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Thu, 04 Mar 2010 22:17:46 +0800
parents 561c4a65e29e
children 5b9a79aaa8cb
files po/zh.po
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh.po	Thu Mar 04 22:07:03 2010 +0800
+++ b/po/zh.po	Thu Mar 04 22:17:46 2010 +0800
@@ -7583,8 +7583,8 @@
 "have made up until that point.  (I find this behavior a little "
 "counterintuitive, which is why I mention it here.)"
 msgstr ""
-"在使用<command role=\"hg-cmd\">hg copy</command>命令的时候，Mercurial会将在当"
-"前工作目录中的文件复制。也就是说，如果你对文件作了修改，并且没有提交，那么"
+"在使用<command role=\"hg-cmd\">hg copy</command>命令的时候，Mercurial会复制工"
+"作目录中当前的文件。也就是说，如果你对文件作了修改，并且没有提交，那么"
 "<command role=\"hg-cmd\">hg copy</command>生成的新的文件将包含这些修改。（我觉"
 "得这样有点不合常理，所以在这里提一下。）"
 
@@ -7691,6 +7691,10 @@
 "\"hg-cmd\">hg status</command> to see that the added file is really being "
 "tracked by Mercurial as a copy of the original, now removed, file."
 msgstr ""
+"和<command role=\"hg-cmd\">hg copy</command>命令的结果一样，我们必须给"
+"<command role=\"hg-cmd\">hg status</command>命令加上<option role=\"hg-opt-"
+"status\">-C</option>选项才能看到Mercurial是将新加的文件是作为原始文件的拷贝进"
+"行管理的，同时原始文件已经删除。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:425