1.1 --- a/po/zh.po	Fri Mar 13 16:01:21 2009 +0800
     1.2 +++ b/po/zh.po	Sat Mar 14 12:42:55 2009 +0800
     1.3 @@ -25,7 +25,7 @@
     1.4  # delete            删除(只从文件系统删除)
     1.5  # patchset          补丁集
     1.6  # pushing to        推到
     1.7 -# pulling from      拉自
     1.8 +# pulling from      拉自，抓取
     1.9  # rename            改名
    1.10  # repository        版本库
    1.11  # revert            恢复
    1.12 @@ -8138,7 +8138,7 @@
    1.13  #. type: Content of: <book><chapter><sect1><title>
    1.14  #: ../en/ch08-branch.xml:25
    1.15  msgid "Giving a persistent name to a revision"
    1.16 -msgstr ""
    1.17 +msgstr "给版本指定一个永久的名称"
    1.18  
    1.19  #. type: Content of: <book><chapter><sect1><para>
    1.20  #: ../en/ch08-branch.xml:27
    1.21 @@ -8293,7 +8293,7 @@
    1.22  #. type: Content of: <book><chapter><sect1><sect2><title>
    1.23  #: ../en/ch08-branch.xml:142
    1.24  msgid "Handling tag conflicts during a merge"
    1.25 -msgstr ""
    1.26 +msgstr "在合并期间处理标签冲突"
    1.27  
    1.28  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.29  #: ../en/ch08-branch.xml:144
    1.30 @@ -8333,7 +8333,7 @@
    1.31  #. type: Content of: <book><chapter><sect1><sect2><title>
    1.32  #: ../en/ch08-branch.xml:176
    1.33  msgid "Tags and cloning"
    1.34 -msgstr ""
    1.35 +msgstr "标签与克隆"
    1.36  
    1.37  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.38  #: ../en/ch08-branch.xml:178
    1.39 @@ -8362,7 +8362,7 @@
    1.40  #. type: Content of: <book><chapter><sect1><sect2><title>
    1.41  #: ../en/ch08-branch.xml:201
    1.42  msgid "When permanent tags are too much"
    1.43 -msgstr ""
    1.44 +msgstr "当永久标签太多的时候"
    1.45  
    1.46  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.47  #: ../en/ch08-branch.xml:203
    1.48 @@ -8392,7 +8392,7 @@
    1.49  #. type: Content of: <book><chapter><sect1><title>
    1.50  #: ../en/ch08-branch.xml:228
    1.51  msgid "The flow of changes&emdash;big picture vs. little"
    1.52 -msgstr ""
    1.53 +msgstr "修改流程&emdash;宏观与微观"
    1.54  
    1.55  #. type: Content of: <book><chapter><sect1><para>
    1.56  #: ../en/ch08-branch.xml:230
    1.57 @@ -8438,7 +8438,7 @@
    1.58  #. type: Content of: <book><chapter><sect1><title>
    1.59  #: ../en/ch08-branch.xml:258
    1.60  msgid "Managing big-picture branches in repositories"
    1.61 -msgstr ""
    1.62 +msgstr "在版本库中管理分支"
    1.63  
    1.64  #. type: Content of: <book><chapter><sect1><para>
    1.65  #: ../en/ch08-branch.xml:260
    1.66 @@ -8476,7 +8476,7 @@
    1.67  #. type: Content of: <book><chapter><sect1><title>
    1.68  #: ../en/ch08-branch.xml:291
    1.69  msgid "Don't repeat yourself: merging across branches"
    1.70 -msgstr ""
    1.71 +msgstr "不要重复劳动：在分支间合并"
    1.72  
    1.73  #. type: Content of: <book><chapter><sect1><para>
    1.74  #: ../en/ch08-branch.xml:293
    1.75 @@ -8505,7 +8505,7 @@
    1.76  #. type: Content of: <book><chapter><sect1><title>
    1.77  #: ../en/ch08-branch.xml:314
    1.78  msgid "Naming branches within one repository"
    1.79 -msgstr ""
    1.80 +msgstr "版本库中的命名分支"
    1.81  
    1.82  #. type: Content of: <book><chapter><sect1><para>
    1.83  #: ../en/ch08-branch.xml:316
    1.84 @@ -8639,7 +8639,7 @@
    1.85  #. type: Content of: <book><chapter><sect1><title>
    1.86  #: ../en/ch08-branch.xml:414
    1.87  msgid "Dealing with multiple named branches in a repository"
    1.88 -msgstr ""
    1.89 +msgstr "在版本库中处理多个命名分支"
    1.90  
    1.91  #. type: Content of: <book><chapter><sect1><para>
    1.92  #: ../en/ch08-branch.xml:417
    1.93 @@ -8699,7 +8699,7 @@
    1.94  #. type: Content of: <book><chapter><sect1><title>
    1.95  #: ../en/ch08-branch.xml:460
    1.96  msgid "Branch names and merging"
    1.97 -msgstr ""
    1.98 +msgstr "分支名称与合并"
    1.99  
   1.100  #. type: Content of: <book><chapter><sect1><para>
   1.101  #: ../en/ch08-branch.xml:462
   1.102 @@ -8756,7 +8756,7 @@
   1.103  #. type: Content of: <book><chapter><sect1><title>
   1.104  #: ../en/ch08-branch.xml:502
   1.105  msgid "Branch naming is generally useful"
   1.106 -msgstr ""
   1.107 +msgstr "分支名称通常都很有用"
   1.108  
   1.109  #. type: Content of: <book><chapter><sect1><para>
   1.110  #: ../en/ch08-branch.xml:504
   1.111 @@ -8805,12 +8805,12 @@
   1.112  #. type: Content of: <book><chapter><sect1><title>
   1.113  #: ../en/ch09-undo.xml:15
   1.114  msgid "Erasing local history"
   1.115 -msgstr ""
   1.116 +msgstr "销毁本地历史"
   1.117  
   1.118  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.119  #: ../en/ch09-undo.xml:18
   1.120  msgid "The accidental commit"
   1.121 -msgstr ""
   1.122 +msgstr "意外的提交"
   1.123  
   1.124  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.125  #: ../en/ch09-undo.xml:20
   1.126 @@ -8826,7 +8826,7 @@
   1.127  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.128  #: ../en/ch09-undo.xml:31
   1.129  msgid "Rolling back a transaction"
   1.130 -msgstr ""
   1.131 +msgstr "回滚一个事务"
   1.132  
   1.133  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.134  #: ../en/ch09-undo.xml:33
   1.135 @@ -8889,7 +8889,7 @@
   1.136  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.137  #: ../en/ch09-undo.xml:85
   1.138  msgid "The erroneous pull"
   1.139 -msgstr ""
   1.140 +msgstr "错误的抓取"
   1.141  
   1.142  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.143  #: ../en/ch09-undo.xml:87
   1.144 @@ -8926,7 +8926,7 @@
   1.145  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.146  #: ../en/ch09-undo.xml:115
   1.147  msgid "Rolling back is useless once you've pushed"
   1.148 -msgstr ""
   1.149 +msgstr "当完成推送后，回滚是无效的"
   1.150  
   1.151  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.152  #: ../en/ch09-undo.xml:117
   1.153 @@ -8965,7 +8965,7 @@
   1.154  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.155  #: ../en/ch09-undo.xml:147
   1.156  msgid "You can only roll back once"
   1.157 -msgstr ""
   1.158 +msgstr "你只能回滚一次"
   1.159  
   1.160  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.161  #: ../en/ch09-undo.xml:149
   1.162 @@ -8987,7 +8987,7 @@
   1.163  #. type: Content of: <book><chapter><sect1><title>
   1.164  #: ../en/ch09-undo.xml:165
   1.165  msgid "Reverting the mistaken change"
   1.166 -msgstr ""
   1.167 +msgstr "撤销错误的修改"
   1.168  
   1.169  #. type: Content of: <book><chapter><sect1><para>
   1.170  #: ../en/ch09-undo.xml:167
   1.171 @@ -9062,7 +9062,7 @@
   1.172  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.173  #: ../en/ch09-undo.xml:218
   1.174  msgid "File management errors"
   1.175 -msgstr ""
   1.176 +msgstr "文件管理错误"
   1.177  
   1.178  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.179  #: ../en/ch09-undo.xml:220
   1.180 @@ -9107,7 +9107,7 @@
   1.181  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.182  #: ../en/ch09-undo.xml:254
   1.183  msgid "A slightly special case: reverting a rename"
   1.184 -msgstr ""
   1.185 +msgstr "一个稍微特别的案例：撤销改名"
   1.186  
   1.187  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.188  #: ../en/ch09-undo.xml:256
   1.189 @@ -9159,7 +9159,7 @@
   1.190  #. type: Content of: <book><chapter><sect1><title>
   1.191  #: ../en/ch09-undo.xml:295
   1.192  msgid "Dealing with committed changes"
   1.193 -msgstr ""
   1.194 +msgstr "处理已经提交的修改"
   1.195  
   1.196  #. type: Content of: <book><chapter><sect1><para>
   1.197  #: ../en/ch09-undo.xml:297
   1.198 @@ -9184,7 +9184,7 @@
   1.199  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.200  #: ../en/ch09-undo.xml:312
   1.201  msgid "Backing out a changeset"
   1.202 -msgstr ""
   1.203 +msgstr "恢复一个修改集"
   1.204  
   1.205  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.206  #: ../en/ch09-undo.xml:314
   1.207 @@ -9220,7 +9220,7 @@
   1.208  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.209  #: ../en/ch09-undo.xml:341
   1.210  msgid "Backing out the tip changeset"
   1.211 -msgstr ""
   1.212 +msgstr "恢复顶点修改集"
   1.213  
   1.214  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.215  #: ../en/ch09-undo.xml:343
   1.216 @@ -9256,7 +9256,7 @@
   1.217  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.218  #: ../en/ch09-undo.xml:373
   1.219  msgid "Backing out a non-tip change"
   1.220 -msgstr ""
   1.221 +msgstr "恢复非顶点的修改"
   1.222  
   1.223  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.224  #: ../en/ch09-undo.xml:375
   1.225 @@ -9325,7 +9325,7 @@
   1.226  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.227  #: ../en/ch09-undo.xml:423
   1.228  msgid "Always use the <option role=\"hg-opt-backout\">--merge</option> option"
   1.229 -msgstr ""
   1.230 +msgstr "始终使用选项 <option role=\"hg-opt-backout\">--merge</option>"
   1.231  
   1.232  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.233  #: ../en/ch09-undo.xml:426
   1.234 @@ -9340,7 +9340,7 @@
   1.235  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.236  #: ../en/ch09-undo.xml:437
   1.237  msgid "Gaining more control of the backout process"
   1.238 -msgstr ""
   1.239 +msgstr "在恢复处理中获得更多控制"
   1.240  
   1.241  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.242  #: ../en/ch09-undo.xml:439
   1.243 @@ -9440,7 +9440,7 @@
   1.244  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.245  #: ../en/ch09-undo.xml:524
   1.246  msgid "Why <command role=\"hg-cmd\">hg backout</command> works as it does"
   1.247 -msgstr ""
   1.248 +msgstr "<command role=\"hg-cmd\">hg backout</command> 的内幕"
   1.249  
   1.250  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.251  #: ../en/ch09-undo.xml:527
   1.252 @@ -9540,7 +9540,7 @@
   1.253  #. type: Content of: <book><chapter><sect1><title>
   1.254  #: ../en/ch09-undo.xml:597
   1.255  msgid "Changes that should never have been"
   1.256 -msgstr ""
   1.257 +msgstr "不该发生的修改"
   1.258  
   1.259  #. type: Content of: <book><chapter><sect1><para>
   1.260  #: ../en/ch09-undo.xml:599
   1.261 @@ -9625,7 +9625,7 @@
   1.262  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.263  #: ../en/ch09-undo.xml:656
   1.264  msgid "Protect yourself from <quote>escaped</quote> changes"
   1.265 -msgstr ""
   1.266 +msgstr "使用<quote>校验</quote>修改来保护你自己"
   1.267  
   1.268  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.269  #: ../en/ch09-undo.xml:659
   1.270 @@ -9660,7 +9660,7 @@
   1.271  #. type: Content of: <book><chapter><sect1><title>
   1.272  #: ../en/ch09-undo.xml:683
   1.273  msgid "Finding the source of a bug"
   1.274 -msgstr ""
   1.275 +msgstr "查找问题的根源"
   1.276  
   1.277  #. type: Content of: <book><chapter><sect1><para>
   1.278  #: ../en/ch09-undo.xml:685
   1.279 @@ -9787,7 +9787,7 @@
   1.280  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.281  #: ../en/ch09-undo.xml:777
   1.282  msgid "Using the <command role=\"hg-cmd\">hg bisect</command> command"
   1.283 -msgstr ""
   1.284 +msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>"
   1.285  
   1.286  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.287  #: ../en/ch09-undo.xml:780
   1.288 @@ -9976,7 +9976,7 @@
   1.289  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.290  #: ../en/ch09-undo.xml:911
   1.291  msgid "Cleaning up after your search"
   1.292 -msgstr ""
   1.293 +msgstr "搜索后的清理"
   1.294  
   1.295  #
   1.296  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.297 @@ -9994,12 +9994,12 @@
   1.298  #. type: Content of: <book><chapter><sect1><title>
   1.299  #: ../en/ch09-undo.xml:928
   1.300  msgid "Tips for finding bugs effectively"
   1.301 -msgstr ""
   1.302 +msgstr "有效查找问题的技巧"
   1.303  
   1.304  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.305  #: ../en/ch09-undo.xml:931
   1.306  msgid "Give consistent input"
   1.307 -msgstr ""
   1.308 +msgstr "给出一致的输入"
   1.309  
   1.310  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.311  #: ../en/ch09-undo.xml:933
   1.312 @@ -10016,7 +10016,7 @@
   1.313  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.314  #: ../en/ch09-undo.xml:945
   1.315  msgid "Automate as much as possible"
   1.316 -msgstr ""
   1.317 +msgstr "尽量自动"
   1.318  
   1.319  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.320  #: ../en/ch09-undo.xml:947
   1.321 @@ -10070,7 +10070,7 @@
   1.322  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.323  #: ../en/ch09-undo.xml:981
   1.324  msgid "Check your results"
   1.325 -msgstr ""
   1.326 +msgstr "检查你的结果"
   1.327  
   1.328  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.329  #: ../en/ch09-undo.xml:983
   1.330 @@ -10104,7 +10104,7 @@
   1.331  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.332  #: ../en/ch09-undo.xml:1003
   1.333  msgid "Beware interference between bugs"
   1.334 -msgstr ""
   1.335 +msgstr "谨防问题之间的冲突"
   1.336  
   1.337  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.338  #: ../en/ch09-undo.xml:1005
   1.339 @@ -10149,7 +10149,7 @@
   1.340  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.341  #: ../en/ch09-undo.xml:1039
   1.342  msgid "Bracket your search lazily"
   1.343 -msgstr ""
   1.344 +msgstr "减少你的查找工作"
   1.345  
   1.346  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.347  #: ../en/ch09-undo.xml:1041
   1.348 @@ -10205,7 +10205,7 @@
   1.349  #. type: Content of: <book><chapter><sect1><title>
   1.350  #: ../en/ch10-hook.xml:18
   1.351  msgid "An overview of hooks in Mercurial"
   1.352 -msgstr ""
   1.353 +msgstr "Mercurial 钩子概述"
   1.354  
   1.355  #. type: Content of: <book><chapter><sect1><para>
   1.356  #: ../en/ch10-hook.xml:20
   1.357 @@ -10322,12 +10322,12 @@
   1.358  #. type: Content of: <book><chapter><sect1><title>
   1.359  #: ../en/ch10-hook.xml:99
   1.360  msgid "Hooks and security"
   1.361 -msgstr ""
   1.362 +msgstr "钩子与安全性"
   1.363  
   1.364  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.365  #: ../en/ch10-hook.xml:102
   1.366  msgid "Hooks are run with your privileges"
   1.367 -msgstr ""
   1.368 +msgstr "钩子以你的特权执行"
   1.369  
   1.370  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.371  #: ../en/ch10-hook.xml:104
   1.372 @@ -10384,7 +10384,7 @@
   1.373  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.374  #: ../en/ch10-hook.xml:153
   1.375  msgid "Hooks do not propagate"
   1.376 -msgstr ""
   1.377 +msgstr "钩子不会传播"
   1.378  
   1.379  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.380  #: ../en/ch10-hook.xml:155
   1.381 @@ -10426,7 +10426,7 @@
   1.382  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.383  #: ../en/ch10-hook.xml:185
   1.384  msgid "Hooks can be overridden"
   1.385 -msgstr ""
   1.386 +msgstr "钩子可以被覆盖"
   1.387  
   1.388  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.389  #: ../en/ch10-hook.xml:187
   1.390 @@ -10447,7 +10447,7 @@
   1.391  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.392  #: ../en/ch10-hook.xml:200
   1.393  msgid "Ensuring that critical hooks are run"
   1.394 -msgstr ""
   1.395 +msgstr "确保关键钩子的执行"
   1.396  
   1.397  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.398  #: ../en/ch10-hook.xml:202
   1.399 @@ -10491,7 +10491,7 @@
   1.400  #. type: Content of: <book><chapter><sect1><title>
   1.401  #: ../en/ch10-hook.xml:237
   1.402  msgid "Care with <literal>pretxn</literal> hooks in a shared-access repository"
   1.403 -msgstr ""
   1.404 +msgstr "在共享版本库中注意 <literal>pretxn</literal> 钩子"
   1.405  
   1.406  #. type: Content of: <book><chapter><sect1><para>
   1.407  #: ../en/ch10-hook.xml:240
   1.408 @@ -10571,7 +10571,7 @@
   1.409  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.410  #: ../en/ch10-hook.xml:300
   1.411  msgid "The problem illustrated"
   1.412 -msgstr ""
   1.413 +msgstr "问题的演示"
   1.414  
   1.415  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.416  #: ../en/ch10-hook.xml:302
   1.417 @@ -10623,7 +10623,7 @@
   1.418  #. type: Content of: <book><chapter><sect1><title>
   1.419  #: ../en/ch10-hook.xml:347
   1.420  msgid "A short tutorial on using hooks"
   1.421 -msgstr ""
   1.422 +msgstr "使用钩子的简短指南"
   1.423  
   1.424  #. type: Content of: <book><chapter><sect1><para>
   1.425  #: ../en/ch10-hook.xml:349
   1.426 @@ -10653,7 +10653,7 @@
   1.427  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.428  #: ../en/ch10-hook.xml:370
   1.429  msgid "Performing multiple actions per event"
   1.430 -msgstr ""
   1.431 +msgstr "每个事件执行多个操作"
   1.432  
   1.433  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.434  #: ../en/ch10-hook.xml:372
   1.435 @@ -10697,7 +10697,7 @@
   1.436  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.437  #: ../en/ch10-hook.xml:408
   1.438  msgid "Controlling whether an activity can proceed"
   1.439 -msgstr ""
   1.440 +msgstr "控制处理的活动"
   1.441  
   1.442  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.443  #: ../en/ch10-hook.xml:410
   1.444 @@ -10749,7 +10749,7 @@
   1.445  #. type: Content of: <book><chapter><sect1><title>
   1.446  #: ../en/ch10-hook.xml:452
   1.447  msgid "Writing your own hooks"
   1.448 -msgstr ""
   1.449 +msgstr "编写钩子"
   1.450  
   1.451  #. type: Content of: <book><chapter><sect1><para>
   1.452  #: ../en/ch10-hook.xml:454
   1.453 @@ -10763,7 +10763,7 @@
   1.454  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.455  #: ../en/ch10-hook.xml:463
   1.456  msgid "Choosing how your hook should run"
   1.457 -msgstr ""
   1.458 +msgstr "选择钩子的执行方式"
   1.459  
   1.460  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.461  #: ../en/ch10-hook.xml:465
   1.462 @@ -10804,7 +10804,7 @@
   1.463  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.464  #: ../en/ch10-hook.xml:494
   1.465  msgid "Hook parameters"
   1.466 -msgstr ""
   1.467 +msgstr "钩子的参数"
   1.468  
   1.469  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.470  #: ../en/ch10-hook.xml:496
   1.471 @@ -10830,7 +10830,7 @@
   1.472  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.473  #: ../en/ch10-hook.xml:516
   1.474  msgid "Hook return values and activity control"
   1.475 -msgstr ""
   1.476 +msgstr "钩子的返回值与活动控制"
   1.477  
   1.478  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.479  #: ../en/ch10-hook.xml:518
   1.480 @@ -10852,7 +10852,7 @@
   1.481  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.482  #: ../en/ch10-hook.xml:533
   1.483  msgid "Writing an external hook"
   1.484 -msgstr ""
   1.485 +msgstr "编写外部钩子"
   1.486  
   1.487  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.488  #: ../en/ch10-hook.xml:535
   1.489 @@ -10892,7 +10892,7 @@
   1.490  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.491  #: ../en/ch10-hook.xml:562
   1.492  msgid "Telling Mercurial to use an in-process hook"
   1.493 -msgstr ""
   1.494 +msgstr "让 MercurialMercurial 使用进程内钩子"
   1.495  
   1.496  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.497  #: ../en/ch10-hook.xml:564
   1.498 @@ -10930,7 +10930,7 @@
   1.499  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.500  #: ../en/ch10-hook.xml:592
   1.501  msgid "Writing an in-process hook"
   1.502 -msgstr ""
   1.503 +msgstr "编写进程内钩子"
   1.504  
   1.505  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.506  #: ../en/ch10-hook.xml:594
   1.507 @@ -10954,12 +10954,12 @@
   1.508  #. type: Content of: <book><chapter><sect1><title>
   1.509  #: ../en/ch10-hook.xml:614
   1.510  msgid "Some hook examples"
   1.511 -msgstr ""
   1.512 +msgstr "钩子样例"
   1.513  
   1.514  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.515  #: ../en/ch10-hook.xml:617
   1.516  msgid "Writing meaningful commit messages"
   1.517 -msgstr ""
   1.518 +msgstr "编写有意义的提交日志"
   1.519  
   1.520  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.521  #: ../en/ch10-hook.xml:619
   1.522 @@ -10973,7 +10973,7 @@
   1.523  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.524  #: ../en/ch10-hook.xml:629
   1.525  msgid "Checking for trailing whitespace"
   1.526 -msgstr ""
   1.527 +msgstr "检查行尾空格"
   1.528  
   1.529  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.530  #: ../en/ch10-hook.xml:631
   1.531 @@ -11050,7 +11050,7 @@
   1.532  #. type: Content of: <book><chapter><sect1><title>
   1.533  #: ../en/ch10-hook.xml:706
   1.534  msgid "Bundled hooks"
   1.535 -msgstr ""
   1.536 +msgstr "内置的钩子"
   1.537  
   1.538  #. type: Content of: <book><chapter><sect1><para>
   1.539  #: ../en/ch10-hook.xml:708
   1.540 @@ -11067,7 +11067,7 @@
   1.541  msgid ""
   1.542  "<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a "
   1.543  "repository"
   1.544 -msgstr ""
   1.545 +msgstr "<literal role=\"hg-ext\">acl</literal>&emdash;版本库的访问控制"
   1.546  
   1.547  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.548  #: ../en/ch10-hook.xml:720
   1.549 @@ -11092,7 +11092,7 @@
   1.550  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.551  #: ../en/ch10-hook.xml:738
   1.552  msgid "Configuring the <literal role=\"hook\">acl</literal> hook"
   1.553 -msgstr ""
   1.554 +msgstr "配置 <literal role=\"hook\">acl</literal> 钩子"
   1.555  
   1.556  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.557  #: ../en/ch10-hook.xml:741
   1.558 @@ -11189,7 +11189,7 @@
   1.559  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.560  #: ../en/ch10-hook.xml:821 ../en/ch10-hook.xml:1095 ../en/ch10-hook.xml:1308
   1.561  msgid "Testing and troubleshooting"
   1.562 -msgstr ""
   1.563 +msgstr "测试与问题处理"
   1.564  
   1.565  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.566  #: ../en/ch10-hook.xml:823
   1.567 @@ -11214,7 +11214,7 @@
   1.568  #: ../en/ch10-hook.xml:842
   1.569  msgid ""
   1.570  "<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla"
   1.571 -msgstr ""
   1.572 +msgstr "<literal role=\"hg-ext\">bugzilla</literal>&emdash;与 Bugzilla 的集成"
   1.573  
   1.574  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.575  #: ../en/ch10-hook.xml:846
   1.576 @@ -11270,7 +11270,7 @@
   1.577  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.578  #: ../en/ch10-hook.xml:892
   1.579  msgid "Configuring the <literal role=\"hook\">bugzilla</literal> hook"
   1.580 -msgstr ""
   1.581 +msgstr "配置 <literal role=\"hook\">bugzilla</literal> 钩子"
   1.582  
   1.583  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.584  #: ../en/ch10-hook.xml:895
   1.585 @@ -11377,7 +11377,7 @@
   1.586  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.587  #: ../en/ch10-hook.xml:992
   1.588  msgid "Mapping committer names to Bugzilla user names"
   1.589 -msgstr ""
   1.590 +msgstr "提交者的名称与 Bugzilla 用户名称的映射"
   1.591  
   1.592  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.593  #: ../en/ch10-hook.xml:994
   1.594 @@ -11419,7 +11419,7 @@
   1.595  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.596  #: ../en/ch10-hook.xml:1035
   1.597  msgid "Configuring the text that gets added to a bug"
   1.598 -msgstr ""
   1.599 +msgstr "配置增加到问题中的正文"
   1.600  
   1.601  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.602  #: ../en/ch10-hook.xml:1037
   1.603 @@ -11547,7 +11547,7 @@
   1.604  #: ../en/ch10-hook.xml:1158
   1.605  msgid ""
   1.606  "<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications"
   1.607 -msgstr ""
   1.608 +msgstr "<literal role=\"hg-ext\">notify</literal>&emdash;邮件通知"
   1.609  
   1.610  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.611  #: ../en/ch10-hook.xml:1161
   1.612 @@ -11579,7 +11579,7 @@
   1.613  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.614  #: ../en/ch10-hook.xml:1183
   1.615  msgid "Configuring the <literal role=\"hg-ext\">notify</literal> hook"
   1.616 -msgstr ""
   1.617 +msgstr "配置 <literal role=\"hg-ext\">notify</literal> 钩子"
   1.618  
   1.619  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.620  #: ../en/ch10-hook.xml:1186
   1.621 @@ -11694,12 +11694,12 @@
   1.622  #. type: Content of: <book><chapter><sect1><title>
   1.623  #: ../en/ch10-hook.xml:1322
   1.624  msgid "Information for writers of hooks"
   1.625 -msgstr ""
   1.626 +msgstr "编写钩子的信息"
   1.627  
   1.628  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.629  #: ../en/ch10-hook.xml:1325
   1.630  msgid "In-process hook execution"
   1.631 -msgstr ""
   1.632 +msgstr "进程内钩子的执行"
   1.633  
   1.634  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.635  #: ../en/ch10-hook.xml:1327
   1.636 @@ -11768,7 +11768,7 @@
   1.637  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.638  #: ../en/ch10-hook.xml:1381
   1.639  msgid "External hook execution"
   1.640 -msgstr ""
   1.641 +msgstr "外部钩子的执行"
   1.642  
   1.643  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.644  #: ../en/ch10-hook.xml:1383
   1.645 @@ -11814,7 +11814,7 @@
   1.646  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.647  #: ../en/ch10-hook.xml:1419
   1.648  msgid "Finding out where changesets come from"
   1.649 -msgstr ""
   1.650 +msgstr "检查修改集来自何处"
   1.651  
   1.652  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.653  #: ../en/ch10-hook.xml:1421
   1.654 @@ -11829,7 +11829,7 @@
   1.655  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.656  #: ../en/ch10-hook.xml:1430
   1.657  msgid "Sources of changesets"
   1.658 -msgstr ""
   1.659 +msgstr "修改集的来源"
   1.660  
   1.661  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.662  #: ../en/ch10-hook.xml:1432
   1.663 @@ -11871,7 +11871,7 @@
   1.664  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.665  #: ../en/ch10-hook.xml:1462
   1.666  msgid "Where changes are going&emdash;remote repository URLs"
   1.667 -msgstr ""
   1.668 +msgstr "修改集要到哪里&emdash;远程版本库的地址"
   1.669  
   1.670  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.671  #: ../en/ch10-hook.xml:1465
   1.672 @@ -11915,14 +11915,14 @@
   1.673  #. type: Content of: <book><chapter><sect1><title>
   1.674  #: ../en/ch10-hook.xml:1501
   1.675  msgid "Hook reference"
   1.676 -msgstr ""
   1.677 +msgstr "钩子参考"
   1.678  
   1.679  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.680  #: ../en/ch10-hook.xml:1504
   1.681  msgid ""
   1.682  "<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets "
   1.683  "added"
   1.684 -msgstr ""
   1.685 +msgstr "<literal role=\"hook\">changegroup</literal>&emdash;增加远程修改集之后"
   1.686  
   1.687  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.688  #: ../en/ch10-hook.xml:1507
   1.689 @@ -11993,7 +11993,7 @@
   1.690  msgid ""
   1.691  "<literal role=\"hook\">commit</literal>&emdash;after a new changeset is "
   1.692  "created"
   1.693 -msgstr ""
   1.694 +msgstr "<literal role=\"hook\">commit</literal>&emdash;创建新修改集之后"
   1.695  
   1.696  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.697  #: ../en/ch10-hook.xml:1561
   1.698 @@ -12034,7 +12034,7 @@
   1.699  msgid ""
   1.700  "<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset "
   1.701  "is added"
   1.702 -msgstr ""
   1.703 +msgstr "<literal role=\"hook\">incoming</literal>&emdash;增加远程修改集之后"
   1.704  
   1.705  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.706  #: ../en/ch10-hook.xml:1593
   1.707 @@ -12075,7 +12075,7 @@
   1.708  msgid ""
   1.709  "<literal role=\"hook\">outgoing</literal>&emdash;after changesets are "
   1.710  "propagated"
   1.711 -msgstr ""
   1.712 +msgstr "<literal role=\"hook\">outgoing</literal>&emdash;传播修改集之后"
   1.713  
   1.714  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.715  #: ../en/ch10-hook.xml:1639
   1.716 @@ -12124,6 +12124,7 @@
   1.717  "<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add "
   1.718  "remote changesets"
   1.719  msgstr ""
   1.720 +"<literal role=\"hook\">prechangegroup</literal>&emdash;增加远程修改集之前"
   1.721  
   1.722  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.723  #: ../en/ch10-hook.xml:1687
   1.724 @@ -12164,7 +12165,7 @@
   1.725  msgid ""
   1.726  "<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a "
   1.727  "changeset"
   1.728 -msgstr ""
   1.729 +msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前"
   1.730  
   1.731  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.732  #: ../en/ch10-hook.xml:1732
   1.733 @@ -12216,7 +12217,7 @@
   1.734  msgid ""
   1.735  "<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to "
   1.736  "propagate changesets"
   1.737 -msgstr ""
   1.738 +msgstr "<literal role=\"hook\">preoutgoing</literal>&emdash;传播修改集之前"
   1.739  
   1.740  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.741  #: ../en/ch10-hook.xml:1772
   1.742 @@ -12254,7 +12255,7 @@
   1.743  #: ../en/ch10-hook.xml:1807
   1.744  msgid ""
   1.745  "<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset"
   1.746 -msgstr ""
   1.747 +msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前"
   1.748  
   1.749  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.750  #: ../en/ch10-hook.xml:1810
   1.751 @@ -12306,6 +12307,8 @@
   1.752  "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing "
   1.753  "addition of remote changesets"
   1.754  msgstr ""
   1.755 +"<literal role=\"hook\">pretxnchangegroup</literal>&emdash;完成增加远程修改集之"
   1.756 +"前"
   1.757  
   1.758  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.759  #: ../en/ch10-hook.xml:1850
   1.760 @@ -12357,7 +12360,7 @@
   1.761  msgid ""
   1.762  "<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit "
   1.763  "of new changeset"
   1.764 -msgstr ""
   1.765 +msgstr "<literal role=\"hook\">pretxncommit</literal>&emdash;完成提交之前"
   1.766  
   1.767  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.768  #: ../en/ch10-hook.xml:1915
   1.769 @@ -12398,6 +12401,7 @@
   1.770  "<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging "
   1.771  "working directory"
   1.772  msgstr ""
   1.773 +"<literal role=\"hook\">preupdate</literal>&emdash;更新或合并工作目录之前"
   1.774  
   1.775  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.776  #: ../en/ch10-hook.xml:1962
   1.777 @@ -12434,7 +12438,7 @@
   1.778  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.779  #: ../en/ch10-hook.xml:1991
   1.780  msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset"
   1.781 -msgstr ""
   1.782 +msgstr "<literal role=\"hook\">tag</literal>&emdash;创建标签之后"
   1.783  
   1.784  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.785  #: ../en/ch10-hook.xml:1994
   1.786 @@ -12482,7 +12486,7 @@
   1.787  msgid ""
   1.788  "<literal role=\"hook\">update</literal>&emdash;after updating or merging "
   1.789  "working directory"
   1.790 -msgstr ""
   1.791 +msgstr "<literal role=\"hook\">update</literal>&emdash;更新或合并工作目录之后"
   1.792  
   1.793  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.794  #: ../en/ch10-hook.xml:2031