# HG changeset patch # User Dongsheng Song # Date 1257315074 -28800 # Node ID 0525fc68b7feba675dd6ba106a53f0b3e763f42f # Parent 93154fbaae9bdef74912931bf2513eea8dfcb5b4 Update po files with source xml files diff -r 93154fbaae9b -r 0525fc68b7fe po/zh.po --- a/po/zh.po Tue Oct 27 21:31:06 2009 -0700 +++ b/po/zh.po Wed Nov 04 14:11:14 2009 +0800 @@ -41,7 +41,7 @@ msgid "" msgstr "" "Project-Id-Version: hgbook 1.2\n" -"POT-Creation-Date: 2009-05-21 14:26+0800\n" +"POT-Creation-Date: 2009-11-04 14:06+0800\n" "PO-Revision-Date: 2009-10-21 16:42+0800\n" "Last-Translator: 宋冬生 \n" "Language-Team: Simplified Chinese \n" @@ -15887,9 +15887,9 @@ "While qpush and qpop each operate on a single patch at a time by default, you " "can push and pop many patches in one go. The option to qpush causes it to push all unapplied patches, while the option to qpop-a option to qpush " +"causes it to push all unapplied patches, while the option to qpop causes it to pop all applied patches. (For some more ways to push " "and pop many patches, see below.)" msgstr "" @@ -15917,10 +15917,10 @@ "Commands that check the working directory all take an I know what I'm " "doing option, which is always named . The exact " "meaning of depends on the command. For example, hg qnew will incorporate any outstanding changes into the new patch " -"it creates, but hg qpop will revert modifications to any files " +"role=\"hg-cmd\">hg qnew will incorporate any outstanding changes into the new patch it " +"creates, but hg qpop will revert modifications to any files " "affected by the patch that it is popping. Be sure to read the documentation " "for a command's option before you use it!" msgstr "" @@ -16355,10 +16355,10 @@ #: ../en/ch12-mq.xml:809 msgid "" "On my old, slow laptop, I was able to hg qpush " -" all 1,738 " +" all 1,738 " "patches in 3.5 minutes, and hg qpop them all in 30 seconds. " -"(On a newer laptop, the time to push all patches dropped to two minutes.) I " +"\"hg-ext-mq-cmd-qpop-opt\">-a them all in 30 seconds. (On " +"a newer laptop, the time to push all patches dropped to two minutes.) I " "could qrefresh one of the biggest " "patches (which made 22,779 lines of changes to 287 files) in 6.6 seconds." msgstr "" @@ -16425,11 +16425,11 @@ "role=\"hg-ext-mq-cmd-qpop-opt\">hg -a your patches, then " "hg pull changes into the underlying " "repository, and finally hg qpush your patches again. MQ will " -"stop pushing any time it runs across a patch that fails to apply during " -"conflicts, allowing you to fix your conflicts, qrefresh the affected patch, and continue pushing until you have " -"fixed your entire stack." +"ext-mq-cmd-qpop-opt\">-a your patches again. MQ will stop " +"pushing any time it runs across a patch that fails to apply during conflicts, " +"allowing you to fix your conflicts, qrefresh the affected patch, and continue pushing until you have fixed your " +"entire stack." msgstr "" #. type: Content of: @@ -16789,11 +16789,11 @@ "If you hg pull, manually edit, or hg update changes to patches or the series file, you will have to hg qpop " -"and then hg qpush in the underlying repository to see those " -"changes show up there. If you forget to do this, you can confuse MQ's idea " -"of which patches are applied." +"\">hg qpop and " +"then hg qpush in the underlying repository to see those changes " +"show up there. If you forget to do this, you can confuse MQ's idea of which " +"patches are applied." msgstr "" #. type: Content of: @@ -17718,7 +17718,7 @@ msgstr "" # -#. &example.hg-interdiff; +#. &example.hg-interdiff; #. type: Content of: <book><chapter><sect1><sect2><para> #: ../en/ch13-mq-collab.xml:473 msgid ""