1.1 --- a/po/zh.po	Tue Oct 27 21:31:06 2009 -0700
     1.2 +++ b/po/zh.po	Wed Nov 04 14:11:14 2009 +0800
     1.3 @@ -41,7 +41,7 @@
     1.4  msgid ""
     1.5  msgstr ""
     1.6  "Project-Id-Version: hgbook 1.2\n"
     1.7 -"POT-Creation-Date: 2009-05-21 14:26+0800\n"
     1.8 +"POT-Creation-Date: 2009-11-04 14:06+0800\n"
     1.9  "PO-Revision-Date: 2009-10-21 16:42+0800\n"
    1.10  "Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n"
    1.11  "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
    1.12 @@ -15887,9 +15887,9 @@
    1.13  "While <command role=\"hg-ext-mq\">qpush</command> and <command role=\"hg-ext-"
    1.14  "mq\">qpop</command> each operate on a single patch at a time by default, you "
    1.15  "can push and pop many patches in one go.  The <option role=\"hg-ext-mq-cmd-"
    1.16 -"qpush-opt\">hg -a</option> option to <command role=\"hg-ext-mq\">qpush</"
    1.17 -"command> causes it to push all unapplied patches, while the <option role=\"hg-"
    1.18 -"ext-mq-cmd-qpop-opt\">-a</option> option to <command role=\"hg-ext-mq\">qpop</"
    1.19 +"qpush-opt\">-a</option> option to <command role=\"hg-ext-mq\">qpush</command> "
    1.20 +"causes it to push all unapplied patches, while the <option role=\"hg-ext-mq-"
    1.21 +"cmd-qpop-opt\">-a</option> option to <command role=\"hg-ext-mq\">qpop</"
    1.22  "command> causes it to pop all applied patches.  (For some more ways to push "
    1.23  "and pop many patches, see <xref linkend=\"sec:mq:perf\"/> below.)"
    1.24  msgstr ""
    1.25 @@ -15917,10 +15917,10 @@
    1.26  "Commands that check the working directory all take an <quote>I know what I'm "
    1.27  "doing</quote> option, which is always named <option>-f</option>.  The exact "
    1.28  "meaning of <option>-f</option> depends on the command.  For example, <command "
    1.29 -"role=\"hg-cmd\">hg qnew <option role=\"hg-ext-mq-cmd-qnew-opt\">hg -f</"
    1.30 -"option></command> will incorporate any outstanding changes into the new patch "
    1.31 -"it creates, but <command role=\"hg-cmd\">hg qpop <option role=\"hg-ext-mq-cmd-"
    1.32 -"qpop-opt\">hg -f</option></command> will revert modifications to any files "
    1.33 +"role=\"hg-cmd\">hg qnew <option role=\"hg-ext-mq-cmd-qnew-opt\">-f</option></"
    1.34 +"command> will incorporate any outstanding changes into the new patch it "
    1.35 +"creates, but <command role=\"hg-cmd\">hg qpop <option role=\"hg-ext-mq-cmd-"
    1.36 +"qpop-opt\">-f</option></command> will revert modifications to any files "
    1.37  "affected by the patch that it is popping.  Be sure to read the documentation "
    1.38  "for a command's <option>-f</option> option before you use it!"
    1.39  msgstr ""
    1.40 @@ -16355,10 +16355,10 @@
    1.41  #: ../en/ch12-mq.xml:809
    1.42  msgid ""
    1.43  "On my old, slow laptop, I was able to <command role=\"hg-cmd\">hg qpush "
    1.44 -"<option role=\"hg-ext-mq-cmd-qpush-opt\">hg -a</option></command> all 1,738 "
    1.45 +"<option role=\"hg-ext-mq-cmd-qpush-opt\">-a</option></command> all 1,738 "
    1.46  "patches in 3.5 minutes, and <command role=\"hg-cmd\">hg qpop <option role="
    1.47 -"\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> them all in 30 seconds.  "
    1.48 -"(On a newer laptop, the time to push all patches dropped to two minutes.)  I "
    1.49 +"\"hg-ext-mq-cmd-qpop-opt\">-a</option></command> them all in 30 seconds.  (On "
    1.50 +"a newer laptop, the time to push all patches dropped to two minutes.)  I "
    1.51  "could <command role=\"hg-ext-mq\">qrefresh</command> one of the biggest "
    1.52  "patches (which made 22,779 lines of changes to 287 files) in 6.6 seconds."
    1.53  msgstr ""
    1.54 @@ -16425,11 +16425,11 @@
    1.55  "role=\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> your patches, then "
    1.56  "<command role=\"hg-cmd\">hg pull</command> changes into the underlying "
    1.57  "repository, and finally <command role=\"hg-cmd\">hg qpush <option role=\"hg-"
    1.58 -"ext-mq-cmd-qpop-opt\">hg -a</option></command> your patches again.  MQ will "
    1.59 -"stop pushing any time it runs across a patch that fails to apply during "
    1.60 -"conflicts, allowing you to fix your conflicts, <command role=\"hg-ext-mq"
    1.61 -"\">qrefresh</command> the affected patch, and continue pushing until you have "
    1.62 -"fixed your entire stack."
    1.63 +"ext-mq-cmd-qpop-opt\">-a</option></command> your patches again.  MQ will stop "
    1.64 +"pushing any time it runs across a patch that fails to apply during conflicts, "
    1.65 +"allowing you to fix your conflicts, <command role=\"hg-ext-mq\">qrefresh</"
    1.66 +"command> the affected patch, and continue pushing until you have fixed your "
    1.67 +"entire stack."
    1.68  msgstr ""
    1.69  
    1.70  #. type: Content of: <book><chapter><sect1><para>
    1.71 @@ -16789,11 +16789,11 @@
    1.72  "If you <command role=\"hg-cmd\">hg pull</command>, manually edit, or <command "
    1.73  "role=\"hg-cmd\">hg update</command> changes to patches or the <filename role="
    1.74  "\"special\">series</filename> file, you will have to <command role=\"hg-cmd"
    1.75 -"\">hg qpop <option role=\"hg-ext-mq-cmd-qpop-opt\">hg -a</option></command> "
    1.76 -"and then <command role=\"hg-cmd\">hg qpush <option role=\"hg-ext-mq-cmd-qpush-"
    1.77 -"opt\">hg -a</option></command> in the underlying repository to see those "
    1.78 -"changes show up there.  If you forget to do this, you can confuse MQ's idea "
    1.79 -"of which patches are applied."
    1.80 +"\">hg qpop <option role=\"hg-ext-mq-cmd-qpop-opt\">-a</option></command> and "
    1.81 +"then <command role=\"hg-cmd\">hg qpush <option role=\"hg-ext-mq-cmd-qpush-opt"
    1.82 +"\">-a</option></command> in the underlying repository to see those changes "
    1.83 +"show up there.  If you forget to do this, you can confuse MQ's idea of which "
    1.84 +"patches are applied."
    1.85  msgstr ""
    1.86  
    1.87  #. type: Content of: <book><chapter><sect1><title>
    1.88 @@ -17718,7 +17718,7 @@
    1.89  msgstr ""
    1.90  
    1.91  #
    1.92 -#.  &example.hg-interdiff;
    1.93 +#. &example.hg-interdiff;
    1.94  #. type: Content of: <book><chapter><sect1><sect2><para>
    1.95  #: ../en/ch13-mq-collab.xml:473
    1.96  msgid ""