Dongsheng Song avatar Dongsheng Song committed c03f7ff

Update Chinese translation

Comments (0)

Files changed (1)

 msgstr ""
 "Project-Id-Version: hgbook 1.2\n"
 "POT-Creation-Date: 2009-05-21 14:26+0800\n"
-"PO-Revision-Date: 2009-04-18 11:50+0800\n"
+"PO-Revision-Date: 2009-05-21 14:55+0800\n"
 "Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n"
 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
 "MIME-Version: 1.0\n"
 
 #. type: Content of: <book><appendix><title>
 #: ../en/appA-svn.xml:5
-#, fuzzy
 msgid "Migrating to Mercurial"
-msgstr "使用 MQ 管理修改"
+msgstr "迁移到 Mercurial"
 
 #. type: Content of: <book><appendix><para>
 #: ../en/appA-svn.xml:7
 #: ../en/appA-svn.xml:25 ../en/appA-svn.xml:369 ../en/ch01-intro.xml:416
 #: ../en/ch01-intro.xml:627
 msgid "Subversion"
-msgstr ""
+msgstr "Subversion"
 
 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
 #: ../en/appA-svn.xml:28 ../en/ch01-intro.xml:532 ../en/ch01-intro.xml:628
 
 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
 #: ../en/appA-svn.xml:31
-#, fuzzy
 msgid "git"
-msgstr "Git"
+msgstr "git"
 
 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
 #: ../en/appA-svn.xml:34 ../en/ch01-intro.xml:630
 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
 #: ../en/appA-svn.xml:37
 msgid "Bazaar"
-msgstr ""
+msgstr "Bazaar"
 
 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
 #: ../en/appA-svn.xml:40
 msgid "Monotone"
-msgstr ""
+msgstr "Monotone"
 
 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
 #: ../en/appA-svn.xml:43
 msgid "GNU Arch"
-msgstr ""
+msgstr "GNU Arch"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><thead><row><entry>
 #: ../en/appA-svn.xml:46 ../en/appA-svn.xml:370
-#, fuzzy
 msgid "Mercurial"
-msgstr "为什么选择 Mercurial?"
+msgstr "Mercurial"
 
 #. type: Content of: <book><appendix><sect1><para>
 #: ../en/appA-svn.xml:50
 #: ../en/appA-svn.xml:213 ../en/appA-svn.xml:218 ../en/appA-svn.xml:224
 #: ../en/appA-svn.xml:229 ../en/appA-svn.xml:532
 msgid "$"
-msgstr ""
+msgstr "$"
 
 #. type: Content of: <book><appendix><sect1><screen><userinput>
 #: ../en/appA-svn.xml:64
 
 #. type: Content of: <book><appendix><sect1><sect2><title>
 #: ../en/appA-svn.xml:86
-#, fuzzy
 msgid "Converting multiple branches"
-msgstr "使用多个分支工作"
+msgstr "转换多个分支"
 
 #. type: Content of: <book><appendix><sect1><sect2><para>
 #: ../en/appA-svn.xml:88
 
 #. type: Content of: <book><appendix><sect1><sect2><title>
 #: ../en/appA-svn.xml:114
-#, fuzzy
 msgid "Mapping user names"
-msgstr "选择用户名称"
+msgstr "映射用户名称"
 
 #. type: Content of: <book><appendix><sect1><sect2><para>
 #: ../en/appA-svn.xml:116
 #. type: Content of: <book><appendix><sect1><sect2><screen><userinput>
 #: ../en/appA-svn.xml:207
 msgid "svnadmin create memcached-mirror"
-msgstr ""
+msgstr "svnadmin create memcached-mirror"
 
 #. type: Content of: <book><appendix><sect1><sect2><para>
 #: ../en/appA-svn.xml:209
 #. type: Content of: <book><appendix><sect1><sect2><screen><userinput>
 #: ../en/appA-svn.xml:212
 msgid "echo '#!/bin/sh' > memcached-mirror/hooks/pre-revprop-change"
