#: ../en/ch08-branch.xml:25 msgid "Giving a persistent name to a revision" -msgstr "" +msgstr "给版本指定一个永久的名称" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:27 @@ -8293,7 +8293,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch08-branch.xml:142 msgid "Handling tag conflicts during a merge" -msgstr "" +msgstr "在合并期间处理标签冲突" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch08-branch.xml:144 @@ -8333,7 +8333,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch08-branch.xml:176 msgid "Tags and cloning" -msgstr "" +msgstr "标签与克隆" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch08-branch.xml:178 @@ -8362,7 +8362,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch08-branch.xml:201 msgid "When permanent tags are too much" -msgstr "" +msgstr "当永久标签太多的时候" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch08-branch.xml:203 @@ -8392,7 +8392,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:228 msgid "The flow of changes&emdash;big picture vs. little" -msgstr "" +msgstr "修改流程&emdash;宏观与微观" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:230 @@ -8438,7 +8438,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:258 msgid "Managing big-picture branches in repositories" -msgstr "" +msgstr "在版本库中管理分支" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:260 @@ -8476,7 +8476,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:291 msgid "Don't repeat yourself: merging across branches" -msgstr "" +msgstr "不要重复劳动：在分支间合并" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:293 @@ -8505,7 +8505,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:314 msgid "Naming branches within one repository" -msgstr "" +msgstr "版本库中的命名分支" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:316 @@ -8639,7 +8639,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:414 msgid "Dealing with multiple named branches in a repository" -msgstr "" +msgstr "在版本库中处理多个命名分支" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:417 @@ -8699,7 +8699,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:460 msgid "Branch names and merging" -msgstr "" +msgstr "分支名称与合并" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:462 @@ -8756,7 +8756,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:502 msgid "Branch naming is generally useful" -msgstr "" +msgstr "分支名称通常都很有用" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:504 @@ -8805,12 +8805,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:15 msgid "Erasing local history" -msgstr "" +msgstr "销毁本地历史" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:18 msgid "The accidental commit" -msgstr "" +msgstr "意外的提交" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:20 @@ -8826,7 +8826,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:31 msgid "Rolling back a transaction" -msgstr "" +msgstr "回滚一个事务" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:33 @@ -8889,7 +8889,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:85 msgid "The erroneous pull" -msgstr "" +msgstr "错误的抓取" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:87 @@ -8926,7 +8926,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:115 msgid "Rolling back is useless once you've pushed" -msgstr "" +msgstr "当完成推送后，回滚是无效的" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:117 @@ -8965,7 +8965,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:147 msgid "You can only roll back once" -msgstr "" +msgstr "你只能回滚一次" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:149 @@ -8987,7 +8987,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:165 msgid "Reverting the mistaken change" -msgstr "" +msgstr "撤销错误的修改" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch09-undo.xml:167 @@ -9062,7 +9062,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:218 msgid "File management errors" -msgstr "" +msgstr "文件管理错误" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:220 @@ -9107,7 +9107,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch09-undo.xml:254 msgid "A slightly special case: reverting a rename" -msgstr "" +msgstr "一个稍微特别的案例：撤销改名" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch09-undo.xml:256 @@ -9159,7 +9159,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:295 msgid "Dealing with committed changes" -msgstr "" +msgstr "处理已经提交的修改" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch09-undo.xml:297 @@ -9184,7 +9184,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:312 msgid "Backing out a changeset" -msgstr "" +msgstr "恢复一个修改集" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:314 @@ -9220,7 +9220,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:341 msgid "Backing out the tip changeset" -msgstr "" +msgstr "恢复顶点修改集" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:343 @@ -9256,7 +9256,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:373 msgid "Backing out a non-tip change" -msgstr "" +msgstr "恢复非顶点的修改" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:375 @@ -9325,7 +9325,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch09-undo.xml:423 msgid "Always use the <option role=\"hg-opt-backout\">--merge</option> option" -msgstr "" +msgstr "始终使用选项 <option role=\"hg-opt-backout\">--merge</option>" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch09-undo.xml:426 @@ -9340,7 +9340,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:437 msgid "Gaining more control of the backout process" -msgstr "" +msgstr "在恢复处理中获得更多控制" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:439 @@ -9440,7 +9440,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:524 msgid "Why <command role=\"hg-cmd\">hg backout</command> works as it does" -msgstr "" +msgstr "<command role=\"hg-cmd\">hg backout</command> 的内幕" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:527 @@ -9540,7 +9540,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:597 msgid "Changes that should never have been" -msgstr "" +msgstr "不该发生的修改" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch09-undo.xml:599 @@ -9625,7 +9625,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:656 msgid "Protect yourself from <quote>escaped</quote> changes" -msgstr "" +msgstr "使用<quote>校验</quote>修改来保护你自己" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:659 @@ -9660,7 +9660,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:683 msgid "Finding the source of a bug" -msgstr "" +msgstr "查找问题的根源" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch09-undo.xml:685 @@ -9787,7 +9787,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:777 msgid "Using the <command role=\"hg-cmd\">hg bisect</command> command" -msgstr "" +msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:780 @@ -9976,7 +9976,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:911 msgid "Cleaning up after your search" -msgstr "" +msgstr "搜索后的清理" # #. type: Content of: <book><chapter><sect1><sect2><para> @@ -9994,12 +9994,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:928 msgid "Tips for finding bugs effectively" -msgstr "" +msgstr "有效查找问题的技巧" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:931 msgid "Give consistent input" -msgstr "" +msgstr "给出一致的输入" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:933 @@ -10016,7 +10016,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:945 msgid "Automate as much as possible" -msgstr "" +msgstr "尽量自动" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:947 @@ -10070,7 +10070,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:981 msgid "Check your results" -msgstr "" +msgstr "检查你的结果" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:983 @@ -10104,7 +10104,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:1003 msgid "Beware interference between bugs" -msgstr "" +msgstr "谨防问题之间的冲突" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:1005 @@ -10149,7 +10149,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:1039 msgid "Bracket your search lazily" -msgstr "" +msgstr "减少你的查找工作" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:1041 @@ -10205,7 +10205,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:18 msgid "An overview of hooks in Mercurial" -msgstr "" +msgstr "Mercurial 钩子概述" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:20 @@ -10322,12 +10322,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:99 msgid "Hooks and security" -msgstr "" +msgstr "钩子与安全性" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:102 msgid "Hooks are run with your privileges" -msgstr "" +msgstr "钩子以你的特权执行" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:104 @@ -10384,7 +10384,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:153 msgid "Hooks do not propagate" -msgstr "" +msgstr "钩子不会传播" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:155 @@ -10426,7 +10426,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:185 msgid "Hooks can be overridden" -msgstr "" +msgstr "钩子可以被覆盖" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:187 @@ -10447,7 +10447,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:200 msgid "Ensuring that critical hooks are run" -msgstr "" +msgstr "确保关键钩子的执行" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:202 @@ -10491,7 +10491,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:237 msgid "Care with <literal>pretxn</literal> hooks in a shared-access repository" -msgstr "" +msgstr "在共享版本库中注意 <literal>pretxn</literal> 钩子" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:240 @@ -10571,7 +10571,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:300 msgid "The problem illustrated" -msgstr "" +msgstr "问题的演示" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:302 @@ -10623,7 +10623,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:347 msgid "A short tutorial on using hooks" -msgstr "" +msgstr "使用钩子的简短指南" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:349 @@ -10653,7 +10653,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:370 msgid "Performing multiple actions per event" -msgstr "" +msgstr "每个事件执行多个操作" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:372 @@ -10697,7 +10697,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:408 msgid "Controlling whether an activity can proceed" -msgstr "" +msgstr "控制处理的活动" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:410 @@ -10749,7 +10749,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:452 msgid "Writing your own hooks" -msgstr "" +msgstr "编写钩子" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:454 @@ -10763,7 +10763,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:463 msgid "Choosing how your hook should run" -msgstr "" +msgstr "选择钩子的执行方式" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:465 @@ -10804,7 +10804,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:494 msgid "Hook parameters" -msgstr "" +msgstr "钩子的参数" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:496 @@ -10830,7 +10830,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:516 msgid "Hook return values and activity control" -msgstr "" +msgstr "钩子的返回值与活动控制" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:518 @@ -10852,7 +10852,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:533 msgid "Writing an external hook" -msgstr "" +msgstr "编写外部钩子" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:535 @@ -10892,7 +10892,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:562 msgid "Telling Mercurial to use an in-process hook" -msgstr "" +msgstr "让 MercurialMercurial 使用进程内钩子" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:564 @@ -10930,7 +10930,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:592 msgid "Writing an in-process hook" -msgstr "" +msgstr "编写进程内钩子" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:594 @@ -10954,12 +10954,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:614 msgid "Some hook examples" -msgstr "" +msgstr "钩子样例" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:617 msgid "Writing meaningful commit messages" -msgstr "" +msgstr "编写有意义的提交日志" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:619 @@ -10973,7 +10973,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:629 msgid "Checking for trailing whitespace" -msgstr "" +msgstr "检查行尾空格" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:631 @@ -11050,7 +11050,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:706 msgid "Bundled hooks" -msgstr "" +msgstr "内置的钩子" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:708 @@ -11067,7 +11067,7 @@ msgid "" "<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a " "repository" -msgstr "" +msgstr "<literal role=\"hg-ext\">acl</literal>&emdash;版本库的访问控制" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:720 @@ -11092,7 +11092,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:738 msgid "Configuring the <literal role=\"hook\">acl</literal> hook" -msgstr "" +msgstr "配置 <literal role=\"hook\">acl</literal> 钩子" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:741 @@ -11189,7 +11189,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:821 ../en/ch10-hook.xml:1095 ../en/ch10-hook.xml:1308 msgid "Testing and troubleshooting" -msgstr "" +msgstr "测试与问题处理" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:823 @@ -11214,7 +11214,7 @@ #: ../en/ch10-hook.xml:842 msgid "" "<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla" -msgstr "" +msgstr "<literal role=\"hg-ext\">bugzilla</literal>&emdash;与 Bugzilla 的集成" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:846 @@ -11270,7 +11270,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:892 msgid "Configuring the <literal role=\"hook\">bugzilla</literal> hook" -msgstr "" +msgstr "配置 <literal role=\"hook\">bugzilla</literal> 钩子" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:895 @@ -11377,7 +11377,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:992 msgid "Mapping committer names to Bugzilla user names" -msgstr "" +msgstr "提交者的名称与 Bugzilla 用户名称的映射" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:994 @@ -11419,7 +11419,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:1035 msgid "Configuring the text that gets added to a bug" -msgstr "" +msgstr "配置增加到问题中的正文" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:1037 @@ -11547,7 +11547,7 @@ #: ../en/ch10-hook.xml:1158 msgid "" "<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications" -msgstr "" +msgstr "<literal role=\"hg-ext\">notify</literal>&emdash;邮件通知" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1161 @@ -11579,7 +11579,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:1183 msgid "Configuring the <literal role=\"hg-ext\">notify</literal> hook" -msgstr "" +msgstr "配置 <literal role=\"hg-ext\">notify</literal> 钩子" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:1186 @@ -11694,12 +11694,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:1322 msgid "Information for writers of hooks" -msgstr "" +msgstr "编写钩子的信息" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1325 msgid "In-process hook execution" -msgstr "" +msgstr "进程内钩子的执行" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1327 @@ -11768,7 +11768,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1381 msgid "External hook execution" -msgstr "" +msgstr "外部钩子的执行" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1383 @@ -11814,7 +11814,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1419 msgid "Finding out where changesets come from" -msgstr "" +msgstr "检查修改集来自何处" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1421 @@ -11829,7 +11829,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:1430 msgid "Sources of changesets" -msgstr "" +msgstr "修改集的来源" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:1432 @@ -11871,7 +11871,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:1462 msgid "Where changes are going&emdash;remote repository URLs" -msgstr "" +msgstr "修改集要到哪里&emdash;远程版本库的地址" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:1465 @@ -11915,14 +11915,14 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:1501 msgid "Hook reference" -msgstr "" +msgstr "钩子参考" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1504 msgid "" "<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets " "added" -msgstr "" +msgstr "<literal role=\"hook\">changegroup</literal>&emdash;增加远程修改集之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1507 @@ -11993,7 +11993,7 @@ msgid "" "<literal role=\"hook\">commit</literal>&emdash;after a new changeset is " "created" -msgstr "" +msgstr "<literal role=\"hook\">commit</literal>&emdash;创建新修改集之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1561 @@ -12034,7 +12034,7 @@ msgid "" "<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset " "is added" -msgstr "" +msgstr "<literal role=\"hook\">incoming</literal>&emdash;增加远程修改集之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1593 @@ -12075,7 +12075,7 @@ msgid "" "<literal role=\"hook\">outgoing</literal>&emdash;after changesets are " "propagated" -msgstr "" +msgstr "<literal role=\"hook\">outgoing</literal>&emdash;传播修改集之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1639 @@ -12124,6 +12124,7 @@ "<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add " "remote changesets" msgstr "" +"<literal role=\"hook\">prechangegroup</literal>&emdash;增加远程修改集之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1687 @@ -12164,7 +12165,7 @@ msgid "" "<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a " "changeset" -msgstr "" +msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1732 @@ -12216,7 +12217,7 @@ msgid "" "<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to " "propagate changesets" -msgstr "" +msgstr "<literal role=\"hook\">preoutgoing</literal>&emdash;传播修改集之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1772 @@ -12254,7 +12255,7 @@ #: ../en/ch10-hook.xml:1807 msgid "" "<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset" -msgstr "" +msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1810 @@ -12306,6 +12307,8 @@ "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing " "addition of remote changesets" msgstr "" +"<literal role=\"hook\">pretxnchangegroup</literal>&emdash;完成增加远程修改集之" +"前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1850 @@ -12357,7 +12360,7 @@ msgid "" "<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit " "of new changeset" -msgstr "" +msgstr "<literal role=\"hook\">pretxncommit</literal>&emdash;完成提交之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1915 @@ -12398,6 +12401,7 @@ "<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging " "working directory" msgstr "" +"<literal role=\"hook\">preupdate</literal>&emdash;更新或合并工作目录之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1962 @@ -12434,7 +12438,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1991 msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset" -msgstr "" +msgstr "<literal role=\"hook\">tag</literal>&emdash;创建标签之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1994 @@ -12482,7 +12486,7 @@ msgid "" "<literal role=\"hook\">update</literal>&emdash;after updating or merging " "working directory" -msgstr "" +msgstr "<literal role=\"hook\">update</literal>&emdash;更新或合并工作目录之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:2031

