1.1 --- a/po/zh.po	Thu May 21 14:57:15 2009 +0800
     1.2 +++ b/po/zh.po	Thu May 21 16:42:10 2009 +0800
     1.3 @@ -42,7 +42,7 @@
     1.4  msgstr ""
     1.5  "Project-Id-Version: hgbook 1.2\n"
     1.6  "POT-Creation-Date: 2009-05-21 14:26+0800\n"
     1.7 -"PO-Revision-Date: 2009-05-21 14:55+0800\n"
     1.8 +"PO-Revision-Date: 2009-05-21 16:42+0800\n"
     1.9  "Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n"
    1.10  "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
    1.11  "MIME-Version: 1.0\n"
    1.12 @@ -112,7 +112,7 @@
    1.13  #. type: Content of: <book><appendix><sect1><title>
    1.14  #: ../en/appA-svn.xml:16
    1.15  msgid "Importing history from another system"
    1.16 -msgstr ""
    1.17 +msgstr "从其它版本控制系统导入历史"
    1.18  
    1.19  #. type: Content of: <book><appendix><sect1><para>
    1.20  #: ../en/appA-svn.xml:18
    1.21 @@ -293,7 +293,7 @@
    1.22  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.23  #: ../en/appA-svn.xml:141
    1.24  msgid "Tidying up the tree"
    1.25 -msgstr ""
    1.26 +msgstr "清理目录树"
    1.27  
    1.28  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.29  #: ../en/appA-svn.xml:143
    1.30 @@ -342,7 +342,7 @@
    1.31  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.32  #: ../en/appA-svn.xml:184
    1.33  msgid "Improving Subversion conversion performance"
    1.34 -msgstr ""
    1.35 +msgstr "改进 Subversion 的转换性能"
    1.36  
    1.37  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.38  #: ../en/appA-svn.xml:186
    1.39 @@ -466,7 +466,7 @@
    1.40  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.41  #: ../en/appA-svn.xml:259
    1.42  msgid "Philosophical differences"
    1.43 -msgstr ""
    1.44 +msgstr "哲学的差别"
    1.45  
    1.46  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.47  #: ../en/appA-svn.xml:261
    1.48 @@ -525,7 +525,7 @@
    1.49  #. type: Content of: <book><appendix><sect1><sect2><sect3><title>
    1.50  #: ../en/appA-svn.xml:301
    1.51  msgid "Multi-user operation and safety"
    1.52 -msgstr ""
    1.53 +msgstr "多用户操作与安全"
    1.54  
    1.55  #. type: Content of: <book><appendix><sect1><sect2><sect3><para>
    1.56  #: ../en/appA-svn.xml:303
    1.57 @@ -563,7 +563,7 @@
    1.58  #. type: Content of: <book><appendix><sect1><sect2><sect3><title>
    1.59  #: ../en/appA-svn.xml:331
    1.60  msgid "Published vs local changes"
    1.61 -msgstr ""
    1.62 +msgstr "已发布的修改与本地修改"
    1.63  
    1.64  #. type: Content of: <book><appendix><sect1><sect2><sect3><para>
    1.65  #: ../en/appA-svn.xml:333
    1.66 @@ -2058,7 +2058,7 @@
    1.67  #. type: Content of: <book><preface><sect1><title>
    1.68  #: ../en/ch00-preface.xml:31
    1.69  msgid "Thank you for supporting Mercurial"
    1.70 -msgstr ""
    1.71 +msgstr "谢谢你支持 Mercurial"
    1.72  
    1.73  #. type: Content of: <book><preface><sect1><para>
    1.74  #: ../en/ch00-preface.xml:33
    1.75 @@ -2075,7 +2075,7 @@
    1.76  #. type: Content of: <book><preface><sect1><title>
    1.77  #: ../en/ch00-preface.xml:45
    1.78  msgid "Acknowledgments"
    1.79 -msgstr ""
    1.80 +msgstr "致谢"
    1.81  
    1.82  #. type: Content of: <book><preface><sect1><para>
    1.83  #: ../en/ch00-preface.xml:47
    1.84 @@ -2163,28 +2163,28 @@
    1.85  #. type: Content of: <book><preface><sect1><title>
    1.86  #: ../en/ch00-preface.xml:111
    1.87  msgid "Conventions Used in This Book"
    1.88 -msgstr ""
    1.89 +msgstr "本书的约定"
    1.90  
    1.91  #. type: Content of: <book><preface><sect1><para>
    1.92  #: ../en/ch00-preface.xml:113
    1.93  msgid "The following typographical conventions are used in this book:"
    1.94 -msgstr ""
    1.95 +msgstr "本书使用如下的印刷约定："
    1.96  
    1.97  #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term>
    1.98  #: ../en/ch00-preface.xml:118
    1.99  msgid "Italic"
   1.100 -msgstr ""
   1.101 +msgstr "斜体"
   1.102  
   1.103  #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para>
   1.104  #: ../en/ch00-preface.xml:121
   1.105  msgid ""
   1.106  "Indicates new terms, URLs, email addresses, filenames, and file extensions."
   1.107 -msgstr ""
   1.108 +msgstr "标识新术语，URL，电子邮件地址，文件名称与扩展名。"
   1.109  
   1.110  #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term>
   1.111  #: ../en/ch00-preface.xml:127
   1.112  msgid "<literal>Constant width</literal>"
   1.113 -msgstr ""
   1.114 +msgstr "<literal>等宽</literal>"
   1.115  
   1.116  #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para>
   1.117  #: ../en/ch00-preface.xml:130
   1.118 @@ -2193,43 +2193,45 @@
   1.119  "elements such as variable or function names, databases, data types, "
   1.120  "environment variables, statements, and keywords."
   1.121  msgstr ""
   1.122 +"用于程序列表，以及段内引用的程序元素，例如变量、函数名称、数据库、数据类型、环"
   1.123 +"境变量、声明和关键字。"
   1.124  
   1.125  #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term>
   1.126  #: ../en/ch00-preface.xml:138
   1.127  msgid "<userinput>Constant width bold</userinput>"
   1.128 -msgstr ""
   1.129 +msgstr "<userinput>等宽粗体</userinput>"
   1.130  
   1.131  #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para>
   1.132  #: ../en/ch00-preface.xml:141
   1.133  msgid "Shows commands or other text that should be typed literally by the user."
   1.134 -msgstr ""
   1.135 +msgstr "标识命令或者其它用户应该逐字输入的文本。"
   1.136  
   1.137  #. type: Content of: <book><preface><sect1><variablelist><varlistentry><term>
   1.138  #: ../en/ch00-preface.xml:147
   1.139  msgid "<replaceable>Constant width italic</replaceable>"
   1.140 -msgstr ""
   1.141 +msgstr "<replaceable>等宽斜体</replaceable>"
   1.142  
   1.143  #. type: Content of: <book><preface><sect1><variablelist><varlistentry><listitem><para>
   1.144  #: ../en/ch00-preface.xml:150
   1.145  msgid ""
   1.146  "Shows text that should be replaced with user-supplied values or by values "
   1.147  "determined by context."
   1.148 -msgstr ""
   1.149 +msgstr "标识应该被用户提供的值或者取决于上下文的值替换的文本。"
   1.150  
   1.151  #. type: Content of: <book><preface><sect1><tip><para>
   1.152  #: ../en/ch00-preface.xml:157
   1.153  msgid "This icon signifies a tip, suggestion, or general note."
   1.154 -msgstr ""
   1.155 +msgstr "此图标表示提示，建议或者一般的的注释。"
   1.156  
   1.157  #. type: Content of: <book><preface><sect1><caution><para>
   1.158  #: ../en/ch00-preface.xml:162
   1.159  msgid "This icon indicates a warning or caution."
   1.160 -msgstr ""
   1.161 +msgstr "此图标表示警告。"
   1.162  
   1.163  #. type: Content of: <book><preface><sect1><title>
   1.164  #: ../en/ch00-preface.xml:167
   1.165  msgid "Using Code Examples"
   1.166 -msgstr ""
   1.167 +msgstr "使用样例代码"
   1.168  
   1.169  #. type: Content of: <book><preface><sect1><para>
   1.170  #: ../en/ch00-preface.xml:169
   1.171 @@ -2265,7 +2267,7 @@
   1.172  #. type: Content of: <book><preface><sect1><title>
   1.173  #: ../en/ch00-preface.xml:193
   1.174  msgid "Safari® Books Online"
   1.175 -msgstr ""
   1.176 +msgstr "Safari® 在线书库"
   1.177  
   1.178  #. type: Content of: <book><preface><sect1><note><para>
   1.179  #: ../en/ch00-preface.xml:196
   1.180 @@ -2289,7 +2291,7 @@
   1.181  #. type: Content of: <book><preface><sect1><title>
   1.182  #: ../en/ch00-preface.xml:211
   1.183  msgid "How to Contact Us"
   1.184 -msgstr ""
   1.185 +msgstr "联系我们"
   1.186  
   1.187  #. type: Content of: <book><preface><sect1><para>
   1.188  #: ../en/ch00-preface.xml:213
   1.189 @@ -4612,7 +4614,7 @@
   1.190  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.191  #: ../en/ch02-tour-basic.xml:942
   1.192  msgid "Default locations"
   1.193 -msgstr ""
   1.194 +msgstr "默认位置"
   1.195  
   1.196  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.197  #: ../en/ch02-tour-basic.xml:944
   1.198 @@ -7086,7 +7088,7 @@
   1.199  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.200  #: ../en/ch05-daily.xml:618
   1.201  msgid "File resolution states"
   1.202 -msgstr ""
   1.203 +msgstr "文件的解决状态"
   1.204  
   1.205  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.206  #: ../en/ch05-daily.xml:620
   1.207 @@ -7166,7 +7168,7 @@
   1.208  #. type: Content of: <book><chapter><sect1><title>
   1.209  #: ../en/ch05-daily.xml:680
   1.210  msgid "More useful diffs"
   1.211 -msgstr ""
   1.212 +msgstr "更有用的差异"
   1.213  
   1.214  #. type: Content of: <book><chapter><sect1><para>
   1.215  #: ../en/ch05-daily.xml:682
   1.216 @@ -7215,7 +7217,7 @@
   1.217  #. type: Content of: <book><chapter><sect1><title>
   1.218  #: ../en/ch05-daily.xml:720
   1.219  msgid "Which files to manage, and which to avoid"
   1.220 -msgstr ""
   1.221 +msgstr "需要管理哪些文件，应该避免的事情"
   1.222  
   1.223  #. type: Content of: <book><chapter><sect1><para>
   1.224  #: ../en/ch05-daily.xml:722
   1.225 @@ -11486,7 +11488,7 @@
   1.226  #. type: Content of: <book><chapter><sect1><sect2><figure><title>
   1.227  #: ../en/ch09-undo.xml:655
   1.228  msgid "A bad merge"
   1.229 -msgstr ""
   1.230 +msgstr "错误的合并"
   1.231  
   1.232  #. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
   1.233  #: ../en/ch09-undo.xml:657
   1.234 @@ -11617,7 +11619,7 @@
   1.235  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.236  #: ../en/ch09-undo.xml:762
   1.237  msgid "What to do about sensitive changes that escape"
   1.238 -msgstr ""
   1.239 +msgstr "处理敏感信息泄漏的方法"
   1.240  
   1.241  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.242  #: ../en/ch09-undo.xml:764
   1.243 @@ -15235,7 +15237,7 @@
   1.244  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.245  #: ../en/ch11-template.xml:611
   1.246  msgid "Listing files on multiple lines"
   1.247 -msgstr ""
   1.248 +msgstr "每行列出一个文件"
   1.249  
   1.250  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.251  #: ../en/ch11-template.xml:613
   1.252 @@ -16295,7 +16297,7 @@
   1.253  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.254  #: ../en/ch12-mq.xml:767
   1.255  msgid "Converting to and from permanent revisions"
   1.256 -msgstr ""
   1.257 +msgstr "与持久版本的相互转换"
   1.258  
   1.259  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.260  #: ../en/ch12-mq.xml:769