-msgstr ""
+msgstr "echo '#!/bin/sh' > memcached-mirror/hooks/pre-revprop-change"
 
 #. type: Content of: <book><appendix><sect1><sect2><screen><userinput>
 #: ../en/appA-svn.xml:213
 msgid "chmod +x memcached-mirror/hooks/pre-revprop-change"
-msgstr ""
+msgstr "chmod +x memcached-mirror/hooks/pre-revprop-change"
 
 #. type: Content of: <book><appendix><sect1><sect2><para>
 #: ../en/appA-svn.xml:215
 "svnsync --init file://`pwd`/memcached-mirror \\ http://code.sixapart.com/svn/"
 "memcached"
 msgstr ""
+"svnsync --init file://`pwd`/memcached-mirror \\ http://code.sixapart.com/svn/"
+"memcached"
 
 #. type: Content of: <book><appendix><sect1><sect2><para>
 #: ../en/appA-svn.xml:221
 #. type: Content of: <book><appendix><sect1><sect2><screen><userinput>
 #: ../en/appA-svn.xml:224
 msgid "svnsync sync file://`pwd`/memcached-mirror"
-msgstr ""
+msgstr "svnsync sync file://`pwd`/memcached-mirror"
 
 #. type: Content of: <book><appendix><sect1><sect2><para>
 #: ../en/appA-svn.xml:226
 #. type: Content of: <book><appendix><sect1><title>
 #: ../en/appA-svn.xml:249
 msgid "Migrating from Subversion"
-msgstr ""
+msgstr "从 Subversion 迁移"
 
 #. type: Content of: <book><appendix><sect1><para>
 #: ../en/appA-svn.xml:251
 #. type: Content of: <book><appendix><sect1><sect2><sect3><title>
 #: ../en/appA-svn.xml:277
 msgid "Scope of commands"
-msgstr ""
+msgstr "命令作用域"
 
 #. type: Content of: <book><appendix><sect1><sect2><sect3><para>
 #: ../en/appA-svn.xml:279
 
 #. type: Content of: <book><appendix><sect1><sect2><title>
 #: ../en/appA-svn.xml:362
-#, fuzzy
 msgid "Quick reference"
-msgstr "钩子参考"
+msgstr "快速参考"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><title>
 #: ../en/appA-svn.xml:365
 msgid "Subversion commands and Mercurial equivalents"
-msgstr ""
+msgstr "Subversion 命令与 Mercurial 对照表"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><thead><row><entry>
 #: ../en/appA-svn.xml:371
 msgid "Notes"
-msgstr ""
+msgstr "备注"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:376
 msgid "<command>svn add</command>"
-msgstr ""
+msgstr "<command>svn add</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:377
 msgid "<command>hg add</command>"
-msgstr ""
+msgstr "<command>hg add</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:381
 msgid "<command>svn blame</command>"
-msgstr ""
+msgstr "<command>svn blame</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:382
 msgid "<command>hg annotate</command>"
-msgstr ""
+msgstr "<command>hg annotate</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:386
 msgid "<command>svn cat</command>"
-msgstr ""
+msgstr "<command>svn cat</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:387
 msgid "<command>hg cat</command>"
-msgstr ""
+msgstr "<command>hg cat</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:391
 msgid "<command>svn checkout</command>"
-msgstr ""
+msgstr "<command>svn checkout</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:392 ../en/appA-svn.xml:409
 msgid "<command>hg clone</command>"
-msgstr ""
+msgstr "<command>hg clone</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:396
 msgid "<command>svn cleanup</command>"
-msgstr ""
+msgstr "<command>svn cleanup</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:397 ../en/appA-svn.xml:472
 msgid "n/a"
-msgstr ""
+msgstr "n/a"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:398
 msgid "No cleanup needed"
-msgstr ""
+msgstr "不需要清理"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:401
 msgid "<command>svn commit</command>"
-msgstr ""
+msgstr "<command>svn commit</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:402
 msgid "<command>hg commit</command>; <command>hg push</command>"
