Commits

Dongsheng Song  committed 4330401

Update file location in po files

  • Participants
  • Parent commits 1e020cb

Comments (0)

Files changed (1)

 msgid ""
 msgstr ""
 "Project-Id-Version: hgbook 1.2\n"
-"POT-Creation-Date: 2009-03-20 17:12+0800\n"
+"POT-Creation-Date: 2009-03-30 21:36+0800\n"
 "PO-Revision-Date: 2009-03-20 17:12+0800\n"
 "Last-Translator: \n"
 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
 "year> <holder>Bryan O'Sullivan</holder> </copyright>"
 
 #. type: Content of: <book><appendix><title>
-#: ../en/appA-cmdref.xml:4
+#: ../en/appA-cmdref.xml:5
 msgid "Command reference"
 msgstr "命令参考"
 
 #. type: Content of: <book><appendix><para>
-#: ../en/appA-cmdref.xml:6
+#: ../en/appA-cmdref.xml:7
 msgid ""
 "\\cmdref{add}{add files at the next commit} \\optref{add}{I}{include} \\optref"
 "{add}{X}{exclude} \\optref{add}{n}{dry-run}"
 msgstr ""
 
 #. type: Content of: <book><appendix><para>
-#: ../en/appA-cmdref.xml:11
+#: ../en/appA-cmdref.xml:12
 msgid "\\cmdref{diff}{print changes in history or working directory}"
 msgstr ""
 
 #. type: Content of: <book><appendix><para>
-#: ../en/appA-cmdref.xml:13
+#: ../en/appA-cmdref.xml:14
 msgid ""
 "Show differences between revisions for the specified files or directories, "
 "using the unified diff format.  For a description of the unified diff format, "
-"see section <xref linkend=\"sec.mq.patch\"/>."
+"see <xref linkend=\"sec:mq:patch\"/>."
 msgstr ""
 
 #. type: Content of: <book><appendix><para>
-#: ../en/appA-cmdref.xml:17
+#: ../en/appA-cmdref.xml:18
 msgid ""
 "By default, this command does not print diffs for files that Mercurial "
 "considers to contain binary data.  To control this behaviour, see the <option "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><title>
-#: ../en/appA-cmdref.xml:22
+#: ../en/appA-cmdref.xml:23
 msgid "Options"
 msgstr "选项"
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:24
+#: ../en/appA-cmdref.xml:25
 msgid "\\loptref{diff}{nodates}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:26
+#: ../en/appA-cmdref.xml:27
 msgid "Omit date and time information when printing diff headers."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:28
+#: ../en/appA-cmdref.xml:29
 msgid "\\optref{diff}{B}{ignore-blank-lines}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:30
+#: ../en/appA-cmdref.xml:31
 msgid ""
 "Do not print changes that only insert or delete blank lines.  A line that "
 "contains only whitespace is not considered blank."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:34
+#: ../en/appA-cmdref.xml:35
 msgid "\\optref{diff}{I}{include}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:37
+#: ../en/appA-cmdref.xml:38
 msgid "Include files and directories whose names match the given patterns."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:40
+#: ../en/appA-cmdref.xml:41
 msgid "\\optref{diff}{X}{exclude}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:43
+#: ../en/appA-cmdref.xml:44
 msgid "Exclude files and directories whose names match the given patterns."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:46
+#: ../en/appA-cmdref.xml:47
 msgid "\\optref{diff}{a}{text}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:49
+#: ../en/appA-cmdref.xml:50
 msgid ""
 "If this option is not specified, <command role=\"hg-cmd\">hg diff</command> "
 "will refuse to print diffs for files that it detects as binary. Specifying "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:55
+#: ../en/appA-cmdref.xml:56
 msgid ""
 "This option is useful for files that are <quote>mostly text</quote> but have "
 "a few embedded NUL characters.  If you use it on files that contain a lot of "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:60
+#: ../en/appA-cmdref.xml:61
 msgid "\\optref{diff}{b}{ignore-space-change}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:63
+#: ../en/appA-cmdref.xml:64
 msgid ""
 "Do not print a line if the only change to that line is in the amount of white "
 "space it contains."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:67
+#: ../en/appA-cmdref.xml:68
 msgid "\\optref{diff}{g}{git}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:70
+#: ../en/appA-cmdref.xml:71
 msgid ""
 "Print <command>git</command>-compatible diffs.  XXX reference a format "
 "description."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:74
+#: ../en/appA-cmdref.xml:75
 msgid "\\optref{diff}{p}{show-function}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:77
+#: ../en/appA-cmdref.xml:78
 msgid ""
 "Display the name of the enclosing function in a hunk header, using a simple "
 "heuristic.  This functionality is enabled by default, so the <option role="
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:84
+#: ../en/appA-cmdref.xml:85
 msgid "\\optref{diff}{r}{rev}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:87
+#: ../en/appA-cmdref.xml:88
 msgid ""
 "Specify one or more revisions to compare.  The <command role=\"hg-cmd\">hg "
 "diff</command> command accepts up to two <option role=\"hg-opt-diff\">-r</"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
-#: ../en/appA-cmdref.xml:93
+#: ../en/appA-cmdref.xml:94
 msgid ""
 "Display the differences between the parent revision of the working directory "
 "and the working directory."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
-#: ../en/appA-cmdref.xml:97
+#: ../en/appA-cmdref.xml:98
 msgid ""
 "Display the differences between the specified changeset and the working "
 "directory."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><orderedlist><listitem><para>
-#: ../en/appA-cmdref.xml:101
+#: ../en/appA-cmdref.xml:102
 msgid "Display the differences between the two specified changesets."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:105
+#: ../en/appA-cmdref.xml:106
 msgid ""
 "You can specify two revisions using either two <option role=\"hg-opt-diff\">-"
 "r</option> options or revision range notation.  For example, the two revision "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:112
+#: ../en/appA-cmdref.xml:113
 msgid ""
 "When you provide two revisions, Mercurial treats the order of those revisions "
 "as significant.  Thus, <command role=\"hg-cmd\">hg diff -r10:20</command> "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:122
+#: ../en/appA-cmdref.xml:123
 msgid "\\optref{diff}{w}{ignore-all-space}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:125
+#: ../en/appA-cmdref.xml:126
 msgid "\\cmdref{version}{print version and copyright information}"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><para>
-#: ../en/appA-cmdref.xml:128
+#: ../en/appA-cmdref.xml:129
 msgid ""
 "This command displays the version of Mercurial you are running, and its "
 "copyright license.  There are four kinds of version string that you may see."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
-#: ../en/appA-cmdref.xml:133
+#: ../en/appA-cmdref.xml:134
 msgid ""
 "The string <quote><literal>unknown</literal></quote>. This version of "
 "Mercurial was not built in a Mercurial repository, and cannot determine its "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
-#: ../en/appA-cmdref.xml:138
+#: ../en/appA-cmdref.xml:139
 msgid ""
 "A short numeric string, such as <quote><literal>1.1</literal></quote>. This "
 "is a build of a revision of Mercurial that was identified by a specific tag "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
-#: ../en/appA-cmdref.xml:146
+#: ../en/appA-cmdref.xml:147
 msgid ""
 "A hexadecimal string, such as <quote><literal>875489e31abe</literal></"
 "quote>.  This is a build of the given revision of Mercurial."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><itemizedlist><listitem><para>
-#: ../en/appA-cmdref.xml:150
+#: ../en/appA-cmdref.xml:151
 msgid ""
 "A hexadecimal string followed by a date, such as <quote><literal>875489e31abe"
 "+20070205</literal></quote>.  This is a build of the given revision of "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><title>
-#: ../en/appA-cmdref.xml:159
+#: ../en/appA-cmdref.xml:160
 msgid "Tips and tricks"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><sect3><title>
-#: ../en/appA-cmdref.xml:162
+#: ../en/appA-cmdref.xml:163
 msgid ""
 "Why do the results of <command role=\"hg-cmd\">hg diff</command> and <command "
 "role=\"hg-cmd\">hg status</command> differ?"
 "\">hg status</command> 的结果不同 ?"
 
 #. type: Content of: <book><appendix><sect2><sect3><para>
