hgbook

diff po/zh.po @ 636:17fe2fe38373

Update Chinese translation
author Dongsheng Song <dongsheng.song@gmail.com>
date Mon Mar 16 16:52:31 2009 +0800 (2009-03-16)
parents fa8a143923ae
children 8b73656f95c9
line diff
     1.1 --- a/po/zh.po	Sat Mar 14 12:42:55 2009 +0800
     1.2 +++ b/po/zh.po	Mon Mar 16 16:52:31 2009 +0800
     1.3 @@ -6,7 +6,7 @@
     1.4  # Dongsheng Song <dongsheng.song@gmail.com>, 2009
     1.5  #
     1.6  # Update to new pot:
     1.7 -#    msgmerge --update zh.po svnbook.pot
     1.8 +#    msgmerge --update zh.po hgbook.pot
     1.9  #
    1.10  # Check translation:
    1.11  #    msgfmt --statistics -c -o zh.mo zh.po
    1.12 @@ -42,7 +42,7 @@
    1.13  msgstr ""
    1.14  "Project-Id-Version: hgbook 1.2\n"
    1.15  "POT-Creation-Date: 2009-03-12 16:06+0800\n"
    1.16 -"PO-Revision-Date: 2009-03-12 18:32+0800\n"
    1.17 +"PO-Revision-Date: 2009-03-16 18:32+0800\n"
    1.18  "Last-Translator: \n"
    1.19  "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
    1.20  "MIME-Version: 1.0\n"
    1.21 @@ -12544,7 +12544,7 @@
    1.22  #. type: Content of: <book><chapter><sect1><title>
    1.23  #: ../en/ch11-template.xml:14
    1.24  msgid "Using precanned output styles"
    1.25 -msgstr ""
    1.26 +msgstr "使用预定义的输出样式"
    1.27  
    1.28  #. type: Content of: <book><chapter><sect1><para>
    1.29  #: ../en/ch11-template.xml:16
    1.30 @@ -12587,7 +12587,7 @@
    1.31  #. type: Content of: <book><chapter><sect1><sect2><title>
    1.32  #: ../en/ch11-template.xml:44
    1.33  msgid "Setting a default style"
    1.34 -msgstr ""
    1.35 +msgstr "设置默认样式"
    1.36  
    1.37  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.38  #: ../en/ch11-template.xml:46
    1.39 @@ -12609,7 +12609,7 @@
    1.40  #. type: Content of: <book><chapter><sect1><title>
    1.41  #: ../en/ch11-template.xml:62
    1.42  msgid "Commands that support styles and templates"
    1.43 -msgstr ""
    1.44 +msgstr "支持样式和模版的命令"
    1.45  
    1.46  #. type: Content of: <book><chapter><sect1><para>
    1.47  #: ../en/ch11-template.xml:64
    1.48 @@ -12632,7 +12632,7 @@
    1.49  #. type: Content of: <book><chapter><sect1><title>
    1.50  #: ../en/ch11-template.xml:79
    1.51  msgid "The basics of templating"
    1.52 -msgstr ""
    1.53 +msgstr "模版基础"
    1.54  
    1.55  #. type: Content of: <book><chapter><sect1><para>
    1.56  #: ../en/ch11-template.xml:81
    1.57 @@ -12697,7 +12697,7 @@
    1.58  #. type: Content of: <book><chapter><sect1><title>
    1.59  #: ../en/ch11-template.xml:131
    1.60  msgid "Common template keywords"
    1.61 -msgstr ""
    1.62 +msgstr "模版关键字"
    1.63  
    1.64  #. type: Content of: <book><chapter><sect1><para>
    1.65  #: ../en/ch11-template.xml:133
    1.66 @@ -12807,7 +12807,7 @@
    1.67  #. type: Content of: <book><chapter><sect1><title>
    1.68  #: ../en/ch11-template.xml:206
    1.69  msgid "Escape sequences"
    1.70 -msgstr ""
    1.71 +msgstr "转义序列"
    1.72  
    1.73  #. type: Content of: <book><chapter><sect1><para>
    1.74  #: ../en/ch11-template.xml:208
    1.75 @@ -12870,7 +12870,7 @@
    1.76  #. type: Content of: <book><chapter><sect1><title>
    1.77  #: ../en/ch11-template.xml:248
    1.78  msgid "Filtering keywords to change their results"
    1.79 -msgstr ""
    1.80 +msgstr "通过过滤关键字来修改输出结果"
    1.81  
    1.82  #. type: Content of: <book><chapter><sect1><para>
    1.83  #: ../en/ch11-template.xml:250
    1.84 @@ -13090,7 +13090,7 @@
    1.85  #. type: Content of: <book><chapter><sect1><sect2><title>
    1.86  #: ../en/ch11-template.xml:426
    1.87  msgid "Combining filters"
    1.88 -msgstr ""
    1.89 +msgstr "组合过滤器"
    1.90  
    1.91  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.92  #: ../en/ch11-template.xml:428
    1.93 @@ -13124,7 +13124,7 @@
    1.94  #. type: Content of: <book><chapter><sect1><title>
    1.95  #: ../en/ch11-template.xml:454
    1.96  msgid "From templates to styles"
    1.97 -msgstr ""
    1.98 +msgstr "从模版到样式"
    1.99  
   1.100  #. type: Content of: <book><chapter><sect1><para>
   1.101  #: ../en/ch11-template.xml:456
   1.102 @@ -13146,7 +13146,7 @@
   1.103  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.104  #: ../en/ch11-template.xml:467
   1.105  msgid "The simplest of style files"
   1.106 -msgstr ""
   1.107 +msgstr "最简单的样式文件"
   1.108  
   1.109  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.110  #: ../en/ch11-template.xml:469
   1.111 @@ -13163,7 +13163,7 @@
   1.112  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.113  #: ../en/ch11-template.xml:479
   1.114  msgid "Style file syntax"
   1.115 -msgstr ""
   1.116 +msgstr "样式文件语法"
   1.117  
   1.118  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.119  #: ../en/ch11-template.xml:481
   1.120 @@ -13227,7 +13227,7 @@
   1.121  #. type: Content of: <book><chapter><sect1><title>
   1.122  #: ../en/ch11-template.xml:521
   1.123  msgid "Style files by example"
   1.124 -msgstr ""
   1.125 +msgstr "样式文件例子"
   1.126  
   1.127  #. type: Content of: <book><chapter><sect1><para>
   1.128  #: ../en/ch11-template.xml:523
   1.129 @@ -13241,7 +13241,7 @@
   1.130  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.131  #: ../en/ch11-template.xml:530
   1.132  msgid "Identifying mistakes in style files"
   1.133 -msgstr ""
   1.134 +msgstr "在样式文件中定位错误"
   1.135  
   1.136  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.137  #: ../en/ch11-template.xml:532
   1.138 @@ -13298,7 +13298,7 @@
   1.139  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.140  #: ../en/ch11-template.xml:578
   1.141  msgid "Uniquely identifying a repository"
   1.142 -msgstr ""
   1.143 +msgstr "版本库的唯一标识"
   1.144  
   1.145  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.146  #: ../en/ch11-template.xml:580
   1.147 @@ -13353,7 +13353,7 @@
   1.148  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.149  #: ../en/ch11-template.xml:614
   1.150  msgid "Mimicking Subversion's output"
   1.151 -msgstr ""
   1.152 +msgstr "模仿 Subversion 的输出"
   1.153  
   1.154  #
   1.155  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.156 @@ -13437,7 +13437,7 @@
   1.157  #. type: Content of: <book><chapter><sect1><title>
   1.158  #: ../en/ch12-mq.xml:8
   1.159  msgid "The patch management problem"
   1.160 -msgstr ""
   1.161 +msgstr "补丁的管理问题"
   1.162  
   1.163  #. type: Content of: <book><chapter><sect1><para>
   1.164  #: ../en/ch12-mq.xml:10
   1.165 @@ -13515,7 +13515,7 @@
   1.166  #. type: Content of: <book><chapter><sect1><title>
   1.167  #: ../en/ch12-mq.xml:65
   1.168  msgid "The prehistory of Mercurial Queues"
   1.169 -msgstr ""
   1.170 +msgstr "MQ 的历史"
   1.171  
   1.172  #. type: Content of: <book><chapter><sect1><para>
   1.173  #: ../en/ch12-mq.xml:67
   1.174 @@ -13595,7 +13595,7 @@
   1.175  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.176  #: ../en/ch12-mq.xml:124
   1.177  msgid "From patchwork quilt to Mercurial Queues"
   1.178 -msgstr ""
   1.179 +msgstr "从 patchwork quilt 到 MQ"
   1.180  
   1.181  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.182  #: ../en/ch12-mq.xml:126
   1.183 @@ -13625,7 +13625,7 @@
   1.184  #. type: Content of: <book><chapter><sect1><title>
   1.185  #: ../en/ch12-mq.xml:144
   1.186  msgid "The huge advantage of MQ"
   1.187 -msgstr ""
   1.188 +msgstr "MQ 的巨大优势"
   1.189  
   1.190  #. type: Content of: <book><chapter><sect1><para>
   1.191  #: ../en/ch12-mq.xml:146
   1.192 @@ -13683,7 +13683,7 @@
   1.193  #. type: Content of: <book><chapter><sect1><title>
   1.194  #: ../en/ch12-mq.xml:187
   1.195  msgid "Understanding patches"
   1.196 -msgstr ""
   1.197 +msgstr "理解补丁"
   1.198  
   1.199  #. type: Content of: <book><chapter><sect1><para>
   1.200  #: ../en/ch12-mq.xml:189
   1.201 @@ -13766,7 +13766,7 @@
   1.202  #. type: Content of: <book><chapter><sect1><title>
   1.203  #: ../en/ch12-mq.xml:250
   1.204  msgid "Getting started with Mercurial Queues"
   1.205 -msgstr ""
   1.206 +msgstr "开始使用 MQ"
   1.207  
   1.208  #. type: Content of: <book><chapter><sect1><para>
   1.209  #: ../en/ch12-mq.xml:252
   1.210 @@ -13806,7 +13806,7 @@
   1.211  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.212  #: ../en/ch12-mq.xml:283
   1.213  msgid "Creating a new patch"
   1.214 -msgstr ""
   1.215 +msgstr "创建新补丁"
   1.216  
   1.217  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.218  #: ../en/ch12-mq.xml:285
   1.219 @@ -13858,7 +13858,7 @@
   1.220  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.221  #: ../en/ch12-mq.xml:325
   1.222  msgid "Refreshing a patch"
   1.223 -msgstr ""
   1.224 +msgstr "刷新补丁"
   1.225  
   1.226  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.227  #: ../en/ch12-mq.xml:327
   1.228 @@ -13888,7 +13888,7 @@
   1.229  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.230  #: ../en/ch12-mq.xml:348
   1.231  msgid "Stacking and tracking patches"
   1.232 -msgstr ""
   1.233 +msgstr "堆叠和跟踪补丁"
   1.234  
   1.235  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.236  #: ../en/ch12-mq.xml:350
   1.237 @@ -13935,7 +13935,7 @@
   1.238  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.239  #: ../en/ch12-mq.xml:387
   1.240  msgid "Manipulating the patch stack"
   1.241 -msgstr ""
   1.242 +msgstr "操作补丁堆栈"
   1.243  
   1.244  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.245  #: ../en/ch12-mq.xml:389
   1.246 @@ -13989,7 +13989,7 @@
   1.247  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.248  #: ../en/ch12-mq.xml:431
   1.249  msgid "Pushing and popping many patches"
   1.250 -msgstr ""
   1.251 +msgstr "压入或弹出多个补丁"
   1.252  
   1.253  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.254  #: ../en/ch12-mq.xml:433
   1.255 @@ -14007,7 +14007,7 @@
   1.256  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.257  #: ../en/ch12-mq.xml:450
   1.258  msgid "Safety checks, and overriding them"
   1.259 -msgstr ""
   1.260 +msgstr "安全的检查,然后覆盖它们"
   1.261  
   1.262  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.263  #: ../en/ch12-mq.xml:452
   1.264 @@ -14038,7 +14038,7 @@
   1.265  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.266  #: ../en/ch12-mq.xml:479
   1.267  msgid "Working on several patches at once"
   1.268 -msgstr ""
   1.269 +msgstr "同时处理多个补丁"
   1.270  
   1.271  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.272  #: ../en/ch12-mq.xml:481
   1.273 @@ -14068,7 +14068,7 @@
   1.274  #. type: Content of: <book><chapter><sect1><title>
   1.275  #: ../en/ch12-mq.xml:505
   1.276  msgid "More about patches"
   1.277 -msgstr ""
   1.278 +msgstr "关于补丁的更多信息"
   1.279  
   1.280  #. type: Content of: <book><chapter><sect1><para>
   1.281  #: ../en/ch12-mq.xml:507
   1.282 @@ -14081,7 +14081,7 @@
   1.283  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.284  #: ../en/ch12-mq.xml:513
   1.285  msgid "The strip count"
   1.286 -msgstr ""
   1.287 +msgstr "修剪计数"
   1.288  
   1.289  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.290  #: ../en/ch12-mq.xml:515
   1.291 @@ -14162,7 +14162,7 @@
   1.292  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.293  #: ../en/ch12-mq.xml:583
   1.294  msgid "Strategies for applying a patch"
   1.295 -msgstr ""
   1.296 +msgstr "应用补丁的策略"
   1.297  
   1.298  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.299  #: ../en/ch12-mq.xml:585
   1.300 @@ -14216,7 +14216,7 @@
   1.301  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.302  #: ../en/ch12-mq.xml:628
   1.303  msgid "Some quirks of patch representation"
   1.304 -msgstr ""
   1.305 +msgstr "补丁的一些特性"
   1.306  
   1.307  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.308  #: ../en/ch12-mq.xml:630
   1.309 @@ -14276,7 +14276,7 @@
   1.310  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.311  #: ../en/ch12-mq.xml:666
   1.312  msgid "Beware the fuzz"
   1.313 -msgstr ""
   1.314 +msgstr "当心毛刺"
   1.315  
   1.316  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.317  #: ../en/ch12-mq.xml:668
   1.318 @@ -14306,7 +14306,7 @@
   1.319  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.320  #: ../en/ch12-mq.xml:691
   1.321  msgid "Handling rejection"
   1.322 -msgstr ""
   1.323 +msgstr "处理拒绝"
   1.324  
   1.325  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.326  #: ../en/ch12-mq.xml:693
   1.327 @@ -14390,7 +14390,7 @@
   1.328  #. type: Content of: <book><chapter><sect1><title>
   1.329  #: ../en/ch12-mq.xml:751
   1.330  msgid "Getting the best performance out of MQ"
   1.331 -msgstr ""
   1.332 +msgstr "MQ 的性能"
   1.333  
   1.334  #. type: Content of: <book><chapter><sect1><para>
   1.335  #: ../en/ch12-mq.xml:753
   1.336 @@ -14457,7 +14457,7 @@
   1.337  #. type: Content of: <book><chapter><sect1><title>
   1.338  #: ../en/ch12-mq.xml:805
   1.339  msgid "Updating your patches when the underlying code changes"
   1.340 -msgstr ""
   1.341 +msgstr "当基础代码改变时,更新补丁的方法"
   1.342  
   1.343  #. type: Content of: <book><chapter><sect1><para>
   1.344  #: ../en/ch12-mq.xml:808
   1.345 @@ -14590,7 +14590,7 @@
   1.346  #. type: Content of: <book><chapter><sect1><title>
   1.347  #: ../en/ch12-mq.xml:907
   1.348  msgid "Identifying patches"
   1.349 -msgstr ""
   1.350 +msgstr "标识补丁"
   1.351  
   1.352  #. type: Content of: <book><chapter><sect1><para>
   1.353  #: ../en/ch12-mq.xml:909
   1.354 @@ -14686,7 +14686,7 @@
   1.355  #. type: Content of: <book><chapter><sect1><title>
   1.356  #: ../en/ch12-mq.xml:977
   1.357  msgid "Useful things to know about"
   1.358 -msgstr ""
   1.359 +msgstr "其它需要了解的东西"
   1.360  
   1.361  #. type: Content of: <book><chapter><sect1><para>
   1.362  #: ../en/ch12-mq.xml:979
   1.363 @@ -14719,7 +14719,7 @@
   1.364  #. type: Content of: <book><chapter><sect1><title>
   1.365  #: ../en/ch12-mq.xml:1004
   1.366  msgid "Managing patches in a repository"
   1.367 -msgstr ""
   1.368 +msgstr "在版本库管理补丁"
   1.369  
   1.370  #. type: Content of: <book><chapter><sect1><para>
   1.371  #: ../en/ch12-mq.xml:1006
   1.372 @@ -14764,7 +14764,7 @@
   1.373  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.374  #: ../en/ch12-mq.xml:1037
   1.375  msgid "MQ support for patch repositories"
   1.376 -msgstr ""
   1.377 +msgstr "MQ 支持补丁版本库"
   1.378  
   1.379  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.380  #: ../en/ch12-mq.xml:1039
   1.381 @@ -14833,7 +14833,7 @@
   1.382  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.383  #: ../en/ch12-mq.xml:1091
   1.384  msgid "A few things to watch out for"
   1.385 -msgstr ""
   1.386 +msgstr "需要注意的事情"
   1.387  
   1.388  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.389  #: ../en/ch12-mq.xml:1093
   1.390 @@ -14859,7 +14859,7 @@
   1.391  #. type: Content of: <book><chapter><sect1><title>
   1.392  #: ../en/ch12-mq.xml:1112
   1.393  msgid "Third party tools for working with patches"
   1.394 -msgstr ""
   1.395 +msgstr "操作补丁的第三方工具"
   1.396  
   1.397  #. type: Content of: <book><chapter><sect1><para>
   1.398  #: ../en/ch12-mq.xml:1114
   1.399 @@ -14900,7 +14900,7 @@
   1.400  #. type: Content of: <book><chapter><sect1><title>
   1.401  #: ../en/ch12-mq.xml:1148
   1.402  msgid "Good ways to work with patches"
   1.403 -msgstr ""
   1.404 +msgstr "操作补丁的好习惯"
   1.405  
   1.406  #. type: Content of: <book><chapter><sect1><para>
   1.407  #: ../en/ch12-mq.xml:1150
   1.408 @@ -14952,12 +14952,12 @@
   1.409  #. type: Content of: <book><chapter><sect1><title>
   1.410  #: ../en/ch12-mq.xml:1189
   1.411  msgid "MQ cookbook"
   1.412 -msgstr ""
   1.413 +msgstr "MQ 手册"
   1.414  
   1.415  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.416  #: ../en/ch12-mq.xml:1192
   1.417  msgid "Manage <quote>trivial</quote> patches"
   1.418 -msgstr ""
   1.419 +msgstr "管理<quote>琐碎的</quote>补丁"
   1.420  
   1.421  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.422  #: ../en/ch12-mq.xml:1194
   1.423 @@ -15005,7 +15005,7 @@
   1.424  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.425  #: ../en/ch12-mq.xml:1230
   1.426  msgid "Combining entire patches"
   1.427 -msgstr ""
   1.428 +msgstr "组合全部的补丁"
   1.429  
   1.430  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.431  #: ../en/ch12-mq.xml:1232
   1.432 @@ -15031,7 +15031,7 @@
   1.433  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.434  #: ../en/ch12-mq.xml:1251
   1.435  msgid "Merging part of one patch into another"
   1.436 -msgstr ""
   1.437 +msgstr "合并补丁的部分内容到其它补丁"
   1.438  
   1.439  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.440  #: ../en/ch12-mq.xml:1253
   1.441 @@ -15109,7 +15109,7 @@
   1.442  #. type: Content of: <book><chapter><sect1><title>
   1.443  #: ../en/ch12-mq.xml:1307
   1.444  msgid "Differences between quilt and MQ"
   1.445 -msgstr ""
   1.446 +msgstr "MQ 与 quilt 的区别"
   1.447  
   1.448  #. type: Content of: <book><chapter><sect1><para>
   1.449  #: ../en/ch12-mq.xml:1309
   1.450 @@ -15164,7 +15164,7 @@
   1.451  #. type: Content of: <book><chapter><sect1><title>
   1.452  #: ../en/ch13-mq-collab.xml:24
   1.453  msgid "The problem of many targets"
   1.454 -msgstr ""
   1.455 +msgstr "多个目标的问题"
   1.456  
   1.457  #. type: Content of: <book><chapter><sect1><para>
   1.458  #: ../en/ch13-mq-collab.xml:26
   1.459 @@ -15215,7 +15215,7 @@
   1.460  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.461  #: ../en/ch13-mq-collab.xml:58
   1.462  msgid "Tempting approaches that don't work well"
   1.463 -msgstr ""
   1.464 +msgstr "工作不好的诱人方法"
   1.465  
   1.466  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.467  #: ../en/ch13-mq-collab.xml:60
   1.468 @@ -15278,7 +15278,7 @@
   1.469  #. type: Content of: <book><chapter><sect1><title>
   1.470  #: ../en/ch13-mq-collab.xml:105
   1.471  msgid "Conditionally applying patches with guards"
   1.472 -msgstr ""
   1.473 +msgstr "有条件的应用补丁"
   1.474  
   1.475  #. type: Content of: <book><chapter><sect1><para>
   1.476  #: ../en/ch13-mq-collab.xml:107
   1.477 @@ -15319,7 +15319,7 @@
   1.478  #. type: Content of: <book><chapter><sect1><title>
   1.479  #: ../en/ch13-mq-collab.xml:135
   1.480  msgid "Controlling the guards on a patch"
   1.481 -msgstr ""
   1.482 +msgstr "控制补丁的应用条件"
   1.483  
   1.484  #. type: Content of: <book><chapter><sect1><para>
   1.485  #: ../en/ch13-mq-collab.xml:137
   1.486 @@ -15369,7 +15369,7 @@
   1.487  #. type: Content of: <book><chapter><sect1><title>
   1.488  #: ../en/ch13-mq-collab.xml:177
   1.489  msgid "Selecting the guards to use"
   1.490 -msgstr ""
   1.491 +msgstr "选择使用的条件"
   1.492  
   1.493  #. type: Content of: <book><chapter><sect1><para>
   1.494  #: ../en/ch13-mq-collab.xml:179
   1.495 @@ -15427,7 +15427,7 @@
   1.496  #. type: Content of: <book><chapter><sect1><title>
   1.497  #: ../en/ch13-mq-collab.xml:224
   1.498  msgid "MQ's rules for applying patches"
   1.499 -msgstr ""
   1.500 +msgstr "MQ 应用补丁的规则"
   1.501  
   1.502  #. type: Content of: <book><chapter><sect1><para>
   1.503  #: ../en/ch13-mq-collab.xml:226
   1.504 @@ -15464,7 +15464,7 @@
   1.505  #. type: Content of: <book><chapter><sect1><title>
   1.506  #: ../en/ch13-mq-collab.xml:245
   1.507  msgid "Trimming the work environment"
   1.508 -msgstr ""
   1.509 +msgstr "修剪工作环境"
   1.510  
   1.511  #. type: Content of: <book><chapter><sect1><para>
   1.512  #: ../en/ch13-mq-collab.xml:247
   1.513 @@ -15499,7 +15499,7 @@
   1.514  #. type: Content of: <book><chapter><sect1><title>
   1.515  #: ../en/ch13-mq-collab.xml:270
   1.516  msgid "Dividing up the <filename role=\"special\">series</filename> file"
   1.517 -msgstr ""
   1.518 +msgstr "分类补丁<filename role=\"special\">系列</filename>"
   1.519  
   1.520  #. type: Content of: <book><chapter><sect1><para>
   1.521  #: ../en/ch13-mq-collab.xml:273
   1.522 @@ -15600,7 +15600,7 @@
   1.523  #. type: Content of: <book><chapter><sect1><title>
   1.524  #: ../en/ch13-mq-collab.xml:343
   1.525  msgid "Maintaining the patch series"
   1.526 -msgstr ""
   1.527 +msgstr "维护补丁系列"
   1.528  
   1.529  #. type: Content of: <book><chapter><sect1><para>
   1.530  #: ../en/ch13-mq-collab.xml:345
   1.531 @@ -15660,7 +15660,7 @@
   1.532  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.533  #: ../en/ch13-mq-collab.xml:381
   1.534  msgid "The art of writing backport patches"
   1.535 -msgstr ""
   1.536 +msgstr "编写向后移植补丁的艺术"
   1.537  
   1.538  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.539  #: ../en/ch13-mq-collab.xml:383
   1.540 @@ -15701,12 +15701,12 @@
   1.541  #. type: Content of: <book><chapter><sect1><title>
   1.542  #: ../en/ch13-mq-collab.xml:417
   1.543  msgid "Useful tips for developing with MQ"
   1.544 -msgstr ""
   1.545 +msgstr "使用 MQ 开发的技巧"
   1.546  
   1.547  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.548  #: ../en/ch13-mq-collab.xml:420
   1.549  msgid "Organising patches in directories"
   1.550 -msgstr ""
   1.551 +msgstr "将补丁放到几个目录中"
   1.552  
   1.553  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.554  #: ../en/ch13-mq-collab.xml:422
   1.555 @@ -15727,7 +15727,7 @@
   1.556  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.557  #: ../en/ch13-mq-collab.xml:434
   1.558  msgid "Viewing the history of a patch"
   1.559 -msgstr ""
   1.560 +msgstr "察看补丁的历史"
   1.561  
   1.562  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.563  #: ../en/ch13-mq-collab.xml:436
   1.564 @@ -15895,7 +15895,7 @@
   1.565  msgid ""
   1.566  "Improve performance with the <literal role=\"hg-ext\">inotify</literal> "
   1.567  "extension"
   1.568 -msgstr ""
   1.569 +msgstr "使用扩展 <literal role=\"hg-ext\">inotify</literal> 以提高性能"
   1.570  
   1.571  #. type: Content of: <book><chapter><sect1><para>
   1.572  #: ../en/ch14-hgext.xml:58
   1.573 @@ -16162,7 +16162,7 @@
   1.574  msgid ""
   1.575  "Flexible diff support with the <literal role=\"hg-ext\">extdiff</literal> "
   1.576  "extension"
   1.577 -msgstr ""
   1.578 +msgstr "使用扩展 <literal role=\"hg-ext\">extdiff</literal> 以扩展差异支持"
   1.579  
   1.580  #. type: Content of: <book><chapter><sect1><para>
   1.581  #: ../en/ch14-hgext.xml:270
   1.582 @@ -16286,7 +16286,7 @@
   1.583  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.584  #: ../en/ch14-hgext.xml:366
   1.585  msgid "Defining command aliases"
   1.586 -msgstr ""
   1.587 +msgstr "定义命令的别名"
   1.588  
   1.589  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.590  #: ../en/ch14-hgext.xml:368
   1.591 @@ -16336,7 +16336,7 @@
   1.592  msgid ""
   1.593  "Cherrypicking changes with the <literal role=\"hg-ext\">transplant</literal> "
   1.594  "extension"
   1.595 -msgstr ""
   1.596 +msgstr "使用扩展 <literal role=\"hg-ext\">transplant</literal> 以挑选修改"
   1.597  
   1.598  #. type: Content of: <book><chapter><sect1><para>
   1.599  #: ../en/ch14-hgext.xml:409
   1.600 @@ -16349,6 +16349,7 @@
   1.601  "Send changes via email with the <literal role=\"hg-ext\">patchbomb</literal> "
   1.602  "extension"
   1.603  msgstr ""
   1.604 +"使用扩展 <literal role=\"hg-ext\">patchbomb</literal> 通过 email 发送修改"
   1.605  
   1.606  #. type: Content of: <book><chapter><sect1><para>
   1.607  #: ../en/ch14-hgext.xml:416
   1.608 @@ -16451,7 +16452,7 @@
   1.609  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.610  #: ../en/ch14-hgext.xml:486
   1.611  msgid "Changing the behaviour of patchbombs"
   1.612 -msgstr ""
   1.613 +msgstr "修改 patchbomb 的行为"
   1.614  
   1.615  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.616  #: ../en/ch14-hgext.xml:488