-msgstr ""
+msgstr "<command>hg commit</command>; <command>hg push</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:404
 msgid "<command>hg push</command> publishes after commit"
-msgstr ""
+msgstr "提交后使用 <command>hg push</command> 发布"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:408 ../en/appA-svn.xml:413
 msgid "<command>svn copy</command>"
-msgstr ""
+msgstr "<command>svn copy</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:410
-#, fuzzy
 msgid "To create a new branch"
 msgstr "创建新补丁"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:414
 msgid "<command>hg copy</command>"
-msgstr ""
+msgstr "<command>hg copy</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:415
-#, fuzzy
 msgid "To copy files or directories"
-msgstr "Mercurial 只跟踪文件,不跟踪目录"
+msgstr "复制文件或目录"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:418
 msgid "<command>svn delete</command> (<command>svn remove</command>)"
-msgstr ""
+msgstr "<command>svn delete</command> (<command>svn remove</command>)"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:420
 msgid "<command>hg remove</command>"
-msgstr ""
+msgstr "<command>hg remove</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:424
 msgid "<command>svn diff</command>"
-msgstr ""
+msgstr "<command>svn diff</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:425
 msgid "<command>hg diff</command>"
-msgstr ""
+msgstr "<command>hg diff</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:429
 msgid "<command>svn export</command>"
-msgstr ""
+msgstr "<command>svn export</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:430
 msgid "<command>hg archive</command>"
-msgstr ""
+msgstr "<command>hg archive</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:434
 msgid "<command>svn help</command>"
-msgstr ""
+msgstr "<command>svn help</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:435
 msgid "<command>hg help</command>"
-msgstr ""
+msgstr "<command>hg help</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:439
 msgid "<command>svn import</command>"
-msgstr ""
+msgstr "<command>svn import</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:440
 msgid "<command>hg addremove</command>; <command>hg commit</command>"
-msgstr ""
+msgstr "<command>hg addremove</command>; <command>hg commit</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:445 ../en/appA-svn.xml:450
 msgid "<command>svn info</command>"
-msgstr ""
+msgstr "<command>svn info</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:446
 msgid "<command>hg parents</command>"
-msgstr ""
+msgstr "<command>hg parents</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:447
 msgid "Shows what revision is checked out"
-msgstr ""
+msgstr "显示检出的版本信息"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:451
 msgid "<command>hg showconfig paths.parent</command>"
-msgstr ""
+msgstr "<command>hg showconfig paths.parent</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:453
 msgid "Shows what URL is checked out"
-msgstr ""
+msgstr "显示检出的 URL"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:456
 msgid "<command>svn list</command>"
-msgstr ""
+msgstr "<command>svn list</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:457
 msgid "<command>hg manifest</command>"
-msgstr ""
+msgstr "<command>hg manifest</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:461
 msgid "<command>svn log</command>"
-msgstr ""
+msgstr "<command>svn log</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:462
 msgid "<command>hg log</command>"
-msgstr ""
+msgstr "<command>hg log</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:466
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:467
 msgid "<command>hg merge</command>"
-msgstr ""
+msgstr "<command>hg merge</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:471
 msgid "<command>svn mkdir</command>"
-msgstr ""
+msgstr "<command>svn mkdir</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:473
-#, fuzzy
 msgid "Mercurial does not track directories"
-msgstr "Mercurial 只跟踪文件,不跟踪目录"
+msgstr "Mercurial 不跟踪目录"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:476
 msgid "<command>svn move</command> (<command>svn rename</command>)"
-msgstr ""
+msgstr "<command>svn move</command> (<command>svn rename</command>)"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:478
 msgid "<command>hg rename</command>"
-msgstr ""
+msgstr "<command>hg rename</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:482
 msgid "<command>svn resolved</command>"
-msgstr ""
+msgstr "<command>svn resolved</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:483
 msgid "<command>hg resolve -m</command>"
-msgstr ""
+msgstr "<command>hg resolve -m</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:487
 msgid "<command>svn revert</command>"
-msgstr ""
+msgstr "<command>svn revert</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:488
 msgid "<command>hg revert</command>"