-#: ../en/appA-cmdref.xml:164
+#: ../en/appA-cmdref.xml:165
 msgid ""
 "When you run the <command role=\"hg-cmd\">hg status</command> command, you'll "
 "see a list of files that Mercurial will record changes for the next time you "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><sect3><para>
-#: ../en/appA-cmdref.xml:171
+#: ../en/appA-cmdref.xml:172
 msgid ""
 "The first is that <command role=\"hg-cmd\">hg status</command> prints some "
 "kinds of modifications that <command role=\"hg-cmd\">hg diff</command> "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><sect3><para>
-#: ../en/appA-cmdref.xml:179
+#: ../en/appA-cmdref.xml:180
 msgid ""
 "If you use the <option role=\"hg-opt-diff\">--git</option> option to <command "
 "role=\"hg-cmd\">hg diff</command>, it will display <command>git</command>-"
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><sect3><para>
-#: ../en/appA-cmdref.xml:184
+#: ../en/appA-cmdref.xml:185
 msgid ""
 "The second possible reason that <command role=\"hg-cmd\">hg diff</command> "
 "might be printing diffs for a subset of the files displayed by <command role="
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><sect3><title>
-#: ../en/appA-cmdref.xml:200
+#: ../en/appA-cmdref.xml:201
 msgid "Generating safe binary diffs"
 msgstr "生成安全的二进制差异"
 
 #. type: Content of: <book><appendix><sect2><sect3><para>
-#: ../en/appA-cmdref.xml:202
+#: ../en/appA-cmdref.xml:203
 msgid ""
 "If you use the <option role=\"hg-opt-diff\">-a</option> option to force "
 "Mercurial to print diffs of files that are either <quote>mostly text</quote> "
 msgstr ""
 
 #. type: Content of: <book><appendix><sect2><sect3><para>
-#: ../en/appA-cmdref.xml:209
+#: ../en/appA-cmdref.xml:210
 msgid ""
 "If you want to generate a diff of a binary file that is safe to use as input "
 "for <command role=\"hg-cmd\">hg import</command>, use the <command role=\"hg-"
 #: ../en/appD-license.xml:33
 msgid ""
 "The reference must be immediately followed with any options elected by the "
-"author(s) and/or publisher of the document (see section <xref linkend=\"sec."
-"opl.options\"/>)."
+"author(s) and/or publisher of the document (see <xref linkend=\"sec:opl:"
+"options\"/>)."
 msgstr ""
 
 #. type: Content of: <book><appendix><sect1><para>
 "turns out to be in error, you can revert to an earlier version of one or more "
 "files.  In fact, a <emphasis>really</emphasis> good revision control tool "
 "will even help you to efficiently figure out exactly when a problem was "
-"introduced (see section <xref linkend=\"sec.undo.bisect\"/> for details)."
+"introduced (see <xref linkend=\"sec:undo:bisect\"/> for details)."
 msgstr ""
 
 #. type: Content of: <book><preface><sect1><sect2><itemizedlist><listitem><para>
 msgid ""
 "As an instance of this, several consecutive commits in an example can show up "
 "as having occurred during the same second.  You can see this occur in the "
-"<literal role=\"hg-ext\">bisect</literal> example in section <xref linkend="
-"\"sec.undo.bisect\"/>, for instance."
+"<literal role=\"hg-ext\">bisect</literal> example in <xref linkend=\"sec:undo:"
+"bisect\"/>, for instance."
 msgstr ""
 
 #. type: Content of: <book><preface><sect1><para>
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch01-tour-basic.xml:249
 msgid ""
-"Figure <xref endterm=\"fig.tour-basic.history.caption\" linkend=\"fig.tour-"
-"basic.history\"/> provides a graphical representation of the history of the "
-"<filename class=\"directory\">hello</filename> repository, to make it a "
-"little easier to see which direction history is <quote>flowing</quote> in.  "
-"We'll be returning to this figure several times in this chapter and the "
-"chapter that follows."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
-#: ../en/ch01-tour-basic.xml:260
-msgid ""
-"<imageobject><imagedata fileref=\"images/tour-history.png\"/></imageobject>"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><textobject><phrase>
-#: ../en/ch01-tour-basic.xml:261 ../en/ch02-tour-merge.xml:48
-#: ../en/ch02-tour-merge.xml:78 ../en/ch02-tour-merge.xml:126
-#: ../en/ch02-tour-merge.xml:182 ../en/ch02-tour-merge.xml:254
-#: ../en/ch03-concepts.xml:56 ../en/ch03-concepts.xml:108
-#: ../en/ch03-concepts.xml:194 ../en/ch03-concepts.xml:301
-#: ../en/ch03-concepts.xml:353 ../en/ch03-concepts.xml:370
-#: ../en/ch03-concepts.xml:414 ../en/ch03-concepts.xml:436
-#: ../en/ch03-concepts.xml:480 ../en/ch05-collab.xml:277
-#: ../en/ch08-undo.xml:366 ../en/ch08-undo.xml:417 ../en/ch08-undo.xml:485
-#: ../en/ch08-undo.xml:527 ../en/ch11-mq.xml:410
-msgid "XXX add text"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
-#: ../en/ch01-tour-basic.xml:262
+"<xref linkend=\"fig:tour-basic:history\"/> provides a graphical "
+"representation of the history of the <filename class=\"directory\">hello</"
+"filename> repository, to make it a little easier to see which direction "
+"history is <quote>flowing</quote> in.  We'll be returning to this figure "
+"several times in this chapter and the chapter that follows."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><figure><title>
+#: ../en/ch01-tour-basic.xml:258
 msgid ""
 "Graphical history of the <filename class=\"directory\">hello</filename> "
 "repository"
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:269
+#. type: Content of: <book><chapter><sect1><figure>
+#: ../en/ch01-tour-basic.xml:260 ../en/ch02-tour-merge.xml:50
+#: ../en/ch02-tour-merge.xml:181 ../en/ch03-concepts.xml:293
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><figure><mediaobject>
+#: ../en/ch01-tour-basic.xml:261
+msgid ""
+"<imageobject><imagedata fileref=\"figs/tour-history.png\"/></imageobject>"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject><textobject><phrase>
+#: ../en/ch01-tour-basic.xml:262 ../en/ch02-tour-merge.xml:52
+#: ../en/ch02-tour-merge.xml:82 ../en/ch02-tour-merge.xml:129
+#: ../en/ch02-tour-merge.xml:183 ../en/ch02-tour-merge.xml:254
+#: ../en/ch03-concepts.xml:57 ../en/ch03-concepts.xml:106
+#: ../en/ch03-concepts.xml:191 ../en/ch03-concepts.xml:295
+#: ../en/ch03-concepts.xml:346 ../en/ch03-concepts.xml:361
+#: ../en/ch03-concepts.xml:402 ../en/ch03-concepts.xml:422
+#: ../en/ch03-concepts.xml:465 ../en/ch05-collab.xml:276
+#: ../en/ch08-undo.xml:365 ../en/ch08-undo.xml:412 ../en/ch08-undo.xml:477
+#: ../en/ch08-undo.xml:515 ../en/ch11-mq.xml:412
+msgid "XXX add text"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><title>
+#: ../en/ch01-tour-basic.xml:267
 msgid "Changesets, revisions, and talking to other people"
 msgstr "改变集,版本,与其它用户交互"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:272
+#: ../en/ch01-tour-basic.xml:270
 msgid ""
 "As English is a notoriously sloppy language, and computer science has a "
 "hallowed history of terminological confusion (why use one term when four will "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:282
+#: ../en/ch01-tour-basic.xml:280
 msgid ""
 "While it doesn't matter what <emphasis>word</emphasis> you use to refer to "
 "the concept of <quote>a changeset</quote>, the <emphasis>identifier</"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
+#: ../en/ch01-tour-basic.xml:289
+msgid ""
+"The revision number is <emphasis>only valid in that repository</emphasis>,"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch01-tour-basic.xml:291
 msgid ""
