# HG changeset patch
# User Zhaoping Sun <zhaopingsun@gmail.com>
# Date 1258944413 18000
# Node ID 3c3a2bd7c14e8053be07c77fb42dcd4a146bfa9e
# Parent  0e202b76f9583849f29421f591b149a41c48e888
2.5 2 paras translated

diff -r 0e202b76f958 -r 3c3a2bd7c14e po/zh.po
--- a/po/zh.po	Sun Nov 22 21:35:38 2009 -0500
+++ b/po/zh.po	Sun Nov 22 21:46:53 2009 -0500
@@ -4324,8 +4324,10 @@
 "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>.  (The "
 "reason that some options don't have short names is that the options in "
 "question are rarely used.)"
-msgstr "大多数选项还有短名，除了使用<option role=\"hg-opt-log\">--rev</option>，"
-"我们还可以用<option role=\"hg-opt-log\">-r</option>。（有些选项没有短名的原因是他们很少用到。）"
+msgstr ""
+"大多数选项还有短名，除了使用<option role=\"hg-opt-log\">--rev</option>，我们还"
+"可以用<option role=\"hg-opt-log\">-r</option>。（有些选项没有短名的原因是他们"
+"很少用到。）"
 
 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:401
@@ -4351,6 +4353,9 @@
 "For example, the command <command role=\"hg-cmd\">hg log -v -p -r 2</command> "
 "can be written as <command role=\"hg-cmd\">hg log -vpr2</command>."
 msgstr ""
+"如果使用短选项，你可以把它们放在一起以减少输入。例如，命令<command role=\"hg-"
+"cmd\">hg log -v -p -r 2</command> 可以写成 <command role=\"hg-cmd\">hg log -"
+"vpr2</command>。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:421
@@ -4359,6 +4364,8 @@
 "long.  This simply reflects my own preference, so don't read anything "
 "significant into it."
 msgstr ""
+"在本书的例子中，我通常使用短选项，很少用长选项。这仅仅是我个人的习惯，你不一定"
+"要这样。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:425