-msgstr ""
+msgstr "<command>hg revert</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:492
 msgid "<command>svn status</command>"
-msgstr ""
+msgstr "<command>svn status</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:493
 msgid "<command>hg status</command>"
-msgstr ""
+msgstr "<command>hg status</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:497
 msgid "<command>svn update</command>"
-msgstr ""
+msgstr "<command>svn update</command>"
 
 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry>
 #: ../en/appA-svn.xml:498
 msgid "<command>hg pull -u</command>"
-msgstr ""
+msgstr "<command>hg pull -u</command>"
 
 #. type: Content of: <book><appendix><sect1><title>
 #: ../en/appA-svn.xml:508
-#, fuzzy
 msgid "Useful tips for newcomers"
-msgstr "其它需要了解的东西"
+msgstr "新手需要了解的技巧"
 
 #. type: Content of: <book><appendix><sect1><para>
 #: ../en/appA-svn.xml:510
 #. type: Content of: <book><appendix><sect1><screen><userinput>
 #: ../en/appA-svn.xml:532
 msgid "hg status `hg root`"
-msgstr ""
+msgstr "hg status `hg root`"
 
 #. type: Content of: <book><appendix><title>
 #: ../en/appB-mq-ref.xml:5
 
 #. type: Content of: <book><appendix><sect1><sect2><title>
 #: ../en/appB-mq-ref.xml:75
-#, fuzzy
 msgid ""
 "<command role=\"hg-ext-mq\">qfold</command>&emdash;move applied patches into "
 "repository history"
-msgstr "<command role=\"hg-ext-mq\">qapplied</command>—显示已应用的补丁"
+msgstr ""
+"<command role=\"hg-ext-mq\">qfold</command>&emdash;将已应用的补丁提交到版本库"
 
 #. type: Content of: <book><appendix><sect1><sect2><para>
 #: ../en/appB-mq-ref.xml:78
 
 #. type: Content of: <book><preface><sect1><title>
 #: ../en/ch00-preface.xml:8
-#, fuzzy
 msgid "Technical storytelling"
-msgstr "共享的技术因素"
+msgstr "技术背景"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:10
 #. type: Content of: <book><preface><sect1><simplelist><member>
 #: ../en/ch00-preface.xml:246
 msgid "<email>bookquestions@oreilly.com</email>"
-msgstr ""
+msgstr "<email>bookquestions@oreilly.com</email>"
 
 #. type: Content of: <book><preface><sect1><para>
 #: ../en/ch00-preface.xml:249
 #. type: Content of: <book><preface><sect1><simplelist><member>
 #: ../en/ch00-preface.xml:253
 msgid "<ulink url=\"http://www.oreilly.com\"></ulink>"
-msgstr ""
+msgstr "<ulink url=\"http://www.oreilly.com\"></ulink>"
 
 #. type: Content of: <book><chapter><title>
 #: ../en/ch01-intro.xml:5
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:54
 msgid "Fedora:"
-msgstr ""
+msgstr "Fedora:"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:56
-#, fuzzy
 msgid "OpenSUSE:"
-msgstr "Fedora and OpenSUSE:"
+msgstr "OpenSUSE:"
 
 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
 #: ../en/ch02-tour-basic.xml:58
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:77
-#, fuzzy
 msgid ""
 "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command "
 "to find out whether Mercurial is installed properly.  The actual version "
 "command runs and prints anything at all."
 msgstr ""
 "首先,我们使用 <command role=\"hg-cmd\">hg version</command> 命令检查 "
-"Mercurial 是否正确安装。它打印出来的实际版本信息并不重要;我们只关心它是否能打"
-"印出我们需要的信息。"
+"Mercurial 是否已经正确安装。它打印出来的实际版本信息并不重要;我们只关心它是否"
+"能够运行,打印出信息。"
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch02-tour-basic.xml:86
 #. type: Content of: <book><chapter><sect1><sect2><sect3><tip><screen><prompt>
 #: ../en/ch02-tour-basic.xml:612
 msgid "C:\\>"