-"The revision number is <emphasis>only valid in that repository</emphasis>,"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:293
-msgid ""
 "while the hex string is the <emphasis>permanent, unchanging identifier</"
 "emphasis> that will always identify that exact changeset in <emphasis>every</"
 "emphasis> copy of the repository."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:298
+#: ../en/ch01-tour-basic.xml:296
 msgid ""
 "This distinction is important.  If you send someone an email talking about "
 "<quote>revision 33</quote>, there's a high likelihood that their revision 33 "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:308
+#: ../en/ch01-tour-basic.xml:306
 msgid ""
 "Mercurial uses revision numbers purely as a convenient shorthand.  If you "
 "need to discuss a changeset with someone, or make a record of a changeset for "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:316
+#: ../en/ch01-tour-basic.xml:314
 msgid "Viewing specific revisions"
 msgstr "察看指定版本"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:318
+#: ../en/ch01-tour-basic.xml:316
 msgid ""
 "To narrow the output of <command role=\"hg-cmd\">hg log</command> down to a "
 "single revision, use the <option role=\"hg-opt-log\">-r</option> (or <option "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:327
+#: ../en/ch01-tour-basic.xml:325
 msgid ""
 "If you want to see the history of several revisions without having to list "
 "each one, you can use <emphasis>range notation</emphasis>; this lets you "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:335
+#: ../en/ch01-tour-basic.xml:333
 msgid ""
 "Mercurial also honours the order in which you specify revisions, so <command "
 "role=\"hg-cmd\">hg log -r 2:4</command> prints 2, 3, and 4. while <command "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:342
+#: ../en/ch01-tour-basic.xml:340
 msgid "More detailed information"
 msgstr "更详细的信息"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:344
+#: ../en/ch01-tour-basic.xml:342
 msgid ""
 "While the summary information printed by <command role=\"hg-cmd\">hg log</"
 "command> is useful if you already know what you're looking for, you may need "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:356
+#: ../en/ch01-tour-basic.xml:354
 msgid ""
 "If you want to see both the description and content of a change, add the "
 "<option role=\"hg-opt-log\">-p</option> (or <option role=\"hg-opt-log\">--"
 "patch</option>) option.  This displays the content of a change as a "
 "<emphasis>unified diff</emphasis> (if you've never seen a unified diff "
-"before, see section <xref linkend=\"sec.mq.patch\"/> for an overview)."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><title>
-#: ../en/ch01-tour-basic.xml:369
+"before, see <xref linkend=\"sec:mq:patch\"/> for an overview)."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><title>
+#: ../en/ch01-tour-basic.xml:367
 msgid "All about command options"
 msgstr "命令选项"
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:371
+#: ../en/ch01-tour-basic.xml:369
 msgid ""
 "Let's take a brief break from exploring Mercurial commands to discuss a "
 "pattern in the way that they work; you may find this useful to keep in mind "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:375
+#: ../en/ch01-tour-basic.xml:373
 msgid ""
 "Mercurial has a consistent and straightforward approach to dealing with the "
 "options that you can pass to commands.  It follows the conventions for "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:380
+#: ../en/ch01-tour-basic.xml:378
 msgid ""
 "Every option has a long name.  For example, as we've already seen, the "
 "<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:384
+#: ../en/ch01-tour-basic.xml:382
 msgid ""
 "Most options have short names, too.  Instead of <option role=\"hg-opt-log\">--"
 "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>.  (The "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:389
+#: ../en/ch01-tour-basic.xml:387
 msgid ""
 "Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</"
 "option>), while short options start with one (e.g. <option role=\"hg-opt-log"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:393
+#: ../en/ch01-tour-basic.xml:391
 msgid ""
 "Option naming and usage is consistent across commands.  For example, every "
 "command that lets you specify a changeset ID or revision number accepts both "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:399
+#: ../en/ch01-tour-basic.xml:397
 msgid ""
 "In the examples throughout this book, I use short options instead of long.  "
 "This just reflects my own preference, so don't read anything significant into "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:403
+#: ../en/ch01-tour-basic.xml:401
 msgid ""
 "Most commands that print output of some kind will print more output when "
 "passed a <option role=\"hg-opt-global\">-v</option> (or <option role=\"hg-opt-"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><title>
-#: ../en/ch01-tour-basic.xml:411
+#: ../en/ch01-tour-basic.xml:409
 msgid "Making and reviewing changes"
 msgstr "创建和复审修改"
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:413
+#: ../en/ch01-tour-basic.xml:411
 msgid ""
 "Now that we have a grasp of viewing history in Mercurial, let's take a look "
 "at making some changes and examining them."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:417
+#: ../en/ch01-tour-basic.xml:415
 msgid ""
 "The first thing we'll do is isolate our experiment in a repository of its "
 "own.  We use the <command role=\"hg-cmd\">hg clone</command> command, but we "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:427
+#: ../en/ch01-tour-basic.xml:425
 msgid ""
 "As an aside, it's often good practice to keep a <quote>pristine</quote> copy "
 "of a remote repository around, which you can then make temporary clones of to "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:436
+#: ../en/ch01-tour-basic.xml:434
 msgid ""
 "In our <filename class=\"directory\">my-hello</filename> repository, we have "
 "a file <filename>hello.c</filename> that contains the classic <quote>hello, "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:449
+#: ../en/ch01-tour-basic.xml:447
 msgid ""
 "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us "
 "what Mercurial knows about the files in the repository."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:455
+#: ../en/ch01-tour-basic.xml:453
 msgid ""
 "The <command role=\"hg-cmd\">hg status</command> command prints no output for "
 "some files, but a line starting with <quote><literal>M</literal></quote> for "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:462
+#: ../en/ch01-tour-basic.xml:460
 msgid ""
 "The <quote><literal>M</literal></quote> indicates that Mercurial has noticed "
 "that we modified <filename>hello.c</filename>.  We didn't need to "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:470
+#: ../en/ch01-tour-basic.xml:468
 msgid ""
 "It's a little bit helpful to know that we've modified <filename>hello.c</"
 "filename>, but we might prefer to know exactly <emphasis>what</emphasis> "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><title>
-#: ../en/ch01-tour-basic.xml:480
+#: ../en/ch01-tour-basic.xml:478
 msgid "Recording changes in a new changeset"
 msgstr "在新修改集中记录修改"
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:482
+#: ../en/ch01-tour-basic.xml:480
 msgid ""
 "We can modify files, build and test our changes, and use <command role=\"hg-"
 "cmd\">hg status</command> and <command role=\"hg-cmd\">hg diff</command> to "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:489
+#: ../en/ch01-tour-basic.xml:487
 msgid ""
 "The <command role=\"hg-cmd\">hg commit</command> command lets us create a new "
 "changeset; we'll usually refer to this as <quote>making a commit</quote> or "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:495
+#: ../en/ch01-tour-basic.xml:493
 msgid "Setting up a username"
 msgstr "配置用户名称"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:497
+#: ../en/ch01-tour-basic.xml:495
 msgid ""
 "When you try to run <command role=\"hg-cmd\">hg commit</command> for the "
 "first time, it is not guaranteed to succeed.  Mercurial records your name and "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:506
+#: ../en/ch01-tour-basic.xml:504
 msgid ""
 "If you specify a <option role=\"hg-opt-commit\">-u</option> option to the "
 "<command role=\"hg-cmd\">hg commit</command> command on the command line, "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:511
+#: ../en/ch01-tour-basic.xml:509
 msgid ""
 "If you have set the <envar>HGUSER</envar> environment variable, this is "
 "checked next."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:514
+#: ../en/ch01-tour-basic.xml:512
 msgid ""
 "If you create a file in your home directory called <filename role=\"special"
 "\">.hgrc</filename>, with a <envar role=\"rc-item-ui\">username</envar> "
 "entry, that will be used next.  To see what the contents of this file should "
