# HG changeset patch # User Dongsheng Song # Date 1237193551 -28800 # Node ID 17fe2fe3837376f5f6348edd5dbebff9345fbd55 # Parent fa8a143923ae8a40c6d5f0e6cf30efca40eacfe1 Update Chinese translation diff -r fa8a143923ae -r 17fe2fe38373 po/zh.po --- a/po/zh.po Sat Mar 14 12:42:55 2009 +0800 +++ b/po/zh.po Mon Mar 16 16:52:31 2009 +0800 @@ -6,7 +6,7 @@ # Dongsheng Song , 2009 # # Update to new pot: -# msgmerge --update zh.po svnbook.pot +# msgmerge --update zh.po hgbook.pot # # Check translation: # msgfmt --statistics -c -o zh.mo zh.po @@ -42,7 +42,7 @@ msgstr "" "Project-Id-Version: hgbook 1.2\n" "POT-Creation-Date: 2009-03-12 16:06+0800\n" -"PO-Revision-Date: 2009-03-12 18:32+0800\n" +"PO-Revision-Date: 2009-03-16 18:32+0800\n" "Last-Translator: \n" "Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" @@ -12544,7 +12544,7 @@ #. type: Content of: #: ../en/ch11-template.xml:14 msgid "Using precanned output styles" -msgstr "" +msgstr "使用预定义的输出样式" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch11-template.xml:16 @@ -12587,7 +12587,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:44 msgid "Setting a default style" -msgstr "" +msgstr "设置默认样式" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch11-template.xml:46 @@ -12609,7 +12609,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch11-template.xml:62 msgid "Commands that support styles and templates" -msgstr "" +msgstr "支持样式和模版的命令" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch11-template.xml:64 @@ -12632,7 +12632,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch11-template.xml:79 msgid "The basics of templating" -msgstr "" +msgstr "模版基础" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch11-template.xml:81 @@ -12697,7 +12697,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch11-template.xml:131 msgid "Common template keywords" -msgstr "" +msgstr "模版关键字" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch11-template.xml:133 @@ -12807,7 +12807,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch11-template.xml:206 msgid "Escape sequences" -msgstr "" +msgstr "转义序列" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch11-template.xml:208 @@ -12870,7 +12870,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch11-template.xml:248 msgid "Filtering keywords to change their results" -msgstr "" +msgstr "通过过滤关键字来修改输出结果" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch11-template.xml:250 @@ -13090,7 +13090,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:426 msgid "Combining filters" -msgstr "" +msgstr "组合过滤器" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch11-template.xml:428 @@ -13124,7 +13124,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch11-template.xml:454 msgid "From templates to styles" -msgstr "" +msgstr "从模版到样式" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch11-template.xml:456 @@ -13146,7 +13146,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:467 msgid "The simplest of style files" -msgstr "" +msgstr "最简单的样式文件" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch11-template.xml:469 @@ -13163,7 +13163,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:479 msgid "Style file syntax" -msgstr "" +msgstr "样式文件语法" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch11-template.xml:481 @@ -13227,7 +13227,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch11-template.xml:521 msgid "Style files by example" -msgstr "" +msgstr "样式文件例子" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch11-template.xml:523 @@ -13241,7 +13241,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:530 msgid "Identifying mistakes in style files" -msgstr "" +msgstr "在样式文件中定位错误" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch11-template.xml:532 @@ -13298,7 +13298,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:578 msgid "Uniquely identifying a repository" -msgstr "" +msgstr "版本库的唯一标识" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch11-template.xml:580 @@ -13353,7 +13353,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch11-template.xml:614 msgid "Mimicking Subversion's output" -msgstr "" +msgstr "模仿 Subversion 的输出" # #. type: Content of: <book><chapter><sect1><sect2><para> @@ -13437,7 +13437,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:8 msgid "The patch management problem" -msgstr "" +msgstr "补丁的管理问题" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:10 @@ -13515,7 +13515,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:65 msgid "The prehistory of Mercurial Queues" -msgstr "" +msgstr "MQ 的历史" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:67 @@ -13595,7 +13595,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:124 msgid "From patchwork quilt to Mercurial Queues" -msgstr "" +msgstr "从 patchwork quilt 到 MQ" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:126 @@ -13625,7 +13625,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:144 msgid "The huge advantage of MQ" -msgstr "" +msgstr "MQ 的巨大优势" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:146 @@ -13683,7 +13683,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:187 msgid "Understanding patches" -msgstr "" +msgstr "理解补丁" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:189 @@ -13766,7 +13766,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:250 msgid "Getting started with Mercurial Queues" -msgstr "" +msgstr "开始使用 MQ" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:252 @@ -13806,7 +13806,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:283 msgid "Creating a new patch" -msgstr "" +msgstr "创建新补丁" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:285 @@ -13858,7 +13858,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:325 msgid "Refreshing a patch" -msgstr "" +msgstr "刷新补丁" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:327 @@ -13888,7 +13888,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:348 msgid "Stacking and tracking patches" -msgstr "" +msgstr "堆叠和跟踪补丁" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:350 @@ -13935,7 +13935,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:387 msgid "Manipulating the patch stack" -msgstr "" +msgstr "操作补丁堆栈" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:389 @@ -13989,7 +13989,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:431 msgid "Pushing and popping many patches" -msgstr "" +msgstr "压入或弹出多个补丁" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:433 @@ -14007,7 +14007,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:450 msgid "Safety checks, and overriding them" -msgstr "" +msgstr "安全的检查,然后覆盖它们" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:452 @@ -14038,7 +14038,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:479 msgid "Working on several patches at once" -msgstr "" +msgstr "同时处理多个补丁" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:481 @@ -14068,7 +14068,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:505 msgid "More about patches" -msgstr "" +msgstr "关于补丁的更多信息" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:507 @@ -14081,7 +14081,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:513 msgid "The strip count" -msgstr "" +msgstr "修剪计数" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:515 @@ -14162,7 +14162,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:583 msgid "Strategies for applying a patch" -msgstr "" +msgstr "应用补丁的策略" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:585 @@ -14216,7 +14216,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:628 msgid "Some quirks of patch representation" -msgstr "" +msgstr "补丁的一些特性" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:630 @@ -14276,7 +14276,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:666 msgid "Beware the fuzz" -msgstr "" +msgstr "当心毛刺" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:668 @@ -14306,7 +14306,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:691 msgid "Handling rejection" -msgstr "" +msgstr "处理拒绝" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:693 @@ -14390,7 +14390,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:751 msgid "Getting the best performance out of MQ" -msgstr "" +msgstr "MQ 的性能" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:753 @@ -14457,7 +14457,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:805 msgid "Updating your patches when the underlying code changes" -msgstr "" +msgstr "当基础代码改变时,更新补丁的方法" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:808 @@ -14590,7 +14590,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:907 msgid "Identifying patches" -msgstr "" +msgstr "标识补丁" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:909 @@ -14686,7 +14686,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:977 msgid "Useful things to know about" -msgstr "" +msgstr "其它需要了解的东西" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:979 @@ -14719,7 +14719,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:1004 msgid "Managing patches in a repository" -msgstr "" +msgstr "在版本库管理补丁" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:1006 @@ -14764,7 +14764,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:1037 msgid "MQ support for patch repositories" -msgstr "" +msgstr "MQ 支持补丁版本库" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:1039 @@ -14833,7 +14833,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:1091 msgid "A few things to watch out for" -msgstr "" +msgstr "需要注意的事情" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:1093 @@ -14859,7 +14859,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:1112 msgid "Third party tools for working with patches" -msgstr "" +msgstr "操作补丁的第三方工具" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:1114 @@ -14900,7 +14900,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:1148 msgid "Good ways to work with patches" -msgstr "" +msgstr "操作补丁的好习惯" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:1150 @@ -14952,12 +14952,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:1189 msgid "MQ cookbook" -msgstr "" +msgstr "MQ 手册" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:1192 msgid "Manage <quote>trivial</quote> patches" -msgstr "" +msgstr "管理<quote>琐碎的</quote>补丁" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:1194 @@ -15005,7 +15005,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:1230 msgid "Combining entire patches" -msgstr "" +msgstr "组合全部的补丁" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:1232 @@ -15031,7 +15031,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch12-mq.xml:1251 msgid "Merging part of one patch into another" -msgstr "" +msgstr "合并补丁的部分内容到其它补丁" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch12-mq.xml:1253 @@ -15109,7 +15109,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch12-mq.xml:1307 msgid "Differences between quilt and MQ" -msgstr "" +msgstr "MQ 与 quilt 的区别" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch12-mq.xml:1309 @@ -15164,7 +15164,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:24 msgid "The problem of many targets" -msgstr "" +msgstr "多个目标的问题" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch13-mq-collab.xml:26 @@ -15215,7 +15215,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch13-mq-collab.xml:58 msgid "Tempting approaches that don't work well" -msgstr "" +msgstr "工作不好的诱人方法" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch13-mq-collab.xml:60 @@ -15278,7 +15278,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:105 msgid "Conditionally applying patches with guards" -msgstr "" +msgstr "有条件的应用补丁" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch13-mq-collab.xml:107 @@ -15319,7 +15319,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:135 msgid "Controlling the guards on a patch" -msgstr "" +msgstr "控制补丁的应用条件" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch13-mq-collab.xml:137 @@ -15369,7 +15369,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:177 msgid "Selecting the guards to use" -msgstr "" +msgstr "选择使用的条件" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch13-mq-collab.xml:179 @@ -15427,7 +15427,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:224 msgid "MQ's rules for applying patches" -msgstr "" +msgstr "MQ 应用补丁的规则" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch13-mq-collab.xml:226 @@ -15464,7 +15464,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:245 msgid "Trimming the work environment" -msgstr "" +msgstr "修剪工作环境" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch13-mq-collab.xml:247 @@ -15499,7 +15499,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:270 msgid "Dividing up the <filename role=\"special\">series</filename> file" -msgstr "" +msgstr "分类补丁<filename role=\"special\">系列</filename>" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch13-mq-collab.xml:273 @@ -15600,7 +15600,7 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:343 msgid "Maintaining the patch series" -msgstr "" +msgstr "维护补丁系列" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch13-mq-collab.xml:345 @@ -15660,7 +15660,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch13-mq-collab.xml:381 msgid "The art of writing backport patches" -msgstr "" +msgstr "编写向后移植补丁的艺术" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch13-mq-collab.xml:383 @@ -15701,12 +15701,12 @@ #. type: Content of: <book><chapter><sect1><title> #: ../en/ch13-mq-collab.xml:417 msgid "Useful tips for developing with MQ" -msgstr "" +msgstr "使用 MQ 开发的技巧" #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch13-mq-collab.xml:420 msgid "Organising patches in directories" -msgstr "" +msgstr "将补丁放到几个目录中" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch13-mq-collab.xml:422 @@ -15727,7 +15727,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch13-mq-collab.xml:434 msgid "Viewing the history of a patch" -msgstr "" +msgstr "察看补丁的历史" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch13-mq-collab.xml:436 @@ -15895,7 +15895,7 @@ msgid "" "Improve performance with the <literal role=\"hg-ext\">inotify</literal> " "extension" -msgstr "" +msgstr "使用扩展 <literal role=\"hg-ext\">inotify</literal> 以提高性能" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch14-hgext.xml:58 @@ -16162,7 +16162,7 @@ msgid "" "Flexible diff support with the <literal role=\"hg-ext\">extdiff</literal> " "extension" -msgstr "" +msgstr "使用扩展 <literal role=\"hg-ext\">extdiff</literal> 以扩展差异支持" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch14-hgext.xml:270 @@ -16286,7 +16286,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch14-hgext.xml:366 msgid "Defining command aliases" -msgstr "" +msgstr "定义命令的别名" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch14-hgext.xml:368 @@ -16336,7 +16336,7 @@ msgid "" "Cherrypicking changes with the <literal role=\"hg-ext\">transplant</literal> " "extension" -msgstr "" +msgstr "使用扩展 <literal role=\"hg-ext\">transplant</literal> 以挑选修改" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch14-hgext.xml:409 @@ -16349,6 +16349,7 @@ "Send changes via email with the <literal role=\"hg-ext\">patchbomb</literal> " "extension" msgstr "" +"使用扩展 <literal role=\"hg-ext\">patchbomb</literal> 通过 email 发送修改" #. type: Content of: <book><chapter><sect1><para> #: ../en/ch14-hgext.xml:416 @@ -16451,7 +16452,7 @@ #. type: Content of: <book><chapter><sect1><sect2><title> #: ../en/ch14-hgext.xml:486 msgid "Changing the behaviour of patchbombs" -msgstr "" +msgstr "修改 patchbomb 的行为" #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch14-hgext.xml:488