# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1257992710 18000
# Node ID 3dec81dc4543d9bc0dc1f69eecd318439c0a1ed0
# Parent  95fd40da8f341107a5b04969e1789ffbe8cde32d
2.4 partly zh translated

diff -r 95fd40da8f34 -r 3dec81dc4543 po/zh.po
--- a/po/zh.po	Wed Nov 11 20:55:51 2009 -0500
+++ b/po/zh.po	Wed Nov 11 21:25:10 2009 -0500
@@ -36,6 +36,7 @@
 # updated           更新到，同步到(适用于旧版本)
 # versioned         受版本控制
 # working copy      工作副本
+# identifiers	    标识符
 # ...
 #
 msgid ""
@@ -3909,7 +3910,8 @@
 "One of the first things we might want to do with a new, unfamiliar repository "
 "is understand its history.  The <command role=\"hg-cmd\">hg log</command> "
 "command gives us a view of the history of changes in the repository."
-msgstr ""
+msgstr "对于一个新的，我们不熟悉的版本库，我们想做的第一件事就是了解它的历史。"
+"命令<command role=\"hg-cmd\">hg log</command>可以让我们浏览版本库中的历史变更。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:203
@@ -3918,14 +3920,16 @@
 "to the project that was recorded.  In Mercurial terminology, we call each of "
 "these recorded events a <emphasis>changeset</emphasis>, because it can "
 "contain a record of changes to several files."
-msgstr ""
+msgstr "缺省情况下，这个命令对项目中记录的每个变更都输出一段简介，在Mercurial"
+"的术语中，我们将这些记录的事件成为<emphasis>变更集</emphasis>，因为每个记录都"
+"可能包括几个文件的变更。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:209
 msgid ""
 "The fields in a record of output from <command role=\"hg-cmd\">hg log</"
 "command> are as follows."
-msgstr ""
+msgstr " <command role=\"hg-cmd\">hg log</command>输出记录的各个字段的意义如下。"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:213
@@ -3937,7 +3941,11 @@
 "changeset in every copy of this repository. The number is shorter and easier "
 "to type than the hex string, but it isn't unique: the same number in two "
 "different clones of a repository may identify different changesets."
-msgstr ""
+msgstr "<literal>changeset</literal>：这个字段包括一个数字，接着一个冒号，然后是"
+"是一个十六进制字符串。这是这个变更的<emphasis>标识符</emphasis>。十六进制字符串"
+"是唯一标识符：在这个版本库的每个拷贝中，同一个字符串总是对应同一个变更集。数字更简单"
+"并且比十六进制字符串更容易书写，但它不是唯一的：一个版本库的两个不同的的克隆中的"
+"同一个数字可能对应不同的变更集。"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:224
@@ -3945,7 +3953,8 @@
 "<literal>user</literal>: The identity of the person who created the "
 "changeset.  This is a free-form field, but it most often contains a person's "
 "name and email address."
-msgstr ""
+msgstr "<literal>user</literal>：这个字段标识是谁创建了这个变更集。这个字段格式可以自由定义，"
+"通常是一个人的姓名加上电子邮件地址。"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:228
@@ -3954,8 +3963,8 @@
 "created, and the timezone in which it was created.  (The date and time are "
 "local to that timezone; they display what time and date it was for the person "
 "who created the changeset.)"
-msgstr ""
-
+msgstr "这个变更集创建的日期和时间，还有时区。（日期和时间是相对于时区的；"
+""他们现实了创建变更的人的日期和时间。）
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:233
 msgid ""