Mercurial > public > src > hgbook
changeset 1168:486f79120611
5.4.4 zh translated
| author | Zhaoping Sun <zhaopingsun@gmail.com> |
|---|---|
| date | Fri, 05 Mar 2010 23:04:49 +0800 |
| parents | 414a81a68a90 |
| children | 06ed083cc04c |
| files | po/zh.po |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/po/zh.po Fri Mar 05 22:59:52 2010 +0800 +++ b/po/zh.po Fri Mar 05 23:04:49 2010 +0800 @@ -7837,7 +7837,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch05-daily.xml:509 msgid "Other name-related corner cases" -msgstr "其它名称相关的情况" +msgstr "其它名称相关的信息" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch05-daily.xml:511 @@ -7847,6 +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>。" #. type: Content of: <book><chapter><sect1><title> #: ../en/ch05-daily.xml:524