hgbook
changeset 715:c03f7ff6069c
Update Chinese translation
author | Dongsheng Song <dongsheng.song@gmail.com> |
---|---|
date | Thu May 21 14:57:15 2009 +0800 (2009-05-21) |
parents | a13404f69f8d |
children | acfeda9d8a2a |
files | po/zh.po |
line diff
1.1 --- a/po/zh.po Thu May 21 14:29:39 2009 +0800 1.2 +++ b/po/zh.po Thu May 21 14:57:15 2009 +0800 1.3 @@ -42,7 +42,7 @@ 1.4 msgstr "" 1.5 "Project-Id-Version: hgbook 1.2\n" 1.6 "POT-Creation-Date: 2009-05-21 14:26+0800\n" 1.7 -"PO-Revision-Date: 2009-04-18 11:50+0800\n" 1.8 +"PO-Revision-Date: 2009-05-21 14:55+0800\n" 1.9 "Last-Translator: 宋冬生 <songdonogsheng@live.cn>\n" 1.10 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" 1.11 "MIME-Version: 1.0\n" 1.12 @@ -90,9 +90,8 @@ 1.13 1.14 #. type: Content of: <book><appendix><title> 1.15 #: ../en/appA-svn.xml:5 1.16 -#, fuzzy 1.17 msgid "Migrating to Mercurial" 1.18 -msgstr "使用 MQ 管理修改" 1.19 +msgstr "迁移到 Mercurial" 1.20 1.21 #. type: Content of: <book><appendix><para> 1.22 #: ../en/appA-svn.xml:7 1.23 @@ -128,7 +127,7 @@ 1.24 #: ../en/appA-svn.xml:25 ../en/appA-svn.xml:369 ../en/ch01-intro.xml:416 1.25 #: ../en/ch01-intro.xml:627 1.26 msgid "Subversion" 1.27 -msgstr "" 1.28 +msgstr "Subversion" 1.29 1.30 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para> 1.31 #: ../en/appA-svn.xml:28 ../en/ch01-intro.xml:532 ../en/ch01-intro.xml:628 1.32 @@ -137,9 +136,8 @@ 1.33 1.34 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para> 1.35 #: ../en/appA-svn.xml:31 1.36 -#, fuzzy 1.37 msgid "git" 1.38 -msgstr "Git" 1.39 +msgstr "git" 1.40 1.41 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para> 1.42 #: ../en/appA-svn.xml:34 ../en/ch01-intro.xml:630 1.43 @@ -149,23 +147,22 @@ 1.44 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para> 1.45 #: ../en/appA-svn.xml:37 1.46 msgid "Bazaar" 1.47 -msgstr "" 1.48 +msgstr "Bazaar" 1.49 1.50 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para> 1.51 #: ../en/appA-svn.xml:40 1.52 msgid "Monotone" 1.53 -msgstr "" 1.54 +msgstr "Monotone" 1.55 1.56 #. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para> 1.57 #: ../en/appA-svn.xml:43 1.58 msgid "GNU Arch" 1.59 -msgstr "" 1.60 +msgstr "GNU Arch" 1.61 1.62 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><thead><row><entry> 1.63 #: ../en/appA-svn.xml:46 ../en/appA-svn.xml:370 1.64 -#, fuzzy 1.65 msgid "Mercurial" 1.66 -msgstr "为什么选择 Mercurial?" 1.67 +msgstr "Mercurial" 1.68 1.69 #. type: Content of: <book><appendix><sect1><para> 1.70 #: ../en/appA-svn.xml:50 1.71 @@ -194,7 +191,7 @@ 1.72 #: ../en/appA-svn.xml:213 ../en/appA-svn.xml:218 ../en/appA-svn.xml:224 1.73 #: ../en/appA-svn.xml:229 ../en/appA-svn.xml:532 1.74 msgid "$" 1.75 -msgstr "" 1.76 +msgstr "$" 1.77 1.78 #. type: Content of: <book><appendix><sect1><screen><userinput> 1.79 #: ../en/appA-svn.xml:64 1.80 @@ -226,9 +223,8 @@ 1.81 1.82 #. type: Content of: <book><appendix><sect1><sect2><title> 1.83 #: ../en/appA-svn.xml:86 1.84 -#, fuzzy 1.85 msgid "Converting multiple branches" 1.86 -msgstr "使用多个分支工作" 1.87 +msgstr "转换多个分支" 1.88 1.89 #. type: Content of: <book><appendix><sect1><sect2><para> 1.90 #: ../en/appA-svn.xml:88 1.91 @@ -263,9 +259,8 @@ 1.92 1.93 #. type: Content of: <book><appendix><sect1><sect2><title> 1.94 #: ../en/appA-svn.xml:114 1.95 -#, fuzzy 1.96 msgid "Mapping user names" 1.97 -msgstr "选择用户名称" 1.98 +msgstr "映射用户名称" 1.99 1.100 #. type: Content of: <book><appendix><sect1><sect2><para> 1.101 #: ../en/appA-svn.xml:116 1.102 @@ -381,7 +376,7 @@ 1.103 #. type: Content of: <book><appendix><sect1><sect2><screen><userinput> 1.104 #: ../en/appA-svn.xml:207 1.105 msgid "svnadmin create memcached-mirror" 1.106 -msgstr "" 1.107 +msgstr "svnadmin create memcached-mirror" 1.108 1.109 #. type: Content of: <book><appendix><sect1><sect2><para> 1.110 #: ../en/appA-svn.xml:209 1.111 @@ -391,12 +386,12 @@ 1.112 #. type: Content of: <book><appendix><sect1><sect2><screen><userinput> 1.113 #: ../en/appA-svn.xml:212 1.114 msgid "echo '#!/bin/sh' > memcached-mirror/hooks/pre-revprop-change" 1.115 -msgstr "" 1.116 +msgstr "echo '#!/bin/sh' > memcached-mirror/hooks/pre-revprop-change" 1.117 1.118 #. type: Content of: <book><appendix><sect1><sect2><screen><userinput> 1.119 #: ../en/appA-svn.xml:213 1.120 msgid "chmod +x memcached-mirror/hooks/pre-revprop-change" 1.121 -msgstr "" 1.122 +msgstr "chmod +x memcached-mirror/hooks/pre-revprop-change" 1.123 1.124 #. type: Content of: <book><appendix><sect1><sect2><para> 1.125 #: ../en/appA-svn.xml:215 1.126 @@ -409,6 +404,8 @@ 1.127 "svnsync --init file://`pwd`/memcached-mirror \\ http://code.sixapart.com/svn/" 1.128 "memcached" 1.129 msgstr "" 1.130 +"svnsync --init file://`pwd`/memcached-mirror \\ http://code.sixapart.com/svn/" 1.131 +"memcached" 1.132 1.133 #. type: Content of: <book><appendix><sect1><sect2><para> 1.134 #: ../en/appA-svn.xml:221 1.135 @@ -419,7 +416,7 @@ 1.136 #. type: Content of: <book><appendix><sect1><sect2><screen><userinput> 1.137 #: ../en/appA-svn.xml:224 1.138 msgid "svnsync sync file://`pwd`/memcached-mirror" 1.139 -msgstr "" 1.140 +msgstr "svnsync sync file://`pwd`/memcached-mirror" 1.141 1.142 #. type: Content of: <book><appendix><sect1><sect2><para> 1.143 #: ../en/appA-svn.xml:226 1.144 @@ -455,7 +452,7 @@ 1.145 #. type: Content of: <book><appendix><sect1><title> 1.146 #: ../en/appA-svn.xml:249 1.147 msgid "Migrating from Subversion" 1.148 -msgstr "" 1.149 +msgstr "从 Subversion 迁移" 1.150 1.151 #. type: Content of: <book><appendix><sect1><para> 1.152 #: ../en/appA-svn.xml:251 1.153 @@ -494,7 +491,7 @@ 1.154 #. type: Content of: <book><appendix><sect1><sect2><sect3><title> 1.155 #: ../en/appA-svn.xml:277 1.156 msgid "Scope of commands" 1.157 -msgstr "" 1.158 +msgstr "命令作用域" 1.159 1.160 #. type: Content of: <book><appendix><sect1><sect2><sect3><para> 1.161 #: ../en/appA-svn.xml:279 1.162 @@ -606,206 +603,203 @@ 1.163 1.164 #. type: Content of: <book><appendix><sect1><sect2><title> 1.165 #: ../en/appA-svn.xml:362 1.166 -#, fuzzy 1.167 msgid "Quick reference" 1.168 -msgstr "钩子参考" 1.169 +msgstr "快速参考" 1.170 1.171 #. type: Content of: <book><appendix><sect1><sect2><table><title> 1.172 #: ../en/appA-svn.xml:365 1.173 msgid "Subversion commands and Mercurial equivalents" 1.174 -msgstr "" 1.175 +msgstr "Subversion 命令与 Mercurial 对照表" 1.176 1.177 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><thead><row><entry> 1.178 #: ../en/appA-svn.xml:371 1.179 msgid "Notes" 1.180 -msgstr "" 1.181 +msgstr "备注" 1.182 1.183 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.184 #: ../en/appA-svn.xml:376 1.185 msgid "<command>svn add</command>" 1.186 -msgstr "" 1.187 +msgstr "<command>svn add</command>" 1.188 1.189 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.190 #: ../en/appA-svn.xml:377 1.191 msgid "<command>hg add</command>" 1.192 -msgstr "" 1.193 +msgstr "<command>hg add</command>" 1.194 1.195 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.196 #: ../en/appA-svn.xml:381 1.197 msgid "<command>svn blame</command>" 1.198 -msgstr "" 1.199 +msgstr "<command>svn blame</command>" 1.200 1.201 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.202 #: ../en/appA-svn.xml:382 1.203 msgid "<command>hg annotate</command>" 1.204 -msgstr "" 1.205 +msgstr "<command>hg annotate</command>" 1.206 1.207 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.208 #: ../en/appA-svn.xml:386 1.209 msgid "<command>svn cat</command>" 1.210 -msgstr "" 1.211 +msgstr "<command>svn cat</command>" 1.212 1.213 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.214 #: ../en/appA-svn.xml:387 1.215 msgid "<command>hg cat</command>" 1.216 -msgstr "" 1.217 +msgstr "<command>hg cat</command>" 1.218 1.219 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.220 #: ../en/appA-svn.xml:391 1.221 msgid "<command>svn checkout</command>" 1.222 -msgstr "" 1.223 +msgstr "<command>svn checkout</command>" 1.224 1.225 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.226 #: ../en/appA-svn.xml:392 ../en/appA-svn.xml:409 1.227 msgid "<command>hg clone</command>" 1.228 -msgstr "" 1.229 +msgstr "<command>hg clone</command>" 1.230 1.231 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.232 #: ../en/appA-svn.xml:396 1.233 msgid "<command>svn cleanup</command>" 1.234 -msgstr "" 1.235 +msgstr "<command>svn cleanup</command>" 1.236 1.237 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.238 #: ../en/appA-svn.xml:397 ../en/appA-svn.xml:472 1.239 msgid "n/a" 1.240 -msgstr "" 1.241 +msgstr "n/a" 1.242 1.243 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.244 #: ../en/appA-svn.xml:398 1.245 msgid "No cleanup needed" 1.246 -msgstr "" 1.247 +msgstr "不需要清理" 1.248 1.249 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.250 #: ../en/appA-svn.xml:401 1.251 msgid "<command>svn commit</command>" 1.252 -msgstr "" 1.253 +msgstr "<command>svn commit</command>" 1.254 1.255 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.256 #: ../en/appA-svn.xml:402 1.257 msgid "<command>hg commit</command>; <command>hg push</command>" 1.258 -msgstr "" 1.259 +msgstr "<command>hg commit</command>; <command>hg push</command>" 1.260 1.261 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.262 #: ../en/appA-svn.xml:404 1.263 msgid "<command>hg push</command> publishes after commit" 1.264 -msgstr "" 1.265 +msgstr "提交后使用 <command>hg push</command> 发布" 1.266 1.267 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.268 #: ../en/appA-svn.xml:408 ../en/appA-svn.xml:413 1.269 msgid "<command>svn copy</command>" 1.270 -msgstr "" 1.271 +msgstr "<command>svn copy</command>" 1.272 1.273 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.274 #: ../en/appA-svn.xml:410 1.275 -#, fuzzy 1.276 msgid "To create a new branch" 1.277 msgstr "创建新补丁" 1.278 1.279 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.280 #: ../en/appA-svn.xml:414 1.281 msgid "<command>hg copy</command>" 1.282 -msgstr "" 1.283 +msgstr "<command>hg copy</command>" 1.284 1.285 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.286 #: ../en/appA-svn.xml:415 1.287 -#, fuzzy 1.288 msgid "To copy files or directories" 1.289 -msgstr "Mercurial 只跟踪文件,不跟踪目录" 1.290 +msgstr "复制文件或目录" 1.291 1.292 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.293 #: ../en/appA-svn.xml:418 1.294 msgid "<command>svn delete</command> (<command>svn remove</command>)" 1.295 -msgstr "" 1.296 +msgstr "<command>svn delete</command> (<command>svn remove</command>)" 1.297 1.298 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.299 #: ../en/appA-svn.xml:420 1.300 msgid "<command>hg remove</command>" 1.301 -msgstr "" 1.302 +msgstr "<command>hg remove</command>" 1.303 1.304 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.305 #: ../en/appA-svn.xml:424 1.306 msgid "<command>svn diff</command>" 1.307 -msgstr "" 1.308 +msgstr "<command>svn diff</command>" 1.309 1.310 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.311 #: ../en/appA-svn.xml:425 1.312 msgid "<command>hg diff</command>" 1.313 -msgstr "" 1.314 +msgstr "<command>hg diff</command>" 1.315 1.316 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.317 #: ../en/appA-svn.xml:429 1.318 msgid "<command>svn export</command>" 1.319 -msgstr "" 1.320 +msgstr "<command>svn export</command>" 1.321 1.322 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.323 #: ../en/appA-svn.xml:430 1.324 msgid "<command>hg archive</command>" 1.325 -msgstr "" 1.326 +msgstr "<command>hg archive</command>" 1.327 1.328 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.329 #: ../en/appA-svn.xml:434 1.330 msgid "<command>svn help</command>" 1.331 -msgstr "" 1.332 +msgstr "<command>svn help</command>" 1.333 1.334 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.335 #: ../en/appA-svn.xml:435 1.336 msgid "<command>hg help</command>" 1.337 -msgstr "" 1.338 +msgstr "<command>hg help</command>" 1.339 1.340 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.341 #: ../en/appA-svn.xml:439 1.342 msgid "<command>svn import</command>" 1.343 -msgstr "" 1.344 +msgstr "<command>svn import</command>" 1.345 1.346 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.347 #: ../en/appA-svn.xml:440 1.348 msgid "<command>hg addremove</command>; <command>hg commit</command>" 1.349 -msgstr "" 1.350 +msgstr "<command>hg addremove</command>; <command>hg commit</command>" 1.351 1.352 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.353 #: ../en/appA-svn.xml:445 ../en/appA-svn.xml:450 1.354 msgid "<command>svn info</command>" 1.355 -msgstr "" 1.356 +msgstr "<command>svn info</command>" 1.357 1.358 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.359 #: ../en/appA-svn.xml:446 1.360 msgid "<command>hg parents</command>" 1.361 -msgstr "" 1.362 +msgstr "<command>hg parents</command>" 1.363 1.364 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.365 #: ../en/appA-svn.xml:447 1.366 msgid "Shows what revision is checked out" 1.367 -msgstr "" 1.368 +msgstr "显示检出的版本信息" 1.369 1.370 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.371 #: ../en/appA-svn.xml:451 1.372 msgid "<command>hg showconfig paths.parent</command>" 1.373 -msgstr "" 1.374 +msgstr "<command>hg showconfig paths.parent</command>" 1.375 1.376 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.377 #: ../en/appA-svn.xml:453 1.378 msgid "Shows what URL is checked out" 1.379 -msgstr "" 1.380 +msgstr "显示检出的 URL" 1.381 1.382 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.383 #: ../en/appA-svn.xml:456 1.384 msgid "<command>svn list</command>" 1.385 -msgstr "" 1.386 +msgstr "<command>svn list</command>" 1.387 1.388 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.389 #: ../en/appA-svn.xml:457 1.390 msgid "<command>hg manifest</command>" 1.391 -msgstr "" 1.392 +msgstr "<command>hg manifest</command>" 1.393 1.394 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.395 #: ../en/appA-svn.xml:461 1.396 msgid "<command>svn log</command>" 1.397 -msgstr "" 1.398 +msgstr "<command>svn log</command>" 1.399 1.400 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.401 #: ../en/appA-svn.xml:462 1.402 msgid "<command>hg log</command>" 1.403 -msgstr "" 1.404 +msgstr "<command>hg log</command>" 1.405 1.406 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.407 #: ../en/appA-svn.xml:466 1.408 @@ -815,74 +809,72 @@ 1.409 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.410 #: ../en/appA-svn.xml:467 1.411 msgid "<command>hg merge</command>" 1.412 -msgstr "" 1.413 +msgstr "<command>hg merge</command>" 1.414 1.415 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.416 #: ../en/appA-svn.xml:471 1.417 msgid "<command>svn mkdir</command>" 1.418 -msgstr "" 1.419 +msgstr "<command>svn mkdir</command>" 1.420 1.421 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.422 #: ../en/appA-svn.xml:473 1.423 -#, fuzzy 1.424 msgid "Mercurial does not track directories" 1.425 -msgstr "Mercurial 只跟踪文件,不跟踪目录" 1.426 +msgstr "Mercurial 不跟踪目录" 1.427 1.428 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.429 #: ../en/appA-svn.xml:476 1.430 msgid "<command>svn move</command> (<command>svn rename</command>)" 1.431 -msgstr "" 1.432 +msgstr "<command>svn move</command> (<command>svn rename</command>)" 1.433 1.434 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.435 #: ../en/appA-svn.xml:478 1.436 msgid "<command>hg rename</command>" 1.437 -msgstr "" 1.438 +msgstr "<command>hg rename</command>" 1.439 1.440 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.441 #: ../en/appA-svn.xml:482 1.442 msgid "<command>svn resolved</command>" 1.443 -msgstr "" 1.444 +msgstr "<command>svn resolved</command>" 1.445 1.446 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.447 #: ../en/appA-svn.xml:483 1.448 msgid "<command>hg resolve -m</command>" 1.449 -msgstr "" 1.450 +msgstr "<command>hg resolve -m</command>" 1.451 1.452 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.453 #: ../en/appA-svn.xml:487 1.454 msgid "<command>svn revert</command>" 1.455 -msgstr "" 1.456 +msgstr "<command>svn revert</command>" 1.457 1.458 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.459 #: ../en/appA-svn.xml:488 1.460 msgid "<command>hg revert</command>" 1.461 -msgstr "" 1.462 +msgstr "<command>hg revert</command>" 1.463 1.464 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.465 #: ../en/appA-svn.xml:492 1.466 msgid "<command>svn status</command>" 1.467 -msgstr "" 1.468 +msgstr "<command>svn status</command>" 1.469 1.470 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.471 #: ../en/appA-svn.xml:493 1.472 msgid "<command>hg status</command>" 1.473 -msgstr "" 1.474 +msgstr "<command>hg status</command>" 1.475 1.476 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.477 #: ../en/appA-svn.xml:497 1.478 msgid "<command>svn update</command>" 1.479 -msgstr "" 1.480 +msgstr "<command>svn update</command>" 1.481 1.482 #. type: Content of: <book><appendix><sect1><sect2><table><tgroup><tbody><row><entry> 1.483 #: ../en/appA-svn.xml:498 1.484 msgid "<command>hg pull -u</command>" 1.485 -msgstr "" 1.486 +msgstr "<command>hg pull -u</command>" 1.487 1.488 #. type: Content of: <book><appendix><sect1><title> 1.489 #: ../en/appA-svn.xml:508 1.490 -#, fuzzy 1.491 msgid "Useful tips for newcomers" 1.492 -msgstr "其它需要了解的东西" 1.493 +msgstr "新手需要了解的技巧" 1.494 1.495 #. type: Content of: <book><appendix><sect1><para> 1.496 #: ../en/appA-svn.xml:510 1.497 @@ -913,7 +905,7 @@ 1.498 #. type: Content of: <book><appendix><sect1><screen><userinput> 1.499 #: ../en/appA-svn.xml:532 1.500 msgid "hg status `hg root`" 1.501 -msgstr "" 1.502 +msgstr "hg status `hg root`" 1.503 1.504 #. type: Content of: <book><appendix><title> 1.505 #: ../en/appB-mq-ref.xml:5 1.506 @@ -1024,11 +1016,11 @@ 1.507 1.508 #. type: Content of: <book><appendix><sect1><sect2><title> 1.509 #: ../en/appB-mq-ref.xml:75 1.510 -#, fuzzy 1.511 msgid "" 1.512 "<command role=\"hg-ext-mq\">qfold</command>&emdash;move applied patches into " 1.513 "repository history" 1.514 -msgstr "<command role=\"hg-ext-mq\">qapplied</command>—显示已应用的补丁" 1.515 +msgstr "" 1.516 +"<command role=\"hg-ext-mq\">qfold</command>&emdash;将已应用的补丁提交到版本库" 1.517 1.518 #. type: Content of: <book><appendix><sect1><sect2><para> 1.519 #: ../en/appB-mq-ref.xml:78 1.520 @@ -2033,9 +2025,8 @@ 1.521 1.522 #. type: Content of: <book><preface><sect1><title> 1.523 #: ../en/ch00-preface.xml:8 1.524 -#, fuzzy 1.525 msgid "Technical storytelling" 1.526 -msgstr "共享的技术因素" 1.527 +msgstr "技术背景" 1.528 1.529 #. type: Content of: <book><preface><sect1><para> 1.530 #: ../en/ch00-preface.xml:10 1.531 @@ -2362,7 +2353,7 @@ 1.532 #. type: Content of: <book><preface><sect1><simplelist><member> 1.533 #: ../en/ch00-preface.xml:246 1.534 msgid "<email>bookquestions@oreilly.com</email>" 1.535 -msgstr "" 1.536 +msgstr "<email>bookquestions@oreilly.com</email>" 1.537 1.538 #. type: Content of: <book><preface><sect1><para> 1.539 #: ../en/ch00-preface.xml:249 1.540 @@ -2374,7 +2365,7 @@ 1.541 #. type: Content of: <book><preface><sect1><simplelist><member> 1.542 #: ../en/ch00-preface.xml:253 1.543 msgid "<ulink url=\"http://www.oreilly.com\"></ulink>" 1.544 -msgstr "" 1.545 +msgstr "<ulink url=\"http://www.oreilly.com\"></ulink>" 1.546 1.547 #. type: Content of: <book><chapter><title> 1.548 #: ../en/ch01-intro.xml:5 1.549 @@ -3448,13 +3439,12 @@ 1.550 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.551 #: ../en/ch02-tour-basic.xml:54 1.552 msgid "Fedora:" 1.553 -msgstr "" 1.554 +msgstr "Fedora:" 1.555 1.556 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.557 #: ../en/ch02-tour-basic.xml:56 1.558 -#, fuzzy 1.559 msgid "OpenSUSE:" 1.560 -msgstr "Fedora and OpenSUSE:" 1.561 +msgstr "OpenSUSE:" 1.562 1.563 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.564 #: ../en/ch02-tour-basic.xml:58 1.565 @@ -3482,7 +3472,6 @@ 1.566 1.567 #. type: Content of: <book><chapter><sect1><para> 1.568 #: ../en/ch02-tour-basic.xml:77 1.569 -#, fuzzy 1.570 msgid "" 1.571 "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command " 1.572 "to find out whether Mercurial is installed properly. The actual version " 1.573 @@ -3490,8 +3479,8 @@ 1.574 "command runs and prints anything at all." 1.575 msgstr "" 1.576 "首先,我们使用 <command role=\"hg-cmd\">hg version</command> 命令检查 " 1.577 -"Mercurial 是否正确安装。它打印出来的实际版本信息并不重要;我们只关心它是否能打" 1.578 -"印出我们需要的信息。" 1.579 +"Mercurial 是否已经正确安装。它打印出来的实际版本信息并不重要;我们只关心它是否" 1.580 +"能够运行,打印出信息。" 1.581 1.582 #. type: Content of: <book><chapter><sect1><sect2><title> 1.583 #: ../en/ch02-tour-basic.xml:86 1.584 @@ -4227,12 +4216,12 @@ 1.585 #. type: Content of: <book><chapter><sect1><sect2><sect3><tip><screen><prompt> 1.586 #: ../en/ch02-tour-basic.xml:612 1.587 msgid "C:\\>" 1.588 -msgstr "" 1.589 +msgstr "C:\\>" 1.590 1.591 #. type: Content of: <book><chapter><sect1><sect2><sect3><tip><screen><userinput> 1.592 #: ../en/ch02-tour-basic.xml:612 1.593 msgid "echo %UserProfile%" 1.594 -msgstr "" 1.595 +msgstr "echo %UserProfile%" 1.596 1.597 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.598 #: ../en/ch02-tour-basic.xml:619 1.599 @@ -4463,9 +4452,8 @@ 1.600 1.601 #. type: Content of: <book><chapter><sect1><sect2><tip><title> 1.602 #: ../en/ch02-tour-basic.xml:810 1.603 -#, fuzzy 1.604 msgid "Pulling specific changes" 1.605 -msgstr "合并有冲突的改变" 1.606 +msgstr "提取指定的修改" 1.607 1.608 #. type: Content of: <book><chapter><sect1><sect2><tip><para> 1.609 #: ../en/ch02-tour-basic.xml:812 1.610 @@ -4678,9 +4666,8 @@ 1.611 1.612 #. type: Content of: <book><chapter><sect1><title> 1.613 #: ../en/ch02-tour-basic.xml:993 1.614 -#, fuzzy 1.615 msgid "Starting a new project" 1.616 -msgstr "创建新补丁" 1.617 +msgstr "开始新项目" 1.618 1.619 #. type: Content of: <book><chapter><sect1><para> 1.620 #: ../en/ch02-tour-basic.xml:995 1.621 @@ -4907,11 +4894,11 @@ 1.622 1.623 #. type: Content of: <book><chapter><sect1><sect2><para> 1.624 #: ../en/ch03-tour-merge.xml:134 1.625 -#, fuzzy 1.626 msgid "" 1.627 "To start a merge between the two heads, we use the <command role=\"hg-cmd" 1.628 "\">hg merge</command> command." 1.629 -msgstr "命令 <command role=\"hg-cmd\">hg serve</command> 的选项" 1.630 +msgstr "" 1.631 +"我们使用 <command role=\"hg-cmd\">hg merge</command> 命令来合并两个顶点。" 1.632 1.633 #. type: Content of: <book><chapter><sect1><sect2><para> 1.634 #: ../en/ch03-tour-merge.xml:139 1.635 @@ -5192,9 +5179,8 @@ 1.636 1.637 #. type: Content of: <book><chapter><sect1><sect2><note><title> 1.638 #: ../en/ch03-tour-merge.xml:357 1.639 -#, fuzzy 1.640 msgid "Where is the <command>hg resolve</command> command?" 1.641 -msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>" 1.642 +msgstr "在哪里能找到 <command role=\"hg-cmd\">hg resolve</command> 命令?" 1.643 1.644 #. type: Content of: <book><chapter><sect1><sect2><note><para> 1.645 #: ../en/ch03-tour-merge.xml:359 1.646 @@ -5282,9 +5268,8 @@ 1.647 1.648 #. type: Content of: <book><chapter><sect1><title> 1.649 #: ../en/ch03-tour-merge.xml:429 1.650 -#, fuzzy 1.651 msgid "Renaming, copying, and merging" 1.652 -msgstr "改名文件与合并修改" 1.653 +msgstr "改名,复制与合并" 1.654 1.655 #. type: Content of: <book><chapter><sect1><para> 1.656 #: ../en/ch03-tour-merge.xml:431 1.657 @@ -7193,11 +7178,11 @@ 1.658 1.659 #. type: Content of: <book><chapter><sect1><para> 1.660 #: ../en/ch05-daily.xml:687 1.661 -#, fuzzy 1.662 msgid "" 1.663 "Consider the case where we use <command role=\"hg-cmd\">hg rename</command> " 1.664 "to rename a file." 1.665 -msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>" 1.666 +msgstr "" 1.667 +"设想我们使用 <command role=\"hg-cmd\">hg rename</command> 命令来改名文件。" 1.668 1.669 #. type: Content of: <book><chapter><sect1><para> 1.670 #: ../en/ch05-daily.xml:692 1.671 @@ -7340,9 +7325,8 @@ 1.672 1.673 #. type: Content of: <book><chapter><sect1><title> 1.674 #: ../en/ch05-daily.xml:801 1.675 -#, fuzzy 1.676 msgid "Backups and mirroring" 1.677 -msgstr "分支名称与合并" 1.678 +msgstr "备份与镜像" 1.679 1.680 #. type: Content of: <book><chapter><sect1><para> 1.681 #: ../en/ch05-daily.xml:803 1.682 @@ -10916,9 +10900,8 @@ 1.683 1.684 #. type: Content of: <book><chapter><sect1><tip><title> 1.685 #: ../en/ch09-undo.xml:197 1.686 -#, fuzzy 1.687 msgid "Be careful with <filename>.orig</filename> files" 1.688 -msgstr "分类补丁<filename role=\"special\">系列</filename>" 1.689 +msgstr "小心 <filename>.orig</filename> 文件" 1.690 1.691 #. type: Content of: <book><chapter><sect1><tip><para> 1.692 #: ../en/ch09-undo.xml:199 1.693 @@ -11476,9 +11459,8 @@ 1.694 1.695 #. type: Content of: <book><chapter><sect1><sect2><title> 1.696 #: ../en/ch09-undo.xml:635 1.697 -#, fuzzy 1.698 msgid "Backing out a merge" 1.699 -msgstr "恢复一个修改集" 1.700 +msgstr "撤销一个合并" 1.701 1.702 #. type: Content of: <book><chapter><sect1><sect2><para> 1.703 #: ../en/ch09-undo.xml:637 1.704 @@ -11536,14 +11518,14 @@ 1.705 1.706 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><title> 1.707 #: ../en/ch09-undo.xml:679 1.708 -#, fuzzy 1.709 msgid "Backing out the merge, favoring one parent" 1.710 -msgstr "恢复顶点修改集" 1.711 +msgstr "拆除合并,关注一个父亲" 1.712 1.713 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><mediaobject> 1.714 #: ../en/ch09-undo.xml:681 1.715 msgid "<imageobject><imagedata fileref=\"figs/bad-merge-2.png\"/></imageobject>" 1.716 msgstr "" 1.717 +"<imageobject><imagedata fileref=\"figs/bad-merge-2.png\"/></imageobject>" 1.718 1.719 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.720 #: ../en/ch09-undo.xml:688 1.721 @@ -11558,12 +11540,13 @@ 1.722 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><title> 1.723 #: ../en/ch09-undo.xml:696 1.724 msgid "Backing out the merge, favoring the other parent" 1.725 -msgstr "" 1.726 +msgstr "拆除合并,关注其它父亲" 1.727 1.728 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><mediaobject> 1.729 #: ../en/ch09-undo.xml:699 1.730 msgid "<imageobject><imagedata fileref=\"figs/bad-merge-3.png\"/></imageobject>" 1.731 msgstr "" 1.732 +"<imageobject><imagedata fileref=\"figs/bad-merge-3.png\"/></imageobject>" 1.733 1.734 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.735 #: ../en/ch09-undo.xml:706 1.736 @@ -11575,14 +11558,14 @@ 1.737 1.738 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><title> 1.739 #: ../en/ch09-undo.xml:711 ../en/ch09-undo.xml:724 1.740 -#, fuzzy 1.741 msgid "Merging the backouts" 1.742 -msgstr "合并两个顶点" 1.743 +msgstr "合并拆除" 1.744 1.745 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><figure><mediaobject> 1.746 #: ../en/ch09-undo.xml:713 1.747 msgid "<imageobject><imagedata fileref=\"figs/bad-merge-4.png\"/></imageobject>" 1.748 msgstr "" 1.749 +"<imageobject><imagedata fileref=\"figs/bad-merge-4.png\"/></imageobject>" 1.750 1.751 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.752 #: ../en/ch09-undo.xml:720 1.753 @@ -11879,19 +11862,20 @@ 1.754 1.755 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para> 1.756 #: ../en/ch09-undo.xml:948 1.757 -#, fuzzy 1.758 msgid "" 1.759 "If the test succeeded, you tell <command role=\"hg-cmd\">hg bisect</command> " 1.760 "by running the <command role=\"hg-cmd\">hg bisect --good</command> command." 1.761 -msgstr "使用 <command role=\"hg-cmd\">hg backout</command> 自动恢复非顶点的修改" 1.762 +msgstr "" 1.763 +"当测试成功后,使用 <command role=\"hg-cmd\">hg bisect --good</command> 命令告" 1.764 +"诉 <command role=\"hg-cmd\">hg bisect</command> 命令。" 1.765 1.766 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><itemizedlist><listitem><para> 1.767 #: ../en/ch09-undo.xml:953 1.768 -#, fuzzy 1.769 msgid "" 1.770 "If it failed, run the <command role=\"hg-cmd\">hg bisect --bad</command> " 1.771 "command." 1.772 -msgstr "使用命令 <command role=\"hg-cmd\">hg bisect</command>" 1.773 +msgstr "" 1.774 +"如果失败,执行 <command role=\"hg-cmd\">hg bisect --bad</command> 命令。" 1.775 1.776 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.777 #: ../en/ch09-undo.xml:957 1.778 @@ -14428,7 +14412,6 @@ 1.779 1.780 #. type: Content of: <book><chapter><title> 1.781 #: ../en/ch11-template.xml:5 1.782 -#, fuzzy 1.783 msgid "Customizing the output of Mercurial" 1.784 msgstr "定制 Mercurial 的输出" 1.785 1.786 @@ -16285,9 +16268,8 @@ 1.787 1.788 #. type: Content of: <book><chapter><sect1><title> 1.789 #: ../en/ch12-mq.xml:749 1.790 -#, fuzzy 1.791 msgid "More on patch management" 1.792 -msgstr "源代码管理" 1.793 +msgstr "补丁管理进阶" 1.794 1.795 #. type: Content of: <book><chapter><sect1><para> 1.796 #: ../en/ch12-mq.xml:751 1.797 @@ -16298,9 +16280,8 @@ 1.798 1.799 #. type: Content of: <book><chapter><sect1><sect2><title> 1.800 #: ../en/ch12-mq.xml:755 1.801 -#, fuzzy 1.802 msgid "Deleting unwanted patches" 1.803 -msgstr "创建新补丁" 1.804 +msgstr "删除不需要的补丁" 1.805 1.806 #. type: Content of: <book><chapter><sect1><sect2><para> 1.807 #: ../en/ch12-mq.xml:757 1.808 @@ -17735,7 +17716,7 @@ 1.809 msgstr "" 1.810 1.811 # 1.812 -#. &example.hg-interdiff; 1.813 +#. &example.hg-interdiff; 1.814 #. type: Content of: <book><chapter><sect1><sect2><para> 1.815 #: ../en/ch13-mq-collab.xml:473 1.816 msgid "" 1.817 @@ -18494,28 +18475,3 @@ 1.818 "the number of lines affected, and a histogram showing how much each file is " 1.819 "modified. This gives readers a qualitative glance at how complex a patch is." 1.820 msgstr "" 1.821 - 1.822 -#~ msgid "The problem illustrated" 1.823 -#~ msgstr "问题的演示" 1.824 - 1.825 -#~ msgid "" 1.826 -#~ "Care with <literal>pretxn</literal> hooks in a shared-access repository" 1.827 -#~ msgstr "在共享版本库中注意 <literal>pretxn</literal> 钩子" 1.828 - 1.829 -#~ msgid "A slightly special case: reverting a rename" 1.830 -#~ msgstr "一个稍微特别的案例:撤销改名" 1.831 - 1.832 -#~ msgid "Colophon&emdash;this book is Free" 1.833 -#~ msgstr "后记—本书是自由的!" 1.834 - 1.835 -#~ msgid "This book is a work in progress" 1.836 -#~ msgstr "本书正在编写中" 1.837 - 1.838 -#~ msgid "" 1.839 -#~ "<command role=\"hg-ext-mq\">qsave</command>&emdash;save current queue state" 1.840 -#~ msgstr "<command role=\"hg-ext-mq\">qsave</command>—保存当前的队列状态" 1.841 - 1.842 -#~ msgid "" 1.843 -#~ "<command role=\"hg-ext-mq\">qrestore</command>&emdash;restore saved queue " 1.844 -#~ "state" 1.845 -#~ msgstr "<command role=\"hg-ext-mq\">qrestore</command>—恢复保存的队列"