hgbook
diff po/zh.po @ 679:06458701453c
Fix up some links to example URLs that aren't actually real.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue Apr 21 21:07:20 2009 -0700 (2009-04-21) |
| parents | 3b33dd6aba87 |
| children | 8613844dd2cf |
line diff
1.1 --- a/po/zh.po Thu Apr 02 09:24:36 2009 +0800 1.2 +++ b/po/zh.po Tue Apr 21 21:07:20 2009 -0700 1.3 @@ -41,9 +41,9 @@ 1.4 msgid "" 1.5 msgstr "" 1.6 "Project-Id-Version: hgbook 1.2\n" 1.7 -"POT-Creation-Date: 2009-04-02 09:21+0800\n" 1.8 -"PO-Revision-Date: 2009-03-31 10:12+0800\n" 1.9 -"Last-Translator: \n" 1.10 +"POT-Creation-Date: 2009-04-05 11:48+0800\n" 1.11 +"PO-Revision-Date: 2009-04-05 12:10+0800\n" 1.12 +"Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n" 1.13 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" 1.14 "MIME-Version: 1.0\n" 1.15 "Content-Type: text/plain; charset=UTF-8\n" 1.16 @@ -65,7 +65,7 @@ 1.17 #. type: Content of: <book><bookinfo> 1.18 #: ../en/00book.xml:48 1.19 msgid "<edition>1</edition> <isbn>9780596800673</isbn>" 1.20 -msgstr "" 1.21 +msgstr "<edition>1</edition> <isbn>9780596800673</isbn>" 1.22 1.23 #. type: Content of: <book><bookinfo><authorgroup><author><firstname> 1.24 #: ../en/00book.xml:52 1.25 @@ -89,340 +89,6 @@ 1.26 "year> <holder>Bryan O'Sullivan</holder> </copyright>" 1.27 1.28 #. type: Content of: <book><appendix><title> 1.29 -#: ../en/appA-cmdref.xml:5 1.30 -msgid "Command reference" 1.31 -msgstr "命令参考" 1.32 - 1.33 -#. type: Content of: <book><appendix><para> 1.34 -#: ../en/appA-cmdref.xml:7 1.35 -msgid "" 1.36 -"\\cmdref{add}{add files at the next commit} \\optref{add}{I}{include} \\optref" 1.37 -"{add}{X}{exclude} \\optref{add}{n}{dry-run}" 1.38 -msgstr "" 1.39 - 1.40 -#. type: Content of: <book><appendix><para> 1.41 -#: ../en/appA-cmdref.xml:12 1.42 -msgid "\\cmdref{diff}{print changes in history or working directory}" 1.43 -msgstr "" 1.44 - 1.45 -#. type: Content of: <book><appendix><para> 1.46 -#: ../en/appA-cmdref.xml:14 1.47 -msgid "" 1.48 -"Show differences between revisions for the specified files or directories, " 1.49 -"using the unified diff format. For a description of the unified diff format, " 1.50 -"see <xref linkend=\"sec:mq:patch\"/>." 1.51 -msgstr "" 1.52 - 1.53 -#. type: Content of: <book><appendix><para> 1.54 -#: ../en/appA-cmdref.xml:18 1.55 -msgid "" 1.56 -"By default, this command does not print diffs for files that Mercurial " 1.57 -"considers to contain binary data. To control this behaviour, see the <option " 1.58 -"role=\"hg-opt-diff\">-a</option> and <option role=\"hg-opt-diff\">--git</" 1.59 -"option> options." 1.60 -msgstr "" 1.61 - 1.62 -#. type: Content of: <book><appendix><sect2><title> 1.63 -#: ../en/appA-cmdref.xml:23 1.64 -msgid "Options" 1.65 -msgstr "选项" 1.66 - 1.67 -#. type: Content of: <book><appendix><sect2><para> 1.68 -#: ../en/appA-cmdref.xml:25 1.69 -msgid "\\loptref{diff}{nodates}" 1.70 -msgstr "" 1.71 - 1.72 -#. type: Content of: <book><appendix><sect2><para> 1.73 -#: ../en/appA-cmdref.xml:27 1.74 -msgid "Omit date and time information when printing diff headers." 1.75 -msgstr "" 1.76 - 1.77 -#. type: Content of: <book><appendix><sect2><para> 1.78 -#: ../en/appA-cmdref.xml:29 1.79 -msgid "\\optref{diff}{B}{ignore-blank-lines}" 1.80 -msgstr "" 1.81 - 1.82 -#. type: Content of: <book><appendix><sect2><para> 1.83 -#: ../en/appA-cmdref.xml:31 1.84 -msgid "" 1.85 -"Do not print changes that only insert or delete blank lines. A line that " 1.86 -"contains only whitespace is not considered blank." 1.87 -msgstr "" 1.88 - 1.89 -#. type: Content of: <book><appendix><sect2><para> 1.90 -#: ../en/appA-cmdref.xml:35 1.91 -msgid "\\optref{diff}{I}{include}" 1.92 -msgstr "" 1.93 - 1.94 -#. type: Content of: <book><appendix><sect2><para> 1.95 -#: ../en/appA-cmdref.xml:38 1.96 -msgid "Include files and directories whose names match the given patterns." 1.97 -msgstr "" 1.98 - 1.99 -#. type: Content of: <book><appendix><sect2><para> 1.100 -#: ../en/appA-cmdref.xml:41 1.101 -msgid "\\optref{diff}{X}{exclude}" 1.102 -msgstr "" 1.103 - 1.104 -#. type: Content of: <book><appendix><sect2><para> 1.105 -#: ../en/appA-cmdref.xml:44 1.106 -msgid "Exclude files and directories whose names match the given patterns." 1.107 -msgstr "" 1.108 - 1.109 -#. type: Content of: <book><appendix><sect2><para> 1.110 -#: ../en/appA-cmdref.xml:47 1.111 -msgid "\\optref{diff}{a}{text}" 1.112 -msgstr "" 1.113 - 1.114 -#. type: Content of: <book><appendix><sect2><para> 1.115 -#: ../en/appA-cmdref.xml:50 1.116 -msgid "" 1.117 -"If this option is not specified, <command role=\"hg-cmd\">hg diff</command> " 1.118 -"will refuse to print diffs for files that it detects as binary. Specifying " 1.119 -"<option role=\"hg-opt-diff\">-a</option> forces <command role=\"hg-cmd\">hg " 1.120 -"diff</command> to treat all files as text, and generate diffs for all of them." 1.121 -msgstr "" 1.122 - 1.123 -#. type: Content of: <book><appendix><sect2><para> 1.124 -#: ../en/appA-cmdref.xml:56 1.125 -msgid "" 1.126 -"This option is useful for files that are <quote>mostly text</quote> but have " 1.127 -"a few embedded NUL characters. If you use it on files that contain a lot of " 1.128 -"binary data, its output will be incomprehensible." 1.129 -msgstr "" 1.130 - 1.131 -#. type: Content of: <book><appendix><sect2><para> 1.132 -#: ../en/appA-cmdref.xml:61 1.133 -msgid "\\optref{diff}{b}{ignore-space-change}" 1.134 -msgstr "" 1.135 - 1.136 -#. type: Content of: <book><appendix><sect2><para> 1.137 -#: ../en/appA-cmdref.xml:64 1.138 -msgid "" 1.139 -"Do not print a line if the only change to that line is in the amount of white " 1.140 -"space it contains." 1.141 -msgstr "" 1.142 - 1.143 -#. type: Content of: <book><appendix><sect2><para> 1.144 -#: ../en/appA-cmdref.xml:68 1.145 -msgid "\\optref{diff}{g}{git}" 1.146 -msgstr "" 1.147 - 1.148 -#. type: Content of: <book><appendix><sect2><para> 1.149 -#: ../en/appA-cmdref.xml:71 1.150 -msgid "" 1.151 -"Print <command>git</command>-compatible diffs. XXX reference a format " 1.152 -"description." 1.153 -msgstr "" 1.154 - 1.155 -#. type: Content of: <book><appendix><sect2><para> 1.156 -#: ../en/appA-cmdref.xml:75 1.157 -msgid "\\optref{diff}{p}{show-function}" 1.158 -msgstr "" 1.159 - 1.160 -#. type: Content of: <book><appendix><sect2><para> 1.161 -#: ../en/appA-cmdref.xml:78 1.162 -msgid "" 1.163 -"Display the name of the enclosing function in a hunk header, using a simple " 1.164 -"heuristic. This functionality is enabled by default, so the <option role=" 1.165 -"\"hg-opt-diff\">-p</option> option has no effect unless you change the value " 1.166 -"of the <envar role=\"rc-item-diff\">showfunc</envar> config item, as in the " 1.167 -"following example." 1.168 -msgstr "" 1.169 - 1.170 -#. type: Content of: <book><appendix><sect2><para> 1.171 -#: ../en/appA-cmdref.xml:85 1.172 -msgid "\\optref{diff}{r}{rev}" 1.173 -msgstr "" 1.174 - 1.175 -#. type: Content of: <book><appendix><sect2><para> 1.176 -#: ../en/appA-cmdref.xml:88 1.177 -msgid "" 1.178 -"Specify one or more revisions to compare. The <command role=\"hg-cmd\">hg " 1.179 -"diff</command> command accepts up to two <option role=\"hg-opt-diff\">-r</" 1.180 -"option> options to specify the revisions to compare." 1.181 -msgstr "" 1.182 - 1.183 -#. type: Content of: <book><appendix><sect2><orderedlist><listitem><para> 1.184 -#: ../en/appA-cmdref.xml:94 1.185 -msgid "" 1.186 -"Display the differences between the parent revision of the working directory " 1.187 -"and the working directory." 1.188 -msgstr "" 1.189 - 1.190 -#. type: Content of: <book><appendix><sect2><orderedlist><listitem><para> 1.191 -#: ../en/appA-cmdref.xml:98 1.192 -msgid "" 1.193 -"Display the differences between the specified changeset and the working " 1.194 -"directory." 1.195 -msgstr "" 1.196 - 1.197 -#. type: Content of: <book><appendix><sect2><orderedlist><listitem><para> 1.198 -#: ../en/appA-cmdref.xml:102 1.199 -msgid "Display the differences between the two specified changesets." 1.200 -msgstr "" 1.201 - 1.202 -#. type: Content of: <book><appendix><sect2><para> 1.203 -#: ../en/appA-cmdref.xml:106 1.204 -msgid "" 1.205 -"You can specify two revisions using either two <option role=\"hg-opt-diff\">-" 1.206 -"r</option> options or revision range notation. For example, the two revision " 1.207 -"specifications below are equivalent." 1.208 -msgstr "" 1.209 - 1.210 -#. type: Content of: <book><appendix><sect2><para> 1.211 -#: ../en/appA-cmdref.xml:113 1.212 -msgid "" 1.213 -"When you provide two revisions, Mercurial treats the order of those revisions " 1.214 -"as significant. Thus, <command role=\"hg-cmd\">hg diff -r10:20</command> " 1.215 -"will produce a diff that will transform files from their contents as of " 1.216 -"revision 10 to their contents as of revision 20, while <command role=\"hg-cmd" 1.217 -"\">hg diff -r20:10</command> means the opposite: the diff that will transform " 1.218 -"files from their revision 20 contents to their revision 10 contents. You " 1.219 -"cannot reverse the ordering in this way if you are diffing against the " 1.220 -"working directory." 1.221 -msgstr "" 1.222 - 1.223 -#. type: Content of: <book><appendix><sect2><para> 1.224 -#: ../en/appA-cmdref.xml:123 1.225 -msgid "\\optref{diff}{w}{ignore-all-space}" 1.226 -msgstr "" 1.227 - 1.228 -#. type: Content of: <book><appendix><sect2><para> 1.229 -#: ../en/appA-cmdref.xml:126 1.230 -msgid "\\cmdref{version}{print version and copyright information}" 1.231 -msgstr "" 1.232 - 1.233 -#. type: Content of: <book><appendix><sect2><para> 1.234 -#: ../en/appA-cmdref.xml:129 1.235 -msgid "" 1.236 -"This command displays the version of Mercurial you are running, and its " 1.237 -"copyright license. There are four kinds of version string that you may see." 1.238 -msgstr "" 1.239 - 1.240 -#. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para> 1.241 -#: ../en/appA-cmdref.xml:134 1.242 -msgid "" 1.243 -"The string <quote><literal>unknown</literal></quote>. This version of " 1.244 -"Mercurial was not built in a Mercurial repository, and cannot determine its " 1.245 -"own version." 1.246 -msgstr "" 1.247 - 1.248 -#. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para> 1.249 -#: ../en/appA-cmdref.xml:139 1.250 -msgid "" 1.251 -"A short numeric string, such as <quote><literal>1.1</literal></quote>. This " 1.252 -"is a build of a revision of Mercurial that was identified by a specific tag " 1.253 -"in the repository where it was built. (This doesn't necessarily mean that " 1.254 -"you're running an official release; someone else could have added that tag to " 1.255 -"any revision in the repository where they built Mercurial.)" 1.256 -msgstr "" 1.257 - 1.258 -#. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para> 1.259 -#: ../en/appA-cmdref.xml:147 1.260 -msgid "" 1.261 -"A hexadecimal string, such as <quote><literal>875489e31abe</literal></" 1.262 -"quote>. This is a build of the given revision of Mercurial." 1.263 -msgstr "" 1.264 - 1.265 -#. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para> 1.266 -#: ../en/appA-cmdref.xml:151 1.267 -msgid "" 1.268 -"A hexadecimal string followed by a date, such as <quote><literal>875489e31abe" 1.269 -"+20070205</literal></quote>. This is a build of the given revision of " 1.270 -"Mercurial, where the build repository contained some local changes that had " 1.271 -"not been committed." 1.272 -msgstr "" 1.273 - 1.274 -#. type: Content of: <book><appendix><sect2><title> 1.275 -#: ../en/appA-cmdref.xml:160 1.276 -msgid "Tips and tricks" 1.277 -msgstr "" 1.278 - 1.279 -#. type: Content of: <book><appendix><sect2><sect3><title> 1.280 -#: ../en/appA-cmdref.xml:163 1.281 -msgid "" 1.282 -"Why do the results of <command role=\"hg-cmd\">hg diff</command> and <command " 1.283 -"role=\"hg-cmd\">hg status</command> differ?" 1.284 -msgstr "" 1.285 -"为什么 <command role=\"hg-cmd\">hg diff</command> 与 <command role=\"hg-cmd" 1.286 -"\">hg status</command> 的结果不同 ?" 1.287 - 1.288 -#. type: Content of: <book><appendix><sect2><sect3><para> 1.289 -#: ../en/appA-cmdref.xml:165 1.290 -msgid "" 1.291 -"When you run the <command role=\"hg-cmd\">hg status</command> command, you'll " 1.292 -"see a list of files that Mercurial will record changes for the next time you " 1.293 -"perform a commit. If you run the <command role=\"hg-cmd\">hg diff</command> " 1.294 -"command, you may notice that it prints diffs for only a <emphasis>subset</" 1.295 -"emphasis> of the files that <command role=\"hg-cmd\">hg status</command> " 1.296 -"listed. There are two possible reasons for this." 1.297 -msgstr "" 1.298 - 1.299 -#. type: Content of: <book><appendix><sect2><sect3><para> 1.300 -#: ../en/appA-cmdref.xml:172 1.301 -msgid "" 1.302 -"The first is that <command role=\"hg-cmd\">hg status</command> prints some " 1.303 -"kinds of modifications that <command role=\"hg-cmd\">hg diff</command> " 1.304 -"doesn't normally display. The <command role=\"hg-cmd\">hg diff</command> " 1.305 -"command normally outputs unified diffs, which don't have the ability to " 1.306 -"represent some changes that Mercurial can track. Most notably, traditional " 1.307 -"diffs can't represent a change in whether or not a file is executable, but " 1.308 -"Mercurial records this information." 1.309 -msgstr "" 1.310 - 1.311 -#. type: Content of: <book><appendix><sect2><sect3><para> 1.312 -#: ../en/appA-cmdref.xml:180 1.313 -msgid "" 1.314 -"If you use the <option role=\"hg-opt-diff\">--git</option> option to <command " 1.315 -"role=\"hg-cmd\">hg diff</command>, it will display <command>git</command>-" 1.316 -"compatible diffs that <emphasis>can</emphasis> display this extra information." 1.317 -msgstr "" 1.318 - 1.319 -#. type: Content of: <book><appendix><sect2><sect3><para> 1.320 -#: ../en/appA-cmdref.xml:185 1.321 -msgid "" 1.322 -"The second possible reason that <command role=\"hg-cmd\">hg diff</command> " 1.323 -"might be printing diffs for a subset of the files displayed by <command role=" 1.324 -"\"hg-cmd\">hg status</command> is that if you invoke it without any " 1.325 -"arguments, <command role=\"hg-cmd\">hg diff</command> prints diffs against " 1.326 -"the first parent of the working directory. If you have run <command role=" 1.327 -"\"hg-cmd\">hg merge</command> to merge two changesets, but you haven't yet " 1.328 -"committed the results of the merge, your working directory has two parents " 1.329 -"(use <command role=\"hg-cmd\">hg parents</command> to see them). While " 1.330 -"<command role=\"hg-cmd\">hg status</command> prints modifications relative to " 1.331 -"<emphasis>both</emphasis> parents after an uncommitted merge, <command role=" 1.332 -"\"hg-cmd\">hg diff</command> still operates relative only to the first " 1.333 -"parent. You can get it to print diffs relative to the second parent by " 1.334 -"specifying that parent with the <option role=\"hg-opt-diff\">-r</option> " 1.335 -"option. There is no way to print diffs relative to both parents." 1.336 -msgstr "" 1.337 - 1.338 -#. type: Content of: <book><appendix><sect2><sect3><title> 1.339 -#: ../en/appA-cmdref.xml:201 1.340 -msgid "Generating safe binary diffs" 1.341 -msgstr "生成安全的二进制差异" 1.342 - 1.343 -#. type: Content of: <book><appendix><sect2><sect3><para> 1.344 -#: ../en/appA-cmdref.xml:203 1.345 -msgid "" 1.346 -"If you use the <option role=\"hg-opt-diff\">-a</option> option to force " 1.347 -"Mercurial to print diffs of files that are either <quote>mostly text</quote> " 1.348 -"or contain lots of binary data, those diffs cannot subsequently be applied by " 1.349 -"either Mercurial's <command role=\"hg-cmd\">hg import</command> command or " 1.350 -"the system's <command>patch</command> command." 1.351 -msgstr "" 1.352 - 1.353 -#. type: Content of: <book><appendix><sect2><sect3><para> 1.354 -#: ../en/appA-cmdref.xml:210 1.355 -msgid "" 1.356 -"If you want to generate a diff of a binary file that is safe to use as input " 1.357 -"for <command role=\"hg-cmd\">hg import</command>, use the <command role=\"hg-" 1.358 -"cmd\">hg diff</command>{--git} option when you generate the patch. The " 1.359 -"system <command>patch</command> command cannot handle binary patches at all." 1.360 -msgstr "" 1.361 - 1.362 -#. type: Content of: <book><appendix><title> 1.363 #: ../en/appB-mq-ref.xml:5 1.364 msgid "Mercurial Queues reference" 1.365 msgstr "Mercurial 队列参考" 1.366 @@ -441,8 +107,8 @@ 1.367 1.368 #. type: Content of: <book><appendix><sect1><sect2><title> 1.369 #: ../en/appB-mq-ref.xml:14 1.370 -#, fuzzy 1.371 -msgid "<command role=\"hg-ext-mq\">qapplied</command>—print applied patches" 1.372 +msgid "" 1.373 +"<command role=\"hg-ext-mq\">qapplied</command>&emdash;print applied patches" 1.374 msgstr "<command role=\"hg-ext-mq\">qapplied</command>—显示已应用的补丁" 1.375 1.376 #. type: Content of: <book><appendix><sect1><sect2><para> 1.377 @@ -455,10 +121,9 @@ 1.378 1.379 #. type: Content of: <book><appendix><sect1><sect2><title> 1.380 #: ../en/appB-mq-ref.xml:24 1.381 -#, fuzzy 1.382 -msgid "" 1.383 -"<command role=\"hg-ext-mq\">qcommit</command>—commit changes in the queue " 1.384 -"repository" 1.385 +msgid "" 1.386 +"<command role=\"hg-ext-mq\">qcommit</command>&emdash;commit changes in the " 1.387 +"queue repository" 1.388 msgstr "<command role=\"hg-ext-mq\">qcommit</command>—提交队列中的修改" 1.389 1.390 #. type: Content of: <book><appendix><sect1><sect2><para> 1.391 @@ -483,9 +148,8 @@ 1.392 1.393 #. type: Content of: <book><appendix><sect1><sect2><title> 1.394 #: ../en/appB-mq-ref.xml:43 1.395 -#, fuzzy 1.396 -msgid "" 1.397 -"<command role=\"hg-ext-mq\">qdelete</command>—delete a patch from the " 1.398 +msgid "" 1.399 +"<command role=\"hg-ext-mq\">qdelete</command>&emdash;delete a patch from the " 1.400 "<filename role=\"special\">series</filename> file" 1.401 msgstr "" 1.402 "<command role=\"hg-ext-mq\">qdelete</command>—从文件 <filename role=\"special" 1.403 @@ -508,7 +172,7 @@ 1.404 #: ../en/appB-mq-ref.xml:335 ../en/appB-mq-ref.xml:404 1.405 #: ../en/appB-mq-ref.xml:497 1.406 msgid "Options:" 1.407 -msgstr "" 1.408 +msgstr "选项:" 1.409 1.410 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para> 1.411 #: ../en/appB-mq-ref.xml:59 1.412 @@ -518,10 +182,9 @@ 1.413 1.414 #. type: Content of: <book><appendix><sect1><sect2><title> 1.415 #: ../en/appB-mq-ref.xml:66 1.416 -#, fuzzy 1.417 -msgid "" 1.418 -"<command role=\"hg-ext-mq\">qdiff</command>—print a diff of the topmost " 1.419 -"applied patch" 1.420 +msgid "" 1.421 +"<command role=\"hg-ext-mq\">qdiff</command>&emdash;print a diff of the " 1.422 +"topmost applied patch" 1.423 msgstr "<command role=\"hg-ext-mq\">qdiff</command>—显示最新应用补丁的差异" 1.424 1.425 #. type: Content of: <book><appendix><sect1><sect2><para> 1.426 @@ -534,10 +197,9 @@ 1.427 1.428 #. type: Content of: <book><appendix><sect1><sect2><title> 1.429 #: ../en/appB-mq-ref.xml:75 1.430 -#, fuzzy 1.431 -msgid "" 1.432 -"<command role=\"hg-ext-mq\">qfold</command>—merge (<quote>fold</quote>) " 1.433 -"several patches into one" 1.434 +msgid "" 1.435 +"<command role=\"hg-ext-mq\">qfold</command>&emdash;merge (<quote>fold</" 1.436 +"quote>) several patches into one" 1.437 msgstr "" 1.438 "<command role=\"hg-ext-mq\">qfold</command>—将多个补丁合并(<quote>折叠</" 1.439 "quote>)成一个" 1.440 @@ -594,10 +256,9 @@ 1.441 1.442 #. type: Content of: <book><appendix><sect1><sect2><title> 1.443 #: ../en/appB-mq-ref.xml:119 1.444 -#, fuzzy 1.445 -msgid "" 1.446 -"<command role=\"hg-ext-mq\">qheader</command>—display the header/description " 1.447 -"of a patch" 1.448 +msgid "" 1.449 +"<command role=\"hg-ext-mq\">qheader</command>&emdash;display the header/" 1.450 +"description of a patch" 1.451 msgstr "<command role=\"hg-ext-mq\">qheader</command>—显示补丁头部描述" 1.452 1.453 #. type: Content of: <book><appendix><sect1><sect2><para> 1.454 @@ -610,10 +271,9 @@ 1.455 1.456 #. type: Content of: <book><appendix><sect1><sect2><title> 1.457 #: ../en/appB-mq-ref.xml:130 1.458 -#, fuzzy 1.459 -msgid "" 1.460 -"<command role=\"hg-ext-mq\">qimport</command>—import a third-party patch into " 1.461 -"the queue" 1.462 +msgid "" 1.463 +"<command role=\"hg-ext-mq\">qimport</command>&emdash;import a third-party " 1.464 +"patch into the queue" 1.465 msgstr "<command role=\"hg-ext-mq\">qimport</command>—将第三方补丁导入队列" 1.466 1.467 #. type: Content of: <book><appendix><sect1><sect2><para> 1.468 @@ -637,10 +297,9 @@ 1.469 1.470 #. type: Content of: <book><appendix><sect1><sect2><title> 1.471 #: ../en/appB-mq-ref.xml:149 1.472 -#, fuzzy 1.473 -msgid "" 1.474 -"<command role=\"hg-ext-mq\">qinit</command>—prepare a repository to work with " 1.475 -"MQ" 1.476 +msgid "" 1.477 +"<command role=\"hg-ext-mq\">qinit</command>&emdash;prepare a repository to " 1.478 +"work with MQ" 1.479 msgstr "<command role=\"hg-ext-mq\">qinit</command>—为使用 MQ 配置版本库" 1.480 1.481 #. type: Content of: <book><appendix><sect1><sect2><para> 1.482 @@ -671,8 +330,7 @@ 1.483 1.484 #. type: Content of: <book><appendix><sect1><sect2><title> 1.485 #: ../en/appB-mq-ref.xml:178 1.486 -#, fuzzy 1.487 -msgid "<command role=\"hg-ext-mq\">qnew</command>—create a new patch" 1.488 +msgid "<command role=\"hg-ext-mq\">qnew</command>&emdash;create a new patch" 1.489 msgstr "<command role=\"hg-ext-mq\">qnew</command>—创建新补丁" 1.490 1.491 #. type: Content of: <book><appendix><sect1><sect2><para> 1.492 @@ -714,9 +372,9 @@ 1.493 1.494 #. type: Content of: <book><appendix><sect1><sect2><title> 1.495 #: ../en/appB-mq-ref.xml:215 1.496 -#, fuzzy 1.497 -msgid "" 1.498 -"<command role=\"hg-ext-mq\">qnext</command>—print the name of the next patch" 1.499 +msgid "" 1.500 +"<command role=\"hg-ext-mq\">qnext</command>&emdash;print the name of the next " 1.501 +"patch" 1.502 msgstr "<command role=\"hg-ext-mq\">qnext</command>—显示下个补丁的名称" 1.503 1.504 #. type: Content of: <book><appendix><sect1><sect2><para> 1.505 @@ -730,8 +388,8 @@ 1.506 1.507 #. type: Content of: <book><appendix><sect1><sect2><title> 1.508 #: ../en/appB-mq-ref.xml:227 1.509 -#, fuzzy 1.510 -msgid "<command role=\"hg-ext-mq\">qpop</command>—pop patches off the stack" 1.511 +msgid "" 1.512 +"<command role=\"hg-ext-mq\">qpop</command>&emdash;pop patches off the stack" 1.513 msgstr "<command role=\"hg-ext-mq\">qpop</command>—删除堆栈顶部的补丁" 1.514 1.515 #. type: Content of: <book><appendix><sect1><sect2><para> 1.516 @@ -814,10 +472,9 @@ 1.517 1.518 #. type: Content of: <book><appendix><sect1><sect2><title> 1.519 #: ../en/appB-mq-ref.xml:288 1.520 -#, fuzzy 1.521 -msgid "" 1.522 -"<command role=\"hg-ext-mq\">qprev</command>—print the name of the previous " 1.523 -"patch" 1.524 +msgid "" 1.525 +"<command role=\"hg-ext-mq\">qprev</command>&emdash;print the name of the " 1.526 +"previous patch" 1.527 msgstr "<command role=\"hg-ext-mq\">qprev</command>—显示上个补丁的名称" 1.528 1.529 #. type: Content of: <book><appendix><sect1><sect2><para> 1.530 @@ -831,8 +488,8 @@ 1.531 1.532 #. type: Content of: <book><appendix><sect1><sect2><title> 1.533 #: ../en/appB-mq-ref.xml:300 1.534 -#, fuzzy 1.535 -msgid "<command role=\"hg-ext-mq\">qpush</command>—push patches onto the stack" 1.536 +msgid "" 1.537 +"<command role=\"hg-ext-mq\">qpush</command>&emdash;push patches onto the stack" 1.538 msgstr "<command role=\"hg-ext-mq\">qpush</command>—增加补丁到堆栈" 1.539 1.540 #. type: Content of: <book><appendix><sect1><sect2><para> 1.541 @@ -929,10 +586,9 @@ 1.542 1.543 #. type: Content of: <book><appendix><sect1><sect2><title> 1.544 #: ../en/appB-mq-ref.xml:368 1.545 -#, fuzzy 1.546 -msgid "" 1.547 -"<command role=\"hg-ext-mq\">qrefresh</command>—update the topmost applied " 1.548 -"patch" 1.549 +msgid "" 1.550 +"<command role=\"hg-ext-mq\">qrefresh</command>&emdash;update the topmost " 1.551 +"applied patch" 1.552 msgstr "<command role=\"hg-ext-mq\">qrefresh</command>—更新最新的补丁" 1.553 1.554 #. type: Content of: <book><appendix><sect1><sect2><para> 1.555 @@ -1007,8 +663,7 @@ 1.556 1.557 #. type: Content of: <book><appendix><sect1><sect2><title> 1.558 #: ../en/appB-mq-ref.xml:424 1.559 -#, fuzzy 1.560 -msgid "<command role=\"hg-ext-mq\">qrename</command>—rename a patch" 1.561 +msgid "<command role=\"hg-ext-mq\">qrename</command>&emdash;rename a patch" 1.562 msgstr "<command role=\"hg-ext-mq\">qrename</command>—改名补丁" 1.563 1.564 #. type: Content of: <book><appendix><sect1><sect2><para> 1.565 @@ -1029,8 +684,9 @@ 1.566 1.567 #. type: Content of: <book><appendix><sect1><sect2><title> 1.568 #: ../en/appB-mq-ref.xml:438 1.569 -#, fuzzy 1.570 -msgid "<command role=\"hg-ext-mq\">qrestore</command>—restore saved queue state" 1.571 +msgid "" 1.572 +"<command role=\"hg-ext-mq\">qrestore</command>&emdash;restore saved queue " 1.573 +"state" 1.574 msgstr "<command role=\"hg-ext-mq\">qrestore</command>—恢复保存的队列" 1.575 1.576 #. type: Content of: <book><appendix><sect1><sect2><para> 1.577 @@ -1040,8 +696,8 @@ 1.578 1.579 #. type: Content of: <book><appendix><sect1><sect2><title> 1.580 #: ../en/appB-mq-ref.xml:446 1.581 -#, fuzzy 1.582 -msgid "<command role=\"hg-ext-mq\">qsave</command>—save current queue state" 1.583 +msgid "" 1.584 +"<command role=\"hg-ext-mq\">qsave</command>&emdash;save current queue state" 1.585 msgstr "<command role=\"hg-ext-mq\">qsave</command>—保存当前的队列状态" 1.586 1.587 #. type: Content of: <book><appendix><sect1><sect2><para> 1.588 @@ -1051,9 +707,9 @@ 1.589 1.590 #. type: Content of: <book><appendix><sect1><sect2><title> 1.591 #: ../en/appB-mq-ref.xml:453 1.592 -#, fuzzy 1.593 -msgid "" 1.594 -"<command role=\"hg-ext-mq\">qseries</command>—print the entire patch series" 1.595 +msgid "" 1.596 +"<command role=\"hg-ext-mq\">qseries</command>&emdash;print the entire patch " 1.597 +"series" 1.598 msgstr "<command role=\"hg-ext-mq\">qseries</command>—显示补丁序列" 1.599 1.600 #. type: Content of: <book><appendix><sect1><sect2><para> 1.601 @@ -1067,9 +723,9 @@ 1.602 1.603 #. type: Content of: <book><appendix><sect1><sect2><title> 1.604 #: ../en/appB-mq-ref.xml:464 1.605 -#, fuzzy 1.606 -msgid "" 1.607 -"<command role=\"hg-ext-mq\">qtop</command>—print the name of the current patch" 1.608 +msgid "" 1.609 +"<command role=\"hg-ext-mq\">qtop</command>&emdash;print the name of the " 1.610 +"current patch" 1.611 msgstr "<command role=\"hg-ext-mq\">qtop</command>—显示当前补丁的名称" 1.612 1.613 #. type: Content of: <book><appendix><sect1><sect2><para> 1.614 @@ -1081,9 +737,9 @@ 1.615 1.616 #. type: Content of: <book><appendix><sect1><sect2><title> 1.617 #: ../en/appB-mq-ref.xml:472 1.618 -#, fuzzy 1.619 -msgid "" 1.620 -"<command role=\"hg-ext-mq\">qunapplied</command>—print patches not yet applied" 1.621 +msgid "" 1.622 +"<command role=\"hg-ext-mq\">qunapplied</command>&emdash;print patches not yet " 1.623 +"applied" 1.624 msgstr "<command role=\"hg-ext-mq\">qunapplied</command>—显示尚未应用的补丁" 1.625 1.626 #. type: Content of: <book><appendix><sect1><sect2><para> 1.627 @@ -1097,9 +753,9 @@ 1.628 1.629 #. type: Content of: <book><appendix><sect1><sect2><title> 1.630 #: ../en/appB-mq-ref.xml:484 1.631 -#, fuzzy 1.632 -msgid "" 1.633 -"<command role=\"hg-cmd\">hg strip</command>—remove a revision and descendants" 1.634 +msgid "" 1.635 +"<command role=\"hg-cmd\">hg strip</command>&emdash;remove a revision and " 1.636 +"descendants" 1.637 msgstr "<command role=\"hg-cmd\">hg strip</command>—删除一个版本及其后继" 1.638 1.639 #. type: Content of: <book><appendix><sect1><sect2><para> 1.640 @@ -1632,8 +1288,9 @@ 1.641 #. type: Content of: <book><preface><sect1><sect2><para> 1.642 #: ../en/ch00-preface.xml:71 1.643 msgid "" 1.644 -"Most of these reasons are equally valid—at least in theory&emdash;whether " 1.645 -"you're working on a project by yourself, or with a hundred other people." 1.646 +"Most of these reasons are equally valid&emdash;at least in theory&emdash;" 1.647 +"whether you're working on a project by yourself, or with a hundred other " 1.648 +"people." 1.649 msgstr "" 1.650 1.651 #. type: Content of: <book><preface><sect1><sect2><para> 1.652 @@ -1753,10 +1410,10 @@ 1.653 #: ../en/ch00-preface.xml:146 1.654 msgid "" 1.655 "This book takes an unusual approach to code samples. Every example is " 1.656 -"<quote>live</quote>—each one is actually the result of a shell script that " 1.657 -"executes the Mercurial commands you see. Every time an image of the book is " 1.658 -"built from its sources, all the example scripts are automatically run, and " 1.659 -"their current results compared against their expected results." 1.660 +"<quote>live</quote>&emdash;each one is actually the result of a shell script " 1.661 +"that executes the Mercurial commands you see. Every time an image of the " 1.662 +"book is built from its sources, all the example scripts are automatically " 1.663 +"run, and their current results compared against their expected results." 1.664 msgstr "" 1.665 1.666 #. type: Content of: <book><preface><sect1><para> 1.667 @@ -2021,10 +1678,11 @@ 1.668 "scalability. It's not unusual for an expensive centralised system to fall " 1.669 "over under the combined load of just a few dozen concurrent users. Once " 1.670 "again, the typical response tends to be an expensive and clunky replication " 1.671 -"facility. Since the load on a central server—if you have one at all—is many " 1.672 -"times lower with a distributed tool (because all of the data is replicated " 1.673 -"everywhere), a single cheap server can handle the needs of a much larger " 1.674 -"team, and replication to balance load becomes a simple matter of scripting." 1.675 +"facility. Since the load on a central server&emdash;if you have one at " 1.676 +"all&emdash;is many times lower with a distributed tool (because all of the " 1.677 +"data is replicated everywhere), a single cheap server can handle the needs of " 1.678 +"a much larger team, and replication to balance load becomes a simple matter " 1.679 +"of scripting." 1.680 msgstr "" 1.681 1.682 #. type: Content of: <book><preface><sect1><sect2><para> 1.683 @@ -2222,7 +1880,7 @@ 1.684 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.685 #: ../en/ch00-preface.xml:499 ../en/ch00-preface.xml:638 1.686 msgid "Git" 1.687 -msgstr "" 1.688 +msgstr "Git" 1.689 1.690 #. type: Content of: <book><preface><sect1><sect2><para> 1.691 #: ../en/ch00-preface.xml:501 1.692 @@ -2280,7 +1938,7 @@ 1.693 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.694 #: ../en/ch00-preface.xml:541 ../en/ch00-preface.xml:637 1.695 msgid "CVS" 1.696 -msgstr "" 1.697 +msgstr "CVS" 1.698 1.699 #. type: Content of: <book><preface><sect1><sect2><para> 1.700 #: ../en/ch00-preface.xml:543 1.701 @@ -2412,7 +2070,7 @@ 1.702 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 1.703 #: ../en/ch00-preface.xml:639 1.704 msgid "Darcs" 1.705 -msgstr "" 1.706 +msgstr "Darcs" 1.707 1.708 #. type: Content of: <book><preface><sect1><para> 1.709 #: ../en/ch00-preface.xml:641 1.710 @@ -2542,8 +2200,7 @@ 1.711 1.712 #. type: Content of: <book><preface><sect1><title> 1.713 #: ../en/ch00-preface.xml:740 1.714 -#, fuzzy 1.715 -msgid "Colophon—this book is Free" 1.716 +msgid "Colophon&emdash;this book is Free" 1.717 msgstr "后记—本书是自由的!" 1.718 1.719 #. type: Content of: <book><preface><sect1><para> 1.720 @@ -2586,7 +2243,7 @@ 1.721 #. type: Content of: <book><chapter><sect1><sect2><title> 1.722 #: ../en/ch01-tour-basic.xml:15 1.723 msgid "Windows" 1.724 -msgstr "" 1.725 +msgstr "Windows" 1.726 1.727 #. type: Content of: <book><chapter><sect1><sect2><para> 1.728 #: ../en/ch01-tour-basic.xml:17 1.729 @@ -2643,13 +2300,12 @@ 1.730 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.731 #: ../en/ch01-tour-basic.xml:52 1.732 msgid "Ubuntu and Debian:" 1.733 -msgstr "" 1.734 +msgstr "Ubuntu 与 Debian:" 1.735 1.736 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.737 #: ../en/ch01-tour-basic.xml:54 1.738 -#, fuzzy 1.739 msgid "Fedora and OpenSUSE:" 1.740 -msgstr "OpenSUSE:" 1.741 +msgstr "Fedora and OpenSUSE:" 1.742 1.743 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.744 #: ../en/ch01-tour-basic.xml:56 1.745 @@ -2663,14 +2319,12 @@ 1.746 1.747 #. type: Content of: <book><chapter><sect1><sect2><para> 1.748 #: ../en/ch01-tour-basic.xml:64 1.749 -#, fuzzy 1.750 msgid "" 1.751 "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www." 1.752 "sunfreeware.com</ulink>, provides prebuilt packages of Mercurial." 1.753 msgstr "" 1.754 "位于 <ulink url=\"http://www.sunfreeware.com\">http://www.sunfreeware.com</" 1.755 -"ulink> 的 SunFreeWare 是很好的二进制安装源，它包含 Intel 和 Sparc 架构的 32 位" 1.756 -"和 64 位包，包含 Mercurial 的当前版本。" 1.757 +"ulink> 的 SunFreeWare 提供了 Mercurial 的二进制安装包。" 1.758 1.759 #. type: Content of: <book><chapter><sect1><title> 1.760 #: ../en/ch01-tour-basic.xml:73 1.761 @@ -3645,10 +3299,10 @@ 1.762 "reason for this: you can use <command role=\"hg-cmd\">hg update</command> to " 1.763 "update the working directory to the state it was in at <emphasis>any " 1.764 "revision</emphasis> in the history of the repository. If you had the working " 1.765 -"directory updated to an old revision—to hunt down the origin of a bug, say—" 1.766 -"and ran a <command role=\"hg-cmd\">hg pull</command> which automatically " 1.767 -"updated the working directory to a new revision, you might not be terribly " 1.768 -"happy." 1.769 +"directory updated to an old revision&emdash;to hunt down the origin of a bug, " 1.770 +"say&emdash;and ran a <command role=\"hg-cmd\">hg pull</command> which " 1.771 +"automatically updated the working directory to a new revision, you might not " 1.772 +"be terribly happy." 1.773 msgstr "" 1.774 1.775 #. type: Content of: <book><chapter><sect1><sect2><para> 1.776 @@ -4940,9 +4594,9 @@ 1.777 #. type: Content of: <book><chapter><sect1><sect2><para> 1.778 #: ../en/ch03-concepts.xml:498 1.779 msgid "" 1.780 -"There are more details—merging has plenty of corner cases&emdash;but these " 1.781 -"are the most common choices that are involved in a merge. As you can see, " 1.782 -"most cases are completely automatic, and indeed most merges finish " 1.783 +"There are more details&emdash;merging has plenty of corner cases&emdash;but " 1.784 +"these are the most common choices that are involved in a merge. As you can " 1.785 +"see, most cases are completely automatic, and indeed most merges finish " 1.786 "automatically, without requiring your input to resolve any conflicts." 1.787 msgstr "" 1.788 1.789 @@ -5268,11 +4922,11 @@ 1.790 "you added before the commit will no longer be listed in the output of " 1.791 "<command role=\"hg-cmd\">hg status</command>. The reason for this is that " 1.792 "<command role=\"hg-cmd\">hg status</command> only tells you about " 1.793 -"<quote>interesting</quote> files—those that you have modified or told " 1.794 -"Mercurial to do something with—by default. If you have a repository that " 1.795 -"contains thousands of files, you will rarely want to know about files that " 1.796 -"Mercurial is tracking, but that have not changed. (You can still get this " 1.797 -"information; we'll return to this later.)" 1.798 +"<quote>interesting</quote> files&emdash;those that you have modified or told " 1.799 +"Mercurial to do something with&emdash;by default. If you have a repository " 1.800 +"that contains thousands of files, you will rarely want to know about files " 1.801 +"that Mercurial is tracking, but that have not changed. (You can still get " 1.802 +"this information; we'll return to this later.)" 1.803 msgstr "" 1.804 1.805 #. type: Content of: <book><chapter><sect1><para> 1.806 @@ -5484,8 +5138,7 @@ 1.807 1.808 #. type: Content of: <book><chapter><sect1><sect2><title> 1.809 #: ../en/ch04-daily.xml:198 1.810 -#, fuzzy 1.811 -msgid "Useful shorthand—adding and removing files in one step" 1.812 +msgid "Useful shorthand&emdash;adding and removing files in one step" 1.813 msgstr "有用的速记—一个步骤添加和删除文件" 1.814 1.815 #. type: Content of: <book><chapter><sect1><sect2><para> 1.816 @@ -5810,8 +5463,8 @@ 1.817 #. type: Content of: <book><chapter><sect1><sect2><para> 1.818 #: ../en/ch04-daily.xml:454 1.819 msgid "" 1.820 -"The case of diverging names occurs when two developers start with a file—" 1.821 -"let's call it <filename>foo</filename>&emdash;in their respective " 1.822 +"The case of diverging names occurs when two developers start with a " 1.823 +"file&emdash;let's call it <filename>foo</filename>&emdash;in their respective " 1.824 "repositories." 1.825 msgstr "" 1.826 1.827 @@ -8613,8 +8266,7 @@ 1.828 1.829 #. type: Content of: <book><chapter><sect1><title> 1.830 #: ../en/ch07-branch.xml:228 1.831 -#, fuzzy 1.832 -msgid "The flow of changes—big picture vs. little" 1.833 +msgid "The flow of changes&emdash;big picture vs. little" 1.834 msgstr "修改流程—宏观与微观" 1.835 1.836 #. type: Content of: <book><chapter><sect1><para> 1.837 @@ -8667,11 +8319,11 @@ 1.838 #: ../en/ch07-branch.xml:260 1.839 msgid "" 1.840 "The easiest way to isolate a <quote>big picture</quote> branch in Mercurial " 1.841 -"is in a dedicated repository. If you have an existing shared repository—" 1.842 -"let's call it <literal>myproject</literal>&emdash;that reaches a <quote>1.0</" 1.843 -"quote> milestone, you can start to prepare for future maintenance releases on " 1.844 -"top of version 1.0 by tagging the revision from which you prepared the 1.0 " 1.845 -"release." 1.846 +"is in a dedicated repository. If you have an existing shared " 1.847 +"repository&emdash;let's call it <literal>myproject</literal>&emdash;that " 1.848 +"reaches a <quote>1.0</quote> milestone, you can start to prepare for future " 1.849 +"maintenance releases on top of version 1.0 by tagging the revision from which " 1.850 +"you prepared the 1.0 release." 1.851 msgstr "" 1.852 1.853 #. type: Content of: <book><chapter><sect1><para> 1.854 @@ -9092,9 +8744,9 @@ 1.855 #. type: Content of: <book><chapter><sect1><sect2><para> 1.856 #: ../en/ch08-undo.xml:65 1.857 msgid "" 1.858 -"However, luck is with me—I've caught my error before I pushed the changeset. " 1.859 -"I use the <command role=\"hg-cmd\">hg rollback</command> command, and " 1.860 -"Mercurial makes that last changeset vanish." 1.861 +"However, luck is with me&emdash;I've caught my error before I pushed the " 1.862 +"changeset. I use the <command role=\"hg-cmd\">hg rollback</command> command, " 1.863 +"and Mercurial makes that last changeset vanish." 1.864 msgstr "" 1.865 1.866 #. type: Content of: <book><chapter><sect1><sect2><para> 1.867 @@ -9164,12 +8816,12 @@ 1.868 #. type: Content of: <book><chapter><sect1><sect2><para> 1.869 #: ../en/ch08-undo.xml:126 1.870 msgid "" 1.871 -"If you've pushed a change to another repository—particularly if it's a shared " 1.872 -"repository—it has essentially <quote>escaped into the wild,</quote> and " 1.873 -"you'll have to recover from your mistake in a different way. What will " 1.874 -"happen if you push a changeset somewhere, then roll it back, then pull from " 1.875 -"the repository you pushed to, is that the changeset will reappear in your " 1.876 -"repository." 1.877 +"If you've pushed a change to another repository&emdash;particularly if it's a " 1.878 +"shared repository&emdash;it has essentially <quote>escaped into the wild,</" 1.879 +"quote> and you'll have to recover from your mistake in a different way. What " 1.880 +"will happen if you push a changeset somewhere, then roll it back, then pull " 1.881 +"from the repository you pushed to, is that the changeset will reappear in " 1.882 +"your repository." 1.883 msgstr "" 1.884 1.885 #. type: Content of: <book><chapter><sect1><sect2><para> 1.886 @@ -9291,7 +8943,7 @@ 1.887 msgid "" 1.888 "The <command role=\"hg-cmd\">hg revert</command> command is useful for more " 1.889 "than just modified files. It lets you reverse the results of all of " 1.890 -"Mercurial's file management commands—<command role=\"hg-cmd\">hg add</" 1.891 +"Mercurial's file management commands&emdash;<command role=\"hg-cmd\">hg add</" 1.892 "command>, <command role=\"hg-cmd\">hg remove</command>, and so on." 1.893 msgstr "" 1.894 1.895 @@ -9794,12 +9446,13 @@ 1.896 #. type: Content of: <book><chapter><sect1><para> 1.897 #: ../en/ch08-undo.xml:616 1.898 msgid "" 1.899 -"Since Mercurial treats history as accumulative—every change builds on top of " 1.900 -"all changes that preceded it—you generally can't just make disastrous changes " 1.901 -"disappear. The one exception is when you've just committed a change, and it " 1.902 -"hasn't been pushed or pulled into another repository. That's when you can " 1.903 -"safely use the <command role=\"hg-cmd\">hg rollback</command> command, as I " 1.904 -"detailed in <xref linkend=\"sec:undo:rollback\"/>." 1.905 +"Since Mercurial treats history as accumulative&emdash;every change builds on " 1.906 +"top of all changes that preceded it&emdash;you generally can't just make " 1.907 +"disastrous changes disappear. The one exception is when you've just " 1.908 +"committed a change, and it hasn't been pushed or pulled into another " 1.909 +"repository. That's when you can safely use the <command role=\"hg-cmd\">hg " 1.910 +"rollback</command> command, as I detailed in <xref linkend=\"sec:undo:rollback" 1.911 +"\"/>." 1.912 msgstr "" 1.913 1.914 #. type: Content of: <book><chapter><sect1><para> 1.915 @@ -10820,10 +10473,11 @@ 1.916 msgid "" 1.917 "In practice, putting a centralised bottleneck like this in place is not often " 1.918 "a good idea, and transaction visibility has nothing to do with the problem. " 1.919 -"As the size of a project—and the time it takes to build and test—grows, you " 1.920 -"rapidly run into a wall with this <quote>try before you buy</quote> approach, " 1.921 -"where you have more changesets to test than time in which to deal with them. " 1.922 -"The inevitable result is frustration on the part of all involved." 1.923 +"As the size of a project&emdash;and the time it takes to build and " 1.924 +"test&emdash;grows, you rapidly run into a wall with this <quote>try before " 1.925 +"you buy</quote> approach, where you have more changesets to test than time in " 1.926 +"which to deal with them. The inevitable result is frustration on the part of " 1.927 +"all involved." 1.928 msgstr "" 1.929 1.930 #. type: Content of: <book><chapter><sect1><sect2><para> 1.931 @@ -10983,8 +10637,9 @@ 1.932 #. type: Content of: <book><chapter><sect1><sect2><para> 1.933 #: ../en/ch09-hook.xml:464 1.934 msgid "" 1.935 -"You can write a hook either as a normal program—typically a shell script—or " 1.936 -"as a Python function that is executed within the Mercurial process." 1.937 +"You can write a hook either as a normal program&emdash;typically a shell " 1.938 +"script&emdash;or as a Python function that is executed within the Mercurial " 1.939 +"process." 1.940 msgstr "" 1.941 1.942 #. type: Content of: <book><chapter><sect1><sect2><para> 1.943 @@ -11278,9 +10933,8 @@ 1.944 1.945 #. type: Content of: <book><chapter><sect1><sect2><title> 1.946 #: ../en/ch09-hook.xml:716 1.947 -#, fuzzy 1.948 -msgid "" 1.949 -"<literal role=\"hg-ext\">acl</literal>—access control for parts of a " 1.950 +msgid "" 1.951 +"<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a " 1.952 "repository" 1.953 msgstr "<literal role=\"hg-ext\">acl</literal>—版本库的访问控制" 1.954 1.955 @@ -11427,8 +11081,8 @@ 1.956 1.957 #. type: Content of: <book><chapter><sect1><sect2><title> 1.958 #: ../en/ch09-hook.xml:844 1.959 -#, fuzzy 1.960 -msgid "<literal role=\"hg-ext\">bugzilla</literal>—integration with Bugzilla" 1.961 +msgid "" 1.962 +"<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla" 1.963 msgstr "<literal role=\"hg-ext\">bugzilla</literal>—与 Bugzilla 的集成" 1.964 1.965 #. type: Content of: <book><chapter><sect1><sect2><para> 1.966 @@ -11444,7 +11098,7 @@ 1.967 #: ../en/ch09-hook.xml:855 1.968 msgid "" 1.969 "It adds a comment to the bug that looks like this (you can configure the " 1.970 -"contents of the comment—see below):" 1.971 +"contents of the comment&emdash;see below):" 1.972 msgstr "" 1.973 1.974 #. type: Content of: <book><chapter><sect1><sect2><para> 1.975 @@ -11760,8 +11414,8 @@ 1.976 1.977 #. type: Content of: <book><chapter><sect1><sect2><title> 1.978 #: ../en/ch09-hook.xml:1150 1.979 -#, fuzzy 1.980 -msgid "<literal role=\"hg-ext\">notify</literal>—send email notifications" 1.981 +msgid "" 1.982 +"<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications" 1.983 msgstr "<literal role=\"hg-ext\">notify</literal>—邮件通知" 1.984 1.985 #. type: Content of: <book><chapter><sect1><sect2><para> 1.986 @@ -12085,8 +11739,7 @@ 1.987 1.988 #. type: Content of: <book><chapter><sect1><sect2><sect3><title> 1.989 #: ../en/ch09-hook.xml:1431 1.990 -#, fuzzy 1.991 -msgid "Where changes are going—remote repository URLs" 1.992 +msgid "Where changes are going&emdash;remote repository URLs" 1.993 msgstr "修改集要到哪里—远程版本库的地址" 1.994 1.995 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.996 @@ -12111,21 +11764,21 @@ 1.997 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para> 1.998 #: ../en/ch09-hook.xml:1449 1.999 msgid "" 1.1000 -"<literal>remote:ssh:1.2.3.4</literal>—remote ssh client, at the IP address " 1.1001 -"<literal>1.2.3.4</literal>." 1.1002 +"<literal>remote:ssh:1.2.3.4</literal>&emdash;remote ssh client, at the IP " 1.1003 +"address <literal>1.2.3.4</literal>." 1.1004 msgstr "" 1.1005 1.1006 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para> 1.1007 #: ../en/ch09-hook.xml:1454 1.1008 msgid "" 1.1009 -"<literal>remote:http:1.2.3.4</literal>—remote http client, at the IP address " 1.1010 -"<literal>1.2.3.4</literal>. If the client is using SSL, this will be of the " 1.1011 -"form <literal>remote:https:1.2.3.4</literal>." 1.1012 +"<literal>remote:http:1.2.3.4</literal>&emdash;remote http client, at the IP " 1.1013 +"address <literal>1.2.3.4</literal>. If the client is using SSL, this will be " 1.1014 +"of the form <literal>remote:https:1.2.3.4</literal>." 1.1015 msgstr "" 1.1016 1.1017 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para> 1.1018 #: ../en/ch09-hook.xml:1461 1.1019 -msgid "Empty—no information could be discovered about the remote client." 1.1020 +msgid "Empty&emdash;no information could be discovered about the remote client." 1.1021 msgstr "" 1.1022 1.1023 #. type: Content of: <book><chapter><sect1><title> 1.1024 @@ -12135,9 +11788,9 @@ 1.1025 1.1026 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1027 #: ../en/ch09-hook.xml:1473 1.1028 -#, fuzzy 1.1029 -msgid "" 1.1030 -"<literal role=\"hook\">changegroup</literal>—after remote changesets added" 1.1031 +msgid "" 1.1032 +"<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets " 1.1033 +"added" 1.1034 msgstr "<literal role=\"hook\">changegroup</literal>—增加远程修改集之后" 1.1035 1.1036 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1037 @@ -12204,8 +11857,9 @@ 1.1038 1.1039 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1040 #: ../en/ch09-hook.xml:1526 1.1041 -#, fuzzy 1.1042 -msgid "<literal role=\"hook\">commit</literal>—after a new changeset is created" 1.1043 +msgid "" 1.1044 +"<literal role=\"hook\">commit</literal>&emdash;after a new changeset is " 1.1045 +"created" 1.1046 msgstr "<literal role=\"hook\">commit</literal>—创建新修改集之后" 1.1047 1.1048 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1049 @@ -12244,9 +11898,9 @@ 1.1050 1.1051 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1052 #: ../en/ch09-hook.xml:1559 1.1053 -#, fuzzy 1.1054 -msgid "" 1.1055 -"<literal role=\"hook\">incoming</literal>—after one remote changeset is added" 1.1056 +msgid "" 1.1057 +"<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset " 1.1058 +"is added" 1.1059 msgstr "<literal role=\"hook\">incoming</literal>—增加远程修改集之后" 1.1060 1.1061 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1062 @@ -12285,9 +11939,9 @@ 1.1063 1.1064 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1065 #: ../en/ch09-hook.xml:1605 1.1066 -#, fuzzy 1.1067 -msgid "" 1.1068 -"<literal role=\"hook\">outgoing</literal>—after changesets are propagated" 1.1069 +msgid "" 1.1070 +"<literal role=\"hook\">outgoing</literal>&emdash;after changesets are " 1.1071 +"propagated" 1.1072 msgstr "<literal role=\"hook\">outgoing</literal>—传播修改集之后" 1.1073 1.1074 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1075 @@ -12333,10 +11987,9 @@ 1.1076 1.1077 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1078 #: ../en/ch09-hook.xml:1652 1.1079 -#, fuzzy 1.1080 -msgid "" 1.1081 -"<literal role=\"hook\">prechangegroup</literal>—before starting to add remote " 1.1082 -"changesets" 1.1083 +msgid "" 1.1084 +"<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add " 1.1085 +"remote changesets" 1.1086 msgstr "<literal role=\"hook\">prechangegroup</literal>—增加远程修改集之前" 1.1087 1.1088 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1089 @@ -12374,9 +12027,8 @@ 1.1090 1.1091 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1092 #: ../en/ch09-hook.xml:1698 1.1093 -#, fuzzy 1.1094 -msgid "" 1.1095 -"<literal role=\"hook\">precommit</literal>—before starting to commit a " 1.1096 +msgid "" 1.1097 +"<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a " 1.1098 "changeset" 1.1099 msgstr "<literal role=\"hook\">precommit</literal>—提交修改集之前" 1.1100 1.1101 @@ -12427,10 +12079,9 @@ 1.1102 1.1103 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1104 #: ../en/ch09-hook.xml:1738 1.1105 -#, fuzzy 1.1106 -msgid "" 1.1107 -"<literal role=\"hook\">preoutgoing</literal>—before starting to propagate " 1.1108 -"changesets" 1.1109 +msgid "" 1.1110 +"<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to " 1.1111 +"propagate changesets" 1.1112 msgstr "<literal role=\"hook\">preoutgoing</literal>—传播修改集之前" 1.1113 1.1114 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1115 @@ -12466,8 +12117,8 @@ 1.1116 1.1117 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1118 #: ../en/ch09-hook.xml:1775 1.1119 -#, fuzzy 1.1120 -msgid "<literal role=\"hook\">pretag</literal>—before tagging a changeset" 1.1121 +msgid "" 1.1122 +"<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset" 1.1123 msgstr "<literal role=\"hook\">pretag</literal>—创建标签之前" 1.1124 1.1125 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1126 @@ -12516,21 +12167,20 @@ 1.1127 1.1128 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1129 #: ../en/ch09-hook.xml:1815 1.1130 -#, fuzzy 1.1131 -msgid "" 1.1132 -"<literal role=\"hook\">pretxnchangegroup</literal>—before completing addition " 1.1133 -"of remote changesets" 1.1134 +msgid "" 1.1135 +"<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing " 1.1136 +"addition of remote changesets" 1.1137 msgstr "" 1.1138 "<literal role=\"hook\">pretxnchangegroup</literal>—完成增加远程修改集之前" 1.1139 1.1140 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1141 #: ../en/ch09-hook.xml:1819 1.1142 msgid "" 1.1143 -"This controlling hook is run before a transaction—that manages the addition " 1.1144 -"of a group of new changesets from outside the repository—completes. If the " 1.1145 -"hook succeeds, the transaction completes, and all of the changesets become " 1.1146 -"permanent within this repository. If the hook fails, the transaction is " 1.1147 -"rolled back, and the data for the changesets is erased." 1.1148 +"This controlling hook is run before a transaction&emdash;that manages the " 1.1149 +"addition of a group of new changesets from outside the repository&emdash;" 1.1150 +"completes. If the hook succeeds, the transaction completes, and all of the " 1.1151 +"changesets become permanent within this repository. If the hook fails, the " 1.1152 +"transaction is rolled back, and the data for the changesets is erased." 1.1153 msgstr "" 1.1154 1.1155 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1156 @@ -12569,19 +12219,18 @@ 1.1157 1.1158 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1159 #: ../en/ch09-hook.xml:1881 1.1160 -#, fuzzy 1.1161 -msgid "" 1.1162 -"<literal role=\"hook\">pretxncommit</literal>—before completing commit of new " 1.1163 -"changeset" 1.1164 +msgid "" 1.1165 +"<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit " 1.1166 +"of new changeset" 1.1167 msgstr "<literal role=\"hook\">pretxncommit</literal>—完成提交之前" 1.1168 1.1169 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1170 #: ../en/ch09-hook.xml:1884 1.1171 msgid "" 1.1172 -"This controlling hook is run before a transaction—that manages a new commit—" 1.1173 -"completes. If the hook succeeds, the transaction completes and the changeset " 1.1174 -"becomes permanent within this repository. If the hook fails, the transaction " 1.1175 -"is rolled back, and the commit data is erased." 1.1176 +"This controlling hook is run before a transaction&emdash;that manages a new " 1.1177 +"commit&emdash;completes. If the hook succeeds, the transaction completes and " 1.1178 +"the changeset becomes permanent within this repository. If the hook fails, " 1.1179 +"the transaction is rolled back, and the commit data is erased." 1.1180 msgstr "" 1.1181 1.1182 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1183 @@ -12612,10 +12261,9 @@ 1.1184 1.1185 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1186 #: ../en/ch09-hook.xml:1929 1.1187 -#, fuzzy 1.1188 -msgid "" 1.1189 -"<literal role=\"hook\">preupdate</literal>—before updating or merging working " 1.1190 -"directory" 1.1191 +msgid "" 1.1192 +"<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging " 1.1193 +"working directory" 1.1194 msgstr "<literal role=\"hook\">preupdate</literal>—更新或合并工作目录之前" 1.1195 1.1196 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1197 @@ -12652,8 +12300,7 @@ 1.1198 1.1199 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1200 #: ../en/ch09-hook.xml:1961 1.1201 -#, fuzzy 1.1202 -msgid "<literal role=\"hook\">tag</literal>—after tagging a changeset" 1.1203 +msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset" 1.1204 msgstr "<literal role=\"hook\">tag</literal>—创建标签之后" 1.1205 1.1206 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1207 @@ -12701,10 +12348,9 @@ 1.1208 1.1209 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1210 #: ../en/ch09-hook.xml:1998 1.1211 -#, fuzzy 1.1212 -msgid "" 1.1213 -"<literal role=\"hook\">update</literal>—after updating or merging working " 1.1214 -"directory" 1.1215 +msgid "" 1.1216 +"<literal role=\"hook\">update</literal>&emdash;after updating or merging " 1.1217 +"working directory" 1.1218 msgstr "<literal role=\"hook\">update</literal>—更新或合并工作目录之后" 1.1219 1.1220 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1221 @@ -12783,9 +12429,9 @@ 1.1222 #. type: Content of: <book><chapter><sect1><para> 1.1223 #: ../en/ch10-template.xml:26 1.1224 msgid "" 1.1225 -"This is somewhat informative, but it takes up a lot of space—five lines of " 1.1226 -"output per changeset. The <literal>compact</literal> style reduces this to " 1.1227 -"three lines, presented in a sparse manner." 1.1228 +"This is somewhat informative, but it takes up a lot of space&emdash;five " 1.1229 +"lines of output per changeset. The <literal>compact</literal> style reduces " 1.1230 +"this to three lines, presented in a sparse manner." 1.1231 msgstr "" 1.1232 1.1233 #. type: Content of: <book><chapter><sect1><para> 1.1234 @@ -13856,8 +13502,9 @@ 1.1235 #: ../en/ch11-mq.xml:149 1.1236 msgid "" 1.1237 "A major reason that patches have persisted in the free software and open " 1.1238 -"source world—in spite of the availability of increasingly capable revision " 1.1239 -"control tools over the years—is the <emphasis>agility</emphasis> they offer." 1.1240 +"source world&emdash;in spite of the availability of increasingly capable " 1.1241 +"revision control tools over the years&emdash;is the <emphasis>agility</" 1.1242 +"emphasis> they offer." 1.1243 msgstr "" 1.1244 1.1245 #. type: Content of: <book><chapter><sect1><para> 1.1246 @@ -13866,8 +13513,8 @@ 1.1247 "Traditional revision control tools make a permanent, irreversible record of " 1.1248 "everything that you do. While this has great value, it's also somewhat " 1.1249 "stifling. If you want to perform a wild-eyed experiment, you have to be " 1.1250 -"careful in how you go about it, or you risk leaving unneeded—or worse, " 1.1251 -"misleading or destabilising—traces of your missteps and errors in the " 1.1252 +"careful in how you go about it, or you risk leaving unneeded&emdash;or worse, " 1.1253 +"misleading or destabilising&emdash;traces of your missteps and errors in the " 1.1254 "permanent revision record." 1.1255 msgstr "" 1.1256 1.1257 @@ -13878,23 +13525,23 @@ 1.1258 "it much easier to isolate your work. Your patches live on top of normal " 1.1259 "revision history, and you can make them disappear or reappear at will. If " 1.1260 "you don't like a patch, you can drop it. If a patch isn't quite as you want " 1.1261 -"it to be, simply fix it—as many times as you need to, until you have refined " 1.1262 -"it into the form you desire." 1.1263 +"it to be, simply fix it&emdash;as many times as you need to, until you have " 1.1264 +"refined it into the form you desire." 1.1265 msgstr "" 1.1266 1.1267 #. type: Content of: <book><chapter><sect1><para> 1.1268 #: ../en/ch11-mq.xml:171 1.1269 msgid "" 1.1270 "As an example, the integration of patches with revision control makes " 1.1271 -"understanding patches and debugging their effects—and their interplay with " 1.1272 -"the code they're based on—<emphasis>enormously</emphasis> easier. Since every " 1.1273 -"applied patch has an associated changeset, you can give <command role=\"hg-cmd" 1.1274 -"\">hg log</command> a file name to see which changesets and patches affected " 1.1275 -"the file. You can use the <command role=\"hg-cmd\">hg bisect</command> " 1.1276 -"command to binary-search through all changesets and applied patches to see " 1.1277 -"where a bug got introduced or fixed. You can use the <command role=\"hg-cmd" 1.1278 -"\">hg annotate</command> command to see which changeset or patch modified a " 1.1279 -"particular line of a source file. And so on." 1.1280 +"understanding patches and debugging their effects&emdash;and their interplay " 1.1281 +"with the code they're based on&emdash;<emphasis>enormously</emphasis> easier. " 1.1282 +"Since every applied patch has an associated changeset, you can give <command " 1.1283 +"role=\"hg-cmd\">hg log</command> a file name to see which changesets and " 1.1284 +"patches affected the file. You can use the <command role=\"hg-cmd\">hg " 1.1285 +"bisect</command> command to binary-search through all changesets and applied " 1.1286 +"patches to see where a bug got introduced or fixed. You can use the <command " 1.1287 +"role=\"hg-cmd\">hg annotate</command> command to see which changeset or patch " 1.1288 +"modified a particular line of a source file. And so on." 1.1289 msgstr "" 1.1290 1.1291 #. type: Content of: <book><chapter><sect1><para> 1.1292 @@ -14266,14 +13913,15 @@ 1.1293 msgid "" 1.1294 "Here's an example that illustrates how you can use this ability. Let's say " 1.1295 "you're developing a new feature as two patches. The first is a change to the " 1.1296 -"core of your software, and the second—layered on top of the first—changes the " 1.1297 -"user interface to use the code you just added to the core. If you notice a " 1.1298 -"bug in the core while you're working on the UI patch, it's easy to fix the " 1.1299 -"core. Simply <command role=\"hg-ext-mq\">qrefresh</command> the UI patch to " 1.1300 -"save your in-progress changes, and <command role=\"hg-ext-mq\">qpop</command> " 1.1301 -"down to the core patch. Fix the core bug, <command role=\"hg-ext-mq" 1.1302 -"\">qrefresh</command> the core patch, and <command role=\"hg-ext-mq\">qpush</" 1.1303 -"command> back to the UI patch to continue where you left off." 1.1304 +"core of your software, and the second&emdash;layered on top of the " 1.1305 +"first&emdash;changes the user interface to use the code you just added to the " 1.1306 +"core. If you notice a bug in the core while you're working on the UI patch, " 1.1307 +"it's easy to fix the core. Simply <command role=\"hg-ext-mq\">qrefresh</" 1.1308 +"command> the UI patch to save your in-progress changes, and <command role=" 1.1309 +"\"hg-ext-mq\">qpop</command> down to the core patch. Fix the core bug, " 1.1310 +"<command role=\"hg-ext-mq\">qrefresh</command> the core patch, and <command " 1.1311 +"role=\"hg-ext-mq\">qpush</command> back to the UI patch to continue where you " 1.1312 +"left off." 1.1313 msgstr "" 1.1314 1.1315 #. type: Content of: <book><chapter><sect1><title> 1.1316 @@ -14576,8 +14224,8 @@ 1.1317 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1318 #: ../en/ch11-mq.xml:731 1.1319 msgid "" 1.1320 -"A large hunk might apply better—either entirely or in part&emdash;if it was " 1.1321 -"broken up into smaller hunks." 1.1322 +"A large hunk might apply better&emdash;either entirely or in part&emdash;if " 1.1323 +"it was broken up into smaller hunks." 1.1324 msgstr "" 1.1325 1.1326 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.1327 @@ -15076,12 +14724,12 @@ 1.1328 msgid "" 1.1329 "The <command>diffstat</command> command <citation>web:diffstat</citation> " 1.1330 "generates a histogram of the modifications made to each file in a patch. It " 1.1331 -"provides a good way to <quote>get a sense of</quote> a patch—which files it " 1.1332 -"affects, and how much change it introduces to each file and as a whole. (I " 1.1333 -"find that it's a good idea to use <command>diffstat</command>'s <option role=" 1.1334 -"\"cmd-opt-diffstat\">-p</option> option as a matter of course, as otherwise " 1.1335 -"it will try to do clever things with prefixes of file names that inevitably " 1.1336 -"confuse at least me.)" 1.1337 +"provides a good way to <quote>get a sense of</quote> a patch&emdash;which " 1.1338 +"files it affects, and how much change it introduces to each file and as a " 1.1339 +"whole. (I find that it's a good idea to use <command>diffstat</command>'s " 1.1340 +"<option role=\"cmd-opt-diffstat\">-p</option> option as a matter of course, " 1.1341 +"as otherwise it will try to do clever things with prefixes of file names that " 1.1342 +"inevitably confuse at least me.)" 1.1343 msgstr "" 1.1344 1.1345 #. type: Content of: <book><chapter><sect1><para> 1.1346 @@ -15131,12 +14779,13 @@ 1.1347 #: ../en/ch11-mq.xml:1160 1.1348 msgid "" 1.1349 "Be aware of what patch you're working on. Use the <command role=\"hg-ext-mq" 1.1350 -"\">qtop</command> command and skim over the text of your patches frequently—" 1.1351 -"for example, using <command role=\"hg-cmd\">hg tip <option role=\"hg-opt-tip" 1.1352 -"\">-p</option></command>)—to be sure of where you stand. I have several " 1.1353 -"times worked on and <command role=\"hg-ext-mq\">qrefresh</command>ed a patch " 1.1354 -"other than the one I intended, and it's often tricky to migrate changes into " 1.1355 -"the right patch after making them in the wrong one." 1.1356 +"\">qtop</command> command and skim over the text of your patches " 1.1357 +"frequently&emdash;for example, using <command role=\"hg-cmd\">hg tip <option " 1.1358 +"role=\"hg-opt-tip\">-p</option></command>)&emdash;to be sure of where you " 1.1359 +"stand. I have several times worked on and <command role=\"hg-ext-mq" 1.1360 +"\">qrefresh</command>ed a patch other than the one I intended, and it's often " 1.1361 +"tricky to migrate changes into the right patch after making them in the wrong " 1.1362 +"one." 1.1363 msgstr "" 1.1364 1.1365 #. type: Content of: <book><chapter><sect1><para> 1.1366 @@ -15966,7 +15615,7 @@ 1.1367 msgstr "" 1.1368 1.1369 # 1.1370 -#. &example.hg-interdiff; 1.1371 +#. &example.hg-interdiff; 1.1372 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1373 #: ../en/ch12-mq-collab.xml:466 1.1374 msgid ""