Commits

zhaopingsun committed 48354eb Merge

 2.4.3 3para fuzzy

  • Participants
  • Parent commits b71b3f7, 8ce6c7a

Comments (0)

Files changed (1)

 "changeset</quote> is of great importance. Recall that the <literal>changeset</"
 "literal> field in the output from <command role=\"hg-cmd\">hg log</command> "
 "identifies a changeset using both a number and a hexadecimal string."
-msgstr "实际上,用哪个<emphasis>词</emphasis>来描述<quote>变更集</quote>的概念并不重要,"
-"重要的是如何用<emphasis>标识符</emphasis>来标识<quote>一个<emphasis>特定的</emphasis>"
-"变更集</quote>。回忆一下<command role=\"hg-cmd\">hg log</command>命令的输出,"
-"<literal>changeset</literal>字段里用一个数字和一个十六进制字符串来标识一个变更集。"
+msgstr ""
+"实际上,用哪个<emphasis>词</emphasis>来描述<quote>变更集</quote>的概念并不重"
+"要,重要的是如何用<emphasis>标识符</emphasis>来标识<quote>一个<emphasis>特定的"
+"</emphasis>变更集</quote>。回忆一下<command role=\"hg-cmd\">hg log</command>命"
+"令的输出,<literal>changeset</literal>字段里用一个数字和一个十六进制字符串来标"
+"识一个变更集。"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:289
 "need to discuss a changeset with someone, or make a record of a changeset for "
 "some other reason (for example, in a bug report), use the hexadecimal "
 "identifier."
-msgstr "Mercurial使用版本号纯粹是为了有些命令的方便,如果你要和别人讨论变更集,"
-"或者由于某些原因为一个变更集做记录(如在bug报告中),请使用十六进制标识符。"
+msgstr ""
+"Mercurial使用版本号纯粹是为了有些命令的方便,如果你要和别人讨论变更集,或者由"
+"于某些原因为一个变更集做记录(如在bug报告中),请使用十六进制标识符。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:318
 "role=\"hg-opt-log\">--rev</option>) option.  You can use either a revision "
 "number or a hexadecimal identifier, and you can provide as many revisions as "
 "you want."
-msgstr "如果只想用<command role=\"hg-cmd\">hg log</command>查看一个版本的日志"
-"使用<option role=\"hg-opt-log\">-r</option>(或者<option role=\"hg-opt-log\">--rev</option>)"
-"选项。版本号和十六进制标识符都可以来指定版本,可以一次指定任意多个版本。"
+msgstr ""
+"如果只想用<command role=\"hg-cmd\">hg log</command>查看一个版本的日志使用"
+"<option role=\"hg-opt-log\">-r</option>(或者<option role=\"hg-opt-log\">--"
+"rev</option>)选项。版本号和十六进制标识符都可以来指定版本,可以一次指定任意多"
+"个版本。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:329
 "each one, you can use <emphasis>range notation</emphasis>; this lets you "
 "express the idea <quote>I want all revisions between <literal>abc</literal> "
 "and <literal>def</literal>, inclusive</quote>."
-msgstr "如果你想显示几个版本历史,但是不想一个一个的列出来,可以使用 <emphasis>范围标记</emphasis>;"
-"它会显示包括<literal>abc</literal>和<literal>def</literal>,以及它们之间的所有版本的版本历史。"
+msgstr ""
+"如果你想显示几个版本历史,但是不想一个一个的列出来,可以使用 <emphasis>范围标"
+"记</emphasis>;它会显示包括<literal>abc</literal>和<literal>def</literal>,以"
+"及它们之间的所有版本的版本历史。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:337
 "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 "
 "role=\"hg-cmd\">hg log -r 4:2</command> prints 4, 3, and 2."
-msgstr "Mercurial还可以指定版本的输出顺序,如<command role=\"hg-cmd\">hg log -r 2:4</command>"
-"输出2,3,4。而<command role=\"hg-cmd\">hg log -r 4:2</command>则输出4,3,2。"
+msgstr ""
+"Mercurial还可以指定版本的输出顺序,如<command role=\"hg-cmd\">hg log -r 2:4</"
+"command>输出2,3,4。而<command role=\"hg-cmd\">hg log -r 4:2</command>则输出"
+"4,3,2。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:344
 "global\">-v</option> (or <option role=\"hg-opt-global\">--verbose</option>) "
 "option gives you this extra detail."
 msgstr ""
+"当你知道你在找那个版本的时候,<command role=\"hg-cmd\">hg log</command>输出的"
+"摘要是非常有用的,但有时候你不知道要找哪个版本,你想看到变更的完整描述,或者修"
+"改过的文件的列表,<command role=\"hg-cmd\">hg log</command>命令的<option role="
+"\"hg-opt-global\">-v</option>(<option role=\"hg-opt-global\">--verbose</"
+"option>)选项会给出更详细的信息。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:358
 "<emphasis>unified diff</emphasis> (if you've never seen a unified diff "
 "before, see <xref linkend=\"sec:mq:patch\"/> for an overview)."
 msgstr ""
+"如果你想同时看到变更的描述和内容,增加<option role=\"hg-opt-log\">-p</option>"
+"(<option role=\"hg-opt-log\">--patch</option>)选项。这会将变更的内容以"
+"<emphasis>unified diff</emphasis>的格式显示(如果你不知道unified diff,请参考"
+"<xref linkend=\"sec:mq:patch\"/>。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch02-tour-basic.xml:368
 msgid ""
 "The <option role=\"hg-opt-log\">-p</option> option is tremendously useful, so "
 "it's well worth remembering."
-msgstr ""
+msgstr "<option role=\"hg-opt-log\">-p</option>选项非常有用,所以一定要记住。"
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch02-tour-basic.xml:375