-"look like, refer to section <xref linkend=\"sec.tour-basic.username\"/> below."
+"look like, refer to <xref linkend=\"sec:tour-basic:username\"/> below."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:521
+#: ../en/ch01-tour-basic.xml:520
 msgid ""
 "If you have set the <envar>EMAIL</envar> environment variable, this will be "
 "used next."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../en/ch01-tour-basic.xml:524
+#: ../en/ch01-tour-basic.xml:523
 msgid ""
 "Mercurial will query your system to find out your local user name and host "
 "name, and construct a username from these components. Since this often "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:531
+#: ../en/ch01-tour-basic.xml:530
 msgid ""
 "If all of these mechanisms fail, Mercurial will fail, printing an error "
 "message.  In this case, it will not let you commit until you set up a "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:535
+#: ../en/ch01-tour-basic.xml:534
 msgid ""
 "You should think of the <envar>HGUSER</envar> environment variable and the "
 "<option role=\"hg-opt-commit\">-u</option> option to the <command role=\"hg-"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../en/ch01-tour-basic.xml:544
+#: ../en/ch01-tour-basic.xml:543
 msgid "Creating a Mercurial configuration file"
 msgstr "创建 Mercurial 的配置文件"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../en/ch01-tour-basic.xml:546
+#: ../en/ch01-tour-basic.xml:545
 msgid ""
 "To set a user name, use your favourite editor to create a file called "
 "<filename role=\"special\">.hgrc</filename> in your home directory.  "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../en/ch01-tour-basic.xml:558
+#: ../en/ch01-tour-basic.xml:557
 msgid ""
 "The <quote><literal>[ui]</literal></quote> line begins a <emphasis>section</"
 "emphasis> of the config file, so you can read the <quote><literal>username "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../en/ch01-tour-basic.xml:571
+#: ../en/ch01-tour-basic.xml:570
 msgid "Choosing a user name"
 msgstr "选择用户名称"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../en/ch01-tour-basic.xml:573
+#: ../en/ch01-tour-basic.xml:572
 msgid ""
 "You can use any text you like as the value of the <literal>username</literal> "
 "config item, since this information is for reading by other people, but for "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
-#: ../en/ch01-tour-basic.xml:580
+#: ../en/ch01-tour-basic.xml:579
 msgid ""
 "Mercurial's built-in web server obfuscates email addresses, to make it more "
 "difficult for the email harvesting tools that spammers use. This reduces the "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:590
+#: ../en/ch01-tour-basic.xml:589
 msgid "Writing a commit message"
 msgstr "写提交日志"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:592
+#: ../en/ch01-tour-basic.xml:591
 msgid ""
 "When we commit a change, Mercurial drops us into a text editor, to enter a "
 "message that will describe the modifications we've made in this changeset.  "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:602
+#: ../en/ch01-tour-basic.xml:601
 msgid ""
 "The editor that the <command role=\"hg-cmd\">hg commit</command> command "
 "drops us into will contain an empty line, followed by a number of lines "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:609
+#: ../en/ch01-tour-basic.xml:608
 msgid ""
 "Mercurial ignores the lines that start with <quote><literal>HG:</literal></"
 "quote>; it uses them only to tell us which files it's recording changes to.  "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:615
+#: ../en/ch01-tour-basic.xml:614
 msgid "Writing a good commit message"
 msgstr "写好提交日志"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:617
+#: ../en/ch01-tour-basic.xml:616
 msgid ""
 "Since <command role=\"hg-cmd\">hg log</command> only prints the first line of "
 "a commit message by default, it's best to write a commit message whose first "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:631
+#: ../en/ch01-tour-basic.xml:630
 msgid ""
 "As far as the remainder of the contents of the commit message are concerned, "
 "there are no hard-and-fast rules.  Mercurial itself doesn't interpret or care "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:637
+#: ../en/ch01-tour-basic.xml:636
 msgid ""
 "My personal preference is for short, but informative, commit messages that "
 "tell me something that I can't figure out with a quick glance at the output "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:644
+#: ../en/ch01-tour-basic.xml:643
 msgid "Aborting a commit"
 msgstr "终止提交"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:646
+#: ../en/ch01-tour-basic.xml:645
 msgid ""
 "If you decide that you don't want to commit while in the middle of editing a "
 "commit message, simply exit from your editor without saving the file that "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:651
+#: ../en/ch01-tour-basic.xml:650
 msgid ""
 "If we run the <command role=\"hg-cmd\">hg commit</command> command without "
 "any arguments, it records all of the changes we've made, as reported by "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:658
+#: ../en/ch01-tour-basic.xml:657
 msgid "Admiring our new handiwork"
 msgstr "欣赏我们的新手艺"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:660
+#: ../en/ch01-tour-basic.xml:659
 msgid ""
 "Once we've finished the commit, we can use the <command role=\"hg-cmd\">hg "
 "tip</command> command to display the changeset we just created.  This command "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:669
+#: ../en/ch01-tour-basic.xml:668
 msgid ""
 "We refer to the newest revision in the repository as the tip revision, or "
 "simply the tip."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><title>
-#: ../en/ch01-tour-basic.xml:676
+#: ../en/ch01-tour-basic.xml:675
 msgid "Sharing changes"
 msgstr "共享修改"
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch01-tour-basic.xml:678
+#: ../en/ch01-tour-basic.xml:677
 msgid ""
 "We mentioned earlier that repositories in Mercurial are self-contained.  This "
 "means that the changeset we just created exists only in our <filename class="
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:686
+#: ../en/ch01-tour-basic.xml:685
 msgid "Pulling changes from another repository"
 msgstr "从其它版本库取得修改"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:687
+#: ../en/ch01-tour-basic.xml:686
 msgid ""
 "To get started, let's clone our original <filename class=\"directory\">hello</"
 "filename> repository, which does not contain the change we just committed.  "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:695
+#: ../en/ch01-tour-basic.xml:694
 msgid ""
 "We'll use the <command role=\"hg-cmd\">hg pull</command> command to bring "
 "changes from <filename class=\"directory\">my-hello</filename> into <filename "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:708
+#: ../en/ch01-tour-basic.xml:707
 msgid ""
 "(Of course, someone could cause more changesets to appear in the repository "
 "that we ran <command role=\"hg-cmd\">hg incoming</command> in, before we get "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:715
+#: ../en/ch01-tour-basic.xml:714
 msgid ""
 "Bringing changes into a repository is a simple matter of running the <command "
 "role=\"hg-cmd\">hg pull</command> command, and telling it which repository to "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:722
+#: ../en/ch01-tour-basic.xml:721
 msgid ""
 "As you can see from the before-and-after output of <command role=\"hg-cmd"
 "\">hg tip</command>, we have successfully pulled changes into our "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:730
+#: ../en/ch01-tour-basic.xml:729
 msgid "Updating the working directory"
 msgstr "更新工作目录"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:732
+#: ../en/ch01-tour-basic.xml:731
 msgid ""
 "We have so far glossed over the relationship between a repository and its "
 "working directory.  The <command role=\"hg-cmd\">hg pull</command> command "
-"that we ran in section <xref linkend=\"sec.tour.pull\"/> brought changes into "
-"the repository, but if we check, there's no sign of those changes in the "
-"working directory.  This is because <command role=\"hg-cmd\">hg pull</"
-"command> does not (by default) touch the working directory.  Instead, we use "
-"the <command role=\"hg-cmd\">hg update</command> command to do this."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:744
+"that we ran in <xref linkend=\"sec:tour:pull\"/> brought changes into the "
+"repository, but if we check, there's no sign of those changes in the working "
+"directory.  This is because <command role=\"hg-cmd\">hg pull</command> does "
+"not (by default) touch the working directory.  Instead, we use the <command "
+"role=\"hg-cmd\">hg update</command> command to do this."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><para>
+#: ../en/ch01-tour-basic.xml:743
 msgid ""
 "It might seem a bit strange that <command role=\"hg-cmd\">hg pull</command> "
 "doesn't update the working directory automatically.  There's actually a good "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:755
+#: ../en/ch01-tour-basic.xml:754
 msgid ""
 "However, since pull-then-update is such a common thing to do, Mercurial lets "
 "you combine the two by passing the <option role=\"hg-opt-pull\">-u</option> "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:760
