hgbook
changeset 1106:aed0e9396b14
2.8.1 zh translation
author | Zhaoping Sun <zhaopingsun@gmail.com> |
---|---|
date | Thu Dec 10 13:49:35 2009 -0500 (2009-12-10) |
parents | 9c84da5d93e9 |
children | 56dbd7295704 |
files | po/zh.po |
line diff
1.1 --- a/po/zh.po Tue Dec 01 23:40:47 2009 -0500 1.2 +++ b/po/zh.po Thu Dec 10 13:49:35 2009 -0500 1.3 @@ -4990,6 +4990,12 @@ 1.4 "more changes than you saw when using <command role=\"hg-cmd\">hg incoming</" 1.5 "command>." 1.6 msgstr "" 1.7 +"因为在运行<command role=\"hg-cmd\">hg incoming</command>和<command role=\"hg-" 1.8 +"cmd\">hg pull</command>之间可能存在延时,你可能不能看到从其他版本库中的所有导入" 1.9 +"进来的变更集。假如你正在通过网络从其他地方的版本库拖变更。当你查看<command " 1.10 +"role=\"hg-cmd\">hg incoming</command>的输出,还没有拖这些变更的时候,其他人向" 1.11 +"这个版本库提交了一些东西。这意味着你可能拖进来比你用<command role=\"hg-cmd" 1.12 +"\">hg incoming</command>看见的多的变更。" 1.13 1.14 #. type: Content of: <book><chapter><sect1><sect2><tip><para> 1.15 #: ../en/ch02-tour-basic.xml:824 1.16 @@ -4999,6 +5005,9 @@ 1.17 "a subset of changes, simply identify the change that you want to pull by its " 1.18 "changeset ID, e.g. <command>hg pull -r7e95bb</command>." 1.19 msgstr "" 1.20 +"如果你仅希望将<command role=\"hg-cmd\">hg incoming</command>命令列出的变更拖进" 1.21 +"来,或者由于其他原因希望得到变更的一个子集,那么你可以明确的指定变更集的ID,比" 1.22 +"如<command>hg pull -r7e95bb</command>。" 1.23 1.24 #. type: Content of: <book><chapter><sect1><sect2><title> 1.25 #: ../en/ch02-tour-basic.xml:834 1.26 @@ -5062,6 +5071,10 @@ 1.27 "opt-pull\">-u</option>, you can see that it printed a helpful reminder that " 1.28 "we'd have to take an explicit step to update the working directory." 1.29 msgstr "" 1.30 +"如果你回过头去看看在<xref linkend=\"sec:tour:pull\"/>一节中,我们运行<command " 1.31 +"role=\"hg-cmd\">hg pull</command>而又没有加上<option role=\"hg-opt-pull\">-u</" 1.32 +"option>选项时的输出,你可能会发现它输出了一条很有用的提示,我们还需要一步,更" 1.33 +"新工作目录。" 1.34 1.35 #. type: Content of: <book><chapter><sect1><sect2><para> 1.36 #: ../en/ch02-tour-basic.xml:872