Mercurial > public > src > hgbook
changeset 1164:6bb66c2e512f
5.4.1 first 2 paras zh translated
author | Zhaoping Sun <zhaopingsun@gmail.com> |
---|---|
date | Thu, 04 Mar 2010 22:55:27 +0800 |
parents | 5b9a79aaa8cb |
children | dba76e0f77c5 |
files | po/zh.po |
diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/po/zh.po Thu Mar 04 22:31:00 2010 +0800 +++ b/po/zh.po Thu Mar 04 22:55:27 2010 +0800 @@ -7706,6 +7706,11 @@ "command> command, and the options it accepts, are similar to the <command " "role=\"hg-cmd\">hg copy</command> command." msgstr "" +"<command role=\"hg-cmd\">hg remove</command>和<command role=\"hg-cmd\">hg " +"copy</command>命令一样,你在事后可以使用<option role=\"hg-opt-rename\">--" +"after</option>选项告诉Mercurial改名。大多数情况下,<command role=\"hg-cmd" +"\">hg rename</command>和<command role=\"hg-cmd\">hg copy</command>的行为和接受" +"的选项都是相似的。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch05-daily.xml:434 @@ -7714,8 +7719,8 @@ "<command role=\"hg-cmd\">hg rename</command> command can be invoked as " "<command role=\"hg-cmd\">hg mv</command>." msgstr "" -"如果你熟悉Unix命令行,那么告诉你一个好消息,可以用<command role=\"hg-cmd\">hg mv</" -"command>替代<command role=\"hg-cmd\">hg rename</command>。" +"如果你熟悉Unix命令行,那么告诉你一个好消息,可以用<command role=\"hg-cmd\">hg " +"mv</command>替代<command role=\"hg-cmd\">hg rename</command>。" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch05-daily.xml:440 @@ -7728,6 +7733,8 @@ "Since Mercurial's rename is implemented as copy-and-remove, the same " "propagation of changes happens when you merge after a rename as after a copy." msgstr "" +"因为Mercurial的重命名是以拷贝删除的方式实现的,如果拷贝了一个文件,然后又将其" +"重命名,变更还是会从原来的文件传播到更名后的文件。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch05-daily.xml:446 @@ -7738,6 +7745,9 @@ "expect to <quote>simply work,</quote> but not all revision control systems " "actually do this.)" msgstr "" +"如果我修改了一个文件,同时你又将其更名,然后我们合并相关变更,那么我在原始文件" +"名下作的修改将会传播到你的新文件中去。(这个功能你可能认为<quote>很简单,</" +"quote>但是不是所有的版本控制系统都有这个功能。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch05-daily.xml:453