+#: ../en/ch01-tour-basic.xml:759
 msgid ""
 "If you look back at the output of <command role=\"hg-cmd\">hg pull</command> "
-"in section <xref linkend=\"sec.tour.pull\"/> when we ran it without <option "
-"role=\"hg-opt-pull\">-u</option>, you can see that it printed a helpful "
-"reminder that we'd have to take an explicit step to update the working "
-"directory:"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:769
+"in <xref linkend=\"sec:tour:pull\"/> when we ran it without <option role=\"hg-"
+"opt-pull\">-u</option>, you can see that it printed a helpful reminder that "
+"we'd have to take an explicit step to update the working directory:"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><para>
+#: ../en/ch01-tour-basic.xml:768
 msgid ""
 "To find out what revision the working directory is at, use the <command role="
 "\"hg-cmd\">hg parents</command> command."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:775
-msgid ""
-"If you look back at figure <xref endterm=\"fig.tour-basic.history.caption\" "
-"linkend=\"fig.tour-basic.history\"/>, you'll see arrows connecting each "
-"changeset.  The node that the arrow leads <emphasis>from</emphasis> in each "
-"case is a parent, and the node that the arrow leads <emphasis>to</emphasis> "
-"is its child.  The working directory has a parent in just the same way; this "
-"is the changeset that the working directory currently contains."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:785
+#: ../en/ch01-tour-basic.xml:774
+msgid ""
+"If you look back at <xref linkend=\"fig:tour-basic:history\"/>, you'll see "
+"arrows connecting each changeset.  The node that the arrow leads "
+"<emphasis>from</emphasis> in each case is a parent, and the node that the "
+"arrow leads <emphasis>to</emphasis> is its child.  The working directory has "
+"a parent in just the same way; this is the changeset that the working "
+"directory currently contains."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><para>
+#: ../en/ch01-tour-basic.xml:783
 msgid ""
 "To update the working directory to a particular revision, give a revision "
 "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:792
+#: ../en/ch01-tour-basic.xml:790
 msgid ""
 "If you omit an explicit revision, <command role=\"hg-cmd\">hg update</"
 "command> will update to the tip revision, as shown by the second call to "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:800
+#: ../en/ch01-tour-basic.xml:798
 msgid "Pushing changes to another repository"
 msgstr "发布修改到其它版本库"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:802
+#: ../en/ch01-tour-basic.xml:800
 msgid ""
 "Mercurial lets us push changes to another repository, from the repository "
 "we're currently visiting.  As with the example of <command role=\"hg-cmd\">hg "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:810
+#: ../en/ch01-tour-basic.xml:808
 msgid ""
 "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what "
 "changes would be pushed into another repository."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:816
+#: ../en/ch01-tour-basic.xml:814
 msgid ""
 "And the <command role=\"hg-cmd\">hg push</command> command does the actual "
 "push."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:822
+#: ../en/ch01-tour-basic.xml:820
 msgid ""
 "As with <command role=\"hg-cmd\">hg pull</command>, the <command role=\"hg-cmd"
 "\">hg push</command> command does not update the working directory in the "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:831
+#: ../en/ch01-tour-basic.xml:829
 msgid ""
 "What happens if we try to pull or push changes and the receiving repository "
 "already has those changes? Nothing too exciting."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch01-tour-basic.xml:838
+#: ../en/ch01-tour-basic.xml:836
 msgid "Sharing changes over a network"
 msgstr "通过网络共享修改"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:840
+#: ../en/ch01-tour-basic.xml:838
 msgid ""
 "The commands we have covered in the previous few sections are not limited to "
 "working with local repositories.  Each works in exactly the same fashion over "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch01-tour-basic.xml:848
+#: ../en/ch01-tour-basic.xml:846
 msgid ""
 "In this example, we can see what changes we could push to the remote "
 "repository, but the repository is understandably not set up to let anonymous "
 msgid ""
 "We should now have two copies of <filename>hello.c</filename> with different "
 "contents.  The histories of the two repositories have also diverged, as "
-"illustrated in figure <xref endterm=\"fig.tour-merge.sep-repos.caption\" "
-"linkend=\"fig.tour-merge.sep-repos\"/>."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
-#: ../en/ch02-tour-merge.xml:47
-msgid ""
-"<imageobject><imagedata fileref=\"images/tour-merge-sep-repos.png\"/></"
-"imageobject>"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
-#: ../en/ch02-tour-merge.xml:49
+"illustrated in <xref linkend=\"fig:tour-merge:sep-repos\"/>."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><figure><title>
+#: ../en/ch02-tour-merge.xml:46
 msgid ""
 "Divergent recent histories of the <filename class=\"directory\">my-hello</"
 "filename> and <filename class=\"directory\">my-new-hello</filename> "
 "repositories"
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:57
+#. type: Content of: <book><chapter><sect1><figure><mediaobject>
+#: ../en/ch02-tour-merge.xml:51
+msgid ""
+"<imageobject><imagedata fileref=\"figs/tour-merge-sep-repos.png\"/></"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><para>
+#: ../en/ch02-tour-merge.xml:56
 msgid ""
 "We already know that pulling changes from our <filename class=\"directory"
 "\">my-hello</filename> repository will have no effect on the working "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:63
+#: ../en/ch02-tour-merge.xml:62
 msgid ""
 "However, the <command role=\"hg-cmd\">hg pull</command> command says "
 "something about <quote>heads</quote>."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch02-tour-merge.xml:67
+#: ../en/ch02-tour-merge.xml:66
 msgid "Head changesets"
 msgstr "顶点改变集"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:69
+#: ../en/ch02-tour-merge.xml:68
 msgid ""
 "A head is a change that has no descendants, or children, as they're also "
 "known.  The tip revision is thus a head, because the newest revision in a "
 "one head."
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
-#: ../en/ch02-tour-merge.xml:77
-msgid ""
-"<imageobject><imagedata fileref=\"images/tour-merge-pull.png\"/></imageobject>"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
-#: ../en/ch02-tour-merge.xml:79
+#. type: Content of: <book><chapter><sect1><sect2><figure><title>
+#: ../en/ch02-tour-merge.xml:75
 msgid ""
 "Repository contents after pulling from <filename class=\"directory\">my-"
 "hello</filename> into <filename class=\"directory\">my-new-hello</filename>"
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:85
-msgid ""
-"In figure <xref endterm=\"fig.tour-merge.pull.caption\" linkend=\"fig.tour-"
-"merge.pull\"/>, you can see the effect of the pull from <filename class="
-"\"directory\">my-hello</filename> into <filename class=\"directory\">my-new-"
-"hello</filename>.  The history that was already present in <filename class="
-"\"directory\">my-new-hello</filename> is untouched, but a new revision has "
-"been added.  By referring to figure <xref endterm=\"fig.tour-merge.sep-repos."
-"caption\" linkend=\"fig.tour-merge.sep-repos\"/>, we can see that the "
-"<emphasis>changeset ID</emphasis> remains the same in the new repository, but "
-"the <emphasis>revision number</emphasis> has changed.  (This, incidentally, "
-"is a fine example of why it's not safe to use revision numbers when "
-"discussing changesets.)  We can view the heads in a repository using the "
-"<command role=\"hg-cmd\">hg heads</command> command."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch02-tour-merge.xml:106
+#. type: Content of: <book><chapter><sect1><sect2><figure>
+#: ../en/ch02-tour-merge.xml:78 ../en/ch02-tour-merge.xml:125
+#: ../en/ch02-tour-merge.xml:250 ../en/ch03-concepts.xml:55
+#: ../en/ch03-concepts.xml:104 ../en/ch03-concepts.xml:189
+#: ../en/ch03-concepts.xml:344 ../en/ch03-concepts.xml:359
+#: ../en/ch03-concepts.xml:400 ../en/ch03-concepts.xml:420
+#: ../en/ch03-concepts.xml:461 ../en/ch05-collab.xml:274
+#: ../en/ch08-undo.xml:363 ../en/ch08-undo.xml:410 ../en/ch08-undo.xml:475
+#: ../en/ch08-undo.xml:513 ../en/ch11-mq.xml:410
+msgid "  <placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
+#: ../en/ch02-tour-merge.xml:79
+msgid ""
+"<imageobject> <imagedata fileref=\"figs/tour-merge-pull.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><para>
+#: ../en/ch02-tour-merge.xml:86
+msgid ""
+"In <xref linkend=\"fig:tour-merge:pull\"/>, you can see the effect of the "
+"pull from <filename class=\"directory\">my-hello</filename> into <filename "
+"class=\"directory\">my-new-hello</filename>.  The history that was already "
+"present in <filename class=\"directory\">my-new-hello</filename> is "
+"untouched, but a new revision has been added.  By referring to <xref linkend="
+"\"fig:tour-merge:sep-repos\"/>, we can see that the <emphasis>changeset ID</"
+"emphasis> remains the same in the new repository, but the <emphasis>revision "
+"number</emphasis> has changed.  (This, incidentally, is a fine example of why "
+"it's not safe to use revision numbers when discussing changesets.)  We can "
+"view the heads in a repository using the <command role=\"hg-cmd\">hg heads</"
+"command> command."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><title>
+#: ../en/ch02-tour-merge.xml:105
 msgid "Performing the merge"
 msgstr "执行合并"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:108
