[svnbook commit] r3528 - * src/zh/po/svnbook.po:
codesite-noreply at google.com
codesite-noreply at google.com
Wed May 27 19:16:31 CDT 2009
Author: songdongsheng at live.cn
Date: Wed May 27 17:15:59 2009
New Revision: 3528
Modified:
trunk/src/zh/po/svnbook.po
Log:
* src/zh/po/svnbook.po:
Sync with source files, no translation change.
Modified: trunk/src/zh/po/svnbook.po
==============================================================================
--- trunk/src/zh/po/svnbook.po (original)
+++ trunk/src/zh/po/svnbook.po Wed May 27 17:15:59 2009
@@ -36,7 +36,7 @@
msgid ""
msgstr ""
"Project-Id-Version: svnbook 1.6\n"
-"POT-Creation-Date: 2009-04-17 13:51+0800\n"
+"POT-Creation-Date: 2009-05-28 08:02+0800\n"
"PO-Revision-Date: 2009-05-04 11:28+0800\n"
"Last-Translator: 宋冬生 <songdonogsheng at live.cn>\n"
"Language-Team: Simplified Chinese <i18n-zh at googlegroups.com >\n"
@@ -490,15 +490,16 @@
#. type: Content of: <book><appendix><sect1><para>
#: ../../en/book/appb-svn-for-cvs-users.xml:47
+#, fuzzy
msgid ""
"Similarly, in CVS, a tag or branch is an annotation on the file or on
the "
"version information for that individual file, whereas in Subversion, a
tag or "
"branch is a copy of an entire tree (by convention, into the <filename>/"
"branches</filename> or <filename>/tags</filename> directories that appear
at "
-"the top level of the repository, beside <filename>/trunk</filename>). In
the "
+"the top level of the repository, beside <filename>/trunk</filename>). In
the "
"repository as a whole, many versions of each file may be visible: the
latest "
"version on each branch, every tagged version, and of course the latest "
-"version on the trunk itself. So, to refine the terms even further, one
would "
+"version on the trunk itself. So, to refine the terms even further, one
would "
"often say <quote><filename>foo.c</filename> as it appears in <filename>/"
"branches/REL1</filename> in revision 5.</quote>"
msgstr ""
@@ -770,7 +771,7 @@
#. type: Content of: <book><appendix><sect1><sect2><title>
#: ../../en/book/appb-svn-for-cvs-users.xml:228
-#: ../../en/book/ch09-reference.xml:8966
+#: ../../en/book/ch09-reference.xml:9076
msgid "Status"
msgstr "状态"
@@ -873,7 +874,7 @@
#. type: Content of: <book><appendix><sect1><sect2><title>
#: ../../en/book/appb-svn-for-cvs-users.xml:326
-#: ../../en/book/ch09-reference.xml:8988
+#: ../../en/book/ch09-reference.xml:9098
msgid "Update"
msgstr "更新"
@@ -1512,6 +1513,7 @@
#. type: Content of: <book><appendix><sect1><para>
#: ../../en/book/appc-webdav.xml:188
+#, fuzzy
msgid ""
"Another feature that may be a useful complement for Subversion's "
"autoversioning comes from Apache's <literal>mod_mime</literal> module.
If a "
@@ -1521,7 +1523,7 @@
"shared folder, not having an association with any application. One
remedy is "
"to have a sysadmin (or other Subversion-knowledgeable person) check out
a "
"working copy and manually set the <literal>svn:mime-type</literal>
property "
-"on necessary files. But there's potentially no end to such cleanup
tasks. "
+"on necessary files. But there's potentially no end to such cleanup
tasks. "
"Instead, you can use the <literal>ModMimeUsePathInfo</literal> directive
in "
"your Subversion <literal><Location></literal> block:"
msgstr ""
@@ -1600,50 +1602,51 @@
msgstr "Linux"
#. type: Content of:
<book><appendix><sect1><table><tgroup><thead><row><entry>
-#: ../../en/book/appc-webdav.xml:250 ../../en/book/ch09-reference.xml:731
-#: ../../en/book/ch09-reference.xml:840 ../../en/book/ch09-reference.xml:976
-#: ../../en/book/ch09-reference.xml:1057 ../../en/book/ch09-reference.xml:1151
-#: ../../en/book/ch09-reference.xml:1298 ../../en/book/ch09-reference.xml:1375
-#: ../../en/book/ch09-reference.xml:1516 ../../en/book/ch09-reference.xml:1721
-#: ../../en/book/ch09-reference.xml:1835 ../../en/book/ch09-reference.xml:2154
-#: ../../en/book/ch09-reference.xml:2268 ../../en/book/ch09-reference.xml:2318
-#: ../../en/book/ch09-reference.xml:2425 ../../en/book/ch09-reference.xml:2611
-#: ../../en/book/ch09-reference.xml:2754 ../../en/book/ch09-reference.xml:2848
-#: ../../en/book/ch09-reference.xml:3161 ../../en/book/ch09-reference.xml:3307
-#: ../../en/book/ch09-reference.xml:3380 ../../en/book/ch09-reference.xml:3463
-#: ../../en/book/ch09-reference.xml:3593 ../../en/book/ch09-reference.xml:3672
-#: ../../en/book/ch09-reference.xml:3749 ../../en/book/ch09-reference.xml:3847
-#: ../../en/book/ch09-reference.xml:3951 ../../en/book/ch09-reference.xml:4087
-#: ../../en/book/ch09-reference.xml:4219 ../../en/book/ch09-reference.xml:4313
-#: ../../en/book/ch09-reference.xml:4425 ../../en/book/ch09-reference.xml:4872
-#: ../../en/book/ch09-reference.xml:5065 ../../en/book/ch09-reference.xml:5153
-#: ../../en/book/ch09-reference.xml:5520 ../../en/book/ch09-reference.xml:5568
-#: ../../en/book/ch09-reference.xml:5647 ../../en/book/ch09-reference.xml:5687
-#: ../../en/book/ch09-reference.xml:5789 ../../en/book/ch09-reference.xml:5821
-#: ../../en/book/ch09-reference.xml:5874 ../../en/book/ch09-reference.xml:5907
-#: ../../en/book/ch09-reference.xml:5955 ../../en/book/ch09-reference.xml:6021
-#: ../../en/book/ch09-reference.xml:6075 ../../en/book/ch09-reference.xml:6121
-#: ../../en/book/ch09-reference.xml:6198 ../../en/book/ch09-reference.xml:6243
-#: ../../en/book/ch09-reference.xml:6298 ../../en/book/ch09-reference.xml:6359
-#: ../../en/book/ch09-reference.xml:6415 ../../en/book/ch09-reference.xml:6470
-#: ../../en/book/ch09-reference.xml:6537 ../../en/book/ch09-reference.xml:6709
-#: ../../en/book/ch09-reference.xml:6755 ../../en/book/ch09-reference.xml:6813
-#: ../../en/book/ch09-reference.xml:6937 ../../en/book/ch09-reference.xml:6983
-#: ../../en/book/ch09-reference.xml:7055 ../../en/book/ch09-reference.xml:7101
-#: ../../en/book/ch09-reference.xml:7141 ../../en/book/ch09-reference.xml:7204
-#: ../../en/book/ch09-reference.xml:7255 ../../en/book/ch09-reference.xml:7307
-#: ../../en/book/ch09-reference.xml:7353 ../../en/book/ch09-reference.xml:7408
-#: ../../en/book/ch09-reference.xml:7472 ../../en/book/ch09-reference.xml:7532
-#: ../../en/book/ch09-reference.xml:7575 ../../en/book/ch09-reference.xml:7758
-#: ../../en/book/ch09-reference.xml:7826 ../../en/book/ch09-reference.xml:7867
-#: ../../en/book/ch09-reference.xml:7944 ../../en/book/ch09-reference.xml:8300
-#: ../../en/book/ch09-reference.xml:8364 ../../en/book/ch09-reference.xml:8428
-#: ../../en/book/ch09-reference.xml:8472 ../../en/book/ch09-reference.xml:8625
-#: ../../en/book/ch09-reference.xml:9019 ../../en/book/ch09-reference.xml:9324
-#: ../../en/book/ch09-reference.xml:9387 ../../en/book/ch09-reference.xml:9442
-#: ../../en/book/ch09-reference.xml:9499 ../../en/book/ch09-reference.xml:9571
-#: ../../en/book/ch09-reference.xml:9645 ../../en/book/ch09-reference.xml:9704
-#: ../../en/book/ch09-reference.xml:9762 ../../en/book/ch09-reference.xml:9822
+#: ../../en/book/appc-webdav.xml:250 ../../en/book/ch09-reference.xml:732
+#: ../../en/book/ch09-reference.xml:841 ../../en/book/ch09-reference.xml:977
+#: ../../en/book/ch09-reference.xml:1058 ../../en/book/ch09-reference.xml:1152
+#: ../../en/book/ch09-reference.xml:1299 ../../en/book/ch09-reference.xml:1376
+#: ../../en/book/ch09-reference.xml:1517 ../../en/book/ch09-reference.xml:1723
+#: ../../en/book/ch09-reference.xml:1837 ../../en/book/ch09-reference.xml:2159
+#: ../../en/book/ch09-reference.xml:2273 ../../en/book/ch09-reference.xml:2321
+#: ../../en/book/ch09-reference.xml:2428 ../../en/book/ch09-reference.xml:2614
+#: ../../en/book/ch09-reference.xml:2757 ../../en/book/ch09-reference.xml:2851
+#: ../../en/book/ch09-reference.xml:3164 ../../en/book/ch09-reference.xml:3310
+#: ../../en/book/ch09-reference.xml:3384 ../../en/book/ch09-reference.xml:3467
+#: ../../en/book/ch09-reference.xml:3597 ../../en/book/ch09-reference.xml:3676
+#: ../../en/book/ch09-reference.xml:3753 ../../en/book/ch09-reference.xml:3852
+#: ../../en/book/ch09-reference.xml:3959 ../../en/book/ch09-reference.xml:4095
+#: ../../en/book/ch09-reference.xml:4227 ../../en/book/ch09-reference.xml:4321
+#: ../../en/book/ch09-reference.xml:4433 ../../en/book/ch09-reference.xml:4880
+#: ../../en/book/ch09-reference.xml:5073 ../../en/book/ch09-reference.xml:5161
+#: ../../en/book/ch09-reference.xml:5525 ../../en/book/ch09-reference.xml:5573
+#: ../../en/book/ch09-reference.xml:5653 ../../en/book/ch09-reference.xml:5693
+#: ../../en/book/ch09-reference.xml:5795 ../../en/book/ch09-reference.xml:5827
+#: ../../en/book/ch09-reference.xml:5880 ../../en/book/ch09-reference.xml:5913
+#: ../../en/book/ch09-reference.xml:5961 ../../en/book/ch09-reference.xml:6027
+#: ../../en/book/ch09-reference.xml:6080 ../../en/book/ch09-reference.xml:6120
+#: ../../en/book/ch09-reference.xml:6156 ../../en/book/ch09-reference.xml:6233
+#: ../../en/book/ch09-reference.xml:6278 ../../en/book/ch09-reference.xml:6333
+#: ../../en/book/ch09-reference.xml:6394 ../../en/book/ch09-reference.xml:6450
+#: ../../en/book/ch09-reference.xml:6505 ../../en/book/ch09-reference.xml:6572
+#: ../../en/book/ch09-reference.xml:6744 ../../en/book/ch09-reference.xml:6790
+#: ../../en/book/ch09-reference.xml:6848 ../../en/book/ch09-reference.xml:6972
+#: ../../en/book/ch09-reference.xml:7018 ../../en/book/ch09-reference.xml:7091
+#: ../../en/book/ch09-reference.xml:7137 ../../en/book/ch09-reference.xml:7177
+#: ../../en/book/ch09-reference.xml:7240 ../../en/book/ch09-reference.xml:7291
+#: ../../en/book/ch09-reference.xml:7343 ../../en/book/ch09-reference.xml:7389
+#: ../../en/book/ch09-reference.xml:7444 ../../en/book/ch09-reference.xml:7509
+#: ../../en/book/ch09-reference.xml:7569 ../../en/book/ch09-reference.xml:7612
+#: ../../en/book/ch09-reference.xml:7803 ../../en/book/ch09-reference.xml:7872
+#: ../../en/book/ch09-reference.xml:7913 ../../en/book/ch09-reference.xml:7975
+#: ../../en/book/ch09-reference.xml:8053 ../../en/book/ch09-reference.xml:8410
+#: ../../en/book/ch09-reference.xml:8474 ../../en/book/ch09-reference.xml:8538
+#: ../../en/book/ch09-reference.xml:8582 ../../en/book/ch09-reference.xml:8735
+#: ../../en/book/ch09-reference.xml:9129 ../../en/book/ch09-reference.xml:9434
+#: ../../en/book/ch09-reference.xml:9497 ../../en/book/ch09-reference.xml:9552
+#: ../../en/book/ch09-reference.xml:9609 ../../en/book/ch09-reference.xml:9681
+#: ../../en/book/ch09-reference.xml:9755 ../../en/book/ch09-reference.xml:9814
+#: ../../en/book/ch09-reference.xml:9872 ../../en/book/ch09-reference.xml:9932
msgid "Description"
msgstr "描述"
@@ -3126,11 +3129,13 @@
#. type: Content of: <book><preface><sect1><sect2><para>
#: ../../en/book/ch00-preface.xml:705
+#, fuzzy
msgid ""
"Gavin, you're able to read half of the words in this book yourself now; "
-"sadly, it's the other half that provide the key concepts. And sorry,
Aidan "
-"— I couldn't find a way to work Disney/Pixar characters into the
text. "
-"But Daddy loves you both, and can't wait to teach you about programming."
+"sadly, it's the other half that provide the key concepts. And sorry, "
+"Aidan—I couldn't find a way to work Disney/Pixar characters into
the "
+"text. But Daddy loves you both, and can't wait to teach you about "
+"programming."
msgstr ""
"Gavin，或许现在本书的很多词你还不能读出来；很遗憾，它是提供关键概念的另一
半。"
"抱歉，Aidan - 我不能找到将 Disney/Pixar 字符转换成文本的方法。但是，爸爸爱
你"
@@ -3244,13 +3249,14 @@
#. type: Content of: <book><preface><sect1><sect2><para>
#: ../../en/book/ch00-preface.xml:779
+#, fuzzy
msgid ""
"If you need to archive old versions of files and directories, possibly "
"resurrect them, or examine logs of how they've changed over time, then "
"Subversion is exactly the right tool for you. If you need to
collaborate "
"with people on documents (usually over a network) and keep track of who
made "
"which changes, then Subversion is also appropriate. This is why
Subversion "
-"is so often used in software development environments— working on
a "
+"is so often used in software development environments—working on a "
"development team is an inherently social activity, and Subversion makes
it "
"easy to collaborate with other programmers. Of course, there's a cost
to "
"using Subversion as well: administrative overhead. You'll need to manage
a "
@@ -3475,23 +3481,23 @@
"emphasis>内容来详细阐述这些组件。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
-#: ../../en/book/ch00-preface.xml:937 ../../en/book/ch09-reference.xml:716
-#: ../../en/book/ch09-reference.xml:825 ../../en/book/ch09-reference.xml:961
-#: ../../en/book/ch09-reference.xml:1041 ../../en/book/ch09-reference.xml:1137
-#: ../../en/book/ch09-reference.xml:1284 ../../en/book/ch09-reference.xml:1361
-#: ../../en/book/ch09-reference.xml:1499 ../../en/book/ch09-reference.xml:1705
-#: ../../en/book/ch09-reference.xml:1818 ../../en/book/ch09-reference.xml:2139
-#: ../../en/book/ch09-reference.xml:2254 ../../en/book/ch09-reference.xml:2303
-#: ../../en/book/ch09-reference.xml:2410 ../../en/book/ch09-reference.xml:2597
-#: ../../en/book/ch09-reference.xml:2738 ../../en/book/ch09-reference.xml:2833
-#: ../../en/book/ch09-reference.xml:3144 ../../en/book/ch09-reference.xml:3290
-#: ../../en/book/ch09-reference.xml:3365 ../../en/book/ch09-reference.xml:3449
-#: ../../en/book/ch09-reference.xml:3578 ../../en/book/ch09-reference.xml:3655
-#: ../../en/book/ch09-reference.xml:3734 ../../en/book/ch09-reference.xml:3832
-#: ../../en/book/ch09-reference.xml:3935 ../../en/book/ch09-reference.xml:4072
-#: ../../en/book/ch09-reference.xml:4203 ../../en/book/ch09-reference.xml:4299
-#: ../../en/book/ch09-reference.xml:4411 ../../en/book/ch09-reference.xml:4854
-#: ../../en/book/ch09-reference.xml:5051 ../../en/book/ch09-reference.xml:5139
+#: ../../en/book/ch00-preface.xml:937 ../../en/book/ch09-reference.xml:717
+#: ../../en/book/ch09-reference.xml:826 ../../en/book/ch09-reference.xml:962
+#: ../../en/book/ch09-reference.xml:1042 ../../en/book/ch09-reference.xml:1138
+#: ../../en/book/ch09-reference.xml:1285 ../../en/book/ch09-reference.xml:1362
+#: ../../en/book/ch09-reference.xml:1500 ../../en/book/ch09-reference.xml:1707
+#: ../../en/book/ch09-reference.xml:1820 ../../en/book/ch09-reference.xml:2144
+#: ../../en/book/ch09-reference.xml:2259 ../../en/book/ch09-reference.xml:2306
+#: ../../en/book/ch09-reference.xml:2413 ../../en/book/ch09-reference.xml:2600
+#: ../../en/book/ch09-reference.xml:2741 ../../en/book/ch09-reference.xml:2836
+#: ../../en/book/ch09-reference.xml:3147 ../../en/book/ch09-reference.xml:3293
+#: ../../en/book/ch09-reference.xml:3369 ../../en/book/ch09-reference.xml:3453
+#: ../../en/book/ch09-reference.xml:3582 ../../en/book/ch09-reference.xml:3659
+#: ../../en/book/ch09-reference.xml:3738 ../../en/book/ch09-reference.xml:3837
+#: ../../en/book/ch09-reference.xml:3943 ../../en/book/ch09-reference.xml:4080
+#: ../../en/book/ch09-reference.xml:4211 ../../en/book/ch09-reference.xml:4307
+#: ../../en/book/ch09-reference.xml:4419 ../../en/book/ch09-reference.xml:4862
+#: ../../en/book/ch09-reference.xml:5059 ../../en/book/ch09-reference.xml:5147
msgid "svn"
msgstr "svn"
@@ -3501,8 +3507,8 @@
msgstr "命令行客户端程序"
#. type: Content of: <book><chapter><sect1><refentry><refnamediv><refname>
-#: ../../en/book/ch00-preface.xml:944 ../../en/book/ch09-reference.xml:8452
-#: ../../en/book/ch09-reference.xml:8457 ../../en/book/ch09-reference.xml:8461
+#: ../../en/book/ch00-preface.xml:944 ../../en/book/ch09-reference.xml:8562
+#: ../../en/book/ch09-reference.xml:8567 ../../en/book/ch09-reference.xml:8571
msgid "svnversion"
msgstr "svnversion"
@@ -3516,15 +3522,15 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
#: ../../en/book/ch00-preface.xml:952
#: ../../en/book/ch05-repository-admin.xml:1122
-#: ../../en/book/ch09-reference.xml:6583 ../../en/book/ch09-reference.xml:6695
-#: ../../en/book/ch09-reference.xml:6741 ../../en/book/ch09-reference.xml:6799
-#: ../../en/book/ch09-reference.xml:6923 ../../en/book/ch09-reference.xml:6969
-#: ../../en/book/ch09-reference.xml:7041 ../../en/book/ch09-reference.xml:7088
-#: ../../en/book/ch09-reference.xml:7125 ../../en/book/ch09-reference.xml:7189
-#: ../../en/book/ch09-reference.xml:7240 ../../en/book/ch09-reference.xml:7292
-#: ../../en/book/ch09-reference.xml:7338 ../../en/book/ch09-reference.xml:7393
-#: ../../en/book/ch09-reference.xml:7458 ../../en/book/ch09-reference.xml:7517
-#: ../../en/book/ch09-reference.xml:7561
+#: ../../en/book/ch09-reference.xml:6618 ../../en/book/ch09-reference.xml:6730
+#: ../../en/book/ch09-reference.xml:6776 ../../en/book/ch09-reference.xml:6834
+#: ../../en/book/ch09-reference.xml:6958 ../../en/book/ch09-reference.xml:7004
+#: ../../en/book/ch09-reference.xml:7077 ../../en/book/ch09-reference.xml:7124
+#: ../../en/book/ch09-reference.xml:7161 ../../en/book/ch09-reference.xml:7225
+#: ../../en/book/ch09-reference.xml:7276 ../../en/book/ch09-reference.xml:7328
+#: ../../en/book/ch09-reference.xml:7374 ../../en/book/ch09-reference.xml:7429
+#: ../../en/book/ch09-reference.xml:7495 ../../en/book/ch09-reference.xml:7554
+#: ../../en/book/ch09-reference.xml:7598
msgid "svnlook"
msgstr "svnlook"
@@ -3536,16 +3542,17 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
#: ../../en/book/ch00-preface.xml:959
#: ../../en/book/ch05-repository-admin.xml:1087
-#: ../../en/book/ch09-reference.xml:5317 ../../en/book/ch09-reference.xml:5506
-#: ../../en/book/ch09-reference.xml:5554 ../../en/book/ch09-reference.xml:5633
-#: ../../en/book/ch09-reference.xml:5673 ../../en/book/ch09-reference.xml:5775
-#: ../../en/book/ch09-reference.xml:5806 ../../en/book/ch09-reference.xml:5858
-#: ../../en/book/ch09-reference.xml:5891 ../../en/book/ch09-reference.xml:5940
-#: ../../en/book/ch09-reference.xml:6007 ../../en/book/ch09-reference.xml:6061
-#: ../../en/book/ch09-reference.xml:6101 ../../en/book/ch09-reference.xml:6183
-#: ../../en/book/ch09-reference.xml:6229 ../../en/book/ch09-reference.xml:6284
-#: ../../en/book/ch09-reference.xml:6345 ../../en/book/ch09-reference.xml:6401
-#: ../../en/book/ch09-reference.xml:6455 ../../en/book/ch09-reference.xml:6523
+#: ../../en/book/ch09-reference.xml:5325 ../../en/book/ch09-reference.xml:5511
+#: ../../en/book/ch09-reference.xml:5559 ../../en/book/ch09-reference.xml:5639
+#: ../../en/book/ch09-reference.xml:5679 ../../en/book/ch09-reference.xml:5781
+#: ../../en/book/ch09-reference.xml:5812 ../../en/book/ch09-reference.xml:5864
+#: ../../en/book/ch09-reference.xml:5897 ../../en/book/ch09-reference.xml:5946
+#: ../../en/book/ch09-reference.xml:6013 ../../en/book/ch09-reference.xml:6066
+#: ../../en/book/ch09-reference.xml:6105 ../../en/book/ch09-reference.xml:6136
+#: ../../en/book/ch09-reference.xml:6218 ../../en/book/ch09-reference.xml:6264
+#: ../../en/book/ch09-reference.xml:6319 ../../en/book/ch09-reference.xml:6380
+#: ../../en/book/ch09-reference.xml:6436 ../../en/book/ch09-reference.xml:6490
+#: ../../en/book/ch09-reference.xml:6558
msgid "svnadmin"
msgstr "svnadmin"
@@ -3556,7 +3563,7 @@
#. type: Content of: <book><chapter><sect1><title>
#: ../../en/book/ch00-preface.xml:967 ../../en/book/ch08-embedding-svn.xml:118
-#: ../../en/book/ch09-reference.xml:8612
+#: ../../en/book/ch09-reference.xml:8722
msgid "mod_dav_svn"
msgstr "mod_dav_svn"
@@ -3570,7 +3577,7 @@
#. type: Content of: <book><chapter><sect1><title>
#: ../../en/book/ch00-preface.xml:976
#: ../../en/book/ch06-server-configuration.xml:82
-#: ../../en/book/ch09-reference.xml:8019
+#: ../../en/book/ch09-reference.xml:8129
msgid "svnserve"
msgstr "svnserve"
@@ -3587,8 +3594,8 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
#: ../../en/book/ch00-preface.xml:985
#: ../../en/book/ch05-repository-admin.xml:1253
-#: ../../en/book/ch09-reference.xml:8204 ../../en/book/ch09-reference.xml:8286
-#: ../../en/book/ch09-reference.xml:8349 ../../en/book/ch09-reference.xml:8414
+#: ../../en/book/ch09-reference.xml:8314 ../../en/book/ch09-reference.xml:8396
+#: ../../en/book/ch09-reference.xml:8459 ../../en/book/ch09-reference.xml:8524
msgid "svndumpfilter"
msgstr "svndumpfilter"
@@ -3600,9 +3607,9 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><indexterm><primary>
#: ../../en/book/ch00-preface.xml:993
#: ../../en/book/ch05-repository-admin.xml:1290
-#: ../../en/book/ch09-reference.xml:7607 ../../en/book/ch09-reference.xml:7742
-#: ../../en/book/ch09-reference.xml:7812 ../../en/book/ch09-reference.xml:7852
-#: ../../en/book/ch09-reference.xml:7929
+#: ../../en/book/ch09-reference.xml:7644 ../../en/book/ch09-reference.xml:7787
+#: ../../en/book/ch09-reference.xml:7858 ../../en/book/ch09-reference.xml:7898
+#: ../../en/book/ch09-reference.xml:7960 ../../en/book/ch09-reference.xml:8038
msgid "svnsync"
msgstr "svnsync"
@@ -5055,10 +5062,10 @@
#. type: Content of: <book><chapter><sect1><title>
#: ../../en/book/ch01-fundamental-concepts.xml:950
#: ../../en/book/ch02-basic-usage.xml:2628
-#: ../../en/book/ch03-advanced-topics.xml:4075
+#: ../../en/book/ch03-advanced-topics.xml:4080
#: ../../en/book/ch04-branching-and-merging.xml:3128
-#: ../../en/book/ch05-repository-admin.xml:3306
-#: ../../en/book/ch07-customizing-svn.xml:1328
+#: ../../en/book/ch05-repository-admin.xml:3324
+#: ../../en/book/ch07-customizing-svn.xml:1329
#: ../../en/book/ch08-embedding-svn.xml:1351
msgid "Summary"
msgstr "总结"
@@ -5140,9 +5147,9 @@
"的模型，如果想查看所有命令的参考，见<xref linkend=\"svn.ref\"/>。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refpurpose>
-#: ../../en/book/ch02-basic-usage.xml:27 ../../en/book/ch09-reference.xml:2261
-#: ../../en/book/ch09-reference.xml:5781 ../../en/book/ch09-reference.xml:7094
-#: ../../en/book/ch09-reference.xml:7818
+#: ../../en/book/ch02-basic-usage.xml:27 ../../en/book/ch09-reference.xml:2266
+#: ../../en/book/ch09-reference.xml:5787 ../../en/book/ch09-reference.xml:7130
+#: ../../en/book/ch09-reference.xml:7864
msgid "Help!"
msgstr "求助！"
@@ -5207,7 +5214,7 @@
"command>，而会在回顾 Subversion 的典型一天时讨论 <command>svn
add</command>。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refname>
-#: ../../en/book/ch02-basic-usage.xml:95 ../../en/book/ch09-reference.xml:2309
+#: ../../en/book/ch02-basic-usage.xml:95 ../../en/book/ch09-reference.xml:2312
msgid "svn import"
msgstr "svn import"
@@ -5479,11 +5486,12 @@
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:325
+#, fuzzy
msgid ""
"When you perform a Subversion operation that requires you to
authenticate, by "
"default Subversion tries to cache your authentication credentials on disk
in "
"encrypted form. On some systems, Subversion may be unable to encrypt
your "
-"authentication data. You will then be asked whether you want to cache
your "
+"authentication data. You will then be asked whether you want to cache
your "
"credentials to disk in plaintext. You can choose to do so for
convenience so "
"that you don't have to continually reenter your password for future "
"operations. If you're concerned about caching your Subversion passwords
in "
@@ -5518,9 +5526,10 @@
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:353
+#, fuzzy
msgid ""
"To disable password caching entirely for a particular one-time command,
pass "
-"the <option >--no-auth-cache</option > option on the command line. To "
+"the <option>--no-auth-cache</option> option on the command line. To "
"permanently disable caching entirely, you can add the line
<literal>store-"
"passwords = no</literal> to your local machine's Subversion
configuration "
"file. See <xref linkend=\"svn.serverconfig.netmodel.credcache\"/> for "
@@ -5576,7 +5585,7 @@
msgstr "典型的工作周期是这样的："
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refpurpose>
-#: ../../en/book/ch02-basic-usage.xml:396 ../../en/book/ch09-reference.xml:5146
+#: ../../en/book/ch02-basic-usage.xml:396 ../../en/book/ch09-reference.xml:5154
msgid "Update your working copy."
msgstr "更新你的工作副本。"
@@ -5819,12 +5828,13 @@
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para><footnote><para>
#: ../../en/book/ch02-basic-usage.xml:587
+#, fuzzy
msgid ""
"Of course, nothing is ever totally deleted from the
repository—just "
"from the <literal>HEAD</literal> of the repository. You can get back "
"anything you delete by checking out (or updating your working copy to) a "
-"revision earlier than the one in which you deleted it. Also see <xref
linkend="
-"\"svn.branchmerge.basicmerging.resurrect\" />."
+"revision earlier than the one in which you deleted it. Also see <xref "
+"linkend=\"svn.branchmerge.basicmerging.resurrect\" />."
msgstr ""
"当然没有任何东西是在版本库里被删除了—只是在版本库的
<literal>HEAD</literal> 里"
"消失了。你可以通过检出(或者更新你的工作副本到)你做出删除操作的前一个修订版
本，"
@@ -6258,6 +6268,7 @@
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
#: ../../en/book/ch02-basic-usage.xml:968
+#, fuzzy
msgid ""
"Subversion uses its internal diff engine, which produces unified diff
format, "
"by default. If you want diff output in a different format, specify an "
@@ -6265,8 +6276,8 @@
"you'd like to it using the <option>--extensions</option> (<option>-x</"
"option>) option. For example, to see local differences in file
<filename>foo."
"c</filename> in context output format while ignoring case differences,
you "
-"might run <userinput>svn diff --diff-cmd /usr/bin/diff --extensions '-i'
foo."
-"c</userinput>."
+"might run <userinput>svn diff --diff-cmd /usr/bin/diff -x \"-i\" foo.c</"
+"userinput>."
msgstr ""
"Subversion 使用内置差异引擎，默认输出统一差异格式。如果你期望不同的输出格
式，"
"你可以使用 <option>--diff-cmd</option> 指定外置的区别程序，并且通过
<option>--"
@@ -7001,7 +7012,7 @@
"message</firstterm> describing your change. Your log message will be "
"attached to the new revision you create. If your log message is brief,
you "
"may wish to supply it on the command line using the <option>--message</"
-"option> (or <option>-m</option>) option:"
+"option> (<option>-m</option>) option:"
msgstr ""
"<command>svn commit</command>命令发送所有的修改到版本库，当你提交修改
时，你需"
"要提供一些描述修改的<firstterm>日志信息</firstterm>，你的信息会附到这个修
订版"
@@ -7251,7 +7262,7 @@
"log</command> also takes a <option>--verbose</option>
(<option>-v</option>) "
"option. Because Subversion allows you to move and copy files and "
"directories, it is important to be able to track path changes in the "
-"filesystem. So, in verbose mode, <command>svn log</command> will include
a "
+"filesystem. So, in verbose mode, <command>svn log</command> will include
a "
"list of changed paths in a revision in its output:"
msgstr ""
"如果你希望得到目录和文件更多的信息，你可以对<command>svn log</command>命令
使用"
@@ -7419,7 +7430,7 @@
"作修订版本的情况下查看文件和目录的内容，实际上，你甚至也不需要有一个工作副
本。"
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refname>
-#: ../../en/book/ch02-basic-usage.xml:2068 ../../en/book/ch09-reference.xml:967
+#: ../../en/book/ch02-basic-usage.xml:2068 ../../en/book/ch09-reference.xml:968
msgid "svn cat"
msgstr "svn cat"
@@ -7439,7 +7450,7 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refnamediv><refname>
#: ../../en/book/ch02-basic-usage.xml:2096
-#: ../../en/book/ch09-reference.xml:2603
+#: ../../en/book/ch09-reference.xml:2606
msgid "svn list"
msgstr "svn list"
@@ -7669,7 +7680,7 @@
#. type: Content of: <book><chapter><sect1><para>
#: ../../en/book/ch02-basic-usage.xml:2290
msgid ""
-"So far, we have only talked about conflicts at the level of file
content. "
+"So far, we have only talked about conflicts at the level of file
content. "
"When you and your collaborators make overlapping changes within the same "
"file, Subversion forces you to merge those changes before you can commit."
"<placeholder type=\"footnote\" id=\"0\"/>"
@@ -7679,7 +7690,7 @@
#: ../../en/book/ch02-basic-usage.xml:2293
msgid ""
"Well, you could mark files containing conflict markers as resolved and
commit "
-"them, if you really wanted to. But this is rarely done in practice."
+"them, if you really wanted to. But this is rarely done in practice."
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
@@ -7688,10 +7699,10 @@
"But what happens if your collaborators move or delete a file that you
are "
"still working on? Maybe there was a miscommunication, and one person
thinks "
"the file should be deleted, while another person still wants to commit "
-"changes to the file. Or maybe your collaborators did some refactoring, "
-"renaming files and moving around directories in the process. If you were "
+"changes to the file. Or maybe your collaborators did some refactoring, "
+"renaming files and moving around directories in the process. If you
were "
"still working on these files, those modifications may need to be applied
to "
-"the files at their new location. Such conflicts manifest themselves at
the "
+"the files at their new location. Such conflicts manifest themselves at
the "
"directory tree structure level rather than at the file content level, and
are "
"known as <firstterm>tree conflicts</firstterm>."
msgstr ""
@@ -7705,9 +7716,9 @@
#: ../../en/book/ch02-basic-usage.xml:2312
msgid ""
"Prior to Subversion 1.6, tree conflicts could yield rather unexpected "
-"results. For example, if a file was locally modified, but had been
renamed in "
-"the repository, running <command>svn update</command> would make
Subversion "
-"carry out the following steps:"
+"results. For example, if a file was locally modified, but had been
renamed "
+"in the repository, running <command>svn update</command> would make "
+"Subversion carry out the following steps:"
msgstr ""
#. type: Content of:
<book><chapter><sect1><sidebar><itemizedlist><listitem><para>
@@ -7719,7 +7730,7 @@
#: ../../en/book/ch02-basic-usage.xml:2322
msgid ""
"Delete the file at its old location, and if it had local modifications,
keep "
-"an on-disk copy of the file at the old location. This on-disk copy now "
+"an on-disk copy of the file at the old location. This on-disk copy now "
"appears as an unversioned file in the working copy."
msgstr ""
@@ -7789,8 +7800,9 @@
#. type: Content of: <book><chapter><sect1><sect2><para>
#: ../../en/book/ch02-basic-usage.xml:2415
+#, fuzzy
msgid ""
-"Your changes are all based on revision 4. They cannot be committed
because "
+"Your changes are all based on revision 4. They cannot be committed
because "
"Harry has already checked in revision 5:"
msgstr "你的修改完全基于版本 4。因为 Harry 已经检入了版本 5，所以它不能被提
交。"
@@ -7830,7 +7842,7 @@
"another during an update, all Subversion can warn you about is an
incoming "
"delete operation on a locally modified file. This delete operation "
"<emphasis>may</emphasis> be part of a move, or it could be a genuine
delete "
-"operation. Talking to your collaborators, or, as a last resort,
<command>svn "
+"operation. Talking to your collaborators, or, as a last resort,
<command>svn "
"log</command>, is a good way to find out what has actually happened."
msgstr ""
@@ -7840,7 +7852,7 @@
"Both <filename>foo.c</filename> and <filename>baz.c</filename> are
reported "
"as locally modified in the output of <command>svn status</command>. You
made "
"the changes to <filename>foo.c</filename> yourself, so this should not
be "
-"surprising. But why is <filename>baz.c</filename> reported as locally "
+"surprising. But why is <filename>baz.c</filename> reported as locally "
"modified?"
msgstr ""
@@ -7861,7 +7873,7 @@
"is based on the revision in which it was last modified before being moved
in "
"the repository. Otherwise, Subversion will resort to retreiving "
"<filename>baz.c</filename> from the repository, and will not try to
transfer "
-"your local modifications to it. You will have to do so manually."
+"your local modifications to it. You will have to do so manually."
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
@@ -7876,7 +7888,7 @@
#: ../../en/book/ch02-basic-usage.xml:2520
msgid ""
"So how can this conflict be resolved? You can either agree or disagree
with "
-"the move Harry made. In case you agree, you can delete <filename>bar.c</"
+"the move Harry made. In case you agree, you can delete <filename>bar.c</"
"filename> and mark the tree conflict as resolved:"
msgstr ""
@@ -7885,7 +7897,7 @@
msgid ""
"If you do not agree with the move, you can delete
<filename>baz.c</filename> "
"instead, after making sure any changes made to it after it was renamed
are "
-"either preserved or not worth keeping. Do not forget to revert the
changes "
+"either preserved or not worth keeping. Do not forget to revert the
changes "
"Harry made to the <filename>Makefile</filename>. Since <filename>bar.c</"
"filename> is already scheduled for re-addition, there is nothing else
left to "
"do, and the conflict can be marked resolved:"
@@ -8509,13 +8521,13 @@
msgid ""
"Trying to locate a custom revision property generally involves performing
a "
"linear walk across all the revisions of the repository, asking of each "
-"revision, \"Do you have the property I'm looking for?\" Trying to find a "
-"custom versioned property is painful, too, and often involves a
recursive "
-"<command>svn propget</command> across an entire working copy. In your "
-"situation, that might not be as bad as a linear walk across all
revisions. "
-"But it certainly leaves much to be desired in terms of both performance
and "
-"likelihood of success, especially if the scope of your search would
require a "
-"working copy from the root of your repository."
+"revision, <quote>Do you have the property I'm looking for?</quote> Trying
to "
+"find a custom versioned property is painful, too, and often involves a "
+"recursive <command>svn propget</command> across an entire working copy.
In "
+"your situation, that might not be as bad as a linear walk across all "
+"revisions. But it certainly leaves much to be desired in terms of both "
+"performance and likelihood of success, especially if the scope of your
search "
+"would require a working copy from the root of your repository."
msgstr ""
"为了定位一个自定义属性通常要线形访问版本库的所有修订版本，向每个修订版本
询"
"问，“你们有我找的属性吗？”尝试查找自定义版本化属性也是同样的痛苦，通常需要
在整"
@@ -8599,9 +8611,10 @@
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
#: ../../en/book/ch03-advanced-topics.xml:509
+#, fuzzy
msgid ""
"If you're familiar with XML, this is pretty much the ASCII subset of the "
-"syntax for XML \"Name\"."
+"syntax for XML <quote>Name</quote>."
msgstr "如果你熟悉XML，其实这就是XML的\"Name\"语法的ASCII子集。"
#. type: Content of: <book><chapter><sect1><sect2><para>
@@ -8673,7 +8686,7 @@
"置<option>--verbose</option>(<option>-v</option>)选项。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:595
+#: ../../en/book/ch03-advanced-topics.xml:597
#, fuzzy
msgid ""
"The last property-related subcommand is <command>propdel</command>.
Since "
@@ -8687,7 +8700,7 @@
"令删除一个属性。例如，这个命令<emphasis>不会</emphasis>产生预期的效果："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:612
+#: ../../en/book/ch03-advanced-topics.xml:616
msgid ""
"You need to use the <command>propdel</command> subcommand to delete "
"properties altogether. The syntax is similar to the other property
commands:"
@@ -8696,7 +8709,7 @@
"似："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:625
+#: ../../en/book/ch03-advanced-topics.xml:630
#, fuzzy
msgid ""
"Remember those unversioned revision properties? You can modify those,
too, "
@@ -8720,7 +8733,7 @@
"简单的运行没有目标路径的<command>svn propset</command>命令："
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:639
+#: ../../en/book/ch03-advanced-topics.xml:644
msgid ""
"Fixing spelling errors, grammatical gotchas, and
<quote>just-plain-wrongness</"
"quote> in commit log messages is perhaps the most common use case for
the "
@@ -8730,7 +8743,7 @@
"revprop</option>选项最常见用例。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:654
+#: ../../en/book/ch03-advanced-topics.xml:659
msgid ""
"But even if you haven't checked out a working copy from that repository,
you "
"can still effect the property change by providing the repository's root
URL:"
@@ -8739,7 +8752,7 @@
"性："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:665
+#: ../../en/book/ch03-advanced-topics.xml:670
#, fuzzy
msgid ""
"Note that the ability to modify these unversioned properties must be "
@@ -8756,7 +8769,7 @@
"下，修改未版本化的属性是禁止的。"
#. type: Content of: <book><chapter><sect1><sect2><tip><para>
-#: ../../en/book/ch03-advanced-topics.xml:675
+#: ../../en/book/ch03-advanced-topics.xml:680
#, fuzzy
msgid ""
"Users should, where possible, use <command>svn propedit</command> instead
of "
@@ -8775,12 +8788,12 @@
"行属性。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:691
+#: ../../en/book/ch03-advanced-topics.xml:696
msgid "Properties and the Subversion Workflow"
msgstr "属性和 Subversion 工作流程"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:693
+#: ../../en/book/ch03-advanced-topics.xml:698
#, fuzzy
msgid ""
"Now that you are familiar with all of the property-related <command>svn</"
@@ -8796,7 +8809,7 @@
"净或者冲突的方式—其他人的修改应用到你的修改。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:702
+#: ../../en/book/ch03-advanced-topics.xml:707
#, fuzzy
msgid ""
"As with file contents, your property changes are local modifications,
made "
@@ -8815,7 +8828,7 @@
"兴趣的文件和目录属性的状态信息。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:725
+#: ../../en/book/ch03-advanced-topics.xml:730
#, fuzzy
msgid ""
"Notice how the <command>status</command> subcommand displays <literal>M</"
@@ -8831,12 +8844,12 @@
"<xref linkend=\"svn.tour.cycle.examine.status\"/>)。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:735
+#: ../../en/book/ch03-advanced-topics.xml:740
msgid "Property Conflicts"
msgstr "属性冲突"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:737
+#: ../../en/book/ch03-advanced-topics.xml:742
#, fuzzy
msgid ""
"As with file contents, local property modifications can conflict with
changes "
@@ -8848,7 +8861,7 @@
"并且接收到有资源属性修改与你的修改冲突，Subversion会报告资源处于冲突状
态。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:755
+#: ../../en/book/ch03-advanced-topics.xml:760
#, fuzzy
msgid ""
"Subversion will also create, in the same directory as the conflicted
object, "
@@ -8865,7 +8878,7 @@
"一个<literal>C</literal>，提交本地修改的尝试会失败。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:775
+#: ../../en/book/ch03-advanced-topics.xml:780
msgid ""
"To resolve property conflicts, simply ensure that the conflicting
properties "
"contain the values that they should, and then use the <command>svn
resolved</"
@@ -8876,7 +8889,7 @@
"<command>svn resolved</command>命令告诉Subversion你已经手工解决了问题。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:783
+#: ../../en/book/ch03-advanced-topics.xml:788
#, fuzzy
msgid ""
"You might also have noticed the nonstandard way that Subversion
currently "
@@ -8894,12 +8907,12 @@
"修改必须手工实施。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:797
+#: ../../en/book/ch03-advanced-topics.xml:802
msgid "Automatic Property Setting"
msgstr "自动设置属性"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:799
+#: ../../en/book/ch03-advanced-topics.xml:804
#, fuzzy
msgid ""
"Properties are a powerful feature of Subversion, acting as key components
of "
@@ -8921,7 +8934,7 @@
"供了一些简单但是有用的特性。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:812
+#: ../../en/book/ch03-advanced-topics.xml:817
#, fuzzy
msgid ""
"Whenever you introduce a file to version control using the <command>svn
add</"
@@ -8940,7 +8953,7 @@
"advanced.props.special.executable\"/>)。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:823
+#: ../../en/book/ch03-advanced-topics.xml:828
#, fuzzy
msgid ""
"Second, Subversion tries to determine the file's MIME type. If you've "
@@ -8972,7 +8985,7 @@
"\"svn.advanced.props.special.mime-type\"/>。)"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:846
+#: ../../en/book/ch03-advanced-topics.xml:851
#, fuzzy
msgid ""
"Subversion also provides, via its runtime configuration system (see
<xref "
@@ -9005,12 +9018,12 @@
"confarea.opts.config\"/>来查看更多的配置支持。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:875
+#: ../../en/book/ch03-advanced-topics.xml:880
msgid "File Portability"
msgstr "文件移植性"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:877
+#: ../../en/book/ch03-advanced-topics.xml:882
#, fuzzy
msgid ""
"Fortunately for Subversion users who routinely find themselves on
different "
@@ -9023,7 +9036,7 @@
"在其他平台上运行。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:884
+#: ../../en/book/ch03-advanced-topics.xml:889
#, fuzzy
msgid ""
"However, the same is not always true of other general classes of software
or "
@@ -9042,7 +9055,7 @@
"性；而Windows使用文件扩展名。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:895
+#: ../../en/book/ch03-advanced-topics.xml:900
#, fuzzy
msgid ""
"Because Subversion is in no position to unite the whole world in common "
@@ -9056,12 +9069,12 @@
"是如何做的。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:904
+#: ../../en/book/ch03-advanced-topics.xml:909
msgid "File Content Type"
msgstr "文件内容类型"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:906
+#: ../../en/book/ch03-advanced-topics.xml:911
#, fuzzy
msgid ""
"Subversion joins the ranks of the many applications that recognize and
make "
@@ -9076,12 +9089,12 @@
"的行为特性。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:915
+#: ../../en/book/ch03-advanced-topics.xml:920
msgid "Identifying File Types"
msgstr "识别文件类型"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:917
+#: ../../en/book/ch03-advanced-topics.xml:922
#, fuzzy
msgid ""
"Various programs on most modern operating systems make assumptions about
the "
@@ -9102,7 +9115,7 @@
"使用。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:931
+#: ../../en/book/ch03-advanced-topics.xml:936
#, fuzzy
msgid ""
"Unfortunately, some of those extensions have changed their meanings over "
@@ -9124,7 +9137,7 @@
"<placeholder-1/>"
#. type: Content of:
<book><chapter><sect1><sect2><sidebar><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:944
+#: ../../en/book/ch03-advanced-topics.xml:949
msgid ""
"You think that was rough? During that same era, WordPerfect also used "
"<filename>.DOC</filename> for their proprietary file format's preferred "
@@ -9134,7 +9147,7 @@
"作为它们私有文件格式的扩展名！"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:950
+#: ../../en/book/ch03-advanced-topics.xml:955
#, fuzzy
msgid ""
"The popularity of computer networking cast still more doubt on the
mapping "
@@ -9153,7 +9166,7 @@
"示数据，或者是提示用户将文件下载到某个地方。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:962
+#: ../../en/book/ch03-advanced-topics.xml:967
#, fuzzy
msgid ""
"Eventually, a standard emerged for, among other things, describing the "
@@ -9170,7 +9183,7 @@
"服务器和其他软件，成为了防止文件内容混淆的标准机制。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:975
+#: ../../en/book/ch03-advanced-topics.xml:980
#, fuzzy
msgid ""
"For example, one of the benefits that Subversion typically provides is "
@@ -9201,7 +9214,7 @@
"护用户在对不可文本合并的文件尝试执行文本的合并时失败的情形。"
#. type: Content of: <book><chapter><sect1><sect2><warning><para>
-#: ../../en/book/ch03-advanced-topics.xml:996
+#: ../../en/book/ch03-advanced-topics.xml:1001
#, fuzzy
msgid ""
"The <literal>svn:mime-type</literal> property, when set to a value that
does "
@@ -9222,7 +9235,7 @@
"Subversion会默默的略过不适合特定属性的文件。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1011
+#: ../../en/book/ch03-advanced-topics.xml:1016
#, fuzzy
msgid ""
"Beginning in Subversion 1.5, users can configure a new
<literal>mime-types-"
@@ -9235,7 +9248,7 @@
"添加和导入文件的MIME类型。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1018
+#: ../../en/book/ch03-advanced-topics.xml:1023
#, fuzzy
msgid ""
"Also, if the <literal>svn:mime-type</literal> property is set, then the "
@@ -9249,12 +9262,12 @@
"何显示版本库的一个文件提供了至关重要的线索。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:1029
+#: ../../en/book/ch03-advanced-topics.xml:1034
msgid "File Executability"
msgstr "文件的可执行性"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1031
+#: ../../en/book/ch03-advanced-topics.xml:1036
#, fuzzy
msgid ""
"On many operating systems, the ability to execute a file as a command is "
@@ -9274,7 +9287,7 @@
"保持打开执行位，在工作副本得到这些文件时设置执行位。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1044
+#: ../../en/book/ch03-advanced-topics.xml:1049
#, fuzzy
msgid ""
"This property has no effect on filesystems that have no concept of an "
@@ -9288,7 +9301,7 @@
"<literal>*</literal>，最后，这个属性只对文件有效，目录无效。"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:1048
+#: ../../en/book/ch03-advanced-topics.xml:1053
msgid ""
"The Windows filesystems use file extensions (such as <filename>.EXE</"
"filename>, <filename>.BAT</filename>, and <filename>.COM</filename>) to "
@@ -9298,12 +9311,12 @@
"literal>和<literal>.COM</literal>)来标示可执行文件。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:1062
+#: ../../en/book/ch03-advanced-topics.xml:1067
msgid "End-of-Line Character Sequences"
msgstr "行结束字符序列"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1064
+#: ../../en/book/ch03-advanced-topics.xml:1069
#, fuzzy
msgid ""
"Unless otherwise noted using a versioned file's <literal>svn:mime-type</"
@@ -9317,7 +9330,7 @@
"可以用上下文区别的报告，否则，对Subversion来说只是字节。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1071
+#: ../../en/book/ch03-advanced-topics.xml:1076
#, fuzzy
msgid ""
"This means that by default, Subversion doesn't pay any attention to the
type "
@@ -9337,7 +9350,7 @@
"来表示一个行的结束。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1083
+#: ../../en/book/ch03-advanced-topics.xml:1088
#, fuzzy
msgid ""
"Not all of the various tools on these operating systems understand files
that "
@@ -9357,7 +9370,7 @@
"<literal>CRLF</literal>)字符。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1095
+#: ../../en/book/ch03-advanced-topics.xml:1100
#, fuzzy
msgid ""
"This sensitivity to foreign EOL markers can be frustrating for folks who "
@@ -9371,7 +9384,7 @@
"具可以展示文件的行结束，那就没有问题了。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1103
+#: ../../en/book/ch03-advanced-topics.xml:1108
#, fuzzy
msgid ""
"But in practice, many common tools either fail to properly read a file
with "
@@ -9394,7 +9407,7 @@
"件的行结束样式，或者是简单的提交文件—包含新的EOL标志。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1119
+#: ../../en/book/ch03-advanced-topics.xml:1124
#, fuzzy
msgid ""
"The result of scenarios like these include wasted time and unnecessary "
@@ -9408,7 +9421,7 @@
"bug在哪一行修正的？哪一行导致了语法错误？"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:1127
+#: ../../en/book/ch03-advanced-topics.xml:1132
#, fuzzy
msgid ""
"The solution to this problem is the <literal>svn:eol-style</literal> "
@@ -9422,12 +9435,12 @@
"多种操作系统的每次提交而发生剧烈变化，正确的值有："
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1137
+#: ../../en/book/ch03-advanced-topics.xml:1142
msgid "<literal>native</literal>"
msgstr "<literal>native</literal>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1139
+#: ../../en/book/ch03-advanced-topics.xml:1144
#, fuzzy
msgid ""
"This causes the file to contain the EOL markers that are native to the "
@@ -9445,7 +9458,7 @@
"志。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1151
+#: ../../en/book/ch03-advanced-topics.xml:1156
#, fuzzy
msgid ""
"Note that Subversion will actually store the file in the repository
using "
@@ -9456,12 +9469,12 @@
"管这对用户来说是透明的。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1159
+#: ../../en/book/ch03-advanced-topics.xml:1164
msgid "<literal>CRLF</literal>"
msgstr "<literal>CRLF</literal>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1161
+#: ../../en/book/ch03-advanced-topics.xml:1166
msgid ""
"This causes the file to contain <literal>CRLF</literal> sequences for
EOL "
"markers, regardless of the operating system in use."
@@ -9470,12 +9483,12 @@
"统。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1167
+#: ../../en/book/ch03-advanced-topics.xml:1172
msgid "<literal>LF</literal>"
msgstr "<literal>LF</literal>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1169
+#: ../../en/book/ch03-advanced-topics.xml:1174
msgid ""
"This causes the file to contain <literal>LF</literal> characters for EOL "
"markers, regardless of the operating system in use."
@@ -9483,12 +9496,12 @@
"这会导致文件使用<literal>LF</literal>字符作为EOL标志，不管使用何种操作系
统。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1175
+#: ../../en/book/ch03-advanced-topics.xml:1180
msgid "<literal>CR</literal>"
msgstr "<literal>CR</literal>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1177
+#: ../../en/book/ch03-advanced-topics.xml:1182
#, fuzzy
msgid ""
"This causes the file to contain <literal>CR</literal> characters for EOL "
@@ -9498,12 +9511,12 @@
"这会导致文件使用<literal>LF</literal>字符作为EOL标志，不管使用何种操作系
统。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:1192
+#: ../../en/book/ch03-advanced-topics.xml:1197
msgid "Ignoring Unversioned Items"
msgstr "忽略未版本控制的条目"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1194
+#: ../../en/book/ch03-advanced-topics.xml:1199
#, fuzzy
msgid ""
"In any given working copy, there is a good chance that alongside all
those "
@@ -9520,7 +9533,7 @@
"任何时候都会将他们删除。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1204
+#: ../../en/book/ch03-advanced-topics.xml:1209
#, fuzzy
msgid ""
"It's ludicrous to expect Subversion working copies to be somehow
impervious "
@@ -9544,7 +9557,7 @@
"贝中包括未版本化文件和目录的信息，如果这种文件很多，它的输出会变得非常嘈
杂。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1220
+#: ../../en/book/ch03-advanced-topics.xml:1225
#, fuzzy
msgid ""
"So Subversion provides two ways for telling it which files you would
prefer "
@@ -9567,7 +9580,7 @@
"模式。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1234
+#: ../../en/book/ch03-advanced-topics.xml:1239
#, fuzzy
msgid ""
"The Subversion runtime configuration system provides an option, "
@@ -9588,12 +9601,12 @@
"模式，例如编辑器Emacs的备份文件<literal>*~</literal>和
<literal>.*~</literal>。"
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:1248
+#: ../../en/book/ch03-advanced-topics.xml:1253
msgid "File Patterns in Subversion"
msgstr "Subversion 中的文件模式？"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:1250
+#: ../../en/book/ch03-advanced-topics.xml:1255
#, fuzzy
msgid ""
"File patterns (also called <firstterm>globs</firstterm> or
<firstterm>shell "
@@ -9611,7 +9624,7 @@
"的明确比较，和特殊通配符，用来解释不同的匹配目标。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:1261
+#: ../../en/book/ch03-advanced-topics.xml:1266
#, fuzzy
msgid ""
"There are different types of file pattern syntaxes, but Subversion uses
the "
@@ -9624,32 +9637,32 @@
"的描述："
#. type: Content of:
<book><chapter><sect1><sidebar><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1269
+#: ../../en/book/ch03-advanced-topics.xml:1274
msgid "<literal>?</literal>"
msgstr "<literal>?</literal>"
#. type: Content of:
<book><chapter><sect1><sidebar><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1271
+#: ../../en/book/ch03-advanced-topics.xml:1276
msgid "Matches any single character"
msgstr "匹配任意单个字符"
#. type: Content of:
<book><chapter><sect1><sidebar><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1275
+#: ../../en/book/ch03-advanced-topics.xml:1280
msgid "<literal>*</literal>"
msgstr "<literal>*</literal>"
#. type: Content of:
<book><chapter><sect1><sidebar><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1277
+#: ../../en/book/ch03-advanced-topics.xml:1282
msgid "Matches any string of characters, including the empty string"
msgstr "匹配任意字符串，包括空字符串"
#. type: Content of:
<book><chapter><sect1><sidebar><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1282
+#: ../../en/book/ch03-advanced-topics.xml:1287
msgid "<literal>[</literal>"
msgstr "<literal>[</literal>"
#. type: Content of:
<book><chapter><sect1><sidebar><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1284
+#: ../../en/book/ch03-advanced-topics.xml:1289
#, fuzzy
msgid ""
"Begins a character class definition terminated by <literal>]</literal>,
used "
@@ -9658,7 +9671,7 @@
"开始一个字符类定义，由<literal>]</literal>结束，用来匹配一组字符串的子
集。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:1291
+#: ../../en/book/ch03-advanced-topics.xml:1296
#, fuzzy
msgid ""
"You can see this same pattern matching behavior at a Unix shell prompt.
The "
@@ -9668,7 +9681,7 @@
"子："
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:1322
+#: ../../en/book/ch03-advanced-topics.xml:1327
msgid ""
"File pattern matching is a bit more complex than what we've described
here, "
"but this basic usage level tends to suit the majority of Subversion
users."
@@ -9677,7 +9690,7 @@
"Subversion的用户。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1328
+#: ../../en/book/ch03-advanced-topics.xml:1333
#, fuzzy
msgid ""
"When found on a versioned directory, the <literal>svn:ignore</literal> "
@@ -9704,7 +9717,7 @@
"从DocBook XML文件生成的HTML, PDF或PostScript。"
#. type: Content of: <book><chapter><sect1><note><para>
-#: ../../en/book/ch03-advanced-topics.xml:1348
+#: ../../en/book/ch03-advanced-topics.xml:1353
#, fuzzy
msgid ""
"Subversion's support for ignorable file patterns extends only to the
one-time "
@@ -9720,12 +9733,12 @@
"会阻止你提交一个符合忽略条件的修改—Subversion一直认为它是版本化的对象。"
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:1360
+#: ../../en/book/ch03-advanced-topics.xml:1365
msgid "Ignore Patterns for CVS Users"
msgstr "CVS 用户的忽略模式"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:1362
+#: ../../en/book/ch03-advanced-topics.xml:1367
#, fuzzy
msgid ""
"The Subversion <literal>svn:ignore</literal> property is very similar in "
@@ -9740,7 +9753,7 @@
"propset</command>输入文件参数："
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:1376
+#: ../../en/book/ch03-advanced-topics.xml:1381
#, fuzzy
msgid ""
"There are, however, some differences in the ways that CVS and Subversion "
@@ -9755,7 +9768,7 @@
"literal>模式来去取消忽略模式。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1386
+#: ../../en/book/ch03-advanced-topics.xml:1391
#, fuzzy
msgid ""
"The global list of ignore patterns tends to be more a matter of personal "
@@ -9767,12 +9780,12 @@
"的需要，所以余下的小节将关注<literal>svn:ignore</literal>属性和它的使用。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1393
+#: ../../en/book/ch03-advanced-topics.xml:1398
msgid "Say you have the following output from <command>svn
status</command>:"
msgstr "假定你的<command>svn status</command>有如下输出："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1407
+#: ../../en/book/ch03-advanced-topics.xml:1412
#, fuzzy
msgid ""
"In this example, you have made some property modifications to "
@@ -9802,12 +9815,12 @@
"性："
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:1416
+#: ../../en/book/ch03-advanced-topics.xml:1421
msgid "Isn't that the whole point of a build system?"
msgstr "这不是编译系统的基本功能吗？"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1434
+#: ../../en/book/ch03-advanced-topics.xml:1439
#, fuzzy
msgid ""
"After you've added this property, you will now have a local property "
@@ -9818,7 +9831,7 @@
"意你的<command>svn status</command>输出有什么其他的不同："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1446
+#: ../../en/book/ch03-advanced-topics.xml:1451
#, fuzzy
msgid ""
"Now, all that cruft is missing from the output! Your
<filename>calculator</"
@@ -9835,7 +9848,7 @@
"代码文件<filename>data.c</filename>。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1455
+#: ../../en/book/ch03-advanced-topics.xml:1460
#, fuzzy
msgid ""
"Of course, this less-verbose report of your working copy status isn't
the "
@@ -9847,7 +9860,7 @@
"Subversion的<option>--no-ignore</option>选项："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1472
+#: ../../en/book/ch03-advanced-topics.xml:1477
#, fuzzy
msgid ""
"As mentioned earlier, the list of file patterns to ignore is also used
by "
@@ -9869,7 +9882,7 @@
"略列表。"
#. type: Content of: <book><chapter><sect1><tip><para>
-#: ../../en/book/ch03-advanced-topics.xml:1487
+#: ../../en/book/ch03-advanced-topics.xml:1492
#, fuzzy
msgid ""
"Even if <literal>svn:ignore</literal> is set, you may run into problems
if "
@@ -9904,12 +9917,12 @@
"files</option>选项。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:1518
+#: ../../en/book/ch03-advanced-topics.xml:1523
msgid "Keyword Substitution"
msgstr "关键字替换"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1520
+#: ../../en/book/ch03-advanced-topics.xml:1525
#, fuzzy
msgid ""
"Subversion has the ability to substitute <firstterm>keywords</"
@@ -9928,7 +9941,7 @@
"乱，作为人类作者，信息变得陈旧是不可避免的。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1532
+#: ../../en/book/ch03-advanced-topics.xml:1537
#, fuzzy
msgid ""
"For example, say you have a document in which you would like to display
the "
@@ -9950,7 +9963,7 @@
"literal><replaceable>KeywordName</replaceable><literal>$</literal>字符
串。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1546
+#: ../../en/book/ch03-advanced-topics.xml:1551
#, fuzzy
msgid ""
"All keywords are case-sensitive where they appear as anchors in files:
you "
@@ -9964,7 +9977,7 @@
"定的关键字名会忽略大小写，但是这个特性已经被废弃了。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1553
+#: ../../en/book/ch03-advanced-topics.xml:1558
#, fuzzy
msgid ""
"Subversion defines the list of keywords available for substitution.
That "
@@ -9975,12 +9988,12 @@
"括了可用的别名："
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1559
+#: ../../en/book/ch03-advanced-topics.xml:1564
msgid "<literal>Date</literal>"
msgstr "<literal>Date</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1561
+#: ../../en/book/ch03-advanced-topics.xml:1566
#, fuzzy
msgid ""
"This keyword describes the last time the file was known to have been
changed "
@@ -9995,12 +10008,12 @@
"<literal>LastChangedDate</literal>来指定。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1572
+#: ../../en/book/ch03-advanced-topics.xml:1577
msgid "<literal>Revision</literal>"
msgstr "<literal>Revision</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1574
+#: ../../en/book/ch03-advanced-topics.xml:1579
#, fuzzy
msgid ""
"This keyword describes the last known revision in which this file changed
in "
@@ -10013,12 +10026,12 @@
"<literal>Rev</literal>引用。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1583
+#: ../../en/book/ch03-advanced-topics.xml:1588
msgid "<literal>Author</literal>"
msgstr "<literal>Author</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1585
+#: ../../en/book/ch03-advanced-topics.xml:1590
#, fuzzy
msgid ""
"This keyword describes the last known user to change this file in the "
@@ -10029,12 +10042,12 @@
"$</literal>，也可以用<literal>LastChangedBy</literal>来指定。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1593
+#: ../../en/book/ch03-advanced-topics.xml:1598
msgid "<literal>HeadURL</literal>"
msgstr "<literal>HeadURL</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1595
+#: ../../en/book/ch03-advanced-topics.xml:1600
#, fuzzy
msgid ""
"This keyword describes the full URL to the latest version of the file in
the "
@@ -10047,12 +10060,12 @@
"po $</literal>，可以缩写为<literal>URL</literal>。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1604
+#: ../../en/book/ch03-advanced-topics.xml:1609
msgid "<literal>Id</literal>"
msgstr "<literal>Id</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1606
+#: ../../en/book/ch03-advanced-topics.xml:1611
#, fuzzy
msgid ""
"This keyword is a compressed combination of the other keywords. Its "
@@ -10070,7 +10083,7 @@
"(使用本地时区)。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1620
+#: ../../en/book/ch03-advanced-topics.xml:1625
#, fuzzy
msgid ""
"Several of the preceding descriptions use the phrase <quote>last known</"
@@ -10087,7 +10100,7 @@
"同的值。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1630
+#: ../../en/book/ch03-advanced-topics.xml:1635
#, fuzzy
msgid ""
"Simply adding keyword anchor text to your file does nothing special. "
@@ -10103,12 +10116,12 @@
"字anchor实例！"
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:1636
+#: ../../en/book/ch03-advanced-topics.xml:1641
msgid "… or maybe even a section of a book …"
msgstr "… 或者可能是本书的一节 …"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1642
+#: ../../en/book/ch03-advanced-topics.xml:1647
#, fuzzy
msgid ""
"To tell Subversion whether to substitute keywords on a particular file,
we "
@@ -10123,7 +10136,7 @@
"表。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1649
+#: ../../en/book/ch03-advanced-topics.xml:1654
msgid ""
"For example, say you have a versioned file named <filename>weather.txt</"
"filename> that looks like this:"
@@ -10131,7 +10144,7 @@
"举个例子，假定你有一个版本化的文件<filename>weather.txt</filename>，内容如
下："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1660
+#: ../../en/book/ch03-advanced-topics.xml:1665
#, fuzzy
msgid ""
"With no <literal>svn:keywords</literal> property set on that file,
Subversion "
@@ -10142,7 +10155,7 @@
"特别操作，现在让我们允许<literal>LastChangedDate</literal>关键字的替换。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1671
+#: ../../en/book/ch03-advanced-topics.xml:1676
#, fuzzy
msgid ""
"Now you have made a local property modification on the
<filename>weather.txt</"
@@ -10161,7 +10174,7 @@
"关键字。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1682
+#: ../../en/book/ch03-advanced-topics.xml:1687
#, fuzzy
msgid ""
"Immediately after you commit this property change, Subversion will
update "
@@ -10179,7 +10192,7 @@
"关键字不会被替换，因为我们没有要求这样做。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1692
+#: ../../en/book/ch03-advanced-topics.xml:1697
#, fuzzy
msgid ""
"Note also that we set the <literal>svn:keywords</literal> property to "
@@ -10191,7 +10204,7 @@
"2009-03-27) $</literal>并且正确的扩展。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1704
+#: ../../en/book/ch03-advanced-topics.xml:1709
#, fuzzy
msgid ""
"If someone else now commits a change to
<filename>weather.txt</filename>, "
@@ -10205,12 +10218,12 @@
"filename>重的关键字将会被替换来反映最新的提交信息。"
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:1713
+#: ../../en/book/ch03-advanced-topics.xml:1718
msgid "Where's $GlobalRev$?"
msgstr "$GlobalRev$ 是什么？"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:1715
+#: ../../en/book/ch03-advanced-topics.xml:1720
#, fuzzy
msgid ""
"New users are often confused by how the <literal>$Rev$</literal> keyword "
@@ -10230,7 +10243,7 @@
"没有Subversion关键字的支持，你怎么才能在你的文件自动得到全局修订版本号？"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:1728
+#: ../../en/book/ch03-advanced-topics.xml:1733
#, fuzzy
msgid ""
"To do this, you need external processing. Subversion ships with a tool "
@@ -10247,7 +10260,7 @@
"\"/>。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1739
+#: ../../en/book/ch03-advanced-topics.xml:1744
#, fuzzy
msgid ""
"Subversion 1.2 introduced a new variant of the keyword syntax, which
brought "
@@ -10271,7 +10284,7 @@
"代值太长，就会在最后的美元符号终止符前用井号(<literal>#</literal>)截断。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1756
+#: ../../en/book/ch03-advanced-topics.xml:1761
#, fuzzy
msgid ""
"For example, say you have a document in which you have some section of "
@@ -10283,7 +10296,7 @@
"Subversion关键字替换语法，你的文件或许像这样："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1768
+#: ../../en/book/ch03-advanced-topics.xml:1773
#, fuzzy
msgid ""
"Now, that looks nice and tabular at the start of things. But when you
then "
@@ -10293,7 +10306,7 @@
"到："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1778
+#: ../../en/book/ch03-advanced-topics.xml:1783
#, fuzzy
msgid ""
"The result is not so beautiful. And you might be tempted to then adjust
the "
@@ -10311,7 +10324,7 @@
"用新的固定长度的关键字语法，定义合适的字段宽度，然后你的文件可能如此："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1795
+#: ../../en/book/ch03-advanced-topics.xml:1800
#, fuzzy
msgid ""
"You commit this change to your file. This time, Subversion notices the
new "
@@ -10328,7 +10341,7 @@
"较长的<literal>Date</literal>字段被一个分号截断："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1811
+#: ../../en/book/ch03-advanced-topics.xml:1816
msgid ""
"The use of fixed-length keywords is especially handy when performing "
"substitutions into complex file formats that themselves use fixed-length "
@@ -10340,7 +10353,7 @@
"序(例如Microsoft Office文档)进行修改的文件。"
#. type: Content of: <book><chapter><sect1><warning><para>
-#: ../../en/book/ch03-advanced-topics.xml:1819
+#: ../../en/book/ch03-advanced-topics.xml:1824
#, fuzzy
msgid ""
"Be aware that because the width of a keyword field is measured in bytes,
the "
@@ -10362,12 +10375,12 @@
"小时，需要选择一个可以扩展的大小。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:1842
+#: ../../en/book/ch03-advanced-topics.xml:1847
msgid "Sparse Directories"
msgstr "稀疏目录"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1844
+#: ../../en/book/ch03-advanced-topics.xml:1849
msgid ""
"By default, most Subversion operations on directories act in a recursive "
"manner. For example, <command>svn checkout</command> creates a working
copy "
@@ -10382,7 +10395,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1858
+#: ../../en/book/ch03-advanced-topics.xml:1863
msgid ""
"For example, say we have a repository with a tree of files and
directories "
"with names of the members of a human family with pets. (It's an odd
example, "
@@ -10391,14 +10404,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1880
+#: ../../en/book/ch03-advanced-topics.xml:1885
msgid ""
"Now, let's check out the same tree again, but this time we'll ask
Subversion "
"to give us only the topmost directory with none of its children at all:"
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1890
+#: ../../en/book/ch03-advanced-topics.xml:1895
msgid ""
"Notice that we added to our original <command>svn checkout</command>
command "
"line a new <option>--depth</option> option. This option is present on
many "
@@ -10412,55 +10425,55 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1906
+#: ../../en/book/ch03-advanced-topics.xml:1911
msgid "<literal>--depth empty</literal>"
msgstr "<literal>--depth empty</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1908
+#: ../../en/book/ch03-advanced-topics.xml:1913
msgid ""
"Include only the immediate target of the operation, not any of its file
or "
"directory children."
msgstr ""
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1914
+#: ../../en/book/ch03-advanced-topics.xml:1919
msgid "<literal>--depth files</literal>"
msgstr "<literal>--depth files</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1916
+#: ../../en/book/ch03-advanced-topics.xml:1921
msgid ""
"Include the immediate target of the operation and any of its immediate
file "
"children."
msgstr ""
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1922
+#: ../../en/book/ch03-advanced-topics.xml:1927
msgid "<literal>--depth immediates</literal>"
msgstr "<literal>--depth immediates</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1924
+#: ../../en/book/ch03-advanced-topics.xml:1929
msgid ""
"Include the immediate target of the operation and any of its immediate
file "
"or directory children. The directory children will themselves be empty."
msgstr ""
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:1931
+#: ../../en/book/ch03-advanced-topics.xml:1936
msgid "<literal>--depth infinity</literal>"
msgstr "<literal>--depth infinity</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:1933
+#: ../../en/book/ch03-advanced-topics.xml:1938
msgid ""
"Include the immediate target, its file and directory children, its
children's "
"children, and so on to full recursion."
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1941
+#: ../../en/book/ch03-advanced-topics.xml:1946
msgid ""
"Of course, merely combining two existing options into one hardly
constitutes "
"a new feature worthy of a whole section in our book. Fortunately, there
is "
@@ -10476,7 +10489,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><tip><para>
-#: ../../en/book/ch03-advanced-topics.xml:1956
+#: ../../en/book/ch03-advanced-topics.xml:1961
msgid ""
"You can check the recorded ambient depth of a working copy using the "
"<command>svn info</command> command. If the ambient depth is anything
other "
@@ -10485,7 +10498,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1969
+#: ../../en/book/ch03-advanced-topics.xml:1974
msgid ""
"Our previous examples demonstrated checkouts of infinite depth (the
default "
"for <command>svn checkout</command>) and empty depth. Let's look now at "
@@ -10493,14 +10506,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1988
+#: ../../en/book/ch03-advanced-topics.xml:1993
msgid ""
"As described, each of these depths is something more than only the
target, "
"but something less than full recursion."
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:1991
+#: ../../en/book/ch03-advanced-topics.xml:1996
msgid ""
"We've used <command>svn checkout</command> as an example here, but
you'll "
"find the <option>--depth</option> option present on many other
Subversion "
@@ -10518,7 +10531,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2008
+#: ../../en/book/ch03-advanced-topics.xml:2013
msgid ""
"In addition to the <option>--depth</option> option, the <command>svn
update</"
"command> and <command>svn switch</command> subcommands also accept a
second "
@@ -10530,14 +10543,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2037
+#: ../../en/book/ch03-advanced-topics.xml:2042
msgid ""
"As we gradually increased our depth selection, the repository gave us
more "
"pieces of our tree."
msgstr "随着我们逐渐的增加我们的depth选择，版本库给我们目录树的片段。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2040
+#: ../../en/book/ch03-advanced-topics.xml:2045
#, fuzzy
msgid ""
"In our example, we operated only on the root of our working copy,
changing "
@@ -10557,7 +10570,7 @@
"分是被修剪的(不在磁盘里)。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2070
+#: ../../en/book/ch03-advanced-topics.xml:2075
#, fuzzy
msgid ""
"Fortunately, having a complex collection of ambient depths in a single "
@@ -10576,7 +10589,7 @@
"并遵守相关的depth设置。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2081
+#: ../../en/book/ch03-advanced-topics.xml:2086
msgid ""
"You might at this point be wondering, <quote>So what? When would I use
this?</"
"quote> One scenario where this feature finds utility is tied to a
particular "
@@ -10598,7 +10611,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2104
+#: ../../en/book/ch03-advanced-topics.xml:2109
msgid ""
"Subversion 1.5's implementation of shallow checkouts is good but does
not "
"support a couple of interesting behaviors. First, you cannot
de-telescope a "
@@ -10611,12 +10624,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:2121
+#: ../../en/book/ch03-advanced-topics.xml:2126
msgid "Locking"
msgstr "锁定"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2123
+#: ../../en/book/ch03-advanced-topics.xml:2128
#, fuzzy
msgid ""
"Subversion's copy-modify-merge version control model lives and dies on
its "
@@ -10644,7 +10657,7 @@
"持这种类型的合并，你的拷贝-修改-合并模型就会遇到麻烦。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2142
+#: ../../en/book/ch03-advanced-topics.xml:2147
#, fuzzy
msgid ""
"Let's look at a real-life example of where this model runs aground.
Harry "
@@ -10662,7 +10675,7 @@
"的淡蓝色的Ford Mustang，挡泥板有一些溅迹。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2153
+#: ../../en/book/ch03-advanced-topics.xml:2158
#, fuzzy
msgid ""
"Now, as is common in graphic design work, there's a change in plans,
which "
@@ -10687,7 +10700,7 @@
"Sally她的图像已经过期了。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2169
+#: ../../en/book/ch03-advanced-topics.xml:2174
#, fuzzy
msgid ""
"Here's where the difficulty sets in. If Harry and Sally were making
changes "
@@ -10709,7 +10722,7 @@
"掉的红色Mustang。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2184
+#: ../../en/book/ch03-advanced-topics.xml:2189
#, fuzzy
msgid ""
"Of course, things would have gone more smoothly if Harry and Sally had "
@@ -10736,7 +10749,7 @@
"</firstterm>特性，与其他版本控制系统的<quote>保留检出</quote>机制类似。"
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:2193
+#: ../../en/book/ch03-advanced-topics.xml:2198
msgid ""
"Communication wouldn't have been such bad medicine for Harry and Sally's "
"Hollywood namesakes, either, for that matter."
@@ -10744,7 +10757,7 @@
"对于Harry和Sally的好莱坞同名人来说交流也不是那么差的药，也是关于那一点。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2207
+#: ../../en/book/ch03-advanced-topics.xml:2212
#, fuzzy
msgid ""
"Subversion's locking feature exists ultimately to minimize wasted time
and "
@@ -10763,7 +10776,7 @@
"象。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2220
+#: ../../en/book/ch03-advanced-topics.xml:2225
#, fuzzy
msgid ""
"When referring to Subversion's locking feature, one is actually talking
about "
@@ -10781,17 +10794,17 @@
"本小节，我们会覆盖锁定特性的大部分内容。"
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:2224
+#: ../../en/book/ch03-advanced-topics.xml:2229
msgid "Subversion does not currently allow locks on directories."
msgstr "Subversion目前不允许锁定目录。"
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:2234
+#: ../../en/book/ch03-advanced-topics.xml:2239
msgid "The Three Meanings of <quote>Lock</quote>"
msgstr "<quote>锁定</quote>的三种含义"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:2236
+#: ../../en/book/ch03-advanced-topics.xml:2241
#, fuzzy
msgid ""
"In this section, and almost everywhere in this book, the words
<quote>lock</"
@@ -10805,7 +10818,7 @@
"锁，因此需要在本书格外关心。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:2243
+#: ../../en/book/ch03-advanced-topics.xml:2248
#, fuzzy
msgid ""
"The second is <firstterm>working copy locks</firstterm>, used internally
by "
@@ -10821,7 +10834,7 @@
"command>删除，<xref linkend=\"svn.tour.cleanup\"/>有介绍。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:2252
+#: ../../en/book/ch03-advanced-topics.xml:2257
#, fuzzy
msgid ""
"Third, there are <firstterm>database locks</firstterm>, used internally
by "
@@ -10835,7 +10848,7 @@
"<xref linkend=\"svn.reposadmin.maint.recovery\"/>有描述。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:2260
+#: ../../en/book/ch03-advanced-topics.xml:2265
#, fuzzy
msgid ""
"You can generally forget about these other kinds of locks until
something "
@@ -10847,12 +10860,12 @@
"种锁，除非是在从上下文中十分明确或明确指出的。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:2270
+#: ../../en/book/ch03-advanced-topics.xml:2275
msgid "Creating Locks"
msgstr "创建锁定"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2272
+#: ../../en/book/ch03-advanced-topics.xml:2277
#, fuzzy
msgid ""
"In the Subversion repository, a <firstterm>lock</firstterm> is a piece
of "
@@ -10874,7 +10887,7 @@
"锁，控制着锁的创建，权限控制和删除。如果提交包含了修改或者删除锁"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2288
+#: ../../en/book/ch03-advanced-topics.xml:2293
#, fuzzy
msgid ""
"To demonstrate lock creation, let's refer back to our example of
multiple "
@@ -10889,7 +10902,7 @@
"改它)，他使用<command>svn lock</command>命令锁定了版本库中的这个文件："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2302
+#: ../../en/book/ch03-advanced-topics.xml:2307
#, fuzzy
msgid ""
"The preceding example demonstrates a number of new things. First,
notice "
@@ -10910,7 +10923,7 @@
"是可选的，但是为了方便交流我们还是推荐使用。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2315
+#: ../../en/book/ch03-advanced-topics.xml:2320
#, fuzzy
msgid ""
"Second, the lock attempt succeeded. This means that the file wasn't
already "
@@ -10926,7 +10939,7 @@
"命令也会失败。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2324
+#: ../../en/book/ch03-advanced-topics.xml:2329
#, fuzzy
msgid ""
"As you can see, the <command>svn lock</command> command prints
confirmation "
@@ -10939,7 +10952,7 @@
"件已经锁定。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2357
+#: ../../en/book/ch03-advanced-topics.xml:2362
#, fuzzy
msgid ""
"The fact that the <command>svn info</command> command, which does not
contact "
@@ -10957,12 +10970,12 @@
"拥有锁定令牌。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:2368
+#: ../../en/book/ch03-advanced-topics.xml:2373
msgid "Regarding Lock Tokens"
msgstr "关于锁定令牌"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:2370
+#: ../../en/book/ch03-advanced-topics.xml:2375
#, fuzzy
msgid ""
"A lock token isn't an authentication token, so much as an "
@@ -10980,7 +10993,7 @@
"拷贝的证据，而不是其它用户在其他地方，仅仅检验锁定拥有者还不能防止出现意
外。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:2380
+#: ../../en/book/ch03-advanced-topics.xml:2385
#, fuzzy
msgid ""
"For example, suppose you lock a file using a computer at your office,
but "
@@ -11000,7 +11013,7 @@
"这个文件，你必须<firstterm>打破</firstterm>锁定再重新锁定文件。)"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2394
+#: ../../en/book/ch03-advanced-topics.xml:2399
msgid ""
"Now that Harry has locked <filename>banana.jpg</filename>, Sally is
unable to "
"change or delete that file:"
@@ -11009,7 +11022,7 @@
"件："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2409
+#: ../../en/book/ch03-advanced-topics.xml:2414
#, fuzzy
msgid ""
"But Harry, after touching up the banana's shade of yellow, is able to
commit "
@@ -11020,7 +11033,7 @@
"因为他的工作副本有正确的锁定令牌："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2425
+#: ../../en/book/ch03-advanced-topics.xml:2430
#, fuzzy
msgid ""
"Notice that after the commit is finished, <command>svn status</command>
shows "
@@ -11048,7 +11061,7 @@
"command>，会释放所有的30个锁定。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2443
+#: ../../en/book/ch03-advanced-topics.xml:2448
#, fuzzy
msgid ""
"This behavior of automatically releasing locks can be overridden with
the "
@@ -11065,7 +11078,7 @@
"literal>。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2452
+#: ../../en/book/ch03-advanced-topics.xml:2457
#, fuzzy
msgid ""
"Of course, locking a file doesn't oblige one to commit a change to it.
The "
@@ -11076,23 +11089,22 @@
"<command>svn unlock</command>命令释放锁定："
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:2465
+#: ../../en/book/ch03-advanced-topics.xml:2470
msgid "Discovering Locks"
msgstr "发现锁定"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2467
+#: ../../en/book/ch03-advanced-topics.xml:2472
#, fuzzy
msgid ""
"When a commit fails due to someone else's locks, it's fairly easy to
learn "
-"about them. The easiest way is to run <userinput>svn status
--show-updates</"
-"userinput>:"
+"about them. The easiest way is to run <userinput>svn status
-u</userinput>:"
msgstr ""
"最明显的方式就是因为锁定而不能提交一个文件，最简单的方式是<command>svn
status "
"--show-updates</command>："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2480
+#: ../../en/book/ch03-advanced-topics.xml:2485
#, fuzzy
msgid ""
"In this example, Sally can see not only that her copy of
<filename>foo.h</"
@@ -11110,7 +11122,7 @@
"定了文件，什么时候，为什么。再一次，<command>svn info</command>拥有答案："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2510
+#: ../../en/book/ch03-advanced-topics.xml:2515
#, fuzzy
msgid ""
"Just as you can use <command>svn info</command> to examine objects in
the "
@@ -11132,7 +11144,7 @@
"版本的对象信息，任何对锁定的提及描述了当前对象的锁定。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2524
+#: ../../en/book/ch03-advanced-topics.xml:2529
#, fuzzy
msgid ""
"So in this particular example, Sally can see that Harry locked the file
on "
@@ -11147,12 +11159,12 @@
"是找管理员去做。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:2536
+#: ../../en/book/ch03-advanced-topics.xml:2541
msgid "Breaking and Stealing Locks"
msgstr "解除和偷窃锁定"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2538
+#: ../../en/book/ch03-advanced-topics.xml:2543
#, fuzzy
msgid ""
"A repository lock isn't sacred—in Subversion's default
configuration "
@@ -11165,7 +11177,7 @@
"firstterm>锁定。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2544
+#: ../../en/book/ch03-advanced-topics.xml:2549
#, fuzzy
msgid ""
"From the administrator's chair, it's simple to break locks. The "
@@ -11179,7 +11191,7 @@
"具的信息可以看<xref linkend=\"svn.reposadmin.maint.tk\"/>。)"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2574
+#: ../../en/book/ch03-advanced-topics.xml:2579
#, fuzzy
msgid ""
"The more interesting option is to allow users to break each other's
locks "
@@ -11190,7 +11202,7 @@
"<option>--force</option>选项："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2596
+#: ../../en/book/ch03-advanced-topics.xml:2601
#, fuzzy
msgid ""
"Now, Sally's initial attempt to unlock failed because she ran
<command>svn "
@@ -11209,7 +11221,7 @@
"权的要求被忽略了，远程的锁定被打破了。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2607
+#: ../../en/book/ch03-advanced-topics.xml:2612
#, fuzzy
msgid ""
"Simply breaking a lock may not be enough. In the running example, Sally
may "
@@ -11230,7 +11242,7 @@
"项："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2627
+#: ../../en/book/ch03-advanced-topics.xml:2632
#, fuzzy
msgid ""
"In any case, whether the lock is broken or stolen, Harry may be in for a "
@@ -11248,7 +11260,7 @@
"本库："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2648
+#: ../../en/book/ch03-advanced-topics.xml:2653
#, fuzzy
msgid ""
"If the repository lock was broken, then <userinput>svn status
--show-updates</"
@@ -11263,12 +11275,12 @@
"所有死掉的锁定并且把它们从工作副本中删除掉。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:2657
+#: ../../en/book/ch03-advanced-topics.xml:2662
msgid "Locking Policies"
msgstr "锁定策略"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:2659
+#: ../../en/book/ch03-advanced-topics.xml:2664
#, fuzzy
msgid ""
"Different systems have different notions of how strict a lock should
be. "
@@ -11286,7 +11298,7 @@
"户经常的打破别人的锁定，代表了团队的文化失败和软件之外的问题。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:2670
+#: ../../en/book/ch03-advanced-topics.xml:2675
#, fuzzy
msgid ""
"Subversion defaults to the <quote>softer</quote> approach, but still
allows "
@@ -11309,12 +11321,12 @@
"hooks\"/>。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:2691
+#: ../../en/book/ch03-advanced-topics.xml:2696
msgid "Lock Communication"
msgstr "锁定交流"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2693
+#: ../../en/book/ch03-advanced-topics.xml:2698
#, fuzzy
msgid ""
"We've seen how <command>svn lock</command> and <command>svn
unlock</command> "
@@ -11327,17 +11339,17 @@
"间这个大问题该如何呢？"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2699
+#: ../../en/book/ch03-advanced-topics.xml:2704
#, fuzzy
msgid ""
"For example, suppose Harry locks an image file and then begins editing
it. "
"Meanwhile, miles away, Sally wants to do the same thing. She doesn't
think "
-"to run <userinput>svn status --show-updates</userinput>, so she has no
idea "
-"that Harry has already locked the file. She spends hours editing the
file, "
-"and when she tries to commit her change, she discovers that either the
file "
-"is locked or that she's out of date. Regardless, her changes aren't "
-"mergeable with Harry's. One of these two people has to throw away his or
her "
-"work, and a lot of time has been wasted."
+"to run <userinput>svn status -u</userinput>, so she has no idea that
Harry "
+"has already locked the file. She spends hours editing the file, and when
she "
+"tries to commit her change, she discovers that either the file is locked
or "
+"that she's out of date. Regardless, her changes aren't mergeable with "
+"Harry's. One of these two people has to throw away his or her work, and
a "
+"lot of time has been wasted."
msgstr ""
"例如，假定Harry锁定了一个图片，并开始编辑。同时，几英里之外的Sally希望做同
样的"
"工作，她没想到运行<command>svn status --show-updates</command>，她不知道
Harry"
@@ -11346,7 +11358,7 @@
"作，许多时间被浪费了。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2710
+#: ../../en/book/ch03-advanced-topics.xml:2715
#, fuzzy
msgid ""
"Subversion's solution to this problem is to provide a mechanism to
remind "
@@ -11366,7 +11378,7 @@
"结果)，文件变成可读写，当释放这个锁后，文件又变成只读。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2723
+#: ../../en/book/ch03-advanced-topics.xml:2728
#, fuzzy
msgid ""
"The theory, then, is that if the image file has this property attached,
Sally "
@@ -11381,7 +11393,7 @@
"提醒了她编辑之前需要锁定文件，这样她就发现了原来存在的锁定："
#. type: Content of: <book><chapter><sect1><sect2><tip><para>
-#: ../../en/book/ch03-advanced-topics.xml:2749
+#: ../../en/book/ch03-advanced-topics.xml:2754
#, fuzzy
msgid ""
"Users and administrators alike are encouraged to attach the <literal>svn:"
@@ -11393,7 +11405,7 @@
"literal>属性，这是鼓励好的锁定习惯和防止浪费的主要技术手段。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2756
+#: ../../en/book/ch03-advanced-topics.xml:2761
#, fuzzy
msgid ""
"Note that this property is a communication tool that works independently
from "
@@ -11405,7 +11417,7 @@
"定。相反的，无论有没有这个属性，并不会要求提交需要首先锁定文件。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:2763
+#: ../../en/book/ch03-advanced-topics.xml:2768
#, fuzzy
msgid ""
"Unfortunately, the system isn't flawless. It's possible that even when
a "
@@ -11422,17 +11434,17 @@
"交流。<placeholder-1/>"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:2772
+#: ../../en/book/ch03-advanced-topics.xml:2777
msgid "Except, perhaps, a classic Vulcan mind-meld."
msgstr "除非是，或许一个经典的火神精神融合。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:2784
+#: ../../en/book/ch03-advanced-topics.xml:2789
msgid "Externals Definitions"
msgstr "外部定义"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2786
+#: ../../en/book/ch03-advanced-topics.xml:2791
#, fuzzy
msgid ""
"Sometimes it is useful to construct a working copy that is made out of a "
@@ -11450,7 +11462,7 @@
"但是如果这个结构对所有的用户是很重要的，每个用户需要执行同样的检出操作。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2797
+#: ../../en/book/ch03-advanced-topics.xml:2802
#, fuzzy
msgid ""
"Fortunately, Subversion provides support for <firstterm>externals "
@@ -11473,7 +11485,7 @@
"版本库URL的列表(相对于设置属性的版本化目录)。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2810
+#: ../../en/book/ch03-advanced-topics.xml:2815
#, fuzzy
msgid ""
"The convenience of the <literal>svn:externals</literal> property is that
once "
@@ -11490,7 +11502,7 @@
"的工作副本检出之后，也会检出外部工作副本。"
#. type: Content of: <book><chapter><sect1><warning><para>
-#: ../../en/book/ch03-advanced-topics.xml:2820
+#: ../../en/book/ch03-advanced-topics.xml:2825
#, fuzzy
msgid ""
"The relative target subdirectories of externals definitions
<emphasis>must "
@@ -11502,7 +11514,7 @@
"径。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2826
+#: ../../en/book/ch03-advanced-topics.xml:2831
#, fuzzy
msgid ""
"You also get in the externals definition design all the regular benefits
of "
@@ -11522,7 +11534,7 @@
"别人更新他们的工作副本接受你的外部定义修改时。"
#. type: Content of: <book><chapter><sect1><tip><para>
-#: ../../en/book/ch03-advanced-topics.xml:2838
+#: ../../en/book/ch03-advanced-topics.xml:2843
msgid ""
"Because the <literal>svn:externals</literal> property has a multiline
value, "
"we strongly recommend that you use <command>svn propedit</command>
instead of "
@@ -11532,7 +11544,7 @@
"<command>svn propedit</command>，而不是使用<command>svn
propset</command>。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2844
+#: ../../en/book/ch03-advanced-topics.xml:2849
msgid ""
"Subversion releases prior to 1.5 honor an externals definition format
that is "
"a multiline table of subdirectories (relative to the versioned directory
on "
@@ -11542,7 +11554,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2858
+#: ../../en/book/ch03-advanced-topics.xml:2863
msgid ""
"When someone checks out a working copy of the <filename>calc</filename> "
"directory referred to in the previous example, Subversion also continues
to "
@@ -11552,7 +11564,7 @@
"贝，Subversion会继续来取出外部定义的项目。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2884
+#: ../../en/book/ch03-advanced-topics.xml:2889
msgid ""
"As of Subversion 1.5, though, a new format of the
<literal>svn:externals</"
"literal> property is supported. Externals definitions are still
multiline, "
@@ -11568,14 +11580,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2905
+#: ../../en/book/ch03-advanced-topics.xml:2910
msgid ""
"Or, making use of the peg revision syntax (which we describe in detail
in "
"<xref linkend=\"svn.advanced.pegrevs\" />), it might appear as:"
msgstr ""
#. type: Content of: <book><chapter><sect1><tip><para>
-#: ../../en/book/ch03-advanced-topics.xml:2917
+#: ../../en/book/ch03-advanced-topics.xml:2922
#, fuzzy
msgid ""
"You should seriously consider using explicit revision numbers in all of
your "
@@ -11598,7 +11610,7 @@
"版本的样子。对于软件项目，这可能是编译复杂代码基的老快照成功和失败的区
别。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2934
+#: ../../en/book/ch03-advanced-topics.xml:2939
#, fuzzy
msgid ""
"For most repositories, these three ways of formatting the externals "
@@ -11624,7 +11636,7 @@
"版本。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2966
+#: ../../en/book/ch03-advanced-topics.xml:2971
#, fuzzy
msgid ""
"Now you use <command>svn move</command> to rename the
<filename>my-project</"
@@ -11637,7 +11649,7 @@
"录已经不存在了。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:2986
+#: ../../en/book/ch03-advanced-topics.xml:2991
#, fuzzy
msgid ""
"Also, absolute URLs can cause problems with repositories that are
available "
@@ -11666,7 +11678,7 @@
"relocate</command>)，外部定义不会重新定位。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3004
+#: ../../en/book/ch03-advanced-topics.xml:3009
msgid ""
"Subversion 1.5 takes a huge step in relieving these frustrations. As "
"mentioned earlier, the URLs used in the new externals definition format
can "
@@ -11675,62 +11687,62 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:3012
+#: ../../en/book/ch03-advanced-topics.xml:3017
msgid "<literal>../</literal>"
msgstr "<literal>../</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3013
+#: ../../en/book/ch03-advanced-topics.xml:3018
msgid ""
"Relative to the URL of the directory on which the
<literal>svn:externals</"
"literal> property is set"
msgstr "相对于设置 <literal>svn:externals</literal> 属性的目录的 URL。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:3018
+#: ../../en/book/ch03-advanced-topics.xml:3023
msgid "<literal>^/</literal>"
msgstr "<literal>^/</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3019
+#: ../../en/book/ch03-advanced-topics.xml:3024
msgid ""
"Relative to the root of the repository in which the
<literal>svn:externals</"
"literal> property is versioned"
msgstr "相对于设置 <literal>svn:externals</literal> 属性的版本库的根。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:3024
+#: ../../en/book/ch03-advanced-topics.xml:3029
msgid "<literal>//</literal>"
msgstr "<literal>//</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3025
+#: ../../en/book/ch03-advanced-topics.xml:3030
msgid ""
"Relative to the scheme of the URL of the directory on which the
<literal>svn:"
"externals</literal> property is set"
msgstr "相对于设置 <literal>svn:externals</literal> 属性的目录的 URL 的方
案。"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><term>
-#: ../../en/book/ch03-advanced-topics.xml:3030
+#: ../../en/book/ch03-advanced-topics.xml:3035
msgid "<literal>/</literal>"
msgstr "<literal>/</literal>"
#. type: Content of:
<book><chapter><sect1><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3031
+#: ../../en/book/ch03-advanced-topics.xml:3036
msgid ""
"Relative to the root URL of the server on which the
<literal>svn:externals</"
"literal> property is versioned"
msgstr "相对于设置 <literal>svn:externals</literal> 属性的服务器的根 URL。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3037
+#: ../../en/book/ch03-advanced-topics.xml:3042
msgid ""
"So, looking a fourth time at our previous externals definition example,
and "
"making use of the new absolute URL syntax in various ways, we might now
see:"
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3048
+#: ../../en/book/ch03-advanced-topics.xml:3053
#, fuzzy
msgid ""
"The support that exists for externals definitions in Subversion remains
less "
@@ -11756,7 +11768,7 @@
"行<command>svn commit</command>—对主工作副本的提交不会迭代到外部定义的部
分。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3065
+#: ../../en/book/ch03-advanced-topics.xml:3070
msgid ""
"We've already mentioned some of the additional shortcomings of the old "
"<literal>svn:externals</literal> format and how the new Subversion 1.5
format "
@@ -11769,7 +11781,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3075
+#: ../../en/book/ch03-advanced-topics.xml:3080
msgid ""
"Besides the <command>svn checkout</command>, <command>svn
update</command>, "
"<command>svn switch</command>, and <command>svn export</command>
commands "
@@ -11783,12 +11795,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:3094
+#: ../../en/book/ch03-advanced-topics.xml:3099
msgid "Peg and Operative Revisions"
msgstr "Peg 和实施修订版本"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3096
+#: ../../en/book/ch03-advanced-topics.xml:3101
#, fuzzy
msgid ""
"We copy, move, rename, and completely replace files and directories on
our "
@@ -11810,7 +11822,7 @@
"不同的版本化资源。当然这些功能也增加了你与这些路径和资源交互的难度。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3110
+#: ../../en/book/ch03-advanced-topics.xml:3115
#, fuzzy
msgid ""
"Subversion is pretty smart about noticing when an object's version
history "
@@ -11829,7 +11841,7 @@
"来清除混淆。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3120
+#: ../../en/book/ch03-advanced-topics.xml:3125
#, fuzzy
msgid ""
"The simplest example of this occurs when a directory or file is deleted
from "
@@ -11851,7 +11863,7 @@
"路径的所有对象？很明显，Subversion需要线索知道你真实的想法。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3134
+#: ../../en/book/ch03-advanced-topics.xml:3139
#, fuzzy
msgid ""
"And thanks to moves, versioned object history can get far more twisted
than "
@@ -11875,7 +11887,7 @@
"本，并且被许多希望改进他们生活的分散用户天天使用。"
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:3142
+#: ../../en/book/ch03-advanced-topics.xml:3147
#, fuzzy
msgid ""
"<quote>You're not supposed to name it. Once you name it, you start
getting "
@@ -11885,7 +11897,7 @@
"Mike Wazowski"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3154
+#: ../../en/book/ch03-advanced-topics.xml:3159
#, fuzzy
msgid ""
"It's a nice story, really, but it doesn't end there. Entrepreneur that
you "
@@ -11906,7 +11918,7 @@
"因重新改回<filename>concept</filename>。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3167
+#: ../../en/book/ch03-advanced-topics.xml:3172
#, fuzzy
msgid ""
"In scenarios like these, attempting to instruct Subversion to work with
these "
@@ -11922,7 +11934,7 @@
"我们的Subversion—需要更多的细节来做正确的事情。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3176
+#: ../../en/book/ch03-advanced-topics.xml:3181
#, fuzzy
msgid ""
"In version 1.1, Subversion introduced a way for you to tell it exactly
which "
@@ -11945,7 +11957,7 @@
"的路径后面追加一个<quote>at符号</quote>(<literal>@</literal>)。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3190
+#: ../../en/book/ch03-advanced-topics.xml:3195
#, fuzzy
msgid ""
"But what of the <option>--revision</option> (<option>-r</option>) of
which "
@@ -11974,7 +11986,7 @@
"quote>作为我们实施的修订版本，我们<emphasis>精确的</emphasis>知道到哪里。"
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:3201
+#: ../../en/book/ch03-advanced-topics.xml:3206
#, fuzzy
msgid ""
"606 N. Main Street, Wheaton, Illinois, is the home of the Wheaton "
@@ -11984,12 +11996,12 @@
"心，看起来是恰当的…。"
#. type: Content of: <book><chapter><sect1><sidebar><title>
-#: ../../en/book/ch03-advanced-topics.xml:3215
+#: ../../en/book/ch03-advanced-topics.xml:3220
msgid "The Peg Revision Algorithm"
msgstr "Peg 修订版本算法"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:3217
+#: ../../en/book/ch03-advanced-topics.xml:3222
#, fuzzy
msgid ""
"The Subversion command-line client performs the peg revision algorithm
any "
@@ -12000,22 +12012,22 @@
"说明的例子："
#. type: Content of: <book><chapter><sect1><sidebar><screen><replaceable>
-#: ../../en/book/ch03-advanced-topics.xml:3223
+#: ../../en/book/ch03-advanced-topics.xml:3228
msgid "OPERATIVE-REV"
msgstr "OPERATIVE-REV"
#. type: Content of: <book><chapter><sect1><sidebar><screen><replaceable>
-#: ../../en/book/ch03-advanced-topics.xml:3223
+#: ../../en/book/ch03-advanced-topics.xml:3228
msgid "PEG-REV"
msgstr "PEG-REV"
#. type: Content of: <book><chapter><sect1><sidebar><screen><replaceable>
-#: ../../en/book/ch03-advanced-topics.xml:3223
+#: ../../en/book/ch03-advanced-topics.xml:3228
msgid "command"
msgstr "command"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:3226
+#: ../../en/book/ch03-advanced-topics.xml:3231
#, fuzzy
msgid ""
"If <replaceable>OPERATIVE-REV</replaceable> is older than
<replaceable>PEG-"
@@ -12025,7 +12037,7 @@
"replaceable>更老，则算法如下："
#. type: Content of:
<book><chapter><sect1><sidebar><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3232
+#: ../../en/book/ch03-advanced-topics.xml:3237
#, fuzzy
msgid ""
"Locate <replaceable>item</replaceable> in the revision identified by "
@@ -12035,7 +12047,7 @@
"replaceable>，在版本库定位到一个唯一的对象。"
#. type: Content of:
<book><chapter><sect1><sidebar><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3237
+#: ../../en/book/ch03-advanced-topics.xml:3242
msgid ""
"Trace the object's history backwards (through any possible renames) to
its "
"ancestor in the revision <replaceable>OPERATIVE-REV</replaceable>."
@@ -12044,7 +12056,7 @@
"replaceable>的祖先。"
#. type: Content of:
<book><chapter><sect1><sidebar><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3242
+#: ../../en/book/ch03-advanced-topics.xml:3247
msgid ""
"Perform the requested action on that ancestor, wherever it is located,
or "
"whatever its name might be or might have been at that time."
@@ -12052,7 +12064,7 @@
"对那个祖先执行请求的动作，无论它的位置，无论它是什么名字，无论当时是否存
在。"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:3248
+#: ../../en/book/ch03-advanced-topics.xml:3253
#, fuzzy
msgid ""
"But what if <replaceable>OPERATIVE-REV</replaceable> is
<emphasis>younger</"
@@ -12073,7 +12085,7 @@
"有一点不同："
#. type: Content of:
<book><chapter><sect1><sidebar><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3262
+#: ../../en/book/ch03-advanced-topics.xml:3267
#, fuzzy
msgid ""
"Locate <replaceable>item</replaceable> in the revision identified by "
@@ -12083,7 +12095,7 @@
"replaceable>，在版本库定位到一个唯一的对象。"
#. type: Content of:
<book><chapter><sect1><sidebar><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3267
+#: ../../en/book/ch03-advanced-topics.xml:3272
#, fuzzy
msgid ""
"Trace the object's history backward (through any possible renames) to
its "
@@ -12093,7 +12105,7 @@
"replaceable>的祖先。"
#. type: Content of:
<book><chapter><sect1><sidebar><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3272
+#: ../../en/book/ch03-advanced-topics.xml:3277
#, fuzzy
msgid ""
"Verify that the object's location (path-wise) in <replaceable>PEG-REV</"
@@ -12112,7 +12124,7 @@
"可以更灵活和优雅的处理这种场景。)"
#. type: Content of: <book><chapter><sect1><sidebar><para>
-#: ../../en/book/ch03-advanced-topics.xml:3286
+#: ../../en/book/ch03-advanced-topics.xml:3291
#, fuzzy
msgid ""
"Note that even when you don't explicitly supply a peg revision or
operative "
@@ -12127,7 +12139,7 @@
"订版本一样。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3296
+#: ../../en/book/ch03-advanced-topics.xml:3301
#, fuzzy
msgid ""
"Say that long ago we created our repository, and in revision 1 we added
our "
@@ -12149,7 +12161,7 @@
"20000个修订版本，就像他们都有一个非常浪漫的历史。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3307
+#: ../../en/book/ch03-advanced-topics.xml:3312
#, fuzzy
msgid ""
"Now, years later, we wonder what the <filename>IDEA</filename> file
looked "
@@ -12168,7 +12180,7 @@
"前的<filename>IDEA</filename>文件在旧版本的样子，我们可以运行："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3323
+#: ../../en/book/ch03-advanced-topics.xml:3328
#, fuzzy
msgid ""
"Of course, in this example, the current <filename>IDEA</filename> file
didn't "
@@ -12181,12 +12193,12 @@
"的写法是："
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3334
+#: ../../en/book/ch03-advanced-topics.xml:3339
msgid "And when executed, it has the expected results."
msgstr "当执行时，它包含期望的结果。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3336
+#: ../../en/book/ch03-advanced-topics.xml:3341
#, fuzzy
msgid ""
"The perceptive reader is probably wondering at this point whether the
peg "
@@ -12213,7 +12225,7 @@
"literal>来引用<filename>filename@</filename>。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3353
+#: ../../en/book/ch03-advanced-topics.xml:3358
#, fuzzy
msgid ""
"Let's ask the other question, then—in revision 1, what were the "
@@ -12224,7 +12236,7 @@
"路径的文件的内容到底是什么？我们会使用一个明确的peg修订版本来帮助我们完
成。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3367
+#: ../../en/book/ch03-advanced-topics.xml:3372
#, fuzzy
msgid ""
"Notice that we didn't provide an operative revision this time. That's "
@@ -12235,7 +12247,7 @@
"Subversion假定缺省的操作修订版本是peg修订版本。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3372
+#: ../../en/book/ch03-advanced-topics.xml:3377
#, fuzzy
msgid ""
"As you can see, the output from our operation appears to be correct.
The "
@@ -12256,7 +12268,7 @@
"filename>路经在历史上的修订版本1的内容。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3394
+#: ../../en/book/ch03-advanced-topics.xml:3399
#, fuzzy
msgid ""
"And the peg and operative revisions need not be so trivial, either. For "
@@ -12274,7 +12286,7 @@
"的URL的组合，然后使用4到10作为我们的实施修订版本范围。"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3423
+#: ../../en/book/ch03-advanced-topics.xml:3428
#, fuzzy
msgid ""
"Fortunately, most folks aren't faced with such complex situations. But
when "
@@ -12285,12 +12297,12 @@
"助Subversion清除混淆的额外提示。"
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:3433
+#: ../../en/book/ch03-advanced-topics.xml:3438
msgid "Changelists"
msgstr "修改列表"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3435
+#: ../../en/book/ch03-advanced-topics.xml:3440
msgid ""
"It is commonplace for a developer to find himself working at any given
time "
"on multiple different, distinct changes to a particular bit of source
code. "
@@ -12305,7 +12317,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3448
+#: ../../en/book/ch03-advanced-topics.xml:3453
msgid ""
"Developers can employ various work methodologies to keep these logical "
"changes organized. Some use separate working copies of the same
repository "
@@ -12320,7 +12332,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3461
+#: ../../en/book/ch03-advanced-topics.xml:3466
msgid ""
"Subversion 1.5 brings a new <firstterm>changelists</firstterm> feature
that "
"adds yet another method to the mix. Changelists are basically arbitrary "
@@ -12342,7 +12354,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3483
+#: ../../en/book/ch03-advanced-topics.xml:3488
msgid ""
"Subversion's changelist support allows you to create changelists by
applying "
"labels to files you want to be associated with that changelist, remove
those "
@@ -12352,12 +12364,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:3492
+#: ../../en/book/ch03-advanced-topics.xml:3497
msgid "Creating and Modifying Changelists"
msgstr "创建和更新修改列表"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3494
+#: ../../en/book/ch03-advanced-topics.xml:3499
msgid ""
"You can create, modify, and delete changelists using the <command>svn "
"changelist</command> command. More accurately, you use this command to
set "
@@ -12368,14 +12380,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3503
+#: ../../en/book/ch03-advanced-topics.xml:3508
msgid ""
"Harry is fixing some bugs in the calculator application's mathematics
logic. "
"His work leads him to change a couple of files:"
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3514
+#: ../../en/book/ch03-advanced-topics.xml:3519
msgid ""
"While testing his bug fix, Harry notices that his changes bring to light
a "
"tangentially related bug in the user interface logic found in "
@@ -12388,7 +12400,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3525
+#: ../../en/book/ch03-advanced-topics.xml:3530
msgid ""
"Harry first creates a changelist and associates with it the two files
he's "
"already changed. He does this by using the <command>svn
changelist</command> "
@@ -12396,14 +12408,14 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3542
+#: ../../en/book/ch03-advanced-topics.xml:3547
msgid ""
"As you can see, the output of <command>svn status</command> reflects this
new "
"grouping."
msgstr "就像你看到的，你的<command>svn status</command>反映了新的分组。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3545
+#: ../../en/book/ch03-advanced-topics.xml:3550
msgid ""
"Harry now sets off to fix the secondary UI problem. Since he knows
which "
"file he'll be changing, he assigns that path to a changelist, too. "
@@ -12412,7 +12424,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3562
+#: ../../en/book/ch03-advanced-topics.xml:3567
msgid ""
"Fortunately, Harry catches his mistake. At this point, he has two
options. "
"He can remove the changelist association from
<filename>button.c</filename>, "
@@ -12420,7 +12432,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3575
+#: ../../en/book/ch03-advanced-topics.xml:3580
msgid ""
"Or, he can skip the removal and just assign a new changelist name. In
this "
"case, Subversion will first warn Harry that <filename>button.c</filename>
is "
@@ -12428,7 +12440,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3595
+#: ../../en/book/ch03-advanced-topics.xml:3600
msgid ""
"Harry now has two distinct changelists present in his working copy, and "
"<command>svn status</command> will group its output according to these "
@@ -12440,18 +12452,18 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3605
+#: ../../en/book/ch03-advanced-topics.xml:3610
msgid ""
"Harry now fixes the user interface problem in
<filename>button.c</filename>."
msgstr "现在 Harry 开始修正 <filename>button.c</filename> 中的用户界面问
题。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:3624
+#: ../../en/book/ch03-advanced-topics.xml:3629
msgid "Changelists As Operation Filters"
msgstr "用修改列表作为操作过滤器"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3626
+#: ../../en/book/ch03-advanced-topics.xml:3631
msgid ""
"The visual grouping that Harry sees in the output of <command>svn
status</"
"command> as shown in our previous section is nice, but not entirely
useful. "
@@ -12462,7 +12474,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3635
+#: ../../en/book/ch03-advanced-topics.xml:3640
msgid ""
"When provided with a <option>--changelist</option> option, Subversion "
"commands will limit the scope of their operation to only those files to
which "
@@ -12473,7 +12485,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3659
+#: ../../en/book/ch03-advanced-topics.xml:3664
msgid ""
"That works okay for a few files, but what if Harry's change touched 20 or
30 "
"files? That would be an annoyingly long list of explicitly named files.
Now "
@@ -12483,7 +12495,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3681
+#: ../../en/book/ch03-advanced-topics.xml:3686
msgid ""
"And when it's time to commit, Harry can again use the
<option>--changelist</"
"option> option to limit the scope of the commit to files in a certain "
@@ -12491,7 +12503,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3695
+#: ../../en/book/ch03-advanced-topics.xml:3700
msgid ""
"In fact, the <command>svn commit</command> command provides a second "
"changelists-related option: <option>--keep-changelists</option>.
Normally, "
@@ -12503,7 +12515,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><note><para>
-#: ../../en/book/ch03-advanced-topics.xml:3715
+#: ../../en/book/ch03-advanced-topics.xml:3720
msgid ""
"The <option>--changelist</option> option acts only as a filter for
Subversion "
"command targets, and will not add targets to an operation. For example,
on a "
@@ -12519,7 +12531,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3731
+#: ../../en/book/ch03-advanced-topics.xml:3736
msgid ""
"Even the <command>svn changelist</command> command accepts the <option>--"
"changelist</option> option. This allows you to quickly and easily rename
or "
@@ -12527,7 +12539,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3747
+#: ../../en/book/ch03-advanced-topics.xml:3752
msgid ""
"Finally, you can specify multiple instances of the <option>--changelist</"
"option> option on a single command line. Doing so limits the operation
you "
@@ -12535,12 +12547,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:3756
+#: ../../en/book/ch03-advanced-topics.xml:3761
msgid "Changelist Limitations"
msgstr "修改列表的限制"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3758
+#: ../../en/book/ch03-advanced-topics.xml:3763
msgid ""
"Subversion's changelist feature is a handy tool for grouping working
copy "
"files, but it does have a few limitations. Changelists are artifacts of
a "
@@ -12555,12 +12567,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch03-advanced-topics.xml:3778
+#: ../../en/book/ch03-advanced-topics.xml:3783
msgid "Network Model"
msgstr "网络模型"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:3780
+#: ../../en/book/ch03-advanced-topics.xml:3785
#, fuzzy
msgid ""
"At some point, you're going to need to understand how your Subversion
client "
@@ -12581,12 +12593,12 @@
"认证和授权信息。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:3795
+#: ../../en/book/ch03-advanced-topics.xml:3800
msgid "Requests and Responses"
msgstr "请求和响应"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3797
+#: ../../en/book/ch03-advanced-topics.xml:3802
#, fuzzy
msgid ""
"The Subversion client spends most of its time managing working copies.
When "
@@ -12603,7 +12615,7 @@
"linkend=\"svn.basic.in-action.wc.sb-1\"/>)。"
#. type: Content of: <book><chapter><sect1><sect2><tip><para>
-#: ../../en/book/ch03-advanced-topics.xml:3806
+#: ../../en/book/ch03-advanced-topics.xml:3811
#, fuzzy
msgid ""
"Run <userinput>svn --version</userinput> to see which URL schemes and "
@@ -12613,7 +12625,7 @@
"议。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3811
+#: ../../en/book/ch03-advanced-topics.xml:3816
#, fuzzy
msgid ""
"When the server process receives a client request, it often demands that
the "
@@ -12640,7 +12652,7 @@
"器永远不会发起一个认证请求。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3828
+#: ../../en/book/ch03-advanced-topics.xml:3833
#, fuzzy
msgid ""
"If the particular network requests issued by the client result in a new "
@@ -12659,12 +12671,12 @@
"发起过认证请求)，这时修订本的<literal>svn:author</literal>的值是空的。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch03-advanced-topics.xml:3845
+#: ../../en/book/ch03-advanced-topics.xml:3850
msgid "Client Credentials Caching"
msgstr "客户端凭证缓存"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3847
+#: ../../en/book/ch03-advanced-topics.xml:3852
#, fuzzy
msgid ""
"Many servers are configured to require authentication on every request.
This "
@@ -12684,7 +12696,7 @@
"的凭证会缓存在磁盘，以主机名, 端口和认证域的组合作为唯一性区别。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3858
+#: ../../en/book/ch03-advanced-topics.xml:3863
#, fuzzy
msgid ""
"When the client receives an authentication challenge, it first looks for
the "
@@ -12697,7 +12709,7 @@
"现，或者是缓存的凭证认证失败，客户端会提示用户提供需要的信息。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3865
+#: ../../en/book/ch03-advanced-topics.xml:3870
#, fuzzy
msgid ""
"The security-conscious reader will suspect immediately that there is
reason "
@@ -12708,7 +12720,7 @@
"</quote>"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3870
+#: ../../en/book/ch03-advanced-topics.xml:3875
msgid ""
"The Subversion developers recognize the legitimacy of such concerns, and
so "
"Subversion works with available mechanisms provided by the operating
system "
@@ -12719,11 +12731,11 @@
"供的机制来减少泄露这些信息的风险。下面是在大多数平台上的做法："
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3880
+#: ../../en/book/ch03-advanced-topics.xml:3885
#, fuzzy
msgid ""
"On Windows, the Subversion client stores passwords in the
<filename>%APPDATA%/"
-"Subversion/auth/</filename> directory. On Windows 2000 and later, the "
+"Subversion/auth/</filename> directory. On Windows 2000 and later, the "
"standard Windows cryptography services are used to encrypt the password
on "
"disk. Because the encryption key is managed by Windows and is tied to
the "
"user's own login credentials, only the user can decrypt the cached
password. "
@@ -12740,7 +12752,7 @@
"根本不存在，在需要时继续询问密码)。"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3895
+#: ../../en/book/ch03-advanced-topics.xml:3900
#, fuzzy
msgid ""
"Similarly, on Mac OS X, the Subversion client stores all repository
passwords "
@@ -12754,7 +12766,7 @@
"要用户密码时要求输入用户帐号密码。"
#. type: Content of:
<book><chapter><sect1><sect2><itemizedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:3905
+#: ../../en/book/ch03-advanced-topics.xml:3910
msgid ""
"For other Unix-like operating systems, no standard
<quote>keychain</quote> "
"services exist. However, the Subversion client knows how to store
password "
@@ -12770,7 +12782,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3925
+#: ../../en/book/ch03-advanced-topics.xml:3930
#, fuzzy
msgid ""
"Of course, for the truly paranoid, none of these mechanisms meets the
test of "
@@ -12782,7 +12794,7 @@
"性，Subversion提供了各种方法来完全关闭凭证缓存。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3931
+#: ../../en/book/ch03-advanced-topics.xml:3936
msgid ""
"To disable caching for a single command, pass the
<option>--no-auth-cache</"
"option> option:"
@@ -12791,7 +12803,7 @@
"option>："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3953
+#: ../../en/book/ch03-advanced-topics.xml:3958
#, fuzzy
msgid ""
"Or, if you want to disable credential caching permanently, you can edit
the "
@@ -12810,7 +12822,7 @@
"\"svn.advanced.confarea.layout\"/>)。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:3969
+#: ../../en/book/ch03-advanced-topics.xml:3974
#, fuzzy
msgid ""
"Sometimes users will want to remove specific credentials from the disk "
@@ -12826,12 +12838,12 @@
"联的特定服务器的域："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:4001
+#: ../../en/book/ch03-advanced-topics.xml:4006
msgid "Once you have located the proper cache file, just delete it."
msgstr "一旦你定位了正确的缓存文件，只需要删除它。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:4004
+#: ../../en/book/ch03-advanced-topics.xml:4009
#, fuzzy
msgid ""
"One last word about <command>svn</command>'s authentication behavior, "
@@ -12857,7 +12869,7 @@
"<command>svn</command>)时，才会使用这些选项。"
#. type: Content of: <book><chapter><sect1><sect2><note><para>
-#: ../../en/book/ch03-advanced-topics.xml:4022
+#: ../../en/book/ch03-advanced-topics.xml:4027
#, fuzzy
msgid ""
"A common mistake is to misconfigure a server so that it never issues an "
@@ -12871,14 +12883,14 @@
"有被使用，如新的修订版本看起来始终是由匿名用户提交的！"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:4031
+#: ../../en/book/ch03-advanced-topics.xml:4036
msgid ""
"Here is a final summary that describes how a Subversion client behaves
when "
"it receives an authentication challenge."
msgstr "这里是Subversion客户端在收到认证请求的时候的行为方式最终总结："
#. type: Content of:
<book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:4037
+#: ../../en/book/ch03-advanced-topics.xml:4042
#, fuzzy
msgid ""
"First, the client checks whether the user specified any credentials as "
@@ -12890,7 +12902,7 @@
"password</option>)指定了任何凭证信息，如果没有，或者这些选项没有认证成
功，然后"
#. type: Content of:
<book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:4045
+#: ../../en/book/ch03-advanced-topics.xml:4050
#, fuzzy
msgid ""
"If no command-line credentials were provided, or the provided ones were "
@@ -12904,7 +12916,7 @@
"已经有了恰当的认证缓存，如果有，它会使用这些凭证进行认证。"
#. type: Content of:
<book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../../en/book/ch03-advanced-topics.xml:4053
+#: ../../en/book/ch03-advanced-topics.xml:4058
msgid ""
"Finally, if the previous mechanisms failed to successfully authenticate
the "
"user against the server, the client resorts to interactively prompting
the "
@@ -12915,7 +12927,7 @@
"凭证(除非使用<option>--non-interactive</option>选项或客户端对等的方式)。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch03-advanced-topics.xml:4062
+#: ../../en/book/ch03-advanced-topics.xml:4067
msgid ""
"If the client successfully authenticates by any of these methods, it
will "
"attempt to cache the credentials on disk (unless the user has disabled
this "
@@ -12925,7 +12937,7 @@
"关闭了这种行为方式，在前面提到过。)"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch03-advanced-topics.xml:4077
+#: ../../en/book/ch03-advanced-topics.xml:4082
msgid ""
"After reading this chapter, you should have a firm grasp on some of "
"Subversion's features that, while perhaps not used
<emphasis>every</emphasis> "
@@ -12938,7 +12950,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para><footnote><para>
-#: ../../en/book/ch03-advanced-topics.xml:4087
+#: ../../en/book/ch03-advanced-topics.xml:4092
msgid ""
"No purchase necessary. Certains terms and conditions apply. No
guarantee of "
"coolness—implicit or otherwise—exists. Mileage may vary."
@@ -14819,7 +14831,7 @@
"previously merged. This puts the responsibility on you—the
user—"
"to remember that the change wasn't actually merged, it just wasn't
wanted. "
"There's no way to ask Subversion for a list of <quote>blocked
changelists.</"
-"quote> If you want to track them (so that you can unblock them someday). "
+"quote> If you want to track them (so that you can unblock them someday) "
"you'll need to record them in a text file somewhere, or perhaps in an "
"invented property. In Subversion 1.5, unfortunately, this is the only
way to "
"manage blocked revisions; the plans are to make a better interface for
this "
@@ -16706,12 +16718,13 @@
#. type: Content of:
<book><chapter><sect1><table><tgroup><tbody><row><entry>
#: ../../en/book/ch04-branching-and-merging.xml:3175
+#, fuzzy
msgid ""
-"<userinput>svn mergeinfo target
--from-source=<replaceable>URL</replaceable></"
-"userinput>"
+"<userinput>svn mergeinfo <replaceable>SOURCE</replaceable> "
+"<replaceable>TARGET</replaceable></userinput>"
msgstr ""
-"<userinput>svn mergeinfo target
--from-source=<replaceable>URL</replaceable></"
-"userinput>"
+"<userinput>svn mv <replaceable>URL1</replaceable> <replaceable>URL2</"
+"replaceable></userinput>"
#. type: Content of:
<book><chapter><sect1><table><tgroup><tbody><row><entry>
#: ../../en/book/ch04-branching-and-merging.xml:3179
@@ -17022,11 +17035,11 @@
#. type: Content of: <book><chapter><sect1><refentry><indexterm><secondary>
#: ../../en/book/ch05-repository-admin.xml:101
-#: ../../en/book/ch09-reference.xml:9314 ../../en/book/ch09-reference.xml:9377
-#: ../../en/book/ch09-reference.xml:9432 ../../en/book/ch09-reference.xml:9488
-#: ../../en/book/ch09-reference.xml:9560 ../../en/book/ch09-reference.xml:9635
-#: ../../en/book/ch09-reference.xml:9694 ../../en/book/ch09-reference.xml:9752
-#: ../../en/book/ch09-reference.xml:9812
+#: ../../en/book/ch09-reference.xml:9424 ../../en/book/ch09-reference.xml:9487
+#: ../../en/book/ch09-reference.xml:9542 ../../en/book/ch09-reference.xml:9598
+#: ../../en/book/ch09-reference.xml:9670 ../../en/book/ch09-reference.xml:9745
+#: ../../en/book/ch09-reference.xml:9804 ../../en/book/ch09-reference.xml:9862
+#: ../../en/book/ch09-reference.xml:9922
msgid "hooks"
msgstr "hooks"
@@ -17537,10 +17550,10 @@
#. type: Content of:
<book><chapter><sect1><sect2><refentry><refsect1><para>
#: ../../en/book/ch05-repository-admin.xml:460
#: ../../en/book/ch05-repository-admin.xml:465
-#: ../../en/book/ch09-reference.xml:754 ../../en/book/ch09-reference.xml:1078
-#: ../../en/book/ch09-reference.xml:1329 ../../en/book/ch09-reference.xml:2289
-#: ../../en/book/ch09-reference.xml:4162 ../../en/book/ch09-reference.xml:4248
-#: ../../en/book/ch09-reference.xml:4337
+#: ../../en/book/ch09-reference.xml:755 ../../en/book/ch09-reference.xml:1079
+#: ../../en/book/ch09-reference.xml:1330 ../../en/book/ch09-reference.xml:2294
+#: ../../en/book/ch09-reference.xml:4170 ../../en/book/ch09-reference.xml:4256
+#: ../../en/book/ch09-reference.xml:4345
msgid "No"
msgstr "否"
@@ -17548,12 +17561,12 @@
#: ../../en/book/ch05-repository-admin.xml:461
#: ../../en/book/ch05-repository-admin.xml:466
#: ../../en/book/ch05-repository-admin.xml:471
-#: ../../en/book/ch09-reference.xml:860 ../../en/book/ch09-reference.xml:995
-#: ../../en/book/ch09-reference.xml:1175 ../../en/book/ch09-reference.xml:1419
-#: ../../en/book/ch09-reference.xml:2343 ../../en/book/ch09-reference.xml:2662
-#: ../../en/book/ch09-reference.xml:2777 ../../en/book/ch09-reference.xml:2891
-#: ../../en/book/ch09-reference.xml:3332 ../../en/book/ch09-reference.xml:4930
-#: ../../en/book/ch09-reference.xml:5089 ../../en/book/ch09-reference.xml:5250
+#: ../../en/book/ch09-reference.xml:861 ../../en/book/ch09-reference.xml:996
+#: ../../en/book/ch09-reference.xml:1176 ../../en/book/ch09-reference.xml:1420
+#: ../../en/book/ch09-reference.xml:2346 ../../en/book/ch09-reference.xml:2665
+#: ../../en/book/ch09-reference.xml:2780 ../../en/book/ch09-reference.xml:2894
+#: ../../en/book/ch09-reference.xml:3335 ../../en/book/ch09-reference.xml:4938
+#: ../../en/book/ch09-reference.xml:5097 ../../en/book/ch09-reference.xml:5258
msgid "Yes"
msgstr "是"
@@ -18136,7 +18149,7 @@
#, fuzzy
msgid ""
"Present in the <filename>db/</filename> subdirectory of your repository
is "
-"the implementation of the versioned filesystem. Your new repository's "
+"the implementation of the versioned filesystem. Your new repository's "
"versioned filesystem begins life at revision 0, which is defined to
consist "
"of nothing but the top-level root (<filename>/</filename>) directory. "
"Initially, revision 0 also has a single revision property,
<literal>svn:date</"
@@ -18677,7 +18690,7 @@
#: ../../en/book/ch05-repository-admin.xml:1292
#, fuzzy
msgid ""
-"The <command>svnsync</command> program, which is new to the 1.4 release
of "
+"The <command>svnsync</command> program, which was new to the 1.4 release
of "
"Subversion, provides all the functionality required for maintaining a
read-"
"only mirror of a Subversion repository. The program really has one
job—"
"to transfer one repository's versioned history into another repository.
And "
@@ -18706,7 +18719,7 @@
"就像你期望的，<command>svnsync</command>的语法与本节提到的其他命令非常类
似。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1325
+#: ../../en/book/ch05-repository-admin.xml:1326
#, fuzzy
msgid ""
"We talk more about replicating repositories with
<command>svnsync</command> "
@@ -18717,12 +18730,12 @@
"<command>svnsync</command>实现版本库复制。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch05-repository-admin.xml:1333
+#: ../../en/book/ch05-repository-admin.xml:1334
msgid "fsfs-reshard.py"
msgstr "fsfs-reshard.py"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1335
+#: ../../en/book/ch05-repository-admin.xml:1336
msgid ""
"While not an official member of the Subversion toolchain, the
<command>fsfs-"
"reshard.py</command> script (found in the <filename>tools/server-side</"
@@ -18737,7 +18750,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1350
+#: ../../en/book/ch05-repository-admin.xml:1351
msgid ""
"<command>fsfs-reshard.py</command> reshuffles the repository's file
structure "
"into a new arrangement that reflects the requested number of sharding "
@@ -18749,12 +18762,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch05-repository-admin.xml:1363
+#: ../../en/book/ch05-repository-admin.xml:1364
msgid "Berkeley DB utilities"
msgstr "Berkeley DB 工具"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1365
+#: ../../en/book/ch05-repository-admin.xml:1366
#, fuzzy
msgid ""
"If you're using a Berkeley DB repository, all of your versioned
filesystem's "
@@ -18770,7 +18783,7 @@
"这些工具随Berkeley DB发布。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1374
+#: ../../en/book/ch05-repository-admin.xml:1375
#, fuzzy
msgid ""
"For day-to-day Subversion use, these tools are unnecessary. Most of the "
@@ -18790,7 +18803,7 @@
"工具的作用。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1385
+#: ../../en/book/ch05-repository-admin.xml:1386
#, fuzzy
msgid ""
"However, there are still a few Berkeley DB utilities that you might find "
@@ -18821,7 +18834,7 @@
"有用信息，包括详细的锁定和存储子系统的统计信息。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1406
+#: ../../en/book/ch05-repository-admin.xml:1407
#, fuzzy
msgid ""
"For more information on the Berkeley DB tool chain, visit the
documentation "
@@ -18833,12 +18846,12 @@
"\">http://www.oracle.com/technology/documentation/berkeley-db/db/</uri>。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch05-repository-admin.xml:1417
+#: ../../en/book/ch05-repository-admin.xml:1418
msgid "Commit Log Message Correction"
msgstr "修正提交消息"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1419
+#: ../../en/book/ch05-repository-admin.xml:1420
#, fuzzy
msgid ""
"Sometimes a user will have an error in her log message (a misspelling or
some "
@@ -18860,7 +18873,7 @@
"能由管理员修改非版本化属性(这也是默认的选项)。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1433
+#: ../../en/book/ch05-repository-admin.xml:1434
#, fuzzy
msgid ""
"If a log message needs to be changed by an administrator, this can be
done "
@@ -18873,7 +18886,7 @@
"(<literal>svn:log</literal>属性)。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1444
+#: ../../en/book/ch05-repository-admin.xml:1445
#, fuzzy
msgid ""
"The <command>svnadmin setlog</command> command, by default, is still
bound by "
@@ -18890,7 +18903,7 @@
"setlog</command>命令的<option>--bypass-hooks</option>选项跳过钩子。"
#. type: Content of: <book><chapter><sect1><sect2><warning><para>
-#: ../../en/book/ch05-repository-admin.xml:1456
+#: ../../en/book/ch05-repository-admin.xml:1457
#, fuzzy
msgid ""
"Remember, though, that by bypassing the hooks, you are likely avoiding
such "
@@ -18903,12 +18916,12 @@
"你所作出的修改，以及你作出修改的方式。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch05-repository-admin.xml:1469
+#: ../../en/book/ch05-repository-admin.xml:1470
msgid "Managing Disk Space"
msgstr "管理磁盘空间"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1471
+#: ../../en/book/ch05-repository-admin.xml:1472
#, fuzzy
msgid ""
"While the cost of storage has dropped incredibly in the past few years,
disk "
@@ -18927,12 +18940,12 @@
"份, 哪些数据可以安全的删除等等。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch05-repository-admin.xml:1483
+#: ../../en/book/ch05-repository-admin.xml:1484
msgid "How Subversion saves disk space"
msgstr "让 Subversion 节约磁盘空间"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1485
+#: ../../en/book/ch05-repository-admin.xml:1486
#, fuzzy
msgid ""
"To keep the repository small, Subversion uses <firstterm>deltification</"
@@ -18960,7 +18973,7 @@
"1.4以后，空间存储变得更为节省—现在文件内容的全文本身都是压缩的了。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><note><para>
-#: ../../en/book/ch05-repository-admin.xml:1506
+#: ../../en/book/ch05-repository-admin.xml:1507
#, fuzzy
msgid ""
"Because all of the data that is subject to deltification in a BDB-backed "
@@ -18977,12 +18990,12 @@
"使增量化技术不能立杆见影的节省磁盘空间，也可以极大的减慢数据库的膨胀速
度。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch05-repository-admin.xml:1522
+#: ../../en/book/ch05-repository-admin.xml:1523
msgid "Removing dead transactions"
msgstr "删除终止的事务"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1524
+#: ../../en/book/ch05-repository-admin.xml:1525
#, fuzzy
msgid ""
"Though they are uncommon, there are circumstances in which a Subversion "
@@ -19002,14 +19015,14 @@
"的管理员总是希望能够将它们清除出去。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1537
+#: ../../en/book/ch05-repository-admin.xml:1538
msgid ""
"You can use the <command>svnadmin lstxns</command> command to list the
names "
"of the currently outstanding transactions:"
msgstr "可以使用<command>svnadmin lstxns</command>命令列出当前的事务名。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1549
+#: ../../en/book/ch05-repository-admin.xml:1550
#, fuzzy
msgid ""
"Each item in the resultant output can then be used with
<command>svnlook</"
@@ -19031,7 +19044,7 @@
"入进行清理。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1568
+#: ../../en/book/ch05-repository-admin.xml:1569
#, fuzzy
msgid ""
"If you use these two subcommands like this, you should consider making
your "
@@ -19047,12 +19060,12 @@
"库中异常事务的信息。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><example><title>
-#: ../../en/book/ch05-repository-admin.xml:1578
+#: ../../en/book/ch05-repository-admin.xml:1579
msgid "txn-info.sh (reporting outstanding transactions)"
msgstr "txn-info.sh (报告异常事务)"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1599
+#: ../../en/book/ch05-repository-admin.xml:1600
#, fuzzy
msgid ""
"The output of the script is basically a concatenation of several chunks
of "
@@ -19063,7 +19076,7 @@
"reposadmin.maint.tk.svnlook\"/>)的输出组成，类似于下面的例子："
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1622
+#: ../../en/book/ch05-repository-admin.xml:1623
#, fuzzy
msgid ""
"A long-abandoned transaction usually represents some sort of failed or "
@@ -19075,7 +19088,7 @@
"我们一些有趣的信息，比如一个进行了9个月的操作居然还是活动的等等。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1628
+#: ../../en/book/ch05-repository-admin.xml:1629
#, fuzzy
msgid ""
"In short, transaction cleanup decisions need not be made unwisely.
Various "
@@ -19092,12 +19105,12 @@
"实已经死亡了。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch05-repository-admin.xml:1641
+#: ../../en/book/ch05-repository-admin.xml:1642
msgid "Purging unused Berkeley DB logfiles"
msgstr "删除不使用的 Berkeley DB 日志文件"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1643
+#: ../../en/book/ch05-repository-admin.xml:1644
#, fuzzy
msgid ""
"Until recently, the largest offender of disk space usage with respect to
BDB-"
@@ -19115,7 +19128,7 @@
"志文件则记录了所有状态变化的信息。因此，日志文件会以很快的速度膨胀起来。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1654
+#: ../../en/book/ch05-repository-admin.xml:1655
#, fuzzy
msgid ""
"Fortunately, beginning with the 4.2 release of Berkeley DB, the database "
@@ -19144,7 +19157,7 @@
"息。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1673
+#: ../../en/book/ch05-repository-admin.xml:1674
#, fuzzy
msgid ""
"Without some sort of automatic logfile removal in place, logfiles will "
@@ -19163,7 +19176,7 @@
"件："
#. type: Content of: <book><chapter><sect1><sect2><sect3><warning><para>
-#: ../../en/book/ch05-repository-admin.xml:1696
+#: ../../en/book/ch05-repository-admin.xml:1697
#, fuzzy
msgid ""
"BDB-backed repositories whose logfiles are used as part of a backup or "
@@ -19180,12 +19193,12 @@
"没有用了。"
#. type: Content of: <book><chapter><sect1><sect2><sect3><title>
-#: ../../en/book/ch05-repository-admin.xml:1711
+#: ../../en/book/ch05-repository-admin.xml:1712
msgid "Packing FSFS filesystems"
msgstr "打包 FSFS 文件系统"
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1713
+#: ../../en/book/ch05-repository-admin.xml:1714
msgid ""
"As described in the sidebar <xref
linkend=\"svn.reposadmin.basics.backends."
"fsfs.revfiles\"/>, FSFS-backed Subversion repositories create, by
default, a "
@@ -19195,7 +19208,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1721
+#: ../../en/book/ch05-repository-admin.xml:1722
msgid ""
"The first problem is that the operating system has to reference many "
"different files over a short period of time. This leads to inefficient
use "
@@ -19205,7 +19218,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1728
+#: ../../en/book/ch05-repository-admin.xml:1729
msgid ""
"The second problem is a bit more subtle. Because of the ways that most "
"filesystems allocate disk space, each file claims more space on the disk
than "
@@ -19219,18 +19232,19 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1741
+#: ../../en/book/ch05-repository-admin.xml:1742
msgid ""
"To solve these problems, Subversion 1.6 introduced the <command>svnadmin "
"pack</command> command. By concatenating all the files of a completed
shard "
-"into a single \"pack\" file and then removing the original per-revision "
-"files, <command>svnadmin pack</command> reduces the file count within a
given "
-"shard down to just a single file. In doing so, it aids filesystem caches
and "
-"reduces (to one) the number of times a file storage overhead penalty is
paid."
+"into a single <quote>pack</quote> file and then removing the original
per-"
+"revision files, <command>svnadmin pack</command> reduces the file count "
+"within a given shard down to just a single file. In doing so, it aids "
+"filesystem caches and reduces (to one) the number of times a file
storage "
+"overhead penalty is paid."
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1751
+#: ../../en/book/ch05-repository-admin.xml:1752
msgid ""
"Subversion can pack existing sharded repositories which have been
upgraded to "
"the 1.6 filesystem format (see <xref
linkend=\"svn.ref.svnadmin.c.upgrade\"/"
@@ -19238,7 +19252,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1769
+#: ../../en/book/ch05-repository-admin.xml:1770
msgid ""
"Because the packing process obtains the required locks before doing its
work, "
"you can run it on live repositories, or even as part of a post-commit
hook. "
@@ -19247,19 +19261,19 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sect3><para>
-#: ../../en/book/ch05-repository-admin.xml:1775
+#: ../../en/book/ch05-repository-admin.xml:1776
msgid ""
"<command>svnadmin pack</command> has no effect on BDB-backed Subversion "
"repositories."
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch05-repository-admin.xml:1783
+#: ../../en/book/ch05-repository-admin.xml:1784
msgid "Berkeley DB Recovery"
msgstr "Berkeley DB 恢复"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1785
+#: ../../en/book/ch05-repository-admin.xml:1786
#, fuzzy
msgid ""
"As mentioned in <xref linkend=\"svn.reposadmin.basics.backends.bdb\"/>,
a "
@@ -19280,7 +19294,7 @@
"员需要知道如何安全的处理种情况。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1798
+#: ../../en/book/ch05-repository-admin.xml:1799
#, fuzzy
msgid ""
"To protect the data in your repository, Berkeley DB uses a locking "
@@ -19306,7 +19320,7 @@
"论因为术语冲突导致的概念混淆。)"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1815
+#: ../../en/book/ch05-repository-admin.xml:1816
#, fuzzy
msgid ""
"In the course of using your Subversion repository, fatal errors or "
@@ -19322,7 +19336,7 @@
"除，但是锁已经无法解除了)。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1824
+#: ../../en/book/ch05-repository-admin.xml:1825
#, fuzzy
msgid ""
"If this happens to your repository, don't panic. The Berkeley DB
filesystem "
@@ -19339,19 +19353,19 @@
"大量的版本库离线备份，不过不要急着通知你的管理员进行恢复。"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch05-repository-admin.xml:1829
+#: ../../en/book/ch05-repository-admin.xml:1830
msgid "For example, hard drive + huge electromagnet = disaster."
msgstr "比如：硬盘 + 大号电磁铁 = 毁灭。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1836
+#: ../../en/book/ch05-repository-admin.xml:1837
msgid ""
"Instead, use the following recipe to attempt to <quote>unwedge</quote>
your "
"repository:"
msgstr "然后，使用下面的方法试着<quote>恢复</quote>你的版本库："
#. type: Content of:
<book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../../en/book/ch05-repository-admin.xml:1841
+#: ../../en/book/ch05-repository-admin.xml:1842
#, fuzzy
msgid ""
"Make sure no processes are accessing (or attempting to access) the "
@@ -19362,7 +19376,7 @@
"HTTP Server或svnserve。"
#. type: Content of:
<book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../../en/book/ch05-repository-admin.xml:1847
+#: ../../en/book/ch05-repository-admin.xml:1848
#, fuzzy
msgid ""
"Become the user who owns and manages the repository. This is important,
as "
@@ -19374,7 +19388,7 @@
"会改变版本库文件的访问权限，导致在版本库<quote>恢复</quote>后依旧无法访
问。"
#. type: Content of:
<book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../../en/book/ch05-repository-admin.xml:1855
+#: ../../en/book/ch05-repository-admin.xml:1856
msgid ""
"Run the command <userinput>svnadmin recover /var/svn/repos</userinput>.
You "
"should see output such as this:"
@@ -19382,17 +19396,17 @@
"运行命令 <userinput>svnadmin recover /var/svn/repos</userinput>。输出如
下："
#. type: Content of:
<book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../../en/book/ch05-repository-admin.xml:1866
+#: ../../en/book/ch05-repository-admin.xml:1867
msgid "This command may take many minutes to complete."
msgstr "此命令可能需要数分钟才能完成。"
#. type: Content of:
<book><chapter><sect1><sect2><orderedlist><listitem><para>
-#: ../../en/book/ch05-repository-admin.xml:1869
+#: ../../en/book/ch05-repository-admin.xml:1870
msgid "Restart the server process."
msgstr "重新启动服务进程。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1873
+#: ../../en/book/ch05-repository-admin.xml:1874
#, fuzzy
msgid ""
"This procedure fixes almost every case of repository wedging. Make sure
that "
@@ -19410,7 +19424,7 @@
"是说，即使恢复了到版本库的连接，一般的用户也无权访问这些文件。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1884
+#: ../../en/book/ch05-repository-admin.xml:1885
#, fuzzy
msgid ""
"If the previous procedure, for some reason, does not successfully
unwedge "
@@ -19428,12 +19442,12 @@
"所遇到的问题。对于Subversion的开发者来说，数据安全是最重要的问题。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch05-repository-admin.xml:1898
+#: ../../en/book/ch05-repository-admin.xml:1899
msgid "Migrating Repository Data Elsewhere"
msgstr "版本库数据的移植"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1900
+#: ../../en/book/ch05-repository-admin.xml:1901
#, fuzzy
msgid ""
"A Subversion filesystem has its data spread throughout files in the "
@@ -19447,7 +19461,7 @@
"到另一个版本库。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1907
+#: ../../en/book/ch05-repository-admin.xml:1908
#, fuzzy
msgid ""
"Subversion provides such functionality by way of <firstterm>repository
dump "
@@ -19469,7 +19483,7 @@
"command>子命令。"
#. type: Content of: <book><chapter><sect1><sect2><warning><para>
-#: ../../en/book/ch05-repository-admin.xml:1922
+#: ../../en/book/ch05-repository-admin.xml:1923
#, fuzzy
msgid ""
"While the Subversion repository dump format contains human-readable
portions "
@@ -19485,7 +19499,7 @@
"换。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1931
+#: ../../en/book/ch05-repository-admin.xml:1932
msgid ""
"There are many reasons for dumping and loading Subversion repository
data. "
"Early in Subversion's life, the most common reason was due to the
evolution "
@@ -19514,7 +19528,7 @@
"覆盖)从版本库历史中清理文件。"
#. type: Content of: <book><chapter><sect1><sect2><note><para>
-#: ../../en/book/ch05-repository-admin.xml:1952
+#: ../../en/book/ch05-repository-admin.xml:1953
msgid ""
"The Subversion repository dump format describes versioned repository
changes "
"only. It will not carry any information about uncommitted transactions,
user "
@@ -19523,7 +19537,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1959
+#: ../../en/book/ch05-repository-admin.xml:1960
#, fuzzy
msgid ""
"Whatever your reason for migrating repository history, using the "
@@ -19542,7 +19556,7 @@
"在终端窗口中监视运行状态，例如："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1983
+#: ../../en/book/ch05-repository-admin.xml:1984
#, fuzzy
msgid ""
"At the end of the process, you will have a single file
(<filename>dumpfile</"
@@ -19558,7 +19572,7 @@
"的过程相同，所以可以在任何时候安全的运行这个命令。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:1992
+#: ../../en/book/ch05-repository-admin.xml:1993
#, fuzzy
msgid ""
"The other subcommand in the pair, <command>svnadmin load</command>,
parses "
@@ -19572,7 +19586,7 @@
"中："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2028
+#: ../../en/book/ch05-repository-admin.xml:2029
#, fuzzy
msgid ""
"The result of a load is new revisions added to a repository—the
same "
@@ -19600,7 +19614,7 @@
"\"/>来得到更多相关信息。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2048
+#: ../../en/book/ch05-repository-admin.xml:2049
#, fuzzy
msgid ""
"Note that because <command>svnadmin</command> uses standard input and
output "
@@ -19613,7 +19627,7 @@
"command>："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2059
+#: ../../en/book/ch05-repository-admin.xml:2060
#, fuzzy
msgid ""
"By default, the dump file will be quite large—much larger than the "
@@ -19637,7 +19651,7 @@
"则基本上与版本库的体积相当。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2074
+#: ../../en/book/ch05-repository-admin.xml:2075
#, fuzzy
msgid ""
"We mentioned previously that <command>svnadmin dump</command> outputs a
range "
@@ -19651,7 +19665,7 @@
"储。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2086
+#: ../../en/book/ch05-repository-admin.xml:2087
#, fuzzy
msgid ""
"As Subversion dumps each new revision, it outputs only enough information
to "
@@ -19667,7 +19681,7 @@
"dump</command>转储的第一个修订版本。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2095
+#: ../../en/book/ch05-repository-admin.xml:2096
#, fuzzy
msgid ""
"By default, Subversion will not express the first dumped revision as
merely "
@@ -19686,7 +19700,7 @@
"认情况下会完整的保存目录, 文件以及属性等数据。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2106
+#: ../../en/book/ch05-repository-admin.xml:2107
#, fuzzy
msgid ""
"However, you can change this default behavior. If you add the <option>--"
@@ -19706,14 +19720,14 @@
"个大文件，比如："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2124
+#: ../../en/book/ch05-repository-admin.xml:2125
msgid ""
"These dump files could be loaded into a new repository with the
following "
"command sequence:"
msgstr "这些转储文件可以使用下列命令装载到一个新的版本库中："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2133
+#: ../../en/book/ch05-repository-admin.xml:2134
#, fuzzy
msgid ""
"Another neat trick you can perform with this
<option>--incremental</option> "
@@ -19733,7 +19747,7 @@
"很好的版本库备份工具，以防万一出现系统崩溃或其它灾难性事件。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2145
+#: ../../en/book/ch05-repository-admin.xml:2146
#, fuzzy
msgid ""
"The dump format can also be used to merge the contents of several
different "
@@ -19751,21 +19765,21 @@
"一个新的版本库中保存所有三个转储文件中的数据："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2161
+#: ../../en/book/ch05-repository-admin.xml:2162
msgid ""
"Then, make new directories in the repository that will encapsulate the "
"contents of each of the three previous repositories:"
msgstr "然后在版本库中创建三个目录分别保存来自三个不同版本库的数据："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2174
+#: ../../en/book/ch05-repository-admin.xml:2175
msgid ""
"Lastly, load the individual dump files into their respective locations in
the "
"new repository:"
msgstr "最后，将转储文件分别装载到各自的目录中："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2187
+#: ../../en/book/ch05-repository-admin.xml:2188
#, fuzzy
msgid ""
"We'll mention one final way to use the Subversion repository dump "
@@ -19785,12 +19799,12 @@
"转换为转储数据格式，如此才能将CVS版本库的数据导入Subversion版本库之中。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch05-repository-admin.xml:2203
+#: ../../en/book/ch05-repository-admin.xml:2204
msgid "Filtering Repository History"
msgstr "过滤版本库历史"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2205
+#: ../../en/book/ch05-repository-admin.xml:2206
#, fuzzy
msgid ""
"Since Subversion stores your versioned history using, at the very least, "
@@ -19818,12 +19832,12 @@
"好的选择。"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch05-repository-admin.xml:2213
+#: ../../en/book/ch05-repository-admin.xml:2214
msgid "That's rather the reason you use version control at all, right?"
msgstr "那就是你是用版本控制的原因，对吗？"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch05-repository-admin.xml:2222
+#: ../../en/book/ch05-repository-admin.xml:2223
msgid ""
"Conscious, cautious removal of certain bits of versioned data is
actually "
"supported by real use cases. That's why an <quote>obliterate</quote>
feature "
@@ -19835,7 +19849,7 @@
"的。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2236
+#: ../../en/book/ch05-repository-admin.xml:2237
#, fuzzy
msgid ""
"As we described earlier in <xref linkend=\"svn.reposadmin.maint.migrate\"
/>, "
@@ -19858,7 +19872,7 @@
"花费很多时间。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2250
+#: ../../en/book/ch05-repository-admin.xml:2251
#, fuzzy
msgid ""
"That's where <command>svndumpfilter</command> becomes useful. This
program "
@@ -19875,7 +19889,7 @@
"含蓄的)的转储数据流。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2259
+#: ../../en/book/ch05-repository-admin.xml:2260
#, fuzzy
msgid ""
"Let's look at a realistic example of how you might use this program.
Earlier "
@@ -19895,7 +19909,7 @@
"成家。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2271
+#: ../../en/book/ch05-repository-admin.xml:2272
#, fuzzy
msgid ""
"Our imaginary repository contains three projects:
<literal>calc</literal>, "
@@ -19906,14 +19920,14 @@
"literal>，和 <literal>spreadsheet</literal>。它们在版本库中的布局如下："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2292
+#: ../../en/book/ch05-repository-admin.xml:2293
msgid ""
"To get these three projects into their own repositories, we first dump
the "
"whole repository:"
msgstr "现在要把这三个项目转移到三个独立的版本库中。首先，转储整个版本库："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2305
+#: ../../en/book/ch05-repository-admin.xml:2306
#, fuzzy
msgid ""
"Next, run that dump file through the filter, each time including only one
of "
@@ -19923,7 +19937,7 @@
"件："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2319
+#: ../../en/book/ch05-repository-admin.xml:2320
#, fuzzy
msgid ""
"At this point, you have to make a decision. Each of your dump files
will "
@@ -19950,7 +19964,7 @@
"<filename>calc</filename>目录的部分。一般来说，就是如下的一些内容："
#. type: Content of: <book><chapter><sect1><sect2><warning><para>
-#: ../../en/book/ch05-repository-admin.xml:2345
+#: ../../en/book/ch05-repository-admin.xml:2346
#, fuzzy
msgid ""
"If you do plan on manually editing the dump file to remove a top-level "
@@ -19964,7 +19978,7 @@
"否则文件的内容就与所需的格式不相符，这个转储文件也就失效了。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2354
+#: ../../en/book/ch05-repository-admin.xml:2355
#, fuzzy
msgid ""
"All that remains now is to create your three new repositories, and load
each "
@@ -19975,7 +19989,7 @@
"的UUID："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2380
+#: ../../en/book/ch05-repository-admin.xml:2381
#, fuzzy
msgid ""
"Both of <command>svndumpfilter</command>'s subcommands accept options
for "
@@ -19991,24 +20005,24 @@
"这些修订版本，<command>svndumpfilter</command>提供了以下命令行选项："
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch05-repository-admin.xml:2391
-#: ../../en/book/ch09-reference.xml:8223
+#: ../../en/book/ch05-repository-admin.xml:2392
+#: ../../en/book/ch09-reference.xml:8333
msgid "<option>--drop-empty-revs</option>"
msgstr "<option>--drop-empty-revs</option>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch05-repository-admin.xml:2393
+#: ../../en/book/ch05-repository-admin.xml:2394
msgid "Do not generate empty revisions at all—just omit them."
msgstr "根本不生成空版本—忽略它们。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch05-repository-admin.xml:2398
-#: ../../en/book/ch09-reference.xml:8232
+#: ../../en/book/ch05-repository-admin.xml:2399
+#: ../../en/book/ch09-reference.xml:8342
msgid "<option>--renumber-revs</option>"
msgstr "<option>--renumber-revs</option>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch05-repository-admin.xml:2400
+#: ../../en/book/ch05-repository-admin.xml:2401
msgid ""
"If empty revisions are dropped (using the
<option>--drop-empty-revs</option> "
"option), change the revision numbers of the remaining revisions so that
there "
@@ -20018,13 +20032,13 @@
"其它修订版本的编号，确保编号序列是连续的。"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><term>
-#: ../../en/book/ch05-repository-admin.xml:2407
-#: ../../en/book/ch09-reference.xml:8251
+#: ../../en/book/ch05-repository-admin.xml:2408
+#: ../../en/book/ch09-reference.xml:8361
msgid "<option>--preserve-revprops</option>"
msgstr "<option>--preserve-revprops</option>"
#. type: Content of:
<book><chapter><sect1><sect2><variablelist><varlistentry><listitem><para>
-#: ../../en/book/ch05-repository-admin.xml:2409
+#: ../../en/book/ch05-repository-admin.xml:2410
#, fuzzy
msgid ""
"If empty revisions are not dropped, preserve the revision properties
(log "
@@ -20038,7 +20052,7 @@
"的日志信息，表明此修订版本由<command>svndumpfilter</command>处理过。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2420
+#: ../../en/book/ch05-repository-admin.xml:2421
#, fuzzy
msgid ""
"While <command>svndumpfilter</command> can be very useful and a huge "
@@ -20054,7 +20068,7 @@
"literal>这两个头参数对你有些帮助。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2434
+#: ../../en/book/ch05-repository-admin.xml:2435
#, fuzzy
msgid ""
"If the paths have leading slashes, you should include leading slashes in
the "
@@ -20070,7 +20084,7 @@
"需要修正这些路径，统一使用斜线开头或不使用斜线开头。"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch05-repository-admin.xml:2441
+#: ../../en/book/ch05-repository-admin.xml:2442
msgid ""
"While <command>svnadmin dump</command> has a consistent leading slash
policy "
"(to not include them), other programs that generate dump data might not
be so "
@@ -20080,7 +20094,7 @@
"个规定就是不以斜线作为路径的开头—其它生成转储文件的程序不一定会遵守这个规
定。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2449
+#: ../../en/book/ch05-repository-admin.xml:2450
#, fuzzy
msgid ""
"Also, copied paths can give you some trouble. Subversion supports copy "
@@ -20110,7 +20124,7 @@
"或许应该作为拷贝操作的源保留给你带来烦恼的路径。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2470
+#: ../../en/book/ch05-repository-admin.xml:2471
#, fuzzy
msgid ""
"Finally, <command>svndumpfilter</command> takes path filtering quite "
@@ -20138,12 +20152,12 @@
"前，你需要确定任何转储流将要存在的目录必须存在于目标版本库。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch05-repository-admin.xml:2494
+#: ../../en/book/ch05-repository-admin.xml:2495
msgid "Repository Replication"
msgstr "版本库复制"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2496
+#: ../../en/book/ch05-repository-admin.xml:2497
#, fuzzy
msgid ""
"There are several scenarios in which it is quite handy to have a
Subversion "
@@ -20160,7 +20174,7 @@
"本库。其他的场景包括，部署一个镜像版本库来分流压力，作为软升级机制等等。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2506
+#: ../../en/book/ch05-repository-admin.xml:2507
#, fuzzy
msgid ""
"As of version 1.4, Subversion provides a program for managing scenarios
such "
@@ -20180,7 +20194,7 @@
"库访问层(RA)接口实现的，所有要做的就是读源版本库，然后读写访问目标版本
库。"
#. type: Content of: <book><chapter><sect1><sect2><note><para>
-#: ../../en/book/ch05-repository-admin.xml:2521
+#: ../../en/book/ch05-repository-admin.xml:2522
#, fuzzy
msgid ""
"When using <command>svnsync</command> against a remote source repository,
the "
@@ -20191,7 +20205,7 @@
"是Subversion1.4或更高的版本。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2526
+#: ../../en/book/ch05-repository-admin.xml:2527
#, fuzzy
msgid ""
"Assuming you already have a source repository that you'd like to mirror,
the "
@@ -20215,7 +20229,7 @@
"1/>最好的办法就是只允许镜像进程修改目标版本库内容。"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch05-repository-admin.xml:2540
+#: ../../en/book/ch05-repository-admin.xml:2541
msgid ""
"In fact, it can't truly be read-only, or <command>svnsync</command>
itself "
"would have a tough time copying revision history into it."
@@ -20224,7 +20238,7 @@
"史拷入。"
#. type: Content of: <book><chapter><sect1><sect2><warning><para>
-#: ../../en/book/ch05-repository-admin.xml:2549
+#: ../../en/book/ch05-repository-admin.xml:2550
#, fuzzy
msgid ""
"Do <emphasis>not</emphasis> modify a mirror repository in such a way as
to "
@@ -20237,7 +20251,7 @@
"和版本库的属性修改必须是由<command>svnsync</command>执行的。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2557
+#: ../../en/book/ch05-repository-admin.xml:2558
#, fuzzy
msgid ""
"Another requirement of the target repository is that the
<command>svnsync</"
@@ -20259,7 +20273,7 @@
"始镜像版本库修订版本了。"
#. type: Content of: <book><chapter><sect1><sect2><tip><para>
-#: ../../en/book/ch05-repository-admin.xml:2571
+#: ../../en/book/ch05-repository-admin.xml:2572
msgid ""
"It's a good idea to implement authorization measures that allow your "
"repository replication process to perform its tasks while preventing
other "
@@ -20269,7 +20283,7 @@
"意。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2577
+#: ../../en/book/ch05-repository-admin.xml:2578
#, fuzzy
msgid ""
"Let's walk through the use of <command>svnsync</command> in a somewhat "
@@ -20281,7 +20295,7 @@
"讨论实践推荐，但是如果你们不需要或者感到不适合你们的环境，你可以不必去关
注。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2583
+#: ../../en/book/ch05-repository-admin.xml:2584
#, fuzzy
msgid ""
"As a service to the fine developers of our favorite version control
system, "
@@ -20305,7 +20319,7 @@
"创建复制进程，我们正在使用的一个例子。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2599
+#: ../../en/book/ch05-repository-admin.xml:2600
#, fuzzy
msgid ""
"First, we'll create the repository which will be our mirror. This and
the "
@@ -20317,7 +20331,7 @@
"本库的机器。一旦版本库配置完成，我们不必再直接碰它了。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2612
+#: ../../en/book/ch05-repository-admin.xml:2613
#, fuzzy
msgid ""
"At this point, we have our repository, and due to our server's
configuration, "
@@ -20334,7 +20348,7 @@
"<literal>syncuser</literal>的提交和属性修改可以被执行。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2622
+#: ../../en/book/ch05-repository-admin.xml:2623
#, fuzzy
msgid ""
"We'll use the repository's hook system both to allow the replication
process "
@@ -20353,12 +20367,12 @@
"<literal>syncuser</literal>，如果是，则允许修改；否则，拒绝修改。"
#. type: Content of: <book><chapter><sect1><sect2><example><title>
-#: ../../en/book/ch05-repository-admin.xml:2635
+#: ../../en/book/ch05-repository-admin.xml:2636
msgid "Mirror repository's pre-revprop-change hook script"
msgstr "镜像版本库的 pre-revprop-change 钩子"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2649
+#: ../../en/book/ch05-repository-admin.xml:2650
#, fuzzy
msgid ""
"That covers revision property changes. Now we need to ensure that only
the "
@@ -20373,12 +20387,12 @@
"filename>钩子。"
#. type: Content of: <book><chapter><sect1><sect2><example><title>
-#: ../../en/book/ch05-repository-admin.xml:2658
+#: ../../en/book/ch05-repository-admin.xml:2659
msgid "Mirror repository's start-commit hook script"
msgstr "镜像版本库的 start-commit 钩子"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2672
+#: ../../en/book/ch05-repository-admin.xml:2673
#, fuzzy
msgid ""
"After installing our hook scripts and ensuring that they are executable
by "
@@ -20389,7 +20403,7 @@
"本库的配置，现在我们开始实际的镜像。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2677
+#: ../../en/book/ch05-repository-admin.xml:2678
#, fuzzy
msgid ""
"The first thing we need to do with <command>svnsync</command> is to
register "
@@ -20407,7 +20421,7 @@
"可以使用<command>svnsync</command>镜像版本库的子树。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2702
+#: ../../en/book/ch05-repository-admin.xml:2703
#, fuzzy
msgid ""
"Our target repository will now remember that it is a mirror of the
public "
@@ -20420,7 +20434,7 @@
"revprop-change钩子的要求。"
#. type: Content of: <book><chapter><sect1><sect2><note><para>
-#: ../../en/book/ch05-repository-admin.xml:2709
+#: ../../en/book/ch05-repository-admin.xml:2710
#, fuzzy
msgid ""
"In Subversion 1.4, the values given to <command>svnsync</command>'s
<option>--"
@@ -20437,7 +20451,7 @@
"command>时会遇到这个问题。"
#. type: Content of: <book><chapter><sect1><sect2><note><para>
-#: ../../en/book/ch05-repository-admin.xml:2718
+#: ../../en/book/ch05-repository-admin.xml:2719
msgid ""
"This has been fixed in Subversion 1.5 with the introduction of two new
pairs "
"of options. Use <option>--source-username</option> and <option>--source-"
@@ -20449,7 +20463,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2732
+#: ../../en/book/ch05-repository-admin.xml:2733
#, fuzzy
msgid ""
"And now comes the fun part. With a single subcommand, we can tell "
@@ -20474,7 +20488,7 @@
"将其作为新的提交转发到目标版本库服务器。"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch05-repository-admin.xml:2737
+#: ../../en/book/ch05-repository-admin.xml:2738
msgid ""
"Be forewarned that while it will take only a few seconds for the average "
"reader to parse this paragraph and the sample output that follows it,
the "
@@ -20485,7 +20499,7 @@
"像过程花费的时间可能会非常长。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2786
+#: ../../en/book/ch05-repository-admin.xml:2787
#, fuzzy
msgid ""
"Of particular interest here is that for each mirrored revision, there is "
@@ -20508,7 +20522,7 @@
"果。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2801
+#: ../../en/book/ch05-repository-admin.xml:2802
#, fuzzy
msgid ""
"Also noteworthy is that <command>svnsync</command> performs careful "
@@ -20517,7 +20531,7 @@
"mirroring a repository, simply repeat the <command>svnsync synchronize</"
"command> command, and it will happily pick up right where it left off.
In "
"fact, as new revisions appear in the source repository, this is exactly
what "
-"you to do to keep your mirror up to date."
+"you do to keep your mirror up to date."
msgstr ""
"值得注意的是<command>svnsync</command>会小心簿记所有的操作，可以安全的中断
并重"
"新开始，而不必破坏镜像数据的完整性。如果在<command>svnsync synchronize</"
@@ -20526,12 +20540,12 @@
"像不会过时。"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><title>
-#: ../../en/book/ch05-repository-admin.xml:2812
+#: ../../en/book/ch05-repository-admin.xml:2813
msgid "svnsync Bookkeeping"
msgstr "关于 svnsync"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch05-repository-admin.xml:2814
+#: ../../en/book/ch05-repository-admin.xml:2815
msgid ""
"<command>svnsync</command> needs to be able to set and modify revision "
"properties on the mirror repository because those properties are part of
the "
@@ -20545,7 +20559,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch05-repository-admin.xml:2826
+#: ../../en/book/ch05-repository-admin.xml:2827
msgid ""
"One of those pieces of state-tracking information is a flag that
essentially "
"just means <quote>there's a synchronization in progress right
now.</quote> "
@@ -20563,7 +20577,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch05-repository-admin.xml:2851
+#: ../../en/book/ch05-repository-admin.xml:2852
msgid ""
"That <command>svnsync</command> stores the source repository URL in a "
"bookkeeping property on the mirror repository is the reason why you have
to "
@@ -20586,12 +20600,12 @@
msgstr ""
#. type: Content of:
<book><chapter><sect1><sect2><sidebar><screen><replaceable>
-#: ../../en/book/ch05-repository-admin.xml:2877
+#: ../../en/book/ch05-repository-admin.xml:2878
msgid "NEW-SOURCE-URL"
msgstr "NEW-SOURCE-URL"
#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
-#: ../../en/book/ch05-repository-admin.xml:2883
+#: ../../en/book/ch05-repository-admin.xml:2884
msgid ""
"Another interesting thing about these special bookkeeping properties is
that "
"<command>svnsync</command> will not attempt to mirror any of those
properties "
@@ -20605,8 +20619,16 @@
"the source repository, it simply ignores them."
msgstr ""
+#. type: Content of: <book><chapter><sect1><sect2><sidebar><para>
+#: ../../en/book/ch05-repository-admin.xml:2898
+msgid ""
+"In Subversion 1.6, an <command>svnsync info</command> subcommand has
been "
+"added to easily display the special bookkeeping properties in the
destination "
+"repository."
+msgstr ""
+
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2899
+#: ../../en/book/ch05-repository-admin.xml:2917
#, fuzzy
msgid ""
"There is, however, one bit of inelegance in the process. Because
Subversion "
@@ -20628,7 +20650,7 @@
"令，只是简单的重新复制某个特定修订版本的属性。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2925
+#: ../../en/book/ch05-repository-admin.xml:2943
#, fuzzy
msgid ""
"That's repository replication in a nutshell. You'll likely want some "
@@ -20643,7 +20665,7 @@
"主版本库将修改推倒一个或多个镜像，这样就可以近乎实时的保持镜像的时效性。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2934
+#: ../../en/book/ch05-repository-admin.xml:2952
#, fuzzy
msgid ""
"Also, while it isn't very commonplace to do so,
<command>svnsync</command> "
@@ -20656,7 +20678,7 @@
"优雅的镜像，它只会拷贝允许查看的版本库内容，显然这种镜像不适合备份方案。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2941
+#: ../../en/book/ch05-repository-admin.xml:2959
msgid ""
"In Subversion 1.5, <command>svnsync</command> grew the ability to also
mirror "
"a subset of a repository rather than the whole thing. The process of
setting "
@@ -20678,7 +20700,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2963
+#: ../../en/book/ch05-repository-admin.xml:2981
#, fuzzy
msgid ""
"As far as user interaction with repositories and mirrors goes, it "
@@ -20695,7 +20717,7 @@
"讨论了这个问题。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2972
+#: ../../en/book/ch05-repository-admin.xml:2990
#, fuzzy
msgid ""
"Once the two repositories have the same UUID, you can use <command>svn "
@@ -20720,7 +20742,7 @@
"本库变成最新，或者将工作副本恢复到你知道的版本库修订版本，再尝试重新定
位。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:2989
+#: ../../en/book/ch05-repository-admin.xml:3007
#, fuzzy
msgid ""
"Finally, be aware that the revision-based replication provided by "
@@ -20739,12 +20761,12 @@
"信息。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch05-repository-admin.xml:3004
+#: ../../en/book/ch05-repository-admin.xml:3022
msgid "Repository Backup"
msgstr "版本库备份"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3006
+#: ../../en/book/ch05-repository-admin.xml:3024
#, fuzzy
msgid ""
"Despite numerous advances in technology since the birth of the modern "
@@ -20761,7 +20783,7 @@
"样备份你的版本库数据。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3016
+#: ../../en/book/ch05-repository-admin.xml:3034
#, fuzzy
msgid ""
"There are two types of backup methods available for Subversion
repository "
@@ -20778,7 +20800,7 @@
"FSFS环境)的完全复制，增量备份的内容要少一些：只包含在上次备份后改变的部
分。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3028
+#: ../../en/book/ch05-repository-admin.xml:3046
#, fuzzy
msgid ""
"As far as full backups go, the naïve approach might seem like a sane one,
but "
@@ -20801,7 +20823,7 @@
"就像Unix的<command>cp</command>或Windows的<command>copy</command>一样琐
碎："
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3047
+#: ../../en/book/ch05-repository-admin.xml:3065
#, fuzzy
msgid ""
"The resultant backup is a fully functional Subversion repository, able to
be "
@@ -20812,7 +20834,7 @@
"替换。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3051
+#: ../../en/book/ch05-repository-admin.xml:3069
#, fuzzy
msgid ""
"When making copies of a Berkeley DB repository, you can even instruct "
@@ -20827,7 +20849,7 @@
"option>。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3063
+#: ../../en/book/ch05-repository-admin.xml:3081
#, fuzzy
msgid ""
"Additional tooling around this command is available, too. The "
@@ -20854,7 +20876,7 @@
"间间隔)。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3081
+#: ../../en/book/ch05-repository-admin.xml:3099
#, fuzzy
msgid ""
"Some administrators use a different backup mechanism built around
generating "
@@ -20884,7 +20906,7 @@
"采纳，因为这些原因，我们不建议你单独依赖转储为基础的备份方法。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3101
+#: ../../en/book/ch05-repository-admin.xml:3119
#, fuzzy
msgid ""
"As you can see, each of the various backup types and methods has its "
@@ -20908,7 +20930,7 @@
"复的代价之间寻求平衡。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3117
+#: ../../en/book/ch05-repository-admin.xml:3135
#, fuzzy
msgid ""
"The <command>svnsync</command> program (see <xref
linkend=\"svn.reposadmin."
@@ -20929,7 +20951,7 @@
"式存在于版本库路径而不存在于版本库虚拟文件系统的项目不会被svnsync处理。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3131
+#: ../../en/book/ch05-repository-admin.xml:3149
#, fuzzy
msgid ""
"In any backup scenario, repository administrators need to be aware of
how "
@@ -20949,14 +20971,14 @@
"修订版本的属性—因此最新版本的增量备份不会捕捉到以前特定修订版本的属性修
改。"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch05-repository-admin.xml:3138
+#: ../../en/book/ch05-repository-admin.xml:3156
msgid ""
"<command>svnadmin setlog</command> can be called in a way that bypasses
the "
"hook interface altogether."
msgstr "<command>svnadmin setlog</command>可以被绕过钩子程序被调用。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3148
+#: ../../en/book/ch05-repository-admin.xml:3166
#, fuzzy
msgid ""
"Generally speaking, only the truly paranoid would need to back up their "
@@ -20973,7 +20995,7 @@
"足够的冗余措施，至少对于最近的提交。但是它是你的数据—你喜欢怎样保护都可
以。"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3158
+#: ../../en/book/ch05-repository-admin.xml:3176
msgid ""
"Often, the best approach to repository backups is a diversified one that "
"leverages combinations of the methods described here. The Subversion "
@@ -20999,19 +21021,19 @@
"复过来。"
#. type: Content of: <book><chapter><sect1><sect2><para><footnote><para>
-#: ../../en/book/ch05-repository-admin.xml:3173
+#: ../../en/book/ch05-repository-admin.xml:3191
msgid ""
"You know—the collective term for all of her <quote>fickle
fingers.</"
"quote>"
msgstr "你知道的—只是对各种<quote>变化莫测</quote>的问题的统称。"
#. type: Content of: <book><chapter><sect1><sect2><title>
-#: ../../en/book/ch05-repository-admin.xml:3183
+#: ../../en/book/ch05-repository-admin.xml:3201
msgid "Managing Repository UUIDs"
msgstr "管理版本库的 UUID"
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3185
+#: ../../en/book/ch05-repository-admin.xml:3203
msgid ""
"Subversion repositories have a universally unique identifier (UUID) "
"associated with them. This is used by Subversion clients to verify the "
@@ -21023,7 +21045,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3195
+#: ../../en/book/ch05-repository-admin.xml:3213
msgid ""
"As a general rule, you want the UUIDs of your live repositories to be "
"unique. That is, after all, the point of having UUIDs. But there are
times "
@@ -21040,7 +21062,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3211
+#: ../../en/book/ch05-repository-admin.xml:3229
msgid ""
"There are a couple of ways to set (or reset) a repository's UUID, should
you "
"need to. As of Subversion 1.5, this is as simple as using the "
@@ -21051,7 +21073,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3233
+#: ../../en/book/ch05-repository-admin.xml:3251
msgid ""
"For folks using versions of Subversion earlier than 1.5, these tasks are
a "
"little more complicated. You can explicitly set a repository's UUID by "
@@ -21061,7 +21083,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><sect2><para>
-#: ../../en/book/ch05-repository-admin.xml:3250
+#: ../../en/book/ch05-repository-admin.xml:3268
msgid ""
"Having older versions of Subversion generate a brand-new UUID is not
quite as "
"simple to do, though. Your best bet here is to find some other way to "
@@ -21069,12 +21091,12 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><title>
-#: ../../en/book/ch05-repository-admin.xml:3263
+#: ../../en/book/ch05-repository-admin.xml:3281
msgid "Moving and Removing Repositories"
msgstr "移动和删除版本库"
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch05-repository-admin.xml:3265
+#: ../../en/book/ch05-repository-admin.xml:3283
msgid ""
"Subversion repository data is wholly contained within the repository "
"directory. As such, you can move a Subversion repository to some other "
@@ -21088,7 +21110,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch05-repository-admin.xml:3277
+#: ../../en/book/ch05-repository-admin.xml:3295
msgid ""
"Of course, there's often still more to be done when trying to cleanly
affect "
"changes such as this. For example, you might need to update your
Subversion "
@@ -21102,7 +21124,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch05-repository-admin.xml:3289
+#: ../../en/book/ch05-repository-admin.xml:3307
msgid ""
"In the case of a copied repository, you should also consider the fact
that "
"Subversion uses repository UUIDs to distinguish repositories. If you
copy a "
@@ -21115,7 +21137,7 @@
msgstr ""
#. type: Content of: <book><chapter><sect1><para>
-#: ../../en/book/ch05-repository-admin.xml:3308
+#: ../../en/book/ch05-repository-admin.xml:3326
#, fuzzy
msgid ""
"By now you should have a basic understanding of how to create, configure,
and "
@@ -21128,7 +21150,7 @@
"并提出了避免陷入误区的建议。"
#. type
==============================================================================
Diff truncated at 200k characters
More information about the svnbook-dev
mailing list