Mercurial > public > src > hgbook
changeset 1170:782e9a5173a1
5.5 zh translated
author | Zhaoping Sun <zhaopingsun@gmail.com> |
---|---|
date | Tue, 16 Mar 2010 21:10:07 +0800 |
parents | 06ed083cc04c |
children | 70aab9784696 |
files | po/zh.po |
diffstat | 1 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/po/zh.po Fri Mar 05 23:13:06 2010 +0800 +++ b/po/zh.po Tue Mar 16 21:10:07 2010 +0800 @@ -7847,9 +7847,9 @@ "same name. This is documented as <ulink role=\"hg-bug\" url=\"http://www." "selenic.com/mercurial/bts/issue29\">issue 29</ulink>." msgstr "" -"Mercurial一直都有一个bug,如果它在进行合并的时候发现一边有一个文件,而另外一" -"边有一个相同名称的目录,那么合并就会失败。这个问题记录在<ulink role=\"hg-bug" -"\" url=\"http://www.selenic.com/mercurial/bts/issue29\">issue 29</ulink>。" +"Mercurial一直都有一个bug,如果它在进行合并的时候发现一边有一个文件,而另外一边" +"有一个相同名称的目录,那么合并就会失败。这个问题记录在<ulink role=\"hg-bug\" " +"url=\"http://www.selenic.com/mercurial/bts/issue29\">issue 29</ulink>。" #. type: Content of: <book><chapter><sect1><title> #: ../en/ch05-daily.xml:524 @@ -7874,6 +7874,11 @@ "for adding by Mercurial any longer, either. You can also use <command role=" "\"hg-cmd\">hg revert</command> to get rid of erroneous changes to a file." msgstr "" +"<command role=\"hg-cmd\">hg revert</command>命令让你取消对工作目录做的变更。比" +"如,你不小心用<command role=\"hg-cmd\">hg add</command>命令添加了一个文件,只" +"要运行<command role=\"hg-cmd\">hg revert</command>加上你添加的文件的文件名,但" +"是文件的内容不会有任何改变,仅仅是Mercurial不再跟踪它了。你也可以用<command " +"role=\"hg-cmd\">hg revert</command>消除对文件作出的错误的更改。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch05-daily.xml:539 @@ -7883,6 +7888,9 @@ "you've committed a change, if you decide it was a mistake, you can still do " "something about it, though your options may be more limited." msgstr "" +"要记住<command role=\"hg-cmd\">hg revert</command>命令仅仅适用于你的变更还没有" +"提交的时候。一旦你提交了变更,然后发现这是个错误,你仍然有机会修正,虽然能做的" +"很有限。" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch05-daily.xml:546 @@ -7891,6 +7899,8 @@ "command, and details about how to deal with changes you have already " "committed, see <xref linkend=\"chap:undo\"/>." msgstr "" +"关于<command role=\"hg-cmd\">hg revert</command>命令的更多信息,还有如何处理已" +"经提交的变更,请参考<xref linkend=\"chap:undo\"/>。" #. type: Content of: <book><chapter><sect1><title> #: ../en/ch05-daily.xml:553