-msgstr ""
+msgstr "C:\\>"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><tip><screen><userinput>
 #: ../en/ch02-tour-basic.xml:612
 msgid "echo %UserProfile%"
-msgstr ""
+msgstr "echo %UserProfile%"
 
 #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
 #: ../en/ch02-tour-basic.xml:619
 
 #. type: Content of: <book><chapter><sect1><sect2><tip><title>
 #: ../en/ch02-tour-basic.xml:810
-#, fuzzy
 msgid "Pulling specific changes"
-msgstr "合并有冲突的改变"
+msgstr "提取指定的修改"
 
 #. type: Content of: <book><chapter><sect1><sect2><tip><para>
 #: ../en/ch02-tour-basic.xml:812
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch02-tour-basic.xml:993
-#, fuzzy
 msgid "Starting a new project"
-msgstr "创建新补丁"
+msgstr "开始新项目"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch02-tour-basic.xml:995
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:134
-#, fuzzy
 msgid ""
 "To start a merge between the two heads, we use the <command role=\"hg-cmd"
 "\">hg merge</command> command."
-msgstr "命令 <command role=\"hg-cmd\">hg serve</command> 的选项"
+msgstr ""
+"我们使用 <command role=\"hg-cmd\">hg merge</command> 命令来合并两个顶点。"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch03-tour-merge.xml:139
 
 #. type: Content of: <book><chapter><sect1><sect2><note><title>
 #: ../en/ch03-tour-merge.xml:357
-#, fuzzy
 msgid "Where is the <command>hg resolve</command> command?"
-msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>"
+msgstr "在哪里能找到 <command role=\"hg-cmd\">hg resolve</command> 命令?"
 
 #. type: Content of: <book><chapter><sect1><sect2><note><para>
 #: ../en/ch03-tour-merge.xml:359
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch03-tour-merge.xml:429
-#, fuzzy
 msgid "Renaming, copying, and merging"
-msgstr "改名文件与合并修改"
+msgstr "改名,复制与合并"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch03-tour-merge.xml:431
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:687
-#, fuzzy
 msgid ""
 "Consider the case where we use <command role=\"hg-cmd\">hg rename</command> "
 "to rename a file."
-msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>"
+msgstr ""
+"设想我们使用 <command role=\"hg-cmd\">hg rename</command> 命令来改名文件。"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:692
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch05-daily.xml:801
-#, fuzzy
 msgid "Backups and mirroring"
-msgstr "分支名称与合并"
+msgstr "备份与镜像"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch05-daily.xml:803
 
 #. type: Content of: <book><chapter><sect1><tip><title>
 #: ../en/ch09-undo.xml:197
-#, fuzzy
 msgid "Be careful with <filename>.orig</filename> files"
-msgstr "分类补丁<filename role=\"special\">系列</filename>"
+msgstr "小心 <filename>.orig</filename> 文件"
 
 #. type: Content of: <book><chapter><sect1><tip><para>
 #: ../en/ch09-undo.xml:199
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch09-undo.xml:635
-#, fuzzy
 msgid "Backing out a merge"
-msgstr "恢复一个修改集"
+msgstr "撤销一个合并"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch09-undo.xml:637
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><title>
 #: ../en/ch09-undo.xml:679
-#, fuzzy
 msgid "Backing out the merge, favoring one parent"
-msgstr "恢复顶点修改集"
+msgstr "拆除合并,关注一个父亲"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><mediaobject>
 #: ../en/ch09-undo.xml:681
 msgid "<imageobject><imagedata fileref=\"figs/bad-merge-2.png\"/></imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"figs/bad-merge-2.png\"/></imageobject>"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch09-undo.xml:688
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><title>
 #: ../en/ch09-undo.xml:696
 msgid "Backing out the merge, favoring the other parent"
-msgstr ""
+msgstr "拆除合并,关注其它父亲"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><mediaobject>
 #: ../en/ch09-undo.xml:699
 msgid "<imageobject><imagedata fileref=\"figs/bad-merge-3.png\"/></imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"figs/bad-merge-3.png\"/></imageobject>"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch09-undo.xml:706
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><title>
 #: ../en/ch09-undo.xml:711 ../en/ch09-undo.xml:724