+#: ../en/ch02-tour-merge.xml:107
 msgid ""
 "What happens if we try to use the normal <command role=\"hg-cmd\">hg update</"
 "command> command to update to the new tip?"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:114
+#: ../en/ch02-tour-merge.xml:113
 msgid ""
 "Mercurial is telling us that the <command role=\"hg-cmd\">hg update</command> "
 "command won't do a merge; it won't update the working directory when it "
 "merge the two heads."
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
-#: ../en/ch02-tour-merge.xml:125
-msgid ""
-"<imageobject><imagedata fileref=\"images/tour-merge-merge.png\"/></"
+#. type: Content of: <book><chapter><sect1><sect2><figure><title>
+#: ../en/ch02-tour-merge.xml:123
+msgid "Working directory and repository during merge, and following commit"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
+#: ../en/ch02-tour-merge.xml:126
+msgid ""
+"<imageobject> <imagedata fileref=\"figs/tour-merge-merge.png\"/> </"
 "imageobject>"
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
-#: ../en/ch02-tour-merge.xml:127
-msgid "Working directory and repository during merge, and following commit"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:132
+#. type: Content of: <book><chapter><sect1><sect2><para>
+#: ../en/ch02-tour-merge.xml:133
 msgid ""
 "This updates the working directory so that it contains changes from "
 "<emphasis>both</emphasis> heads, which is reflected in both the output of "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch02-tour-merge.xml:142
+#: ../en/ch02-tour-merge.xml:143
 msgid "Committing the results of the merge"
 msgstr "提交合并结果"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:144
+#: ../en/ch02-tour-merge.xml:145
 msgid ""
 "Whenever we've done a merge, <command role=\"hg-cmd\">hg parents</command> "
 "will display two parents until we <command role=\"hg-cmd\">hg commit</"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:151
+#: ../en/ch02-tour-merge.xml:152
 msgid ""
 "We now have a new tip revision; notice that it has <emphasis>both</emphasis> "
 "of our former heads as its parents.  These are the same revisions that were "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:158
-msgid ""
-"In figure <xref endterm=\"fig.tour-merge.merge.caption\" linkend=\"fig.tour-"
-"merge.merge\"/>, you can see a representation of what happens to the working "
-"directory during the merge, and how this affects the repository when the "
-"commit happens.  During the merge, the working directory has two parent "
-"changesets, and these become the parents of the new changeset."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><title>
-#: ../en/ch02-tour-merge.xml:169
+#: ../en/ch02-tour-merge.xml:159
+msgid ""
+"In <xref linkend=\"fig:tour-merge:merge\"/>, you can see a representation of "
+"what happens to the working directory during the merge, and how this affects "
+"the repository when the commit happens.  During the merge, the working "
+"directory has two parent changesets, and these become the parents of the new "
+"changeset."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><title>
+#: ../en/ch02-tour-merge.xml:170
 msgid "Merging conflicting changes"
 msgstr "合并有冲突的改变"
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:171
+#: ../en/ch02-tour-merge.xml:172
 msgid ""
 "Most merges are simple affairs, but sometimes you'll find yourself merging "
 "changes where each modifies the same portions of the same files.  Unless both "
 "something coherent."
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><informalfigure><mediaobject>
+#. type: Content of: <book><chapter><sect1><figure><title>
 #: ../en/ch02-tour-merge.xml:180
-msgid ""
-"<imageobject><imagedata fileref=\"images/tour-merge-conflict.png\"/> </"
+msgid "Conflicting changes to a document"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><figure><mediaobject>
+#: ../en/ch02-tour-merge.xml:182
+msgid ""
+"<imageobject><imagedata fileref=\"figs/tour-merge-conflict.png\"/></"
 "imageobject>"
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para>
-#: ../en/ch02-tour-merge.xml:183
-msgid "Conflicting changes to a document"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:188
-msgid ""
-"Figure <xref endterm=\"fig.tour-merge.conflict.caption\" linkend=\"fig.tour-"
-"merge.conflict\"/> illustrates an instance of two conflicting changes to a "
-"document.  We started with a single version of the file; then we made some "
-"changes; while someone else made different changes to the same text.  Our "
-"task in resolving the conflicting changes is to decide what the file should "
-"look like."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:196
+#. type: Content of: <book><chapter><sect1><para>
+#: ../en/ch02-tour-merge.xml:187
+msgid ""
+"<xref linkend=\"fig:tour-merge:conflict\"/> illustrates an instance of two "
+"conflicting changes to a document.  We started with a single version of the "
+"file; then we made some changes; while someone else made different changes to "
+"the same text.  Our task in resolving the conflicting changes is to decide "
+"what the file should look like."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><para>
+#: ../en/ch02-tour-merge.xml:194
 msgid ""
 "Mercurial doesn't have a built-in facility for handling conflicts. Instead, "
 "it runs an external program called <command>hgmerge</command>.  This is a "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:207
+#: ../en/ch02-tour-merge.xml:205
 msgid ""
 "It's also possible to get Mercurial to run another program or script instead "
 "of <command>hgmerge</command>, by setting the <envar>HGMERGE</envar> "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch02-tour-merge.xml:213
+#: ../en/ch02-tour-merge.xml:211
 msgid "Using a graphical merge tool"
 msgstr "使用图形合并工具"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:215
+#: ../en/ch02-tour-merge.xml:213
 msgid ""
 "My preferred graphical merge tool is <command>kdiff3</command>, which I'll "
 "use to describe the features that are common to graphical file merging "
 "tools.  You can see a screenshot of <command>kdiff3</command> in action in "
-"figure <xref endterm=\"fig.tour-merge.kdiff3.caption\" linkend=\"fig.tour-"
-"merge.kdiff3\"/>.  The kind of merge it is performing is called a "
-"<emphasis>three-way merge</emphasis>, because there are three different "
-"versions of the file of interest to us.  The tool thus splits the upper "
-"portion of the window into three panes:"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../en/ch02-tour-merge.xml:226
+"<xref linkend=\"fig:tour-merge:kdiff3\"/>.  The kind of merge it is "
+"performing is called a <emphasis>three-way merge</emphasis>, because there "
+"are three different versions of the file of interest to us.  The tool thus "
+"splits the upper portion of the window into three panes:"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
+#: ../en/ch02-tour-merge.xml:223
 msgid ""
 "At the left is the <emphasis>base</emphasis> version of the file, i.e. the "
 "most recent version from which the two versions we're trying to merge are "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../en/ch02-tour-merge.xml:231
+#: ../en/ch02-tour-merge.xml:228
 msgid ""
 "In the middle is <quote>our</quote> version of the file, with the contents "
 "that we modified."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../en/ch02-tour-merge.xml:234
