diff po/zh.po @ 729:ccda4952e5f3

Update Chinese translation

--- a/po/zh.po	Thu Mar 12 17:11:59 2009 +0800
+++ b/po/zh.po	Thu Mar 12 17:12:18 2009 +0800
@@ -41,8 +41,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: hgbook 1.2\n"
-"POT-Creation-Date: 2009-03-11 10:07+0800\n"
-"PO-Revision-Date: 2009-03-09 23:32+0800\n"
+"POT-Creation-Date: 2009-03-12 16:06+0800\n"
+"PO-Revision-Date: 2009-03-12 18:32+0800\n"
 "Last-Translator: \n"
 "Language-Team: Simplified Chinese <[e-mail] >\n"
 "MIME-Version: 1.0\n"
@@ -3888,7 +3888,9 @@
 
 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
 #: ../en/ch03-tour-merge.xml:247
-msgid "<imageobject><imagedata fileref=\"images/kdiff3.png\"/></imageobject>"
+msgid ""
+"<imageobject><imagedata width=\"100%\" fileref=\"images/kdiff3.png\"/></"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
@@ -5708,7 +5710,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch06-collab.xml:14
 msgid "Mercurial's web interface"
-msgstr ""
+msgstr "Mercurial 的 web 接口"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch06-collab.xml:16
@@ -5773,7 +5775,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch06-collab.xml:60
 msgid "Collaboration models"
-msgstr ""
+msgstr "协作模型"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch06-collab.xml:62
@@ -5788,7 +5790,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:70
 msgid "Factors to keep in mind"
-msgstr ""
+msgstr "要牢记的因素"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:72
@@ -5829,7 +5831,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:102
 msgid "Informal anarchy"
-msgstr ""
+msgstr "无政府状态"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:104
@@ -5879,7 +5881,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:141
 msgid "A single central repository"
-msgstr ""
+msgstr "单一中央版本库"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:143
@@ -5927,7 +5929,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:178
 msgid "Working with multiple branches"
-msgstr ""
+msgstr "使用多个分支工作"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:180
@@ -6035,7 +6037,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
 #: ../en/ch06-collab.xml:264 ../en/ch06-collab.xml:276
 msgid "Feature branches"
-msgstr ""
+msgstr "特性分支"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:266
@@ -6065,7 +6067,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:287
 msgid "The release train"
-msgstr ""
+msgstr "发布列车"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:289
@@ -6088,7 +6090,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:303
 msgid "The Linux kernel model"
-msgstr ""
+msgstr "Linux 内核模型"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:305
@@ -6183,7 +6185,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:378
 msgid "Pull-only versus shared-push collaboration"
-msgstr ""
+msgstr "只读与共享写协作"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:380
@@ -6217,7 +6219,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:402
 msgid "Where collaboration meets branch management"
-msgstr ""
+msgstr "协作与分支管理"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:404
@@ -6234,7 +6236,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch06-collab.xml:416
 msgid "The technical side of sharing"
-msgstr ""
+msgstr "共享的技术因素"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch06-collab.xml:418
@@ -6246,7 +6248,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch06-collab.xml:423
 msgid "Informal sharing with <command role=\"hg-cmd\">hg serve</command>"
-msgstr ""
+msgstr "使用 <command role=\"hg-cmd\">hg serve</command> 进行非正式共享"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch06-collab.xml:426
@@ -6314,7 +6316,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:469
 msgid "A few things to keep in mind"
-msgstr ""
+msgstr "要牢记的几件事"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:471
@@ -6358,7 +6360,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch06-collab.xml:502
 msgid "Using the Secure Shell (ssh) protocol"
-msgstr ""
+msgstr "使用 ssh 协议"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch06-collab.xml:504
@@ -6388,7 +6390,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:520
 msgid "How to read and write ssh URLs"
-msgstr ""
+msgstr "如何读写 ssh 路径"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:522
@@ -6470,7 +6472,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:575
 msgid "Finding an ssh client for your system"
-msgstr ""
+msgstr "为你的系统寻找 ssh 客户端"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:577
@@ -6524,7 +6526,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:613
 msgid "Generating a key pair"
-msgstr ""
+msgstr "产生密钥对"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:615
@@ -6569,7 +6571,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:647
 msgid "Using an authentication agent"
-msgstr ""
+msgstr "使用认证代理"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:649
@@ -6607,7 +6609,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:676
 msgid "Configuring the server side properly"
-msgstr ""
+msgstr "正确配置服务器端"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:678
@@ -6810,7 +6812,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:824
 msgid "Using compression with ssh"
-msgstr ""
+msgstr "通过 ssh 使用压缩"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:826
@@ -6861,7 +6863,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch06-collab.xml:863
 msgid "Serving over HTTP using CGI"
-msgstr ""
+msgstr "使用 CGI 通过 HTTP 提供服务"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch06-collab.xml:865
@@ -6891,7 +6893,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:885
 msgid "Web server configuration checklist"
-msgstr ""
+msgstr "Web 服务器配置检查表"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:887
@@ -6938,7 +6940,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:918
 msgid "Basic CGI configuration"
-msgstr ""
+msgstr "基本 CGI 配置"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:920
@@ -6983,7 +6985,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
 #: ../en/ch06-collab.xml:955
 msgid "What could <emphasis>possibly</emphasis> go wrong?"
