# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1261628192 18000
# Node ID ddd97fac358231e64d334a5ec4ca16a93598bf3b
# Parent  56dbd7295704469a7596b8877adc2d436493cc31
2.8.3 zh translated

diff -r 56dbd7295704 -r ddd97fac3582 po/zh.po
--- a/po/zh.po	Wed Dec 23 23:02:50 2009 -0500
+++ b/po/zh.po	Wed Dec 23 23:16:32 2009 -0500
@@ -5166,6 +5166,12 @@
 "update its working directory while someone was working in it, their work "
 "would be disrupted."
 msgstr ""
+"与<command role=\"hg-cmd\">hg pull</command>一样，在变更推送之后，<command "
+"role=\"hg-cmd\">hg push</command>命令并不会更新版本库的工作目录，与<command "
+"role=\"hg-cmd\">hg pull</command>命令不同，<command role=\"hg-cmd\">hg push</"
+"command>并不提供<literal>-u</literal>选项来更新其他版本库的工作目录。这一不对"
+"称是有目的的：我们推送的版本库可能是一个远端的服务器，并且很多人共享使用它。如"
+"果在其他人正在工作的时候，我们更新了工作目录，那么他们的工作很可能被破坏。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:934
@@ -5173,6 +5179,8 @@
 "What happens if we try to pull or push changes and the receiving repository "
 "already has those changes? Nothing too exciting."
 msgstr ""
+"如果我们向一个已经包含了这些变更的版本库推送或者拉这些变更会发生什么事情呢？，"
+"什么也不会发生。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:942