+#: ../en/ch02-tour-merge.xml:231
 msgid ""
 "On the right is <quote>their</quote> version of the file, the one that from "
 "the changeset that we're trying to merge with."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:238
+#: ../en/ch02-tour-merge.xml:235
 msgid ""
 "In the pane below these is the current <emphasis>result</emphasis> of the "
 "merge. Our task is to replace all of the red text, which indicates unresolved "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:245
+#: ../en/ch02-tour-merge.xml:242
 msgid ""
 "All four of these panes are <emphasis>locked together</emphasis>; if we "
 "scroll vertically or horizontally in any of them, the others are updated to "
 "display the corresponding sections of their respective files."
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
-#: ../en/ch02-tour-merge.xml:252
-msgid ""
-"<imageobject><imagedata width=\"100%\" fileref=\"images/kdiff3.png\"/> </"
+#. type: Content of: <book><chapter><sect1><sect2><figure><title>
+#: ../en/ch02-tour-merge.xml:248
+msgid "Using <command>kdiff3</command> to merge versions of a file"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
+#: ../en/ch02-tour-merge.xml:251
+msgid ""
+"<imageobject> <imagedata width=\"100%\" fileref=\"figs/kdiff3.png\"/></"
 "imageobject>"
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
-#: ../en/ch02-tour-merge.xml:255
-msgid "Using <command>kdiff3</command> to merge versions of a file"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:261
+#. type: Content of: <book><chapter><sect1><sect2><para>
+#: ../en/ch02-tour-merge.xml:259
 msgid ""
 "For each conflicting portion of the file, we can choose to resolve the "
 "conflict using some combination of text from the base version, ours, or "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:267
+#: ../en/ch02-tour-merge.xml:265
 msgid ""
 "There are <emphasis>many</emphasis> file merging tools available, too many to "
 "cover here.  They vary in which platforms they are available for, and in "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch02-tour-merge.xml:276
+#: ../en/ch02-tour-merge.xml:274
 msgid "A worked example"
 msgstr "合并实例"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:278
-msgid ""
-"In this example, we will reproduce the file modification history of figure "
-"<xref endterm=\"fig.tour-merge.conflict.caption\" linkend=\"fig.tour-merge."
-"conflict\"/> above.  Let's begin by creating a repository with a base version "
-"of our document."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:286
+#: ../en/ch02-tour-merge.xml:276
+msgid ""
+"In this example, we will reproduce the file modification history of <xref "
+"linkend=\"fig:tour-merge:conflict\"/> above.  Let's begin by creating a "
+"repository with a base version of our document."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><para>
+#: ../en/ch02-tour-merge.xml:283
 msgid "We'll clone the repository and make a change to the file."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:291
+#: ../en/ch02-tour-merge.xml:288
 msgid ""
 "And another clone, to simulate someone else making a change to the file. "
 "(This hints at the idea that it's not all that unusual to merge with yourself "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:299
+#: ../en/ch02-tour-merge.xml:296
 msgid ""
 "Having created two different versions of the file, we'll set up an "
 "environment suitable for running our merge."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:305
+#: ../en/ch02-tour-merge.xml:302
 msgid ""
 "In this example, I won't use Mercurial's normal <command>hgmerge</command> "
 "program to do the merge, because it would drop my nice automated example-"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:315
+#: ../en/ch02-tour-merge.xml:312
 msgid "<emphasis role=\"bold\">XXX FIX THIS EXAMPLE.</emphasis>"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:320
+#: ../en/ch02-tour-merge.xml:317
 msgid ""
 "Because <command>merge</command> can't resolve the conflicting changes, it "
 "leaves <emphasis>merge markers</emphasis> inside the file that has conflicts, "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:326
+#: ../en/ch02-tour-merge.xml:323
 msgid ""
 "Mercurial can tell from the way <command>merge</command> exits that it wasn't "
 "able to merge successfully, so it tells us what commands we'll need to run if "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch02-tour-merge.xml:333
+#: ../en/ch02-tour-merge.xml:330
 msgid ""
 "If automatic or manual merges fail, there's nothing to prevent us from "
 "<quote>fixing up</quote> the affected files ourselves, and committing the "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><title>
-#: ../en/ch02-tour-merge.xml:342
+#: ../en/ch02-tour-merge.xml:339
 msgid "Simplifying the pull-merge-commit sequence"
 msgstr "简化拉-合并-提交程序"
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:344
+#: ../en/ch02-tour-merge.xml:341
 msgid ""
 "The process of merging changes as outlined above is straightforward, but "
 "requires running three commands in sequence."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:350
+#: ../en/ch02-tour-merge.xml:347
 msgid ""
 "In the case of the final commit, you also need to enter a commit message, "
 "which is almost always going to be a piece of uninteresting "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:354
+#: ../en/ch02-tour-merge.xml:351
 msgid ""
 "It would be nice to reduce the number of steps needed, if this were "
 "possible.  Indeed, Mercurial is distributed with an extension called <literal "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:359
+#: ../en/ch02-tour-merge.xml:356
 msgid ""
 "Mercurial provides a flexible extension mechanism that lets people extend its "
 "functionality, while keeping the core of Mercurial small and easy to deal "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:366
+#: ../en/ch02-tour-merge.xml:363
 msgid ""
 "The <literal role=\"hg-ext\">fetch</literal> extension adds a new command "
 "called, not surprisingly, <command role=\"hg-cmd\">hg fetch</command>.  This "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:379
+#: ../en/ch02-tour-merge.xml:376
 msgid ""
 "Enabling the <literal role=\"hg-ext\">fetch</literal> extension is easy.  "
 "Edit your <filename role=\"special\">.hgrc</filename>, and either go to the "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch02-tour-merge.xml:388
+#: ../en/ch02-tour-merge.xml:385
 msgid ""
 "(Normally, on the right-hand side of the <quote><literal>=</literal></quote> "
 "would appear the location of the extension, but since the <literal role=\"hg-"
 "much history, the revision data and index are combined in a single "
 "<quote><literal>.i</literal></quote> file.  The correspondence between a file "
 "in the working directory and the filelog that tracks its history in the "
-"repository is illustrated in figure <xref endterm=\"fig.concepts.filelog."
-"caption\" linkend=\"fig.concepts.filelog\"/>."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
-#: ../en/ch03-concepts.xml:55
-msgid "<imageobject><imagedata fileref=\"images/filelog.png\"/></imageobject>"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
-#: ../en/ch03-concepts.xml:57
+"repository is illustrated in <xref linkend=\"fig:concepts:filelog\"/>."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><figure><title>
+#: ../en/ch03-concepts.xml:53
 msgid ""
 "Relationships between files in working directory and filelogs in repository"
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch03-concepts.xml:65
+#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
+#: ../en/ch03-concepts.xml:56
+msgid "<imageobject><imagedata fileref=\"figs/filelog.png\"/></imageobject>"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><title>
+#: ../en/ch03-concepts.xml:63
 msgid "Managing tracked files"
 msgstr "管理跟踪的文件"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:67
+#: ../en/ch03-concepts.xml:65
 msgid ""
 "Mercurial uses a structure called a <emphasis>manifest</emphasis> to collect "
 "together information about the files that it tracks.  Each entry in the "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch03-concepts.xml:77
+#: ../en/ch03-concepts.xml:75
 msgid "Recording changeset information"
 msgstr "记录修改集信息"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:79
+#: ../en/ch03-concepts.xml:77
 msgid ""
 "The <emphasis>changelog</emphasis> contains information about each "
 "changeset.  Each revision records who committed a change, the changeset "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch03-concepts.xml:87
+#: ../en/ch03-concepts.xml:85
 msgid "Relationships between revisions"
 msgstr "版本之间的关系"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:89
+#: ../en/ch03-concepts.xml:87
 msgid ""
 "Within a changelog, a manifest, or a filelog, each revision stores a pointer "
 "to its immediate parent (or to its two parents, if it's a merge revision).  "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:96
