# HG changeset patch # User Zhaoping Sun # Date 1259206414 18000 # Node ID b6bb5b383887abd300ec2fe8823cacbd99686fc4 # Parent 77fa81a32f2e3e03470585b9ef6a2c338dc72dd1 2.8.1 first 2 para zh translated diff -r 77fa81a32f2e -r b6bb5b383887 po/zh.po --- a/po/zh.po Wed Nov 25 21:51:40 2009 -0500 +++ b/po/zh.po Wed Nov 25 22:33:34 2009 -0500 @@ -4916,7 +4916,7 @@ #. type: Content of: #: ../en/ch02-tour-basic.xml:772 msgid "Pulling changes from another repository" -msgstr "从其它版本库取得修改" +msgstr "从其它版本库取得变更" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:774 @@ -4926,6 +4926,9 @@ "We'll call our temporary repository <filename class=\"directory\">hello-pull</" "filename>." msgstr "" +"首先,我们克隆原始版本的<filename class=\"directory\">hello</filename>版本库," +"它不包含我们刚刚提交的变更。我们将这个临时版本库称为<filename class=" +"\"directory\">hello</filename>。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:782 @@ -4939,6 +4942,12 @@ "<emphasis>would</emphasis> pull into the repository, without actually pulling " "the changes in." msgstr "" +"我们用<command role=\"hg-cmd\">hg pull</command>命令将变更从<filename class=" +"\"directory\">my-hello</filename>拖到<filename class=\"directory\">hello-" +"pull</filename>。然而,不管三七二十一将不了解的变更拖进版本库也实在是冒险。" +"Mercurial提供了<command role=\"hg-cmd\">hg incoming</command>命令,它会告诉我" +"们<command role=\"hg-cmd\">hg pull</command>将会把哪些变更拖进版本库,但不会真" +"正的执行。" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch02-tour-basic.xml:795