# HG changeset patch # User Dongsheng Song # Date 1237005775 -28800 # Node ID fa8a143923ae8a40c6d5f0e6cf30efca40eacfe1 # Parent d1a6ed326f8769fd0f6188a146c78c86f558f85c Update Chinese translation diff -r d1a6ed326f87 -r fa8a143923ae po/zh.po --- a/po/zh.po Fri Mar 13 16:01:21 2009 +0800 +++ b/po/zh.po Sat Mar 14 12:42:55 2009 +0800 @@ -25,7 +25,7 @@ # delete 删除(只从文件系统删除) # patchset 补丁集 # pushing to 推到 -# pulling from 拉自 +# pulling from 拉自，抓取 # rename 改名 # repository 版本库 # revert 恢复 @@ -8138,7 +8138,7 @@ #. type: Content of: #: ../en/ch08-branch.xml:25 msgid "Giving a persistent name to a revision" -msgstr "" +msgstr "给版本指定一个永久的名称" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:27 @@ -8293,7 +8293,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch08-branch.xml:142 msgid "Handling tag conflicts during a merge" -msgstr "" +msgstr "在合并期间处理标签冲突" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch08-branch.xml:144 @@ -8333,7 +8333,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch08-branch.xml:176 msgid "Tags and cloning" -msgstr "" +msgstr "标签与克隆" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch08-branch.xml:178 @@ -8362,7 +8362,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch08-branch.xml:201 msgid "When permanent tags are too much" -msgstr "" +msgstr "当永久标签太多的时候" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch08-branch.xml:203 @@ -8392,7 +8392,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:228 msgid "The flow of changes&emdash;big picture vs. little" -msgstr "" +msgstr "修改流程&emdash;宏观与微观" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:230 @@ -8438,7 +8438,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:258 msgid "Managing big-picture branches in repositories" -msgstr "" +msgstr "在版本库中管理分支" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:260 @@ -8476,7 +8476,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:291 msgid "Don't repeat yourself: merging across branches" -msgstr "" +msgstr "不要重复劳动：在分支间合并" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:293 @@ -8505,7 +8505,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:314 msgid "Naming branches within one repository" -msgstr "" +msgstr "版本库中的命名分支" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:316 @@ -8639,7 +8639,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:414 msgid "Dealing with multiple named branches in a repository" -msgstr "" +msgstr "在版本库中处理多个命名分支" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:417 @@ -8699,7 +8699,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:460 msgid "Branch names and merging" -msgstr "" +msgstr "分支名称与合并" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:462 @@ -8756,7 +8756,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch08-branch.xml:502 msgid "Branch naming is generally useful" -msgstr "" +msgstr "分支名称通常都很有用" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch08-branch.xml:504 @@ -8805,12 +8805,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:15 msgid "Erasing local history" -msgstr "" +msgstr "销毁本地历史" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:18 msgid "The accidental commit" -msgstr "" +msgstr "意外的提交" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:20 @@ -8826,7 +8826,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:31 msgid "Rolling back a transaction" -msgstr "" +msgstr "回滚一个事务" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:33 @@ -8889,7 +8889,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:85 msgid "The erroneous pull" -msgstr "" +msgstr "错误的抓取" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:87 @@ -8926,7 +8926,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:115 msgid "Rolling back is useless once you've pushed" -msgstr "" +msgstr "当完成推送后，回滚是无效的" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:117 @@ -8965,7 +8965,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:147 msgid "You can only roll back once" -msgstr "" +msgstr "你只能回滚一次" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:149 @@ -8987,7 +8987,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:165 msgid "Reverting the mistaken change" -msgstr "" +msgstr "撤销错误的修改" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch09-undo.xml:167 @@ -9062,7 +9062,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:218 msgid "File management errors" -msgstr "" +msgstr "文件管理错误" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:220 @@ -9107,7 +9107,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch09-undo.xml:254 msgid "A slightly special case: reverting a rename" -msgstr "" +msgstr "一个稍微特别的案例：撤销改名" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch09-undo.xml:256 @@ -9159,7 +9159,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:295 msgid "Dealing with committed changes" -msgstr "" +msgstr "处理已经提交的修改" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch09-undo.xml:297 @@ -9184,7 +9184,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:312 msgid "Backing out a changeset" -msgstr "" +msgstr "恢复一个修改集" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:314 @@ -9220,7 +9220,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:341 msgid "Backing out the tip changeset" -msgstr "" +msgstr "恢复顶点修改集" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:343 @@ -9256,7 +9256,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:373 msgid "Backing out a non-tip change" -msgstr "" +msgstr "恢复非顶点的修改" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:375 @@ -9325,7 +9325,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch09-undo.xml:423 msgid "Always use the <option role=\"hg-opt-backout\">--merge</option> option" -msgstr "" +msgstr "始终使用选项 <option role=\"hg-opt-backout\">--merge</option>" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch09-undo.xml:426 @@ -9340,7 +9340,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:437 msgid "Gaining more control of the backout process" -msgstr "" +msgstr "在恢复处理中获得更多控制" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:439 @@ -9440,7 +9440,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:524 msgid "Why <command role=\"hg-cmd\">hg backout</command> works as it does" -msgstr "" +msgstr "<command role=\"hg-cmd\">hg backout</command> 的内幕" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:527 @@ -9540,7 +9540,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:597 msgid "Changes that should never have been" -msgstr "" +msgstr "不该发生的修改" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch09-undo.xml:599 @@ -9625,7 +9625,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:656 msgid "Protect yourself from <quote>escaped</quote> changes" -msgstr "" +msgstr "使用<quote>校验</quote>修改来保护你自己" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:659 @@ -9660,7 +9660,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:683 msgid "Finding the source of a bug" -msgstr "" +msgstr "查找问题的根源" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch09-undo.xml:685 @@ -9787,7 +9787,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:777 msgid "Using the <command role=\"hg-cmd\">hg bisect</command> command" -msgstr "" +msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:780 @@ -9976,7 +9976,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:911 msgid "Cleaning up after your search" -msgstr "" +msgstr "搜索后的清理" # #. type: Content of: <book><chapter><sect1><sect2><para> @@ -9994,12 +9994,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch09-undo.xml:928 msgid "Tips for finding bugs effectively" -msgstr "" +msgstr "有效查找问题的技巧" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:931 msgid "Give consistent input" -msgstr "" +msgstr "给出一致的输入" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:933 @@ -10016,7 +10016,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:945 msgid "Automate as much as possible" -msgstr "" +msgstr "尽量自动" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:947 @@ -10070,7 +10070,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:981 msgid "Check your results" -msgstr "" +msgstr "检查你的结果" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:983 @@ -10104,7 +10104,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:1003 msgid "Beware interference between bugs" -msgstr "" +msgstr "谨防问题之间的冲突" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:1005 @@ -10149,7 +10149,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch09-undo.xml:1039 msgid "Bracket your search lazily" -msgstr "" +msgstr "减少你的查找工作" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch09-undo.xml:1041 @@ -10205,7 +10205,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:18 msgid "An overview of hooks in Mercurial" -msgstr "" +msgstr "Mercurial 钩子概述" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:20 @@ -10322,12 +10322,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:99 msgid "Hooks and security" -msgstr "" +msgstr "钩子与安全性" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:102 msgid "Hooks are run with your privileges" -msgstr "" +msgstr "钩子以你的特权执行" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:104 @@ -10384,7 +10384,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:153 msgid "Hooks do not propagate" -msgstr "" +msgstr "钩子不会传播" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:155 @@ -10426,7 +10426,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:185 msgid "Hooks can be overridden" -msgstr "" +msgstr "钩子可以被覆盖" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:187 @@ -10447,7 +10447,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:200 msgid "Ensuring that critical hooks are run" -msgstr "" +msgstr "确保关键钩子的执行" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:202 @@ -10491,7 +10491,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:237 msgid "Care with <literal>pretxn</literal> hooks in a shared-access repository" -msgstr "" +msgstr "在共享版本库中注意 <literal>pretxn</literal> 钩子" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:240 @@ -10571,7 +10571,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:300 msgid "The problem illustrated" -msgstr "" +msgstr "问题的演示" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:302 @@ -10623,7 +10623,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:347 msgid "A short tutorial on using hooks" -msgstr "" +msgstr "使用钩子的简短指南" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:349 @@ -10653,7 +10653,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:370 msgid "Performing multiple actions per event" -msgstr "" +msgstr "每个事件执行多个操作" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:372 @@ -10697,7 +10697,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:408 msgid "Controlling whether an activity can proceed" -msgstr "" +msgstr "控制处理的活动" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:410 @@ -10749,7 +10749,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:452 msgid "Writing your own hooks" -msgstr "" +msgstr "编写钩子" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:454 @@ -10763,7 +10763,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:463 msgid "Choosing how your hook should run" -msgstr "" +msgstr "选择钩子的执行方式" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:465 @@ -10804,7 +10804,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:494 msgid "Hook parameters" -msgstr "" +msgstr "钩子的参数" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:496 @@ -10830,7 +10830,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:516 msgid "Hook return values and activity control" -msgstr "" +msgstr "钩子的返回值与活动控制" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:518 @@ -10852,7 +10852,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:533 msgid "Writing an external hook" -msgstr "" +msgstr "编写外部钩子" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:535 @@ -10892,7 +10892,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:562 msgid "Telling Mercurial to use an in-process hook" -msgstr "" +msgstr "让 MercurialMercurial 使用进程内钩子" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:564 @@ -10930,7 +10930,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:592 msgid "Writing an in-process hook" -msgstr "" +msgstr "编写进程内钩子" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:594 @@ -10954,12 +10954,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:614 msgid "Some hook examples" -msgstr "" +msgstr "钩子样例" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:617 msgid "Writing meaningful commit messages" -msgstr "" +msgstr "编写有意义的提交日志" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:619 @@ -10973,7 +10973,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:629 msgid "Checking for trailing whitespace" -msgstr "" +msgstr "检查行尾空格" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:631 @@ -11050,7 +11050,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:706 msgid "Bundled hooks" -msgstr "" +msgstr "内置的钩子" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch10-hook.xml:708 @@ -11067,7 +11067,7 @@ msgid "" "<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a " "repository" -msgstr "" +msgstr "<literal role=\"hg-ext\">acl</literal>&emdash;版本库的访问控制" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:720 @@ -11092,7 +11092,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:738 msgid "Configuring the <literal role=\"hook\">acl</literal> hook" -msgstr "" +msgstr "配置 <literal role=\"hook\">acl</literal> 钩子" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:741 @@ -11189,7 +11189,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:821 ../en/ch10-hook.xml:1095 ../en/ch10-hook.xml:1308 msgid "Testing and troubleshooting" -msgstr "" +msgstr "测试与问题处理" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:823 @@ -11214,7 +11214,7 @@ #: ../en/ch10-hook.xml:842 msgid "" "<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla" -msgstr "" +msgstr "<literal role=\"hg-ext\">bugzilla</literal>&emdash;与 Bugzilla 的集成" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:846 @@ -11270,7 +11270,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:892 msgid "Configuring the <literal role=\"hook\">bugzilla</literal> hook" -msgstr "" +msgstr "配置 <literal role=\"hook\">bugzilla</literal> 钩子" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:895 @@ -11377,7 +11377,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:992 msgid "Mapping committer names to Bugzilla user names" -msgstr "" +msgstr "提交者的名称与 Bugzilla 用户名称的映射" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:994 @@ -11419,7 +11419,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:1035 msgid "Configuring the text that gets added to a bug" -msgstr "" +msgstr "配置增加到问题中的正文" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:1037 @@ -11547,7 +11547,7 @@ #: ../en/ch10-hook.xml:1158 msgid "" "<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications" -msgstr "" +msgstr "<literal role=\"hg-ext\">notify</literal>&emdash;邮件通知" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1161 @@ -11579,7 +11579,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:1183 msgid "Configuring the <literal role=\"hg-ext\">notify</literal> hook" -msgstr "" +msgstr "配置 <literal role=\"hg-ext\">notify</literal> 钩子" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:1186 @@ -11694,12 +11694,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:1322 msgid "Information for writers of hooks" -msgstr "" +msgstr "编写钩子的信息" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1325 msgid "In-process hook execution" -msgstr "" +msgstr "进程内钩子的执行" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1327 @@ -11768,7 +11768,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1381 msgid "External hook execution" -msgstr "" +msgstr "外部钩子的执行" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1383 @@ -11814,7 +11814,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1419 msgid "Finding out where changesets come from" -msgstr "" +msgstr "检查修改集来自何处" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1421 @@ -11829,7 +11829,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:1430 msgid "Sources of changesets" -msgstr "" +msgstr "修改集的来源" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:1432 @@ -11871,7 +11871,7 @@ #. type: Content of: <book><chapter><sect1><sect2><sect3><title> #: ../en/ch10-hook.xml:1462 msgid "Where changes are going&emdash;remote repository URLs" -msgstr "" +msgstr "修改集要到哪里&emdash;远程版本库的地址" #. type: Content of: <book><chapter><sect1><sect2><sect3><para> #: ../en/ch10-hook.xml:1465 @@ -11915,14 +11915,14 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch10-hook.xml:1501 msgid "Hook reference" -msgstr "" +msgstr "钩子参考" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1504 msgid "" "<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets " "added" -msgstr "" +msgstr "<literal role=\"hook\">changegroup</literal>&emdash;增加远程修改集之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1507 @@ -11993,7 +11993,7 @@ msgid "" "<literal role=\"hook\">commit</literal>&emdash;after a new changeset is " "created" -msgstr "" +msgstr "<literal role=\"hook\">commit</literal>&emdash;创建新修改集之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1561 @@ -12034,7 +12034,7 @@ msgid "" "<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset " "is added" -msgstr "" +msgstr "<literal role=\"hook\">incoming</literal>&emdash;增加远程修改集之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1593 @@ -12075,7 +12075,7 @@ msgid "" "<literal role=\"hook\">outgoing</literal>&emdash;after changesets are " "propagated" -msgstr "" +msgstr "<literal role=\"hook\">outgoing</literal>&emdash;传播修改集之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1639 @@ -12124,6 +12124,7 @@ "<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add " "remote changesets" msgstr "" +"<literal role=\"hook\">prechangegroup</literal>&emdash;增加远程修改集之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1687 @@ -12164,7 +12165,7 @@ msgid "" "<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a " "changeset" -msgstr "" +msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1732 @@ -12216,7 +12217,7 @@ msgid "" "<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to " "propagate changesets" -msgstr "" +msgstr "<literal role=\"hook\">preoutgoing</literal>&emdash;传播修改集之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1772 @@ -12254,7 +12255,7 @@ #: ../en/ch10-hook.xml:1807 msgid "" "<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset" -msgstr "" +msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1810 @@ -12306,6 +12307,8 @@ "<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing " "addition of remote changesets" msgstr "" +"<literal role=\"hook\">pretxnchangegroup</literal>&emdash;完成增加远程修改集之" +"前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1850 @@ -12357,7 +12360,7 @@ msgid "" "<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit " "of new changeset" -msgstr "" +msgstr "<literal role=\"hook\">pretxncommit</literal>&emdash;完成提交之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1915 @@ -12398,6 +12401,7 @@ "<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging " "working directory" msgstr "" +"<literal role=\"hook\">preupdate</literal>&emdash;更新或合并工作目录之前" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1962 @@ -12434,7 +12438,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch10-hook.xml:1991 msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset" -msgstr "" +msgstr "<literal role=\"hook\">tag</literal>&emdash;创建标签之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:1994 @@ -12482,7 +12486,7 @@ msgid "" "<literal role=\"hook\">update</literal>&emdash;after updating or merging " "working directory" -msgstr "" +msgstr "<literal role=\"hook\">update</literal>&emdash;更新或合并工作目录之后" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch10-hook.xml:2031