+#: ../en/ch03-concepts.xml:94
 msgid ""
 "For every changeset in a repository, there is exactly one revision stored in "
 "the changelog.  Each revision of the changelog contains a pointer to a single "
 "revision of the manifest.  A revision of the manifest stores a pointer to a "
 "single revision of each filelog tracked when that changeset was created.  "
-"These relationships are illustrated in figure <xref endterm=\"fig.concepts."
-"metadata.caption\" linkend=\"fig.concepts.metadata\"/>."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
-#: ../en/ch03-concepts.xml:107
-msgid "<imageobject><imagedata fileref=\"images/metadata.png\"/></imageobject>"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
-#: ../en/ch03-concepts.xml:109
+"These relationships are illustrated in <xref linkend=\"fig:concepts:metadata"
+"\"/>."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><figure><title>
+#: ../en/ch03-concepts.xml:103
 msgid "Metadata relationships"
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:114
+#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
+#: ../en/ch03-concepts.xml:105
+msgid "<imageobject><imagedata fileref=\"figs/metadata.png\"/></imageobject>"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><para>
+#: ../en/ch03-concepts.xml:110
 msgid ""
 "As the illustration shows, there is <emphasis>not</emphasis> a <quote>one to "
 "one</quote> relationship between revisions in the changelog, manifest, or "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><title>
-#: ../en/ch03-concepts.xml:127
+#: ../en/ch03-concepts.xml:123
 msgid "Safe, efficient storage"
 msgstr "安全,高效的存储"
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch03-concepts.xml:129
+#: ../en/ch03-concepts.xml:125
 msgid ""
 "The underpinnings of changelogs, manifests, and filelogs are provided by a "
 "single structure called the <emphasis>revlog</emphasis>."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch03-concepts.xml:134
+#: ../en/ch03-concepts.xml:130
 msgid "Efficient storage"
 msgstr "高效存储"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:136
+#: ../en/ch03-concepts.xml:132
 msgid ""
 "The revlog provides efficient storage of revisions using a <emphasis>delta</"
 "emphasis> mechanism.  Instead of storing a complete copy of a file for each "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:144
+#: ../en/ch03-concepts.xml:140
 msgid ""
 "Some obsolete revision control systems can only work with deltas of text "
 "files.  They must either store binary files as complete snapshots or encoded "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch03-concepts.xml:153
+#: ../en/ch03-concepts.xml:149
 msgid "Safe operation"
 msgstr "安全操作"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:155
+#: ../en/ch03-concepts.xml:151
 msgid ""
 "Mercurial only ever <emphasis>appends</emphasis> data to the end of a revlog "
 "file. It never modifies a section of a file after it has written it.  This is "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:161
+#: ../en/ch03-concepts.xml:157
 msgid ""
 "In addition, Mercurial treats every write as part of a <emphasis>transaction</"
 "emphasis> that can span a number of files.  A transaction is "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:171
+#: ../en/ch03-concepts.xml:167
 msgid ""
 "The fact that Mercurial only appends to files makes it easier to provide this "
 "transactional guarantee.  The easier it is to do stuff like this, the more "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch03-concepts.xml:178
+#: ../en/ch03-concepts.xml:174
 msgid "Fast retrieval"
 msgstr "快速检索"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:180
+#: ../en/ch03-concepts.xml:176
 msgid ""
 "Mercurial cleverly avoids a pitfall common to all earlier revision control "
 "systems: the problem of <emphasis>inefficient retrieval</emphasis>. Most "
 "longer it takes to reconstruct a particular revision."
 msgstr ""
 
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject>
-#: ../en/ch03-concepts.xml:193
-msgid "<imageobject><imagedata fileref=\"images/snapshot.png\"/></imageobject>"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><caption><para>
+#. type: Content of: <book><chapter><sect1><sect2><figure><title>
+#: ../en/ch03-concepts.xml:188
+msgid "Snapshot of a revlog, with incremental deltas"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><figure><mediaobject>
+#: ../en/ch03-concepts.xml:190
+msgid "<imageobject><imagedata fileref=\"figs/snapshot.png\"/></imageobject>"
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-concepts.xml:195
-msgid "Snapshot of a revlog, with incremental deltas"
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:200
 msgid ""
 "The innovation that Mercurial applies to this problem is simple but "
 "effective.  Once the cumulative amount of delta information stored since the "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:209
-msgid ""
-"Figure <xref endterm=\"fig.concepts.snapshot.caption\" linkend=\"fig.concepts."
-"snapshot\"/> illustrates the idea.  In an entry in a revlog's index file, "
-"Mercurial stores the range of entries from the data file that it must read to "
-"reconstruct a particular revision."
+#: ../en/ch03-concepts.xml:204
+msgid ""
+"<xref linkend=\"fig:concepts:snapshot\"/> illustrates the idea.  In an entry "
+"in a revlog's index file, Mercurial stores the range of entries from the data "
+"file that it must read to reconstruct a particular revision."
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../en/ch03-concepts.xml:216
+#: ../en/ch03-concepts.xml:210
 msgid "Aside: the influence of video compression"
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../en/ch03-concepts.xml:218
+#: ../en/ch03-concepts.xml:212
 msgid ""
 "If you're familiar with video compression or have ever watched a TV feed "
 "through a digital cable or satellite service, you may know that most video "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../en/ch03-concepts.xml:227
+#: ../en/ch03-concepts.xml:221
 msgid ""
 "Because it's possible for a video stream to <quote>drop out</quote> "
 "occasionally due to signal glitches, and to limit the accumulation of "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../en/ch03-concepts.xml:241
+#: ../en/ch03-concepts.xml:235
 msgid "Identification and strong integrity"
 msgstr "鉴别和强完整性"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:243
+#: ../en/ch03-concepts.xml:237
 msgid ""
 "Along with delta or snapshot information, a revlog entry contains a "
 "cryptographic hash of the data that it represents.  This makes it difficult "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:248
+#: ../en/ch03-concepts.xml:242
 msgid ""
 "Hashes provide more than a mere check against corruption; they are used as "
 "the identifiers for revisions.  The changeset identification hashes that you "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:255
+#: ../en/ch03-concepts.xml:249
 msgid ""
 "Mercurial verifies that hashes are correct when it retrieves file revisions "
 "and when it pulls changes from another repository.  If it encounters an "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../en/ch03-concepts.xml:260
+#: ../en/ch03-concepts.xml:254
 msgid ""
 "In addition to the effect it has on retrieval efficiency, Mercurial's use of "
 "periodic snapshots makes it more robust against partial data corruption.  If "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><title>
-#: ../en/ch03-concepts.xml:272
+#: ../en/ch03-concepts.xml:266
 msgid "Revision history, branching, and merging"
 msgstr "修订历史,分支与合并"
 
 #. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch03-concepts.xml:274
+#: ../en/ch03-concepts.xml:268
 msgid ""
 "Every entry in a Mercurial revlog knows the identity of its immediate "
 "ancestor revision, usually referred to as its <emphasis>parent</emphasis>.  "
 msgstr ""
 
 #. type: Content of: <book><chapter><sect1><para>
+#: ../en/ch03-concepts.xml:276
+msgid ""
+"In <xref linkend=\"fig:concepts:revlog\"/>, you can see an example of the "
+"conceptual structure of a revlog.  Filelogs, manifests, and changelogs all "
+"have this same structure; they differ only in the kind of data stored in each "
+"delta or snapshot."
+msgstr ""
+
+#. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-concepts.xml:282
 msgid ""
-"In figure <xref endterm=\"fig.concepts.revlog.caption\" linkend=\"fig."
-"concepts.revlog\"/>, you can see an example of the conceptual structure of a "
-"revlog.  Filelogs, manifests, and changelogs all have this same structure; "
-"they differ only in the kind of data stored in each delta or snapshot."
-msgstr ""
-
-#. type: Content of: <book><chapter><sect1><para>
-#: ../en/ch03-concepts.xml:289
-msgid ""
 "The first revision in a revlog (at the bottom of the image)  has the null ID "
 "in both of its parent slots.  For a <quote>normal</quote> revision, its first "
 "parent slot contains the ID of its parent revision, and its second contains "
 "slots."