hgbook
diff po/zh.po @ 648:e0ac2341a861
Fix building error introduced by bos at rev 8366882f67f2
| author | Dongsheng Song <dongsheng.song@gmail.com> |
|---|---|
| date | Wed Mar 18 21:50:57 2009 +0800 (2009-03-18) |
| parents | 3b864df20e3b |
| children | 7e7c47481e4f |
line diff
1.1 --- a/po/zh.po Wed Mar 18 18:13:05 2009 +0800 1.2 +++ b/po/zh.po Wed Mar 18 21:50:57 2009 +0800 1.3 @@ -41,8 +41,8 @@ 1.4 msgid "" 1.5 msgstr "" 1.6 "Project-Id-Version: hgbook 1.2\n" 1.7 -"POT-Creation-Date: 2009-03-17 10:44+0800\n" 1.8 -"PO-Revision-Date: 2009-03-18 18:12+0800\n" 1.9 +"POT-Creation-Date: 2009-03-18 19:48+0800\n" 1.10 +"PO-Revision-Date: 2009-03-18 19:50+0800\n" 1.11 "Last-Translator: \n" 1.12 "Language-Team: Simplified Chinese <i18n-zh@googlegroups.com >\n" 1.13 "MIME-Version: 1.0\n" 1.14 @@ -2498,48 +2498,51 @@ 1.15 msgstr "Debian:" 1.16 1.17 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.18 -#: ../en/ch02-tour-basic.xml:35 1.19 +#: ../en/ch02-tour-basic.xml:34 1.20 msgid "Fedora Core:" 1.21 msgstr "Fedora Core:" 1.22 1.23 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.24 -#: ../en/ch02-tour-basic.xml:38 1.25 +#: ../en/ch02-tour-basic.xml:36 1.26 msgid "Gentoo:" 1.27 msgstr "Gentoo:" 1.28 1.29 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.30 -#: ../en/ch02-tour-basic.xml:40 1.31 +#: ../en/ch02-tour-basic.xml:38 1.32 msgid "OpenSUSE:" 1.33 msgstr "OpenSUSE:" 1.34 1.35 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.36 -#: ../en/ch02-tour-basic.xml:43 1.37 +#: ../en/ch02-tour-basic.xml:40 1.38 msgid "" 1.39 "Ubuntu: Ubuntu's Mercurial package is based on Debian's. To install it, run " 1.40 "the following command." 1.41 -msgstr "" 1.42 - 1.43 -#. type: Content of: <book><chapter><sect1><sect2><title> 1.44 -#: ../en/ch02-tour-basic.xml:52 1.45 +msgstr "Ubuntu: Ubuntu 的 Mercurial 包基于 Debian。安装时，使用如下命令：" 1.46 + 1.47 +#. type: Content of: <book><chapter><sect1><sect2><title> 1.48 +#: ../en/ch02-tour-basic.xml:48 1.49 msgid "Solaris" 1.50 -msgstr "" 1.51 - 1.52 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.53 -#: ../en/ch02-tour-basic.xml:54 1.54 +msgstr "Solaris" 1.55 + 1.56 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.57 +#: ../en/ch02-tour-basic.xml:50 1.58 msgid "" 1.59 "SunFreeWare, at <ulink url=\"http://www.sunfreeware.com\">http://www." 1.60 "sunfreeware.com</ulink>, is a good source for a large number of pre-built " 1.61 "Solaris packages for 32 and 64 bit Intel and Sparc architectures, including " 1.62 "current versions of Mercurial." 1.63 msgstr "" 1.64 - 1.65 -#. type: Content of: <book><chapter><sect1><sect2><title> 1.66 -#: ../en/ch02-tour-basic.xml:62 1.67 +"位于 <ulink url=\"http://www.sunfreeware.com\">http://www.sunfreeware.com</" 1.68 +"ulink> 的 SunFreeWare 是很好的二进制安装源，它包含 Intel 和 Sparc 架构的 32 位" 1.69 +"和 64 位包，包含 Mercurial 的当前版本。" 1.70 + 1.71 +#. type: Content of: <book><chapter><sect1><sect2><title> 1.72 +#: ../en/ch02-tour-basic.xml:58 1.73 msgid "Mac OS X" 1.74 -msgstr "" 1.75 - 1.76 -#. type: Content of: <book><chapter><sect1><sect2><para> 1.77 -#: ../en/ch02-tour-basic.xml:64 1.78 +msgstr "Mac OS X" 1.79 + 1.80 +#. type: Content of: <book><chapter><sect1><sect2><para> 1.81 +#: ../en/ch02-tour-basic.xml:60 1.82 msgid "" 1.83 "Lee Cantey publishes an installer of Mercurial for Mac OS X at <ulink url=" 1.84 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. " 1.85 @@ -2550,7 +2553,7 @@ 1.86 msgstr "" 1.87 1.88 #. type: Content of: <book><chapter><sect1><sect2><para> 1.89 -#: ../en/ch02-tour-basic.xml:73 1.90 +#: ../en/ch02-tour-basic.xml:69 1.91 msgid "" 1.92 "It's also possible to install Mercurial using Fink or MacPorts, two popular " 1.93 "free package managers for Mac OS X. If you have Fink, use <command>sudo apt-" 1.94 @@ -2559,12 +2562,12 @@ 1.95 msgstr "" 1.96 1.97 #. type: Content of: <book><chapter><sect1><sect2><title> 1.98 -#: ../en/ch02-tour-basic.xml:81 1.99 +#: ../en/ch02-tour-basic.xml:77 1.100 msgid "Windows" 1.101 msgstr "" 1.102 1.103 #. type: Content of: <book><chapter><sect1><sect2><para> 1.104 -#: ../en/ch02-tour-basic.xml:83 1.105 +#: ../en/ch02-tour-basic.xml:79 1.106 msgid "" 1.107 "Lee Cantey publishes an installer of Mercurial for Windows at <ulink url=" 1.108 "\"http://mercurial.berkwood.com\">http://mercurial.berkwood.com</ulink>. " 1.109 @@ -2572,7 +2575,7 @@ 1.110 msgstr "" 1.111 1.112 #. type: Content of: <book><chapter><sect1><sect2><note><para> 1.113 -#: ../en/ch02-tour-basic.xml:90 1.114 +#: ../en/ch02-tour-basic.xml:86 1.115 msgid "" 1.116 "The Windows version of Mercurial does not automatically convert line endings " 1.117 "between Windows and Unix styles. If you want to share work with Unix users, " 1.118 @@ -2580,12 +2583,12 @@ 1.119 msgstr "" 1.120 1.121 #. type: Content of: <book><chapter><sect1><title> 1.122 -#: ../en/ch02-tour-basic.xml:100 1.123 +#: ../en/ch02-tour-basic.xml:96 1.124 msgid "Getting started" 1.125 msgstr "开始" 1.126 1.127 #. type: Content of: <book><chapter><sect1><para> 1.128 -#: ../en/ch02-tour-basic.xml:102 1.129 +#: ../en/ch02-tour-basic.xml:98 1.130 msgid "" 1.131 "To begin, we'll use the <command role=\"hg-cmd\">hg version</command> command " 1.132 "to find out whether Mercurial is actually installed properly. The actual " 1.133 @@ -2594,12 +2597,12 @@ 1.134 msgstr "" 1.135 1.136 #. type: Content of: <book><chapter><sect1><sect2><title> 1.137 -#: ../en/ch02-tour-basic.xml:111 1.138 +#: ../en/ch02-tour-basic.xml:107 1.139 msgid "Built-in help" 1.140 msgstr "内置帮助" 1.141 1.142 #. type: Content of: <book><chapter><sect1><sect2><para> 1.143 -#: ../en/ch02-tour-basic.xml:113 1.144 +#: ../en/ch02-tour-basic.xml:109 1.145 msgid "" 1.146 "Mercurial provides a built-in help system. This is invaluable for those " 1.147 "times when you find yourself stuck trying to remember how to run a command. " 1.148 @@ -2610,7 +2613,7 @@ 1.149 msgstr "" 1.150 1.151 #. type: Content of: <book><chapter><sect1><sect2><para> 1.152 -#: ../en/ch02-tour-basic.xml:124 1.153 +#: ../en/ch02-tour-basic.xml:120 1.154 msgid "" 1.155 "For a more impressive level of detail (which you won't usually need) run " 1.156 "<command role=\"hg-cmd\">hg help <option role=\"hg-opt-global\">-v</option></" 1.157 @@ -2620,12 +2623,12 @@ 1.158 msgstr "" 1.159 1.160 #. type: Content of: <book><chapter><sect1><title> 1.161 -#: ../en/ch02-tour-basic.xml:135 1.162 +#: ../en/ch02-tour-basic.xml:131 1.163 msgid "Working with a repository" 1.164 msgstr "使用版本库" 1.165 1.166 #. type: Content of: <book><chapter><sect1><para> 1.167 -#: ../en/ch02-tour-basic.xml:137 1.168 +#: ../en/ch02-tour-basic.xml:133 1.169 msgid "" 1.170 "In Mercurial, everything happens inside a <emphasis>repository</emphasis>. " 1.171 "The repository for a project contains all of the files that <quote>belong to</" 1.172 @@ -2633,7 +2636,7 @@ 1.173 msgstr "" 1.174 1.175 #. type: Content of: <book><chapter><sect1><para> 1.176 -#: ../en/ch02-tour-basic.xml:143 1.177 +#: ../en/ch02-tour-basic.xml:139 1.178 msgid "" 1.179 "There's nothing particularly magical about a repository; it is simply a " 1.180 "directory tree in your filesystem that Mercurial treats as special. You can " 1.181 @@ -2642,12 +2645,12 @@ 1.182 msgstr "" 1.183 1.184 #. type: Content of: <book><chapter><sect1><sect2><title> 1.185 -#: ../en/ch02-tour-basic.xml:150 1.186 +#: ../en/ch02-tour-basic.xml:146 1.187 msgid "Making a local copy of a repository" 1.188 msgstr "创建版本库的工作副本" 1.189 1.190 #. type: Content of: <book><chapter><sect1><sect2><para> 1.191 -#: ../en/ch02-tour-basic.xml:152 1.192 +#: ../en/ch02-tour-basic.xml:148 1.193 msgid "" 1.194 "<emphasis>Copying</emphasis> a repository is just a little bit special. " 1.195 "While you could use a normal file copying command to make a copy of a " 1.196 @@ -2657,21 +2660,21 @@ 1.197 msgstr "" 1.198 1.199 #. type: Content of: <book><chapter><sect1><sect2><para> 1.200 -#: ../en/ch02-tour-basic.xml:161 1.201 +#: ../en/ch02-tour-basic.xml:157 1.202 msgid "" 1.203 "If our clone succeeded, we should now have a local directory called <filename " 1.204 "class=\"directory\">hello</filename>. This directory will contain some files." 1.205 msgstr "" 1.206 1.207 #. type: Content of: <book><chapter><sect1><sect2><para> 1.208 -#: ../en/ch02-tour-basic.xml:167 1.209 +#: ../en/ch02-tour-basic.xml:163 1.210 msgid "" 1.211 "These files have the same contents and history in our repository as they do " 1.212 "in the repository we cloned." 1.213 msgstr "" 1.214 1.215 #. type: Content of: <book><chapter><sect1><sect2><para> 1.216 -#: ../en/ch02-tour-basic.xml:170 1.217 +#: ../en/ch02-tour-basic.xml:166 1.218 msgid "" 1.219 "Every Mercurial repository is complete, self-contained, and independent. It " 1.220 "contains its own private copy of a project's files and history. A cloned " 1.221 @@ -2681,7 +2684,7 @@ 1.222 msgstr "" 1.223 1.224 #. type: Content of: <book><chapter><sect1><sect2><para> 1.225 -#: ../en/ch02-tour-basic.xml:177 1.226 +#: ../en/ch02-tour-basic.xml:173 1.227 msgid "" 1.228 "What this means for now is that we're free to experiment with our repository, " 1.229 "safe in the knowledge that it's a private <quote>sandbox</quote> that won't " 1.230 @@ -2689,12 +2692,12 @@ 1.231 msgstr "" 1.232 1.233 #. type: Content of: <book><chapter><sect1><sect2><title> 1.234 -#: ../en/ch02-tour-basic.xml:183 1.235 +#: ../en/ch02-tour-basic.xml:179 1.236 msgid "What's in a repository?" 1.237 msgstr "什么是版本库?" 1.238 1.239 #. type: Content of: <book><chapter><sect1><sect2><para> 1.240 -#: ../en/ch02-tour-basic.xml:185 1.241 +#: ../en/ch02-tour-basic.xml:181 1.242 msgid "" 1.243 "When we take a more detailed look inside a repository, we can see that it " 1.244 "contains a directory named <filename class=\"directory\">.hg</filename>. " 1.245 @@ -2702,7 +2705,7 @@ 1.246 msgstr "" 1.247 1.248 #. type: Content of: <book><chapter><sect1><sect2><para> 1.249 -#: ../en/ch02-tour-basic.xml:192 1.250 +#: ../en/ch02-tour-basic.xml:188 1.251 msgid "" 1.252 "The contents of the <filename class=\"directory\">.hg</filename> directory " 1.253 "and its subdirectories are private to Mercurial. Every other file and " 1.254 @@ -2710,7 +2713,7 @@ 1.255 msgstr "" 1.256 1.257 #. type: Content of: <book><chapter><sect1><sect2><para> 1.258 -#: ../en/ch02-tour-basic.xml:198 1.259 +#: ../en/ch02-tour-basic.xml:194 1.260 msgid "" 1.261 "To introduce a little terminology, the <filename class=\"directory\">.hg</" 1.262 "filename> directory is the <quote>real</quote> repository, and all of the " 1.263 @@ -2723,12 +2726,12 @@ 1.264 msgstr "" 1.265 1.266 #. type: Content of: <book><chapter><sect1><title> 1.267 -#: ../en/ch02-tour-basic.xml:213 1.268 +#: ../en/ch02-tour-basic.xml:209 1.269 msgid "A tour through history" 1.270 msgstr "回溯历史" 1.271 1.272 #. type: Content of: <book><chapter><sect1><para> 1.273 -#: ../en/ch02-tour-basic.xml:215 1.274 +#: ../en/ch02-tour-basic.xml:211 1.275 msgid "" 1.276 "One of the first things we might want to do with a new, unfamiliar repository " 1.277 "is understand its history. The <command role=\"hg-cmd\">hg log</command> " 1.278 @@ -2736,7 +2739,7 @@ 1.279 msgstr "" 1.280 1.281 #. type: Content of: <book><chapter><sect1><para> 1.282 -#: ../en/ch02-tour-basic.xml:222 1.283 +#: ../en/ch02-tour-basic.xml:218 1.284 msgid "" 1.285 "By default, this command prints a brief paragraph of output for each change " 1.286 "to the project that was recorded. In Mercurial terminology, we call each of " 1.287 @@ -2745,14 +2748,14 @@ 1.288 msgstr "" 1.289 1.290 #. type: Content of: <book><chapter><sect1><para> 1.291 -#: ../en/ch02-tour-basic.xml:228 1.292 +#: ../en/ch02-tour-basic.xml:224 1.293 msgid "" 1.294 "The fields in a record of output from <command role=\"hg-cmd\">hg log</" 1.295 "command> are as follows." 1.296 msgstr "" 1.297 1.298 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.299 -#: ../en/ch02-tour-basic.xml:231 1.300 +#: ../en/ch02-tour-basic.xml:227 1.301 msgid "" 1.302 "<literal>changeset</literal>: This field has the format of a number, followed " 1.303 "by a colon, followed by a hexadecimal string. These are " 1.304 @@ -2762,7 +2765,7 @@ 1.305 msgstr "" 1.306 1.307 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.308 -#: ../en/ch02-tour-basic.xml:237 1.309 +#: ../en/ch02-tour-basic.xml:233 1.310 msgid "" 1.311 "<literal>user</literal>: The identity of the person who created the " 1.312 "changeset. This is a free-form field, but it most often contains a person's " 1.313 @@ -2770,7 +2773,7 @@ 1.314 msgstr "" 1.315 1.316 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.317 -#: ../en/ch02-tour-basic.xml:241 1.318 +#: ../en/ch02-tour-basic.xml:237 1.319 msgid "" 1.320 "<literal>date</literal>: The date and time on which the changeset was " 1.321 "created, and the timezone in which it was created. (The date and time are " 1.322 @@ -2779,21 +2782,21 @@ 1.323 msgstr "" 1.324 1.325 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.326 -#: ../en/ch02-tour-basic.xml:246 1.327 +#: ../en/ch02-tour-basic.xml:242 1.328 msgid "" 1.329 "<literal>summary</literal>: The first line of the text message that the " 1.330 "creator of the changeset entered to describe the changeset." 1.331 msgstr "" 1.332 1.333 #. type: Content of: <book><chapter><sect1><para> 1.334 -#: ../en/ch02-tour-basic.xml:249 1.335 +#: ../en/ch02-tour-basic.xml:245 1.336 msgid "" 1.337 "The default output printed by <command role=\"hg-cmd\">hg log</command> is " 1.338 "purely a summary; it is missing a lot of detail." 1.339 msgstr "" 1.340 1.341 #. type: Content of: <book><chapter><sect1><para> 1.342 -#: ../en/ch02-tour-basic.xml:253 1.343 +#: ../en/ch02-tour-basic.xml:249 1.344 msgid "" 1.345 "Figure <xref endterm=\"fig.tour-basic.history.caption\" linkend=\"fig.tour-" 1.346 "basic.history\"/> provides a graphical representation of the history of the " 1.347 @@ -2804,13 +2807,13 @@ 1.348 msgstr "" 1.349 1.350 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject> 1.351 -#: ../en/ch02-tour-basic.xml:264 1.352 +#: ../en/ch02-tour-basic.xml:260 1.353 msgid "" 1.354 "<imageobject><imagedata fileref=\"images/tour-history.png\"/></imageobject>" 1.355 msgstr "" 1.356 1.357 #. type: Content of: <book><chapter><sect1><sect2><informalfigure><mediaobject><textobject><phrase> 1.358 -#: ../en/ch02-tour-basic.xml:265 ../en/ch03-tour-merge.xml:48 1.359 +#: ../en/ch02-tour-basic.xml:261 ../en/ch03-tour-merge.xml:48 1.360 #: ../en/ch03-tour-merge.xml:78 ../en/ch03-tour-merge.xml:126 1.361 #: ../en/ch03-tour-merge.xml:182 ../en/ch03-tour-merge.xml:254 1.362 #: ../en/ch04-concepts.xml:56 ../en/ch04-concepts.xml:108 1.363 @@ -2824,19 +2827,19 @@ 1.364 msgstr "" 1.365 1.366 #. type: Content of: <book><chapter><sect1><informalfigure><mediaobject><caption><para> 1.367 -#: ../en/ch02-tour-basic.xml:266 1.368 +#: ../en/ch02-tour-basic.xml:262 1.369 msgid "" 1.370 "Graphical history of the <filename class=\"directory\">hello</filename> " 1.371 "repository" 1.372 msgstr "" 1.373 1.374 #. type: Content of: <book><chapter><sect1><sect2><title> 1.375 -#: ../en/ch02-tour-basic.xml:273 1.376 +#: ../en/ch02-tour-basic.xml:269 1.377 msgid "Changesets, revisions, and talking to other people" 1.378 msgstr "改变集，版本，与其它用户交互" 1.379 1.380 #. type: Content of: <book><chapter><sect1><sect2><para> 1.381 -#: ../en/ch02-tour-basic.xml:276 1.382 +#: ../en/ch02-tour-basic.xml:272 1.383 msgid "" 1.384 "As English is a notoriously sloppy language, and computer science has a " 1.385 "hallowed history of terminological confusion (why use one term when four will " 1.386 @@ -2848,7 +2851,7 @@ 1.387 msgstr "" 1.388 1.389 #. type: Content of: <book><chapter><sect1><sect2><para> 1.390 -#: ../en/ch02-tour-basic.xml:286 1.391 +#: ../en/ch02-tour-basic.xml:282 1.392 msgid "" 1.393 "While it doesn't matter what <emphasis>word</emphasis> you use to refer to " 1.394 "the concept of <quote>a changeset</quote>, the <emphasis>identifier</" 1.395 @@ -2859,13 +2862,13 @@ 1.396 msgstr "" 1.397 1.398 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.399 -#: ../en/ch02-tour-basic.xml:295 1.400 +#: ../en/ch02-tour-basic.xml:291 1.401 msgid "" 1.402 "The revision number is <emphasis>only valid in that repository</emphasis>," 1.403 msgstr "" 1.404 1.405 #. type: Content of: <book><chapter><sect1><sect2><itemizedlist><listitem><para> 1.406 -#: ../en/ch02-tour-basic.xml:297 1.407 +#: ../en/ch02-tour-basic.xml:293 1.408 msgid "" 1.409 "while the hex string is the <emphasis>permanent, unchanging identifier</" 1.410 "emphasis> that will always identify that exact changeset in <emphasis>every</" 1.411 @@ -2873,7 +2876,7 @@ 1.412 msgstr "" 1.413 1.414 #. type: Content of: <book><chapter><sect1><sect2><para> 1.415 -#: ../en/ch02-tour-basic.xml:302 1.416 +#: ../en/ch02-tour-basic.xml:298 1.417 msgid "" 1.418 "This distinction is important. If you send someone an email talking about " 1.419 "<quote>revision 33</quote>, there's a high likelihood that their revision 33 " 1.420 @@ -2885,7 +2888,7 @@ 1.421 msgstr "" 1.422 1.423 #. type: Content of: <book><chapter><sect1><sect2><para> 1.424 -#: ../en/ch02-tour-basic.xml:312 1.425 +#: ../en/ch02-tour-basic.xml:308 1.426 msgid "" 1.427 "Mercurial uses revision numbers purely as a convenient shorthand. If you " 1.428 "need to discuss a changeset with someone, or make a record of a changeset for " 1.429 @@ -2894,12 +2897,12 @@ 1.430 msgstr "" 1.431 1.432 #. type: Content of: <book><chapter><sect1><sect2><title> 1.433 -#: ../en/ch02-tour-basic.xml:320 1.434 +#: ../en/ch02-tour-basic.xml:316 1.435 msgid "Viewing specific revisions" 1.436 msgstr "察看指定版本" 1.437 1.438 #. type: Content of: <book><chapter><sect1><sect2><para> 1.439 -#: ../en/ch02-tour-basic.xml:322 1.440 +#: ../en/ch02-tour-basic.xml:318 1.441 msgid "" 1.442 "To narrow the output of <command role=\"hg-cmd\">hg log</command> down to a " 1.443 "single revision, use the <option role=\"hg-opt-log\">-r</option> (or <option " 1.444 @@ -2909,7 +2912,7 @@ 1.445 msgstr "" 1.446 1.447 #. type: Content of: <book><chapter><sect1><sect2><para> 1.448 -#: ../en/ch02-tour-basic.xml:331 1.449 +#: ../en/ch02-tour-basic.xml:327 1.450 msgid "" 1.451 "If you want to see the history of several revisions without having to list " 1.452 "each one, you can use <emphasis>range notation</emphasis>; this lets you " 1.453 @@ -2918,7 +2921,7 @@ 1.454 msgstr "" 1.455 1.456 #. type: Content of: <book><chapter><sect1><sect2><para> 1.457 -#: ../en/ch02-tour-basic.xml:339 1.458 +#: ../en/ch02-tour-basic.xml:335 1.459 msgid "" 1.460 "Mercurial also honours the order in which you specify revisions, so <command " 1.461 "role=\"hg-cmd\">hg log -r 2:4</command> prints 2, 3, and 4. while <command " 1.462 @@ -2926,12 +2929,12 @@ 1.463 msgstr "" 1.464 1.465 #. type: Content of: <book><chapter><sect1><sect2><title> 1.466 -#: ../en/ch02-tour-basic.xml:346 1.467 +#: ../en/ch02-tour-basic.xml:342 1.468 msgid "More detailed information" 1.469 msgstr "更详细的信息" 1.470 1.471 #. type: Content of: <book><chapter><sect1><sect2><para> 1.472 -#: ../en/ch02-tour-basic.xml:348 1.473 +#: ../en/ch02-tour-basic.xml:344 1.474 msgid "" 1.475 "While the summary information printed by <command role=\"hg-cmd\">hg log</" 1.476 "command> is useful if you already know what you're looking for, you may need " 1.477 @@ -2943,7 +2946,7 @@ 1.478 msgstr "" 1.479 1.480 #. type: Content of: <book><chapter><sect1><sect2><para> 1.481 -#: ../en/ch02-tour-basic.xml:360 1.482 +#: ../en/ch02-tour-basic.xml:356 1.483 msgid "" 1.484 "If you want to see both the description and content of a change, add the " 1.485 "<option role=\"hg-opt-log\">-p</option> (or <option role=\"hg-opt-log\">--" 1.486 @@ -2953,12 +2956,12 @@ 1.487 msgstr "" 1.488 1.489 #. type: Content of: <book><chapter><sect1><title> 1.490 -#: ../en/ch02-tour-basic.xml:373 1.491 +#: ../en/ch02-tour-basic.xml:369 1.492 msgid "All about command options" 1.493 msgstr "命令选项" 1.494 1.495 #. type: Content of: <book><chapter><sect1><para> 1.496 -#: ../en/ch02-tour-basic.xml:375 1.497 +#: ../en/ch02-tour-basic.xml:371 1.498 msgid "" 1.499 "Let's take a brief break from exploring Mercurial commands to discuss a " 1.500 "pattern in the way that they work; you may find this useful to keep in mind " 1.501 @@ -2966,7 +2969,7 @@ 1.502 msgstr "" 1.503 1.504 #. type: Content of: <book><chapter><sect1><para> 1.505 -#: ../en/ch02-tour-basic.xml:379 1.506 +#: ../en/ch02-tour-basic.xml:375 1.507 msgid "" 1.508 "Mercurial has a consistent and straightforward approach to dealing with the " 1.509 "options that you can pass to commands. It follows the conventions for " 1.510 @@ -2974,7 +2977,7 @@ 1.511 msgstr "" 1.512 1.513 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.514 -#: ../en/ch02-tour-basic.xml:384 1.515 +#: ../en/ch02-tour-basic.xml:380 1.516 msgid "" 1.517 "Every option has a long name. For example, as we've already seen, the " 1.518 "<command role=\"hg-cmd\">hg log</command> command accepts a <option role=\"hg-" 1.519 @@ -2982,7 +2985,7 @@ 1.520 msgstr "" 1.521 1.522 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.523 -#: ../en/ch02-tour-basic.xml:388 1.524 +#: ../en/ch02-tour-basic.xml:384 1.525 msgid "" 1.526 "Most options have short names, too. Instead of <option role=\"hg-opt-log\">--" 1.527 "rev</option>, we can use <option role=\"hg-opt-log\">-r</option>. (The " 1.528 @@ -2991,7 +2994,7 @@ 1.529 msgstr "" 1.530 1.531 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.532 -#: ../en/ch02-tour-basic.xml:393 1.533 +#: ../en/ch02-tour-basic.xml:389 1.534 msgid "" 1.535 "Long options start with two dashes (e.g. <option role=\"hg-opt-log\">--rev</" 1.536 "option>), while short options start with one (e.g. <option role=\"hg-opt-log" 1.537 @@ -2999,7 +3002,7 @@ 1.538 msgstr "" 1.539 1.540 #. type: Content of: <book><chapter><sect1><itemizedlist><listitem><para> 1.541 -#: ../en/ch02-tour-basic.xml:397 1.542 +#: ../en/ch02-tour-basic.xml:393 1.543 msgid "" 1.544 "Option naming and usage is consistent across commands. For example, every " 1.545 "command that lets you specify a changeset ID or revision number accepts both " 1.546 @@ -3008,7 +3011,7 @@ 1.547 msgstr "" 1.548 1.549 #. type: Content of: <book><chapter><sect1><para> 1.550 -#: ../en/ch02-tour-basic.xml:403 1.551 +#: ../en/ch02-tour-basic.xml:399 1.552 msgid "" 1.553 "In the examples throughout this book, I use short options instead of long. " 1.554 "This just reflects my own preference, so don't read anything significant into " 1.555 @@ -3016,7 +3019,7 @@ 1.556 msgstr "" 1.557 1.558 #. type: Content of: <book><chapter><sect1><para> 1.559 -#: ../en/ch02-tour-basic.xml:407 1.560 +#: ../en/ch02-tour-basic.xml:403 1.561 msgid "" 1.562 "Most commands that print output of some kind will print more output when " 1.563 "passed a <option role=\"hg-opt-global\">-v</option> (or <option role=\"hg-opt-" 1.564 @@ -3025,19 +3028,19 @@ 1.565 msgstr "" 1.566 1.567 #. type: Content of: <book><chapter><sect1><title> 1.568 -#: ../en/ch02-tour-basic.xml:415 1.569 +#: ../en/ch02-tour-basic.xml:411 1.570 msgid "Making and reviewing changes" 1.571 msgstr "创建和复审修改" 1.572 1.573 #. type: Content of: <book><chapter><sect1><para> 1.574 -#: ../en/ch02-tour-basic.xml:417 1.575 +#: ../en/ch02-tour-basic.xml:413 1.576 msgid "" 1.577 "Now that we have a grasp of viewing history in Mercurial, let's take a look " 1.578 "at making some changes and examining them." 1.579 msgstr "" 1.580 1.581 #. type: Content of: <book><chapter><sect1><para> 1.582 -#: ../en/ch02-tour-basic.xml:421 1.583 +#: ../en/ch02-tour-basic.xml:417 1.584 msgid "" 1.585 "The first thing we'll do is isolate our experiment in a repository of its " 1.586 "own. We use the <command role=\"hg-cmd\">hg clone</command> command, but we " 1.587 @@ -3048,7 +3051,7 @@ 1.588 msgstr "" 1.589 1.590 #. type: Content of: <book><chapter><sect1><para> 1.591 -#: ../en/ch02-tour-basic.xml:431 1.592 +#: ../en/ch02-tour-basic.xml:427 1.593 msgid "" 1.594 "As an aside, it's often good practice to keep a <quote>pristine</quote> copy " 1.595 "of a remote repository around, which you can then make temporary clones of to " 1.596 @@ -3060,7 +3063,7 @@ 1.597 msgstr "" 1.598 1.599 #. type: Content of: <book><chapter><sect1><para> 1.600 -#: ../en/ch02-tour-basic.xml:440 1.601 +#: ../en/ch02-tour-basic.xml:436 1.602 msgid "" 1.603 "In our <filename class=\"directory\">my-hello</filename> repository, we have " 1.604 "a file <filename>hello.c</filename> that contains the classic <quote>hello, " 1.605 @@ -3073,14 +3076,14 @@ 1.606 msgstr "" 1.607 1.608 #. type: Content of: <book><chapter><sect1><para> 1.609 -#: ../en/ch02-tour-basic.xml:453 1.610 +#: ../en/ch02-tour-basic.xml:449 1.611 msgid "" 1.612 "Mercurial's <command role=\"hg-cmd\">hg status</command> command will tell us " 1.613 "what Mercurial knows about the files in the repository." 1.614 msgstr "" 1.615 1.616 #. type: Content of: <book><chapter><sect1><para> 1.617 -#: ../en/ch02-tour-basic.xml:459 1.618 +#: ../en/ch02-tour-basic.xml:455 1.619 msgid "" 1.620 "The <command role=\"hg-cmd\">hg status</command> command prints no output for " 1.621 "some files, but a line starting with <quote><literal>M</literal></quote> for " 1.622 @@ -3090,7 +3093,7 @@ 1.623 msgstr "" 1.624 1.625 #. type: Content of: <book><chapter><sect1><para> 1.626 -#: ../en/ch02-tour-basic.xml:466 1.627 +#: ../en/ch02-tour-basic.xml:462 1.628 msgid "" 1.629 "The <quote><literal>M</literal></quote> indicates that Mercurial has noticed " 1.630 "that we modified <filename>hello.c</filename>. We didn't need to " 1.631 @@ -3100,7 +3103,7 @@ 1.632 msgstr "" 1.633 1.634 #. type: Content of: <book><chapter><sect1><para> 1.635 -#: ../en/ch02-tour-basic.xml:474 1.636 +#: ../en/ch02-tour-basic.xml:470 1.637 msgid "" 1.638 "It's a little bit helpful to know that we've modified <filename>hello.c</" 1.639 "filename>, but we might prefer to know exactly <emphasis>what</emphasis> " 1.640 @@ -3109,12 +3112,12 @@ 1.641 msgstr "" 1.642 1.643 #. type: Content of: <book><chapter><sect1><title> 1.644 -#: ../en/ch02-tour-basic.xml:484 1.645 +#: ../en/ch02-tour-basic.xml:480 1.646 msgid "Recording changes in a new changeset" 1.647 msgstr "在新修改集中记录修改" 1.648 1.649 #. type: Content of: <book><chapter><sect1><para> 1.650 -#: ../en/ch02-tour-basic.xml:486 1.651 +#: ../en/ch02-tour-basic.xml:482 1.652 msgid "" 1.653 "We can modify files, build and test our changes, and use <command role=\"hg-" 1.654 "cmd\">hg status</command> and <command role=\"hg-cmd\">hg diff</command> to " 1.655 @@ -3123,7 +3126,7 @@ 1.656 msgstr "" 1.657 1.658 #. type: Content of: <book><chapter><sect1><para> 1.659 -#: ../en/ch02-tour-basic.xml:493 1.660 +#: ../en/ch02-tour-basic.xml:489 1.661 msgid "" 1.662 "The <command role=\"hg-cmd\">hg commit</command> command lets us create a new " 1.663 "changeset; we'll usually refer to this as <quote>making a commit</quote> or " 1.664 @@ -3131,12 +3134,12 @@ 1.665 msgstr "" 1.666 1.667 #. type: Content of: <book><chapter><sect1><sect2><title> 1.668 -#: ../en/ch02-tour-basic.xml:499 1.669 +#: ../en/ch02-tour-basic.xml:495 1.670 msgid "Setting up a username" 1.671 msgstr "配置用户名称" 1.672 1.673 #. type: Content of: <book><chapter><sect1><sect2><para> 1.674 -#: ../en/ch02-tour-basic.xml:501 1.675 +#: ../en/ch02-tour-basic.xml:497 1.676 msgid "" 1.677 "When you try to run <command role=\"hg-cmd\">hg commit</command> for the " 1.678 "first time, it is not guaranteed to succeed. Mercurial records your name and " 1.679 @@ -3147,7 +3150,7 @@ 1.680 msgstr "" 1.681 1.682 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.683 -#: ../en/ch02-tour-basic.xml:510 1.684 +#: ../en/ch02-tour-basic.xml:506 1.685 msgid "" 1.686 "If you specify a <option role=\"hg-opt-commit\">-u</option> option to the " 1.687 "<command role=\"hg-cmd\">hg commit</command> command on the command line, " 1.688 @@ -3155,14 +3158,14 @@ 1.689 msgstr "" 1.690 1.691 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.692 -#: ../en/ch02-tour-basic.xml:515 1.693 +#: ../en/ch02-tour-basic.xml:511 1.694 msgid "" 1.695 "If you have set the <envar>HGUSER</envar> environment variable, this is " 1.696 "checked next." 1.697 msgstr "" 1.698 1.699 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.700 -#: ../en/ch02-tour-basic.xml:518 1.701 +#: ../en/ch02-tour-basic.xml:514 1.702 msgid "" 1.703 "If you create a file in your home directory called <filename role=\"special" 1.704 "\">.hgrc</filename>, with a <envar role=\"rc-item-ui\">username</envar> " 1.705 @@ -3171,14 +3174,14 @@ 1.706 msgstr "" 1.707 1.708 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.709 -#: ../en/ch02-tour-basic.xml:525 1.710 +#: ../en/ch02-tour-basic.xml:521 1.711 msgid "" 1.712 "If you have set the <envar>EMAIL</envar> environment variable, this will be " 1.713 "used next." 1.714 msgstr "" 1.715 1.716 #. type: Content of: <book><chapter><sect1><sect2><orderedlist><listitem><para> 1.717 -#: ../en/ch02-tour-basic.xml:528 1.718 +#: ../en/ch02-tour-basic.xml:524 1.719 msgid "" 1.720 "Mercurial will query your system to find out your local user name and host " 1.721 "name, and construct a username from these components. Since this often " 1.722 @@ -3187,7 +3190,7 @@ 1.723 msgstr "" 1.724 1.725 #. type: Content of: <book><chapter><sect1><sect2><para> 1.726 -#: ../en/ch02-tour-basic.xml:535 1.727 +#: ../en/ch02-tour-basic.xml:531 1.728 msgid "" 1.729 "If all of these mechanisms fail, Mercurial will fail, printing an error " 1.730 "message. In this case, it will not let you commit until you set up a " 1.731 @@ -3195,7 +3198,7 @@ 1.732 msgstr "" 1.733 1.734 #. type: Content of: <book><chapter><sect1><sect2><para> 1.735 -#: ../en/ch02-tour-basic.xml:539 1.736 +#: ../en/ch02-tour-basic.xml:535 1.737 msgid "" 1.738 "You should think of the <envar>HGUSER</envar> environment variable and the " 1.739 "<option role=\"hg-opt-commit\">-u</option> option to the <command role=\"hg-" 1.740 @@ -3206,12 +3209,12 @@ 1.741 msgstr "" 1.742 1.743 #. type: Content of: <book><chapter><sect1><sect2><sect3><title> 1.744 -#: ../en/ch02-tour-basic.xml:548 1.745 +#: ../en/ch02-tour-basic.xml:544 1.746 msgid "Creating a Mercurial configuration file" 1.747 msgstr "创建 Mercurial 的配置文件" 1.748 1.749 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.750 -#: ../en/ch02-tour-basic.xml:550 1.751 +#: ../en/ch02-tour-basic.xml:546 1.752 msgid "" 1.753 "To set a user name, use your favourite editor to create a file called " 1.754 "<filename role=\"special\">.hgrc</filename> in your home directory. " 1.755 @@ -3221,7 +3224,7 @@ 1.756 msgstr "" 1.757 1.758 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.759 -#: ../en/ch02-tour-basic.xml:561 1.760 +#: ../en/ch02-tour-basic.xml:557 1.761 msgid "" 1.762 "The <quote><literal>[ui]</literal></quote> line begins a <emphasis>section</" 1.763 "emphasis> of the config file, so you can read the <quote><literal>username " 1.764 @@ -3233,12 +3236,12 @@ 1.765 msgstr "" 1.766 1.767 #. type: Content of: <book><chapter><sect1><sect2><sect3><title> 1.768 -#: ../en/ch02-tour-basic.xml:574 1.769 +#: ../en/ch02-tour-basic.xml:570 1.770 msgid "Choosing a user name" 1.771 msgstr "选择用户名称" 1.772 1.773 #. type: Content of: <book><chapter><sect1><sect2><sect3><para> 1.774 -#: ../en/ch02-tour-basic.xml:576 1.775 +#: ../en/ch02-tour-basic.xml:572 1.776 msgid "" 1.777 "You can use any text you like as the value of the <literal>username</literal> " 1.778 "config item, since this information is for reading by other people, but for " 1.779 @@ -3247,7 +3250,7 @@ 1.780 msgstr "" 1.781 1.782 #. type: Content of: <book><chapter><sect1><sect2><sect3><note><para> 1.783 -#: ../en/ch02-tour-basic.xml:583 1.784 +#: ../en/ch02-tour-basic.xml:579 1.785 msgid "" 1.786 "Mercurial's built-in web server obfuscates email addresses, to make it more " 1.787 "difficult for the email harvesting tools that spammers use. This reduces the " 1.788 @@ -3256,12 +3259,12 @@ 1.789 msgstr "" 1.790 1.791 #. type: Content of: <book><chapter><sect1><sect2><title> 1.792 -#: ../en/ch02-tour-basic.xml:593 1.793 +#: ../en/ch02-tour-basic.xml:589 1.794 msgid "Writing a commit message" 1.795 msgstr "写提交日志" 1.796 1.797 #. type: Content of: <book><chapter><sect1><sect2><para> 1.798 -#: ../en/ch02-tour-basic.xml:595 1.799 +#: ../en/ch02-tour-basic.xml:591 1.800 msgid "" 1.801 "When we commit a change, Mercurial drops us into a text editor, to enter a " 1.802 "message that will describe the modifications we've made in this changeset. " 1.803 @@ -3271,7 +3274,7 @@ 1.804 msgstr "" 1.805 1.806 #. type: Content of: <book><chapter><sect1><sect2><para> 1.807 -#: ../en/ch02-tour-basic.xml:605 1.808 +#: ../en/ch02-tour-basic.xml:601 1.809 msgid "" 1.810 "The editor that the <command role=\"hg-cmd\">hg commit</command> command " 1.811 "drops us into will contain an empty line, followed by a number of lines " 1.812 @@ -3279,7 +3282,7 @@ 1.813 msgstr "" 1.814 1.815 #. type: Content of: <book><chapter><sect1><sect2><para> 1.816 -#: ../en/ch02-tour-basic.xml:612 1.817 +#: ../en/ch02-tour-basic.xml:608 1.818 msgid "" 1.819 "Mercurial ignores the lines that start with <quote><literal>HG:</literal></" 1.820 "quote>; it uses them only to tell us which files it's recording changes to. " 1.821 @@ -3287,12 +3290,12 @@ 1.822 msgstr "" 1.823 1.824 #. type: Content of: <book><chapter><sect1><sect2><title> 1.825 -#: ../en/ch02-tour-basic.xml:618 1.826 +#: ../en/ch02-tour-basic.xml:614 1.827 msgid "Writing a good commit message" 1.828 msgstr "写好提交日志" 1.829 1.830 #. type: Content of: <book><chapter><sect1><sect2><para> 1.831 -#: ../en/ch02-tour-basic.xml:620 1.832 +#: ../en/ch02-tour-basic.xml:616 1.833 msgid "" 1.834 "Since <command role=\"hg-cmd\">hg log</command> only prints the first line of " 1.835 "a commit message by default, it's best to write a commit message whose first " 1.836 @@ -3302,7 +3305,7 @@ 1.837 msgstr "" 1.838 1.839 #. type: Content of: <book><chapter><sect1><sect2><para> 1.840 -#: ../en/ch02-tour-basic.xml:634 1.841 +#: ../en/ch02-tour-basic.xml:630 1.842 msgid "" 1.843 "As far as the remainder of the contents of the commit message are concerned, " 1.844 "there are no hard-and-fast rules. Mercurial itself doesn't interpret or care " 1.845 @@ -3311,7 +3314,7 @@ 1.846 msgstr "" 1.847 1.848 #. type: Content of: <book><chapter><sect1><sect2><para> 1.849 -#: ../en/ch02-tour-basic.xml:640 1.850 +#: ../en/ch02-tour-basic.xml:636 1.851 msgid "" 1.852 "My personal preference is for short, but informative, commit messages that " 1.853 "tell me something that I can't figure out with a quick glance at the output " 1.854 @@ -3319,12 +3322,12 @@ 1.855 msgstr "" 1.856 1.857 #. type: Content of: <book><chapter><sect1><sect2><title> 1.858 -#: ../en/ch02-tour-basic.xml:647 1.859 +#: ../en/ch02-tour-basic.xml:643 1.860 msgid "Aborting a commit" 1.861 msgstr "终止提交" 1.862 1.863 #. type: Content of: <book><chapter><sect1><sect2><para> 1.864 -#: ../en/ch02-tour-basic.xml:649 1.865 +#: ../en/ch02-tour-basic.xml:645 1.866 msgid "" 1.867 "If you decide that you don't want to commit while in the middle of editing a " 1.868 "commit message, simply exit from your editor without saving the file that " 1.869 @@ -3333,7 +3336,7 @@ 1.870 msgstr "" 1.871 1.872 #. type: Content of: <book><chapter><sect1><sect2><para> 1.873 -#: ../en/ch02-tour-basic.xml:654 1.874 +#: ../en/ch02-tour-basic.xml:650 1.875 msgid "" 1.876 "If we run the <command role=\"hg-cmd\">hg commit</command> command without " 1.877 "any arguments, it records all of the changes we've made, as reported by " 1.878 @@ -3342,12 +3345,12 @@ 1.879 msgstr "" 1.880 1.881 #. type: Content of: <book><chapter><sect1><sect2><title> 1.882 -#: ../en/ch02-tour-basic.xml:661 1.883 +#: ../en/ch02-tour-basic.xml:657 1.884 msgid "Admiring our new handiwork" 1.885 msgstr "欣赏我们的新手艺" 1.886 1.887 #. type: Content of: <book><chapter><sect1><sect2><para> 1.888 -#: ../en/ch02-tour-basic.xml:663 1.889 +#: ../en/ch02-tour-basic.xml:659 1.890 msgid "" 1.891 "Once we've finished the commit, we can use the <command role=\"hg-cmd\">hg " 1.892 "tip</command> command to display the changeset we just created. This command " 1.893 @@ -3356,19 +3359,19 @@ 1.894 msgstr "" 1.895 1.896 #. type: Content of: <book><chapter><sect1><sect2><para> 1.897 -#: ../en/ch02-tour-basic.xml:672 1.898 +#: ../en/ch02-tour-basic.xml:668 1.899 msgid "" 1.900 "We refer to the newest revision in the repository as the tip revision, or " 1.901 "simply the tip." 1.902 msgstr "" 1.903 1.904 #. type: Content of: <book><chapter><sect1><title> 1.905 -#: ../en/ch02-tour-basic.xml:679 1.906 +#: ../en/ch02-tour-basic.xml:675 1.907 msgid "Sharing changes" 1.908 msgstr "共享修改" 1.909 1.910 #. type: Content of: <book><chapter><sect1><para> 1.911 -#: ../en/ch02-tour-basic.xml:681 1.912 +#: ../en/ch02-tour-basic.xml:677 1.913 msgid "" 1.914 "We mentioned earlier that repositories in Mercurial are self-contained. This " 1.915 "means that the changeset we just created exists only in our <filename class=" 1.916 @@ -3377,12 +3380,12 @@ 1.917 msgstr "" 1.918 1.919 #. type: Content of: <book><chapter><sect1><sect2><title> 1.920 -#: ../en/ch02-tour-basic.xml:689 1.921 +#: ../en/ch02-tour-basic.xml:685 1.922 msgid "Pulling changes from another repository" 1.923 msgstr "从其它版本库取得修改" 1.924 1.925 #. type: Content of: <book><chapter><sect1><sect2><para> 1.926 -#: ../en/ch02-tour-basic.xml:690 1.927 +#: ../en/ch02-tour-basic.xml:686 1.928 msgid "" 1.929 "To get started, let's clone our original <filename class=\"directory\">hello</" 1.930 "filename> repository, which does not contain the change we just committed. " 1.931 @@ -3391,7 +3394,7 @@ 1.932 msgstr "" 1.933 1.934 #. type: Content of: <book><chapter><sect1><sect2><para> 1.935 -#: ../en/ch02-tour-basic.xml:698 1.936 +#: ../en/ch02-tour-basic.xml:694 1.937 msgid "" 1.938 "We'll use the <command role=\"hg-cmd\">hg pull</command> command to bring " 1.939 "changes from <filename class=\"directory\">my-hello</filename> into <filename " 1.940 @@ -3404,7 +3407,7 @@ 1.941 msgstr "" 1.942 1.943 #. type: Content of: <book><chapter><sect1><sect2><para> 1.944 -#: ../en/ch02-tour-basic.xml:711 1.945 +#: ../en/ch02-tour-basic.xml:707 1.946 msgid "" 1.947 "(Of course, someone could cause more changesets to appear in the repository " 1.948 "that we ran <command role=\"hg-cmd\">hg incoming</command> in, before we get " 1.949 @@ -3413,7 +3416,7 @@ 1.950 msgstr "" 1.951 1.952 #. type: Content of: <book><chapter><sect1><sect2><para> 1.953 -#: ../en/ch02-tour-basic.xml:718 1.954 +#: ../en/ch02-tour-basic.xml:714 1.955 msgid "" 1.956 "Bringing changes into a repository is a simple matter of running the <command " 1.957 "role=\"hg-cmd\">hg pull</command> command, and telling it which repository to " 1.958 @@ -3421,7 +3424,7 @@ 1.959 msgstr "" 1.960 1.961 #. type: Content of: <book><chapter><sect1><sect2><para> 1.962 -#: ../en/ch02-tour-basic.xml:725 1.963 +#: ../en/ch02-tour-basic.xml:721 1.964 msgid "" 1.965 "As you can see from the before-and-after output of <command role=\"hg-cmd" 1.966 "\">hg tip</command>, we have successfully pulled changes into our " 1.967 @@ -3430,12 +3433,12 @@ 1.968 msgstr "" 1.969 1.970 #. type: Content of: <book><chapter><sect1><sect2><title> 1.971 -#: ../en/ch02-tour-basic.xml:733 1.972 +#: ../en/ch02-tour-basic.xml:729 1.973 msgid "Updating the working directory" 1.974 msgstr "更新工作目录" 1.975 1.976 #. type: Content of: <book><chapter><sect1><sect2><para> 1.977 -#: ../en/ch02-tour-basic.xml:735 1.978 +#: ../en/ch02-tour-basic.xml:731 1.979 msgid "" 1.980 "We have so far glossed over the relationship between a repository and its " 1.981 "working directory. The <command role=\"hg-cmd\">hg pull</command> command " 1.982 @@ -3447,7 +3450,7 @@ 1.983 msgstr "" 1.984 1.985 #. type: Content of: <book><chapter><sect1><sect2><para> 1.986 -#: ../en/ch02-tour-basic.xml:747 1.987 +#: ../en/ch02-tour-basic.xml:743 1.988 msgid "" 1.989 "It might seem a bit strange that <command role=\"hg-cmd\">hg pull</command> " 1.990 "doesn't update the working directory automatically. There's actually a good " 1.991 @@ -3461,7 +3464,7 @@ 1.992 msgstr "" 1.993 1.994 #. type: Content of: <book><chapter><sect1><sect2><para> 1.995 -#: ../en/ch02-tour-basic.xml:758 1.996 +#: ../en/ch02-tour-basic.xml:754 1.997 msgid "" 1.998 "However, since pull-then-update is such a common thing to do, Mercurial lets " 1.999 "you combine the two by passing the <option role=\"hg-opt-pull\">-u</option> " 1.1000 @@ -3469,7 +3472,7 @@ 1.1001 msgstr "" 1.1002 1.1003 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1004 -#: ../en/ch02-tour-basic.xml:763 1.1005 +#: ../en/ch02-tour-basic.xml:759 1.1006 msgid "" 1.1007 "If you look back at the output of <command role=\"hg-cmd\">hg pull</command> " 1.1008 "in section <xref linkend=\"sec.tour.pull\"/> when we ran it without <option " 1.1009 @@ -3479,14 +3482,14 @@ 1.1010 msgstr "" 1.1011 1.1012 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1013 -#: ../en/ch02-tour-basic.xml:772 1.1014 +#: ../en/ch02-tour-basic.xml:768 1.1015 msgid "" 1.1016 "To find out what revision the working directory is at, use the <command role=" 1.1017 "\"hg-cmd\">hg parents</command> command." 1.1018 msgstr "" 1.1019 1.1020 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1021 -#: ../en/ch02-tour-basic.xml:778 1.1022 +#: ../en/ch02-tour-basic.xml:774 1.1023 msgid "" 1.1024 "If you look back at figure <xref endterm=\"fig.tour-basic.history.caption\" " 1.1025 "linkend=\"fig.tour-basic.history\"/>, you'll see arrows connecting each " 1.1026 @@ -3497,7 +3500,7 @@ 1.1027 msgstr "" 1.1028 1.1029 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1030 -#: ../en/ch02-tour-basic.xml:788 1.1031 +#: ../en/ch02-tour-basic.xml:784 1.1032 msgid "" 1.1033 "To update the working directory to a particular revision, give a revision " 1.1034 "number or changeset ID to the <command role=\"hg-cmd\">hg update</command> " 1.1035 @@ -3505,7 +3508,7 @@ 1.1036 msgstr "" 1.1037 1.1038 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1039 -#: ../en/ch02-tour-basic.xml:795 1.1040 +#: ../en/ch02-tour-basic.xml:791 1.1041 msgid "" 1.1042 "If you omit an explicit revision, <command role=\"hg-cmd\">hg update</" 1.1043 "command> will update to the tip revision, as shown by the second call to " 1.1044 @@ -3513,12 +3516,12 @@ 1.1045 msgstr "" 1.1046 1.1047 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1048 -#: ../en/ch02-tour-basic.xml:803 1.1049 +#: ../en/ch02-tour-basic.xml:799 1.1050 msgid "Pushing changes to another repository" 1.1051 msgstr "发布修改到其它版本库" 1.1052 1.1053 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1054 -#: ../en/ch02-tour-basic.xml:805 1.1055 +#: ../en/ch02-tour-basic.xml:801 1.1056 msgid "" 1.1057 "Mercurial lets us push changes to another repository, from the repository " 1.1058 "we're currently visiting. As with the example of <command role=\"hg-cmd\">hg " 1.1059 @@ -3527,21 +3530,21 @@ 1.1060 msgstr "" 1.1061 1.1062 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1063 -#: ../en/ch02-tour-basic.xml:813 1.1064 +#: ../en/ch02-tour-basic.xml:809 1.1065 msgid "" 1.1066 "The <command role=\"hg-cmd\">hg outgoing</command> command tells us what " 1.1067 "changes would be pushed into another repository." 1.1068 msgstr "" 1.1069 1.1070 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1071 -#: ../en/ch02-tour-basic.xml:819 1.1072 +#: ../en/ch02-tour-basic.xml:815 1.1073 msgid "" 1.1074 "And the <command role=\"hg-cmd\">hg push</command> command does the actual " 1.1075 "push." 1.1076 msgstr "" 1.1077 1.1078 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1079 -#: ../en/ch02-tour-basic.xml:825 1.1080 +#: ../en/ch02-tour-basic.xml:821 1.1081 msgid "" 1.1082 "As with <command role=\"hg-cmd\">hg pull</command>, the <command role=\"hg-cmd" 1.1083 "\">hg push</command> command does not update the working directory in the " 1.1084 @@ -3552,19 +3555,19 @@ 1.1085 msgstr "" 1.1086 1.1087 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1088 -#: ../en/ch02-tour-basic.xml:834 1.1089 +#: ../en/ch02-tour-basic.xml:830 1.1090 msgid "" 1.1091 "What happens if we try to pull or push changes and the receiving repository " 1.1092 "already has those changes? Nothing too exciting." 1.1093 msgstr "" 1.1094 1.1095 #. type: Content of: <book><chapter><sect1><sect2><title> 1.1096 -#: ../en/ch02-tour-basic.xml:841 1.1097 +#: ../en/ch02-tour-basic.xml:837 1.1098 msgid "Sharing changes over a network" 1.1099 msgstr "通过网络共享修改" 1.1100 1.1101 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1102 -#: ../en/ch02-tour-basic.xml:843 1.1103 +#: ../en/ch02-tour-basic.xml:839 1.1104 msgid "" 1.1105 "The commands we have covered in the previous few sections are not limited to " 1.1106 "working with local repositories. Each works in exactly the same fashion over " 1.1107 @@ -3572,7 +3575,7 @@ 1.1108 msgstr "" 1.1109 1.1110 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1111 -#: ../en/ch02-tour-basic.xml:851 1.1112 +#: ../en/ch02-tour-basic.xml:847 1.1113 msgid "" 1.1114 "In this example, we can see what changes we could push to the remote " 1.1115 "repository, but the repository is understandably not set up to let anonymous " 1.1116 @@ -15797,7 +15800,7 @@ 1.1117 msgstr "" 1.1118 1.1119 # 1.1120 -#. &example.hg-interdiff; 1.1121 +#. &example.hg-interdiff; 1.1122 #. type: Content of: <book><chapter><sect1><sect2><para> 1.1123 #: ../en/ch13-mq-collab.xml:465 1.1124 msgid ""