hgbook
changeset 1107:56dbd7295704
2.8.3 first 3 para zh translated
author | Zhaoping Sun <zhaopingsun@gmail.com> |
---|---|
date | Wed Dec 23 23:02:50 2009 -0500 (2009-12-23) |
parents | aed0e9396b14 |
children | ddd97fac3582 |
files | po/zh.po |
line diff
1.1 --- a/po/zh.po Thu Dec 10 13:49:35 2009 -0500 1.2 +++ b/po/zh.po Wed Dec 23 23:02:50 2009 -0500 1.3 @@ -5071,10 +5071,10 @@ 1.4 "opt-pull\">-u</option>, you can see that it printed a helpful reminder that " 1.5 "we'd have to take an explicit step to update the working directory." 1.6 msgstr "" 1.7 -"如果你回过头去看看在<xref linkend=\"sec:tour:pull\"/>一节中,我们运行<command " 1.8 -"role=\"hg-cmd\">hg pull</command>而又没有加上<option role=\"hg-opt-pull\">-u</" 1.9 -"option>选项时的输出,你可能会发现它输出了一条很有用的提示,我们还需要一步,更" 1.10 -"新工作目录。" 1.11 +"如果回顾<xref linkend=\"sec:tour:pull\"/>一节,我们运行<command role=\"hg-cmd" 1.12 +"\">hg pull</command>而又没有加上<option role=\"hg-opt-pull\">-u</option>选项" 1.13 +"时,你可能会发现它输出了一条很有用的提示,我们还需要执行一个操作,才能更新工作" 1.14 +"目录。" 1.15 1.16 #. type: Content of: <book><chapter><sect1><sect2><para> 1.17 #: ../en/ch02-tour-basic.xml:872 1.18 @@ -5095,6 +5095,10 @@ 1.19 "a parent in just the same way; this is the changeset that the working " 1.20 "directory currently contains." 1.21 msgstr "" 1.22 +"如果回顾<xref linkend=\"fig:tour-basic:history\"/>一节,你会看到箭头连着每个变" 1.23 +"更集。箭头<emphasis>离开</emphasis>的节点是父版本,箭头<emphasis>指向</" 1.24 +"emphasis>的是子版本。工作目录的父版本也是一样的方式;它是工作目录包含的变更" 1.25 +"集。" 1.26 1.27 #. type: Content of: <book><chapter><sect1><sect2><para> 1.28 #: ../en/ch02-tour-basic.xml:887 1.29 @@ -5113,6 +5117,9 @@ 1.30 "command> will update to the tip revision, as shown by the second call to " 1.31 "<command role=\"hg-cmd\">hg update</command> in the example above." 1.32 msgstr "" 1.33 +"如果没有明确指出版本,<command role=\"hg-cmd\">hg update</command>会更新到tip" 1.34 +"版,就像上面例子<command role=\"hg-cmd\">hg update</command>第二次执行的结果一" 1.35 +"样。 " 1.36 1.37 #. type: Content of: <book><chapter><sect1><sect2><title> 1.38 #: ../en/ch02-tour-basic.xml:901 1.39 @@ -5127,6 +5134,8 @@ 1.40 "pull</command> above, we'll create a temporary repository to push our changes " 1.41 "into." 1.42 msgstr "" 1.43 +"我们可以将变更从当前所在的版本库推到其他的版本库。与上面的<command role=\"hg-" 1.44 +"cmd\">hgpull</command>例子一样,我们可以创建一个临时的版本库存放我们的变更。" 1.45 1.46 #. type: Content of: <book><chapter><sect1><sect2><para> 1.47 #: ../en/ch02-tour-basic.xml:911 1.48 @@ -5134,13 +5143,15 @@ 1.49 "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what " 1.50 "changes would be pushed into another repository." 1.51 msgstr "" 1.52 +"<command role=\"hg-cmd\">hg outgoing</command>命令可以告诉我们那些变更将会被推" 1.53 +"到另外一个版本库。" 1.54 1.55 #. type: Content of: <book><chapter><sect1><sect2><para> 1.56 #: ../en/ch02-tour-basic.xml:917 1.57 msgid "" 1.58 "And the <command role=\"hg-cmd\">hg push</command> command does the actual " 1.59 "push." 1.60 -msgstr "" 1.61 +msgstr "而<command role=\"hg-cmd\">hg push</command>命令则会执行真正的推操作。" 1.62 1.63 #. type: Content of: <book><chapter><sect1><sect2><para> 1.64 #: ../en/ch02-tour-basic.xml:922