-#, fuzzy
 msgid "Merging the backouts"
-msgstr "合并两个顶点"
+msgstr "合并拆除"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><mediaobject>
 #: ../en/ch09-undo.xml:713
 msgid "<imageobject><imagedata fileref=\"figs/bad-merge-4.png\"/></imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"figs/bad-merge-4.png\"/></imageobject>"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch09-undo.xml:720
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para>
 #: ../en/ch09-undo.xml:948
-#, fuzzy
 msgid ""
 "If the test succeeded, you tell <command role=\"hg-cmd\">hg bisect</command> "
 "by running the <command role=\"hg-cmd\">hg bisect --good</command> command."
-msgstr "使用 <command role=\"hg-cmd\">hg backout</command> 自动恢复非顶点的修改"
+msgstr ""
+"当测试成功后,使用 <command role=\"hg-cmd\">hg bisect --good</command> 命令告"
+"诉 <command role=\"hg-cmd\">hg bisect</command> 命令。"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para>
 #: ../en/ch09-undo.xml:953
-#, fuzzy
 msgid ""
 "If it failed, run the <command role=\"hg-cmd\">hg bisect --bad</command> "
 "command."
-msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>"
+msgstr ""
+"如果失败,执行 <command role=\"hg-cmd\">hg bisect --bad</command> 命令。"
 
 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para>
 #: ../en/ch09-undo.xml:957
 
 #. type: Content of: <book><chapter><title>
 #: ../en/ch11-template.xml:5
-#, fuzzy
 msgid "Customizing the output of Mercurial"
 msgstr "定制 Mercurial 的输出"
 
 
 #. type: Content of: <book><chapter><sect1><title>
 #: ../en/ch12-mq.xml:749
-#, fuzzy
 msgid "More on patch management"
-msgstr "源代码管理"
+msgstr "补丁管理进阶"
 
 #. type: Content of: <book><chapter><sect1><para>
 #: ../en/ch12-mq.xml:751
 
 #. type: Content of: <book><chapter><sect1><sect2><title>
 #: ../en/ch12-mq.xml:755
-#, fuzzy
 msgid "Deleting unwanted patches"
-msgstr "创建新补丁"
+msgstr "删除不需要的补丁"
 
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch12-mq.xml:757
 msgstr ""
 
 #
-#. 	&example.hg-interdiff; 
+#.  &example.hg-interdiff;
 #. type: Content of: <book><chapter><sect1><sect2><para>
 #: ../en/ch13-mq-collab.xml:473
 msgid ""
 "the number of lines affected, and a histogram showing how much each file is "
 "modified.  This gives readers a qualitative glance at how complex a patch is."
 msgstr ""
-
-#~ msgid "The problem illustrated"
-#~ msgstr "问题的演示"
-
-#~ msgid ""
-#~ "Care with <literal>pretxn</literal> hooks in a shared-access repository"
-#~ msgstr "在共享版本库中注意 <literal>pretxn</literal> 钩子"
-
-#~ msgid "A slightly special case: reverting a rename"
-#~ msgstr "一个稍微特别的案例:撤销改名"
-
-#~ msgid "Colophon&emdash;this book is Free"
-#~ msgstr "后记—本书是自由的!"
-
-#~ msgid "This book is a work in progress"
-#~ msgstr "本书正在编写中"
-
-#~ msgid ""
-#~ "<command role=\"hg-ext-mq\">qsave</command>&emdash;save current queue state"
-#~ msgstr "<command role=\"hg-ext-mq\">qsave</command>—保存当前的队列状态"
-
-#~ msgid ""
-#~ "<command role=\"hg-ext-mq\">qrestore</command>&emdash;restore saved queue "
-#~ "state"
-#~ msgstr "<command role=\"hg-ext-mq\">qrestore</command>—恢复保存的队列"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.