-msgstr ""
+msgstr "什么<emphasis>可能</emphasis>会出错?"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
 #: ../en/ch06-collab.xml:958
@@ -7093,7 +7095,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
 #: ../en/ch06-collab.xml:1054
 msgid "Configuring lighttpd"
-msgstr ""
+msgstr "配置 lighttpd"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
 #: ../en/ch06-collab.xml:1056
@@ -7132,7 +7134,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:1091
 msgid "Sharing multiple repositories with one CGI script"
-msgstr ""
+msgstr "使用一个 CGI 脚本共享多个版本库"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:1093
@@ -7246,7 +7248,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
 #: ../en/ch06-collab.xml:1190
 msgid "Explicitly specifying which repositories to publish"
-msgstr ""
+msgstr "明确指出要发布的版本库"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
 #: ../en/ch06-collab.xml:1193
@@ -7286,7 +7288,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:1223
 msgid "Downloading source archives"
-msgstr ""
+msgstr "下载源代码档案包"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:1225
@@ -7308,7 +7310,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch06-collab.xml:1238
 msgid "Web configuration options"
-msgstr ""
+msgstr "Web 配置选项"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch06-collab.xml:1240
@@ -7439,7 +7441,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
 #: ../en/ch06-collab.xml:1341
 msgid "Options specific to an individual repository"
-msgstr ""
+msgstr "针对单个版本库的选项"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
 #: ../en/ch06-collab.xml:1343
@@ -7470,7 +7472,7 @@
 #: ../en/ch06-collab.xml:1362
 msgid ""
 "Options specific to the <command role=\"hg-cmd\">hg serve</command> command"
-msgstr ""
+msgstr "命令 <command role=\"hg-cmd\">hg serve</command> 的选项"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
 #: ../en/ch06-collab.xml:1365
@@ -7527,6 +7529,8 @@
 "Choosing the right <filename role=\"special\"> /.hgrc</filename>\\ file to "
 "add <literal role=\"rc-web\">web</literal> items to"
 msgstr ""
+"选择正确的 <filename role=\"special\"> /.hgrc</filename> 文件增加到 <literal "
+"role=\"rc-web\">web</literal> 条目"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
 #: ../en/ch06-collab.xml:1405
@@ -7566,7 +7570,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch07-filenames.xml:11
 msgid "Simple file naming"
-msgstr ""
+msgstr "简单文件名称"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch07-filenames.xml:13
@@ -7597,7 +7601,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch07-filenames.xml:33
 msgid "Running commands without any file names"
-msgstr ""
+msgstr "不提供文件名称的执行命令"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch07-filenames.xml:35
@@ -7652,7 +7656,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch07-filenames.xml:76
 msgid "Telling you what's going on"
-msgstr ""
+msgstr "告诉你正在做什么"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch07-filenames.xml:78
@@ -7686,7 +7690,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch07-filenames.xml:100
 msgid "Using patterns to identify files"
-msgstr ""
+msgstr "使用模式标识文件"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch07-filenames.xml:102
@@ -7755,7 +7759,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch07-filenames.xml:140
 msgid "Shell-style <literal>glob</literal> patterns"
-msgstr ""
+msgstr "外壳风格的 <literal>glob</literal>  模式"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch07-filenames.xml:142
@@ -7820,7 +7824,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
 #: ../en/ch07-filenames.xml:187
 msgid "Watch out!"
-msgstr ""
+msgstr "千万小心！"
 
 #
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
@@ -7836,7 +7840,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch07-filenames.xml:201
 msgid "Regular expression matching with <literal>re</literal> patterns"
-msgstr ""
+msgstr "使用 <literal>re</literal> 模式的正则表达式匹配"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch07-filenames.xml:204
@@ -7880,7 +7884,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch07-filenames.xml:234
 msgid "Filtering files"
-msgstr ""
+msgstr "过滤文件"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch07-filenames.xml:236
@@ -7932,7 +7936,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch07-filenames.xml:272
 msgid "Ignoring unwanted files and directories"
-msgstr ""
+msgstr "忽略不需要的文件和目录"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch07-filenames.xml:274
@@ -7942,7 +7946,7 @@
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch07-filenames.xml:278
 msgid "Case sensitivity"
-msgstr ""
+msgstr "大小写敏感性"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch07-filenames.xml:280
@@ -8003,7 +8007,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch07-filenames.xml:323
 msgid "Safe, portable repository storage"
-msgstr ""
+msgstr "安全，可移植的版本库存储"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch07-filenames.xml:325
@@ -8019,7 +8023,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch07-filenames.xml:336
 msgid "Detecting case conflicts"
-msgstr ""
+msgstr "检测大小写冲突"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch07-filenames.xml:338
@@ -8058,7 +8062,7 @@
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch07-filenames.xml:367
 msgid "Fixing a case conflict"
-msgstr ""
+msgstr "修正大小写冲突"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch07-filenames.xml:369
@@ -15757,7 +15761,7 @@
 msgstr ""
 
 #
-#. 	&example.hg-interdiff; 
+#. 	&example.hg-interdiff;
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch13-mq-collab.xml:465
 msgid ""