1.1 --- a/po/zh.po	Tue Mar 31 10:02:16 2009 +0800
     1.2 +++ b/po/zh.po	Tue Mar 31 11:04:18 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-03-30 21:36+0800\n"
     1.8 +"POT-Creation-Date: 2009-03-31 10:46+0800\n"
     1.9  "PO-Revision-Date: 2009-03-31 10:12+0800\n"
    1.10  "Last-Translator: \n"
    1.11  "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n"
    1.12 @@ -436,9 +436,8 @@
    1.13  
    1.14  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.15  #: ../en/appB-mq-ref.xml:14
    1.16 -msgid ""
    1.17 -"<command role=\"hg-ext-mq\">qapplied</command>&emdash;print applied patches"
    1.18 -msgstr "<command role=\"hg-ext-mq\">qapplied</command>&emdash;显示已应用的补丁"
    1.19 +msgid "<command role=\"hg-ext-mq\">qapplied</command>—print applied patches"
    1.20 +msgstr "<command role=\"hg-ext-mq\">qapplied</command>—显示已应用的补丁"
    1.21  
    1.22  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.23  #: ../en/appB-mq-ref.xml:17
    1.24 @@ -451,9 +450,9 @@
    1.25  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.26  #: ../en/appB-mq-ref.xml:24
    1.27  msgid ""
    1.28 -"<command role=\"hg-ext-mq\">qcommit</command>&emdash;commit changes in the "
    1.29 -"queue repository"
    1.30 -msgstr "<command role=\"hg-ext-mq\">qcommit</command>&emdash;提交队列中的修改"
    1.31 +"<command role=\"hg-ext-mq\">qcommit</command>—commit changes in the queue "
    1.32 +"repository"
    1.33 +msgstr "<command role=\"hg-ext-mq\">qcommit</command>—提交队列中的修改"
    1.34  
    1.35  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.36  #: ../en/appB-mq-ref.xml:27
    1.37 @@ -478,11 +477,11 @@
    1.38  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.39  #: ../en/appB-mq-ref.xml:43
    1.40  msgid ""
    1.41 -"<command role=\"hg-ext-mq\">qdelete</command>&emdash;delete a patch from the "
    1.42 +"<command role=\"hg-ext-mq\">qdelete</command>—delete a patch from the "
    1.43  "<filename role=\"special\">series</filename> file"
    1.44  msgstr ""
    1.45 -"<command role=\"hg-ext-mq\">qdelete</command>&emdash;从文件 <filename role="
    1.46 -"\"special\">series</filename> 中删除补丁"
    1.47 +"<command role=\"hg-ext-mq\">qdelete</command>—从文件 <filename role=\"special"
    1.48 +"\">series</filename> 中删除补丁"
    1.49  
    1.50  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.51  #: ../en/appB-mq-ref.xml:48
    1.52 @@ -512,10 +511,9 @@
    1.53  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.54  #: ../en/appB-mq-ref.xml:66
    1.55  msgid ""
    1.56 -"<command role=\"hg-ext-mq\">qdiff</command>&emdash;print a diff of the "
    1.57 -"topmost applied patch"
    1.58 -msgstr ""
    1.59 -"<command role=\"hg-ext-mq\">qdiff</command>&emdash;显示最新应用补丁的差异"
    1.60 +"<command role=\"hg-ext-mq\">qdiff</command>—print a diff of the topmost "
    1.61 +"applied patch"
    1.62 +msgstr "<command role=\"hg-ext-mq\">qdiff</command>—显示最新应用补丁的差异"
    1.63  
    1.64  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.65  #: ../en/appB-mq-ref.xml:69
    1.66 @@ -528,11 +526,11 @@
    1.67  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.68  #: ../en/appB-mq-ref.xml:75
    1.69  msgid ""
    1.70 -"<command role=\"hg-ext-mq\">qfold</command>&emdash;merge (<quote>fold</"
    1.71 -"quote>) several patches into one"
    1.72 -msgstr ""
    1.73 -"<command role=\"hg-ext-mq\">qfold</command>&emdash;将多个补丁合并(<quote>折叠"
    1.74 -"</quote>)成一个"
    1.75 +"<command role=\"hg-ext-mq\">qfold</command>—merge (<quote>fold</quote>) "
    1.76 +"several patches into one"
    1.77 +msgstr ""
    1.78 +"<command role=\"hg-ext-mq\">qfold</command>—将多个补丁合并(<quote>折叠</"
    1.79 +"quote>)成一个"
    1.80  
    1.81  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.82  #: ../en/appB-mq-ref.xml:78
    1.83 @@ -587,9 +585,9 @@
    1.84  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.85  #: ../en/appB-mq-ref.xml:119
    1.86  msgid ""
    1.87 -"<command role=\"hg-ext-mq\">qheader</command>&emdash;display the header/"
    1.88 -"description of a patch"
    1.89 -msgstr "<command role=\"hg-ext-mq\">qheader</command>&emdash;显示补丁头部描述"
    1.90 +"<command role=\"hg-ext-mq\">qheader</command>—display the header/description "
    1.91 +"of a patch"
    1.92 +msgstr "<command role=\"hg-ext-mq\">qheader</command>—显示补丁头部描述"
    1.93  
    1.94  #. type: Content of: <book><appendix><sect1><sect2><para>
    1.95  #: ../en/appB-mq-ref.xml:123
    1.96 @@ -602,10 +600,9 @@
    1.97  #. type: Content of: <book><appendix><sect1><sect2><title>
    1.98  #: ../en/appB-mq-ref.xml:130
    1.99  msgid ""
   1.100 -"<command role=\"hg-ext-mq\">qimport</command>&emdash;import a third-party "
   1.101 -"patch into the queue"
   1.102 -msgstr ""
   1.103 -"<command role=\"hg-ext-mq\">qimport</command>&emdash;将第三方补丁导入队列"
   1.104 +"<command role=\"hg-ext-mq\">qimport</command>—import a third-party patch into "
   1.105 +"the queue"
   1.106 +msgstr "<command role=\"hg-ext-mq\">qimport</command>—将第三方补丁导入队列"
   1.107  
   1.108  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.109  #: ../en/appB-mq-ref.xml:133
   1.110 @@ -629,9 +626,9 @@
   1.111  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.112  #: ../en/appB-mq-ref.xml:149
   1.113  msgid ""
   1.114 -"<command role=\"hg-ext-mq\">qinit</command>&emdash;prepare a repository to "
   1.115 -"work with MQ"
   1.116 -msgstr "<command role=\"hg-ext-mq\">qinit</command>&emdash;为使用 MQ 配置版本库"
   1.117 +"<command role=\"hg-ext-mq\">qinit</command>—prepare a repository to work with "
   1.118 +"MQ"
   1.119 +msgstr "<command role=\"hg-ext-mq\">qinit</command>—为使用 MQ 配置版本库"
   1.120  
   1.121  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.122  #: ../en/appB-mq-ref.xml:152
   1.123 @@ -661,8 +658,8 @@
   1.124  
   1.125  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.126  #: ../en/appB-mq-ref.xml:178
   1.127 -msgid "<command role=\"hg-ext-mq\">qnew</command>&emdash;create a new patch"
   1.128 -msgstr "<command role=\"hg-ext-mq\">qnew</command>&emdash;创建新补丁"
   1.129 +msgid "<command role=\"hg-ext-mq\">qnew</command>—create a new patch"
   1.130 +msgstr "<command role=\"hg-ext-mq\">qnew</command>—创建新补丁"
   1.131  
   1.132  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.133  #: ../en/appB-mq-ref.xml:181
   1.134 @@ -704,9 +701,8 @@
   1.135  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.136  #: ../en/appB-mq-ref.xml:215
   1.137  msgid ""
   1.138 -"<command role=\"hg-ext-mq\">qnext</command>&emdash;print the name of the next "
   1.139 -"patch"
   1.140 -msgstr "<command role=\"hg-ext-mq\">qnext</command>&emdash;显示下个补丁的名称"
   1.141 +"<command role=\"hg-ext-mq\">qnext</command>—print the name of the next patch"
   1.142 +msgstr "<command role=\"hg-ext-mq\">qnext</command>—显示下个补丁的名称"
   1.143  
   1.144  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.145  #: ../en/appB-mq-ref.xml:218
   1.146 @@ -719,9 +715,8 @@
   1.147  
   1.148  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.149  #: ../en/appB-mq-ref.xml:227
   1.150 -msgid ""
   1.151 -"<command role=\"hg-ext-mq\">qpop</command>&emdash;pop patches off the stack"
   1.152 -msgstr "<command role=\"hg-ext-mq\">qpop</command>&emdash;删除堆栈顶部的补丁"
   1.153 +msgid "<command role=\"hg-ext-mq\">qpop</command>—pop patches off the stack"
   1.154 +msgstr "<command role=\"hg-ext-mq\">qpop</command>—删除堆栈顶部的补丁"
   1.155  
   1.156  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.157  #: ../en/appB-mq-ref.xml:230
   1.158 @@ -804,9 +799,9 @@
   1.159  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.160  #: ../en/appB-mq-ref.xml:288
   1.161  msgid ""
   1.162 -"<command role=\"hg-ext-mq\">qprev</command>&emdash;print the name of the "
   1.163 -"previous patch"
   1.164 -msgstr "<command role=\"hg-ext-mq\">qprev</command>&emdash;显示上个补丁的名称"
   1.165 +"<command role=\"hg-ext-mq\">qprev</command>—print the name of the previous "
   1.166 +"patch"
   1.167 +msgstr "<command role=\"hg-ext-mq\">qprev</command>—显示上个补丁的名称"
   1.168  
   1.169  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.170  #: ../en/appB-mq-ref.xml:291
   1.171 @@ -819,9 +814,8 @@
   1.172  
   1.173  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.174  #: ../en/appB-mq-ref.xml:300
   1.175 -msgid ""
   1.176 -"<command role=\"hg-ext-mq\">qpush</command>&emdash;push patches onto the stack"
   1.177 -msgstr "<command role=\"hg-ext-mq\">qpush</command>&emdash;增加补丁到堆栈"
   1.178 +msgid "<command role=\"hg-ext-mq\">qpush</command>—push patches onto the stack"
   1.179 +msgstr "<command role=\"hg-ext-mq\">qpush</command>—增加补丁到堆栈"
   1.180  
   1.181  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.182  #: ../en/appB-mq-ref.xml:303
   1.183 @@ -918,9 +912,9 @@
   1.184  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.185  #: ../en/appB-mq-ref.xml:368
   1.186  msgid ""
   1.187 -"<command role=\"hg-ext-mq\">qrefresh</command>&emdash;update the topmost "
   1.188 -"applied patch"
   1.189 -msgstr "<command role=\"hg-ext-mq\">qrefresh</command>&emdash;更新最新的补丁"
   1.190 +"<command role=\"hg-ext-mq\">qrefresh</command>—update the topmost applied "
   1.191 +"patch"
   1.192 +msgstr "<command role=\"hg-ext-mq\">qrefresh</command>—更新最新的补丁"
   1.193  
   1.194  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.195  #: ../en/appB-mq-ref.xml:372
   1.196 @@ -994,8 +988,8 @@
   1.197  
   1.198  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.199  #: ../en/appB-mq-ref.xml:424
   1.200 -msgid "<command role=\"hg-ext-mq\">qrename</command>&emdash;rename a patch"
   1.201 -msgstr "<command role=\"hg-ext-mq\">qrename</command>&emdash;改名补丁"
   1.202 +msgid "<command role=\"hg-ext-mq\">qrename</command>—rename a patch"
   1.203 +msgstr "<command role=\"hg-ext-mq\">qrename</command>—改名补丁"
   1.204  
   1.205  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.206  #: ../en/appB-mq-ref.xml:427
   1.207 @@ -1015,10 +1009,8 @@
   1.208  
   1.209  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.210  #: ../en/appB-mq-ref.xml:438
   1.211 -msgid ""
   1.212 -"<command role=\"hg-ext-mq\">qrestore</command>&emdash;restore saved queue "
   1.213 -"state"
   1.214 -msgstr "<command role=\"hg-ext-mq\">qrestore</command>&emdash;恢复保存的队列"
   1.215 +msgid "<command role=\"hg-ext-mq\">qrestore</command>—restore saved queue state"
   1.216 +msgstr "<command role=\"hg-ext-mq\">qrestore</command>—恢复保存的队列"
   1.217  
   1.218  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.219  #: ../en/appB-mq-ref.xml:442
   1.220 @@ -1027,9 +1019,8 @@
   1.221  
   1.222  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.223  #: ../en/appB-mq-ref.xml:446
   1.224 -msgid ""
   1.225 -"<command role=\"hg-ext-mq\">qsave</command>&emdash;save current queue state"
   1.226 -msgstr "<command role=\"hg-ext-mq\">qsave</command>&emdash;保存当前的队列状态"
   1.227 +msgid "<command role=\"hg-ext-mq\">qsave</command>—save current queue state"
   1.228 +msgstr "<command role=\"hg-ext-mq\">qsave</command>—保存当前的队列状态"
   1.229  
   1.230  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.231  #: ../en/appB-mq-ref.xml:449
   1.232 @@ -1039,9 +1030,8 @@
   1.233  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.234  #: ../en/appB-mq-ref.xml:453
   1.235  msgid ""
   1.236 -"<command role=\"hg-ext-mq\">qseries</command>&emdash;print the entire patch "
   1.237 -"series"
   1.238 -msgstr "<command role=\"hg-ext-mq\">qseries</command>&emdash;显示补丁序列"
   1.239 +"<command role=\"hg-ext-mq\">qseries</command>—print the entire patch series"
   1.240 +msgstr "<command role=\"hg-ext-mq\">qseries</command>—显示补丁序列"
   1.241  
   1.242  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.243  #: ../en/appB-mq-ref.xml:456
   1.244 @@ -1055,9 +1045,8 @@
   1.245  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.246  #: ../en/appB-mq-ref.xml:464
   1.247  msgid ""
   1.248 -"<command role=\"hg-ext-mq\">qtop</command>&emdash;print the name of the "
   1.249 -"current patch"
   1.250 -msgstr "<command role=\"hg-ext-mq\">qtop</command>&emdash;显示当前补丁的名称"
   1.251 +"<command role=\"hg-ext-mq\">qtop</command>—print the name of the current patch"
   1.252 +msgstr "<command role=\"hg-ext-mq\">qtop</command>—显示当前补丁的名称"
   1.253  
   1.254  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.255  #: ../en/appB-mq-ref.xml:467
   1.256 @@ -1069,10 +1058,8 @@
   1.257  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.258  #: ../en/appB-mq-ref.xml:472
   1.259  msgid ""
   1.260 -"<command role=\"hg-ext-mq\">qunapplied</command>&emdash;print patches not yet "
   1.261 -"applied"
   1.262 -msgstr ""
   1.263 -"<command role=\"hg-ext-mq\">qunapplied</command>&emdash;显示尚未应用的补丁"
   1.264 +"<command role=\"hg-ext-mq\">qunapplied</command>—print patches not yet applied"
   1.265 +msgstr "<command role=\"hg-ext-mq\">qunapplied</command>—显示尚未应用的补丁"
   1.266  
   1.267  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.268  #: ../en/appB-mq-ref.xml:476
   1.269 @@ -1086,9 +1073,8 @@
   1.270  #. type: Content of: <book><appendix><sect1><sect2><title>
   1.271  #: ../en/appB-mq-ref.xml:484
   1.272  msgid ""
   1.273 -"<command role=\"hg-cmd\">hg strip</command>&emdash;remove a revision and "
   1.274 -"descendants"
   1.275 -msgstr "<command role=\"hg-cmd\">hg strip</command>&emdash;删除一个版本及其后继"
   1.276 +"<command role=\"hg-cmd\">hg strip</command>—remove a revision and descendants"
   1.277 +msgstr "<command role=\"hg-cmd\">hg strip</command>—删除一个版本及其后继"
   1.278  
   1.279  #. type: Content of: <book><appendix><sect1><sect2><para>
   1.280  #: ../en/appB-mq-ref.xml:487
   1.281 @@ -2531,8 +2517,8 @@
   1.282  
   1.283  #. type: Content of: <book><preface><sect1><title>
   1.284  #: ../en/ch00-preface.xml:739
   1.285 -msgid "Colophon&emdash;this book is Free"
   1.286 -msgstr "后记&emdash;本书是自由的!"
   1.287 +msgid "Colophon—this book is Free"
   1.288 +msgstr "后记—本书是自由的!"
   1.289  
   1.290  #. type: Content of: <book><preface><sect1><para>
   1.291  #: ../en/ch00-preface.xml:741
   1.292 @@ -4863,9 +4849,9 @@
   1.293  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.294  #: ../en/ch03-concepts.xml:498
   1.295  msgid ""
   1.296 -"There are more details&emdash;merging has plenty of corner cases&emdash;but "
   1.297 -"these are the most common choices that are involved in a merge.  As you can "
   1.298 -"see, most cases are completely automatic, and indeed most merges finish "
   1.299 +"There are more details—merging has plenty of corner cases&emdash;but these "
   1.300 +"are the most common choices that are involved in a merge.  As you can see, "
   1.301 +"most cases are completely automatic, and indeed most merges finish "
   1.302  "automatically, without requiring your input to resolve any conflicts."
   1.303  msgstr ""
   1.304  
   1.305 @@ -5191,11 +5177,11 @@
   1.306  "you added before the commit will no longer be listed in the output of "
   1.307  "<command role=\"hg-cmd\">hg status</command>.  The reason for this is that "
   1.308  "<command role=\"hg-cmd\">hg status</command> only tells you about "
   1.309 -"<quote>interesting</quote> files&emdash;those that you have modified or told "
   1.310 -"Mercurial to do something with&emdash;by default.  If you have a repository "
   1.311 -"that contains thousands of files, you will rarely want to know about files "
   1.312 -"that Mercurial is tracking, but that have not changed.  (You can still get "
   1.313 -"this information; we'll return to this later.)"
   1.314 +"<quote>interesting</quote> files—those that you have modified or told "
   1.315 +"Mercurial to do something with—by default.  If you have a repository that "
   1.316 +"contains thousands of files, you will rarely want to know about files that "
   1.317 +"Mercurial is tracking, but that have not changed.  (You can still get this "
   1.318 +"information; we'll return to this later.)"
   1.319  msgstr ""
   1.320  
   1.321  #. type: Content of: <book><chapter><sect1><para>
   1.322 @@ -5407,8 +5393,8 @@
   1.323  
   1.324  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.325  #: ../en/ch04-daily.xml:198
   1.326 -msgid "Useful shorthand&emdash;adding and removing files in one step"
   1.327 -msgstr "有用的速记&emdash;一个步骤添加和删除文件"
   1.328 +msgid "Useful shorthand—adding and removing files in one step"
   1.329 +msgstr "有用的速记—一个步骤添加和删除文件"
   1.330  
   1.331  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.332  #: ../en/ch04-daily.xml:201
   1.333 @@ -5732,8 +5718,8 @@
   1.334  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.335  #: ../en/ch04-daily.xml:454
   1.336  msgid ""
   1.337 -"The case of diverging names occurs when two developers start with a "
   1.338 -"file&emdash;let's call it <filename>foo</filename>&emdash;in their respective "
   1.339 +"The case of diverging names occurs when two developers start with a file—"
   1.340 +"let's call it <filename>foo</filename>&emdash;in their respective "
   1.341  "repositories."
   1.342  msgstr ""
   1.343  
   1.344 @@ -8535,8 +8521,8 @@
   1.345  
   1.346  #. type: Content of: <book><chapter><sect1><title>
   1.347  #: ../en/ch07-branch.xml:228
   1.348 -msgid "The flow of changes&emdash;big picture vs. little"
   1.349 -msgstr "修改流程&emdash;宏观与微观"
   1.350 +msgid "The flow of changes—big picture vs. little"
   1.351 +msgstr "修改流程—宏观与微观"
   1.352  
   1.353  #. type: Content of: <book><chapter><sect1><para>
   1.354  #: ../en/ch07-branch.xml:230
   1.355 @@ -8588,11 +8574,11 @@
   1.356  #: ../en/ch07-branch.xml:260
   1.357  msgid ""
   1.358  "The easiest way to isolate a <quote>big picture</quote> branch in Mercurial "
   1.359 -"is in a dedicated repository.  If you have an existing shared "
   1.360 -"repository&emdash;let's call it <literal>myproject</literal>&emdash;that "
   1.361 -"reaches a <quote>1.0</quote> milestone, you can start to prepare for future "
   1.362 -"maintenance releases on top of version 1.0 by tagging the revision from which "
   1.363 -"you prepared the 1.0 release."
   1.364 +"is in a dedicated repository.  If you have an existing shared repository—"
   1.365 +"let's call it <literal>myproject</literal>&emdash;that reaches a <quote>1.0</"
   1.366 +"quote> milestone, you can start to prepare for future maintenance releases on "
   1.367 +"top of version 1.0 by tagging the revision from which you prepared the 1.0 "
   1.368 +"release."
   1.369  msgstr ""
   1.370  
   1.371  #. type: Content of: <book><chapter><sect1><para>
   1.372 @@ -9013,9 +8999,9 @@
   1.373  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.374  #: ../en/ch08-undo.xml:65
   1.375  msgid ""
   1.376 -"However, luck is with me&emdash;I've caught my error before I pushed the "
   1.377 -"changeset.  I use the <command role=\"hg-cmd\">hg rollback</command> command, "
   1.378 -"and Mercurial makes that last changeset vanish."
   1.379 +"However, luck is with me—I've caught my error before I pushed the changeset.  "
   1.380 +"I use the <command role=\"hg-cmd\">hg rollback</command> command, and "
   1.381 +"Mercurial makes that last changeset vanish."
   1.382  msgstr ""
   1.383  
   1.384  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.385 @@ -9085,12 +9071,12 @@
   1.386  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.387  #: ../en/ch08-undo.xml:126
   1.388  msgid ""
   1.389 -"If you've pushed a change to another repository&emdash;particularly if it's a "
   1.390 -"shared repository&emdash;it has essentially <quote>escaped into the wild,</"
   1.391 -"quote> and you'll have to recover from your mistake in a different way.  What "
   1.392 -"will happen if you push a changeset somewhere, then roll it back, then pull "
   1.393 -"from the repository you pushed to, is that the changeset will reappear in "
   1.394 -"your repository."
   1.395 +"If you've pushed a change to another repository—particularly if it's a shared "
   1.396 +"repository—it has essentially <quote>escaped into the wild,</quote> and "
   1.397 +"you'll have to recover from your mistake in a different way.  What will "
   1.398 +"happen if you push a changeset somewhere, then roll it back, then pull from "
   1.399 +"the repository you pushed to, is that the changeset will reappear in your "
   1.400 +"repository."
   1.401  msgstr ""
   1.402  
   1.403  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.404 @@ -9212,7 +9198,7 @@
   1.405  msgid ""
   1.406  "The <command role=\"hg-cmd\">hg revert</command> command is useful for more "
   1.407  "than just modified files.  It lets you reverse the results of all of "
   1.408 -"Mercurial's file management commands&emdash;<command role=\"hg-cmd\">hg add</"
   1.409 +"Mercurial's file management commands—<command role=\"hg-cmd\">hg add</"
   1.410  "command>, <command role=\"hg-cmd\">hg remove</command>, and so on."
   1.411  msgstr ""
   1.412  
   1.413 @@ -9715,13 +9701,12 @@
   1.414  #. type: Content of: <book><chapter><sect1><para>
   1.415  #: ../en/ch08-undo.xml:616
   1.416  msgid ""
   1.417 -"Since Mercurial treats history as accumulative&emdash;every change builds on "
   1.418 -"top of all changes that preceded it&emdash;you generally can't just make "
   1.419 -"disastrous changes disappear.  The one exception is when you've just "
   1.420 -"committed a change, and it hasn't been pushed or pulled into another "
   1.421 -"repository.  That's when you can safely use the <command role=\"hg-cmd\">hg "
   1.422 -"rollback</command> command, as I detailed in <xref linkend=\"sec:undo:rollback"
   1.423 -"\"/>."
   1.424 +"Since Mercurial treats history as accumulative—every change builds on top of "
   1.425 +"all changes that preceded it—you generally can't just make disastrous changes "
   1.426 +"disappear.  The one exception is when you've just committed a change, and it "
   1.427 +"hasn't been pushed or pulled into another repository.  That's when you can "
   1.428 +"safely use the <command role=\"hg-cmd\">hg rollback</command> command, as I "
   1.429 +"detailed in <xref linkend=\"sec:undo:rollback\"/>."
   1.430  msgstr ""
   1.431  
   1.432  #. type: Content of: <book><chapter><sect1><para>
   1.433 @@ -10742,11 +10727,10 @@
   1.434  msgid ""
   1.435  "In practice, putting a centralised bottleneck like this in place is not often "
   1.436  "a good idea, and transaction visibility has nothing to do with the problem.  "
   1.437 -"As the size of a project&emdash;and the time it takes to build and "
   1.438 -"test&emdash;grows, you rapidly run into a wall with this <quote>try before "
   1.439 -"you buy</quote> approach, where you have more changesets to test than time in "
   1.440 -"which to deal with them.  The inevitable result is frustration on the part of "
   1.441 -"all involved."
   1.442 +"As the size of a project—and the time it takes to build and test—grows, you "
   1.443 +"rapidly run into a wall with this <quote>try before you buy</quote> approach, "
   1.444 +"where you have more changesets to test than time in which to deal with them.  "
   1.445 +"The inevitable result is frustration on the part of all involved."
   1.446  msgstr ""
   1.447  
   1.448  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.449 @@ -10906,9 +10890,8 @@
   1.450  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.451  #: ../en/ch09-hook.xml:464
   1.452  msgid ""
   1.453 -"You can write a hook either as a normal program&emdash;typically a shell "
   1.454 -"script&emdash;or as a Python function that is executed within the Mercurial "
   1.455 -"process."
   1.456 +"You can write a hook either as a normal program—typically a shell script—or "
   1.457 +"as a Python function that is executed within the Mercurial process."
   1.458  msgstr ""
   1.459  
   1.460  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.461 @@ -11203,9 +11186,9 @@
   1.462  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.463  #: ../en/ch09-hook.xml:716
   1.464  msgid ""
   1.465 -"<literal role=\"hg-ext\">acl</literal>&emdash;access control for parts of a "
   1.466 +"<literal role=\"hg-ext\">acl</literal>—access control for parts of a "
   1.467  "repository"
   1.468 -msgstr "<literal role=\"hg-ext\">acl</literal>&emdash;版本库的访问控制"
   1.469 +msgstr "<literal role=\"hg-ext\">acl</literal>—版本库的访问控制"
   1.470  
   1.471  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.472  #: ../en/ch09-hook.xml:719
   1.473 @@ -11350,9 +11333,8 @@
   1.474  
   1.475  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.476  #: ../en/ch09-hook.xml:844
   1.477 -msgid ""
   1.478 -"<literal role=\"hg-ext\">bugzilla</literal>&emdash;integration with Bugzilla"
   1.479 -msgstr "<literal role=\"hg-ext\">bugzilla</literal>&emdash;与 Bugzilla 的集成"
   1.480 +msgid "<literal role=\"hg-ext\">bugzilla</literal>—integration with Bugzilla"
   1.481 +msgstr "<literal role=\"hg-ext\">bugzilla</literal>—与 Bugzilla 的集成"
   1.482  
   1.483  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.484  #: ../en/ch09-hook.xml:848
   1.485 @@ -11367,7 +11349,7 @@
   1.486  #: ../en/ch09-hook.xml:855
   1.487  msgid ""
   1.488  "It adds a comment to the bug that looks like this (you can configure the "
   1.489 -"contents of the comment&emdash;see below):"
   1.490 +"contents of the comment—see below):"
   1.491  msgstr ""
   1.492  
   1.493  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.494 @@ -11683,9 +11665,8 @@
   1.495  
   1.496  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.497  #: ../en/ch09-hook.xml:1150
   1.498 -msgid ""
   1.499 -"<literal role=\"hg-ext\">notify</literal>&emdash;send email notifications"
   1.500 -msgstr "<literal role=\"hg-ext\">notify</literal>&emdash;邮件通知"
   1.501 +msgid "<literal role=\"hg-ext\">notify</literal>—send email notifications"
   1.502 +msgstr "<literal role=\"hg-ext\">notify</literal>—邮件通知"
   1.503  
   1.504  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.505  #: ../en/ch09-hook.xml:1153
   1.506 @@ -12008,8 +11989,8 @@
   1.507  
   1.508  #. type: Content of: <book><chapter><sect1><sect2><sect3><title>
   1.509  #: ../en/ch09-hook.xml:1431
   1.510 -msgid "Where changes are going&emdash;remote repository URLs"
   1.511 -msgstr "修改集要到哪里&emdash;远程版本库的地址"
   1.512 +msgid "Where changes are going—remote repository URLs"
   1.513 +msgstr "修改集要到哪里—远程版本库的地址"
   1.514  
   1.515  #. type: Content of: <book><chapter><sect1><sect2><sect3><para>
   1.516  #: ../en/ch09-hook.xml:1434
   1.517 @@ -12033,21 +12014,21 @@
   1.518  #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
   1.519  #: ../en/ch09-hook.xml:1449
   1.520  msgid ""
   1.521 -"<literal>remote:ssh:1.2.3.4</literal>&emdash;remote ssh client, at the IP "
   1.522 -"address <literal>1.2.3.4</literal>."
   1.523 +"<literal>remote:ssh:1.2.3.4</literal>—remote ssh client, at the IP address "
   1.524 +"<literal>1.2.3.4</literal>."
   1.525  msgstr ""
   1.526  
   1.527  #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
   1.528  #: ../en/ch09-hook.xml:1454
   1.529  msgid ""
   1.530 -"<literal>remote:http:1.2.3.4</literal>&emdash;remote http client, at the IP "
   1.531 -"address <literal>1.2.3.4</literal>.  If the client is using SSL, this will be "
   1.532 -"of the form <literal>remote:https:1.2.3.4</literal>."
   1.533 +"<literal>remote:http:1.2.3.4</literal>—remote http client, at the IP address "
   1.534 +"<literal>1.2.3.4</literal>.  If the client is using SSL, this will be of the "
   1.535 +"form <literal>remote:https:1.2.3.4</literal>."
   1.536  msgstr ""
   1.537  
   1.538  #. type: Content of: <book><chapter><sect1><sect2><sect3><itemizedlist><listitem><para>
   1.539  #: ../en/ch09-hook.xml:1461
   1.540 -msgid "Empty&emdash;no information could be discovered about the remote client."
   1.541 +msgid "Empty—no information could be discovered about the remote client."
   1.542  msgstr ""
   1.543  
   1.544  #. type: Content of: <book><chapter><sect1><title>
   1.545 @@ -12058,9 +12039,8 @@
   1.546  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.547  #: ../en/ch09-hook.xml:1473
   1.548  msgid ""
   1.549 -"<literal role=\"hook\">changegroup</literal>&emdash;after remote changesets "
   1.550 -"added"
   1.551 -msgstr "<literal role=\"hook\">changegroup</literal>&emdash;增加远程修改集之后"
   1.552 +"<literal role=\"hook\">changegroup</literal>—after remote changesets added"
   1.553 +msgstr "<literal role=\"hook\">changegroup</literal>—增加远程修改集之后"
   1.554  
   1.555  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.556  #: ../en/ch09-hook.xml:1476
   1.557 @@ -12126,10 +12106,8 @@
   1.558  
   1.559  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.560  #: ../en/ch09-hook.xml:1526
   1.561 -msgid ""
   1.562 -"<literal role=\"hook\">commit</literal>&emdash;after a new changeset is "
   1.563 -"created"
   1.564 -msgstr "<literal role=\"hook\">commit</literal>&emdash;创建新修改集之后"
   1.565 +msgid "<literal role=\"hook\">commit</literal>—after a new changeset is created"
   1.566 +msgstr "<literal role=\"hook\">commit</literal>—创建新修改集之后"
   1.567  
   1.568  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.569  #: ../en/ch09-hook.xml:1529
   1.570 @@ -12168,9 +12146,8 @@
   1.571  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.572  #: ../en/ch09-hook.xml:1559
   1.573  msgid ""
   1.574 -"<literal role=\"hook\">incoming</literal>&emdash;after one remote changeset "
   1.575 -"is added"
   1.576 -msgstr "<literal role=\"hook\">incoming</literal>&emdash;增加远程修改集之后"
   1.577 +"<literal role=\"hook\">incoming</literal>—after one remote changeset is added"
   1.578 +msgstr "<literal role=\"hook\">incoming</literal>—增加远程修改集之后"
   1.579  
   1.580  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.581  #: ../en/ch09-hook.xml:1562
   1.582 @@ -12209,9 +12186,8 @@
   1.583  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.584  #: ../en/ch09-hook.xml:1605
   1.585  msgid ""
   1.586 -"<literal role=\"hook\">outgoing</literal>&emdash;after changesets are "
   1.587 -"propagated"
   1.588 -msgstr "<literal role=\"hook\">outgoing</literal>&emdash;传播修改集之后"
   1.589 +"<literal role=\"hook\">outgoing</literal>—after changesets are propagated"
   1.590 +msgstr "<literal role=\"hook\">outgoing</literal>—传播修改集之后"
   1.591  
   1.592  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.593  #: ../en/ch09-hook.xml:1608
   1.594 @@ -12257,10 +12233,9 @@
   1.595  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.596  #: ../en/ch09-hook.xml:1652
   1.597  msgid ""
   1.598 -"<literal role=\"hook\">prechangegroup</literal>&emdash;before starting to add "
   1.599 -"remote changesets"
   1.600 -msgstr ""
   1.601 -"<literal role=\"hook\">prechangegroup</literal>&emdash;增加远程修改集之前"
   1.602 +"<literal role=\"hook\">prechangegroup</literal>—before starting to add remote "
   1.603 +"changesets"
   1.604 +msgstr "<literal role=\"hook\">prechangegroup</literal>—增加远程修改集之前"
   1.605  
   1.606  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.607  #: ../en/ch09-hook.xml:1656
   1.608 @@ -12298,9 +12273,9 @@
   1.609  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.610  #: ../en/ch09-hook.xml:1698
   1.611  msgid ""
   1.612 -"<literal role=\"hook\">precommit</literal>&emdash;before starting to commit a "
   1.613 +"<literal role=\"hook\">precommit</literal>—before starting to commit a "
   1.614  "changeset"
   1.615 -msgstr "<literal role=\"hook\">precommit</literal>&emdash;提交修改集之前"
   1.616 +msgstr "<literal role=\"hook\">precommit</literal>—提交修改集之前"
   1.617  
   1.618  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.619  #: ../en/ch09-hook.xml:1701
   1.620 @@ -12350,9 +12325,9 @@
   1.621  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.622  #: ../en/ch09-hook.xml:1738
   1.623  msgid ""
   1.624 -"<literal role=\"hook\">preoutgoing</literal>&emdash;before starting to "
   1.625 -"propagate changesets"
   1.626 -msgstr "<literal role=\"hook\">preoutgoing</literal>&emdash;传播修改集之前"
   1.627 +"<literal role=\"hook\">preoutgoing</literal>—before starting to propagate "
   1.628 +"changesets"
   1.629 +msgstr "<literal role=\"hook\">preoutgoing</literal>—传播修改集之前"
   1.630  
   1.631  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.632  #: ../en/ch09-hook.xml:1741
   1.633 @@ -12387,9 +12362,8 @@
   1.634  
   1.635  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.636  #: ../en/ch09-hook.xml:1775
   1.637 -msgid ""
   1.638 -"<literal role=\"hook\">pretag</literal>&emdash;before tagging a changeset"
   1.639 -msgstr "<literal role=\"hook\">pretag</literal>&emdash;创建标签之前"
   1.640 +msgid "<literal role=\"hook\">pretag</literal>—before tagging a changeset"
   1.641 +msgstr "<literal role=\"hook\">pretag</literal>—创建标签之前"
   1.642  
   1.643  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.644  #: ../en/ch09-hook.xml:1778
   1.645 @@ -12438,20 +12412,19 @@
   1.646  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.647  #: ../en/ch09-hook.xml:1815
   1.648  msgid ""
   1.649 -"<literal role=\"hook\">pretxnchangegroup</literal>&emdash;before completing "
   1.650 -"addition of remote changesets"
   1.651 -msgstr ""
   1.652 -"<literal role=\"hook\">pretxnchangegroup</literal>&emdash;完成增加远程修改集之"
   1.653 -"前"
   1.654 +"<literal role=\"hook\">pretxnchangegroup</literal>—before completing addition "
   1.655 +"of remote changesets"
   1.656 +msgstr ""
   1.657 +"<literal role=\"hook\">pretxnchangegroup</literal>—完成增加远程修改集之前"
   1.658  
   1.659  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.660  #: ../en/ch09-hook.xml:1819
   1.661  msgid ""
   1.662 -"This controlling hook is run before a transaction&emdash;that manages the "
   1.663 -"addition of a group of new changesets from outside the repository&emdash;"
   1.664 -"completes.  If the hook succeeds, the transaction completes, and all of the "
   1.665 -"changesets become permanent within this repository.  If the hook fails, the "
   1.666 -"transaction is rolled back, and the data for the changesets is erased."
   1.667 +"This controlling hook is run before a transaction—that manages the addition "
   1.668 +"of a group of new changesets from outside the repository—completes.  If the "
   1.669 +"hook succeeds, the transaction completes, and all of the changesets become "
   1.670 +"permanent within this repository.  If the hook fails, the transaction is "
   1.671 +"rolled back, and the data for the changesets is erased."
   1.672  msgstr ""
   1.673  
   1.674  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.675 @@ -12491,17 +12464,17 @@
   1.676  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.677  #: ../en/ch09-hook.xml:1881
   1.678  msgid ""
   1.679 -"<literal role=\"hook\">pretxncommit</literal>&emdash;before completing commit "
   1.680 -"of new changeset"
   1.681 -msgstr "<literal role=\"hook\">pretxncommit</literal>&emdash;完成提交之前"
   1.682 +"<literal role=\"hook\">pretxncommit</literal>—before completing commit of new "
   1.683 +"changeset"
   1.684 +msgstr "<literal role=\"hook\">pretxncommit</literal>—完成提交之前"
   1.685  
   1.686  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.687  #: ../en/ch09-hook.xml:1884
   1.688  msgid ""
   1.689 -"This controlling hook is run before a transaction&emdash;that manages a new "
   1.690 -"commit&emdash;completes.  If the hook succeeds, the transaction completes and "
   1.691 -"the changeset becomes permanent within this repository.  If the hook fails, "
   1.692 -"the transaction is rolled back, and the commit data is erased."
   1.693 +"This controlling hook is run before a transaction—that manages a new commit—"
   1.694 +"completes.  If the hook succeeds, the transaction completes and the changeset "
   1.695 +"becomes permanent within this repository.  If the hook fails, the transaction "
   1.696 +"is rolled back, and the commit data is erased."
   1.697  msgstr ""
   1.698  
   1.699  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.700 @@ -12533,10 +12506,9 @@
   1.701  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.702  #: ../en/ch09-hook.xml:1929
   1.703  msgid ""
   1.704 -"<literal role=\"hook\">preupdate</literal>&emdash;before updating or merging "
   1.705 -"working directory"
   1.706 -msgstr ""
   1.707 -"<literal role=\"hook\">preupdate</literal>&emdash;更新或合并工作目录之前"
   1.708 +"<literal role=\"hook\">preupdate</literal>—before updating or merging working "
   1.709 +"directory"
   1.710 +msgstr "<literal role=\"hook\">preupdate</literal>—更新或合并工作目录之前"
   1.711  
   1.712  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.713  #: ../en/ch09-hook.xml:1932
   1.714 @@ -12572,8 +12544,8 @@
   1.715  
   1.716  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.717  #: ../en/ch09-hook.xml:1961
   1.718 -msgid "<literal role=\"hook\">tag</literal>&emdash;after tagging a changeset"
   1.719 -msgstr "<literal role=\"hook\">tag</literal>&emdash;创建标签之后"
   1.720 +msgid "<literal role=\"hook\">tag</literal>—after tagging a changeset"
   1.721 +msgstr "<literal role=\"hook\">tag</literal>—创建标签之后"
   1.722  
   1.723  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.724  #: ../en/ch09-hook.xml:1964
   1.725 @@ -12621,9 +12593,9 @@
   1.726  #. type: Content of: <book><chapter><sect1><sect2><title>
   1.727  #: ../en/ch09-hook.xml:1998
   1.728  msgid ""
   1.729 -"<literal role=\"hook\">update</literal>&emdash;after updating or merging "
   1.730 -"working directory"
   1.731 -msgstr "<literal role=\"hook\">update</literal>&emdash;更新或合并工作目录之后"
   1.732 +"<literal role=\"hook\">update</literal>—after updating or merging working "
   1.733 +"directory"
   1.734 +msgstr "<literal role=\"hook\">update</literal>—更新或合并工作目录之后"
   1.735  
   1.736  #. type: Content of: <book><chapter><sect1><sect2><para>
   1.737  #: ../en/ch09-hook.xml:2001
   1.738 @@ -12701,9 +12673,9 @@
   1.739  #. type: Content of: <book><chapter><sect1><para>
   1.740  #: ../en/ch10-template.xml:26
   1.741  msgid ""
   1.742 -"This is somewhat informative, but it takes up a lot of space&emdash;five "
   1.743 -"lines of output per changeset.  The <literal>compact</literal> style reduces "
   1.744 -"this to three lines, presented in a sparse manner."
   1.745 +"This is somewhat informative, but it takes up a lot of space—five lines of "
   1.746 +"output per changeset.  The <literal>compact</literal> style reduces this to "
   1.747 +"three lines, presented in a sparse manner."
   1.748  msgstr ""
   1.749  
   1.750  #. type: Content of: <book><chapter><sect1><para>
   1.751 @@ -13774,9 +13746,8 @@
   1.752  #: ../en/ch11-mq.xml:149
   1.753  msgid ""
   1.754  "A major reason that patches have persisted in the free software and open "
   1.755 -"source world&emdash;in spite of the availability of increasingly capable "
   1.756 -"revision control tools over the years&emdash;is the <emphasis>agility</"
   1.757 -"emphasis> they offer."
   1.758 +"source world—in spite of the availability of increasingly capable revision "
   1.759 +"control tools over the years—is the <emphasis>agility</emphasis> they offer."
   1.760  msgstr ""
   1.761  
   1.762  #. type: Content of: <book><chapter><sect1><para>
   1.763 @@ -13785,8 +13756,8 @@
   1.764  "Traditional revision control tools make a permanent, irreversible record of "
   1.765  "everything that you do.  While this has great value, it's also somewhat "
   1.766  "stifling.  If you want to perform a wild-eyed experiment, you have to be "
   1.767 -"careful in how you go about it, or you risk leaving unneeded&emdash;or worse, "
   1.768 -"misleading or destabilising&emdash;traces of your missteps and errors in the "
   1.769 +"careful in how you go about it, or you risk leaving unneeded—or worse, "
   1.770 +"misleading or destabilising—traces of your missteps and errors in the "
   1.771  "permanent revision record."
   1.772  msgstr ""
   1.773  
   1.774 @@ -13797,23 +13768,23 @@
   1.775  "it much easier to isolate your work.  Your patches live on top of normal "
   1.776  "revision history, and you can make them disappear or reappear at will.  If "
   1.777  "you don't like a patch, you can drop it.  If a patch isn't quite as you want "
   1.778 -"it to be, simply fix it&emdash;as many times as you need to, until you have "
   1.779 -"refined it into the form you desire."
   1.780 +"it to be, simply fix it—as many times as you need to, until you have refined "
   1.781 +"it into the form you desire."
   1.782  msgstr ""
   1.783  
   1.784  #. type: Content of: <book><chapter><sect1><para>
   1.785  #: ../en/ch11-mq.xml:171
   1.786  msgid ""
   1.787  "As an example, the integration of patches with revision control makes "
   1.788 -"understanding patches and debugging their effects&emdash;and their interplay "
   1.789 -"with the code they're based on&emdash;<emphasis>enormously</emphasis> easier. "
   1.790 -"Since every applied patch has an associated changeset, you can give <command "
   1.791 -"role=\"hg-cmd\">hg log</command> a file name to see which changesets and "
   1.792 -"patches affected the file.  You can use the <command role=\"hg-cmd\">hg "
   1.793 -"bisect</command> command to binary-search through all changesets and applied "
   1.794 -"patches to see where a bug got introduced or fixed.  You can use the <command "
   1.795 -"role=\"hg-cmd\">hg annotate</command> command to see which changeset or patch "
   1.796 -"modified a particular line of a source file.  And so on."
   1.797 +"understanding patches and debugging their effects—and their interplay with "
   1.798 +"the code they're based on—<emphasis>enormously</emphasis> easier. Since every "
   1.799 +"applied patch has an associated changeset, you can give <command role=\"hg-cmd"
   1.800 +"\">hg log</command> a file name to see which changesets and patches affected "
   1.801 +"the file.  You can use the <command role=\"hg-cmd\">hg bisect</command> "
   1.802 +"command to binary-search through all changesets and applied patches to see "
   1.803 +"where a bug got introduced or fixed.  You can use the <command role=\"hg-cmd"
   1.804 +"\">hg annotate</command> command to see which changeset or patch modified a "
   1.805 +"particular line of a source file.  And so on."
   1.806  msgstr ""
   1.807  
   1.808  #. type: Content of: <book><chapter><sect1><title>
   1.809 @@ -14190,15 +14161,14 @@
   1.810  msgid ""
   1.811  "Here's an example that illustrates how you can use this ability. Let's say "
   1.812  "you're developing a new feature as two patches.  The first is a change to the "
   1.813 -"core of your software, and the second&emdash;layered on top of the "
   1.814 -"first&emdash;changes the user interface to use the code you just added to the "
   1.815 -"core.  If you notice a bug in the core while you're working on the UI patch, "
   1.816 -"it's easy to fix the core.  Simply <command role=\"hg-ext-mq\">qrefresh</"
   1.817 -"command> the UI patch to save your in-progress changes, and <command role="
   1.818 -"\"hg-ext-mq\">qpop</command> down to the core patch.  Fix the core bug, "
   1.819 -"<command role=\"hg-ext-mq\">qrefresh</command> the core patch, and <command "
   1.820 -"role=\"hg-ext-mq\">qpush</command> back to the UI patch to continue where you "
   1.821 -"left off."
   1.822 +"core of your software, and the second—layered on top of the first—changes the "
   1.823 +"user interface to use the code you just added to the core.  If you notice a "
   1.824 +"bug in the core while you're working on the UI patch, it's easy to fix the "
   1.825 +"core.  Simply <command role=\"hg-ext-mq\">qrefresh</command> the UI patch to "
   1.826 +"save your in-progress changes, and <command role=\"hg-ext-mq\">qpop</command> "
   1.827 +"down to the core patch.  Fix the core bug, <command role=\"hg-ext-mq"
   1.828 +"\">qrefresh</command> the core patch, and <command role=\"hg-ext-mq\">qpush</"
   1.829 +"command> back to the UI patch to continue where you left off."
   1.830  msgstr ""
   1.831  
   1.832  #. type: Content of: <book><chapter><sect1><title>
   1.833 @@ -14501,8 +14471,8 @@
   1.834  #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
   1.835  #: ../en/ch11-mq.xml:731
   1.836  msgid ""
   1.837 -"A large hunk might apply better&emdash;either entirely or in part&emdash;if "
   1.838 -"it was broken up into smaller hunks."
   1.839 +"A large hunk might apply better—either entirely or in part&emdash;if it was "
   1.840 +"broken up into smaller hunks."
   1.841  msgstr ""
   1.842  
   1.843  #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para>
   1.844 @@ -15001,12 +14971,12 @@
   1.845  msgid ""
   1.846  "The <command>diffstat</command> command <citation>web:diffstat</citation> "
   1.847  "generates a histogram of the modifications made to each file in a patch.  It "
   1.848 -"provides a good way to <quote>get a sense of</quote> a patch&emdash;which "
   1.849 -"files it affects, and how much change it introduces to each file and as a "
   1.850 -"whole.  (I find that it's a good idea to use <command>diffstat</command>'s "
   1.851 -"<option role=\"cmd-opt-diffstat\">-p</option> option as a matter of course, "
   1.852 -"as otherwise it will try to do clever things with prefixes of file names that "
   1.853 -"inevitably confuse at least me.)"
   1.854 +"provides a good way to <quote>get a sense of</quote> a patch—which files it "
   1.855 +"affects, and how much change it introduces to each file and as a whole.  (I "
   1.856 +"find that it's a good idea to use <command>diffstat</command>'s <option role="
   1.857 +"\"cmd-opt-diffstat\">-p</option> option as a matter of course, as otherwise "
   1.858 +"it will try to do clever things with prefixes of file names that inevitably "
   1.859 +"confuse at least me.)"
   1.860  msgstr ""
   1.861  
   1.862  #. type: Content of: <book><chapter><sect1><para>
   1.863 @@ -15056,13 +15026,12 @@
   1.864  #: ../en/ch11-mq.xml:1160
   1.865  msgid ""
   1.866  "Be aware of what patch you're working on.  Use the <command role=\"hg-ext-mq"
   1.867 -"\">qtop</command> command and skim over the text of your patches "
   1.868 -"frequently&emdash;for example, using <command role=\"hg-cmd\">hg tip <option "
   1.869 -"role=\"hg-opt-tip\">-p</option></command>)&emdash;to be sure of where you "
   1.870 -"stand.  I have several times worked on and <command role=\"hg-ext-mq"
   1.871 -"\">qrefresh</command>ed a patch other than the one I intended, and it's often "
   1.872 -"tricky to migrate changes into the right patch after making them in the wrong "
   1.873 -"one."
   1.874 +"\">qtop</command> command and skim over the text of your patches frequently—"
   1.875 +"for example, using <command role=\"hg-cmd\">hg tip <option role=\"hg-opt-tip"
   1.876 +"\">-p</option></command>)—to be sure of where you stand.  I have several "
   1.877 +"times worked on and <command role=\"hg-ext-mq\">qrefresh</command>ed a patch "
   1.878 +"other than the one I intended, and it's often tricky to migrate changes into "
   1.879 +"the right patch after making them in the wrong one."
   1.880  msgstr ""
   1.881  
   1.882  #. type: Content of: <book><chapter><sect1><para>