hgbook

changeset 1103:b6bb5b383887

2.8.1 first 2 para zh translated
author Zhaoping Sun <zhaopingsun@gmail.com>
date Wed Nov 25 22:33:34 2009 -0500 (2009-11-25)
parents 77fa81a32f2e
children eafa27cb18eb
files po/zh.po
line diff
     1.1 --- a/po/zh.po	Wed Nov 25 21:51:40 2009 -0500
     1.2 +++ b/po/zh.po	Wed Nov 25 22:33:34 2009 -0500
     1.3 @@ -4916,7 +4916,7 @@
     1.4  #. type: Content of: <book><chapter><sect1><sect2><title>
     1.5  #: ../en/ch02-tour-basic.xml:772
     1.6  msgid "Pulling changes from another repository"
     1.7 -msgstr "从其它版本库取得修改"
     1.8 +msgstr "从其它版本库取得变更"
     1.9  
    1.10  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.11  #: ../en/ch02-tour-basic.xml:774
    1.12 @@ -4926,6 +4926,9 @@
    1.13  "We'll call our temporary repository <filename class=\"directory\">hello-pull</"
    1.14  "filename>."
    1.15  msgstr ""
    1.16 +"首先,我们克隆原始版本的<filename class=\"directory\">hello</filename>版本库,"
    1.17 +"它不包含我们刚刚提交的变更。我们将这个临时版本库称为<filename class="
    1.18 +"\"directory\">hello</filename>。"
    1.19  
    1.20  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.21  #: ../en/ch02-tour-basic.xml:782
    1.22 @@ -4939,6 +4942,12 @@
    1.23  "<emphasis>would</emphasis> pull into the repository, without actually pulling "
    1.24  "the changes in."
    1.25  msgstr ""
    1.26 +"我们用<command role=\"hg-cmd\">hg pull</command>命令将变更从<filename class="
    1.27 +"\"directory\">my-hello</filename>拖到<filename class=\"directory\">hello-"
    1.28 +"pull</filename>。然而,不管三七二十一将不了解的变更拖进版本库也实在是冒险。"
    1.29 +"Mercurial提供了<command role=\"hg-cmd\">hg incoming</command>命令,它会告诉我"
    1.30 +"们<command role=\"hg-cmd\">hg pull</command>将会把哪些变更拖进版本库,但不会真"
    1.31 +"正的执行。"
    1.32  
    1.33  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.34  #: ../en/ch02-tour-basic.xml:795