hgbook
changeset 668:55e2953f82d6
Update Chinese translation
| author | Dongsheng Song <songdongsheng@live.cn> |
|---|---|
| date | Sun Apr 05 12:12:00 2009 +0800 (2009-04-05) |
| parents | 3b33dd6aba87 |
| children | a79fb712fe20 |
| files | Makefile Makefile.vars.tmpl en/00book.xml po/zh.po |
line diff
1.1 --- a/Makefile Thu Apr 02 09:24:36 2009 +0800 1.2 +++ b/Makefile Sun Apr 05 12:12:00 2009 +0800 1.3 @@ -14,7 +14,9 @@ 1.4 -o nodefault="<programlisting> <screen>" \ 1.5 -o untranslated="<programlisting> <screen>" 1.6 TRANSLATE = PERLLIB=$(PO4A_LIB) $(PO4A_HOME)/po4a-translate -M UTF-8 \ 1.7 - -f docbook -o doctype=docbook \ 1.8 + -f docbook -o doctype=docbook -o includeexternal \ 1.9 + -o nodefault="<programlisting> <screen>" \ 1.10 + -o untranslated="<programlisting> <screen>" \ 1.11 -k 0 1.12 1.13 #rev_id = $(shell hg parents --template '{node|short} ({date|isodate})') 1.14 @@ -122,8 +124,6 @@ 1.15 ifneq "$(findstring $(LINGUA),$(PO_LANGUAGES))" "" 1.16 (cd po; \ 1.17 $(UPDATEPO) -m ../en/00book.xml -p $(LINGUA).po; \ 1.18 - cat $(LINGUA).po | sed 's/&emdash;/—/' > $(LINGUA).po.tmp; \ 1.19 - mv $(LINGUA).po.tmp $(LINGUA).po \ 1.20 ) 1.21 $(MAKE) tidypo LINGUA=$(LINGUA) 1.22 endif 1.23 @@ -142,7 +142,7 @@ 1.24 $(LINGUA)/examples/.run: 1.25 (cd $(LINGUA)/examples; ./run-example -v -a) 1.26 1.27 -build/$(LINGUA)/source/hgbook.xml: $(wildcard $(LINGUA)/*.xml) $(images) $(LINGUA)/examples/.run $(images) 1.28 +build/$(LINGUA)/source/hgbook.xml: $(wildcard $(LINGUA)/*.xml) $(images) $(LINGUA)/examples/.run 1.29 mkdir -p build/$(LINGUA)/source/figs 1.30 cp $(LINGUA)/figs/*.png build/$(LINGUA)/source/figs 1.31 cp stylesheets/hgbook.css build/$(LINGUA)/source 1.32 @@ -155,12 +155,14 @@ 1.33 build/en/source/hgbook.xml: 1.34 ${MAKE} LINGUA=en $@ 1.35 1.36 -build/$(LINGUA)/source/hgbook.xml: build/en/source/hgbook.xml po/$(LINGUA).po $(images) 1.37 +build/$(LINGUA)/source/hgbook.xml: $(wildcard en/*.xml) po/$(LINGUA).po $(images) 1.38 mkdir -p build/$(LINGUA)/source/figs 1.39 cp en/figs/*.png build/$(LINGUA)/source/figs 1.40 cp stylesheets/hgbook.css build/$(LINGUA)/source 1.41 - $(TRANSLATE) -m build/en/source/hgbook.xml.tmp -p po/$(LINGUA).po -l $@.tmp 1.42 + $(TRANSLATE) -m en/00book.xml -p po/$(LINGUA).po -l en/hgbook.xml.$(LINGUA) 1.43 + xmllint --nonet --noent --xinclude --postvalid --output $@.tmp en/hgbook.xml.$(LINGUA) 1.44 cat $@.tmp | sed 's/\$$rev_id\$$/${rev_id}/' > $@ 1.45 + mv en/hgbook.xml.$(LINGUA) build/$(LINGUA)/source 1.46 endif 1.47 1.48 endif 1.49 @@ -220,7 +222,7 @@ 1.50 1.51 build/$(LINGUA)/pdf/hgbook.pdf: build/$(LINGUA)/source/hgbook.xml stylesheets/fo.xsl stylesheets/$(LINGUA)/fo.xsl 1.52 mkdir -p build/$(LINGUA)/pdf 1.53 - java -classpath $(JAVA_SHARE)/saxon65.jar:$(JAVA_SHARE)/saxon65-dbxsl.jar:$(JAVA_SHARE)/xml-commons-resolver-1.2.jar:$(JAVA_SHARE) \ 1.54 + java -classpath $(JAVA_LIB)/saxon65.jar:$(JAVA_LIB)/saxon65-dbxsl.jar:$(JAVA_LIB)/xml-commons-resolver-1.2.jar:$(JAVA_LIB) \ 1.55 com.icl.saxon.StyleSheet \ 1.56 -x org.apache.xml.resolver.tools.ResolvingXMLReader \ 1.57 -y org.apache.xml.resolver.tools.ResolvingXMLReader \
2.1 --- a/Makefile.vars.tmpl Thu Apr 02 09:24:36 2009 +0800 2.2 +++ b/Makefile.vars.tmpl Sun Apr 05 12:12:00 2009 +0800 2.3 @@ -11,7 +11,7 @@ 2.4 PO4A_LIB=$(PO4A_HOME)/lib 2.5 2.6 # saxon65.jar, saxon65-dbxsl.jar, xml-commons-resolver-1.2.jar: Only for pdf format ! 2.7 -JAVA_SHARE=/home/dongsheng/var/svn/i18n-zh/trunk/lib/share/java 2.8 +JAVA_LIB=/home/dongsheng/var/svn/i18n-zh/trunk/lib/share/java 2.9 2.10 # fop (>= 0.9.6): Only for pdf format ! 2.11 FOP_HOME=/home/dongsheng/var/svn/i18n-zh/trunk/lib/fop
3.1 --- a/en/00book.xml Thu Apr 02 09:24:36 2009 +0800 3.2 +++ b/en/00book.xml Sun Apr 05 12:12:00 2009 +0800 3.3 @@ -96,8 +96,6 @@ 3.4 &ch12; 3.5 <!-- BEGIN ch13 --> 3.6 &ch13; 3.7 - <!-- BEGIN appA --> 3.8 - <!-- &appA; --> 3.9 <!-- BEGIN appB --> 3.10 &appB; 3.11 <!-- BEGIN appC -->
4.1 --- a/po/zh.po Thu Apr 02 09:24:36 2009 +0800 4.2 +++ b/po/zh.po Sun Apr 05 12:12:00 2009 +0800 4.3 @@ -41,9 +41,9 @@ 4.4 msgid "" 4.5 msgstr "" 4.6 "Project-Id-Version: hgbook 1.2\n" 4.7 -"POT-Creation-Date: 2009-04-02 09:21+0800\n" 4.8 -"PO-Revision-Date: 2009-03-31 10:12+0800\n" 4.9 -"Last-Translator: \n" 4.10 +"POT-Creation-Date: 2009-04-05 11:48+0800\n" 4.11 +"PO-Revision-Date: 2009-04-05 12:10+0800\n" 4.12 +"Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n" 4.13 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" 4.14 "MIME-Version: 1.0\n" 4.15 "Content-Type: text/plain; charset=UTF-8\n" 4.16 @@ -65,7 +65,7 @@ 4.17 #. type: Content of: <book><bookinfo> 4.18 #: ../en/00book.xml:48 4.19 msgid "<edition>1</edition> <isbn>9780596800673</isbn>" 4.20 -msgstr "" 4.21 +msgstr "<edition>1</edition> <isbn>9780596800673</isbn>" 4.22 4.23 #. type: Content of: <book><bookinfo><authorgroup><author><firstname> 4.24 #: ../en/00book.xml:52 4.25 @@ -89,340 +89,6 @@ 4.26 "year> <holder>Bryan O'Sullivan</holder> </copyright>" 4.27 4.28 #. type: Content of: <book><appendix><title> 4.29 -#: ../en/appA-cmdref.xml:5 4.30 -msgid "Command reference" 4.31 -msgstr "命令参考" 4.32 - 4.33 -#. type: Content of: <book><appendix><para> 4.34 -#: ../en/appA-cmdref.xml:7 4.35 -msgid "" 4.36 -"\\cmdref{add}{add files at the next commit} \\optref{add}{I}{include} \\optref" 4.37 -"{add}{X}{exclude} \\optref{add}{n}{dry-run}" 4.38 -msgstr "" 4.39 - 4.40 -#. type: Content of: <book><appendix><para> 4.41 -#: ../en/appA-cmdref.xml:12 4.42 -msgid "\\cmdref{diff}{print changes in history or working directory}" 4.43 -msgstr "" 4.44 - 4.45 -#. type: Content of: <book><appendix><para> 4.46 -#: ../en/appA-cmdref.xml:14 4.47 -msgid "" 4.48 -"Show differences between revisions for the specified files or directories, " 4.49 -"using the unified diff format. For a description of the unified diff format, " 4.50 -"see <xref linkend=\"sec:mq:patch\"/>." 4.51 -msgstr "" 4.52 - 4.53 -#. type: Content of: <book><appendix><para> 4.54 -#: ../en/appA-cmdref.xml:18 4.55 -msgid "" 4.56 -"By default, this command does not print diffs for files that Mercurial " 4.57 -"considers to contain binary data. To control this behaviour, see the <option " 4.58 -"role=\"hg-opt-diff\">-a</option> and <option role=\"hg-opt-diff\">--git</" 4.59 -"option> options." 4.60 -msgstr "" 4.61 - 4.62 -#. type: Content of: <book><appendix><sect2><title> 4.63 -#: ../en/appA-cmdref.xml:23 4.64 -msgid "Options" 4.65 -msgstr "选项" 4.66 - 4.67 -#. type: Content of: <book><appendix><sect2><para> 4.68 -#: ../en/appA-cmdref.xml:25 4.69 -msgid "\\loptref{diff}{nodates}" 4.70 -msgstr "" 4.71 - 4.72 -#. type: Content of: <book><appendix><sect2><para> 4.73 -#: ../en/appA-cmdref.xml:27 4.74 -msgid "Omit date and time information when printing diff headers." 4.75 -msgstr "" 4.76 - 4.77 -#. type: Content of: <book><appendix><sect2><para> 4.78 -#: ../en/appA-cmdref.xml:29 4.79 -msgid "\\optref{diff}{B}{ignore-blank-lines}" 4.80 -msgstr "" 4.81 - 4.82 -#. type: Content of: <book><appendix><sect2><para> 4.83 -#: ../en/appA-cmdref.xml:31 4.84 -msgid "" 4.85 -"Do not print changes that only insert or delete blank lines. A line that " 4.86 -"contains only whitespace is not considered blank." 4.87 -msgstr "" 4.88 - 4.89 -#. type: Content of: <book><appendix><sect2><para> 4.90 -#: ../en/appA-cmdref.xml:35 4.91 -msgid "\\optref{diff}{I}{include}" 4.92 -msgstr "" 4.93 - 4.94 -#. type: Content of: <book><appendix><sect2><para> 4.95 -#: ../en/appA-cmdref.xml:38 4.96 -msgid "Include files and directories whose names match the given patterns." 4.97 -msgstr "" 4.98 - 4.99 -#. type: Content of: <book><appendix><sect2><para> 4.100 -#: ../en/appA-cmdref.xml:41 4.101 -msgid "\\optref{diff}{X}{exclude}" 4.102 -msgstr "" 4.103 - 4.104 -#. type: Content of: <book><appendix><sect2><para> 4.105 -#: ../en/appA-cmdref.xml:44 4.106 -msgid "Exclude files and directories whose names match the given patterns." 4.107 -msgstr "" 4.108 - 4.109 -#. type: Content of: <book><appendix><sect2><para> 4.110 -#: ../en/appA-cmdref.xml:47 4.111 -msgid "\\optref{diff}{a}{text}" 4.112 -msgstr "" 4.113 - 4.114 -#. type: Content of: <book><appendix><sect2><para> 4.115 -#: ../en/appA-cmdref.xml:50 4.116 -msgid "" 4.117 -"If this option is not specified, <command role=\"hg-cmd\">hg diff</command> " 4.118 -"will refuse to print diffs for files that it detects as binary. Specifying " 4.119 -"<option role=\"hg-opt-diff\">-a</option> forces <command role=\"hg-cmd\">hg " 4.120 -"diff</command> to treat all files as text, and generate diffs for all of them." 4.121 -msgstr "" 4.122 - 4.123 -#. type: Content of: <book><appendix><sect2><para> 4.124 -#: ../en/appA-cmdref.xml:56 4.125 -msgid "" 4.126 -"This option is useful for files that are <quote>mostly text</quote> but have " 4.127 -"a few embedded NUL characters. If you use it on files that contain a lot of " 4.128 -"binary data, its output will be incomprehensible." 4.129 -msgstr "" 4.130 - 4.131 -#. type: Content of: <book><appendix><sect2><para> 4.132 -#: ../en/appA-cmdref.xml:61 4.133 -msgid "\\optref{diff}{b}{ignore-space-change}" 4.134 -msgstr "" 4.135 - 4.136 -#. type: Content of: <book><appendix><sect2><para> 4.137 -#: ../en/appA-cmdref.xml:64 4.138 -msgid "" 4.139 -"Do not print a line if the only change to that line is in the amount of white " 4.140 -"space it contains." 4.141 -msgstr "" 4.142 - 4.143 -#. type: Content of: <book><appendix><sect2><para> 4.144 -#: ../en/appA-cmdref.xml:68 4.145 -msgid "\\optref{diff}{g}{git}" 4.146 -msgstr "" 4.147 - 4.148 -#. type: Content of: <book><appendix><sect2><para> 4.149 -#: ../en/appA-cmdref.xml:71 4.150 -msgid "" 4.151 -"Print <command>git</command>-compatible diffs. XXX reference a format " 4.152 -"description." 4.153 -msgstr "" 4.154 - 4.155 -#. type: Content of: <book><appendix><sect2><para> 4.156 -#: ../en/appA-cmdref.xml:75 4.157 -msgid "\\optref{diff}{p}{show-function}" 4.158 -msgstr "" 4.159 - 4.160 -#. type: Content of: <book><appendix><sect2><para> 4.161 -#: ../en/appA-cmdref.xml:78 4.162 -msgid "" 4.163 -"Display the name of the enclosing function in a hunk header, using a simple " 4.164 -"heuristic. This functionality is enabled by default, so the <option role=" 4.165 -"\"hg-opt-diff\">-p</option> option has no effect unless you change the value " 4.166 -"of the <envar role=\"rc-item-diff\">showfunc</envar> config item, as in the " 4.167 -"following example." 4.168 -msgstr "" 4.169 - 4.170 -#. type: Content of: <book><appendix><sect2><para> 4.171 -#: ../en/appA-cmdref.xml:85 4.172 -msgid "\\optref{diff}{r}{rev}" 4.173 -msgstr "" 4.174 - 4.175 -#. type: Content of: <book><appendix><sect2><para> 4.176 -#: ../en/appA-cmdref.xml:88 4.177 -msgid "" 4.178 -"Specify one or more revisions to compare. The <command role=\"hg-cmd\">hg " 4.179 -"diff</command> command accepts up to two <option role=\"hg-opt-diff\">-r</" 4.180 -"option> options to specify the revisions to compare." 4.181 -msgstr "" 4.182 - 4.183 -#. type: Content of: <book><appendix><sect2><orderedlist><listitem><para> 4.184 -#: ../en/appA-cmdref.xml:94 4.185 -msgid "" 4.186 -"Display the differences between the parent revision of the working directory " 4.187 -"and the working directory." 4.188 -msgstr "" 4.189 - 4.190 -#. type: Content of: <book><appendix><sect2><orderedlist><listitem><para> 4.191 -#: ../en/appA-cmdref.xml:98 4.192 -msgid "" 4.193 -"Display the differences between the specified changeset and the working " 4.194 -"directory." 4.195 -msgstr "" 4.196 - 4.197 -#. type: Content of: <book><appendix><sect2><orderedlist><listitem><para> 4.198 -#: ../en/appA-cmdref.xml:102 4.199 -msgid "Display the differences between the two specified changesets." 4.200 -msgstr "" 4.201 - 4.202 -#. type: Content of: <book><appendix><sect2><para> 4.203 -#: ../en/appA-cmdref.xml:106 4.204 -msgid "" 4.205 -"You can specify two revisions using either two <option role=\"hg-opt-diff\">-" 4.206 -"r</option> options or revision range notation. For example, the two revision " 4.207 -"specifications below are equivalent." 4.208 -msgstr "" 4.209 - 4.210 -#. type: Content of: <book><appendix><sect2><para> 4.211 -#: ../en/appA-cmdref.xml:113 4.212 -msgid "" 4.213 -"When you provide two revisions, Mercurial treats the order of those revisions " 4.214 -"as significant. Thus, <command role=\"hg-cmd\">hg diff -r10:20</command> " 4.215 -"will produce a diff that will transform files from their contents as of " 4.216 -"revision 10 to their contents as of revision 20, while <command role=\"hg-cmd" 4.217 -"\">hg diff -r20:10</command> means the opposite: the diff that will transform " 4.218 -"files from their revision 20 contents to their revision 10 contents. You " 4.219 -"cannot reverse the ordering in this way if you are diffing against the " 4.220 -"working directory." 4.221 -msgstr "" 4.222 - 4.223 -#. type: Content of: <book><appendix><sect2><para> 4.224 -#: ../en/appA-cmdref.xml:123 4.225 -msgid "\\optref{diff}{w}{ignore-all-space}" 4.226 -msgstr "" 4.227 - 4.228 -#. type: Content of: <book><appendix><sect2><para> 4.229 -#: ../en/appA-cmdref.xml:126 4.230 -msgid "\\cmdref{version}{print version and copyright information}" 4.231 -msgstr "" 4.232 - 4.233 -#. type: Content of: <book><appendix><sect2><para> 4.234 -#: ../en/appA-cmdref.xml:129 4.235 -msgid "" 4.236 -"This command displays the version of Mercurial you are running, and its " 4.237 -"copyright license. There are four kinds of version string that you may see." 4.238 -msgstr "" 4.239 - 4.240 -#. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para> 4.241 -#: ../en/appA-cmdref.xml:134 4.242 -msgid "" 4.243 -"The string <quote><literal>unknown</literal></quote>. This version of " 4.244 -"Mercurial was not built in a Mercurial repository, and cannot determine its " 4.245 -"own version." 4.246 -msgstr "" 4.247 - 4.248 -#. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para> 4.249 -#: ../en/appA-cmdref.xml:139 4.250 -msgid "" 4.251 -"A short numeric string, such as <quote><literal>1.1</literal></quote>. This " 4.252 -"is a build of a revision of Mercurial that was identified by a specific tag " 4.253 -"in the repository where it was built. (This doesn't necessarily mean that " 4.254 -"you're running an official release; someone else could have added that tag to " 4.255 -"any revision in the repository where they built Mercurial.)" 4.256 -msgstr "" 4.257 - 4.258 -#. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para> 4.259 -#: ../en/appA-cmdref.xml:147 4.260 -msgid "" 4.261 -"A hexadecimal string, such as <quote><literal>875489e31abe</literal></" 4.262 -"quote>. This is a build of the given revision of Mercurial." 4.263 -msgstr "" 4.264 - 4.265 -#. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para> 4.266 -#: ../en/appA-cmdref.xml:151 4.267 -msgid "" 4.268 -"A hexadecimal string followed by a date, such as <quote><literal>875489e31abe" 4.269 -"+20070205</literal></quote>. This is a build of the given revision of " 4.270 -"Mercurial, where the build repository contained some local changes that had " 4.271 -"not been committed." 4.272 -msgstr "" 4.273 - 4.274 -#. type: Content of: <book><appendix><sect2><title> 4.275 -#: ../en/appA-cmdref.xml:160 4.276 -msgid "Tips and tricks" 4.277 -msgstr "" 4.278 - 4.279 -#. type: Content of: <book><appendix><sect2><sect3><title> 4.280 -#: ../en/appA-cmdref.xml:163 4.281 -msgid "" 4.282 -"Why do the results of <command role=\"hg-cmd\">hg diff</command> and <command " 4.283 -"role=\"hg-cmd\">hg status</command> differ?" 4.284 -msgstr "" 4.285 -"为什么 <command role=\"hg-cmd\">hg diff</command> 与 <command role=\"hg-cmd" 4.286 -"\">hg status</command> 的结果不同 ?" 4.287 - 4.288 -#. type: Content of: <book><appendix><sect2><sect3><para> 4.289 -#: ../en/appA-cmdref.xml:165 4.290 -msgid "" 4.291 -"When you run the <command role=\"hg-cmd\">hg status</command> command, you'll " 4.292 -"see a list of files that Mercurial will record changes for the next time you " 4.293 -"perform a commit. If you run the <command role=\"hg-cmd\">hg diff</command> " 4.294 -"command, you may notice that it prints diffs for only a <emphasis>subset</" 4.295 -"emphasis> of the files that <command role=\"hg-cmd\">hg status</command> " 4.296 -"listed. There are two possible reasons for this." 4.297 -msgstr "" 4.298 - 4.299 -#. type: Content of: <book><appendix><sect2><sect3><para> 4.300 -#: ../en/appA-cmdref.xml:172 4.301 -msgid "" 4.302 -"The first is that <command role=\"hg-cmd\">hg status</command> prints some " 4.303 -"kinds of modifications that <command role=\"hg-cmd\">hg diff</command> " 4.304 -"doesn't normally display. The <command role=\"hg-cmd\">hg diff</command> " 4.305 -"command normally outputs unified diffs, which don't have the ability to " 4.306 -"represent some changes that Mercurial can track. Most notably, traditional " 4.307 -"diffs can't represent a change in whether or not a file is executable, but " 4.308 -"Mercurial records this information." 4.309 -msgstr "" 4.310 - 4.311 -#. type: Content of: <book><appendix><sect2><sect3><para> 4.312 -#: ../en/appA-cmdref.xml:180 4.313 -msgid "" 4.314 -"If you use the <option role=\"hg-opt-diff\">--git</option> option to <command " 4.315 -"role=\"hg-cmd\">hg diff</command>, it will display <command>git</command>-" 4.316 -"compatible diffs that <emphasis>can</emphasis> display this extra information." 4.317 -msgstr "" 4.318 - 4.319 -#. type: Content of: <book><appendix><sect2><sect3><para> 4.320 -#: ../en/appA-cmdref.xml:185 4.321 -msgid "" 4.322 -"The second possible reason that <command role=\"hg-cmd\">hg diff</command> " 4.323 -"might be printing diffs for a subset of the files displayed by <command role=" 4.324 -"\"hg-cmd\">hg status</command> is that if you invoke it without any " 4.325 -"arguments, <command role=\"hg-cmd\">hg diff</command> prints diffs against " 4.326 -"the first parent of the working directory. If you have run <command role=" 4.327 -"\"hg-cmd\">hg merge</command> to merge two changesets, but you haven't yet " 4.328 -"committed the results of the merge, your working directory has two parents " 4.329 -"(use <command role=\"hg-cmd\">hg parents</command> to see them). While " 4.330 -"<command role=\"hg-cmd\">hg status</command> prints modifications relative to " 4.331 -"<emphasis>both</emphasis> parents after an uncommitted merge, <command role=" 4.332 -"\"hg-cmd\">hg diff</command> still operates relative only to the first " 4.333 -"parent. You can get it to print diffs relative to the second parent by " 4.334 -"specifying that parent with the <option role=\"hg-opt-diff\">-r</option> " 4.335 -"option. There is no way to print diffs relative to both parents." 4.336 -msgstr "" 4.337 - 4.338 -#. type: Content of: <book><appendix><sect2><sect3><title> 4.339 -#: ../en/appA-cmdref.xml:201 4.340 -msgid "Generating safe binary diffs" 4.341 -msgstr "生成安全的二进制差异" 4.342 - 4.343 -#. type: Content of: <book><appendix><sect2><sect3><para> 4.344 -#: ../en/appA-cmdref.xml:203 4.345 -msgid "" 4.346 -"If you use the <option role=\"hg-opt-diff\">-a</option> option to force " 4.347 -"Mercurial to print diffs of files that are either <quote>mostly text</quote> " 4.348 -"or contain lots of binary data, those diffs cannot subsequently be applied by " 4.349 -"either Mercurial's <command role=\"hg-cmd\">hg import</command> command or " 4.350 -"the system's <command>patch</command> command." 4.351 -msgstr "" 4.352 - 4.353 -#. type: Content of: <book><appendix><sect2><sect3><para> 4.354 -#: ../en/appA-cmdref.xml:210 4.355 -msgid "" 4.356 -"If you want to generate a diff of a binary file that is safe to use as input " 4.357 -"for <command role=\"hg-cmd\">hg import</command>, use the <command role=\"hg-" 4.358 -"cmd\">hg diff</command>{--git} option when you generate the patch. The " 4.359 -"system <command>patch</command> command cannot handle binary patches at all." 4.360 -msgstr "" 4.361 - 4.362 -#. type: Content of: <book><appendix><title> 4.363 #: ../en/appB-mq-ref.xml:5 4.364 msgid "Mercurial Queues reference" 4.365 msgstr "Mercurial 队列参考" 4.366 @@ -441,8 +107,8 @@ 4.367 4.368 #. type: Content of: <book><appendix><sect1><sect2><title> 4.369 #: ../en/appB-mq-ref.xml:14 4.370 -#, fuzzy 4.371 -msgid "<command role=\"hg-ext-mq\">qapplied</command>—print applied patches" 4.372 +msgid "" 4.373 +"<command role=\"hg-ext-mq\">qapplied</command>&emdash;print applied patches" 4.374 msgstr "<command role=\"hg-ext-mq\">qapplied</command>—显示已应用的补丁" 4.375 4.376 #. type: Content of: <book><appendix><sect1><sect2><para> 4.377 @@ -455,10 +121,9 @@ 4.378 4.379 #. type: Content of: <book><appendix><sect1><sect2><title> 4.380 #: ../en/appB-mq-ref.xml:24 4.381 -#, fuzzy 4.382 -msgid "" 4.383 -"<command role=\"hg-ext-mq\">qcommit</command>—commit changes in the queue " 4.384 -"repository" 4.385 +msgid "" 4.386 +"<command role=\"hg-ext-mq\">qcommit</command>&emdash;commit changes in the " 4.387 +"queue repository" 4.388 msgstr "<command role=\"hg-ext-mq\">qcommit</command>—提交队列中的修改" 4.389 4.390 #. type: Content of: <book><appendix><sect1><sect2><para> 4.391 @@ -483,9 +148,8 @@ 4.392 4.393 #. type: Content of: <book><appendix><sect1><sect2><title> 4.394 #: ../en/appB-mq-ref.xml:43 4.395 -#, fuzzy 4.396 -msgid "" 4.397 -"<command role=\"hg-ext-mq\">qdelete</command>—delete a patch from the " 4.398 +msgid "" 4.399 +"<command role=\"hg-ext-mq\">qdelete</command>&emdash;delete a patch from the " 4.400 "<filename role=\"special\">series</filename> file" 4.401 msgstr "" 4.402 "<command role=\"hg-ext-mq\">qdelete</command>—从文件 <filename role=\"special" 4.403 @@ -508,7 +172,7 @@ 4.404 #: ../en/appB-mq-ref.xml:335 ../en/appB-mq-ref.xml:404 4.405 #: ../en/appB-mq-ref.xml:497 4.406 msgid "Options:" 4.407 -msgstr "" 4.408 +msgstr "选项:" 4.409 4.410 #. type: Content of: <book><appendix><sect1><sect2><itemizedlist><listitem><para> 4.411 #: ../en/appB-mq-ref.xml:59 4.412 @@ -518,10 +182,9 @@ 4.413 4.414 #. type: Content of: <book><appendix><sect1><sect2><title> 4.415 #: ../en/appB-mq-ref.xml:66 4.416 -#, fuzzy 4.417 -msgid "" 4.418 -"<command role=\"hg-ext-mq\">qdiff</command>—print a diff of the topmost " 4.419 -"applied patch" 4.420 +msgid "" 4.421 +"<command role=\"hg-ext-mq\">qdiff</command>&emdash;print a diff of the " 4.422 +"topmost applied patch" 4.423 msgstr "<command role=\"hg-ext-mq\">qdiff</command>—显示最新应用补丁的差异" 4.424 4.425 #. type: Content of: <book><appendix><sect1><sect2><para> 4.426 @@ -534,10 +197,9 @@ 4.427 4.428 #. type: Content of: <book><appendix><sect1><sect2><title> 4.429 #: ../en/appB-mq-ref.xml:75 4.430 -#, fuzzy 4.431 -msgid "" 4.432 -"<command role=\"hg-ext-mq\">qfold</command>—merge (<quote>fold</quote>) " 4.433 -"several patches into one" 4.434 +msgid "" 4.435 +"<command role=\"hg-ext-mq\">qfold</command>&emdash;merge (<quote>fold</" 4.436 +"quote>) several patches into one" 4.437 msgstr "" 4.438 "<command role=\"hg-ext-mq\">qfold</command>—将多个补丁合并(<quote>折叠</" 4.439 "quote>)成一个" 4.440 @@ -594,10 +256,9 @@ 4.441 4.442 #. type: Content of: <book><appendix><sect1><sect2><title> 4.443 #: ../en/appB-mq-ref.xml:119 4.444 -#, fuzzy 4.445 -msgid "" 4.446 -"<command role=\"hg-ext-mq\">qheader</command>—display the header/description " 4.447 -"of a patch" 4.448 +msgid "" 4.449 +"<command role=\"hg-ext-mq\">qheader</command>&emdash;display the header/" 4.450 +"description of a patch" 4.451 msgstr "<command role=\"hg-ext-mq\">qheader</command>—显示补丁头部描述" 4.452 4.453 #. type: Content of: <book><appendix><sect1><sect2><para> 4.454 @@ -610,10 +271,9 @@ 4.455 4.456 #. type: Content of: <book><appendix><sect1><sect2><title> 4.457 #: ../en/appB-mq-ref.xml:130 4.458 -#, fuzzy 4.459 -msgid "" 4.460 -"<command role=\"hg-ext-mq\">qimport</command>—import a third-party patch into " 4.461 -"the queue" 4.462 +msgid "" 4.463 +"<command role=\"hg-ext-mq\">qimport</command>&emdash;import a third-party " 4.464 +"patch into the queue" 4.465 msgstr "<command role=\"hg-ext-mq\">qimport</command>—将第三方补丁导入队列" 4.466 4.467 #. type: Content of: <book><appendix><sect1><sect2><para> 4.468 @@ -637,10 +297,9 @@ 4.469 4.470 #. type: Content of: <book><appendix><sect1><sect2><title> 4.471 #: ../en/appB-mq-ref.xml:149 4.472 -#, fuzzy 4.473 -msgid "" 4.474 -"<command role=\"hg-ext-mq\">qinit</command>—prepare a repository to work with " 4.475 -"MQ" 4.476 +msgid "" 4.477 +"<command role=\"hg-ext-mq\">qinit</command>&emdash;prepare a repository to " 4.478 +"work with MQ" 4.479 msgstr "<command role=\"hg-ext-mq\">qinit</command>—为使用 MQ 配置版本库" 4.480 4.481 #. type: Content of: <book><appendix><sect1><sect2><para> 4.482 @@ -671,8 +330,7 @@ 4.483 4.484 #. type: Content of: <book><appendix><sect1><sect2><title> 4.485 #: ../en/appB-mq-ref.xml:178 4.486 -#, fuzzy 4.487 -msgid "<command role=\"hg-ext-mq\">qnew</command>—create a new patch" 4.488 +msgid "<command role=\"hg-ext-mq\">qnew</command>&emdash;create a new patch" 4.489 msgstr "<command role=\"hg-ext-mq\">qnew</command>—创建新补丁" 4.490 4.491 #. type: Content of: <book><appendix><sect1><sect2><para> 4.492 @@ -714,9 +372,9 @@ 4.493 4.494 #. type: Content of: <book><appendix><sect1><sect2><title> 4.495 #: ../en/appB-mq-ref.xml:215 4.496 -#, fuzzy 4.497 -msgid "" 4.498 -"<command role=\"hg-ext-mq\">qnext</command>—print the name of the next patch" 4.499 +msgid "" 4.500 +"<command role=\"hg-ext-mq\">qnext</command>&emdash;print the name of the next " 4.501 +"patch" 4.502 msgstr "<command role=\"hg-ext-mq\">qnext</command>—显示下个补丁的名称" 4.503 4.504 #. type: Content of: <book><appendix><sect1><sect2><para> 4.505 @@ -730,8 +388,8 @@ 4.506 4.507 #. type: Content of: <book><appendix><sect1><sect2><title> 4.508 #: ../en/appB-mq-ref.xml:227 4.509 -#, fuzzy 4.510 -msgid "<command role=\"hg-ext-mq\">qpop</command>—pop patches off the stack" 4.511 +msgid "" 4.512 +"<command role=\"hg-ext-mq\">qpop</command>&emdash;pop patches off the stack" 4.513 msgstr "<command role=\"hg-ext-mq\">qpop</command>—删除堆栈顶部的补丁" 4.514 4.515 #. type: Content of: <book><appendix><sect1><sect2><para> 4.516 @@ -814,10 +472,9 @@ 4.517 4.518 #. type: Content of: <book><appendix><sect1><sect2><title> 4.519 #: ../en/appB-mq-ref.xml:288 4.520 -#, fuzzy 4.521 -msgid "" 4.522 -"<command role=\"hg-ext-mq\">qprev</command>—print the name of the previous " 4.523 -"patch" 4.524 +msgid "" 4.525 +"<command role=\"hg-ext-mq\">qprev</command>&emdash;print the name of the " 4.526 +"previous patch" 4.527 msgstr "<command role=\"hg-ext-mq\">qprev</command>—显示上个补丁的名称" 4.528 4.529 #. type: Content of: <book><appendix><sect1><sect2><para> 4.530 @@ -831,8 +488,8 @@ 4.531 4.532 #. type: Content of: <book><appendix><sect1><sect2><title> 4.533 #: ../en/appB-mq-ref.xml:300 4.534 -#, fuzzy 4.535 -msgid "<command role=\"hg-ext-mq\">qpush</command>—push patches onto the stack" 4.536 +msgid "" 4.537 +"<command role=\"hg-ext-mq\">qpush</command>&emdash;push patches onto the stack" 4.538 msgstr "<command role=\"hg-ext-mq\">qpush</command>—增加补丁到堆栈" 4.539 4.540 #. type: Content of: <book><appendix><sect1><sect2><para> 4.541 @@ -929,10 +586,9 @@ 4.542 4.543 #. type: Content of: <book><appendix><sect1><sect2><title> 4.544 #: ../en/appB-mq-ref.xml:368 4.545 -#, fuzzy 4.546 -msgid "" 4.547 -"<command role=\"hg-ext-mq\">qrefresh</command>—update the topmost applied " 4.548 -"patch" 4.549 +msgid "" 4.550 +"<command role=\"hg-ext-mq\">qrefresh</command>&emdash;update the topmost " 4.551 +"applied patch" 4.552 msgstr "<command role=\"hg-ext-mq\">qrefresh</command>—更新最新的补丁" 4.553 4.554 #. type: Content of: <book><appendix><sect1><sect2><para> 4.555 @@ -1007,8 +663,7 @@ 4.556 4.557 #. type: Content of: <book><appendix><sect1><sect2><title> 4.558 #: ../en/appB-mq-ref.xml:424 4.559 -#, fuzzy 4.560 -msgid "<command role=\"hg-ext-mq\">qrename</command>—rename a patch" 4.561 +msgid "<command role=\"hg-ext-mq\">qrename</command>&emdash;rename a patch" 4.562 msgstr "<command role=\"hg-ext-mq\">qrename</command>—改名补丁" 4.563 4.564 #. type: Content of: <book><appendix><sect1><sect2><para> 4.565 @@ -1029,8 +684,9 @@ 4.566 4.567 #. type: Content of: <book><appendix><sect1><sect2><title> 4.568 #: ../en/appB-mq-ref.xml:438 4.569 -#, fuzzy 4.570 -msgid "<command role=\"hg-ext-mq\">qrestore</command>—restore saved queue state" 4.571 +msgid "" 4.572 +"<command role=\"hg-ext-mq\">qrestore</command>&emdash;restore saved queue " 4.573 +"state" 4.574 msgstr "<command role=\"hg-ext-mq\">qrestore</command>—恢复保存的队列" 4.575 4.576 #. type: Content of: <book><appendix><sect1><sect2><para> 4.577 @@ -1040,8 +696,8 @@ 4.578 4.579 #. type: Content of: <book><appendix><sect1><sect2><title> 4.580 #: ../en/appB-mq-ref.xml:446 4.581 -#, fuzzy 4.582 -msgid "<command role=\"hg-ext-mq\">qsave</command>—save current queue state" 4.583 +msgid "" 4.584 +"<command role=\"hg-ext-mq\">qsave</command>&emdash;save current queue state" 4.585 msgstr "<command role=\"hg-ext-mq\">qsave</command>—保存当前的队列状态" 4.586 4.587 #. type: Content of: <book><appendix><sect1><sect2><para> 4.588 @@ -1051,9 +707,9 @@ 4.589 4.590 #. type: Content of: <book><appendix><sect1><sect2><title> 4.591 #: ../en/appB-mq-ref.xml:453 4.592 -#, fuzzy 4.593 -msgid "" 4.594 -"<command role=\"hg-ext-mq\">qseries</command>—print the entire patch series" 4.595 +msgid "" 4.596 +"<command role=\"hg-ext-mq\">qseries</command>&emdash;print the entire patch " 4.597 +"series" 4.598 msgstr "<command role=\"hg-ext-mq\">qseries</command>—显示补丁序列" 4.599 4.600 #. type: Content of: <book><appendix><sect1><sect2><para> 4.601 @@ -1067,9 +723,9 @@ 4.602 4.603 #. type: Content of: <book><appendix><sect1><sect2><title> 4.604 #: ../en/appB-mq-ref.xml:464 4.605 -#, fuzzy 4.606 -msgid "" 4.607 -"<command role=\"hg-ext-mq\">qtop</command>—print the name of the current patch" 4.608 +msgid "" 4.609 +"<command role=\"hg-ext-mq\">qtop</command>&emdash;print the name of the " 4.610 +"current patch" 4.611 msgstr "<command role=\"hg-ext-mq\">qtop</command>—显示当前补丁的名称" 4.612 4.613 #. type: Content of: <book><appendix><sect1><sect2><para> 4.614 @@ -1081,9 +737,9 @@ 4.615 4.616 #. type: Content of: <book><appendix><sect1><sect2><title> 4.617 #: ../en/appB-mq-ref.xml:472 4.618 -#, fuzzy 4.619 -msgid "" 4.620 -"<command role=\"hg-ext-mq\">qunapplied</command>—print patches not yet applied" 4.621 +msgid "" 4.622 +"<command role=\"hg-ext-mq\">qunapplied</command>&emdash;print patches not yet " 4.623 +"applied" 4.624 msgstr "<command role=\"hg-ext-mq\">qunapplied</command>—显示尚未应用的补丁" 4.625 4.626 #. type: Content of: <book><appendix><sect1><sect2><para> 4.627 @@ -1097,9 +753,9 @@ 4.628 4.629 #. type: Content of: <book><appendix><sect1><sect2><title> 4.630 #: ../en/appB-mq-ref.xml:484 4.631 -#, fuzzy 4.632 -msgid "" 4.633 -"<command role=\"hg-cmd\">hg strip</command>—remove a revision and descendants" 4.634 +msgid "" 4.635 +"<command role=\"hg-cmd\">hg strip</command>&emdash;remove a revision and " 4.636 +"descendants" 4.637 msgstr "<command role=\"hg-cmd\">hg strip</command>—删除一个版本及其后继" 4.638 4.639 #. type: Content of: <book><appendix><sect1><sect2><para> 4.640 @@ -1632,8 +1288,9 @@ 4.641 #. type: Content of: <book><preface><sect1><sect2><para> 4.642 #: ../en/ch00-preface.xml:71 4.643 msgid "" 4.644 -"Most of these reasons are equally valid—at least in theory&emdash;whether " 4.645 -"you're working on a project by yourself, or with a hundred other people." 4.646 +"Most of these reasons are equally valid&emdash;at least in theory&emdash;" 4.647 +"whether you're working on a project by yourself, or with a hundred other " 4.648 +"people." 4.649 msgstr "" 4.650 4.651 #. type: Content of: <book><preface><sect1><sect2><para> 4.652 @@ -1753,10 +1410,10 @@ 4.653 #: ../en/ch00-preface.xml:146 4.654 msgid "" 4.655 "This book takes an unusual approach to code samples. Every example is " 4.656 -"<quote>live</quote>—each one is actually the result of a shell script that " 4.657 -"executes the Mercurial commands you see. Every time an image of the book is " 4.658 -"built from its sources, all the example scripts are automatically run, and " 4.659 -"their current results compared against their expected results." 4.660 +"<quote>live</quote>&emdash;each one is actually the result of a shell script " 4.661 +"that executes the Mercurial commands you see. Every time an image of the " 4.662 +"book is built from its sources, all the example scripts are automatically " 4.663 +"run, and their current results compared against their expected results." 4.664 msgstr "" 4.665 4.666 #. type: Content of: <book><preface><sect1><para> 4.667 @@ -2021,10 +1678,11 @@ 4.668 "scalability. It's not unusual for an expensive centralised system to fall " 4.669 "over under the combined load of just a few dozen concurrent users. Once " 4.670 "again, the typical response tends to be an expensive and clunky replication " 4.671 -"facility. Since the load on a central server—if you have one at all—is many " 4.672 -"times lower with a distributed tool (because all of the data is replicated " 4.673 -"everywhere), a single cheap server can handle the needs of a much larger " 4.674 -"team, and replication to balance load becomes a simple matter of scripting." 4.675 +"facility. Since the load on a central server&emdash;if you have one at " 4.676 +"all&emdash;is many times lower with a distributed tool (because all of the " 4.677 +"data is replicated everywhere), a single cheap server can handle the needs of " 4.678 +"a much larger team, and replication to balance load becomes a simple matter " 4.679 +"of scripting." 4.680 msgstr "" 4.681 4.682 #. type: Content of: <book><preface><sect1><sect2><para> 4.683 @@ -2222,7 +1880,7 @@ 4.684 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 4.685 #: ../en/ch00-preface.xml:499 ../en/ch00-preface.xml:638 4.686 msgid "Git" 4.687 -msgstr "" 4.688 +msgstr "Git" 4.689 4.690 #. type: Content of: <book><preface><sect1><sect2><para> 4.691 #: ../en/ch00-preface.xml:501 4.692 @@ -2280,7 +1938,7 @@ 4.693 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 4.694 #: ../en/ch00-preface.xml:541 ../en/ch00-preface.xml:637 4.695 msgid "CVS" 4.696 -msgstr "" 4.697 +msgstr "CVS" 4.698 4.699 #. type: Content of: <book><preface><sect1><sect2><para> 4.700 #: ../en/ch00-preface.xml:543 4.701 @@ -2412,7 +2070,7 @@ 4.702 #. type: Content of: <book><preface><sect1><itemizedlist><listitem><para> 4.703 #: ../en/ch00-preface.xml:639 4.704 msgid "Darcs" 4.705 -msgstr "" 4.706 +msgstr "Darcs" 4.707 4.708 #. type: Content of: <book><preface><sect1><para> 4.709 #: ../en/ch00-preface.xml:641 4.710 @@ -2542,8 +2200,7 @@ 4.711 4.712 #. type: Content of: <book><preface><sect1><title> 4.713 #: ../en/ch00-preface.xml:740 4.714 -#, fuzzy 4.715 -msgid "Colophon—this book is Free" 4.716 +msgid "Colophon&emdash;this book is Free" 4.717 msgstr "后记—本书是自由的!" 4.718 4.719 #. type: Content of: <book><preface><sect1><para> 4.720 @@ -2586,7 +2243,7 @@ 4.721 #. type: Content of: <book><chapter><sect1><sect2><title> 4.722 #: ../en/ch01-tour-basic.xml:15 4.723 msgid "Windows" 4.724 -msgstr "" 4.725 +msgstr "Windows" 4.726 4.727 #. type: Content of: <book><chapter><sect1><sect2><para> 4.728 #: ../en/ch01-tour-basic.xml:17 4.729 @@ -2643,13 +2300,12 @@ 4.730 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 4.731 #: ../en/ch01-tour-basic.xml:52 4.732 msgid "Ubuntu and Debian:" 4.733 -msgstr "" 4.734 +msgstr "Ubuntu 与 Debian:" 4.735 4.736 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 4.737 #: ../en/ch01-tour-basic.xml:54 4.738 -#, fuzzy 4.739 msgid "Fedora and OpenSUSE:" 4.740 -msgstr "OpenSUSE:" 4.741 +msgstr "Fedora and OpenSUSE:" 4.742 4.743 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 4.744 #: ../en/ch01-tour-basic.xml:56 4.745 @@ -2663,14 +2319,12 @@ 4.746 4.747 #. type: Content of: <book><chapter><sect1><sect2><para> 4.748 #: ../en/ch01-tour-basic.xml:64 4.749 -#, fuzzy 4.750 msgid "" 4.751 "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www." 4.752 "sunfreeware.com</ulink>, provides prebuilt packages of Mercurial." 4.753 msgstr "" 4.754 "位于 <ulink url=\"http://www.sunfreeware.com\">http://www.sunfreeware.com</" 4.755 -"ulink> 的 SunFreeWare 是很好的二进制安装源，它包含 Intel 和 Sparc 架构的 32 位" 4.756 -"和 64 位包，包含 Mercurial 的当前版本。" 4.757 +"ulink> 的 SunFreeWare 提供了 Mercurial 的二进制安装包。" 4.758 4.759 #. type: Content of: <book><chapter><sect1><title> 4.760 #: ../en/ch01-tour-basic.xml:73 4.761 @@ -3645,10 +3299,10 @@ 4.762 "reason for this: you can use <command role=\"hg-cmd\">hg update</command> to " 4.763 "update the working directory to the state it was in at <emphasis>any " 4.764 "revision</emphasis> in the history of the repository. If you had the working " 4.765 -"directory updated to an old revision—to hunt down the origin of a bug, say—" 4.766 -"and ran a <command role=\"hg-cmd\">hg pull</command> which automatically " 4.767 -"updated the working directory to a new revision, you might not be terribly " 4.768 -"happy." 4.769 +"directory updated to an old revision&emdash;to hunt down the origin of a bug, " 4.770 +"say&emdash;and ran a <command role=\"hg-cmd\">hg pull</command> which " 4.771 +"automatically updated the working directory to a new revision, you might not " 4.772 +"be terribly happy." 4.773 msgstr "" 4.774 4.775 #. type: Content of: <book><chapter><sect1><sect2><para> 4.776 @@ -4940,9 +4594,9 @@ 4.777 #. type: Content of: <book><chapter><sect1><sect2><para> 4.778 #: ../en/ch03-concepts.xml:498 4.779 msgid "" 4.780 -"There are more details—merging has plenty of corner cases&emdash;but these " 4.781 -"are the most common choices that are involved in a merge. As you can see, " 4.782 -"most cases are completely automatic, and indeed most merges finish " 4.783 +"There are more details&emdash;merging has plenty of corner cases&emdash;but " 4.784 +"these are the most common choices that are involved in a merge. As you can " 4.785 +"see, most cases are completely automatic, and indeed most merges finish " 4.786 "automatically, without requiring your input to resolve any conflicts." 4.787 msgstr "" 4.788 4.789 @@ -5268,11 +4922,11 @@ 4.790 "you added before the commit will no longer be listed in the output of " 4.791 "<command role=\"hg-cmd\">hg status</command>. The reason for this is that " 4.792 "<command role=\"hg-cmd\">hg status</command> only tells you about " 4.793 -"<quote>interesting</quote> files—those that you have modified or told " 4.794 -"Mercurial to do something with—by default. If you have a repository that " 4.795 -"contains thousands of files, you will rarely want to know about files that " 4.796 -"Mercurial is tracking, but that have not changed. (You can still get this " 4.797 -"information; we'll return to this later.)" 4.798 +"<quote>interesting</quote> files&emdash;those that you have modified or told " 4.799 +"Mercurial to do something with&emdash;by default. If you have a repository " 4.800 +"that contains thousands of files, you will rarely want to know about files " 4.801 +"that Mercurial is tracking, but that have not changed. (You can still get " 4.802 +"this information; we'll return to this later.)" 4.803 msgstr "" 4.804 4.805 #. type: Content of: <book><chapter><sect1><para> 4.806 @@ -5484,8 +5138,7 @@ 4.807 4.808 #. type: Content of: <book><chapter><sect1><sect2><title> 4.809 #: ../en/ch04-daily.xml:198 4.810 -#, fuzzy 4.811 -msgid "Useful shorthand—adding and removing files in one step" 4.812 +msgid "Useful shorthand&emdash;adding and removing files in one step" 4.813 msgstr "有用的速记—一个步骤添加和删除文件" 4.814 4.815 #. type: Content of: <book><chapter><sect1><sect2><para> 4.816 @@ -5810,8 +5463,8 @@ 4.817 #. type: Content of: <book><chapter><sect1><sect2><para> 4.818 #: ../en/ch04-daily.xml:454 4.819 msgid "" 4.820 -"The case of diverging names occurs when two developers start with a file—" 4.821 -"let's call it <filename>foo</filename>&emdash;in their respective " 4.822 +"The case of diverging names occurs when two developers start with a " 4.823 +"file&emdash;let's call it <filename>foo</filename>&emdash;in their respective " 4.824 "repositories." 4.825 msgstr "" 4.826 4.827 @@ -8613,8 +8266,7 @@ 4.828 4.829 #. type: Content of: <book><chapter><sect1><title> 4.830 #: ../en/ch07-branch.xml:228 4.831 -#, fuzzy 4.832 -msgid "The flow of changes—big picture vs. little" 4.833 +msgid "The flow of changes&emdash;big picture vs. little" 4.834 msgstr "修改流程—宏观与微观" 4.835 4.836 #. type: Content of: <book><chapter><sect1><para> 4.837 @@ -8667,11 +8319,11 @@ 4.838 #: ../en/ch07-branch.xml:260 4.839 msgid "" 4.840 "The easiest way to isolate a <quote>big picture</quote> branch in Mercurial " 4.841 -"is in a dedicated repository. If you have an existing shared repository—" 4.842 -"let's call it <literal>myproject</literal>&emdash;that reaches a <quote>1.0</" 4.843 -"quote> milestone, you can start to prepare for future maintenance releases on " 4.844 -"top of version 1.0 by tagging the revision from which you prepared the 1.0 " 4.845 -"release." 4.846 +"is in a dedicated repository. If you have an existing shared " 4.847 +"repository&emdash;let's call it <literal>myproject</literal>&emdash;that " 4.848 +"reaches a <quote>1.0</quote> milestone, you can start to prepare for future " 4.849 +"maintenance releases on top of version 1.0 by tagging the revision from which " 4.850 +"you prepared the 1.0 release." 4.851 msgstr "" 4.852 4.853 #. type: Content of: <book><chapter><sect1><para> 4.854 @@ -9092,9 +8744,9 @@ 4.855 #. type: Content of: <book><chapter><sect1><sect2><para> 4.856 #: ../en/ch08-undo.xml:65 4.857 msgid "" 4.858 -"However, luck is with me—I've caught my error before I pushed the changeset. " 4.859 -"I use the <command role=\"hg-cmd\">hg rollback</command> command, and " 4.860 -"Mercurial makes that last changeset vanish." 4.861 +"However, luck is with me&emdash;I've caught my error before I pushed the " 4.862 +"changeset. I use the <command role=\"hg-cmd\">hg rollback</command> command, " 4.863 +"and Mercurial makes that last changeset vanish." 4.864 msgstr "" 4.865 4.866 #. type: Content of: <book><chapter><sect1><sect2><para> 4.867 @@ -9164,12 +8816,12 @@ 4.868 #. type: Content of: <book><chapter><sect1><sect2><para> 4.869 #: ../en/ch08-undo.xml:126 4.870 msgid "" 4.871 -"If you've pushed a change to another repository—particularly if it's a shared " 4.872 -"repository—it has essentially <quote>escaped into the wild,</quote> and " 4.873 -"you'll have to recover from your mistake in a different way. What will " 4.874 -"happen if you push a changeset somewhere, then roll it back, then pull from " 4.875 -"the repository you pushed to, is that the changeset will reappear in your " 4.876 -"repository." 4.877 +"If you've pushed a change to another repository&emdash;particularly if it's a " 4.878 +"shared repository&emdash;it has essentially <quote>escaped into the wild,</" 4.879 +"quote> and you'll have to recover from your mistake in a different way. What " 4.880 +"will happen if you push a changeset somewhere, then roll it back, then pull " 4.881 +"from the repository you pushed to, is that the changeset will reappear in " 4.882 +"your repository." 4.883 msgstr "" 4.884 4.885 #. type: Content of: <book><chapter><sect1><sect2><para> 4.886 @@ -9291,7 +8943,7 @@ 4.887 msgid "" 4.888 "The <command role=\"hg-cmd\">hg revert</command> command is useful for more " 4.889 "than just modified files. It lets you reverse the results of all of " 4.890 -"Mercurial's file management commands—<command role=\"hg-cmd\">hg add</" 4.891 +"Mercurial's file management commands&emdash;<command role=\"hg-cmd\">hg add</" 4.892 "command>, <command role=\"hg-cmd\">hg remove</command>, and so on." 4.893 msgstr "" 4.894 4.895 @@ -9794,12 +9446,13 @@ 4.896 #. type: Content of: <book><chapter><sect1><para> 4.897 #: ../en/ch08-undo.xml:616 4.898 msgid "" 4.899 -"Since Mercurial treats history as accumulative—every change builds on top of " 4.900 -"all changes that preceded it—you generally can't just make disastrous changes " 4.901 -"disappear. The one exception is when you've just committed a change, and it " 4.902 -"hasn't been pushed or pulled into another repository. That's when you can " 4.903 -"safely use the <command role=\"hg-cmd\">hg rollback</command> command, as I " 4.904 -"detailed in <xref linkend=\"sec:undo:rollback\"/>." 4.905 +"Since Mercurial treats history as accumulative&emdash;every change builds on " 4.906 +"top of all changes that preceded it&emdash;you generally can't just make " 4.907 +"disastrous changes disappear. The one exception is when you've just " 4.908 +"committed a change, and it hasn't been pushed or pulled into another " 4.909 +"repository. That's when you can safely use the <command role=\"hg-cmd\">hg " 4.910 +"rollback</command> command, as I detailed in <xref linkend=\"sec:undo:rollback" 4.911 +"\"/>." 4.912 msgstr "" 4.913 4.914 #. type: Content of: <book><chapter><sect1><para> 4.915 @@ -10820,10 +10473,11 @@ 4.916 msgid "" 4.917 "In practice, putting a centralised bottleneck like this in place is not often " 4.918 "a good idea, and transaction visibility has nothing to do with the problem. " 4.919 -"As the size of a project—and the time it takes to build and test—grows, you " 4.920 -"rapidly run into a wall with this <quote>try before you buy</quote> approach, " 4.921 -"where you have more changesets to test than time in which to deal with them. " 4.922 -"The inevitable result is frustration on the part of all involved." 4.923 +"As the size of a project&emdash;and the time it takes to build and " 4.924 +"test&emdash;grows, you rapidly run into a wall with this <quote>try before " 4.925 +"you buy</quote> approach, where you have more changesets to test than time in " 4.926 +"which to deal with them. The inevitable result is frustration on the part of " 4.927 +"all involved." 4.928 msgstr "" 4.929 4.930 #. type: Content of: <book><chapter><sect1><sect2><para> 4.931 @@ -10983,8 +10637,9 @@ 4.932 #. type: Content of: <book><chapter><sect1><sect2><para> 4.933 #: ../en/ch09-hook.xml:464 4.934 msgid "" 4.935 -"You can write a hook either as a normal program—typically a shell script—or " 4.936 -"as a Python function that is executed within the Mercurial process." 4.937 +"You can write a hook either as a normal program&emdash;typically a shell " 4.938 +"script&emdash;or as a Python function that is executed within the Mercurial " 4.939 +"process." 4.940 msgstr "" 4.941 4.942 #. type: Content of: <book><chapter><sect1><sect2><para> 4.943 @@ -11278,9 +10933,8 @@ 4.944 4.945 #. type: Content of: <book><chapter><sect1><sect2><title> 4.946 #: ../en/ch09-hook.xml:716 4.947 -#, fuzzy 4.948 -msgid "" 4.949 -"<literal role=\"hg-ext\">acl</literal>—access control for parts of a " 4.950 +msgid "" 4.951 +"<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a " 4.952 "repository" 4.953 msgstr "<literal role=\"hg-ext\">acl</literal>—版本库的访问控制" 4.954 4.955 @@ -11427,8 +11081,8 @@ 4.956 4.957 #. type: Content of: <book><chapter><sect1><sect2><title> 4.958 #: ../en/ch09-hook.xml:844 4.959 -#, fuzzy 4.960 -msgid "<literal role=\"hg-ext\">bugzilla</literal>—integration with Bugzilla" 4.961 +msgid "" 4.962 +"<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla" 4.963 msgstr "<literal role=\"hg-ext\">bugzilla</literal>—与 Bugzilla 的集成" 4.964 4.965 #. type: Content of: <book><chapter><sect1><sect2><para> 4.966 @@ -11444,7 +11098,7 @@ 4.967 #: ../en/ch09-hook.xml:855 4.968 msgid "" 4.969 "It adds a comment to the bug that looks like this (you can configure the " 4.970 -"contents of the comment—see below):" 4.971 +"contents of the comment&emdash;see below):" 4.972 msgstr "" 4.973 4.974 #. type: Content of: <book><chapter><sect1><sect2><para> 4.975 @@ -11760,8 +11414,8 @@ 4.976 4.977 #. type: Content of: <book><chapter><sect1><sect2><title> 4.978 #: ../en/ch09-hook.xml:1150 4.979 -#, fuzzy 4.980 -msgid "<literal role=\"hg-ext\">notify</literal>—send email notifications" 4.981 +msgid "" 4.982 +"<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications" 4.983 msgstr "<literal role=\"hg-ext\">notify</literal>—邮件通知" 4.984 4.985 #. type: Content of: <book><chapter><sect1><sect2><para> 4.986 @@ -12085,8 +11739,7 @@ 4.987 4.988 #. type: Content of: <book><chapter><sect1><sect2><sect3><title> 4.989 #: ../en/ch09-hook.xml:1431 4.990 -#, fuzzy 4.991 -msgid "Where changes are going—remote repository URLs" 4.992 +msgid "Where changes are going&emdash;remote repository URLs" 4.993 msgstr "修改集要到哪里—远程版本库的地址" 4.994 4.995 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 4.996 @@ -12111,21 +11764,21 @@ 4.997 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para> 4.998 #: ../en/ch09-hook.xml:1449 4.999 msgid "" 4.1000 -"<literal>remote:ssh:1.2.3.4</literal>—remote ssh client, at the IP address " 4.1001 -"<literal>1.2.3.4</literal>." 4.1002 +"<literal>remote:ssh:1.2.3.4</literal>&emdash;remote ssh client, at the IP " 4.1003 +"address <literal>1.2.3.4</literal>." 4.1004 msgstr "" 4.1005 4.1006 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para> 4.1007 #: ../en/ch09-hook.xml:1454 4.1008 msgid "" 4.1009 -"<literal>remote:http:1.2.3.4</literal>—remote http client, at the IP address " 4.1010 -"<literal>1.2.3.4</literal>. If the client is using SSL, this will be of the " 4.1011 -"form <literal>remote:https:1.2.3.4</literal>." 4.1012 +"<literal>remote:http:1.2.3.4</literal>&emdash;remote http client, at the IP " 4.1013 +"address <literal>1.2.3.4</literal>. If the client is using SSL, this will be " 4.1014 +"of the form <literal>remote:https:1.2.3.4</literal>." 4.1015 msgstr "" 4.1016 4.1017 #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para> 4.1018 #: ../en/ch09-hook.xml:1461 4.1019 -msgid "Empty—no information could be discovered about the remote client." 4.1020 +msgid "Empty&emdash;no information could be discovered about the remote client." 4.1021 msgstr "" 4.1022 4.1023 #. type: Content of: <book><chapter><sect1><title> 4.1024 @@ -12135,9 +11788,9 @@ 4.1025 4.1026 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1027 #: ../en/ch09-hook.xml:1473 4.1028 -#, fuzzy 4.1029 -msgid "" 4.1030 -"<literal role=\"hook\">changegroup</literal>—after remote changesets added" 4.1031 +msgid "" 4.1032 +"<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets " 4.1033 +"added" 4.1034 msgstr "<literal role=\"hook\">changegroup</literal>—增加远程修改集之后" 4.1035 4.1036 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1037 @@ -12204,8 +11857,9 @@ 4.1038 4.1039 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1040 #: ../en/ch09-hook.xml:1526 4.1041 -#, fuzzy 4.1042 -msgid "<literal role=\"hook\">commit</literal>—after a new changeset is created" 4.1043 +msgid "" 4.1044 +"<literal role=\"hook\">commit</literal>&emdash;after a new changeset is " 4.1045 +"created" 4.1046 msgstr "<literal role=\"hook\">commit</literal>—创建新修改集之后" 4.1047 4.1048 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1049 @@ -12244,9 +11898,9 @@ 4.1050 4.1051 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1052 #: ../en/ch09-hook.xml:1559 4.1053 -#, fuzzy 4.1054 -msgid "" 4.1055 -"<literal role=\"hook\">incoming</literal>—after one remote changeset is added" 4.1056 +msgid "" 4.1057 +"<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset " 4.1058 +"is added" 4.1059 msgstr "<literal role=\"hook\">incoming</literal>—增加远程修改集之后" 4.1060 4.1061 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1062 @@ -12285,9 +11939,9 @@ 4.1063 4.1064 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1065 #: ../en/ch09-hook.xml:1605 4.1066 -#, fuzzy 4.1067 -msgid "" 4.1068 -"<literal role=\"hook\">outgoing</literal>—after changesets are propagated" 4.1069 +msgid "" 4.1070 +"<literal role=\"hook\">outgoing</literal>&emdash;after changesets are " 4.1071 +"propagated" 4.1072 msgstr "<literal role=\"hook\">outgoing</literal>—传播修改集之后" 4.1073 4.1074 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1075 @@ -12333,10 +11987,9 @@ 4.1076 4.1077 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1078 #: ../en/ch09-hook.xml:1652 4.1079 -#, fuzzy 4.1080 -msgid "" 4.1081 -"<literal role=\"hook\">prechangegroup</literal>—before starting to add remote " 4.1082 -"changesets" 4.1083 +msgid "" 4.1084 +"<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add " 4.1085 +"remote changesets" 4.1086 msgstr "<literal role=\"hook\">prechangegroup</literal>—增加远程修改集之前" 4.1087 4.1088 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1089 @@ -12374,9 +12027,8 @@ 4.1090 4.1091 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1092 #: ../en/ch09-hook.xml:1698 4.1093 -#, fuzzy 4.1094 -msgid "" 4.1095 -"<literal role=\"hook\">precommit</literal>—before starting to commit a " 4.1096 +msgid "" 4.1097 +"<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a " 4.1098 "changeset" 4.1099 msgstr "<literal role=\"hook\">precommit</literal>—提交修改集之前" 4.1100 4.1101 @@ -12427,10 +12079,9 @@ 4.1102 4.1103 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1104 #: ../en/ch09-hook.xml:1738 4.1105 -#, fuzzy 4.1106 -msgid "" 4.1107 -"<literal role=\"hook\">preoutgoing</literal>—before starting to propagate " 4.1108 -"changesets" 4.1109 +msgid "" 4.1110 +"<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to " 4.1111 +"propagate changesets" 4.1112 msgstr "<literal role=\"hook\">preoutgoing</literal>—传播修改集之前" 4.1113 4.1114 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1115 @@ -12466,8 +12117,8 @@ 4.1116 4.1117 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1118 #: ../en/ch09-hook.xml:1775 4.1119 -#, fuzzy 4.1120 -msgid "<literal role=\"hook\">pretag</literal>—before tagging a changeset" 4.1121 +msgid "" 4.1122 +"<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset" 4.1123 msgstr "<literal role=\"hook\">pretag</literal>—创建标签之前" 4.1124 4.1125 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1126 @@ -12516,21 +12167,20 @@ 4.1127 4.1128 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1129 #: ../en/ch09-hook.xml:1815 4.1130 -#, fuzzy 4.1131 -msgid "" 4.1132 -"<literal role=\"hook\">pretxnchangegroup</literal>—before completing addition " 4.1133 -"of remote changesets" 4.1134 +msgid "" 4.1135 +"<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing " 4.1136 +"addition of remote changesets" 4.1137 msgstr "" 4.1138 "<literal role=\"hook\">pretxnchangegroup</literal>—完成增加远程修改集之前" 4.1139 4.1140 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1141 #: ../en/ch09-hook.xml:1819 4.1142 msgid "" 4.1143 -"This controlling hook is run before a transaction—that manages the addition " 4.1144 -"of a group of new changesets from outside the repository—completes. If the " 4.1145 -"hook succeeds, the transaction completes, and all of the changesets become " 4.1146 -"permanent within this repository. If the hook fails, the transaction is " 4.1147 -"rolled back, and the data for the changesets is erased." 4.1148 +"This controlling hook is run before a transaction&emdash;that manages the " 4.1149 +"addition of a group of new changesets from outside the repository&emdash;" 4.1150 +"completes. If the hook succeeds, the transaction completes, and all of the " 4.1151 +"changesets become permanent within this repository. If the hook fails, the " 4.1152 +"transaction is rolled back, and the data for the changesets is erased." 4.1153 msgstr "" 4.1154 4.1155 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1156 @@ -12569,19 +12219,18 @@ 4.1157 4.1158 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1159 #: ../en/ch09-hook.xml:1881 4.1160 -#, fuzzy 4.1161 -msgid "" 4.1162 -"<literal role=\"hook\">pretxncommit</literal>—before completing commit of new " 4.1163 -"changeset" 4.1164 +msgid "" 4.1165 +"<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit " 4.1166 +"of new changeset" 4.1167 msgstr "<literal role=\"hook\">pretxncommit</literal>—完成提交之前" 4.1168 4.1169 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1170 #: ../en/ch09-hook.xml:1884 4.1171 msgid "" 4.1172 -"This controlling hook is run before a transaction—that manages a new commit—" 4.1173 -"completes. If the hook succeeds, the transaction completes and the changeset " 4.1174 -"becomes permanent within this repository. If the hook fails, the transaction " 4.1175 -"is rolled back, and the commit data is erased." 4.1176 +"This controlling hook is run before a transaction&emdash;that manages a new " 4.1177 +"commit&emdash;completes. If the hook succeeds, the transaction completes and " 4.1178 +"the changeset becomes permanent within this repository. If the hook fails, " 4.1179 +"the transaction is rolled back, and the commit data is erased." 4.1180 msgstr "" 4.1181 4.1182 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1183 @@ -12612,10 +12261,9 @@ 4.1184 4.1185 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1186 #: ../en/ch09-hook.xml:1929 4.1187 -#, fuzzy 4.1188 -msgid "" 4.1189 -"<literal role=\"hook\">preupdate</literal>—before updating or merging working " 4.1190 -"directory" 4.1191 +msgid "" 4.1192 +"<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging " 4.1193 +"working directory" 4.1194 msgstr "<literal role=\"hook\">preupdate</literal>—更新或合并工作目录之前" 4.1195 4.1196 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1197 @@ -12652,8 +12300,7 @@ 4.1198 4.1199 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1200 #: ../en/ch09-hook.xml:1961 4.1201 -#, fuzzy 4.1202 -msgid "<literal role=\"hook\">tag</literal>—after tagging a changeset" 4.1203 +msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset" 4.1204 msgstr "<literal role=\"hook\">tag</literal>—创建标签之后" 4.1205 4.1206 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1207 @@ -12701,10 +12348,9 @@ 4.1208 4.1209 #. type: Content of: <book><chapter><sect1><sect2><title> 4.1210 #: ../en/ch09-hook.xml:1998 4.1211 -#, fuzzy 4.1212 -msgid "" 4.1213 -"<literal role=\"hook\">update</literal>—after updating or merging working " 4.1214 -"directory" 4.1215 +msgid "" 4.1216 +"<literal role=\"hook\">update</literal>&emdash;after updating or merging " 4.1217 +"working directory" 4.1218 msgstr "<literal role=\"hook\">update</literal>—更新或合并工作目录之后" 4.1219 4.1220 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1221 @@ -12783,9 +12429,9 @@ 4.1222 #. type: Content of: <book><chapter><sect1><para> 4.1223 #: ../en/ch10-template.xml:26 4.1224 msgid "" 4.1225 -"This is somewhat informative, but it takes up a lot of space—five lines of " 4.1226 -"output per changeset. The <literal>compact</literal> style reduces this to " 4.1227 -"three lines, presented in a sparse manner." 4.1228 +"This is somewhat informative, but it takes up a lot of space&emdash;five " 4.1229 +"lines of output per changeset. The <literal>compact</literal> style reduces " 4.1230 +"this to three lines, presented in a sparse manner." 4.1231 msgstr "" 4.1232 4.1233 #. type: Content of: <book><chapter><sect1><para> 4.1234 @@ -13856,8 +13502,9 @@ 4.1235 #: ../en/ch11-mq.xml:149 4.1236 msgid "" 4.1237 "A major reason that patches have persisted in the free software and open " 4.1238 -"source world—in spite of the availability of increasingly capable revision " 4.1239 -"control tools over the years—is the <emphasis>agility</emphasis> they offer." 4.1240 +"source world&emdash;in spite of the availability of increasingly capable " 4.1241 +"revision control tools over the years&emdash;is the <emphasis>agility</" 4.1242 +"emphasis> they offer." 4.1243 msgstr "" 4.1244 4.1245 #. type: Content of: <book><chapter><sect1><para> 4.1246 @@ -13866,8 +13513,8 @@ 4.1247 "Traditional revision control tools make a permanent, irreversible record of " 4.1248 "everything that you do. While this has great value, it's also somewhat " 4.1249 "stifling. If you want to perform a wild-eyed experiment, you have to be " 4.1250 -"careful in how you go about it, or you risk leaving unneeded—or worse, " 4.1251 -"misleading or destabilising—traces of your missteps and errors in the " 4.1252 +"careful in how you go about it, or you risk leaving unneeded&emdash;or worse, " 4.1253 +"misleading or destabilising&emdash;traces of your missteps and errors in the " 4.1254 "permanent revision record." 4.1255 msgstr "" 4.1256 4.1257 @@ -13878,23 +13525,23 @@ 4.1258 "it much easier to isolate your work. Your patches live on top of normal " 4.1259 "revision history, and you can make them disappear or reappear at will. If " 4.1260 "you don't like a patch, you can drop it. If a patch isn't quite as you want " 4.1261 -"it to be, simply fix it—as many times as you need to, until you have refined " 4.1262 -"it into the form you desire." 4.1263 +"it to be, simply fix it&emdash;as many times as you need to, until you have " 4.1264 +"refined it into the form you desire." 4.1265 msgstr "" 4.1266 4.1267 #. type: Content of: <book><chapter><sect1><para> 4.1268 #: ../en/ch11-mq.xml:171 4.1269 msgid "" 4.1270 "As an example, the integration of patches with revision control makes " 4.1271 -"understanding patches and debugging their effects—and their interplay with " 4.1272 -"the code they're based on—<emphasis>enormously</emphasis> easier. Since every " 4.1273 -"applied patch has an associated changeset, you can give <command role=\"hg-cmd" 4.1274 -"\">hg log</command> a file name to see which changesets and patches affected " 4.1275 -"the file. You can use the <command role=\"hg-cmd\">hg bisect</command> " 4.1276 -"command to binary-search through all changesets and applied patches to see " 4.1277 -"where a bug got introduced or fixed. You can use the <command role=\"hg-cmd" 4.1278 -"\">hg annotate</command> command to see which changeset or patch modified a " 4.1279 -"particular line of a source file. And so on." 4.1280 +"understanding patches and debugging their effects&emdash;and their interplay " 4.1281 +"with the code they're based on&emdash;<emphasis>enormously</emphasis> easier. " 4.1282 +"Since every applied patch has an associated changeset, you can give <command " 4.1283 +"role=\"hg-cmd\">hg log</command> a file name to see which changesets and " 4.1284 +"patches affected the file. You can use the <command role=\"hg-cmd\">hg " 4.1285 +"bisect</command> command to binary-search through all changesets and applied " 4.1286 +"patches to see where a bug got introduced or fixed. You can use the <command " 4.1287 +"role=\"hg-cmd\">hg annotate</command> command to see which changeset or patch " 4.1288 +"modified a particular line of a source file. And so on." 4.1289 msgstr "" 4.1290 4.1291 #. type: Content of: <book><chapter><sect1><para> 4.1292 @@ -14266,14 +13913,15 @@ 4.1293 msgid "" 4.1294 "Here's an example that illustrates how you can use this ability. Let's say " 4.1295 "you're developing a new feature as two patches. The first is a change to the " 4.1296 -"core of your software, and the second—layered on top of the first—changes the " 4.1297 -"user interface to use the code you just added to the core. If you notice a " 4.1298 -"bug in the core while you're working on the UI patch, it's easy to fix the " 4.1299 -"core. Simply <command role=\"hg-ext-mq\">qrefresh</command> the UI patch to " 4.1300 -"save your in-progress changes, and <command role=\"hg-ext-mq\">qpop</command> " 4.1301 -"down to the core patch. Fix the core bug, <command role=\"hg-ext-mq" 4.1302 -"\">qrefresh</command> the core patch, and <command role=\"hg-ext-mq\">qpush</" 4.1303 -"command> back to the UI patch to continue where you left off." 4.1304 +"core of your software, and the second&emdash;layered on top of the " 4.1305 +"first&emdash;changes the user interface to use the code you just added to the " 4.1306 +"core. If you notice a bug in the core while you're working on the UI patch, " 4.1307 +"it's easy to fix the core. Simply <command role=\"hg-ext-mq\">qrefresh</" 4.1308 +"command> the UI patch to save your in-progress changes, and <command role=" 4.1309 +"\"hg-ext-mq\">qpop</command> down to the core patch. Fix the core bug, " 4.1310 +"<command role=\"hg-ext-mq\">qrefresh</command> the core patch, and <command " 4.1311 +"role=\"hg-ext-mq\">qpush</command> back to the UI patch to continue where you " 4.1312 +"left off." 4.1313 msgstr "" 4.1314 4.1315 #. type: Content of: <book><chapter><sect1><title> 4.1316 @@ -14576,8 +14224,8 @@ 4.1317 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 4.1318 #: ../en/ch11-mq.xml:731 4.1319 msgid "" 4.1320 -"A large hunk might apply better—either entirely or in part&emdash;if it was " 4.1321 -"broken up into smaller hunks." 4.1322 +"A large hunk might apply better&emdash;either entirely or in part&emdash;if " 4.1323 +"it was broken up into smaller hunks." 4.1324 msgstr "" 4.1325 4.1326 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 4.1327 @@ -15076,12 +14724,12 @@ 4.1328 msgid "" 4.1329 "The <command>diffstat</command> command <citation>web:diffstat</citation> " 4.1330 "generates a histogram of the modifications made to each file in a patch. It " 4.1331 -"provides a good way to <quote>get a sense of</quote> a patch—which files it " 4.1332 -"affects, and how much change it introduces to each file and as a whole. (I " 4.1333 -"find that it's a good idea to use <command>diffstat</command>'s <option role=" 4.1334 -"\"cmd-opt-diffstat\">-p</option> option as a matter of course, as otherwise " 4.1335 -"it will try to do clever things with prefixes of file names that inevitably " 4.1336 -"confuse at least me.)" 4.1337 +"provides a good way to <quote>get a sense of</quote> a patch&emdash;which " 4.1338 +"files it affects, and how much change it introduces to each file and as a " 4.1339 +"whole. (I find that it's a good idea to use <command>diffstat</command>'s " 4.1340 +"<option role=\"cmd-opt-diffstat\">-p</option> option as a matter of course, " 4.1341 +"as otherwise it will try to do clever things with prefixes of file names that " 4.1342 +"inevitably confuse at least me.)" 4.1343 msgstr "" 4.1344 4.1345 #. type: Content of: <book><chapter><sect1><para> 4.1346 @@ -15131,12 +14779,13 @@ 4.1347 #: ../en/ch11-mq.xml:1160 4.1348 msgid "" 4.1349 "Be aware of what patch you're working on. Use the <command role=\"hg-ext-mq" 4.1350 -"\">qtop</command> command and skim over the text of your patches frequently—" 4.1351 -"for example, using <command role=\"hg-cmd\">hg tip <option role=\"hg-opt-tip" 4.1352 -"\">-p</option></command>)—to be sure of where you stand. I have several " 4.1353 -"times worked on and <command role=\"hg-ext-mq\">qrefresh</command>ed a patch " 4.1354 -"other than the one I intended, and it's often tricky to migrate changes into " 4.1355 -"the right patch after making them in the wrong one." 4.1356 +"\">qtop</command> command and skim over the text of your patches " 4.1357 +"frequently&emdash;for example, using <command role=\"hg-cmd\">hg tip <option " 4.1358 +"role=\"hg-opt-tip\">-p</option></command>)&emdash;to be sure of where you " 4.1359 +"stand. I have several times worked on and <command role=\"hg-ext-mq" 4.1360 +"\">qrefresh</command>ed a patch other than the one I intended, and it's often " 4.1361 +"tricky to migrate changes into the right patch after making them in the wrong " 4.1362 +"one." 4.1363 msgstr "" 4.1364 4.1365 #. type: Content of: <book><chapter><sect1><para> 4.1366 @@ -15966,7 +15615,7 @@ 4.1367 msgstr "" 4.1368 4.1369 # 4.1370 -#. &example.hg-interdiff; 4.1371 +#. &example.hg-interdiff; 4.1372 #. type: Content of: <book><chapter><sect1><sect2><para> 4.1373 #: ../en/ch12-mq-collab.xml:466 4.1374 msgid ""