Mercurial > hgbook
comparison po/zh.po @ 735:17fe2fe38373
Update Chinese translation
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Mon, 16 Mar 2009 16:52:31 +0800 |
parents | fa8a143923ae |
children | 8b73656f95c9 |
comparison
equal
deleted
inserted
replaced
734:fa8a143923ae | 735:17fe2fe38373 |
---|---|
4 # | 4 # |
5 # Authors: | 5 # Authors: |
6 # Dongsheng Song <dongsheng.song@gmail.com>, 2009 | 6 # Dongsheng Song <dongsheng.song@gmail.com>, 2009 |
7 # | 7 # |
8 # Update to new pot: | 8 # Update to new pot: |
9 # msgmerge --update zh.po svnbook.pot | 9 # msgmerge --update zh.po hgbook.pot |
10 # | 10 # |
11 # Check translation: | 11 # Check translation: |
12 # msgfmt --statistics -c -o zh.mo zh.po | 12 # msgfmt --statistics -c -o zh.mo zh.po |
13 # | 13 # |
14 # Please format your translation before commit: | 14 # Please format your translation before commit: |
40 # | 40 # |
41 msgid "" | 41 msgid "" |
42 msgstr "" | 42 msgstr "" |
43 "Project-Id-Version: hgbook 1.2\n" | 43 "Project-Id-Version: hgbook 1.2\n" |
44 "POT-Creation-Date: 2009-03-12 16:06+0800\n" | 44 "POT-Creation-Date: 2009-03-12 16:06+0800\n" |
45 "PO-Revision-Date: 2009-03-12 18:32+0800\n" | 45 "PO-Revision-Date: 2009-03-16 18:32+0800\n" |
46 "Last-Translator: \n" | 46 "Last-Translator: \n" |
47 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" | 47 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" |
48 "MIME-Version: 1.0\n" | 48 "MIME-Version: 1.0\n" |
49 "Content-Type: text/plain; charset=UTF-8\n" | 49 "Content-Type: text/plain; charset=UTF-8\n" |
50 "Content-Transfer-Encoding: 8bit\n" | 50 "Content-Transfer-Encoding: 8bit\n" |
12542 msgstr "" | 12542 msgstr "" |
12543 | 12543 |
12544 #. type: Content of: <book><chapter><sect1><title> | 12544 #. type: Content of: <book><chapter><sect1><title> |
12545 #: ../en/ch11-template.xml:14 | 12545 #: ../en/ch11-template.xml:14 |
12546 msgid "Using precanned output styles" | 12546 msgid "Using precanned output styles" |
12547 msgstr "" | 12547 msgstr "使用预定义的输出样式" |
12548 | 12548 |
12549 #. type: Content of: <book><chapter><sect1><para> | 12549 #. type: Content of: <book><chapter><sect1><para> |
12550 #: ../en/ch11-template.xml:16 | 12550 #: ../en/ch11-template.xml:16 |
12551 msgid "" | 12551 msgid "" |
12552 "Packaged with Mercurial are some output styles that you can use immediately. " | 12552 "Packaged with Mercurial are some output styles that you can use immediately. " |
12585 msgstr "" | 12585 msgstr "" |
12586 | 12586 |
12587 #. type: Content of: <book><chapter><sect1><sect2><title> | 12587 #. type: Content of: <book><chapter><sect1><sect2><title> |
12588 #: ../en/ch11-template.xml:44 | 12588 #: ../en/ch11-template.xml:44 |
12589 msgid "Setting a default style" | 12589 msgid "Setting a default style" |
12590 msgstr "" | 12590 msgstr "设置默认样式" |
12591 | 12591 |
12592 #. type: Content of: <book><chapter><sect1><sect2><para> | 12592 #. type: Content of: <book><chapter><sect1><sect2><para> |
12593 #: ../en/ch11-template.xml:46 | 12593 #: ../en/ch11-template.xml:46 |
12594 msgid "" | 12594 msgid "" |
12595 "You can modify the output style that Mercurial will use for every command by " | 12595 "You can modify the output style that Mercurial will use for every command by " |
12607 msgstr "" | 12607 msgstr "" |
12608 | 12608 |
12609 #. type: Content of: <book><chapter><sect1><title> | 12609 #. type: Content of: <book><chapter><sect1><title> |
12610 #: ../en/ch11-template.xml:62 | 12610 #: ../en/ch11-template.xml:62 |
12611 msgid "Commands that support styles and templates" | 12611 msgid "Commands that support styles and templates" |
12612 msgstr "" | 12612 msgstr "支持样式和模版的命令" |
12613 | 12613 |
12614 #. type: Content of: <book><chapter><sect1><para> | 12614 #. type: Content of: <book><chapter><sect1><para> |
12615 #: ../en/ch11-template.xml:64 | 12615 #: ../en/ch11-template.xml:64 |
12616 msgid "" | 12616 msgid "" |
12617 "All of Mercurial's <quote><literal>log</literal>-like</quote> commands let " | 12617 "All of Mercurial's <quote><literal>log</literal>-like</quote> commands let " |
12630 msgstr "" | 12630 msgstr "" |
12631 | 12631 |
12632 #. type: Content of: <book><chapter><sect1><title> | 12632 #. type: Content of: <book><chapter><sect1><title> |
12633 #: ../en/ch11-template.xml:79 | 12633 #: ../en/ch11-template.xml:79 |
12634 msgid "The basics of templating" | 12634 msgid "The basics of templating" |
12635 msgstr "" | 12635 msgstr "模版基础" |
12636 | 12636 |
12637 #. type: Content of: <book><chapter><sect1><para> | 12637 #. type: Content of: <book><chapter><sect1><para> |
12638 #: ../en/ch11-template.xml:81 | 12638 #: ../en/ch11-template.xml:81 |
12639 msgid "" | 12639 msgid "" |
12640 "At its simplest, a Mercurial template is a piece of text. Some of the text " | 12640 "At its simplest, a Mercurial template is a piece of text. Some of the text " |
12695 msgstr "" | 12695 msgstr "" |
12696 | 12696 |
12697 #. type: Content of: <book><chapter><sect1><title> | 12697 #. type: Content of: <book><chapter><sect1><title> |
12698 #: ../en/ch11-template.xml:131 | 12698 #: ../en/ch11-template.xml:131 |
12699 msgid "Common template keywords" | 12699 msgid "Common template keywords" |
12700 msgstr "" | 12700 msgstr "模版关键字" |
12701 | 12701 |
12702 #. type: Content of: <book><chapter><sect1><para> | 12702 #. type: Content of: <book><chapter><sect1><para> |
12703 #: ../en/ch11-template.xml:133 | 12703 #: ../en/ch11-template.xml:133 |
12704 msgid "" | 12704 msgid "" |
12705 "You can start writing simple templates immediately using the keywords below." | 12705 "You can start writing simple templates immediately using the keywords below." |
12805 msgstr "" | 12805 msgstr "" |
12806 | 12806 |
12807 #. type: Content of: <book><chapter><sect1><title> | 12807 #. type: Content of: <book><chapter><sect1><title> |
12808 #: ../en/ch11-template.xml:206 | 12808 #: ../en/ch11-template.xml:206 |
12809 msgid "Escape sequences" | 12809 msgid "Escape sequences" |
12810 msgstr "" | 12810 msgstr "转义序列" |
12811 | 12811 |
12812 #. type: Content of: <book><chapter><sect1><para> | 12812 #. type: Content of: <book><chapter><sect1><para> |
12813 #: ../en/ch11-template.xml:208 | 12813 #: ../en/ch11-template.xml:208 |
12814 msgid "" | 12814 msgid "" |
12815 "Mercurial's templating engine recognises the most commonly used escape " | 12815 "Mercurial's templating engine recognises the most commonly used escape " |
12868 msgstr "" | 12868 msgstr "" |
12869 | 12869 |
12870 #. type: Content of: <book><chapter><sect1><title> | 12870 #. type: Content of: <book><chapter><sect1><title> |
12871 #: ../en/ch11-template.xml:248 | 12871 #: ../en/ch11-template.xml:248 |
12872 msgid "Filtering keywords to change their results" | 12872 msgid "Filtering keywords to change their results" |
12873 msgstr "" | 12873 msgstr "通过过滤关键字来修改输出结果" |
12874 | 12874 |
12875 #. type: Content of: <book><chapter><sect1><para> | 12875 #. type: Content of: <book><chapter><sect1><para> |
12876 #: ../en/ch11-template.xml:250 | 12876 #: ../en/ch11-template.xml:250 |
12877 msgid "" | 12877 msgid "" |
12878 "Some of the results of template expansion are not immediately easy to use. " | 12878 "Some of the results of template expansion are not immediately easy to use. " |
13088 msgstr "" | 13088 msgstr "" |
13089 | 13089 |
13090 #. type: Content of: <book><chapter><sect1><sect2><title> | 13090 #. type: Content of: <book><chapter><sect1><sect2><title> |
13091 #: ../en/ch11-template.xml:426 | 13091 #: ../en/ch11-template.xml:426 |
13092 msgid "Combining filters" | 13092 msgid "Combining filters" |
13093 msgstr "" | 13093 msgstr "组合过滤器" |
13094 | 13094 |
13095 #. type: Content of: <book><chapter><sect1><sect2><para> | 13095 #. type: Content of: <book><chapter><sect1><sect2><para> |
13096 #: ../en/ch11-template.xml:428 | 13096 #: ../en/ch11-template.xml:428 |
13097 msgid "" | 13097 msgid "" |
13098 "It is easy to combine filters to yield output in the form you would like. " | 13098 "It is easy to combine filters to yield output in the form you would like. " |
13122 msgstr "" | 13122 msgstr "" |
13123 | 13123 |
13124 #. type: Content of: <book><chapter><sect1><title> | 13124 #. type: Content of: <book><chapter><sect1><title> |
13125 #: ../en/ch11-template.xml:454 | 13125 #: ../en/ch11-template.xml:454 |
13126 msgid "From templates to styles" | 13126 msgid "From templates to styles" |
13127 msgstr "" | 13127 msgstr "从模版到样式" |
13128 | 13128 |
13129 #. type: Content of: <book><chapter><sect1><para> | 13129 #. type: Content of: <book><chapter><sect1><para> |
13130 #: ../en/ch11-template.xml:456 | 13130 #: ../en/ch11-template.xml:456 |
13131 msgid "" | 13131 msgid "" |
13132 "A command line template provides a quick and simple way to format some " | 13132 "A command line template provides a quick and simple way to format some " |
13144 msgstr "" | 13144 msgstr "" |
13145 | 13145 |
13146 #. type: Content of: <book><chapter><sect1><sect2><title> | 13146 #. type: Content of: <book><chapter><sect1><sect2><title> |
13147 #: ../en/ch11-template.xml:467 | 13147 #: ../en/ch11-template.xml:467 |
13148 msgid "The simplest of style files" | 13148 msgid "The simplest of style files" |
13149 msgstr "" | 13149 msgstr "最简单的样式文件" |
13150 | 13150 |
13151 #. type: Content of: <book><chapter><sect1><sect2><para> | 13151 #. type: Content of: <book><chapter><sect1><sect2><para> |
13152 #: ../en/ch11-template.xml:469 | 13152 #: ../en/ch11-template.xml:469 |
13153 msgid "Our simple style file contains just one line:" | 13153 msgid "Our simple style file contains just one line:" |
13154 msgstr "" | 13154 msgstr "" |
13161 msgstr "" | 13161 msgstr "" |
13162 | 13162 |
13163 #. type: Content of: <book><chapter><sect1><sect2><title> | 13163 #. type: Content of: <book><chapter><sect1><sect2><title> |
13164 #: ../en/ch11-template.xml:479 | 13164 #: ../en/ch11-template.xml:479 |
13165 msgid "Style file syntax" | 13165 msgid "Style file syntax" |
13166 msgstr "" | 13166 msgstr "样式文件语法" |
13167 | 13167 |
13168 #. type: Content of: <book><chapter><sect1><sect2><para> | 13168 #. type: Content of: <book><chapter><sect1><sect2><para> |
13169 #: ../en/ch11-template.xml:481 | 13169 #: ../en/ch11-template.xml:481 |
13170 msgid "The syntax rules for a style file are simple." | 13170 msgid "The syntax rules for a style file are simple." |
13171 msgstr "" | 13171 msgstr "" |
13225 msgstr "" | 13225 msgstr "" |
13226 | 13226 |
13227 #. type: Content of: <book><chapter><sect1><title> | 13227 #. type: Content of: <book><chapter><sect1><title> |
13228 #: ../en/ch11-template.xml:521 | 13228 #: ../en/ch11-template.xml:521 |
13229 msgid "Style files by example" | 13229 msgid "Style files by example" |
13230 msgstr "" | 13230 msgstr "样式文件例子" |
13231 | 13231 |
13232 #. type: Content of: <book><chapter><sect1><para> | 13232 #. type: Content of: <book><chapter><sect1><para> |
13233 #: ../en/ch11-template.xml:523 | 13233 #: ../en/ch11-template.xml:523 |
13234 msgid "" | 13234 msgid "" |
13235 "To illustrate how to write a style file, we will construct a few by example. " | 13235 "To illustrate how to write a style file, we will construct a few by example. " |
13239 msgstr "" | 13239 msgstr "" |
13240 | 13240 |
13241 #. type: Content of: <book><chapter><sect1><sect2><title> | 13241 #. type: Content of: <book><chapter><sect1><sect2><title> |
13242 #: ../en/ch11-template.xml:530 | 13242 #: ../en/ch11-template.xml:530 |
13243 msgid "Identifying mistakes in style files" | 13243 msgid "Identifying mistakes in style files" |
13244 msgstr "" | 13244 msgstr "在样式文件中定位错误" |
13245 | 13245 |
13246 #. type: Content of: <book><chapter><sect1><sect2><para> | 13246 #. type: Content of: <book><chapter><sect1><sect2><para> |
13247 #: ../en/ch11-template.xml:532 | 13247 #: ../en/ch11-template.xml:532 |
13248 msgid "" | 13248 msgid "" |
13249 "If Mercurial encounters a problem in a style file you are working on, it " | 13249 "If Mercurial encounters a problem in a style file you are working on, it " |
13296 msgstr "" | 13296 msgstr "" |
13297 | 13297 |
13298 #. type: Content of: <book><chapter><sect1><sect2><title> | 13298 #. type: Content of: <book><chapter><sect1><sect2><title> |
13299 #: ../en/ch11-template.xml:578 | 13299 #: ../en/ch11-template.xml:578 |
13300 msgid "Uniquely identifying a repository" | 13300 msgid "Uniquely identifying a repository" |
13301 msgstr "" | 13301 msgstr "版本库的唯一标识" |
13302 | 13302 |
13303 #. type: Content of: <book><chapter><sect1><sect2><para> | 13303 #. type: Content of: <book><chapter><sect1><sect2><para> |
13304 #: ../en/ch11-template.xml:580 | 13304 #: ../en/ch11-template.xml:580 |
13305 msgid "" | 13305 msgid "" |
13306 "If you would like to be able to identify a Mercurial repository <quote>fairly " | 13306 "If you would like to be able to identify a Mercurial repository <quote>fairly " |
13351 msgstr "" | 13351 msgstr "" |
13352 | 13352 |
13353 #. type: Content of: <book><chapter><sect1><sect2><title> | 13353 #. type: Content of: <book><chapter><sect1><sect2><title> |
13354 #: ../en/ch11-template.xml:614 | 13354 #: ../en/ch11-template.xml:614 |
13355 msgid "Mimicking Subversion's output" | 13355 msgid "Mimicking Subversion's output" |
13356 msgstr "" | 13356 msgstr "模仿 Subversion 的输出" |
13357 | 13357 |
13358 # | 13358 # |
13359 #. type: Content of: <book><chapter><sect1><sect2><para> | 13359 #. type: Content of: <book><chapter><sect1><sect2><para> |
13360 #: ../en/ch11-template.xml:616 | 13360 #: ../en/ch11-template.xml:616 |
13361 msgid "" | 13361 msgid "" |
13435 msgstr "使用 MQ 管理修改" | 13435 msgstr "使用 MQ 管理修改" |
13436 | 13436 |
13437 #. type: Content of: <book><chapter><sect1><title> | 13437 #. type: Content of: <book><chapter><sect1><title> |
13438 #: ../en/ch12-mq.xml:8 | 13438 #: ../en/ch12-mq.xml:8 |
13439 msgid "The patch management problem" | 13439 msgid "The patch management problem" |
13440 msgstr "" | 13440 msgstr "补丁的管理问题" |
13441 | 13441 |
13442 #. type: Content of: <book><chapter><sect1><para> | 13442 #. type: Content of: <book><chapter><sect1><para> |
13443 #: ../en/ch12-mq.xml:10 | 13443 #: ../en/ch12-mq.xml:10 |
13444 msgid "" | 13444 msgid "" |
13445 "Here is a common scenario: you need to install a software package from " | 13445 "Here is a common scenario: you need to install a software package from " |
13513 msgstr "" | 13513 msgstr "" |
13514 | 13514 |
13515 #. type: Content of: <book><chapter><sect1><title> | 13515 #. type: Content of: <book><chapter><sect1><title> |
13516 #: ../en/ch12-mq.xml:65 | 13516 #: ../en/ch12-mq.xml:65 |
13517 msgid "The prehistory of Mercurial Queues" | 13517 msgid "The prehistory of Mercurial Queues" |
13518 msgstr "" | 13518 msgstr "MQ 的历史" |
13519 | 13519 |
13520 #. type: Content of: <book><chapter><sect1><para> | 13520 #. type: Content of: <book><chapter><sect1><para> |
13521 #: ../en/ch12-mq.xml:67 | 13521 #: ../en/ch12-mq.xml:67 |
13522 msgid "" | 13522 msgid "" |
13523 "During the late 1990s, several Linux kernel developers started to maintain " | 13523 "During the late 1990s, several Linux kernel developers started to maintain " |
13593 msgstr "" | 13593 msgstr "" |
13594 | 13594 |
13595 #. type: Content of: <book><chapter><sect1><sect2><title> | 13595 #. type: Content of: <book><chapter><sect1><sect2><title> |
13596 #: ../en/ch12-mq.xml:124 | 13596 #: ../en/ch12-mq.xml:124 |
13597 msgid "From patchwork quilt to Mercurial Queues" | 13597 msgid "From patchwork quilt to Mercurial Queues" |
13598 msgstr "" | 13598 msgstr "从 patchwork quilt 到 MQ" |
13599 | 13599 |
13600 #. type: Content of: <book><chapter><sect1><sect2><para> | 13600 #. type: Content of: <book><chapter><sect1><sect2><para> |
13601 #: ../en/ch12-mq.xml:126 | 13601 #: ../en/ch12-mq.xml:126 |
13602 msgid "" | 13602 msgid "" |
13603 "In mid-2005, Chris Mason took the features of quilt and wrote an extension " | 13603 "In mid-2005, Chris Mason took the features of quilt and wrote an extension " |
13623 msgstr "" | 13623 msgstr "" |
13624 | 13624 |
13625 #. type: Content of: <book><chapter><sect1><title> | 13625 #. type: Content of: <book><chapter><sect1><title> |
13626 #: ../en/ch12-mq.xml:144 | 13626 #: ../en/ch12-mq.xml:144 |
13627 msgid "The huge advantage of MQ" | 13627 msgid "The huge advantage of MQ" |
13628 msgstr "" | 13628 msgstr "MQ 的巨大优势" |
13629 | 13629 |
13630 #. type: Content of: <book><chapter><sect1><para> | 13630 #. type: Content of: <book><chapter><sect1><para> |
13631 #: ../en/ch12-mq.xml:146 | 13631 #: ../en/ch12-mq.xml:146 |
13632 msgid "" | 13632 msgid "" |
13633 "I cannot overstate the value that MQ offers through the unification of " | 13633 "I cannot overstate the value that MQ offers through the unification of " |
13681 msgstr "" | 13681 msgstr "" |
13682 | 13682 |
13683 #. type: Content of: <book><chapter><sect1><title> | 13683 #. type: Content of: <book><chapter><sect1><title> |
13684 #: ../en/ch12-mq.xml:187 | 13684 #: ../en/ch12-mq.xml:187 |
13685 msgid "Understanding patches" | 13685 msgid "Understanding patches" |
13686 msgstr "" | 13686 msgstr "理解补丁" |
13687 | 13687 |
13688 #. type: Content of: <book><chapter><sect1><para> | 13688 #. type: Content of: <book><chapter><sect1><para> |
13689 #: ../en/ch12-mq.xml:189 | 13689 #: ../en/ch12-mq.xml:189 |
13690 msgid "" | 13690 msgid "" |
13691 "Because MQ doesn't hide its patch-oriented nature, it is helpful to " | 13691 "Because MQ doesn't hide its patch-oriented nature, it is helpful to " |
13764 msgstr "" | 13764 msgstr "" |
13765 | 13765 |
13766 #. type: Content of: <book><chapter><sect1><title> | 13766 #. type: Content of: <book><chapter><sect1><title> |
13767 #: ../en/ch12-mq.xml:250 | 13767 #: ../en/ch12-mq.xml:250 |
13768 msgid "Getting started with Mercurial Queues" | 13768 msgid "Getting started with Mercurial Queues" |
13769 msgstr "" | 13769 msgstr "开始使用 MQ" |
13770 | 13770 |
13771 #. type: Content of: <book><chapter><sect1><para> | 13771 #. type: Content of: <book><chapter><sect1><para> |
13772 #: ../en/ch12-mq.xml:252 | 13772 #: ../en/ch12-mq.xml:252 |
13773 msgid "" | 13773 msgid "" |
13774 "Because MQ is implemented as an extension, you must explicitly enable before " | 13774 "Because MQ is implemented as an extension, you must explicitly enable before " |
13804 msgstr "" | 13804 msgstr "" |
13805 | 13805 |
13806 #. type: Content of: <book><chapter><sect1><sect2><title> | 13806 #. type: Content of: <book><chapter><sect1><sect2><title> |
13807 #: ../en/ch12-mq.xml:283 | 13807 #: ../en/ch12-mq.xml:283 |
13808 msgid "Creating a new patch" | 13808 msgid "Creating a new patch" |
13809 msgstr "" | 13809 msgstr "创建新补丁" |
13810 | 13810 |
13811 #. type: Content of: <book><chapter><sect1><sect2><para> | 13811 #. type: Content of: <book><chapter><sect1><sect2><para> |
13812 #: ../en/ch12-mq.xml:285 | 13812 #: ../en/ch12-mq.xml:285 |
13813 msgid "" | 13813 msgid "" |
13814 "To begin work on a new patch, use the <command role=\"hg-ext-mq\">qnew</" | 13814 "To begin work on a new patch, use the <command role=\"hg-ext-mq\">qnew</" |
13856 msgstr "" | 13856 msgstr "" |
13857 | 13857 |
13858 #. type: Content of: <book><chapter><sect1><sect2><title> | 13858 #. type: Content of: <book><chapter><sect1><sect2><title> |
13859 #: ../en/ch12-mq.xml:325 | 13859 #: ../en/ch12-mq.xml:325 |
13860 msgid "Refreshing a patch" | 13860 msgid "Refreshing a patch" |
13861 msgstr "" | 13861 msgstr "刷新补丁" |
13862 | 13862 |
13863 #. type: Content of: <book><chapter><sect1><sect2><para> | 13863 #. type: Content of: <book><chapter><sect1><sect2><para> |
13864 #: ../en/ch12-mq.xml:327 | 13864 #: ../en/ch12-mq.xml:327 |
13865 msgid "" | 13865 msgid "" |
13866 "When you reach a point where you want to save your work, use the <command " | 13866 "When you reach a point where you want to save your work, use the <command " |
13886 msgstr "" | 13886 msgstr "" |
13887 | 13887 |
13888 #. type: Content of: <book><chapter><sect1><sect2><title> | 13888 #. type: Content of: <book><chapter><sect1><sect2><title> |
13889 #: ../en/ch12-mq.xml:348 | 13889 #: ../en/ch12-mq.xml:348 |
13890 msgid "Stacking and tracking patches" | 13890 msgid "Stacking and tracking patches" |
13891 msgstr "" | 13891 msgstr "堆叠和跟踪补丁" |
13892 | 13892 |
13893 #. type: Content of: <book><chapter><sect1><sect2><para> | 13893 #. type: Content of: <book><chapter><sect1><sect2><para> |
13894 #: ../en/ch12-mq.xml:350 | 13894 #: ../en/ch12-mq.xml:350 |
13895 msgid "" | 13895 msgid "" |
13896 "Once you have finished working on a patch, or need to work on another, you " | 13896 "Once you have finished working on a patch, or need to work on another, you " |
13933 msgstr "" | 13933 msgstr "" |
13934 | 13934 |
13935 #. type: Content of: <book><chapter><sect1><sect2><title> | 13935 #. type: Content of: <book><chapter><sect1><sect2><title> |
13936 #: ../en/ch12-mq.xml:387 | 13936 #: ../en/ch12-mq.xml:387 |
13937 msgid "Manipulating the patch stack" | 13937 msgid "Manipulating the patch stack" |
13938 msgstr "" | 13938 msgstr "操作补丁堆栈" |
13939 | 13939 |
13940 #. type: Content of: <book><chapter><sect1><sect2><para> | 13940 #. type: Content of: <book><chapter><sect1><sect2><para> |
13941 #: ../en/ch12-mq.xml:389 | 13941 #: ../en/ch12-mq.xml:389 |
13942 msgid "" | 13942 msgid "" |
13943 "The previous discussion implied that there must be a difference between " | 13943 "The previous discussion implied that there must be a difference between " |
13987 msgstr "" | 13987 msgstr "" |
13988 | 13988 |
13989 #. type: Content of: <book><chapter><sect1><sect2><title> | 13989 #. type: Content of: <book><chapter><sect1><sect2><title> |
13990 #: ../en/ch12-mq.xml:431 | 13990 #: ../en/ch12-mq.xml:431 |
13991 msgid "Pushing and popping many patches" | 13991 msgid "Pushing and popping many patches" |
13992 msgstr "" | 13992 msgstr "压入或弹出多个补丁" |
13993 | 13993 |
13994 #. type: Content of: <book><chapter><sect1><sect2><para> | 13994 #. type: Content of: <book><chapter><sect1><sect2><para> |
13995 #: ../en/ch12-mq.xml:433 | 13995 #: ../en/ch12-mq.xml:433 |
13996 msgid "" | 13996 msgid "" |
13997 "While <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-" | 13997 "While <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-" |
14005 msgstr "" | 14005 msgstr "" |
14006 | 14006 |
14007 #. type: Content of: <book><chapter><sect1><sect2><title> | 14007 #. type: Content of: <book><chapter><sect1><sect2><title> |
14008 #: ../en/ch12-mq.xml:450 | 14008 #: ../en/ch12-mq.xml:450 |
14009 msgid "Safety checks, and overriding them" | 14009 msgid "Safety checks, and overriding them" |
14010 msgstr "" | 14010 msgstr "安全的检查,然后覆盖它们" |
14011 | 14011 |
14012 #. type: Content of: <book><chapter><sect1><sect2><para> | 14012 #. type: Content of: <book><chapter><sect1><sect2><para> |
14013 #: ../en/ch12-mq.xml:452 | 14013 #: ../en/ch12-mq.xml:452 |
14014 msgid "" | 14014 msgid "" |
14015 "Several MQ commands check the working directory before they do anything, and " | 14015 "Several MQ commands check the working directory before they do anything, and " |
14036 msgstr "" | 14036 msgstr "" |
14037 | 14037 |
14038 #. type: Content of: <book><chapter><sect1><sect2><title> | 14038 #. type: Content of: <book><chapter><sect1><sect2><title> |
14039 #: ../en/ch12-mq.xml:479 | 14039 #: ../en/ch12-mq.xml:479 |
14040 msgid "Working on several patches at once" | 14040 msgid "Working on several patches at once" |
14041 msgstr "" | 14041 msgstr "同时处理多个补丁" |
14042 | 14042 |
14043 #. type: Content of: <book><chapter><sect1><sect2><para> | 14043 #. type: Content of: <book><chapter><sect1><sect2><para> |
14044 #: ../en/ch12-mq.xml:481 | 14044 #: ../en/ch12-mq.xml:481 |
14045 msgid "" | 14045 msgid "" |
14046 "The <command role=\"hg-ext-mq\">qrefresh</command> command always refreshes " | 14046 "The <command role=\"hg-ext-mq\">qrefresh</command> command always refreshes " |
14066 msgstr "" | 14066 msgstr "" |
14067 | 14067 |
14068 #. type: Content of: <book><chapter><sect1><title> | 14068 #. type: Content of: <book><chapter><sect1><title> |
14069 #: ../en/ch12-mq.xml:505 | 14069 #: ../en/ch12-mq.xml:505 |
14070 msgid "More about patches" | 14070 msgid "More about patches" |
14071 msgstr "" | 14071 msgstr "关于补丁的更多信息" |
14072 | 14072 |
14073 #. type: Content of: <book><chapter><sect1><para> | 14073 #. type: Content of: <book><chapter><sect1><para> |
14074 #: ../en/ch12-mq.xml:507 | 14074 #: ../en/ch12-mq.xml:507 |
14075 msgid "" | 14075 msgid "" |
14076 "MQ uses the GNU <command>patch</command> command to apply patches, so it's " | 14076 "MQ uses the GNU <command>patch</command> command to apply patches, so it's " |
14079 msgstr "" | 14079 msgstr "" |
14080 | 14080 |
14081 #. type: Content of: <book><chapter><sect1><sect2><title> | 14081 #. type: Content of: <book><chapter><sect1><sect2><title> |
14082 #: ../en/ch12-mq.xml:513 | 14082 #: ../en/ch12-mq.xml:513 |
14083 msgid "The strip count" | 14083 msgid "The strip count" |
14084 msgstr "" | 14084 msgstr "修剪计数" |
14085 | 14085 |
14086 #. type: Content of: <book><chapter><sect1><sect2><para> | 14086 #. type: Content of: <book><chapter><sect1><sect2><para> |
14087 #: ../en/ch12-mq.xml:515 | 14087 #: ../en/ch12-mq.xml:515 |
14088 msgid "" | 14088 msgid "" |
14089 "If you look at the file headers in a patch, you will notice that the " | 14089 "If you look at the file headers in a patch, you will notice that the " |
14160 msgstr "" | 14160 msgstr "" |
14161 | 14161 |
14162 #. type: Content of: <book><chapter><sect1><sect2><title> | 14162 #. type: Content of: <book><chapter><sect1><sect2><title> |
14163 #: ../en/ch12-mq.xml:583 | 14163 #: ../en/ch12-mq.xml:583 |
14164 msgid "Strategies for applying a patch" | 14164 msgid "Strategies for applying a patch" |
14165 msgstr "" | 14165 msgstr "应用补丁的策略" |
14166 | 14166 |
14167 #. type: Content of: <book><chapter><sect1><sect2><para> | 14167 #. type: Content of: <book><chapter><sect1><sect2><para> |
14168 #: ../en/ch12-mq.xml:585 | 14168 #: ../en/ch12-mq.xml:585 |
14169 msgid "" | 14169 msgid "" |
14170 "When <command>patch</command> applies a hunk, it tries a handful of " | 14170 "When <command>patch</command> applies a hunk, it tries a handful of " |
14214 msgstr "" | 14214 msgstr "" |
14215 | 14215 |
14216 #. type: Content of: <book><chapter><sect1><sect2><title> | 14216 #. type: Content of: <book><chapter><sect1><sect2><title> |
14217 #: ../en/ch12-mq.xml:628 | 14217 #: ../en/ch12-mq.xml:628 |
14218 msgid "Some quirks of patch representation" | 14218 msgid "Some quirks of patch representation" |
14219 msgstr "" | 14219 msgstr "补丁的一些特性" |
14220 | 14220 |
14221 #. type: Content of: <book><chapter><sect1><sect2><para> | 14221 #. type: Content of: <book><chapter><sect1><sect2><para> |
14222 #: ../en/ch12-mq.xml:630 | 14222 #: ../en/ch12-mq.xml:630 |
14223 msgid "" | 14223 msgid "" |
14224 "There are a few useful things to know about how <command>patch</command> " | 14224 "There are a few useful things to know about how <command>patch</command> " |
14274 msgstr "" | 14274 msgstr "" |
14275 | 14275 |
14276 #. type: Content of: <book><chapter><sect1><sect2><title> | 14276 #. type: Content of: <book><chapter><sect1><sect2><title> |
14277 #: ../en/ch12-mq.xml:666 | 14277 #: ../en/ch12-mq.xml:666 |
14278 msgid "Beware the fuzz" | 14278 msgid "Beware the fuzz" |
14279 msgstr "" | 14279 msgstr "当心毛刺" |
14280 | 14280 |
14281 #. type: Content of: <book><chapter><sect1><sect2><para> | 14281 #. type: Content of: <book><chapter><sect1><sect2><para> |
14282 #: ../en/ch12-mq.xml:668 | 14282 #: ../en/ch12-mq.xml:668 |
14283 msgid "" | 14283 msgid "" |
14284 "While applying a hunk at an offset, or with a fuzz factor, will often be " | 14284 "While applying a hunk at an offset, or with a fuzz factor, will often be " |
14304 msgstr "" | 14304 msgstr "" |
14305 | 14305 |
14306 #. type: Content of: <book><chapter><sect1><sect2><title> | 14306 #. type: Content of: <book><chapter><sect1><sect2><title> |
14307 #: ../en/ch12-mq.xml:691 | 14307 #: ../en/ch12-mq.xml:691 |
14308 msgid "Handling rejection" | 14308 msgid "Handling rejection" |
14309 msgstr "" | 14309 msgstr "处理拒绝" |
14310 | 14310 |
14311 #. type: Content of: <book><chapter><sect1><sect2><para> | 14311 #. type: Content of: <book><chapter><sect1><sect2><para> |
14312 #: ../en/ch12-mq.xml:693 | 14312 #: ../en/ch12-mq.xml:693 |
14313 msgid "" | 14313 msgid "" |
14314 "If <command role=\"hg-ext-mq\">qpush</command> fails to apply a patch, it " | 14314 "If <command role=\"hg-ext-mq\">qpush</command> fails to apply a patch, it " |
14388 msgstr "" | 14388 msgstr "" |
14389 | 14389 |
14390 #. type: Content of: <book><chapter><sect1><title> | 14390 #. type: Content of: <book><chapter><sect1><title> |
14391 #: ../en/ch12-mq.xml:751 | 14391 #: ../en/ch12-mq.xml:751 |
14392 msgid "Getting the best performance out of MQ" | 14392 msgid "Getting the best performance out of MQ" |
14393 msgstr "" | 14393 msgstr "MQ 的性能" |
14394 | 14394 |
14395 #. type: Content of: <book><chapter><sect1><para> | 14395 #. type: Content of: <book><chapter><sect1><para> |
14396 #: ../en/ch12-mq.xml:753 | 14396 #: ../en/ch12-mq.xml:753 |
14397 msgid "" | 14397 msgid "" |
14398 "MQ is very efficient at handling a large number of patches. I ran some " | 14398 "MQ is very efficient at handling a large number of patches. I ran some " |
14455 msgstr "" | 14455 msgstr "" |
14456 | 14456 |
14457 #. type: Content of: <book><chapter><sect1><title> | 14457 #. type: Content of: <book><chapter><sect1><title> |
14458 #: ../en/ch12-mq.xml:805 | 14458 #: ../en/ch12-mq.xml:805 |
14459 msgid "Updating your patches when the underlying code changes" | 14459 msgid "Updating your patches when the underlying code changes" |
14460 msgstr "" | 14460 msgstr "当基础代码改变时,更新补丁的方法" |
14461 | 14461 |
14462 #. type: Content of: <book><chapter><sect1><para> | 14462 #. type: Content of: <book><chapter><sect1><para> |
14463 #: ../en/ch12-mq.xml:808 | 14463 #: ../en/ch12-mq.xml:808 |
14464 msgid "" | 14464 msgid "" |
14465 "It's common to have a stack of patches on top of an underlying repository " | 14465 "It's common to have a stack of patches on top of an underlying repository " |
14588 msgstr "" | 14588 msgstr "" |
14589 | 14589 |
14590 #. type: Content of: <book><chapter><sect1><title> | 14590 #. type: Content of: <book><chapter><sect1><title> |
14591 #: ../en/ch12-mq.xml:907 | 14591 #: ../en/ch12-mq.xml:907 |
14592 msgid "Identifying patches" | 14592 msgid "Identifying patches" |
14593 msgstr "" | 14593 msgstr "标识补丁" |
14594 | 14594 |
14595 #. type: Content of: <book><chapter><sect1><para> | 14595 #. type: Content of: <book><chapter><sect1><para> |
14596 #: ../en/ch12-mq.xml:909 | 14596 #: ../en/ch12-mq.xml:909 |
14597 msgid "" | 14597 msgid "" |
14598 "MQ commands that work with patches let you refer to a patch either by using " | 14598 "MQ commands that work with patches let you refer to a patch either by using " |
14684 msgstr "" | 14684 msgstr "" |
14685 | 14685 |
14686 #. type: Content of: <book><chapter><sect1><title> | 14686 #. type: Content of: <book><chapter><sect1><title> |
14687 #: ../en/ch12-mq.xml:977 | 14687 #: ../en/ch12-mq.xml:977 |
14688 msgid "Useful things to know about" | 14688 msgid "Useful things to know about" |
14689 msgstr "" | 14689 msgstr "其它需要了解的东西" |
14690 | 14690 |
14691 #. type: Content of: <book><chapter><sect1><para> | 14691 #. type: Content of: <book><chapter><sect1><para> |
14692 #: ../en/ch12-mq.xml:979 | 14692 #: ../en/ch12-mq.xml:979 |
14693 msgid "" | 14693 msgid "" |
14694 "There are a number of aspects of MQ usage that don't fit tidily into sections " | 14694 "There are a number of aspects of MQ usage that don't fit tidily into sections " |
14717 msgstr "" | 14717 msgstr "" |
14718 | 14718 |
14719 #. type: Content of: <book><chapter><sect1><title> | 14719 #. type: Content of: <book><chapter><sect1><title> |
14720 #: ../en/ch12-mq.xml:1004 | 14720 #: ../en/ch12-mq.xml:1004 |
14721 msgid "Managing patches in a repository" | 14721 msgid "Managing patches in a repository" |
14722 msgstr "" | 14722 msgstr "在版本库管理补丁" |
14723 | 14723 |
14724 #. type: Content of: <book><chapter><sect1><para> | 14724 #. type: Content of: <book><chapter><sect1><para> |
14725 #: ../en/ch12-mq.xml:1006 | 14725 #: ../en/ch12-mq.xml:1006 |
14726 msgid "" | 14726 msgid "" |
14727 "Because MQ's <filename role=\"special\" class=\"directory\">.hg/patches</" | 14727 "Because MQ's <filename role=\"special\" class=\"directory\">.hg/patches</" |
14762 msgstr "" | 14762 msgstr "" |
14763 | 14763 |
14764 #. type: Content of: <book><chapter><sect1><sect2><title> | 14764 #. type: Content of: <book><chapter><sect1><sect2><title> |
14765 #: ../en/ch12-mq.xml:1037 | 14765 #: ../en/ch12-mq.xml:1037 |
14766 msgid "MQ support for patch repositories" | 14766 msgid "MQ support for patch repositories" |
14767 msgstr "" | 14767 msgstr "MQ 支持补丁版本库" |
14768 | 14768 |
14769 #. type: Content of: <book><chapter><sect1><sect2><para> | 14769 #. type: Content of: <book><chapter><sect1><sect2><para> |
14770 #: ../en/ch12-mq.xml:1039 | 14770 #: ../en/ch12-mq.xml:1039 |
14771 msgid "" | 14771 msgid "" |
14772 "MQ helps you to work with the <filename role=\"special\" class=\"directory\">." | 14772 "MQ helps you to work with the <filename role=\"special\" class=\"directory\">." |
14831 msgstr "" | 14831 msgstr "" |
14832 | 14832 |
14833 #. type: Content of: <book><chapter><sect1><sect2><title> | 14833 #. type: Content of: <book><chapter><sect1><sect2><title> |
14834 #: ../en/ch12-mq.xml:1091 | 14834 #: ../en/ch12-mq.xml:1091 |
14835 msgid "A few things to watch out for" | 14835 msgid "A few things to watch out for" |
14836 msgstr "" | 14836 msgstr "需要注意的事情" |
14837 | 14837 |
14838 #. type: Content of: <book><chapter><sect1><sect2><para> | 14838 #. type: Content of: <book><chapter><sect1><sect2><para> |
14839 #: ../en/ch12-mq.xml:1093 | 14839 #: ../en/ch12-mq.xml:1093 |
14840 msgid "" | 14840 msgid "" |
14841 "MQ's support for working with a repository full of patches is limited in a " | 14841 "MQ's support for working with a repository full of patches is limited in a " |
14857 msgstr "" | 14857 msgstr "" |
14858 | 14858 |
14859 #. type: Content of: <book><chapter><sect1><title> | 14859 #. type: Content of: <book><chapter><sect1><title> |
14860 #: ../en/ch12-mq.xml:1112 | 14860 #: ../en/ch12-mq.xml:1112 |
14861 msgid "Third party tools for working with patches" | 14861 msgid "Third party tools for working with patches" |
14862 msgstr "" | 14862 msgstr "操作补丁的第三方工具" |
14863 | 14863 |
14864 #. type: Content of: <book><chapter><sect1><para> | 14864 #. type: Content of: <book><chapter><sect1><para> |
14865 #: ../en/ch12-mq.xml:1114 | 14865 #: ../en/ch12-mq.xml:1114 |
14866 msgid "" | 14866 msgid "" |
14867 "Once you've been working with patches for a while, you'll find yourself " | 14867 "Once you've been working with patches for a while, you'll find yourself " |
14898 msgstr "" | 14898 msgstr "" |
14899 | 14899 |
14900 #. type: Content of: <book><chapter><sect1><title> | 14900 #. type: Content of: <book><chapter><sect1><title> |
14901 #: ../en/ch12-mq.xml:1148 | 14901 #: ../en/ch12-mq.xml:1148 |
14902 msgid "Good ways to work with patches" | 14902 msgid "Good ways to work with patches" |
14903 msgstr "" | 14903 msgstr "操作补丁的好习惯" |
14904 | 14904 |
14905 #. type: Content of: <book><chapter><sect1><para> | 14905 #. type: Content of: <book><chapter><sect1><para> |
14906 #: ../en/ch12-mq.xml:1150 | 14906 #: ../en/ch12-mq.xml:1150 |
14907 msgid "" | 14907 msgid "" |
14908 "Whether you are working on a patch series to submit to a free software or " | 14908 "Whether you are working on a patch series to submit to a free software or " |
14950 msgstr "" | 14950 msgstr "" |
14951 | 14951 |
14952 #. type: Content of: <book><chapter><sect1><title> | 14952 #. type: Content of: <book><chapter><sect1><title> |
14953 #: ../en/ch12-mq.xml:1189 | 14953 #: ../en/ch12-mq.xml:1189 |
14954 msgid "MQ cookbook" | 14954 msgid "MQ cookbook" |
14955 msgstr "" | 14955 msgstr "MQ 手册" |
14956 | 14956 |
14957 #. type: Content of: <book><chapter><sect1><sect2><title> | 14957 #. type: Content of: <book><chapter><sect1><sect2><title> |
14958 #: ../en/ch12-mq.xml:1192 | 14958 #: ../en/ch12-mq.xml:1192 |
14959 msgid "Manage <quote>trivial</quote> patches" | 14959 msgid "Manage <quote>trivial</quote> patches" |
14960 msgstr "" | 14960 msgstr "管理<quote>琐碎的</quote>补丁" |
14961 | 14961 |
14962 #. type: Content of: <book><chapter><sect1><sect2><para> | 14962 #. type: Content of: <book><chapter><sect1><sect2><para> |
14963 #: ../en/ch12-mq.xml:1194 | 14963 #: ../en/ch12-mq.xml:1194 |
14964 msgid "" | 14964 msgid "" |
14965 "Because the overhead of dropping files into a new Mercurial repository is so " | 14965 "Because the overhead of dropping files into a new Mercurial repository is so " |
15003 msgstr "" | 15003 msgstr "" |
15004 | 15004 |
15005 #. type: Content of: <book><chapter><sect1><sect2><title> | 15005 #. type: Content of: <book><chapter><sect1><sect2><title> |
15006 #: ../en/ch12-mq.xml:1230 | 15006 #: ../en/ch12-mq.xml:1230 |
15007 msgid "Combining entire patches" | 15007 msgid "Combining entire patches" |
15008 msgstr "" | 15008 msgstr "组合全部的补丁" |
15009 | 15009 |
15010 #. type: Content of: <book><chapter><sect1><sect2><para> | 15010 #. type: Content of: <book><chapter><sect1><sect2><para> |
15011 #: ../en/ch12-mq.xml:1232 | 15011 #: ../en/ch12-mq.xml:1232 |
15012 msgid "" | 15012 msgid "" |
15013 "MQ provides a command, <command role=\"hg-ext-mq\">qfold</command> that lets " | 15013 "MQ provides a command, <command role=\"hg-ext-mq\">qfold</command> that lets " |
15029 msgstr "" | 15029 msgstr "" |
15030 | 15030 |
15031 #. type: Content of: <book><chapter><sect1><sect2><title> | 15031 #. type: Content of: <book><chapter><sect1><sect2><title> |
15032 #: ../en/ch12-mq.xml:1251 | 15032 #: ../en/ch12-mq.xml:1251 |
15033 msgid "Merging part of one patch into another" | 15033 msgid "Merging part of one patch into another" |
15034 msgstr "" | 15034 msgstr "合并补丁的部分内容到其它补丁" |
15035 | 15035 |
15036 #. type: Content of: <book><chapter><sect1><sect2><para> | 15036 #. type: Content of: <book><chapter><sect1><sect2><para> |
15037 #: ../en/ch12-mq.xml:1253 | 15037 #: ../en/ch12-mq.xml:1253 |
15038 msgid "" | 15038 msgid "" |
15039 "Merging <emphasis>part</emphasis> of one patch into another is more difficult " | 15039 "Merging <emphasis>part</emphasis> of one patch into another is more difficult " |
15107 msgstr "" | 15107 msgstr "" |
15108 | 15108 |
15109 #. type: Content of: <book><chapter><sect1><title> | 15109 #. type: Content of: <book><chapter><sect1><title> |
15110 #: ../en/ch12-mq.xml:1307 | 15110 #: ../en/ch12-mq.xml:1307 |
15111 msgid "Differences between quilt and MQ" | 15111 msgid "Differences between quilt and MQ" |
15112 msgstr "" | 15112 msgstr "MQ 与 quilt 的区别" |
15113 | 15113 |
15114 #. type: Content of: <book><chapter><sect1><para> | 15114 #. type: Content of: <book><chapter><sect1><para> |
15115 #: ../en/ch12-mq.xml:1309 | 15115 #: ../en/ch12-mq.xml:1309 |
15116 msgid "" | 15116 msgid "" |
15117 "If you are already familiar with quilt, MQ provides a similar command set. " | 15117 "If you are already familiar with quilt, MQ provides a similar command set. " |
15162 msgstr "" | 15162 msgstr "" |
15163 | 15163 |
15164 #. type: Content of: <book><chapter><sect1><title> | 15164 #. type: Content of: <book><chapter><sect1><title> |
15165 #: ../en/ch13-mq-collab.xml:24 | 15165 #: ../en/ch13-mq-collab.xml:24 |
15166 msgid "The problem of many targets" | 15166 msgid "The problem of many targets" |
15167 msgstr "" | 15167 msgstr "多个目标的问题" |
15168 | 15168 |
15169 #. type: Content of: <book><chapter><sect1><para> | 15169 #. type: Content of: <book><chapter><sect1><para> |
15170 #: ../en/ch13-mq-collab.xml:26 | 15170 #: ../en/ch13-mq-collab.xml:26 |
15171 msgid "" | 15171 msgid "" |
15172 "The Linux kernel changes rapidly, and has never been internally stable; " | 15172 "The Linux kernel changes rapidly, and has never been internally stable; " |
15213 msgstr "" | 15213 msgstr "" |
15214 | 15214 |
15215 #. type: Content of: <book><chapter><sect1><sect2><title> | 15215 #. type: Content of: <book><chapter><sect1><sect2><title> |
15216 #: ../en/ch13-mq-collab.xml:58 | 15216 #: ../en/ch13-mq-collab.xml:58 |
15217 msgid "Tempting approaches that don't work well" | 15217 msgid "Tempting approaches that don't work well" |
15218 msgstr "" | 15218 msgstr "工作不好的诱人方法" |
15219 | 15219 |
15220 #. type: Content of: <book><chapter><sect1><sect2><para> | 15220 #. type: Content of: <book><chapter><sect1><sect2><para> |
15221 #: ../en/ch13-mq-collab.xml:60 | 15221 #: ../en/ch13-mq-collab.xml:60 |
15222 msgid "" | 15222 msgid "" |
15223 "There are two <quote>standard</quote> ways to maintain a piece of software " | 15223 "There are two <quote>standard</quote> ways to maintain a piece of software " |
15276 msgstr "" | 15276 msgstr "" |
15277 | 15277 |
15278 #. type: Content of: <book><chapter><sect1><title> | 15278 #. type: Content of: <book><chapter><sect1><title> |
15279 #: ../en/ch13-mq-collab.xml:105 | 15279 #: ../en/ch13-mq-collab.xml:105 |
15280 msgid "Conditionally applying patches with guards" | 15280 msgid "Conditionally applying patches with guards" |
15281 msgstr "" | 15281 msgstr "有条件的应用补丁" |
15282 | 15282 |
15283 #. type: Content of: <book><chapter><sect1><para> | 15283 #. type: Content of: <book><chapter><sect1><para> |
15284 #: ../en/ch13-mq-collab.xml:107 | 15284 #: ../en/ch13-mq-collab.xml:107 |
15285 msgid "" | 15285 msgid "" |
15286 "Perhaps the best way to maintain sanity with so many targets is to be able to " | 15286 "Perhaps the best way to maintain sanity with so many targets is to be able to " |
15317 msgstr "" | 15317 msgstr "" |
15318 | 15318 |
15319 #. type: Content of: <book><chapter><sect1><title> | 15319 #. type: Content of: <book><chapter><sect1><title> |
15320 #: ../en/ch13-mq-collab.xml:135 | 15320 #: ../en/ch13-mq-collab.xml:135 |
15321 msgid "Controlling the guards on a patch" | 15321 msgid "Controlling the guards on a patch" |
15322 msgstr "" | 15322 msgstr "控制补丁的应用条件" |
15323 | 15323 |
15324 #. type: Content of: <book><chapter><sect1><para> | 15324 #. type: Content of: <book><chapter><sect1><para> |
15325 #: ../en/ch13-mq-collab.xml:137 | 15325 #: ../en/ch13-mq-collab.xml:137 |
15326 msgid "" | 15326 msgid "" |
15327 "The <command role=\"hg-ext-mq\">qguard</command> command lets you determine " | 15327 "The <command role=\"hg-ext-mq\">qguard</command> command lets you determine " |
15367 msgstr "" | 15367 msgstr "" |
15368 | 15368 |
15369 #. type: Content of: <book><chapter><sect1><title> | 15369 #. type: Content of: <book><chapter><sect1><title> |
15370 #: ../en/ch13-mq-collab.xml:177 | 15370 #: ../en/ch13-mq-collab.xml:177 |
15371 msgid "Selecting the guards to use" | 15371 msgid "Selecting the guards to use" |
15372 msgstr "" | 15372 msgstr "选择使用的条件" |
15373 | 15373 |
15374 #. type: Content of: <book><chapter><sect1><para> | 15374 #. type: Content of: <book><chapter><sect1><para> |
15375 #: ../en/ch13-mq-collab.xml:179 | 15375 #: ../en/ch13-mq-collab.xml:179 |
15376 msgid "" | 15376 msgid "" |
15377 "The <command role=\"hg-ext-mq\">qselect</command> command determines which " | 15377 "The <command role=\"hg-ext-mq\">qselect</command> command determines which " |
15425 msgstr "" | 15425 msgstr "" |
15426 | 15426 |
15427 #. type: Content of: <book><chapter><sect1><title> | 15427 #. type: Content of: <book><chapter><sect1><title> |
15428 #: ../en/ch13-mq-collab.xml:224 | 15428 #: ../en/ch13-mq-collab.xml:224 |
15429 msgid "MQ's rules for applying patches" | 15429 msgid "MQ's rules for applying patches" |
15430 msgstr "" | 15430 msgstr "MQ 应用补丁的规则" |
15431 | 15431 |
15432 #. type: Content of: <book><chapter><sect1><para> | 15432 #. type: Content of: <book><chapter><sect1><para> |
15433 #: ../en/ch13-mq-collab.xml:226 | 15433 #: ../en/ch13-mq-collab.xml:226 |
15434 msgid "" | 15434 msgid "" |
15435 "The rules that MQ uses when deciding whether to apply a patch are as follows." | 15435 "The rules that MQ uses when deciding whether to apply a patch are as follows." |
15462 msgstr "" | 15462 msgstr "" |
15463 | 15463 |
15464 #. type: Content of: <book><chapter><sect1><title> | 15464 #. type: Content of: <book><chapter><sect1><title> |
15465 #: ../en/ch13-mq-collab.xml:245 | 15465 #: ../en/ch13-mq-collab.xml:245 |
15466 msgid "Trimming the work environment" | 15466 msgid "Trimming the work environment" |
15467 msgstr "" | 15467 msgstr "修剪工作环境" |
15468 | 15468 |
15469 #. type: Content of: <book><chapter><sect1><para> | 15469 #. type: Content of: <book><chapter><sect1><para> |
15470 #: ../en/ch13-mq-collab.xml:247 | 15470 #: ../en/ch13-mq-collab.xml:247 |
15471 msgid "" | 15471 msgid "" |
15472 "In working on the device driver I mentioned earlier, I don't apply the " | 15472 "In working on the device driver I mentioned earlier, I don't apply the " |
15497 msgstr "" | 15497 msgstr "" |
15498 | 15498 |
15499 #. type: Content of: <book><chapter><sect1><title> | 15499 #. type: Content of: <book><chapter><sect1><title> |
15500 #: ../en/ch13-mq-collab.xml:270 | 15500 #: ../en/ch13-mq-collab.xml:270 |
15501 msgid "Dividing up the <filename role=\"special\">series</filename> file" | 15501 msgid "Dividing up the <filename role=\"special\">series</filename> file" |
15502 msgstr "" | 15502 msgstr "分类补丁<filename role=\"special\">系列</filename>" |
15503 | 15503 |
15504 #. type: Content of: <book><chapter><sect1><para> | 15504 #. type: Content of: <book><chapter><sect1><para> |
15505 #: ../en/ch13-mq-collab.xml:273 | 15505 #: ../en/ch13-mq-collab.xml:273 |
15506 msgid "" | 15506 msgid "" |
15507 "I categorise the patches in the <filename role=\"special\">series</filename> " | 15507 "I categorise the patches in the <filename role=\"special\">series</filename> " |
15598 msgstr "" | 15598 msgstr "" |
15599 | 15599 |
15600 #. type: Content of: <book><chapter><sect1><title> | 15600 #. type: Content of: <book><chapter><sect1><title> |
15601 #: ../en/ch13-mq-collab.xml:343 | 15601 #: ../en/ch13-mq-collab.xml:343 |
15602 msgid "Maintaining the patch series" | 15602 msgid "Maintaining the patch series" |
15603 msgstr "" | 15603 msgstr "维护补丁系列" |
15604 | 15604 |
15605 #. type: Content of: <book><chapter><sect1><para> | 15605 #. type: Content of: <book><chapter><sect1><para> |
15606 #: ../en/ch13-mq-collab.xml:345 | 15606 #: ../en/ch13-mq-collab.xml:345 |
15607 msgid "" | 15607 msgid "" |
15608 "In my work, I use a number of guards to control which patches are to be " | 15608 "In my work, I use a number of guards to control which patches are to be " |
15658 msgstr "" | 15658 msgstr "" |
15659 | 15659 |
15660 #. type: Content of: <book><chapter><sect1><sect2><title> | 15660 #. type: Content of: <book><chapter><sect1><sect2><title> |
15661 #: ../en/ch13-mq-collab.xml:381 | 15661 #: ../en/ch13-mq-collab.xml:381 |
15662 msgid "The art of writing backport patches" | 15662 msgid "The art of writing backport patches" |
15663 msgstr "" | 15663 msgstr "编写向后移植补丁的艺术" |
15664 | 15664 |
15665 #. type: Content of: <book><chapter><sect1><sect2><para> | 15665 #. type: Content of: <book><chapter><sect1><sect2><para> |
15666 #: ../en/ch13-mq-collab.xml:383 | 15666 #: ../en/ch13-mq-collab.xml:383 |
15667 msgid "" | 15667 msgid "" |
15668 "Using MQ, writing a backport patch is a simple process. All such a patch has " | 15668 "Using MQ, writing a backport patch is a simple process. All such a patch has " |
15699 msgstr "" | 15699 msgstr "" |
15700 | 15700 |
15701 #. type: Content of: <book><chapter><sect1><title> | 15701 #. type: Content of: <book><chapter><sect1><title> |
15702 #: ../en/ch13-mq-collab.xml:417 | 15702 #: ../en/ch13-mq-collab.xml:417 |
15703 msgid "Useful tips for developing with MQ" | 15703 msgid "Useful tips for developing with MQ" |
15704 msgstr "" | 15704 msgstr "使用 MQ 开发的技巧" |
15705 | 15705 |
15706 #. type: Content of: <book><chapter><sect1><sect2><title> | 15706 #. type: Content of: <book><chapter><sect1><sect2><title> |
15707 #: ../en/ch13-mq-collab.xml:420 | 15707 #: ../en/ch13-mq-collab.xml:420 |
15708 msgid "Organising patches in directories" | 15708 msgid "Organising patches in directories" |
15709 msgstr "" | 15709 msgstr "将补丁放到几个目录中" |
15710 | 15710 |
15711 #. type: Content of: <book><chapter><sect1><sect2><para> | 15711 #. type: Content of: <book><chapter><sect1><sect2><para> |
15712 #: ../en/ch13-mq-collab.xml:422 | 15712 #: ../en/ch13-mq-collab.xml:422 |
15713 msgid "" | 15713 msgid "" |
15714 "If you're working on a substantial project with MQ, it's not difficult to " | 15714 "If you're working on a substantial project with MQ, it's not difficult to " |
15725 msgstr "" | 15725 msgstr "" |
15726 | 15726 |
15727 #. type: Content of: <book><chapter><sect1><sect2><title> | 15727 #. type: Content of: <book><chapter><sect1><sect2><title> |
15728 #: ../en/ch13-mq-collab.xml:434 | 15728 #: ../en/ch13-mq-collab.xml:434 |
15729 msgid "Viewing the history of a patch" | 15729 msgid "Viewing the history of a patch" |
15730 msgstr "" | 15730 msgstr "察看补丁的历史" |
15731 | 15731 |
15732 #. type: Content of: <book><chapter><sect1><sect2><para> | 15732 #. type: Content of: <book><chapter><sect1><sect2><para> |
15733 #: ../en/ch13-mq-collab.xml:436 | 15733 #: ../en/ch13-mq-collab.xml:436 |
15734 msgid "" | 15734 msgid "" |
15735 "If you're developing a set of patches over a long time, it's a good idea to " | 15735 "If you're developing a set of patches over a long time, it's a good idea to " |
15893 #. type: Content of: <book><chapter><sect1><title> | 15893 #. type: Content of: <book><chapter><sect1><title> |
15894 #: ../en/ch14-hgext.xml:55 | 15894 #: ../en/ch14-hgext.xml:55 |
15895 msgid "" | 15895 msgid "" |
15896 "Improve performance with the <literal role=\"hg-ext\">inotify</literal> " | 15896 "Improve performance with the <literal role=\"hg-ext\">inotify</literal> " |
15897 "extension" | 15897 "extension" |
15898 msgstr "" | 15898 msgstr "使用扩展 <literal role=\"hg-ext\">inotify</literal> 以提高性能" |
15899 | 15899 |
15900 #. type: Content of: <book><chapter><sect1><para> | 15900 #. type: Content of: <book><chapter><sect1><para> |
15901 #: ../en/ch14-hgext.xml:58 | 15901 #: ../en/ch14-hgext.xml:58 |
15902 msgid "" | 15902 msgid "" |
15903 "Are you interested in having some of the most common Mercurial operations run " | 15903 "Are you interested in having some of the most common Mercurial operations run " |
16160 #. type: Content of: <book><chapter><sect1><title> | 16160 #. type: Content of: <book><chapter><sect1><title> |
16161 #: ../en/ch14-hgext.xml:267 | 16161 #: ../en/ch14-hgext.xml:267 |
16162 msgid "" | 16162 msgid "" |
16163 "Flexible diff support with the <literal role=\"hg-ext\">extdiff</literal> " | 16163 "Flexible diff support with the <literal role=\"hg-ext\">extdiff</literal> " |
16164 "extension" | 16164 "extension" |
16165 msgstr "" | 16165 msgstr "使用扩展 <literal role=\"hg-ext\">extdiff</literal> 以扩展差异支持" |
16166 | 16166 |
16167 #. type: Content of: <book><chapter><sect1><para> | 16167 #. type: Content of: <book><chapter><sect1><para> |
16168 #: ../en/ch14-hgext.xml:270 | 16168 #: ../en/ch14-hgext.xml:270 |
16169 msgid "" | 16169 msgid "" |
16170 "Mercurial's built-in <command role=\"hg-cmd\">hg diff</command> command " | 16170 "Mercurial's built-in <command role=\"hg-cmd\">hg diff</command> command " |
16284 msgstr "" | 16284 msgstr "" |
16285 | 16285 |
16286 #. type: Content of: <book><chapter><sect1><sect2><title> | 16286 #. type: Content of: <book><chapter><sect1><sect2><title> |
16287 #: ../en/ch14-hgext.xml:366 | 16287 #: ../en/ch14-hgext.xml:366 |
16288 msgid "Defining command aliases" | 16288 msgid "Defining command aliases" |
16289 msgstr "" | 16289 msgstr "定义命令的别名" |
16290 | 16290 |
16291 #. type: Content of: <book><chapter><sect1><sect2><para> | 16291 #. type: Content of: <book><chapter><sect1><sect2><para> |
16292 #: ../en/ch14-hgext.xml:368 | 16292 #: ../en/ch14-hgext.xml:368 |
16293 msgid "" | 16293 msgid "" |
16294 "It can be cumbersome to remember the options to both the <command role=\"hg-" | 16294 "It can be cumbersome to remember the options to both the <command role=\"hg-" |
16334 #. type: Content of: <book><chapter><sect1><title> | 16334 #. type: Content of: <book><chapter><sect1><title> |
16335 #: ../en/ch14-hgext.xml:406 | 16335 #: ../en/ch14-hgext.xml:406 |
16336 msgid "" | 16336 msgid "" |
16337 "Cherrypicking changes with the <literal role=\"hg-ext\">transplant</literal> " | 16337 "Cherrypicking changes with the <literal role=\"hg-ext\">transplant</literal> " |
16338 "extension" | 16338 "extension" |
16339 msgstr "" | 16339 msgstr "使用扩展 <literal role=\"hg-ext\">transplant</literal> 以挑选修改" |
16340 | 16340 |
16341 #. type: Content of: <book><chapter><sect1><para> | 16341 #. type: Content of: <book><chapter><sect1><para> |
16342 #: ../en/ch14-hgext.xml:409 | 16342 #: ../en/ch14-hgext.xml:409 |
16343 msgid "Need to have a long chat with Brendan about this." | 16343 msgid "Need to have a long chat with Brendan about this." |
16344 msgstr "" | 16344 msgstr "" |
16347 #: ../en/ch14-hgext.xml:413 | 16347 #: ../en/ch14-hgext.xml:413 |
16348 msgid "" | 16348 msgid "" |
16349 "Send changes via email with the <literal role=\"hg-ext\">patchbomb</literal> " | 16349 "Send changes via email with the <literal role=\"hg-ext\">patchbomb</literal> " |
16350 "extension" | 16350 "extension" |
16351 msgstr "" | 16351 msgstr "" |
16352 "使用扩展 <literal role=\"hg-ext\">patchbomb</literal> 通过 email 发送修改" | |
16352 | 16353 |
16353 #. type: Content of: <book><chapter><sect1><para> | 16354 #. type: Content of: <book><chapter><sect1><para> |
16354 #: ../en/ch14-hgext.xml:416 | 16355 #: ../en/ch14-hgext.xml:416 |
16355 msgid "" | 16356 msgid "" |
16356 "Many projects have a culture of <quote>change review</quote>, in which people " | 16357 "Many projects have a culture of <quote>change review</quote>, in which people " |
16449 msgstr "" | 16450 msgstr "" |
16450 | 16451 |
16451 #. type: Content of: <book><chapter><sect1><sect2><title> | 16452 #. type: Content of: <book><chapter><sect1><sect2><title> |
16452 #: ../en/ch14-hgext.xml:486 | 16453 #: ../en/ch14-hgext.xml:486 |
16453 msgid "Changing the behaviour of patchbombs" | 16454 msgid "Changing the behaviour of patchbombs" |
16454 msgstr "" | 16455 msgstr "修改 patchbomb 的行为" |
16455 | 16456 |
16456 #. type: Content of: <book><chapter><sect1><sect2><para> | 16457 #. type: Content of: <book><chapter><sect1><sect2><para> |
16457 #: ../en/ch14-hgext.xml:488 | 16458 #: ../en/ch14-hgext.xml:488 |
16458 msgid "" | 16459 msgid "" |
16459 "Not every project has exactly the same conventions for sending changes in " | 16460 "Not every project has exactly the same conventions for sending changes in " |