[svnbook commit] r3465 - Merge with http://i18n-zh.googlecode.com/svn/trunk/doc/svnbook/zh
codesite-noreply at google.com
codesite-noreply at google.com
Thu Apr 2 03:08:51 CDT 2009
Author: dongsheng.song at gmail.com
Date: Thu Apr 2 01:07:09 2009
New Revision: 3465
Added:
trunk/src/tools/Makefile.base-po
trunk/src/zh/images/ (props changed)
- copied from r3463, /trunk/src/zh/book/images/
trunk/src/zh/po/ (props changed)
trunk/src/zh/po/svnbook.po
trunk/src/zh/stylesheets/
trunk/src/zh/stylesheets/chunk.xsl (contents, props changed)
- copied, changed from r3463,
/trunk/src/en/stylesheets/chunk-stylesheet.xsl
trunk/src/zh/stylesheets/fo.xsl (contents, props changed)
- copied, changed from r3463,
/trunk/src/en/stylesheets/fo-stylesheet.xsl
trunk/src/zh/stylesheets/html.xsl (contents, props changed)
- copied, changed from r3463,
/trunk/src/en/stylesheets/html-stylesheet.xsl
trunk/src/zh/stylesheets/styles.css (contents, props changed)
- copied, changed from r3463, /trunk/src/zh/book/styles.css
trunk/src/zh/stylesheets/zh/
trunk/src/zh/stylesheets/zh/chunk.xsl
trunk/src/zh/stylesheets/zh/fo.xsl
trunk/src/zh/stylesheets/zh/html.xsl
Removed:
trunk/src/zh/book/
Modified:
trunk/src/tools/ (props changed)
trunk/src/tools/fo-stylesheet.xsl
trunk/src/zh/ (props changed)
trunk/src/zh/Makefile
Log:
Merge with http://i18n-zh.googlecode.com/svn/trunk/doc/svnbook/zh
Added: trunk/src/tools/Makefile.base-po
==============================================================================
--- (empty file)
+++ trunk/src/tools/Makefile.base-po Thu Apr 2 01:07:09 2009
@@ -0,0 +1,114 @@
+#
+# PO based Makefile for the svnbook
+#
+
+include ../tools/Makefile.base-vars
+
+UPDATEPO = PERLLIB=../../tools/po4a/lib ../../tools/po4a/po4a-updatepo -M
UTF-8 \
+ -f docbook -o doctype='docbook' -o includeexternal \
+ -o nodefault='<programlisting> <screen>' \
+ -o untranslated='<programlisting> <screen>'
+TRANSLATE = PERLLIB=../tools/po4a/lib ../tools/po4a/po4a-translate -M
UTF-8 \
+ -f docbook -o doctype='docbook' \
+ -k 0
+
+help:
+ @echo " make epub # IDPF EPUB format"
+ @echo " make html-chunk # one web page per node."
+ @echo " make html # entirely on one web page."
+ @echo " make pdf # Adobe Portable Document Format."
+ @echo " make validate # always before commit!"
+ @echo " make tidypo # always before commit!"
+ @echo " make updatepo # update po files."
+ @echo " make all # html html-chunk epub"
+ @echo " make stat"
+ @echo " make clean"
+
+clean:
+ @rm -fr build po/*.mo book
+
+all: html html-chunk epub
+
+stat:
+ @( \
+ cd po; \
+ for f in *.po; do \
+ printf "%s\t" $$f; \
+ LC_ALL=C msgfmt --statistics -c $$f; \
+ done; \
+ )
+
+tidypo:
+ for po in $(wildcard po/*.po); do \
+ msgcat --sort-by-file --width=80 $$po > $$po.tmp && mv $$po.tmp $$po; \
+ done
+
+updatepo:
+ (cd po && $(UPDATEPO) -m ../../en/book/book.xml -p svnbook.po)
+ $(MAKE) tidypo
+
+build/source/svnbook.xml: $(filter-out ../en/book/version.xml,
$(wildcard ../en/book/*.xml)) po/svnbook.po
+ mkdir -p build/source/images book
+ cp stylesheets/styles.css build/source
+ cp ../en/book/images/*.png build/source/images
+ cp images/*.png build/source/images
+ cp ../en/book/*.xml book
+
+ cat book/book.xml | \
+
sed 's/..\/..\/tools\/dtd\/docbook-4.4\/docbookx.dtd/http:\/\/www.oasis-open.org\/docbook\/xml\/4.5\/docbookx.dtd/'
\
+ > book/book.xml.tmp
+ mv book/book.xml.tmp book/book.xml
+ @if svn info . > /dev/null; then \
+ echo '<!ENTITY svn.l10n_revision "'`LC_ALL=C svn info po |
awk '{if(/^Last Changed Rev/) print "r"$$4}'`'">' > book/version.xml.tmp; \
+ echo '<!ENTITY svn.version "'`LC_ALL=C svn info ../en/book |
awk '{if(/^Last Changed Rev/) print "/r"$$4}'`'">' >> book/version.xml.tmp;
\
+ else \
+ echo '<!ENTITY svn.l10n_revision "'`date +%Y-%m-%d`'">' >
book/version.xml.tmp; \
+ echo '<!ENTITY svn.version "">' >> book/version.xml.tmp; \
+ fi
+ @if cmp -s book/version.xml book/version.xml.tmp; then \
+ rm book/version.xml.tmp; \
+ else \
+ mv book/version.xml.tmp book/version.xml; \
+ fi
+
+ xmllint --nonet --noent --xinclude --postvalid --output
build/source/svnbook-en.xml book/book.xml
+ $(TRANSLATE) -m build/source/svnbook-en.xml -p po/svnbook.po -l
build/source/svnbook.xml
+ $(MAKE) validate
+
+validate: build/source/svnbook.xml
+ xmllint --nonet --noout --postvalid --xinclude $<
+
+epub: build/svnbook.epub
+build/svnbook.epub: build/source/svnbook.xml
+ $(ENSURE_XSL)
+ (cd build/source; ../../../tools/xsl/epub/bin/dbtoepub -c styles.css -v
svnbook.xml; mv svnbook.epub ..)
+
+html-chunk: build/svnbook-html-chunk/index.html
+build/svnbook-html-chunk/index.html: build/source/svnbook.xml
stylesheets/chunk.xsl stylesheets/$(LINGUA)/chunk.xsl
+ $(ENSURE_XSL)
+ mkdir -p build/svnbook-html-chunk/images
+ cp build/source/styles.css build/svnbook-html-chunk
+ cp build/source/images/*.png build/svnbook-html-chunk/images
+ xsltproc --output build/svnbook-html-chunk/ \
+ stylesheets/$(LINGUA)/chunk.xsl build/source/svnbook.xml
+ (cd build; tar czf svnbook-html-chunk.tgz svnbook-html-chunk)
+
+html: build/svnbook-html/svnbook.html
+build/svnbook-html/svnbook.html: build/source/svnbook.xml
stylesheets/html.xsl stylesheets/$(LINGUA)/html.xsl
+ $(ENSURE_XSL)
+ mkdir -p build/svnbook-html/images
+ cp ../en/book/styles.css build/svnbook-html
+ cp ../en/book/images/*.png build/svnbook-html/images
+ xsltproc --output build/svnbook-html/svnbook.html \
+ stylesheets/$(LINGUA)/html.xsl build/source/svnbook.xml
+ (cd build; tar czf svnbook-html.tgz svnbook-html)
+
+#
+# Requires at least fop 0.96 and configure Chinese fonts
+#
+pdf: build/svnbook.pdf
+build/svnbook.pdf: build/source/svnbook.xml stylesheets/fo.xsl
stylesheets/$(LINGUA)/fo.xsl
+ $(ENSURE_XSL)
+ xsltproc --output build/source/svnbook.fo --param fop1.extensions 1 \
+ stylesheets/$(LINGUA)/fo.xsl build/source/svnbook.xml
+ (cd build/source && ../../../tools/fop1.sh
-c ../../../tools/fop1-userconfig.xml svnbook.fo ../svnbook.pdf)
Modified: trunk/src/tools/fo-stylesheet.xsl
==============================================================================
--- trunk/src/tools/fo-stylesheet.xsl (original)
+++ trunk/src/tools/fo-stylesheet.xsl Thu Apr 2 01:07:09 2009
@@ -8,8 +8,8 @@
<xsl:param name="fop.extensions" select="1" />
<xsl:param name="variablelist.as.blocks" select="1" />
<xsl:param name="body.start.indent">0pt</xsl:param>
- <xsl:param name="body.font.family">sans-serif</xsl:param>
- <xsl:param name="dingbat.font.family">sans-serif</xsl:param>
+ <xsl:param name="body.font.family">serif,SimSun</xsl:param>
+ <xsl:param name="dingbat.font.family">serif,SimSun</xsl:param>
<xsl:param name="admon.textlabel" select="0" />
<xsl:param name="admon.graphics" select="1" />
<xsl:param name="admon.graphics.path">images/</xsl:param>
Modified: trunk/src/zh/Makefile
==============================================================================
--- trunk/src/zh/Makefile (original)
+++ trunk/src/zh/Makefile Thu Apr 2 01:07:09 2009
@@ -1 +1,6 @@
-include ../tools/Makefile.base
+#
+# PO based Makefile for the svnbook
+#
+
+LINGUA=zh
+include ../tools/Makefile.base-po
Added: trunk/src/zh/po/svnbook.po
==============================================================================
--- (empty file)
+++ trunk/src/zh/po/svnbook.po Thu Apr 2 01:07:09 2009
@@ -0,0 +1,37645 @@
+#
+# Simplified Chinese translation for svnbook
+# This file is distributed under the same license as the svnbook.
+#
+# Authors:
+# Dongsheng Song <dongsheng.song at gmail.com>, 2007-2009
+# Daijun Sun <daijun at gmail.com>, 2005-2008
+# Xun Leasun <leasun at gmail.com>, 2005-2006
+#
+# Check translation:
+# msgfmt --statistics -c -o svnbook.mo svnbook.po
+#
+# Please format your translation before commit:
+# msgcat --sort-by-file --width=80 -o svnbook_tmp.po svnbook.po
+# mv -f svnbook_tmp.po svnbook.po
+#
+# Dictionary:
+# BASE revision 基础版本
+# blame 追溯
+# checkout 检出
+# default 默认
+# HEAD revision 最新版本
+# overlay 重载
+# remove 删除
+# rename 改名
+# repository 版本库
+# revert 恢复
+# revision 版本
+# Subversion book Subversion 手册
+# undo 撤销
+# unified diff 标准差异
+# unversioned 未版本控制
+# versioned 已版本控制
+# working copy 工作副本
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: svnbook 1.6\n"
+"POT-Creation-Date: 2009-04-02 15:45+0800\n"
+"PO-Revision-Date: 2009-03-27 14:31+0800\n"
+"Last-Translator: \n"
+"Language-Team: Simplified Chinese <i18n-zh at googlegroups.com >\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Chinese\n"
+"X-Poedit-Country: CHINA\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. type: Content of: <book><appendix><title>
+#: ../../en/book/appa-quickstart.xml:3
+msgid "Subversion Quick-Start Guide"
+msgstr "Subversion 快速入门指南"
+
+#. type: Content of: <book><appendix><para>
+#: ../../en/book/appa-quickstart.xml:6
+msgid ""
+"If you're eager to get Subversion up and running (and you enjoy learning
by "
+"experimentation), this appendix will show you how to create a
repository, "
+"import code, and then check it back out again as a working copy. Along
the "
+"way, we give links to the relevant chapters of this book."
+msgstr ""
+"如果你渴望快速配置 Subversion 并运行(而且你喜欢通过实验学习)，本章会展示如
何创"
+"建版本库，导入代码，然后以工作副本检出，继续我们会给出本书的相关章节的链
接。"
+
+#. type: Content of: <book><appendix><warning><para>
+#: ../../en/book/appa-quickstart.xml:13
+msgid ""
+"If you're new to the entire concept of version control or to the
<quote>copy-"
+"modify-merge</quote> model used by both CVS and Subversion, you should
read "
+"<xref linkend=\"svn.basic\"/> before going any further."
+msgstr ""
+"如果读者还不熟悉版本控制，以及在 Subversion 和 CVS 中使用的<quote>拷贝-修
改-合"
+"并</quote>模型这些基础概念，那么建议在进一步学习之前，首先阅读<xref
linkend="
+"\"svn.basic\"/>。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appa-quickstart.xml:25
+msgid "Installing Subversion"
+msgstr "安装 Subversion"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:27
+msgid ""
+"Subversion is built on a portability layer called APR—the Apache "
+"Portable Runtime library. The APR library provides all the interfaces
that "
+"Subversion needs to function on different operating systems: disk
access, "
+"network access, memory management, and so on. While Subversion is able
to "
+"use Apache as one of its network server programs, its dependence on APR "
+"<emphasis>does not</emphasis> mean that Apache is a required component.
APR "
+"is a standalone library usable by any application. It does mean,
however, "
+"that like Apache, Subversion clients and servers run on any operating
system "
+"that the Apache <command>httpd</command> server runs on: Windows, Linux,
all "
+"flavors of BSD, Mac OS X, NetWare, and others."
+msgstr ""
+"Subversion 是基于 APR—Apache 可移植运行库构建的。APR 提供了
Subversion "
+"需要的全部与操作系统相关的操作接口，如磁盘访问, 网络访问，内存管理等。这使
得 "
+"Subversion 能够使用 Apache 作为其网络服务器程序之一，Subversion 对 APR 的
依赖"
+"<emphasis>并不</emphasis>意味着必须使用 Apache 作为它的网络服务器程序。
APR是一"
+"个独立的程序库，任何应用程序都可以使用它。相反，它意味着 Subversion 能够在
所有"
+"可运行 Apache 服务器的操作系统上运行，如 Windows, Linux, 各种 BSD, Mac OS
X, "
+"Netware 等。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:40
+msgid ""
+"The easiest way to get Subversion is to download a binary package built
for "
+"your operating system. Subversion's web site (<ulink
url=\"http://subversion."
+"tigris.org\"/>) often has these packages available for download, posted
by "
+"volunteers. The site usually contains graphical installer packages for
users "
+"of Microsoft operating systems. If you run a Unix-like operating system,
you "
+"can use your system's native package distribution system (RPMs, DEBs,
the "
+"ports tree, etc.) to get Subversion."
+msgstr ""
+"最简单的安装 Subversion 的方法就是下载与你的操作系统对应的二进制程序包。
在 "
+"Subversion 的网站(<ulink url=\"http://subversion.tigris.org\"/>)上通常可以
找到"
+"由志愿者提供下载的程序包。在这个网站上，会提供微软操作系统上的图形化应用程
序安"
+"装包。而对于类 Unix 系统，则可以使用其自身的程序包系统(RPM, DEB, ports 等
)来获"
+"取 Subversion。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:50
+#, fuzzy
+msgid ""
+"Alternatively, you can build Subversion directly from source code,
though "
+"it's not always an easy task. (If you're not experienced at building
open "
+"source software packages, you're probably better off downloading a
binary "
+"distribution instead!) From the Subversion web site, download the
latest "
+"source code release. After unpacking it, follow the instructions in the "
+"<filename>INSTALL</filename> file to build it. Note that a released
source "
+"package may not contain everything you need to build a command-line
client "
+"capable of talking to a remote repository. Starting with Subversion 1.4
and "
+"later, the libraries Subversion depends on (apr, apr-util, and neon) are "
+"distributed in a separate source package suffixed with <filename>-deps</"
+"filename>. These libraries are now common enough that they may already
be "
+"installed on your system. If not, you'll need to unpack the dependency "
+"package into the same directory where you unpacked the main Subversion "
+"source. Regardless, it's possible that you may want to fetch other
optional "
+"dependencies such as Berkeley DB and possibly Apache <command>httpd</"
+"command>. If you want to do a complete build, make sure you have all of
the "
+"packages documented in the <filename>INSTALL</filename> file."
+msgstr ""
+"此外，还可以通过编译源代码包直接生成Subversion程序，尽管这不是一件简单的任
务"
+"(如果你没有构建过开源软件包，你最好下载二进制发布版本)。首先，从
Subversion网站"
+"下载最新的源代码包，然后解压缩。然后，根据<filename>INSTALL</filename>文件
的指"
+"示进行编译。需要注意的是，正式发布的源代码包中可能没有包含构建命令行客户端
工具"
+"所需的全部内容，从Subversion1.4开始，所有依赖的库(如apr，apr-util和neno库
)以"
+"<filename>-deps</filename>为名称单独发布，这些库应该可以满足你在你的系统上
的安"
+"装，你需要将依赖库解压缩到Subversion源程序相同的目录。但是一些可选的组件则
依赖"
+"于其它一些程序库，如Berkeley DB和Apache httpd。因此，如果想要进行完整的编
译，"
+"请根据<filename>INSTALL</filename>文件中的内容确认这些程序库是否可用。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:72
+#, fuzzy
+msgid ""
+"If you're one of those folks that likes to use bleeding-edge software,
you "
+"can also get the Subversion source code from the Subversion repository
in "
+"which it lives. Obviously, you'll need to already have a Subversion
client "
+"on hand to do this. But once you do, you can check out a working copy of
the "
+"Subversion source repository from <ulink
url=\"http://svn.collab.net/repos/"
+"svn/trunk/\"/>: <placeholder type=\"footnote\" id=\"0\"/>"
+msgstr ""
+"如果你是一个喜欢使用最新软件的人，你可以从Subversion本身的版本库得到
Subversion"
+"最新的源代码，显然，你首先需要一个Subversion客户端，有了之后，你就可以从
<uri "
+"href=\"http://svn.collab.net/repos/svn/trunk/\">http://svn.collab.net/repos/"
+"svn/trunk/</uri>检出一个Subversion源代码的工作副本：<placeholder-1/>"
+
+#. type: Content of: <book><appendix><sect1><para><footnote><para>
+#: ../../en/book/appa-quickstart.xml:79
+#, fuzzy
+msgid ""
+"Note that the URL checked out in the example ends not with <literal>svn</"
+"literal>, but with a subdirectory thereof called
<literal>trunk</literal>. "
+"See our discussion of Subversion's branching and tagging model for the "
+"reasoning behind this."
+msgstr ""
+"注意上面例子中检出的URL并不是以<literal>svn</literal>结尾，而是它的一个叫
做"
+"<literal>trunk</literal>的子目录，可以看我们对Subversion的分支和标签模型的
讨论"
+"来理解背后的原因。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:97
+#, fuzzy
+msgid ""
+"The preceding command will create a working copy of the latest
(unreleased) "
+"Subversion source code into a subdirectory named <filename>subversion</"
+"filename> in your current working directory. You can adjust that last "
+"argument as you see fit. Regardless of what you call the new working
copy "
+"directory, though, after this operation completes, you will now have the "
+"Subversion source code. Of course, you will still need to fetch a few
helper "
+"libraries (apr, apr-util, etc.)—see the
<filename>INSTALL</filename> "
+"file in the top level of the working copy for details."
+msgstr ""
+"上面的命令会检出一个流血的，最新的Subversion源代码版本到你的叫做"
+"<filename>subversion</filename>的当前工作目录。很明显，你可以调整最后的参
数改"
+"为你需要的。不管你怎么称呼你的新的工作副本目录，在操作之后，你现在已经有
了"
+"Subversion的源代码。当然，你还是需要得到一些帮助库(apr，apr-util等等)—见工
作拷"
+"贝根目录的<filename>INSTALL</filename>来得到更多细节。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appa-quickstart.xml:115
+msgid "High-Speed Tutorial"
+msgstr "快速指南"
+
+#. type: Content of: <book><appendix><sect1><blockquote><para>
+#: ../../en/book/appa-quickstart.xml:118
+msgid ""
+"<quote>Please make sure your seat backs are in their full, upright
position "
+"and that your tray tables are stored. Flight attendants, prepare for
take-"
+"off….</quote>"
+msgstr ""
+"<quote>请确定你坐在了正确的位置，你的盘桌已经关闭，乘务员们，准备起飞 …。
</"
+"quote>"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:123
+msgid ""
+"What follows is a quick tutorial that walks you through some basic
Subversion "
+"configuration and operation. When you finish it, you should have a
general "
+"understanding of Subversion's typical usage."
+msgstr ""
+"这是一个快速教程，能够帮助你熟悉 Subversion 的基本配置和操作。在结束这个教
程"
+"时，你应该对 Subversion 的典型用法有了一个基本认识。"
+
+#. type: Content of: <book><appendix><sect1><note><para>
+#: ../../en/book/appa-quickstart.xml:129
+#, fuzzy
+msgid ""
+"The examples used in this appendix assume that you have <command>svn</"
+"command>, the Subversion command-line client, and <command>svnadmin</"
+"command>, the administrative tool, ready to go on a Unix-like operating "
+"system. (This tutorial also works at the Windows command-line prompt, "
+"assuming you make some obvious tweaks.) We also assume you are using "
+"Subversion 1.2 or later (run <userinput>svn --version</userinput> to
check.)"
+msgstr ""
+"运行下面的例子需要首先正确安装 Subversion 客户端程序
<command>svn</command>，"
+"以及管理工具 <command>svnadmin</command>，在类 Unix 操作系统上运行(假定你
做了"
+"显而易见的调整，本教程也能在 Windows 命令行执行)。我们还假定你使用
Subversion "
+"1.2 或更新版本(可以运行 <userinput>svn --version</userinput> 来检查)。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:139
+msgid ""
+"Subversion stores all versioned data in a central repository. To begin, "
+"create a new repository:"
+msgstr ""
+"Subversion 的所有版本化数据都储存在中心版本库中。因此我们需要先创建一个版
本"
+"库："
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:148
+#, fuzzy
+msgid ""
+"This command creates a new directory,
<filename>/var/svn/repos</filename>, "
+"which contains a Subversion repository. This new directory contains
(among "
+"other things) a collection of database files. You won't see your
versioned "
+"files if you peek inside. For more information about repository creation
and "
+"maintenance, see <xref linkend=\"svn.reposadmin\"/>."
+msgstr ""
+"这个命令创建了一个新目录<filename>/var/svn/repos</filename>，并在其中创建
了一"
+"个Subversion版本库。这个目录里主要保存了一些数据库文件(还有其它一些文件
)，而不"
+"像CVS那样保存着版本化的文件。需要更多版本库创建和维护方面的内容，参见
<xref "
+"linkend=\"svn.reposadmin\"/>。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:156
+#, fuzzy
+msgid ""
+"Subversion has no concept of a <quote>project.</quote> The repository is
just "
+"a virtual versioned filesystem, a large tree that can hold anything you "
+"wish. Some administrators prefer to store only one project in a
repository, "
+"and others prefer to store multiple projects in a repository by placing
them "
+"into separate directories. We discuss the merits of each approach in
<xref "
+"linkend=\"svn.reposadmin.projects.chooselayout\"/>. Either way, the "
+"repository manages only files and directories, so it's up to humans to "
+"interpret particular directories as <quote>projects.</quote> So while
you "
+"might see references to projects throughout this book, keep in mind that "
+"we're only ever talking about some directory (or collection of
directories) "
+"in the repository."
+msgstr ""
+"在Subversion没有<quote>项目</quote>的概念。Subversion的版本库只是一个虚拟
的版"
+"本化文件系统，可以存放你想要存放的任何文件。有些管理员喜欢为每个项目建立一
个独"
+"立的版本库，而另外一些管理员则喜欢将多个项目存放到同一个版本库的不同目录
里。这"
+"两种方式各有各的优点，关于这方面内容的叙述，参见<xref linkend=\"svn."
+"reposadmin.projects.chooselayout\"/>。不论是哪一种方式，版本库都只是负责管
理文"
+"件和目录，而<quote>项目</quote>则是人为指定的概念。因此，尽管本书中遍布着
项目"
+"这个词，但是请记住我们只不过是在谈论版本库中的某些特定目录(或者是一组目录
)。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:170
+#, fuzzy
+msgid ""
+"In this example, we assume you already have some sort of project (a "
+"collection of files and directories) that you wish to import into your
newly "
+"created Subversion repository. Begin by organizing your data into a
single "
+"directory called <filename>myproject</filename> (or whatever you wish).
For "
+"reasons explained in <xref linkend=\"svn.branchmerge\"/>, your project's
tree "
+"structure should contain three top-level directories named "
+"<filename>branches</filename>, <filename>tags</filename>, and "
+"<filename>trunk</filename>. The <filename>trunk</filename> directory
should "
+"contain all of your data, and the <filename>branches</filename> and "
+"<filename>tags</filename> directories should be empty:"
+msgstr ""
+"在这个例子中，我们假定已经有一些需要导入到Subversion版本库的条目(一组文件
和目"
+"录)。接下来，我们需要把这些条目整理到一个名为
<filename>myproject</filename>的"
+"目录(或者其它任意目录)里。在这个目录下，创建三个顶级子目录："
+"<filename>branches</filename>, <filename>tags</filename>和
<filename>trunk</"
+"filename>，这样做的原因将在后文中阐述。之后，将所有需版本化的数据保存到"
+"<filename>trunk</filename>目录下，同时保持<filename>branches</filename>和"
+"<filename>tags</filename>目录为空："
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:193
+msgid ""
+"The <filename>branches</filename>, <filename>tags</filename>, and "
+"<filename>trunk</filename> subdirectories aren't actually required by "
+"Subversion. They're merely a popular convention that you'll most likely
want "
+"to use later on."
+msgstr ""
+"<filename>branches</filename>, <filename>tags</filename> 和
<filename>trunk</"
+"filename> 这三个子目录不是 Subversion 必须的。但这样做是 Subversion 的习惯
用"
+"法，我们还是遵守这个约定吧。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:198
+msgid ""
+"Once you have your tree of data ready to go, import it into the
repository "
+"with the <command>svn import</command> command (see <xref
linkend=\"svn.tour."
+"importing\"/>):"
+msgstr ""
+"准备好了数据之后，就可以使用<command>svn import</command>命令(参见<xref "
+"linkend=\"svn.tour.importing\"/>)将其导入到版本库中："
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:215
+#, fuzzy
+msgid ""
+"Now the repository contains this tree of data. As mentioned earlier,
you "
+"won't see your files by directly peeking into the repository; they're
all "
+"stored within a database. But the repository's imaginary filesystem now "
+"contains a top-level directory named <filename>myproject</filename>,
which in "
+"turn contains your data."
+msgstr ""
+"现在版本库中已经保存了目录中的数据。如前所述，直接查看版本库是看不到文件和
目录"
+"的；它们存放在数据库之中。但是版本库的虚拟文件系统中则包含了一个名为"
+"<filename>myproject</filename>的顶级目录，其中依此保存了所有的数据。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:222
+#, fuzzy
+msgid ""
+"Note that the original <filename>/tmp/myproject</filename> directory is "
+"unchanged; Subversion is unaware of it. (In fact, you can even delete
that "
+"directory if you wish.) To start manipulating repository data, you need
to "
+"create a new <quote>working copy</quote> of the data, a sort of private "
+"workspace. Ask Subversion to <quote>check out</quote> a working copy of
the "
+"<filename>myproject/trunk</filename> directory in the repository:"
+msgstr ""
+"注意我们在一开始创建的那个<filename>/tmp/myproject</filename>目录并没有改
变，"
+"Subversion并不在意它(事实上，完全可以删除这个目录)。要开始使用版本库数
据，我们"
+"还要创建一个新的用于存储数据的<quote>工作副本</quote>，这是一个私有工作
区。从"
+"Subversion版本库里<quote>检出</quote>一个
<filename>myproject/trunk</filename>"
+"目录工作副本的操作如下："
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:240
+#, fuzzy
+msgid ""
+"Now you have a personal copy of part of the repository in a new
directory "
+"named <filename>myproject</filename>. You can edit the files in your
working "
+"copy and then commit those changes back into the repository."
+msgstr ""
+"现在，在<filename>myproject</filename> 目录下生成了一个版本库数据的独立副
本。"
+"我们可以在这个工作副本中编辑文件，并将修改提交到版本库中。"
+
+#. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
+#: ../../en/book/appa-quickstart.xml:247
+msgid "Enter your working copy and edit a file's contents."
+msgstr "进入工作副本目录，编辑某个文件的内容。"
+
+#. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
+#: ../../en/book/appa-quickstart.xml:251
+msgid ""
+"Run <userinput>svn diff</userinput> to see unified diff output of your "
+"changes."
+msgstr "运行 <userinput>svn diff</userinput>，以标准差异格式查看你的修改。"
+
+#. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
+#: ../../en/book/appa-quickstart.xml:255
+msgid ""
+"Run <userinput>svn commit</userinput> to commit the new version of your
file "
+"to the repository."
+msgstr "运行 <userinput>>svn commit</userinput>，将你的修改提交到版本库
中。"
+
+#. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
+#: ../../en/book/appa-quickstart.xml:259
+msgid ""
+"Run <userinput>svn update</userinput> to bring your working copy
<quote>up to "
+"date</quote> with the repository."
+msgstr ""
+"运行 <userinput>svn update</userinput>，让你的工作副本更新到版本库的
<quote>最"
+"新</quote>版本。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:264
+msgid ""
+"For a full tour of all the things you can do with your working copy,
read "
+"<xref linkend=\"svn.tour\"/>."
+msgstr "完整的工作副本操作指南，请参见<xref linkend=\"svn.tour\"/>。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appa-quickstart.xml:267
+#, fuzzy
+msgid ""
+"At this point, you have the option of making your repository available
to "
+"others over a network. See <xref linkend=\"svn.serverconfig\"/> to
learn "
+"about the different sorts of server processes available and how to
configure "
+"them."
+msgstr ""
+"现在，Subversion版本库可以通过网络方式访问。参考<xref linkend=\"svn."
+"serverconfig\"/>，了解不同服务器软件的使用以及配置方法。"
+
+#. type: Content of: <book><appendix><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:2
+msgid "Subversion for CVS Users"
+msgstr "CVS 用户的 Subversion 指南"
+
+#. type: Content of: <book><appendix><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:4
+msgid ""
+"This appendix is a guide for CVS users new to Subversion. It's
essentially a "
+"list of differences between the two systems as <quote>viewed from 10,000
feet."
+"</quote> For each section, we provide references to relevant chapters
when "
+"possible."
+msgstr ""
+"这个附录可以作为 CVS 用户开始使用 Subversion 的指南，实质上就是在
<quote>10000 "
+"英尺</quote>鸟瞰这两个系统之间的区别列表。在每一小节，我们会尽可能提供相关
章节"
+"的引用。"
+
+#. type: Content of: <book><appendix><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:10
+#, fuzzy
+msgid ""
+"Although the goal of Subversion is to take over the current and future
CVS "
+"user base, some new features and design changes were required to fix
certain "
+"<quote>broken</quote> behaviors that CVS had. This means that, as a CVS "
+"user, you may need to break habits—ones that you forgot were odd
to "
+"begin with."
+msgstr ""
+"尽管Subversion的目标是接管当前和未来的CVS用户基础，需要一些新的特性设计来
修正"
+"一些CVS<quote>不好的</quote>行为习惯，这意味着，作为一个CVS用户，你或许需
要打"
+"破习惯—忘记一些奇怪的习惯来作为开始。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:22
+msgid "Revision Numbers Are Different Now"
+msgstr "版本号现在不同了"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:24
+#, fuzzy
+msgid ""
+"In CVS, revision numbers are per file. This is because CVS stores its
data "
+"in RCS files; each file has a corresponding RCS file in the repository,
and "
+"the repository is roughly laid out according to the structure of your
project "
+"tree."
+msgstr ""
+"在CVS中，修订版本号是每文件的，这是因为CVS使用RCS文件保存数据，每个文件都
在版"
+"本库有一个对应的RCS文件，版本库几乎就是根据项目树的结构创建。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:29
+#, fuzzy
+msgid ""
+"In Subversion, the repository looks like a single filesystem. Each
commit "
+"results in an entirely new filesystem tree; in essence, the repository is
an "
+"array of trees. Each of these trees is labeled with a single revision "
+"number. When someone talks about <quote>revision 54</quote>, he's
talking "
+"about a particular tree (and indirectly, the way the filesystem looked
after "
+"the 54th commit)."
+msgstr ""
+"在Subversion，版本库看起来像是一个单独的文件系统，每次提交导致一个新的文件
系"
+"统；本质上，版本库是一堆树，每棵树都有一个单独的修订版本号。当有人谈论
<quote>"
+"修订版本54</quote>时，他们是在讨论一个特定的树(并且间接来说，文件系统在提
交54"
+"次之后的样子)。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:37
+#, fuzzy
+msgid ""
+"Technically, it's not valid to talk about <quote>revision 5 of
<filename>foo."
+"c</filename>.</quote> Instead, one would say <quote><filename>foo.c</"
+"filename> as it appears in revision 5.</quote> Also, be careful when
making "
+"assumptions about the evolution of a file. In CVS, revisions 5 and 6 of "
+"<filename>foo.c</filename> are always different. In Subversion, it's
most "
+"likely that <filename>foo.c</filename> did <emphasis>not</emphasis>
change "
+"between revisions 5 and 6."
+msgstr ""
+"技术上讲，谈论<quote>文件<filename>foo.c</filename>的修订版本5</quote>是不
正确"
+"的，相反，一个人会说<quote><filename>foo.c</filename>在修订版本5出现
</quote>。"
+"同样，我们在假定文件的进展时也要小心，在CVS，文件
<filename>foo.c</filename>的"
+"修订版本5和6一定是不同的，在Subversion，<filename>foo.c</filename>可能在修
订版"
+"本5和6之间<emphasis>没有</emphasis>改变。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:47
+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 "
+"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 "
+"often say <quote><filename>foo.c</filename> as it appears in <filename>/"
+"branches/REL1</filename> in revision 5.</quote>"
+msgstr ""
+"类似的，在CVS中标签或分支是文件的一种标注，或者是单个文件的版本信息，而在"
+"Subversion中，标签和分支是整个目录树的拷贝(为了方便，进入版本库顶级目录的"
+"<filename>/branches</filename>或<filename>/tags</filename>子目
录，<filename>/"
+"trunk</filename>旁边)。版本库作为一个整体，每个文件的许多版本可见：每个分
支的"
+"最新版本，每个标签的最新版本以及trunk本身的最新版本。所以，我们再精炼一下
术"
+"语，我们说<quote><filename>foo.c</filename>在修订版本5出现在<filename>/"
+"branches/REL1</filename>。</quote>"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:61
+msgid ""
+"For more details on this topic, see <xref
linkend=\"svn.basic.in-action.revs"
+"\" />."
+msgstr ""
+"关于此专题的更多细节，请参见<xref linkend=\"svn.basic.in-action.revs\"
/>。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:70
+msgid "Directory Versions"
+msgstr "目录的版本"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:72
+#, fuzzy
+msgid ""
+"Subversion tracks tree structures, not just file contents. It's one of
the "
+"biggest reasons Subversion was written to replace CVS."
+msgstr ""
+"Subversion会记录目录树的结构，不仅仅是文件的内容。这是编写Subversion替代
CVS最"
+"重要的一个原因。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:76
+msgid "Here's what this means to you, as a former CVS user:"
+msgstr "以下是对你这意味着什么的说明，作为一个前CVS用户："
+
+#. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:80
+#, fuzzy
+msgid ""
+"The <command>svn add</command> and <command>svn delete</command>
commands "
+"work on directories now, just as they work on files. So do <command>svn "
+"copy</command> and <command>svn move</command>. However, these commands
do "
+"<emphasis>not</emphasis> cause any kind of immediate change in the "
+"repository. Instead, the working items are simply
<quote>scheduled</quote> "
+"for addition or deletion. No repository changes happen until you run "
+"<userinput>svn commit</userinput>."
+msgstr ""
+"<command>svn add</command>和<command>svn delete</command>现在也工作在目录
上"
+"了，就像在文件上一样，还有<command>svn copy</command>和<command>svn
move</"
+"command>也一样。然而，这些命令<emphasis>不</emphasis>会导致版本库即时的变
化，"
+"相反，工作的项目只是<quote>预定要</quote>添加和删除，在运行<command>svn "
+"commit</command>之前没有版本库的修改。"
+
+#. type: Content of: <book><appendix><sect1><itemizedlist><listitem><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:91
+#, fuzzy
+msgid ""
+"Directories aren't dumb containers anymore; they have revision numbers
like "
+"files. (Or more properly, it's correct to talk about <quote>directory "
+"<filename>foo/</filename> in revision 5.</quote>)"
+msgstr ""
+"目录不再是哑容器了；它们也有文件一样的修订版本号。(更准确一点，谈论
<quote>修订"
+"版本5的目录<filename>foo/</filename></quote>是正确的。)"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:98
+#, fuzzy
+msgid ""
+"Let's talk more about that last point. Directory versioning is a hard "
+"problem; because we want to allow mixed-revision working copies, there
are "
+"some limitations on how far we can abuse this model."
+msgstr ""
+"让我们再讨论一下最后一点，目录版本化是一个困难的问题；因为我们希望允许混合
修订"
+"版本的工作副本，有一些防止我们滥用这个模型的限制。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:103
+#, fuzzy
+msgid ""
+"From a theoretical point of view, we define <quote>revision 5 of
directory "
+"<filename>foo</filename></quote> to mean a specific collection of
directory "
+"entries and properties. Now suppose we start adding and removing files
from "
+"<filename>foo</filename>, and then commit. It would be a lie to say that
we "
+"still have revision 5 of <filename>foo</filename>. However, if we
bumped "
+"<filename>foo</filename>'s revision number after the commit, that would
be a "
+"lie too; there may be other changes to <filename>foo</filename> we
haven't "
+"yet received, because we haven't updated yet."
+msgstr ""
+"从理论观点，我们定义<quote>目录<filename>foo</filename>的修订版本
5</quote>意味"
+"着一组目录条目和属性。现在假定我们从<filename>foo</filename>开始添加和删除
文"
+"件，然后提交。如果说我们还有<filename>foo</filename>的修订版本5就是一个谎
言。"
+"然而，如果说我们在提交之后增加了一位<filename>foo</filename>的修订版本号
码，这"
+"也是一个谎言；<filename>foo</filename>还有一些修改我们没有得到，因为我们还
没有"
+"更新。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:115
+#, fuzzy
+msgid ""
+"Subversion deals with this problem by quietly tracking committed adds
and "
+"deletes in the <filename>.svn</filename> area. When you eventually run "
+"<userinput>svn update</userinput>, all accounts are settled with the "
+"repository, and the directory's new revision number is set correctly. "
+"<emphasis>Therefore, only after an update is it truly safe to say that
you "
+"have a <quote>perfect</quote> revision of a directory.</emphasis> Most of
the "
+"time, your working copy will contain <quote>imperfect</quote> directory "
+"revisions."
+msgstr ""
+"Subversion通过在<filename>.svn</filename>区域偷偷的纪录添加和删除来处理这
些问"
+"题，当你最后运行<command>svn update</command>，所有的账目会到版本库结
算，并且"
+"目录的新修订版本号会正确设置。<emphasis>因此，只有在更新之后才可以真正安全
地说"
+"我们有了一个<quote>完美的</quote>修订版本目录。</emphasis>在大多数时候，你
的工"
+"作拷贝会保存<quote>不完美的</quote>目录修订版本。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:125
+#, fuzzy
+msgid ""
+"Similarly, a problem arises if you attempt to commit property changes on
a "
+"directory. Normally, the commit would bump the working directory's
local "
+"revision number. But again, that would be a lie, as there may be adds
or "
+"deletes that the directory doesn't yet have, because no update has
happened. "
+"<emphasis>Therefore, you are not allowed to commit property changes on a "
+"directory unless the directory is up to date.</emphasis>"
+msgstr ""
+"同样的，如果你尝试提交目录的属性修改会有一个问题，通常情况下，提交应该会提
高工"
+"作目录的本地修订版本号，但是再一次，这还是一个谎言，因为这个目录还没有添加
和删"
+"除发生，因为还没有更新发生。<emphasis>因此，在你的目录不是最新的时候不允许
你提"
+"交属性修改。</emphasis>"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:134
+msgid ""
+"For more discussion about the limitations of directory versioning, see
<xref "
+"linkend=\"svn.basic.in-action.mixedrevs\"/>."
+msgstr ""
+"关于目录版本的更多讨论见<xref
linkend=\"svn.basic.in-action.mixedrevs\"/>。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:144
+msgid "More Disconnected Operations"
+msgstr "更多离线操作"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:146
+#, fuzzy
+msgid ""
+"In recent years, disk space has become outrageously cheap and abundant,
but "
+"network bandwidth has not. Therefore, the Subversion working copy has
been "
+"optimized around the scarcer resource."
+msgstr ""
+"近些年来，磁盘空间变得异常便宜和丰富，但是网络带宽还没有，因此Subversion工
作拷"
+"贝为紧缺资源进行了优化。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:151
+#, fuzzy
+msgid ""
+"The <filename>.svn</filename> administrative directory serves the same "
+"purpose as the <filename>CVS</filename> directory, except that it also
stores "
+"read-only, <quote>pristine</quote> copies of your files. This allows you
to "
+"do many things offline:"
+msgstr ""
+"<filename>.svn</filename>管理目录维护者与<filename>CVS</filename>同样的功
能，"
+"除了它还保存了只读的文件<quote>原始</quote>拷贝，这允许你做许多离线操作："
+
+#. type: Content of:
<book><appendix><sect1><variablelist><varlistentry><term>
+#: ../../en/book/appb-svn-for-cvs-users.xml:160
+#: ../../en/book/ch02-basic-usage.xml:427
+msgid "<command>svn status</command>"
+msgstr "<command>svn status</command>"
+
+#. type: Content of:
<book><appendix><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:162
+msgid ""
+"Shows you any local changes you've made (see <xref
linkend=\"svn.tour.cycle."
+"examine.status\"/>)"
+msgstr ""
+"显示你所做的本地修改(见<xref linkend=\"svn.tour.cycle.examine.status\"/>)"
+
+#. type: Content of:
<book><appendix><sect1><variablelist><varlistentry><term>
+#: ../../en/book/appb-svn-for-cvs-users.xml:168
+#: ../../en/book/ch02-basic-usage.xml:430
+#: ../../en/book/ch02-basic-usage.xml:1748
+msgid "<command>svn diff</command>"
+msgstr "<command>svn diff</command>"
+
+#. type: Content of:
<book><appendix><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:170
+msgid ""
+"Shows you the details of your changes (see <xref
linkend=\"svn.tour.cycle."
+"examine.diff\"/>)"
+msgstr ""
+"显示修改的详细信息(见see <xref linkend=\"svn.tour.cycle.examine.diff\"/>)"
+
+#. type: Content of:
<book><appendix><sect1><variablelist><varlistentry><term>
+#: ../../en/book/appb-svn-for-cvs-users.xml:176
+#: ../../en/book/ch02-basic-usage.xml:439
+msgid "<command>svn revert</command>"
+msgstr "<command>svn revert</command>"
+
+#. type: Content of:
<book><appendix><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:178
+msgid ""
+"Removes your local changes (see <xref
linkend=\"svn.tour.cycle.revert\"/>)"
+msgstr "删除你的本地修改(见<xref linkend=\"svn.tour.cycle.revert\"/>)"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:185
+msgid ""
+"Also, the cached pristine files allow the Subversion client to send "
+"differences when committing, which CVS cannot do."
+msgstr ""
+"另外，原始文件的缓存允许Subversion客户端在提交时只提交区别，这是CVS做不到
的。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:188
+#, fuzzy
+msgid ""
+"The last subcommand in the list—<command>svn
revert</command>—is "
+"new. It will not only remove local changes, but also unschedule
operations "
+"such as adds and deletes. Although deleting the file and then running "
+"<userinput>svn update</userinput> will still work, doing so distorts the
true "
+"purpose of updating. And, while we're on this subject…"
+msgstr ""
+"列表中最后一个子命令—<command>svn revert</command>—是新的；它不仅仅删除本
地修"
+"改，也会取消如增加和删除的预定操作，这是恢复文件推荐的方式；删除文件，然后
运行"
+"<command>svn update</command>还可以工作，但是这样侮辱了更新操作的作用，而
且，"
+"我们在这个主题…"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:203
+msgid "Distinction Between Status and Update"
+msgstr "区分状态和更新"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:205
+msgid ""
+"Subversion attempts to erase a lot of the confusion between the
<command>cvs "
+"status</command> and <command>cvs update</command> commands."
+msgstr ""
+"在Subversion，我们已经设法抹去<command>cvs status</command>和
<command>cvs "
+"update</command>之间的混乱。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:209
+#, fuzzy
+msgid ""
+"The <command>cvs status</command> command has two purposes: first, to
show "
+"the user any local modifications in the working copy, and second, to show
the "
+"user which files are out of date. Unfortunately, because of CVS's
hard-to-"
+"read status output, many CVS users don't take advantage of this command
at "
+"all. Instead, they've developed a habit of running <userinput>cvs
update</"
+"userinput> or <userinput>cvs -n update</userinput> to quickly see their "
+"changes. If users forget to use the <option>-n</option> option, this has
the "
+"side effect of merging repository changes they may not be ready to deal
with."
+msgstr ""
+"<command>cvs status</command>命令有两个目的：第一，显示用户在工作副本的所
有本"
+"地修改，第二，显示给用户哪些文件是最新的。很不幸，因为CVS难以阅读的状态输
出，"
+"许多CVS用户并没有充分利用这个命令的好处。相反，他们慢慢习惯运行
<command>cvs "
+"update</command>或<command>cvs -n update</command>来快速查看区别，如果用户
忘记"
+"使用<option>-n</option>选项，副作用就是将还没有准备好处理的版本库修改合并
到工"
+"作拷贝。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:221
+#, fuzzy
+msgid ""
+"Subversion removes this muddle by making the output of <command>svn
status</"
+"command> easy to read for both humans and parsers. Also, <command>svn "
+"update</command> prints only information about files that are updated, "
+"<emphasis>not</emphasis> local modifications."
+msgstr ""
+"对于Subversion，我们通过修改<command>svn status</command>的输出使之同时满
足阅"
+"读和解析的需要来努力消除这种混乱，同样，<command>svn update</command>只会
打印"
+"将要更新的文件信息，而<emphasis>不是</emphasis>本地修改。"
+
+#. type: Content of: <book><appendix><sect1><sect2><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:228
+#: ../../en/book/ch09-reference.xml:8966
+msgid "Status"
+msgstr "状态"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:230
+#, fuzzy
+msgid ""
+"<command>svn status</command> prints all files that have local "
+"modifications. By default, the repository is not contacted. While this "
+"subcommand accepts a fair number of options, the following are the most "
+"commonly used ones:"
+msgstr ""
+"<command>svn status</command>打印所有本地修改的文件，缺省情况下，不会联系
版本"
+"库，然而这个命令接受一些选项，如下是一些最常用的："
+
+#. type: Content of:
<book><appendix><sect1><sect2><variablelist><varlistentry><term>
+#: ../../en/book/appb-svn-for-cvs-users.xml:237
+msgid "<option>-u</option>"
+msgstr "<option>-u</option>"
+
+#. type: Content of:
<book><appendix><sect1><sect2><variablelist><varlistentry><listitem><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:239
+msgid ""
+"Contact the repository to determine, and then display, out-of-dateness "
+"information."
+msgstr "访问版本库检测并显示过期的信息。"
+
+#. type: Content of:
<book><appendix><sect1><sect2><variablelist><varlistentry><term>
+#: ../../en/book/appb-svn-for-cvs-users.xml:245
+msgid "<option>-v</option>"
+msgstr "<option>-v</option>"
+
+#. type: Content of:
<book><appendix><sect1><sect2><variablelist><varlistentry><listitem><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:247
+msgid "Show <emphasis>all</emphasis> entries under version control."
+msgstr "显示<emphasis>所有</emphasis>版本控制下的文件。"
+
+#. type: Content of:
<book><appendix><sect1><sect2><variablelist><varlistentry><term>
+#: ../../en/book/appb-svn-for-cvs-users.xml:253
+msgid "<option>-N</option>"
+msgstr "<option>-N</option>"
+
+#. type: Content of:
<book><appendix><sect1><sect2><variablelist><varlistentry><listitem><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:255
+msgid "Run nonrecursively (do not descend into subdirectories)."
+msgstr "非递归方式运行(不会访问子目录)。"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:261
+#, fuzzy
+msgid ""
+"The <command>svn status</command> command has two output formats. In
the "
+"default <quote>short</quote> format, local modifications look like this:"
+msgstr ""
+"<command>svn status</command> 命令有两种输出格式。缺省是<quote>短
</quote>格"
+"式，本地修改的输出就像这样："
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:271
+msgid ""
+"If you specify the <option>--show-updates</option> (<option>-u</option>) "
+"option, a longer output format is used:"
+msgstr ""
+"如果你指定<option>--show-updates</option>(<option>-u</option>)选项，就会使
用较"
+"长的格式输出："
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:284
+#, fuzzy
+msgid ""
+"In this case, two new columns appear. The second column contains an
asterisk "
+"if the file or directory is out of date. The third column shows the
working "
+"copy's revision number of the item. In the previous example, the
asterisk "
+"indicates that <filename>faces.html</filename> would be patched if we "
+"updated, and that <filename>bloo.png</filename> is a newly added file in
the "
+"repository. (The absence of any revision number next to
<filename>bloo.png</"
+"filename> means that it doesn't yet exist in the working copy.)"
+msgstr ""
+"在这个例子里，出现了两列，第二列的星号表示了文件或目录是否过期，第三列显示
了工"
+"作拷贝修订版本号，在上面的例子里，星号表示如果进行更
新，<filename>faces.html</"
+"filename>会被合并，而<filename>bloo.png</filename>则是版本库新加的文件。"
+"(<filename>bloo.png</filename>前面的修订版本号为空表示了这个文件在工作副本
已经"
+"不存在了。)"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:302
+#, fuzzy
+msgid ""
+"At this point, you should take a quick look at the list of all possible "
+"status codes in <xref linkend=\"svn.ref.svn.c.status\"/>. Here are a few
of "
+"the more common status codes you'll see:"
+msgstr ""
+"此刻，你必须赶快看一下<xref linkend=\"svn.ref.svn.c.status\"/>中所说的可能
属性"
+"代码，下面是一些你会看到的常用状态代码："
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:320
+#, fuzzy
+msgid ""
+"For a more detailed discussion of <command>svn status</command>, see
<xref "
+"linkend=\"svn.tour.cycle.examine.status\" />."
+msgstr ""
+"关于<command>svn status</command>的详细讨论，见<xref
linkend=\"svn.tour.cycle."
+"examine.status\"/>。"
+
+#. type: Content of: <book><appendix><sect1><sect2><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:326
+#: ../../en/book/ch09-reference.xml:8988
+msgid "Update"
+msgstr "更新"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:328
+msgid ""
+"<command>svn update</command> updates your working copy, and prints only "
+"information about files that it updates."
+msgstr "<command>svn update</command>会更新你的工作副本，只打印这次更新的文
件。"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:331
+#, fuzzy
+msgid ""
+"Subversion has combined CVS's <literal>P</literal> and
<literal>U</literal> "
+"codes into just <literal>U</literal>. When a merge or conflict occurs, "
+"Subversion simply prints <literal>G</literal> or <literal>C</literal>,
rather "
+"than a whole sentence about it."
+msgstr ""
+"Subversion将CVS的<literal>P</literal>和<literal>U</literal>合并为
<literal>U</"
+"literal>，当合并或冲突发生时，Subversion会简单的打印
<literal>G</literal>或"
+"<literal>C</literal>，而不是大段相关内容。"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:337
+#, fuzzy
+msgid ""
+"For a more detailed discussion of <command>svn update</command>, see
<xref "
+"linkend=\"svn.tour.cycle.update\" />."
+msgstr ""
+"关于<command>svn update</command>的详细讨论，见<xref
linkend=\"svn.tour.cycle."
+"update\"/>。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:348
+msgid "Branches and Tags"
+msgstr "分支和标签"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:350
+#, fuzzy
+msgid ""
+"Subversion doesn't distinguish between filesystem space and
<quote>branch</"
+"quote> space; branches and tags are ordinary directories within the "
+"filesystem. This is probably the single biggest mental hurdle that a
CVS "
+"user will need to cross. Read all about it in <xref
linkend=\"svn.branchmerge"
+"\"/>."
+msgstr ""
+"Subversion不区分文件系统空间和<quote>分支</quote>空间；分支和标签都是普通
的文"
+"件系统目录，这恐怕是CVS用户需要逾越的最大心理障碍，所有信息在<xref
linkend="
+"\"svn.branchmerge\"/>。"
+
+#. type: Content of: <book><appendix><sect1><warning><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:358
+#, fuzzy
+msgid ""
+"Since Subversion treats branches and tags as ordinary directories, your "
+"project's various lines of development probably live in subdirectories of
the "
+"main project directory. So remember to check out using the URL of the "
+"subdirectory that contains the particular line of development you want,
not "
+"the project's root URL. If you make the mistake of checking out the root
of "
+"the project, you may very well wind up with a working copy that contains
a "
+"complete copy of your project's content for each and every one of its "
+"branches and tags. <placeholder type=\"footnote\" id=\"0\"/>"
+msgstr ""
+"因为Subversion把分支和标签看作普通目录看待，你项目不同的开发线存在于主项目
目录"
+"的不同子目录里。所以要记住检出你所要的保存特定开发线的子目录，而不是项目的
根目"
+"录。如果你错误的检出了项目本身，你会紧张的发现你的项目拷贝包含了所有的分支
和标"
+"签。<placeholder-1/>"
+
+#. type: Content of: <book><appendix><sect1><warning><para><footnote><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:368
+msgid ""
+"That is, providing you don't run out of disk space before your checkout "
+"finishes."
+msgstr "如果在检出完成之前没有消耗完磁盘空间的话。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:381
+msgid "Metadata Properties"
+msgstr "元数据属性"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:383
+#, fuzzy
+msgid ""
+"A new feature of Subversion is that you can attach arbitrary metadata
(or "
+"<quote>properties</quote>) to files and directories. Properties are "
+"arbitrary name/value pairs associated with files and directories in your "
+"working copy."
+msgstr ""
+"Subversion的一个新特性就是你可以对文件和目录任意附加元数据(或者是<quote>属
性</"
+"quote>)，属性是关联在工作副本文件或目录的任意名称/值对。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:389
+#, fuzzy
+msgid ""
+"To set or get a property name, use the <command>svn propset</command>
and "
+"<command>svn propget</command> subcommands. To list all properties on
an "
+"object, use <command>svn proplist</command>."
+msgstr ""
+"为了设置或得到一个属性名称，使用<command>svn propset</command>和
<command>svn "
+"propget</command>子命令，列出对象所有的属性，使用<command>svn proplist</"
+"command>。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:394
+msgid "For more information, see <xref linkend=\"svn.advanced.props\"/>."
+msgstr "更多信息见<xref linkend=\"svn.advanced.props\"/>。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:402
+msgid "Conflict Resolution"
+msgstr "解决冲突"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:404
+#, fuzzy
+msgid ""
+"CVS marks conflicts with inline <quote>conflict markers,</quote> and
then "
+"prints a <literal>C</literal> during an update or merge operation. "
+"Historically, this has caused problems, because CVS isn't doing enough.
Many "
+"users forget about (or don't see) the <literal>C</literal> after it
whizzes "
+"by on their terminal. They often forget that the conflict markers are
even "
+"present, and then accidentally commit files containing those conflict
markers."
+msgstr ""
+"CVS使用内联<quote>冲突标志</quote>来标记冲突，并且在更新时打印
<literal>C</"
+"literal>。历史上讲，这导致了许多问题，因为CVS做得还不够。许多用户在它们快
速闪"
+"过终端时忘记(或没有看到)<literal>C</literal>，即使出现了冲突标记，他们也经
常忘"
+"记，然后提交了带有冲突标记的文件。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:413
+msgid ""
+"Subversion solves this problem in a pair of ways. First, when a
conflict "
+"occurs in a file, Subversion records the fact that the file is in a state
of "
+"conflict, and won't allow you to commit changes to that file until you "
+"explicitly resolve the conflict. Second, Subversion 1.5 provides
interactive "
+"conflict resolution, which allows you to resolve conflicts as they
happen "
+"instead of having to go back and do so after the update or merge
operation "
+"completes. See <xref linkend=\"svn.tour.cycle.resolve\" /> for more
about "
+"conflict resolution in Subversion."
+msgstr ""
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:430
+msgid "Binary Files and Translation"
+msgstr "二进制文件和行结束标记转换"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:432
+#, fuzzy
+msgid ""
+"In the most general sense, Subversion handles binary files more
gracefully "
+"than CVS does. Because CVS uses RCS, it can only store successive full "
+"copies of a changing binary file. Subversion, however, expresses
differences "
+"between files using a binary differencing algorithm, regardless of
whether "
+"they contain textual or binary data. That means all files are stored "
+"differentially (compressed) in the repository."
+msgstr ""
+"在大多数情况下，Subversion比CVS更好的处理二进制文件，因为CVS使用RCS，它只
可以"
+"存储二进制文件的完整拷贝，但是，Subversion使用二进制区别算法来表示文件的区
别，"
+"而不管文件是文本文件还是二进制文件。这意味着所有的文件是以增量的(压缩的)形
式存"
+"放在版本库。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:440
+#, fuzzy
+msgid ""
+"CVS users have to mark binary files with <option>-kb</option> flags to "
+"prevent data from being garbled (due to keyword expansion and
line-ending "
+"translations). They sometimes forget to do this."
+msgstr ""
+"CVS用户需要使用<option>-kb</option>选项来标记二进制文件，防止数据的混淆(因
为关"
+"键字解释和行结束转化)，他们有时候会忘记这样做。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:445
+#, fuzzy
+msgid ""
+"Subversion takes the more paranoid route. First, it never performs any
kind "
+"of keyword or line-ending translation unless you explicitly ask it to do
so "
+"(see <xref linkend=\"svn.advanced.props.special.keywords\"/> and <xref "
+"linkend=\"svn.advanced.props.special.eol-style\"/> for more details).
By "
+"default, Subversion treats all file data as literal byte strings, and
files "
+"are always stored in the repository in an untranslated state."
+msgstr ""
+"Subversion使用更加异想天开的方法—第一，如果你不明确的告诉它(详情见<xref "
+"linkend=\"svn.advanced.props.special.keywords\"/>和<xref linkend=\"svn."
+"advanced.props.special.eol-style\"/>)这样做，它不会做任何关键字或行结束转
化的"
+"操作，缺省情况下Subversion会把所有的数据看作字节串，所有的储存在版本库的文
件都"
+"处于未转化的状态。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:454
+#, fuzzy
+msgid ""
+"Second, Subversion maintains an internal notion of whether a file is "
+"<quote>text</quote> or <quote>binary</quote> data, but this notion is "
+"<emphasis>only</emphasis> extant in the working copy. During an
<command>svn "
+"update</command>, Subversion will perform contextual merges on locally "
+"modified text files, but will not attempt to do so for binary files."
+msgstr ""
+"第二，Subversion维护了一个内部的概念来区别一个文件是<quote>文本</quote>还
是"
+"<quote>二进制</quote>文件，但这个概念<emphasis>只</emphasis>在工作副本非常
重"
+"要，在<command>svn update</command>，Subversion会对本地修改的文本文件执行
上下"
+"文的合并，但是对二进制文件不会。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:461
+#, fuzzy
+msgid ""
+"To determine whether a contextual merge is possible, Subversion examines
the "
+"<literal>svn:mime-type</literal> property. If the file has no
<literal>svn:"
+"mime-type</literal> property, or has a MIME type that is textual (e.g., "
+"<literal>text/*</literal>), Subversion assumes it is text. Otherwise, "
+"Subversion assumes the file is binary. Subversion also helps users by "
+"running a binary-detection algorithm in the <command>svn import</command>
and "
+"<command>svn add</command> commands. These commands will make a good
guess "
+"and then (possibly) set a binary <literal>svn:mime-type</literal>
property on "
+"the file being added. (If Subversion guesses wrong, the user can always "
+"remove or hand-edit the property.)"
+msgstr ""
+"为了检测一个上下文的合并是可能的，Subversion检测<literal>svn:mime-type</"
+"literal>属性，如果没有<literal>svn:mime-type</literal>属性，或者这个属性是
文本"
+"的(例如<literal>text/*</literal>)，Subversion会假定它是文本的，否则
Subversion"
+"认为它是二进制文件。Subversion也会在<command>svn import</command>和"
+"<command>svn add</command>命令时通过运行一个二进制检测算法来帮助用户。这些
命令"
+"会做出很好的猜测，然后(如果可能)设置添加文件的
<literal>svn:mime-type</literal>"
+"属性。(如果Subversion猜测错误，用户可以删除或手工编辑这个属性。)"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:482
+msgid "Versioned Modules"
+msgstr "版本化的模块"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:484
+#, fuzzy
+msgid ""
+"Unlike CVS, a Subversion working copy is aware that it has checked out a "
+"module. That means if somebody changes the definition of a module
(e.g., "
+"adds or removes components), a call to <command>svn update</command>
will "
+"update the working copy appropriately, adding and removing components."
+msgstr ""
+"不像CVS，Subversion工作副本会意识到它检出了一个模块，这意味着如果有人修改
了模"
+"块的定义(例如添加和删除组件)，然后一个对<command>svn update</command>的调
用会"
+"适当的更新工作副本，添加或删除组件。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:490
+msgid ""
+"Subversion defines modules as a list of directories within a directory "
+"property; see <xref linkend=\"svn.advanced.externals\"/>."
+msgstr ""
+"Subversion定义了模块作为一个目录属性的目录列表：见<xref linkend=\"svn."
+"advanced.externals\"/>。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:500
+msgid "Authentication"
+msgstr "认证"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:502
+#, fuzzy
+msgid ""
+"With CVS's pserver, you are required to log in to the server (using the "
+"<command>cvs login</command> command) before performing any read or
write "
+"operation—you sometimes even have to log in for anonymous
operations. "
+"With a Subversion repository using Apache <command>httpd</command> or "
+"<command>svnserve</command> as the server, you don't provide any "
+"authentication credentials at the outset—if an operation that you "
+"perform requires authentication, the server will challenge you for your "
+"credentials (whether those credentials are username and password, a
client "
+"certificate, or even both). So if your repository is world-readable,
you "
+"will not be required to authenticate at all for read operations."
+msgstr ""
+"通过CVS的pserver，你需要在读写操作之前<quote>登陆</quote>到服务器(使用"
+"<command>cvs login</command>命令)—即使是匿名操作。Subversion版本库使用
Apache的"
+"<command>httpd</command>或<command>svnserve</command>作为服务器，你不需要
开始"
+"时提供认证凭证—如果一个操作需要认证，服务器会要求你的凭证(不管这凭证是用户
名与"
+"密码，客户证书还是两个都有)。所以如果你的工作副本是全局可读的，在所有的读
操作"
+"中不需要任何认证。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:515
+msgid ""
+"As with CVS, Subversion still caches your credentials on disk (in your "
+"<filename>~/.subversion/auth/</filename> directory) unless you tell it
not to "
+"by using the <option>--no-auth-cache</option> option."
+msgstr ""
+"相对于CVS，Subversion会一直在磁盘(在你的<filename>~/.subversion/auth/</"
+"filename>目录)缓存凭证，除非你通过<option>--no-auth-cache</option>选项告诉
它不"
+"这样做。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:520
+#, fuzzy
+msgid ""
+"The exception to this behavior, however, is in the case of accessing an "
+"<command>svnserve</command> server over an SSH tunnel, using the
<literal>svn"
+"+ssh://</literal> URL scheme. In that case, the <command>ssh</command> "
+"program unconditionally demands authentication just to start the tunnel."
+msgstr ""
+"这个行为也有例外，当使用SSH管道的<command>svnserve</command>服务器时，使
用"
+"<literal>svn+ssh://</literal>的URL模式这种情况下，<command>ssh</command>会
在通"
+"道刚开始时无条件的要求认证。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appb-svn-for-cvs-users.xml:533
+msgid "Converting a Repository from CVS to Subversion"
+msgstr "迁移 CVS 版本库到 Subversion"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:535
+#, fuzzy
+msgid ""
+"Perhaps the most important way to familiarize CVS users with Subversion
is to "
+"let them continue to work on their projects using the new system. And
while "
+"that can be somewhat accomplished using a flat import into a Subversion "
+"repository of an exported CVS repository, the more thorough solution
involves "
+"transferring not just the latest snapshot of their data, but all the
history "
+"behind it as well, from one system to another. This is an extremely "
+"difficult problem to solve; it involves deducing changesets in the
absence of "
+"atomicity and translating between the systems' completely orthogonal "
+"branching policies, among other complications. Still, a handful of
tools "
+"claim to at least partially support the ability to convert existing CVS "
+"repositories into Subversion ones."
+msgstr ""
+"或许让CVS用户熟悉Subversion最好的办法就是让他们的项目继续在新系统下工
作，这可"
+"以简单得通过平淡的把CVS版本库的导出数据导入到Subversion完成，或者是更加完
全的"
+"方案，不仅仅包括最新数据快照，还包括所有的历史，从一个系统到另一个系统。这
是一"
+"个非常困难的问题，包括推导保持原子性的修改集，转化两个系统完全不同的分支政
策。"
+"但是我们还是有许多工具声称至少部分具备了的转化已存在的CVS版本库为
Subversion版"
+"本库的能力。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appb-svn-for-cvs-users.xml:549
+#, fuzzy
+msgid ""
+"The most popular (and mature) conversion tool is cvs2svn (<ulink
url=\"http://"
+"cvs2svn.tigris.org/\"/>), a Python program originally created by members
of "
+"Subversion's own development community. This tool is meant to run
exactly "
+"once: it scans your CVS repository multiple times and attempts to deduce "
+"commits, branches, and tags as best it can. When it finishes, the result
is "
+"either a Subversion repository or a portable Subversion dump file "
+"representing your code's history. See the web site for detailed
instructions "
+"and caveats."
+msgstr ""
+"最流行的(好像是最成熟的)转化工具是cvs2svn(<uri
href=\"http://cvs2svn.tigris."
+"org/\">http://cvs2svn.tigris.org/</uri>)，它是最初由Subversion自己的开发社
区成"
+"员开发的一个Python脚本：它会多次扫描你的CVS版本库，并尽可能尝试推断提
交，分支"
+"和标签，当它结束时，结果是可以代表代码历史的Subversion版本库或可移植的"
+"Subversion转储文件，关于指令和警告的详细信息可以看网站。"
+
+#. type: Content of: <book><appendix><title>
+#: ../../en/book/appc-webdav.xml:2
+msgid "WebDAV and Autoversioning"
+msgstr "WebDAV 和自动版本"
+
+#. type: Content of: <book><appendix><para>
+#: ../../en/book/appc-webdav.xml:4
+#, fuzzy
+msgid ""
+"WebDAV is an extension to HTTP, and it is growing more and more popular
as a "
+"standard for file sharing. Today's operating systems are becoming
extremely "
+"web-aware, and many now have built-in support for mounting
<quote>shares</"
+"quote> exported by WebDAV servers."
+msgstr ""
+"WebDAV是HTTP的一个扩展，作为一个文件共享的标准不断发展。当今的操作系统变得
极端"
+"的web化，许多内置了对装配WebDAV服务器导出的<quote>共享</quote>的支持。"
+
+#. type: Content of: <book><appendix><para>
+#: ../../en/book/appc-webdav.xml:10
+#, fuzzy
+msgid ""
+"If you use Apache as your Subversion network server, to some extent you
are "
+"also running a WebDAV server. This appendix gives some background on
the "
+"nature of this protocol, how Subversion uses it, and how well Subversion "
+"interoperates with other software that is WebDAV-aware."
+msgstr ""
+"如果你使用Apache/mod_dav_svn作为你的Subversion网络服务器，某种程度上，你也
是在"
+"运行一个WebDAV服务器。这个附录提供了这种协议一些背景知识，Subversion如何使
用"
+"它，Subversion如何和认识WebDAV的软件交互工作。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appc-webdav.xml:21
+msgid "What Is WebDAV?"
+msgstr "什么是 WebDAV？"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:23
+#, fuzzy
+msgid ""
+"<firstterm>DAV</firstterm> stands for <quote>Distributed Authoring and "
+"Versioning.</quote> RFC 2518 defines a set of concepts and accompanying "
+"extension methods to HTTP 1.1 that make the Web a more universal
read/write "
+"medium. The basic idea is that a WebDAV-compliant web server can act
like a "
+"generic file server; clients can <quote>mount</quote> shared folders
over "
+"HTTP that behave much like other network filesystems (such as NFS or
SMB)."
+msgstr ""
+"<firstterm>DAV</firstterm>的意思是<quote>Distributed Authoring and "
+"Versioning</quote>。RFC 2518为HTTP 1.1定义了一组概念和附加扩展方法来把
web变成"
+"一个更加普遍的读/写媒体，基本思想是一个WebDAV兼容的web服务器可以像普通的文
件服"
+"务器一样工作；客户端可以通过HTTP装配类似于NFS或SMB的WebDAV共享文件夹。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:32
+#, fuzzy
+msgid ""
+"The tragedy, though, is that despite the acronym, the RFC specification "
+"doesn't actually describe any sort of version control. Basic WebDAV
clients "
+"and servers assume that only one version of each file or directory
exists, "
+"and that it can be repeatedly overwritten."
+msgstr ""
+"悲惨的是，RFC规范并没有提供任何版本控制模型。基本的DAV客户端和服务器只是假
定每"
+"个文件或目录只有一个版本存在，可以重复的覆盖。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:38
+#, fuzzy
+msgid ""
+"Because RFC 2518 left out versioning concepts, another committee was
left "
+"with the responsibility of writing RFC 3253 a few years later. The new
RFC "
+"adds versioning concepts to WebDAV, placing the <quote>V</quote> back in "
+"<quote>DAV</quote>—hence the term <quote>DeltaV.</quote>
WebDAV/DeltaV "
+"clients and servers are often called just <quote>DeltaV</quote>
programs, "
+"since DeltaV implies the existence of basic WebDAV."
+msgstr ""
+"因为RFC 2518漏下了版本概念，几年之后，另一个委员会留下来负责撰写RFC 3253来
添加"
+"WebDAV的版本化，也就是<quote>DeltaV</quote>。WebDAV/DeltaV客户端和服务器经
常叫"
+"做<quote>DeltaV</quote>客户端和服务器，因为DeltaV暗含了基本的WebDAV。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:47
+#, fuzzy
+msgid ""
+"The original WebDAV standard has been widely successful. Every modern "
+"computer operating system has a general WebDAV client built in (details
to "
+"follow), and a number of popular standalone applications are also able
to "
+"speak WebDAV—Microsoft Office, Dreamweaver, and Photoshop, to name
a "
+"few. On the server end, Apache HTTP Server has been able to provide
WebDAV "
+"services since 1998 and is considered the de facto open source
standard. "
+"Several other commercial WebDAV servers are available, including
Microsoft's "
+"own IIS."
+msgstr ""
+"最初的WebDAV标准得到了广泛的成功，所有的现代操作系统拥有内置的(后面有详细
资料)"
+"对普通WebDAV的支持，许多流行的应用程序也可以使用WebDAV—Microsoft Office，"
+"Dreamweaver和Photoshop。在服务器方面，Apache从1998年就开始支持WebDAV，并被
认为"
+"是一个事实上的开源标准，也有许多商业的WebDAV服务器，例如Microsoft的IIS。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:58
+#, fuzzy
+msgid ""
+"DeltaV, unfortunately, has not been so successful. It's very difficult
to "
+"find any DeltaV clients or servers. The few that do exist are
relatively "
+"unknown commercial products, and thus it's very difficult to test "
+"interoperability. It's not entirely clear as to why DeltaV has remained "
+"stagnant. Some opine that the specification is just too complex.
Others "
+"argue that while WebDAV's features have mass appeal (even the least
technical "
+"users appreciate network file sharing), its version control features
just "
+"aren't interesting or necessary for most users. Finally, some believe
that "
+"DeltaV remains unpopular because there's still no open source server
product "
+"that implements it well."
+msgstr ""
+"不幸的是，DeltaV没有这样的成功，很难寻找到任何DeltaV客户端和服务器。只有一
些不"
+"太出名的商业产品，因此很难测试交互性，不清楚为什么DeltaV还这样停滞，一些人
说规"
+"范太复杂了，还有些人认为尽管DeltaV的特性有很大的吸引力(即使最新的技术用户
也喜"
+"欢使用网络文件共享)，版本控制特性对大多数用户还不是这样有趣和必须。最
后，有些"
+"人认为DeltaV还这样不流行主要是因为一直没有开源的服务器产品实现它。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:71
+#, fuzzy
+msgid ""
+"When Subversion was still in its design phase, it seemed like a great
idea to "
+"use Apache as a network server. It already had a module to provide
WebDAV "
+"services. DeltaV was a relatively new specification. The hope was that
the "
+"Subversion server module (<command>mod_dav_svn</command>) would
eventually "
+"evolve into an open source DeltaV reference implementation.
Unfortunately, "
+"DeltaV has a very specific versioning model that doesn't quite line up
with "
+"Subversion's model. Some concepts were mappable; others were not."
+msgstr ""
+"当Subversion还在设计阶段时，使用Apache的httpd作为主要网络服务器就是一个很
好的"
+"想法，已经有了支持WebDAV服务的模块(<command>mod_dav_svn</command>)。
DeltaV有一"
+"个很新的规范，希望就是Subversion服务器模块最终能够成为一个开源的DeltaV参考
实"
+"现，但非常不幸，DeltaV得版本模型过于详细，与Subversion的模型并不匹配，虽然
有些"
+"概念可以对应起来，但有些则不能。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:81
+msgid "What does this mean, then?"
+msgstr "这是什么意思呢？"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:83
+#, fuzzy
+msgid ""
+"First, the Subversion client is not a fully implemented DeltaV client.
It "
+"needs certain types of things from the server that DeltaV itself cannot "
+"provide, and thus is largely dependent on a number of
Subversion-specific "
+"HTTP <literal>REPORT</literal> requests that only <command>mod_dav_svn</"
+"command> understands."
+msgstr ""
+"首先，Subversion客户端不是一个完全实现的DeltaV客户端，它需要从服务器得到
DeltaV"
+"不能提供的东西，因此非常依赖于只有<command>mod_dav_svn</command>理解的"
+"Subversion特定的<literal>REPORT</literal>请求。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:90
+#, fuzzy
+msgid ""
+"Second, <command>mod_dav_svn</command> is not a fully realized DeltaV "
+"server. Many portions of the DeltaV specification were irrelevant to "
+"Subversion, and thus were left unimplemented."
+msgstr ""
+"其次，<command>mod_dav_svn</command>不是一个完全的DeltaV服务，许多与
Subversion"
+"不相关的DeltaV规范还没有实现。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:95
+#, fuzzy
+msgid ""
+"There is still some debate in the developer community as to whether or
not "
+"it's worthwhile to remedy either of these situations. It's fairly "
+"unrealistic to change Subversion's design to match DeltaV, so there's "
+"probably no way the client can ever learn to get everything it needs from
a "
+"general DeltaV server. On the other hand,
<command>mod_dav_svn</command> "
+"<emphasis>could</emphasis> be further developed to implement all of
DeltaV, "
+"but it's hard to find motivation to do so—there are almost no
DeltaV "
+"clients to interoperate with."
+msgstr ""
+"在开发者社区一直有这样的讨论，是否值得弥补这种形势。改变Subversion的设计来
匹配"
+"DeltaV看起来并不现实，所以可能没有办法让客户端从普通的DeltaV服务器上得到所
有的"
+"东西。另一方面，mod_dav_svn<emphasis>可以</emphasis>继续开发来实现所有的"
+"DeltaV，但缺乏这样做的动力—几乎没有能与之交户的DeltaV客户端。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appc-webdav.xml:112
+msgid "Autoversioning"
+msgstr "自动版本化"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:114
+#, fuzzy
+msgid ""
+"While the Subversion client is not a full DeltaV client, and the
Subversion "
+"server is not a full DeltaV server, there's still a glimmer of WebDAV "
+"interoperability to be happy about:
<firstterm>autoversioning</firstterm>."
+msgstr ""
+"因为Subversion客户端不是完整的DeltaV客户端，Subversion服务器也不是完整的
DeltaV"
+"服务器，但仍有值得高兴的交互特性：叫做<firstterm>自动版本化</firstterm>。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:119
+#, fuzzy
+msgid ""
+"Autoversioning is an optional feature defined in the DeltaV standard. A "
+"typical DeltaV server will reject an ignorant WebDAV client attempting to
do "
+"a <literal>PUT</literal> to a file that's under version control. To
change a "
+"version-controlled file, the server expects a series of proper
versioning "
+"requests: something like <literal>MKACTIVITY</literal>,
<literal>CHECKOUT</"
+"literal>, <literal>PUT</literal>, <literal>CHECKIN</literal>. But if
the "
+"DeltaV server supports autoversioning, write requests from basic WebDAV "
+"clients are accepted. The server behaves as though the client
<emphasis>had</"
+"emphasis> issued the proper series of versioning requests, performing a "
+"commit under the hood. In other words, it allows a DeltaV server to "
+"interoperate with ordinary WebDAV clients that don't understand
versioning."
+msgstr ""
+"自动版本化是DeltaV标准中的可选特性，一个典型的DeltaV服务器会拒绝一个对版本
控制"
+"之下文件的<literal>PUT</literal>操作，为了修改一个版本控制下的文件，服务器
只会"
+"接受一系列正确的版本请求：例如<literal>MKACTIVITY</literal>, "
+"<literal>CHECKOUT</literal>, <literal>PUT</literal>和<literal>CHECKIN</"
+"literal>。但是如果DeltaV服务器支持自动版本化，服务器可以在后台假装客户端执
行了"
+"一些列正确的版本请求，也就是说，DeltaV服务器可以与一个对版本化一无所知的普
通"
+"WebDAV客户端交互。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:134
+#, fuzzy
+msgid ""
+"Because so many operating systems already have integrated WebDAV clients,
the "
+"use case for this feature can be incredibly appealing to administrators "
+"working with non-technical users. Imagine an office of ordinary users "
+"running Microsoft Windows or Mac OS. Each user <quote>mounts</quote>
the "
+"Subversion repository, which appears to be an ordinary network folder.
They "
+"use the shared folder as they always do: open files, edit them, and save "
+"them. Meanwhile, the server is automatically versioning everything.
Any "
+"administrator (or knowledgeable user) can still use a Subversion client
to "
+"search history and retrieve older versions of data."
+msgstr ""
+"因为有许多操作系统已经集成了WebDAV客户端，这个特性的用例可能是这样的：假设
一个"
+"办公室有许多使用Microsoft Windows或Mac OS的普通用户，每个用户<quote>装载
</"
+"quote>了一个Subversion版本库，看起来就是普通的网络共享文件夹。他们像普通目
录一"
+"样的操作这个目录：打开文件, 编辑它们，保存它们。同时，服务器自动的版本化所
有的"
+"东西，任何管理员(或有知识的用户)可以一直使用Subversion客户端来查询历史来检
索旧"
+"版本的数据。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:146
+#, fuzzy
+msgid ""
+"This scenario isn't fiction—it's real and it works, as of
Subversion "
+"1.2 and later. To activate autoversioning in
<command>mod_dav_svn</command>, "
+"use the <literal>SVNAutoversioning</literal> directive within the "
+"<filename>httpd.conf</filename> <literal>Location</literal> block, like
so:"
+msgstr ""
+"这个场景不是小说：对于Subversion 1.2来说，是真实的和有效的。为了激活"
+"<command>mod_dav_svn</command>的自动版本化，需要使用
<filename>httpd.conf</"
+"filename>中Location区块的<literal>SVNAutoversioning</literal>指示，例如："
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:161
+#, fuzzy
+msgid ""
+"When Subversion autoversioning is active, write requests from WebDAV
clients "
+"result in automatic commits. A generic log message is automatically "
+"generated and attached to each revision."
+msgstr ""
+"当激活了SVNAutoversioning，来自WebDAV的客户端请求会导致自动提交，每个修订
版本"
+"会自动附加一个原始的日志信息。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:166
+#, fuzzy
+msgid ""
+"Before activating this feature, however, understand what you're getting "
+"into. WebDAV clients tend to do <emphasis>many</emphasis> write
requests, "
+"resulting in a huge number of automatically committed revisions. For "
+"example, when saving data, many clients will do a <literal>PUT</literal>
of a "
+"0-byte file (as a way of reserving a name) followed by another
<literal>PUT</"
+"literal> with the real file data. The single file-write results in two "
+"separate commits. Also consider that many applications auto-save every
few "
+"minutes, resulting in even more commits."
+msgstr ""
+"然而，在激活这个特性之前，需要理解你做的事情。WebDAV会做许多写请求，导致了
产生"
+"数量<emphasis>非常多</emphasis>的自动提交修订版本。例如，当保存数据，许多
客户"
+"端会使用一个<literal>PUT</literal>一个0字节的文件，然后紧跟一个
<literal>PUT</"
+"literal>真实的文件数据。一个单独的文件写操作产生了两个不同的提交。考虑到许
多应"
+"用程序隔几分钟的自动保存，会产生更多的提交。"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:177
+#, fuzzy
+msgid ""
+"If you have a post-commit hook program that sends email, you may want to "
+"disable email generation either altogether or on certain sections of the "
+"repository; it depends on whether you think the influx of emails will
still "
+"prove to be valuable notifications or not. Also, a smart post-commit
hook "
+"program can distinguish between a transaction created via autoversioning
and "
+"one created through a normal Subversion commit operation. The trick is
to "
+"look for a revision property named <literal>svn:autoversioned</literal>.
If "
+"present, the commit was made by a generic WebDAV client."
+msgstr ""
+"如果你有发送邮件的post-commit钩子程序，例如，你会根据是否有价值来开启和关
闭邮"
+"件通知，另外，一个聪明的post-commit钩子也应该能够区分自动版本化和
<command>svn "
+"commit</command>产生的事务。技巧就是检查修订版本的
<literal>svn:autoversioned</"
+"literal>属性，如果有，则提交来自一个原始的WebDAV客户端。"
+
+#. 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 "
+"WebDAV client adds a new file to the repository, there's no opportunity
for "
+"the user to set the the <literal>svn:mime-type</literal> property. This "
+"might cause the file to appear as a generic icon when viewed within a
WebDAV "
+"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. "
+"Instead, you can use the <literal>ModMimeUsePathInfo</literal> directive
in "
+"your Subversion <literal><Location></literal> block:"
+msgstr ""
+"另一个作为<literal>SVNAutoversioning</literal>特性补充的特性来自Apache的"
+"<literal>mod_mime</literal>模块，如果一个原始的WebDAV客户端在版本库添加了
一个"
+"新文件，用户就没有机会设置<literal>svn:mime-type</literal>属性，这会导致使
用"
+"WebDAV共享目录查看时会看到原始的图标，而没有关联到任何应用。一个补救办法就
是让"
+"系统管理员(或其他理解Subversion)的人检出一份工作副本，然后为需要的文件手动
设置"
+"<literal>svn:mime-type</literal>属性，但是这个整理工作永远不会结束，作为替
代，"
+"你可以在你的Subversion<literal><Location></literal>区使用"
+"<literal>ModMimeUsePathInfo</literal>指示："
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:214
+#, fuzzy
+msgid ""
+"This directive allows <literal>mod_mime</literal> to attempt automatic "
+"deduction of the MIME type on new files that enter the repository via "
+"autoversioning. The module looks at the file's named extension and
possibly "
+"the contents as well; if the file matches some common patterns, the
file's "
+"<literal>svn:mime-type</literal> property will be set automatically."
+msgstr ""
+"这个指示允许 <literal>mod_mime</literal> 在使用自动版本化添加新文件时，尝
试自"
+"动检测新文件的 mime-type，这个模块查看文件的扩展名，有可能的话还包括检查内
容；"
+"如果文件符合某个通用模式，就会自动设置文件的属性 <literal>svn:mime-type</"
+"literal>。"
+
+#. type: Content of: <book><appendix><sect1><title>
+#: ../../en/book/appc-webdav.xml:228
+msgid "Client Interoperability"
+msgstr "客户端交互性"
+
+#. type: Content of: <book><appendix><sect1><para>
+#: ../../en/book/appc-webdav.xml:230
+#, fuzzy
+msgid ""
+"All WebDAV clients fall into one of three categories—standalone "
+"applications, file-explorer extensions, or filesystem implementations.
These "
+"categories broadly define the types of WebDAV functionality available to "
+"users. <xref linkend=\"svn.webdav.clients.tbl-1\"/> gives our
categorization "
+"as well as a quick description of some common pieces of WebDAV-enabled "
+"software. You can find more details about these software offerings, as
well "
+"as their general category, in the sections that follow."
+msgstr ""
+"所有的 WebDAV 客户端分为三类—独立应用程序，文件浏览器扩展，或文件系统实
现。这"
+"些分类定义了 WebDAV 用户可用的功能。<xref
linkend=\"svn.webdav.clients.tbl-1"
+"\"/>给 WebDAV 常见软件进行了分类，并提供了的简短描述。这些软件支持的细
节，以及"
+"总体的分类，可以在后面的章节找到。"
+
+#. type: Content of: <book><appendix><sect1><table><title>
+#: ../../en/book/appc-webdav.xml:241
+msgid "Common WebDAV clients"
+msgstr "常用的 WebDAV 客户端"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><thead><row><entry>
+#: ../../en/book/appc-webdav.xml:245
+msgid "Software"
+msgstr "软件"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><thead><row><entry>
+#: ../../en/book/appc-webdav.xml:246
+msgid "Type"
+msgstr "类型"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><thead><row><entry>
+#: ../../en/book/appc-webdav.xml:247
+msgid "Windows"
+msgstr "Windows"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><thead><row><entry>
+#: ../../en/book/appc-webdav.xml:248
+msgid "Mac"
+msgstr "Mac"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><thead><row><entry>
+#: ../../en/book/appc-webdav.xml:249
+msgid "Linux"
+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
+msgid "Description"
+msgstr "描述"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:255
+msgid "Adobe Photoshop"
+msgstr "Adobe Photoshop"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:256 ../../en/book/appc-webdav.xml:265
+#: ../../en/book/appc-webdav.xml:274 ../../en/book/appc-webdav.xml:282
+#: ../../en/book/appc-webdav.xml:291
+msgid "Standalone WebDAV application"
+msgstr "独立的 WebDAV 应用程序"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:257 ../../en/book/appc-webdav.xml:267
+#: ../../en/book/appc-webdav.xml:268 ../../en/book/appc-webdav.xml:275
+#: ../../en/book/appc-webdav.xml:276 ../../en/book/appc-webdav.xml:277
+#: ../../en/book/appc-webdav.xml:283 ../../en/book/appc-webdav.xml:292
+#: ../../en/book/appc-webdav.xml:302 ../../en/book/appc-webdav.xml:313
+#: ../../en/book/appc-webdav.xml:322 ../../en/book/appc-webdav.xml:330
+#: ../../en/book/appc-webdav.xml:338 ../../en/book/appc-webdav.xml:347
+#: ../../en/book/appc-webdav.xml:359
+msgid "X"
+msgstr "X"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:260
+msgid ""
+"Image editing software, allowing direct opening from, and writing to,
WebDAV "
+"URLs"
+msgstr "图像编辑软件，允许对 WebDAV 的 URL 直接读写"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:264
+msgid "cadaver"
+msgstr "cadaver"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:269
+msgid ""
+"Command-line WebDAV client supporting file transfer, tree, and locking "
+"operations"
+msgstr "命令行 WebDAV 客户端，支持文件传输，目录树显示和锁定操作"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:273
+msgid "DAV Explorer"
+msgstr "DAV Explorer"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:278
+msgid "Java GUI tool for exploring WebDAV shares"
+msgstr "浏览 WebDAV 共享的 Java GUI 工具"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:281
+msgid "Adobe Dreamweaver"
+msgstr "Adobe Dreamweaver"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:286
+msgid ""
+"Web production software able to directly read from and write to WebDAV
URLs"
+msgstr "Web 创作软件，可以直接读写 WebDAV 的 URL"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:290
+msgid "Microsoft Office"
+msgstr "Microsoft Office"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:295
+msgid ""
+"Office productivity suite with several components able to directly read
from "
+"and write to WebDAV URLs"
+msgstr "Office 产品套件，有几个组件可以直接读写 WebDAV 的 URL"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><title>
+#: ../../en/book/appc-webdav.xml:300 ../../en/book/appc-webdav.xml:477
+msgid "Microsoft Web Folders"
+msgstr "Microsoft Web 文件夹"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:301 ../../en/book/appc-webdav.xml:310
+#: ../../en/book/appc-webdav.xml:319
+msgid "File-explorer WebDAV extension"
+msgstr "文件浏览器 WebDAV 扩展"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:305
+msgid ""
+"GUI file explorer program able to perform tree operations on a WebDAV
share"
+msgstr "GUI 文件浏览器程序，可以对 WebDAV 共享执行目录树操作"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:309
+msgid "GNOME Nautilus"
+msgstr "GNOME Nautilus"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:314 ../../en/book/appc-webdav.xml:323
+msgid "GUI file explorer able to perform tree operations on a WebDAV share"
+msgstr "GUI 文件浏览器，可以对 WebDAV 共享执行目录树操作"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:318
+msgid "KDE Konqueror"
+msgstr "KDE Konqueror"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><title>
+#: ../../en/book/appc-webdav.xml:327 ../../en/book/appc-webdav.xml:618
+msgid "Mac OS X"
+msgstr "Mac OS X"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:328 ../../en/book/appc-webdav.xml:337
+#: ../../en/book/appc-webdav.xml:346 ../../en/book/appc-webdav.xml:356
+msgid "WebDAV filesystem implementation"
+msgstr "WebDAV 文件系统实现"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:332
+msgid "Operating system that has built-in support for mounting WebDAV
shares."
+msgstr "内置支持加载 WebDAV 共享的操作系统。"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:336
+msgid "Novell NetDrive"
+msgstr "Novell NetDrive"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:341
+msgid ""
+"Drive-mapping program for assigning Windows drive letters to a mounted
remote "
+"WebDAV share"
+msgstr "为远程 WebDAV 共享分配 Windows 驱动器盘符的驱动映射程序"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:345
+msgid "SRT WebDrive"
+msgstr "文件传输软件，可以将 Windows 驱动器加载为远程的 WebDAV 共享"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:350
+msgid ""
+"File transfer software, which, among other things, allows the assignment
of "
+"Windows drive letters to a mounted remote WebDAV share"
+msgstr ""
+"文件传输软件，也就是可以为加载的远程 WebDAV 共享赋予 Windows 驱动器盘符。"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:355
+msgid "davfs2"
+msgstr "davfs2"
+
+#. type: Content of:
<book><appendix><sect1><table><tgroup><tbody><row><entry>
+#: ../../en/book/appc-webdav.xml:360
+msgid "Linux filesystem driver that allows you to mount a WebDAV share"
+msgstr "允许加载 WebDAV 共享的 Linux 文件系统驱动"
+
+#. type: Content of: <book><appendix><sect1><sect2><title>
+#: ../../en/book/appc-webdav.xml:370
+msgid "Standalone WebDAV Applications"
+msgstr "独立的 WebDAV 应用程序"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appc-webdav.xml:372
+#, fuzzy
+msgid ""
+"A WebDAV application is a program that speaks WebDAV protocols with a
WebDAV "
+"server. We'll cover some of the most popular programs with this kind of "
+"WebDAV support."
+msgstr ""
+"WebDAV应用使用WebDAV协议与WebDAV服务器通讯，我们将会介绍一些支持WebDAV的流
行程"
+"序。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><title>
+#: ../../en/book/appc-webdav.xml:378
+msgid "Microsoft Office, Dreamweaver, Photoshop"
+msgstr "Microsoft Office，Dreamweaver，Photoshop"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:380
+#, fuzzy
+msgid ""
+"On Windows, several well-known applications contain integrated WebDAV
client "
+"functionality, such as Microsoft's Office, <placeholder type=\"footnote\"
id="
+"\"0\"/> Adobe's Photoshop and Dreamweaver programs. They're able to
directly "
+"open and save to URLs, and tend to make heavy use of WebDAV locks when "
+"editing a file."
+msgstr ""
+"在Windows下，有许多已知的应用程序支持WebDAV客户端功能，例如微软Office，"
+"<placeholder-1/>Adobe的Photoshop和Macromedia的Dreamweaver程序，他们可以直
接打"
+"开和保存URL，并且在编辑文件时经常使用WebDAV的锁。 "
+
+#. type: Content of:
<book><appendix><sect1><sect2><sect3><para><footnote><para>
+#: ../../en/book/appc-webdav.xml:384
+#, fuzzy
+msgid ""
+"WebDAV support was removed from Microsoft Access for some reason, but it "
+"exists in the rest of the Office suite."
+msgstr ""
+"在Windows下，有一些有名的集成WebDAV客户端功能的软件，例如Microsoft's
Office, "
+"Adobe的Photoshop和Macromedia的Dreamweaver。它们都可以直接打开和保存URL，也
可以"
+"在编辑时大量的使用WebDAV的锁定。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:392
+#, fuzzy
+msgid ""
+"Note that while many of these programs also exist for Mac OS X, they do
not "
+"appear to support WebDAV directly on that platform. In fact, on Mac OS
X, "
+"the <guimenu>File→Open</guimenu> dialog box doesn't allow one to
type a "
+"path or URL at all. It's likely that the WebDAV features were
deliberately "
+"left out of Macintosh versions of these programs, since OS X already
provides "
+"such excellent low-level filesystem support for WebDAV."
+msgstr ""
+"需要注意尽管这些程序也存在于Mac OS X，但是在这个平台上并不是直接支持
WebDAV。实"
+"际上在Mac OS X，<guimenu>File→Open</guimenu>对话框不允许人们输入path或
URL，这"
+"好像看起来我们的这个Macintosh应用不会支持WebDAV特性了，但实际上是因为OS
X已经"
+"实现了底层的文件系统级WebDAV支持。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><title>
+#: ../../en/book/appc-webdav.xml:405
+msgid "cadaver, DAV Explorer"
+msgstr "Cadaver，DAV 浏览器"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:407
+#, fuzzy
+msgid ""
+"cadaver is a bare-bones Unix command-line program for browsing and
changing "
+"WebDAV shares. Like the Subversion client, it uses the neon HTTP "
+"library—not surprisingly, since both neon and cadaver are written
by "
+"the same author. cadaver is free software (GPL license) and is available
at "
+"<ulink url=\"http://www.webdav.org/cadaver/\"/>."
+msgstr ""
+"Cadaver是一个简单的Unix命令行的WebDAV共享浏览程序，就像Subversion客户
端，它使"
+"用neon的HTTP库，毫不奇怪，因为其作者就是neon的作者，Cadaver是一个自由软件
(是用"
+"GPL许可证)，可以通过<uri
href=\"http://www.webdav.org/cadaver/\">http://www."
+"webdav.org/cadaver/</uri>访问。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:415
+#, fuzzy
+msgid ""
+"Using cadaver is similar to using a command-line FTP program, and thus
it's "
+"extremely useful for basic WebDAV debugging. It can be used to upload
or "
+"download files in a pinch, to examine properties, and to copy, move,
lock, or "
+"unlock files:"
+msgstr ""
+"使用cadaver与命令行FTP程序类似，因此它在基本的WebDAV调试中非常有用，它可以
用来"
+"在紧急情况下上传或下载文件，也可以用来验证属性，并拷贝, 移动, 锁定或解锁文
件："
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:439
+#, fuzzy
+msgid ""
+"DAV Explorer is another standalone WebDAV client, written in Java. It's "
+"under a free Apache-like license and is available at <ulink
url=\"http://www."
+"ics.uci.edu/~webdav/\"/>. It does everything cadaver does, but has the "
+"advantages of being portable and being a more user-friendly GUI
application. "
+"It's also one of the first clients to support the new WebDAV Access
Control "
+"Protocol (RFC 3744)."
+msgstr ""
+"DAV Explorer是另一个独立运行的WebDAV客户端，使用Java编写，有一个类Apache的
许可"
+"证，网站是<uri
href=\"http://www.ics.uci.edu/~webdav/\">http://www.ics.uci."
+"edu/~webdav/</uri>。DAV Explorer与cadaver功能差不多，优点可移植，并有一个
用户"
+"友好的GUI程序。它也是最早的支持WebDAV访问控制协议(RFC 3744)的客户端之一。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:447
+#, fuzzy
+msgid ""
+"Of course, DAV Explorer's ACL support is useless in this case, since "
+"<command>mod_dav_svn</command> doesn't support it. The fact that both "
+"cadaver and DAV Explorer support some limited DeltaV commands isn't "
+"particularly useful either, since they don't allow <literal>MKACTIVITY</"
+"literal> requests. But it's not relevant anyway; we're assuming all of
these "
+"clients are operating against an autoversioning repository."
+msgstr ""
+"当然，在这个情况下DAV Explorer的ACL支持没有任何用处，因为"
+"<command>mod_dav_svn</command>不支持它，事实上，Cadaver和DAV Explorer支持
的一"
+"些有限的DeltaV命令也并不有效，因为他们不允许
<literal>MKACTIVITY</literal>请"
+"求，但是这都不相干；我们假定这些客户端都是针对自动版本化版本库工作。"
+
+#. type: Content of: <book><appendix><sect1><sect2><title>
+#: ../../en/book/appc-webdav.xml:461
+msgid "File-Explorer WebDAV Extensions"
+msgstr "文件浏览器的 WebDAV 扩展"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appc-webdav.xml:463
+#, fuzzy
+msgid ""
+"Some popular file explorer GUI programs support WebDAV extensions that
allow "
+"a user to browse a DAV share as though it was just another directory on
the "
+"local computer, and to perform basic tree editing operations on the items
in "
+"that share. For example, Windows Explorer is able to browse a WebDAV
server "
+"as a <quote>network place.</quote> Users can drag files to and from the "
+"desktop, or can rename, copy, or delete files in the usual way. But
because "
+"it's only a feature of the file explorer, the DAV share isn't visible to "
+"ordinary applications. All DAV interaction must happen through the
explorer "
+"interface."
+msgstr ""
+"一些流行的文件浏览器GUI程序支持WebDAV扩展，允许用户将DAV共享当作本地文件夹
访"
+"问，例如Windows浏览器可以以<quote>network place</quote>方式浏览WebDAV服务
器。"
+"用户可以拖入和拖出文件，或者是改名, 拷贝或删除其中的文件。但是因为它只是文
件浏"
+"览器的一个特性，DAV对普通应用不可见，所有的DAV交互必须通过浏览器界面。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:479
+#, fuzzy
+msgid ""
+"Microsoft was one of the original backers of the WebDAV specification,
and "
+"first started shipping a client in Windows 98, which was known as Web "
+"Folders. This client was also shipped in Windows NT 4.0 and Windows
2000."
+msgstr ""
+"Microsoft是WebDAV规范最早的支持者，最早在Windows 98配置客户端，被称作
<quote>网"
+"络文件夹</quote>，这个客户端在Windows NT4和2000上也存在。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:484
+#, fuzzy
+msgid ""
+"The original Web Folders client was an extension to Explorer, the main
GUI "
+"program used to browse filesystems. It works well enough. In Windows
98, "
+"the feature might need to be explicitly installed if Web Folders aren't "
+"already visible inside My Computer. In Windows 2000, simply add a new "
+"<quote>network place,</quote> enter the URL, and the WebDAV share will
pop up "
+"for browsing."
+msgstr ""
+"最早的Webfolders客户端是浏览器的扩展，主要的浏览文件系统的GUI程序，工作良
好。"
+"在Windows 98，如果<quote>我的电脑</quote>里没有网络文件夹，这个特性需要明
确安"
+"装。在Windows 2000，只需要添加一个新的<quote>网络位置</quote>，输入
URL，WebDAV"
+"共享就会弹出让你浏览。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:492
+#, fuzzy
+msgid ""
+"With the release of Windows XP, Microsoft started shipping a new "
+"implementation of Web Folders, known as the WebDAV Mini-Redirector. The
new "
+"implementation is a filesystem-level client, allowing WebDAV shares to
be "
+"mounted as drive letters. Unfortunately, this implementation is
incredibly "
+"buggy. The client usually tries to convert HTTP URLs
(<literal>http://host/"
+"repos</literal>) into UNC share notation (<literal>\\\\host\\repos</"
+"literal>); it also often tries to use Windows Domain authentication to "
+"respond to basic-auth HTTP challenges, sending usernames as <literal>HOST"
+"\\username</literal>. These interoperability problems are severe and
are "
+"documented in numerous places around the Web, to the frustration of many "
+"users. Even Greg Stein, the original author of Apache's WebDAV module, "
+"bluntly states that XP Web Folders simply can't operate against an
Apache "
+"server."
+msgstr ""
+"伴随着Windows XP，Microsoft开始了另一种网络文件夹的实现，叫做
<quote>WebDAV "
+"mini-redirector</quote>，这个新的实现是文件系统级的客户端，允许WebDAV转载
到驱"
+"动器盘符上。不幸的是，这个实现充满难以相信的bug。客户端经常会尝试把http的
URL"
+"(<literal>http://host/repos</literal>)转化为UNC共享符号(<literal>\\\\host"
+"\\repos</literal>)，它也经常使用Windows域认证来回应基本的HTTP认证，按照"
+"<literal>HOST\\username</literal>发送用户名。这类互动性问题在网络上大量传
播，"
+"使大量用户受挫。即使是ApacheWebDAV的作者Greg Stein也建议不要对Apache服务器
使用"
+"XP的网络文件夹。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:509
+msgid ""
+"Windows Vista's initial implementation of Web Folders seems to be almost
the "
+"same as XP's, so it has the same sort of problems. With luck, Microsoft
will "
+"remedy these issues in a Vista Service Pack."
+msgstr ""
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:514
+msgid ""
+"However, there seem to be workarounds for both XP and Vista that allow
Web "
+"Folders to work against Apache. Users have mostly reported success with "
+"these techniques, so we'll relay them here."
+msgstr ""
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:519
+msgid ""
+"On Windows XP, you have two options. First, search Microsoft's web site
for "
+"update KB90730, <quote>Software Update for Web Folders.</quote> This may
fix "
+"all your problems. If it doesn't, it seems that the original pre-XP Web "
+"Folders implementation is still buried within the system. You can
unearth it "
+"by going to Network Places and adding a new network place. When
prompted, "
+"enter the URL of the repository, but <emphasis>include a port number</"
+"emphasis> in the URL. For example, you should enter
<userinput>http://host/"
+"repos</userinput> as <userinput>http://host:80/repos</userinput>
instead. "
+"Respond to any authentication prompts with your Subversion credentials."
+msgstr ""
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:533
+msgid ""
+"On Windows Vista, the same KB90730 update may clear everything up. But
there "
+"may still be other issues. Some users have reported that Vista considers
all "
+"<literal>http://</literal> connections insecure, and thus will always
fail "
+"any authentication challenges from Apache unless the connection happens
over "
+"<literal>https://</literal>. If you're unable to connect to the
Subversion "
+"repository via SSL, you can tweak the system registry to turn off this "
+"behavior. Just change the value of the
<literal>HKEY_LOCAL_MACHINE\\SYSTEM"
+"\\CurrentControlSet\\Services\\WebClient\\Parameters\\BasicAuthLevel</"
+"literal> key from <userinput>1</userinput> to <userinput>2</userinput>.
A "
+"final warning: be sure to set up the Web Folder to point to the
repository's "
+"root directory (<filename>/</filename>), rather than some subdirectory
such "
+"as <filename>/trunk</filename>. Vista Web Folders seems to work only
against "
+"repository roots."
+msgstr ""
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:549
+msgid ""
+"In general, while these workarounds may function for you, you might get
a "
+"better overall experience using a third-party WebDAV client such as
WebDrive "
+"or NetDrive."
+msgstr ""
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><title>
+#: ../../en/book/appc-webdav.xml:557
+msgid "Nautilus, Konqueror"
+msgstr "Nautilus，Konqueror"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:559
+#, fuzzy
+msgid ""
+"Nautilus is the official file manager/browser for the GNOME desktop
(<ulink "
+"url=\"http://www.gnome.org\"/>), and Konqueror is the manager/browser for
the "
+"KDE desktop (<ulink url=\"http://www.kde.org\"/>). Both of these "
+"applications have an explorer-level WebDAV client built in, and they
operate "
+"just fine against an autoversioning repository."
+msgstr ""
+"Nautilus 是 GNOME 桌面(<ulink url=\"http://www.gnome.org\"/>)的官方文件管
理/浏"
+"览器，KDE 桌面(<ulink url=\"http://www.kde.org\"/>)的则是 Konqueror。两个
应用"
+"程序都是浏览器级别的 WebDAV 客户端，对自动版本化的版本库工作良好。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:566
+#, fuzzy
+msgid ""
+"In GNOME's Nautilus, select the <guimenuitem>File→Open location</"
+"guimenuitem> menu item and enter the URL in the dialog box presented.
The "
+"repository should then be displayed like any other filesystem."
+msgstr ""
+"在 GNOME 的 Nautilus 中，选择 <guimenuitem>File→Open
location</guimenuitem>，"
+"在显示的对话框中输入 URL。版本库就会象其它文件系统一样显示。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:571
+#, fuzzy
+msgid ""
+"In KDE's Konqueror, you need to use the <literal>webdav://</literal>
scheme "
+"when entering the URL in the location bar. If you enter an
<literal>http://</"
+"literal> URL, Konqueror will behave like an ordinary web browser.
You'll "
+"likely see the generic HTML directory listing produced by "
+"<command>mod_dav_svn</command>. When you enter <userinput>webdav://host/"
+"repos</userinput> instead of <userinput>http://host/repos</userinput>, "
+"Konqueror becomes a WebDAV client and displays the repository as a
filesystem."
+msgstr ""
+"在 KDE 的 Konqueror 中，你需要在地址栏使用 <literal>webdav://</literal> 方
案来"
+"输入 URL，如果你输入 <literal>http://</literal> URL，Konqueror 会像普通的
web "
+"浏览器。你会看到 <command>mod_dav_svn</command> 输出的普通 HTML 目录列表。
通过"
+"输入 <userinput>webdav://host/repos</userinput> 代替
<userinput>http://host/"
+"repos</userinput>，Konqueror 就成为了一个 WebDAV 客户端，并且按照文件系统
的方"
+"式显示版本库。"
+
+#. type: Content of: <book><appendix><sect1><sect2><title>
+#: ../../en/book/appc-webdav.xml:587
+msgid "WebDAV Filesystem Implementation"
+msgstr "WebDAV 的文件系统实现"
+
+#. type: Content of: <book><appendix><sect1><sect2><para>
+#: ../../en/book/appc-webdav.xml:589
+#, fuzzy
+msgid ""
+"The WebDAV filesystem implementation is arguably the best sort of WebDAV "
+"client. It's implemented as a low-level filesystem module, typically
within "
+"the operating system's kernel. This means that the DAV share is mounted
like "
+"any other network filesystem, similar to mounting an NFS share on Unix
or "
+"attaching an SMB share as a drive letter in Windows. As a result, this
sort "
+"of client provides completely transparent read/write WebDAV access to
all "
+"programs. Applications aren't even aware that WebDAV requests are
happening."
+msgstr ""
+"WebDAV 文件系统实现被认为是最佳的 WebDAV 客户端。它通过低级的文件系统模块
实"
+"现，通常在操作系统的核心。这意味着 DAV 共享像网络的其他文件系统一样装
载，就像"
+"在 Unix 下面装载 NFS，或者在 Windows 下装载一个 SMB 共享。结果就是这种客户
端为"
+"所有程序提供了对 WebDAV 的透明访问，应用程序甚至意识不到发生了 WebDAV 请
求。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><title>
+#: ../../en/book/appc-webdav.xml:602
+msgid "WebDrive, NetDrive"
+msgstr "WebDrive，NetDrive"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:604
+#, fuzzy
+msgid ""
+"Both WebDrive and NetDrive are excellent commercial products that allow
a "
+"WebDAV share to be attached as drive letters in Windows. As a result,
you "
+"can operate on the contents of these WebDAV-backed pseudodrives as easily
as "
+"you can against real local hard drives, and in the same ways. You can "
+"purchase WebDrive from South River Technologies (<ulink url=\"http://www."
+"southrivertech.com\"/>). Novell's NetDrive is freely available online,
but "
+"requires users to have a NetWare license."
+msgstr ""
+"WebDrive 和 NetDrive 都是优秀的商业产品，允许将 WebDAV 绑定到 Windows 的盘
符，"
+"结果是你可以同对真实硬盘一样操作这些 WebDAV 后端支持的共享。WebDrive 可以
从 "
+"South River Technologies(<ulink url=\"http://www.southrivertech.com\"/>)购
买。"
+"Novell 的 NetDrive 可以在网络上免费下载，但用户还是需要有一个 NetWare 许可
证。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:620
+#, fuzzy
+msgid ""
+"Apple's OS X operating system has an integrated filesystem-level WebDAV "
+"client. From the Finder, select the <guimenuitem>Go→Connect to
Server</"
+"guimenuitem> menu item. Enter a WebDAV URL, and it appears as a disk on
the "
+"desktop, just like any other mounted volume. You can also mount a
WebDAV "
+"share from the Darwin terminal by using the <literal>webdav</literal> "
+"filesystem type with the <command>mount</command> command:"
+msgstr ""
+"Apple的OS X操作系统是集成的文件系统级的WebDAV客户端，通过Finder，选择
<guimenu "
+"moreinfo=\"none\">Go menu</guimenu>的<guimenuitem
moreinfo=\"none\">Connect "
+"to Server</guimenuitem>条目，输入WebDAV的URL，会在桌面显示一个磁盘，就像其
他装"
+"载的卷。你也可以从Darwin终端通过<command>mount</command>类型为"
+"<literal>webdav</literal>的文件系统实现。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:634
+#, fuzzy
+msgid ""
+"Note that if your <command>mod_dav_svn</command> is older than version
1.2, "
+"OS X will refuse to mount the share as read/write; it will appear as
read-"
+"only. This is because OS X insists on locking support for read/write
shares, "
+"and the ability to lock files first appeared in Subversion 1.2."
+msgstr ""
+"注意如果 <command>mod_dav_svn</command> 是 1.2 之前的版本，OS X 不能装载为
可读"
+"写，而是会成为只读。这是因为，OS X 坚持要读写共享支持锁定，而锁定文件出现
在 "
+"Subversion 1.2。"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:641
+#, fuzzy
+msgid ""
+"Also, OS X's WebDAV client can sometimes be overly sensitive to HTTP "
+"redirects. If OS X is unable to mount the repository at all, you may
need to "
+"enable the <literal>BrowserMatch</literal> directive in the Apache
server's "
+"<filename>httpd.conf</filename>:"
+msgstr ""
+"OS X 的 WebDAV 客户端有时候对 HTTP 重定向很敏感。如果 OS X 不能装载版本
库，你"
+"或许需要开启Apache 服务器 <filename>httpd.conf</filename> 中的 "
+"<literal>BrowserMatch</literal> 指令："
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><title>
+#: ../../en/book/appc-webdav.xml:655
+msgid "Linux davfs2"
+msgstr "Linux davfs2"
+
+#. type: Content of: <book><appendix><sect1><sect2><sect3><para>
+#: ../../en/book/appc-webdav.xml:657
+#, fuzzy
+msgid ""
+"Linux davfs2 is a filesystem module for the Linux kernel, whose
development "
+"is organized at <ulink url=\"http://dav.sourceforge.net/\"/>. Once you "
+"install davfs2, you can mount a WebDAV network share using the usual
Linux "
+"mount command:"
+msgstr ""
+"Linux davfs2 是一个 Linux内核的文件系统模块，开发主页是 <ulink
url=\"http://"
+"dav.sourceforge.net/\"/>。一旦安装 davfs2，你就可以使用通常的 Linux mount
命令"
+"装载 WebDAV 网络共享："
+
+#. type: Content of: <book><title>
+#: ../../en/book/book.xml:25
+msgid "Version Control with Subversion"
+msgstr "Subversion 权威指南"
+
+#. type: Content of: <book><bookinfo><subtitle>
+#: ../../en/book/book.xml:29
+msgid "For Subversion 1.6"
+msgstr "针对 Subversion 1.6"
+
+#. type: Content of: <book><bookinfo><subtitle>
+#: ../../en/book/book.xml:33
+#, fuzzy
+msgid "(Compiled from &svn.l10n_revision;&svn.version;)"
+msgstr "(编译自 $svn.rev.id$)"
+
+#. type: Content of: <book><bookinfo>
+#: ../../en/book/book.xml:35
+msgid "<edition>Second</edition> <isbn>?-?????-???-?</isbn>"
+msgstr "<edition>Second</edition> <isbn>?-?????-???-?</isbn>"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><firstname>
+#: ../../en/book/book.xml:40
+msgid "Ben"
+msgstr "Ben"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><surname>
+#: ../../en/book/book.xml:41
+msgid "Collins-Sussman"
+msgstr "Collins-Sussman"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><firstname>
+#: ../../en/book/book.xml:45
+msgid "Brian W."
+msgstr "Brian W."
+
+#. type: Content of: <book><bookinfo><authorgroup><author><surname>
+#: ../../en/book/book.xml:46
+msgid "Fitzpatrick"
+msgstr "Fitzpatrick"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><firstname>
+#: ../../en/book/book.xml:50
+msgid "C. Michael"
+msgstr "C. Michael"
+
+#. type: Content of: <book><bookinfo><authorgroup><author><surname>
+#: ../../en/book/book.xml:51
+msgid "Pilato"
+msgstr "Pilato"
+
+#. type: Content of: <book><bookinfo>
+#: ../../en/book/book.xml:56
+msgid ""
+"<editor> <firstname>Tatiana</firstname> <surname>Apandi</surname>
</editor> "
+"<pagenums>350 pages (est.)</pagenums> <pubdate>(TBA)</pubdate>
<copyright> "
+"<year>2002</year> <year>2003</year> <year>2004</year> <year>2005</year> "
+"<year>2006</year> <year>2007</year> <year>2008</year> <holder>Ben
Collins-"
+"Sussman</holder> <holder>Brian W. Fitzpatrick</holder> <holder>C.
Michael "
+"Pilato</holder> </copyright>"
+msgstr ""
+"<editor> <firstname>Tatiana</firstname> <surname>Apandi</surname>
</editor> "
+"<pagenums>350 pages (est.)</pagenums> <pubdate>(TBA)</pubdate>
<copyright> "
+"<year>2002</year> <year>2003</year> <year>2004</year> <year>2005</year> "
+"<year>2006</year> <year>2007</year> <year>2008</year> <holder>Ben
Collins-"
+"Sussman</holder> <holder>Brian W. Fitzpatrick</holder> <holder>C.
Michael "
+"Pilato</holder> </copyright>"
+
+#. type: Content of: <book><bookinfo><legalnotice><para>
+#: ../../en/book/book.xml:77
+msgid ""
+"This work is licensed under the Creative Commons Attribution License.
To "
+"view a copy of this license, visit <ulink
url=\"http://creativecommons.org/"
+"licenses/by/2.0/\"/> or send a letter to Creative Commons, 559 Nathan
Abbott "
+"Way, Stanford, California 94305, USA."
+msgstr ""
+"本书使用创作共用许可证。可以访问 <ulink url=\"http://creativecommons.org/"
+"licenses/by/2.0/\"/> 或发送邮件到 Creative Commons, 559 Nathan Abbott
Way, "
+"Stanford, California 94305, USA，以查看本许可证。"
+
+#. type: Content of: <book><preface><title>
+#: ../../en/book/ch00-preface.xml:2
+msgid "Preface"
+msgstr "序言"
+
+#. type: Content of: <book><preface><blockquote><attribution>
+#: ../../en/book/ch00-preface.xml:5
+msgid "Greg Hudson, Subversion developer"
+msgstr "Greg Hudson，Subversion开发者"
+
+#. type: Content of: <book><preface><blockquote><para>
+#: ../../en/book/ch00-preface.xml:6
+msgid ""
+"<quote>It is important not to let the perfect become the enemy of the
good, "
+"even when you can agree on what perfect is. Doubly so when you can't.
As "
+"unpleasant as it is to be trapped by past mistakes, you can't make any "
+"progress by being afraid of your own shadow during design.</quote>"
+msgstr ""
+"<quote>即使你能确认什么是完美，也不要让完美成为好的敌人。更何况你不能确
认。因"
+"为落入过去陷阱的不悦，你会在设计时因为担心自己的缺陷而无所作为。</quote>"
+
+#. type: Content of: <book><preface><para>
+#: ../../en/book/ch00-preface.xml:14
+msgid ""
+"<placeholder type=\"indexterm\" id=\"0\"/> In the world of open source "
+"software, the Concurrent Versions System (CVS) was the tool of choice
for "
+"version control for many years. And rightly so. CVS was open source "
+"software itself, and its nonrestrictive modus operandi and support for "
+"networked operation allowed dozens of geographically dispersed
programmers to "
+"share their work. It fit the collaborative nature of the open source
world "
+"very well. CVS and its semi-chaotic development model have since become "
+"cornerstones of open source culture."
+msgstr ""
+"<placeholder type=\"indexterm\" id=\"0\"/>在开源软件世界，长久以来，并行版
本系"
+"统(CVS)一直是版本控制工具的唯一选择。事实证明，这个选择不错。CVS 的自由软
件身"
+"份，无约束的处事态度，对网络化操作的支持，使众多身处不同地方的程序员可以共
享他"
+"们的工作成果，正符合了开源世界协作的精神。CVS 和它半混乱状态的开发模式已成
为开"
+"源文化的基石。"
+
+#. type: Content of: <book><preface><para><indexterm><primary>
+#: ../../en/book/ch00-preface.xml:15
+msgid "Concurrent Versions System (CVS)"
+msgstr "并行版本系统 (CVS)"
+
+#. type: Content of: <book><preface><para>
+#: ../../en/book/ch00-preface.xml:28
+msgid ""
+"But CVS was not without its flaws, and simply fixing those flaws promised
to "
+"be an enormous effort. Enter Subversion. Subversion was designed to be
a "
+"successor to CVS, and its originators set out to win the hearts of CVS
users "
+"in two ways—by creating an open source system with a design (and "
+"<quote>look and feel</quote>) similar to CVS, and by attempting to avoid
most "
+"of CVS's noticeable flaws. While the result isn't necessarily the next
great "
+"evolution in version control design, Subversion <emphasis>is</emphasis>
very "
+"powerful, very usable, and very flexible. And for the most part, almost
all "
+"newly started open source projects now choose Subversion instead of CVS."
+msgstr ""
+"但是，CVS 也并不是没有缺陷，而修正这些缺陷要耗费很大的精力。而 Subversion
则是"
+"以 CVS 继任者的面目出现的新型版本控制系统，Subversion 的设计者们力图通过两
方面"
+"的努力赢得 CVS 用户的青睐 — 保持开源系统的设计(以及<quote>界面风格
</"
+"quote>)与 CVS 尽可能类似，同时尽力弥补 CVS 许多显著的缺陷。这些努力的结果
使得"
+"从 CVS 迁移到 Subversion 不需要作出重大的变革，Subversion 确实<emphasis>是
</"
+"emphasis>非常强大, 非常有用和非常灵活的工具。并且很重要的一点，几乎所有新
的开"
+"源项目都选择了 Subversion 替代 CVS。"
+
+#. type: Content of: <book><preface><para>
+#: ../../en/book/ch00-preface.xml:40
+msgid ""
+"This book is written to document the 1.6 series of the Subversion
version "
+"control system. We have made every attempt to be thorough in our
coverage. "
+"However, Subversion has a thriving and energetic development community,
so "
+"already a number of features and improvements are planned for future
versions "
+"that may change some of the commands and specific notes in this book."
+msgstr ""
+"本书是为 Subversion 1.6 系列撰写的。在书中，我们尽力涵盖 Subversion 的所有
内"
+"容。但是，Subversion 有一个兴盛和充满活力的开发社区，已有许多新的特性和改
进措"
+"施计划在 Subversion 新版本中实现，本书中讲述的命令和特性可能会有所变化。"
+
+#. type: Content of: <book><preface><sect1><title>
+#: ../../en/book/ch00-preface.xml:54
+msgid "Audience"
+msgstr "读者"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:56
+msgid ""
+"This book is written for computer-literate folk who want to use
Subversion to "
+"manage their data. While Subversion runs on a number of different
operating "
+"systems, its primary user interface is command-line-based. That
command-line "
+"tool (<command>svn</command>), and some auxiliary programs, are the focus
of "
+"this book."
+msgstr ""
+"本书是为了那些在计算机领域有丰富知识，并且希望使用 Subversion 管理数据的人
士准"
+"备的。尽管 Subversion 可以在多种不同的操作系统上运行，但其基本用户操作界面
是基"
+"于命令行的，也就是我们将要在本书中讲述和使用的命令行工具(<command>svn</"
+"command>)，还有一些针对本书的辅助程序。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:63
+msgid ""
+"For consistency, the examples in this book assume that the reader is
using a "
+"Unix-like operating system and is relatively comfortable with Unix and "
+"command-line interfaces. That said, the <command>svn</command> program
also "
+"runs on non-Unix platforms such as Microsoft Windows. With a few minor "
+"exceptions, such as the use of backward slashes (<literal>\\</literal>) "
+"instead of forward slashes (<literal>/</literal>) for path separators,
the "
+"input to and output from this tool when run on Windows are identical to
its "
+"Unix counterpart."
+msgstr ""
+"出于一致性的考虑，本书的例子假定读者使用的是类 Unix 的操作系统，并且熟悉
Unix "
+"和命令行界面。当然，<command>svn</command> 程序也可以在如 Microsoft
Windows 这"
+"样的非 Unix 平台上运行，除了一些微小的不同，如使用反斜线(<literal>\\</"
+"literal>)代替正斜线(<literal>/</literal>)作为路径分隔符，在 Windows 上运
行 "
+"svn 程序的输入和输出与在 Unix 平台上运行完全一致。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:73
+msgid ""
+"Most readers are probably programmers or system administrators who need
to "
+"track changes to source code. This is the most common use for
Subversion, "
+"and therefore it is the scenario underlying all of the book's examples.
But "
+"Subversion can be used to manage changes to any sort of
information—"
+"images, music, databases, documentation, and so on. To Subversion, all
data "
+"is just data."
+msgstr ""
+"大多数读者可能是那些需要跟踪代码变化的程序员或者系统管理员。这是
Subversion 最"
+"普遍的用途，因此这个场景贯穿于整本书的例子中。但是 Subversion 可以用来管理
任何"
+"类型的数据 — 图像, 音乐, 数据库, 文档等等。对于 Subversion，数据就是
数据"
+"而已。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:81
+msgid ""
+"While this book is written with the assumption that the reader has never
used "
+"a version control system, we've also tried to make it easy for users of
CVS "
+"(and other systems) to make a painless leap into Subversion. Special "
+"sidebars may mention other version control systems from time to time,
and "
+"Appendix B summarizes many of the differences between CVS and Subversion."
+msgstr ""
+"本书假定读者从来没有使用过任何版本控制工具，同时，我们也努力使 CVS (或其他
系"
+"统)用户能够轻松的投入到 Subversion 的使用当中，在侧栏不时会出现一些涉及
CVS 的"
+"内容，此外，在附录 B 的一个章节中总结了 Subversion 和 CVS 的区别。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:89
+msgid ""
+"Note also that the source code examples used throughout the book are
only "
+"examples. While they will compile with the proper compiler
incantations, "
+"they are intended to illustrate a particular scenario and not necessarily
to "
+"serve as examples of good programming style or practices."
+msgstr ""
+"需要说明的是，所有源代码示例仅仅是例子而已。这些例子需要通过正确编译器参数
进行"
+"编译，在这里列举它们只是为了说明特定的场景，并非为了展示优秀的编码风格或实
践。"
+
+#. type: Content of: <book><preface><sect1><title>
+#: ../../en/book/ch00-preface.xml:101
+msgid "How to Read This Book"
+msgstr "怎样阅读本书"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:103
+msgid ""
+"Technical books always face a certain dilemma: whether to cater to "
+"<firstterm>top-down</firstterm> or to <firstterm>bottom-up</firstterm> "
+"learners. A top-down learner prefers to read or skim documentation,
getting "
+"a large overview of how the system works; only then does she actually
start "
+"using the software. A bottom-up learner is a <quote>learn by
doing</quote> "
+"person—someone who just wants to dive into the software and figure
it "
+"out as she goes, referring to book sections when necessary. Most books
tend "
+"to be written for one type of person or the other, and this book is "
+"undoubtedly biased toward top-down learners. (And if you're actually
reading "
+"this section, you're probably already a top-down learner yourself!)
However, "
+"if you're a bottom-up person, don't despair. While the book may be laid
out "
+"as a broad survey of Subversion topics, the content of each section tends
to "
+"be heavy with specific examples that you can try-by-doing. For the
impatient "
+"folks who just want to get going, you can jump right to <xref
linkend=\"svn."
+"intro\"/>."
+msgstr ""
+"技术书籍经常要面对这样两难的困境：是迎合<firstterm>自上至下</firstterm>的
初学"
+"者，还是<firstterm>自下至上</firstterm>的初学者。一个自上至下的学习者会喜
欢略"
+"读文档，得到对系统工作原理的总体看法；然后她才会开始实际使用软件。而一个自
下至"
+"上的学习者，是通过实践学习的人，她希望快速的开始使用软件，自己领会软件的使
用，"
+"只在必要时读取相关章节。大多数图书会倾向于针对某一类读者，而本书毫无疑问倾
向于"
+"自上至下的方法(如果你阅读了本节，那你也一定是一个自上至下的学习者！)。然
而，如"
+"果你是自下至上的人，不要失望。本书以 Subversion 为主题的广泛观察进行组
织，每个"
+"章节都包含了大量可以尝试的详细实例。如果你希望马上开工，没有耐心等待，你可
以看"
+"<xref linkend=\"svn.intro\"/>。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:122
+msgid ""
+"Regardless of your learning style, this book aims to be useful to people
of "
+"widely different backgrounds—from those with no previous experience
in "
+"version control to experienced system administrators. Depending on your
own "
+"background, certain chapters may be more or less important to you. The "
+"following can be considered a <quote>recommended reading list</quote>
for "
+"various types of readers:"
+msgstr ""
+"本书适用于具有不同背景知识的各个层次的读者 - 从未使用过版本控制的新手，到
经验"
+"丰富的系统管理员都能够从本书中获益。根据基础的不同，某些的章节可能对某些读
者更"
+"有价值。下面的内容可以看作是为不同类型的读者提供的<quote>推荐阅读清单</"
+"quote>："
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:133
+msgid "Experienced system administrators"
+msgstr "资深系统管理员"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:135
+msgid ""
+"The assumption here is that you've probably used version control before
and "
+"are dying to get a Subversion server up and running ASAP. <xref linkend="
+"\"svn.reposadmin\"/> and <xref linkend=\"svn.serverconfig\"/> will show
you "
+"how to create your first repository and make it available over the
network. "
+"After that's done, <xref linkend=\"svn.tour\"/> and <xref
linkend=\"svn.forcvs"
+"\"/> are the fastest routes to learning the Subversion client."
+msgstr ""
+"假定你从前使用过版本控制，并且迫切需要建立起 Subversion 服务器并尽快运行起
来。"
+"<xref linkend=\"svn.reposadmin\"/>和<xref linkend=\"svn.serverconfig\"/>将
会告"
+"诉你如何建立起一个版本库，并将其在网络上发布。然后，<xref
linkend=\"svn.tour"
+"\"/>和<xref linkend=\"svn.forcvs\"/>将向你展示怎样使用 Subversion 客户端软
件。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:149
+msgid "New users"
+msgstr "新用户"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:151
+msgid ""
+"Your administrator has probably set up Subversion already, and you need
to "
+"learn how to use the client. If you've never used a version control
system, "
+"then <xref linkend=\"svn.basic\"/> is a vital introduction to the ideas "
+"behind version control. <xref linkend=\"svn.tour\"/> is a guided tour of
the "
+"Subversion client."
+msgstr ""
+"如果管理员已经为你准备好了 Subversion 服务，你所需要的是学习如何使用客户
端。如"
+"果你没有使用版本控制系统，那么<xref linkend=\"svn.basic\"/>介绍了版本控制
的重"
+"要思想，<xref linkend=\"svn.tour\"/>是重要的入门教程。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:161
+msgid "Advanced users"
+msgstr "高级用户"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:163
+msgid ""
+"Whether you're a user or administrator, eventually your project will
grow "
+"larger. You're going to want to learn how to do more advanced things
with "
+"Subversion, such as how to use Subversion's property support (<xref
linkend="
+"\"svn.advanced\"/>), how to use branches and perform merges (<xref
linkend="
+"\"svn.branchmerge\"/>), how to configure runtime options (<xref
linkend=\"svn."
+"customization\"/>), and other things. These chapters aren't critical at "
+"first, but be sure to read them once you're comfortable with the basics."
+msgstr ""
+"无论是用户还是管理员，项目终将会壮大起来。那时，就需要学习更多 Subversion
的高"
+"级功能(<xref linkend=\"svn.advanced\"/>)，像如何使用分支和执行合并(<xref "
+"linkend=\"svn.branchmerge\"/>)，怎样配制运行参数(<xref linkend=\"svn."
+"customization\"/>)，等等。这两章在学习的初期并不重要，但熟悉了基本操作之后
还是"
+"非常有必要了解一下。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:177
+msgid "Developers"
+msgstr "开发者"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:179
+msgid ""
+"Presumably, you're already familiar with Subversion, and now want to
either "
+"extend it or build new software on top of its many APIs. <xref
linkend=\"svn."
+"developer\"/> is just for you."
+msgstr ""
+"你应该已经很熟悉 Subversion 了，并且想扩展它或使用它的 API 开发新软件。
<xref "
+"linkend=\"svn.developer\"/>将最适合你。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:187
+msgid ""
+"The book ends with reference material—<xref linkend=\"svn.ref\"/>
is a "
+"reference guide for all Subversion commands, and the appendixes cover a "
+"number of useful topics. These are the chapters you're mostly likely to
come "
+"back to after you've finished the book."
+msgstr ""
+"本书以参考材料作为结束 — <xref linkend=\"svn.ref\"/>是一部
Subversion 全"
+"部命令的详细指南，此外，在附录中还有许多很有意义的主题。阅读完本书后，这些
章节"
+"将会是你经常查阅的内容。"
+
+#. type: Content of: <book><preface><sect1><title>
+#: ../../en/book/ch00-preface.xml:199
+msgid "Conventions Used in This Book"
+msgstr "本书约定"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:201
+msgid "The following typographic conventions are used in this book:"
+msgstr "本节描述了本书中使用的各种约定。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:208
+msgid "<userinput>Constant width</userinput>"
+msgstr "<userinput>等宽</userinput>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:211
+msgid "Used for literal user input, command output, and command-line
options"
+msgstr "用于用户的原文输入，命令输出和命令行选项"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:218
+msgid "<filename>Italic</filename>"
+msgstr "<filename>斜体</filename>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:221
+msgid ""
+"Used for program and Subversion tool subcommand names, file and
directory "
+"names, and new terms"
+msgstr "用于程序，Subversion 工具的子命令名称，文件和目录的名称，以及新术
语"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:228
+msgid "<replaceable>Constant width italic</replaceable>"
+msgstr "<replaceable>等宽斜体</replaceable>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:231
+msgid "Used for replaceable items in code and text"
+msgstr "用于代码和文本中的可替换部分"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:237
+msgid ""
+"Also, we sprinkled especially helpful or important bits of information "
+"throughout the book (in contextually relevant locations), set off
visually so "
+"they're easy to find. Look for the following icons as you read:"
+msgstr ""
+
+#. type: Content of: <book><preface><sect1><note><para>
+#: ../../en/book/ch00-preface.xml:243
+msgid "This icon designates a special point of interest."
+msgstr "此图标表示旁边的内容需特别注意。"
+
+#. type: Content of: <book><preface><sect1><tip><para>
+#: ../../en/book/ch00-preface.xml:247
+msgid "This icon designates a helpful tip or recommended best practice."
+msgstr "此图标表示旁边描述了一个有用的小技巧。"
+
+#. type: Content of: <book><preface><sect1><warning><para>
+#: ../../en/book/ch00-preface.xml:252
+msgid ""
+"This icon designates a warning. Pay close attention to these to avoid "
+"running into problems."
+msgstr "此图标表示警告。请特别注意这些内容以免出现问题。"
+
+#. type: Content of: <book><preface><sect1><title>
+#: ../../en/book/ch00-preface.xml:262
+msgid "Organization of This Book"
+msgstr "本书的结构"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:264
+msgid "The chapters that follow and their contents are listed here:"
+msgstr "以下是各个章节的内容介绍："
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:270
+msgid "<xref linkend=\"svn.basic\"/>"
+msgstr "<xref linkend=\"svn.basic\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:272
+msgid ""
+"Explains the basics of version control and different versioning models,
along "
+"with Subversion's repository, working copies, and revisions."
+msgstr ""
+"介绍了版本控制的基础知识及不同的版本模型，同时讲述了 Subversion 版本库，工
作副"
+"本和修订版本的概念。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:279
+msgid "<xref linkend=\"svn.tour\"/>"
+msgstr "<xref linkend=\"svn.tour\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:281
+msgid ""
+"Walks you through a day in the life of a Subversion user. It
demonstrates "
+"how to use a Subversion client to obtain, modify, and commit data."
+msgstr ""
+"引领你开始一个 Subversion 用户的工作。示范怎样使用 Subversion 获得, 修改和
提交"
+"数据。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:288
+msgid "<xref linkend=\"svn.advanced\"/>"
+msgstr "<xref linkend=\"svn.advanced\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:290
+msgid ""
+"Covers more complex features that regular users will eventually come
into "
+"contact with, such as versioned metadata, file locking, and peg
revisions."
+msgstr ""
+"覆盖了许多普通用户最终要面对的复杂特性，例如版本化的元数据, 文件锁定和
peg 修"
+"订版本。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:297
+msgid "<xref linkend=\"svn.branchmerge\"/>"
+msgstr "<xref linkend=\"svn.branchmerge\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:299
+msgid ""
+"Discusses branches, merges, and tagging, including best practices for "
+"branching and merging, common use cases, how to undo changes, and how to "
+"easily swing from one branch to the next."
+msgstr ""
+"讨论分支, 合并与标签，包括最佳实践的介绍，常见用例的描述，怎样取消修改，以
及怎"
+"样从一个分支转到另一个分支。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:307
+msgid "<xref linkend=\"svn.reposadmin\"/>"
+msgstr "<xref linkend=\"svn.reposadmin\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:309
+msgid ""
+"Describes the basics of the Subversion repository, how to create,
configure, "
+"and maintain a repository, and the tools you can use to do all of this."
+msgstr ""
+"讲述 Subversion 版本库的基本概念，怎样建立, 配置和维护版本库，以及哪些工具
可以"
+"完成上述的工作。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:316
+msgid "<xref linkend=\"svn.serverconfig\"/>"
+msgstr "<xref linkend=\"svn.serverconfig\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:318
+msgid ""
+"Explains how to configure your Subversion server and offers different
ways to "
+"access your repository: <literal>HTTP</literal>, the
<literal>svn</literal> "
+"protocol, and local disk access. It also covers the details of "
+"authentication, authorization and anonymous access."
+msgstr ""
+"描述了如何配置 Subversion 服务器，以及访问版本库的不同方
式：<literal>HTTP</"
+"literal>, <literal>svn</literal> 协议和本地磁盘访问。这里也介绍了认证，授
权与"
+"匿名访问的细节。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:328
+msgid "<xref linkend=\"svn.customization\"/>"
+msgstr "<xref linkend=\"svn.customization\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:330
+msgid ""
+"Explores the Subversion client configuration files, the handling of "
+"internationalized text, and how to make external tools cooperate with "
+"Subversion."
+msgstr ""
+"研究了 Subversion 的客户端配置文件，对国际化字符的处理，以及 Subversion 如
何与"
+"外置工具交互。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:337
+msgid "<xref linkend=\"svn.developer\"/>"
+msgstr "<xref linkend=\"svn.developer\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:339
+msgid ""
+"Describes the internals of Subversion, the Subversion filesystem, and
the "
+"working copy administrative areas from a programmer's point of view. It
also "
+"demonstrates how to use the public APIs to write a program that uses "
+"Subversion."
+msgstr ""
+"介绍了 Subversion 的内部信息, Subversion 的文件系统，以及程序员眼中的工作
副本"
+"管理区，展示了如何使用公共 API 编写 Subversion 应用程序。最重要的内容
是，如何"
+"为 Subversion 的开发贡献力量。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:348
+msgid "<xref linkend=\"svn.ref\"/>"
+msgstr "<xref linkend=\"svn.ref\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:350
+msgid ""
+"Explains in great detail every subcommand of <command>svn</command>, "
+"<command>svnadmin</command>, and <command>svnlook</command> with plenty
of "
+"examples for the whole family!"
+msgstr ""
+"以大量的实例，详细描述了 <command>svn</command>,
<command>svnadmin</command> "
+"和 <command>svnlook</command> 的所有子命令。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:358
+msgid "<xref linkend=\"svn.intro\"/>"
+msgstr "<xref linkend=\"svn.intro\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:360
+msgid ""
+"For the impatient, a whirlwind explanation of how to install Subversion
and "
+"start using it immediately. You have been warned."
+msgstr ""
+"对于缺乏耐心的家伙，我们会立刻解释如何安装和使用 Subversion。我们已经告诫
你"
+"了。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:367
+msgid "<xref linkend=\"svn.forcvs\"/>"
+msgstr "<xref linkend=\"svn.forcvs\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:369
+msgid ""
+"Covers the similarities and differences between Subversion and CVS, with "
+"numerous suggestions on how to break all the bad habits you picked up
from "
+"years of using CVS. Included are descriptions of Subversion revision "
+"numbers, versioned directories, offline operations,
<command>update</command> "
+"versus <command>status</command>, branches, tags, metadata, conflict "
+"resolution, and authentication."
+msgstr ""
+"详细比较了 Subversion 与 CVS 的异同，并针对如何消除多年使用 CVS 养成的坏习
惯提"
+"出建议。内容包括 Subversion 版本号, 版本化的目录, 离线操作,
<command>update</"
+"command> 与 <command>status</command> 的对比, 分支, 标签, 元数据, 冲突处理
和认"
+"证。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:381
+msgid "<xref linkend=\"svn.webdav\"/>"
+msgstr "<xref linkend=\"svn.webdav\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:383
+msgid ""
+"Describes the details of WebDAV and DeltaV and how you can configure
your "
+"Subversion repository to be mounted read/write as a DAV share."
+msgstr ""
+"描述了WebDAV 与 DeltaV 的细节，并介绍了如何将 Subversion 版本库作为可读/写
的 "
+"DAV 共享装载。"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><term>
+#: ../../en/book/ch00-preface.xml:390
+msgid "<xref linkend=\"svn.copyright\"/>"
+msgstr "<xref linkend=\"svn.copyright\"/>"
+
+#. type: Content of:
<book><preface><sect1><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:392
+msgid ""
+"A copy of the Creative Commons Attribution License, under which this book
is "
+"licensed."
+msgstr "Creative Commons Attribution License 的副本，本书的许可证。"
+
+#. type: Content of: <book><preface><sect1><title>
+#: ../../en/book/ch00-preface.xml:406
+msgid "This Book Is Free"
+msgstr "本书是免费的"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:408
+msgid ""
+"This book started out as bits of documentation written by Subversion
project "
+"developers, which were then coalesced into a single work and rewritten.
As "
+"such, it has always been under a free license (see <xref linkend=\"svn."
+"copyright\"/>). In fact, the book was written in the public eye,
originally "
+"as part of the Subversion project itself. This means two things:"
+msgstr ""
+"本书最初是作为 Subversion 项目的文档，并由 Subversion 的开发者开始撰写
的，后来"
+"成为一个独立的项目并进行了重写。与 Subversion 相同，它始终按自由许可证(参
见 "
+"<xref linkend=\"svn.copyright\"/>)发布。事实上，本书是在公众的关注中写出来
的，"
+"最初是 Subversion 项目的一部分，这有两种含义："
+
+#. type: Content of: <book><preface><sect1><itemizedlist><listitem><para>
+#: ../../en/book/ch00-preface.xml:417
+msgid ""
+"You will always find the latest version of this book in the book's own "
+"Subversion repository."
+msgstr "总可以在 Subversion 的版本库里找到本书的最新版本。"
+
+#. type: Content of: <book><preface><sect1><itemizedlist><listitem><para>
+#: ../../en/book/ch00-preface.xml:422
+msgid ""
+"You can make changes to this book and redistribute it however you
wish—"
+"it's under a free license. Your only obligation is to maintain proper "
+"attribution to the original authors. Of course, we'd much rather you
send "
+"feedback and patches to the Subversion developer community, instead of "
+"distributing your private version of this book."
+msgstr ""
+"可以任意分发或修改本书 — 它在自由许可证的控制之下。你的唯一限制是必
须保"
+"留原始作者。当然，与其独自发布私有版本，不如向 Subversion 开发社区提供反馈
和修"
+"正信息。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:432
+msgid ""
+"The online home of this book's development and most of the
volunteer-driven "
+"translation efforts regarding it is <ulink
url=\"http://svnbook.red-bean.com"
+"\"/>. There you can find links to the latest releases and tagged
versions of "
+"the book in various formats, as well as instructions for accessing the
book's "
+"Subversion repository (where its DocBook XML source code lives).
Feedback is "
+"welcomed—encouraged, even. Please submit all comments, complaints,
and "
+"patches against the book sources to
<email>svnbook-dev at red-bean.com</email>."
+msgstr ""
+"本书的在线主页和许多志愿者的翻译工作位于 <ulink
url=\"http://svnbook.red-bean."
+"com\"/>。在这个网站上，你可以找到本书最新快照和标签版本的链接的各种格
式，以及"
+"访问本书的 Subversion 版本库(存放 DocBook XML 源文件)的指令。我们欢迎和鼓
励反"
+"馈。请将所有的评论, 抱怨和对本书源文件的补丁发送到
<email>svnbook-dev at red-"
+"bean.com</email>。"
+
+#. type: Content of: <book><preface><sect1><title>
+#: ../../en/book/ch00-preface.xml:448
+msgid "Acknowledgments"
+msgstr "致谢"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:450
+msgid ""
+"This book would not be possible (nor very useful) if Subversion did not "
+"exist. For that, the authors would like to thank Brian Behlendorf and "
+"CollabNet for the vision to fund such a risky and ambitious new open
source "
+"project; Jim Blandy for the original Subversion name and design—we
love "
+"you, Jim; and Karl Fogel for being such a good friend and a great
community "
+"leader, in that order. <placeholder type=\"footnote\" id=\"0\"/>"
+msgstr ""
+"没有 Subversion 就不可能有(即使有也没什么价值)这本书。所以作者衷心感谢
Brian "
+"Behlendorf 和 CollabNet，他们独到的眼光开创了这个充满冒险但雄心勃勃的开源
项"
+"目；Jim Blandy 贡献了 Subversion 最初的名字和设计 — 我们爱你，Jim；还有
Karl "
+"Fogel，一个好朋友和伟大的社区领袖。<placeholder type=\"footnote\"
id=\"0\"/>"
+
+#. type: Content of: <book><preface><sect1><para><footnote><para>
+#: ../../en/book/ch00-preface.xml:458
+msgid ""
+"Oh, and thanks, Karl, for being too overworked to write this book
yourself."
+msgstr "噢，还要感谢 Karl 为了本书所付出的辛勤工作。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:463
+msgid ""
+"Thanks to O'Reilly and our various editors: Chuck Toporek, Linda Mui,
Tatiana "
+"Apandi, Mary Brady, and Mary Treseler. Their patience and support has
been "
+"tremendous."
+msgstr ""
+"感谢 O'Reilly 和我们的编辑：Chuck Toporek, Linda Mui, Tatiana Apandi,
Mary "
+"Brady 和 Mary Treseler。他们的耐心和支持是巨大的。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:467
+msgid ""
+"Finally, we thank the countless people who contributed to this book with "
+"informal reviews, suggestions, and patches. While this is undoubtedly
not a "
+"complete list, this book would be incomplete and incorrect without their "
+"help: Bhuvaneswaran A, David Alber, C. Scott Ananian, David Anderson,
Ariel "
+"Arjona, Seth Arnold, Jani Averbach, Charles Bailey, Ryan Barrett,
Francois "
+"Beausoleil, Brian R. Becker, Yves Bergeron, Karl Berry, Jennifer Bevan,
Matt "
+"Blais, Jim Blandy, Phil Bordelon, Sietse Brouwer, Tom Brown, Zack Brown, "
+"Martin Buchholz, Paul Burba, Sean Callan-Hinsvark, Branko Cibej, Archie "
+"Cobbs, Jason Cohen, Ryan Cresawn, John R. Daily, Peter Davis, Olivier
Davy, "
+"Robert P. J. Day, Mo DeJong, Brian Denny, Joe Drew, Markus Dreyer, Nick "
+"Duffek, Boris Dusek, Ben Elliston, Justin Erenkrantz, Jens M.
Felderhoff, "
+"Kyle Ferrio, Shlomi Fish, Julian Foad, Chris Foote, Martin Furter, Vlad "
+"Georgescu, Peter Gervai, Dave Gilbert, Eric Gillespie, David Glasser,
Marcel "
+"Gosselin, Lieven Govaerts, Steve Greenland, Matthew Gregan, Tom Gregory, "
+"Maverick Grey, Art Haas, Mark E. Hamilton, Eric Hanchrow, Liam Healy,
Malte "
+"Helmert, Michael Henderson, Øyvind A. Holm, Greg Hudson, Alexis Huxley,
Auke "
+"Jilderda, Toby Johnson, Jens B. Jorgensen, Tez Kamihira, David Kimdon,
Mark "
+"Benedetto King, Robert Kleemann, Erik Kline, Josh Knowles, Andreas J.
Koenig, "
+"Axel Kollmorgen, Nuutti Kotivuori, Kalin Kozhuharov, Matt Kraai, Regis "
+"Kuckaertz, Stefan Kueng, Steve Kunkee, Scott Lamb, Wesley J. Landaker, "
+"Benjamin Landsteiner, Vincent Lefevre, Morten Ludvigsen, Dennis
Lundberg, "
+"Paul Lussier, Bruce A. Mah, Jonathon Mah, Karl Heinz Marbaise, Philip
Martin, "
+"Feliciano Matias, Neil Mayhew, Patrick Mayweg, Gareth McCaughan, Craig "
+"McElroy, Simon McKenna, Christophe Meresse, Jonathan Metillon,
Jean-Francois "
+"Michaud, Jon Middleton, Robert Moerland, Marcel Molina Jr., Tim Moloney, "
+"Alexander Mueller, Tabish Mustufa, Christopher Ness, Roman Neuhauser,
Mats "
+"Nilsson, Greg Noel, Joe Orton, Eric Paire, Dimitri Papadopoulos-Orfanos, "
+"Jerry Peek, Chris Pepper, Amy Lyn Pilato, Kevin Pilch-Bisson, Hans
Polak, "
+"Dmitriy Popkov, Michael Price, Mark Proctor, Steffen Prohaska, Daniel
Rall, "
+"Srinivasa Ramanujan, Jack Repenning, Tobias Ringstrom, Jason Robbins,
Garrett "
+"Rooney, Joel Rosdahl, Christian Sauer, Ryan Schmidt, Jochem
Schulenklopper, "
+"Jens Seidel, Daniel Shahaf, Larry Shatzer, Danil Shopyrin, Erik
Sjoelund, "
+"Joey Smith, W. Snyder, Stefan Sperling, Robert Spier, M. S. Sriram,
Russell "
+"Steicke, David Steinbrunner, Sander Striker, David Summers, Johan
Sundstroem, "
+"Ed Swierk, John Szakmeister, Arfrever Frehtes Taifersar Arahesis, Robert "
+"Tasarz, Michael W. Thelen, Mason Thomas, Erik van der Kolk, Joshua
Varner, "
+"Eric Wadsworth, Chris Wagner, Colin Watson, Alex Waugh, Chad Whitacre,
Andy "
+"Whitcroft, Josef Wolf, Luke Worth, Hyrum Wright, Blair Zajac, Florian "
+"Zumbiehl, and the entire Subversion community."
+msgstr ""
+"最后，我们要感谢数不清的曾经为本书作出贡献的人们，他们进行了非正式的审
阅，并给"
+"出了大量建议和修改意见。虽然无法列出一个完整的列表，但本书的完整和正确离不
开他"
+"们：Bhuvaneswaran A, David Alber, C. Scott Ananian, David Anderson,
Ariel "
+"Arjona, Seth Arnold, Jani Averbach, Charles Bailey, Ryan Barrett,
Francois "
+"Beausoleil, Brian R. Becker, Yves Bergeron, Karl Berry, Jennifer Bevan,
Matt "
+"Blais, Jim Blandy, Phil Bordelon, Sietse Brouwer, Tom Brown, Zack Brown, "
+"Martin Buchholz, Paul Burba, Sean Callan-Hinsvark, Branko Cibej, Archie "
+"Cobbs, Jason Cohen, Ryan Cresawn, John R. Daily, Peter Davis, Olivier
Davy, "
+"Robert P. J. Day, Mo DeJong, Brian Denny, Joe Drew, Markus Dreyer, Nick "
+"Duffek, Boris Dusek, Ben Elliston, Justin Erenkrantz, Jens M.
Felderhoff, "
+"Kyle Ferrio, Shlomi Fish, Julian Foad, Chris Foote, Martin Furter, Vlad "
+"Georgescu, Peter Gervai, Dave Gilbert, Eric Gillespie, David Glasser,
Marcel "
+"Gosselin, Lieven Govaerts, Steve Greenland, Matthew Gregan, Tom Gregory, "
+"Maverick Grey, Art Haas, Mark E. Hamilton, Eric Hanchrow, Liam Healy,
Malte "
+"Helmert, Michael Henderson, Øyvind A. Holm, Greg Hudson, Alexis Huxley,
Auke "
+"Jilderda, Toby Johnson, Jens B. Jorgensen, Tez Kamihira, David Kimdon,
Mark "
+"Benedetto King, Robert Kleemann, Erik Kline, Josh Knowles, Andreas J.
Koenig, "
+"Axel Kollmorgen, Nuutti Kotivuori, Kalin Kozhuharov, Matt Kraai, Regis "
+"Kuckaertz, Stefan Kueng, Steve Kunkee, Scott Lamb, Wesley J. Landaker, "
+"Benjamin Landsteiner, Vincent Lefevre, Morten Ludvigsen, Dennis
Lundberg, "
+"Paul Lussier, Bruce A. Mah, Jonathon Mah, Karl Heinz Marbaise, Philip
Martin, "
+"Feliciano Matias, Neil Mayhew, Patrick Mayweg, Gareth McCaughan, Craig "
+"McElroy, Simon McKenna, Christophe Meresse, Jonathan Metillon,
Jean-Francois "
+"Michaud, Jon Middleton, Robert Moerland, Marcel Molina Jr., Tim Moloney, "
+"Alexander Mueller, Tabish Mustufa, Christopher Ness, Roman Neuhauser,
Mats "
+"Nilsson, Greg Noel, Joe Orton, Eric Paire, Dimitri Papadopoulos-Orfanos, "
+"Jerry Peek, Chris Pepper, Amy Lyn Pilato, Kevin Pilch-Bisson, Hans
Polak, "
+"Dmitriy Popkov, Michael Price, Mark Proctor, Steffen Prohaska, Daniel
Rall, "
+"Srinivasa Ramanujan, Jack Repenning, Tobias Ringstrom, Jason Robbins,
Garrett "
+"Rooney, Joel Rosdahl, Christian Sauer, Ryan Schmidt, Jochem
Schulenklopper, "
+"Jens Seidel, Daniel Shahaf, Larry Shatzer, Danil Shopyrin, Erik
Sjoelund, "
+"Joey Smith, W. Snyder, Stefan Sperling, Robert Spier, M. S. Sriram,
Russell "
+"Steicke, David Steinbrunner, Sander Striker, David Summers, Johan
Sundstroem, "
+"Ed Swierk, John Szakmeister, Arfrever Frehtes Taifersar Arahesis, Robert "
+"Tasarz, Michael W. Thelen, Mason Thomas, Erik van der Kolk, Joshua
Varner, "
+"Eric Wadsworth, Chris Wagner, Colin Watson, Alex Waugh, Chad Whitacre,
Andy "
+"Whitcroft, Josef Wolf, Luke Worth, Hyrum Wright, Blair Zajac, Florian "
+"Zumbiehl, 以及整个 Subversion 社区。"
+
+#. type: Content of: <book><preface><sect1><sect2><title>
+#: ../../en/book/ch00-preface.xml:645
+msgid "From Ben Collins-Sussman"
+msgstr "来自 Ben Collins-Sussman"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:647
+msgid ""
+"Thanks to my wife Frances, who, for many months, got to hear <quote>But "
+"honey, I'm still working on the book,</quote> rather than the usual "
+"<quote>But honey, I'm still doing email.</quote> I don't know where she
gets "
+"all that patience! She's my perfect counterbalance."
+msgstr ""
+"感谢我的妻子 Frances，在好几个月里，我一直在对你说：<quote>但是亲爱的，我
还在"
+"为这本书工作</quote>，此外还有，<quote>但是亲爱的，我还在处理邮件
</quote>。我"
+"不知道她为什么会如此耐心！她是我完美的平衡点。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:653
+msgid ""
+"Thanks to my extended family and friends for their sincere
encouragement, "
+"despite having no actual interest in the subject. (You know, the ones
who "
+"say, <quote>Ooh, you wrote a book?</quote> and then when you tell them
it's a "
+"computer book, sort of glaze over.)"
+msgstr ""
+"感谢我的家人和朋友对我诚挚的鼓励，尽管他们对我的课题不感兴趣。(你知道
的，一个"
+"人说 <quote>哇，你正在写一本书？</quote>，然后当他知道你是写一本计算机书
时，那"
+"种惊讶就变得没有那么多了。)"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:659
+msgid ""
+"Thanks to all my close friends, who make me a rich, rich man. Don't look
at "
+"me that way—you know who you are."
+msgstr "感谢我身边让我富有的朋友。不要那样看我 — 你们知道你们是谁。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:662
+msgid ""
+"Thanks to my parents for the perfect low-level formatting and being "
+"unbelievable role models. Thanks to my kids for the opportunity to pass
that "
+"on."
+msgstr ""
+"感谢父母对我的低级格式化，和难以置信的角色典范 ，感谢儿子给我机会传承这些
东"
+"西。"
+
+#. type: Content of: <book><preface><sect1><sect2><title>
+#: ../../en/book/ch00-preface.xml:670
+msgid "From Brian W. Fitzpatrick"
+msgstr "来自 Brian W. Fitzpatrick"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:672
+msgid ""
+"Huge thanks to my wife Marie for being incredibly understanding,
supportive, "
+"and most of all, patient. Thank you to my brother Eric who first
introduced "
+"me to Unix programming way back when. Thanks to my Mom and Grandmother
for "
+"all their support, not to mention enduring a Christmas holiday where I
came "
+"home and promptly buried my head in my laptop to work on the book."
+msgstr ""
+"非常非常感谢我的妻子 Marie 的理解，支持和最重要的耐心。感谢引导我学会
Unix 编"
+"程的兄弟 Eric，感谢我的母亲和祖母的支持，对我在圣诞夜里埋头工作的理解。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:680
+msgid ""
+"To Mike and Ben: it was a pleasure working with you on the book. Heck,
it's "
+"a pleasure working with you at work!"
+msgstr ""
+"致 Mike 和 Ben：与你们一起完成本书的工作非常快乐。Heck，我们在一起工作很愉
快！"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:683
+msgid ""
+"To everyone in the Subversion community and the Apache Software
Foundation, "
+"thanks for having me. Not a day goes by where I don't learn something
from "
+"at least one of you."
+msgstr ""
+"感谢所有在 Subversion 和 Apache 软件基金会的人们给我机会与你们在一起，没有
一天"
+"我不从你们那里学到知识。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:688
+msgid ""
+"Lastly, thanks to my grandfather, who always told me that <quote>freedom "
+"equals responsibility.</quote> I couldn't agree more."
+msgstr ""
+"最后，感谢我的祖父，他一直跟我说<quote>自由等于责任</quote>。我深信不疑。"
+
+#. type: Content of: <book><preface><sect1><sect2><title>
+#: ../../en/book/ch00-preface.xml:696
+msgid "From C. Michael Pilato"
+msgstr "来自 C. Michael Pilato"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:698
+msgid ""
+"Special thanks to Amy, my best friend and wife of more than ten
incredible "
+"years, for her love and patient support, for putting up with the late
nights, "
+"and for graciously enduring the version control processes I've imposed
on "
+"her. Don't worry, sweetheart—you'll be a TortoiseSVN wizard in no
time!"
+msgstr ""
+"特别感谢 Amy，我 10 年中难以置信的最好的朋友和妻子，因为她的爱和耐心支
持，因为"
+"她提供的深夜工作，因为她对我强加给她的版本控制过程的优雅持久忍受 。不要担
心，"
+"甜心 — 你会立刻成为 TortoiseSVN 巫师！"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:705
+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."
+msgstr ""
+"Gavin，或许现在本书的很多词你还不能读出来；很遗憾，它是提供关键概念的另一
半。"
+"抱歉，Aidan - 我不能找到将 Disney/Pixar 字符转换成文本的方法。但是，爸爸爱
你"
+"们，不能等待教你们编程知识。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:711
+msgid ""
+"Mom and Dad, thanks for your constant support and enthusiasm. Mom- and
Dad-"
+"in-law, thanks for all of the same <emphasis>plus</emphasis> your
fabulous "
+"daughter."
+msgstr ""
+"妈妈和爸爸，感谢你们的支持和热情，岳父岳母，以同样的理由感谢你
们，<emphasis>还"
+"要</emphasis>感谢你们难以置信的女儿。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:715
+msgid ""
+"Hats off to Shep Kendall, through whom the world of computers was first "
+"opened to me; Ben Collins-Sussman, my tour guide through the open source "
+"world; Karl Fogel, you <emphasis>are</emphasis> my <filename>.emacs</"
+"filename>; Greg Stein, for oozing practical programming know-how; and
Brian "
+"Fitzpatrick, for sharing this writing experience with me. To the many
folks "
+"from whom I am constantly picking up new knowledge—keep dropping
it!"
+msgstr ""
+"向你们致敬：Shep Kendall，为我打开了通向计算机世界的大门；Ben Collins-"
+"Sussman，我在开源世界的导师；Karl Fogel，你<emphasis>是</emphasis>我的 "
+"<filename>.emacs</filename>；Greg Stain，让我在编程实践困境中知道怎样做；"
+"Brain Fitzpatrick，同我分享他的写作经验。所有我一直从你们那里获得新知识的
人—尽"
+"管又不断忘记。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:724
+msgid ""
+"Finally, to the One who perfectly demonstrates creative excellence—"
+"thank You."
+msgstr "最后，感谢所有对我展现完美卓越创造力的人们。"
+
+#. type: Content of: <book><preface><sect1><title>
+#: ../../en/book/ch00-preface.xml:736
+msgid "What Is Subversion?"
+msgstr "Subversion 是什么？"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:738
+msgid ""
+"Subversion is a free/open source version control system. That is,
Subversion "
+"manages files and directories, and the changes made to them, over time.
This "
+"allows you to recover older versions of your data or examine the history
of "
+"how your data changed. In this regard, many people think of a version "
+"control system as a sort of <quote>time machine.</quote>"
+msgstr ""
+"Subversion 是一个自由/开源的版本控制系统。也就是说，在 Subversion 管理
下，文件"
+"和目录可以超越时空。也就是 Subversion 允许你数据恢复到早期版本，或者是检查
数据"
+"修改的历史。正因为如此，许多人将版本控制系统当作一种神奇的<quote>时间机器
</"
+"quote>。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:745
+msgid ""
+"Subversion can operate across networks, which allows it to be used by
people "
+"on different computers. At some level, the ability for various people
to "
+"modify and manage the same set of data from their respective locations "
+"fosters collaboration. Progress can occur more quickly without a single "
+"conduit through which all modifications must occur. And because the work
is "
+"versioned, you need not fear that quality is the trade-off for losing
that "
+"conduit—if some incorrect change is made to the data, just undo
that "
+"change."
+msgstr ""
+"Subversion 的版本库可以通过网络访问，从而使用户可以在不同的电脑上进行操
作。从"
+"某种程度上来说，允许用户在各自的空间里修改和管理同一组数据可以促进团队协
作。因"
+"为修改不再是单线进行，开发速度会更快。此外，由于所有的工作都已版本化，也就
不必"
+"担心由于错误的更改而影响软件质量—如果出现不正确的更改，只要撤销那一次更改
操作"
+"即可。"
+
+#. type: Content of: <book><preface><sect1><para>
+#: ../../en/book/ch00-preface.xml:755
+msgid ""
+"Some version control systems are also software configuration management
(SCM) "
+"systems. These systems are specifically tailored to manage trees of
source "
+"code and have many features that are specific to software
development—"
+"such as natively understanding programming languages, or supplying tools
for "
+"building software. Subversion, however, is not one of these systems. It
is "
+"a general system that can be used to manage <emphasis>any</emphasis> "
+"collection of files. For you, those files might be source
code—for "
+"others, anything from grocery shopping lists to digital video mixdowns
and "
+"beyond."
+msgstr ""
+"某些版本控制系统本身也是软件配置管理(SCM)系统，这种系统经过精巧的设计，专
门用"
+"来管理源代码树，并且具备许多与软件开发有关的特性—比如，对编程语言的支
持，或者"
+"提供程序构建工具。不过 Subversion 并不是这样的系统。它是一个通用系统，可以
管理"
+"<emphasis>任何</emphasis>类型的文件集。对你来说，这些文件这可能是源程序—而
对别"
+"人，则可能是一个货物清单或者是数字电影。"
+
+#. type: Content of: <book><preface><sect1><sect2><title>
+#: ../../en/book/ch00-preface.xml:771
+msgid "Is Subversion the Right Tool?"
+msgstr "Subversion 是正确的工具吗？"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:773
+msgid ""
+"If you're a user or system administrator pondering the use of Subversion,
the "
+"first question you should ask yourself is: \"Is this the right tool for
the "
+"job?\" Subversion is a fantastic hammer, but be careful not to view
every "
+"problem as a nail."
+msgstr ""
+"如果你是一个考虑如何使用 Subversion 的用户或管理员，你要问自己的第一件事
就"
+"是： \"这是这项工作的正确工具吗？\"，Subversion 是一个梦幻般的锤子，但要小
心不"
+"要把任何问题当作钉子。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:779
+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 "
+"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 "
+"data repository to store the information and all its history, and be
diligent "
+"about backing it up. When working with the data on a daily basis, you
won't "
+"be able to copy, move, rename, or delete files the way you usually do. "
+"Instead, you'll have to do all of those things through Subversion."
+msgstr ""
+"如果你希望归档文件和目录旧版本，有可能要恢复或需要查看日志获得其修改的历
史，那"
+"么 Subversion 是你需要的工具。如果你需要和别人协作文档(通常通过网络)并跟踪
所做"
+"的修改，那么 Subversion 也适合。这是 Subversion 为什么使用在软件开发环境
—编程"
+"是一件天性的社会活动，Subversion 使得与其他程序员的交互变得简单。当然，使
用 "
+"Subversion 也有代价：管理负担。你会需要管理一个存放所有历史的数据版本
库，并需"
+"要经常的备份。而在日常的工作中，你不能像往常一样拷贝, 移动, 重命名或删除文
件，"
+"相反，你需要通过 Subversion 完成这些工作。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:797
+msgid ""
+"Assuming you're fine with the extra workflow, you should still make sure "
+"you're not using Subversion to solve a problem that other tools solve "
+"better. For example, because Subversion replicates data to all the "
+"collaborators involved, a common misuse is to treat it as a generic "
+"distribution system. People will sometimes use Subversion to distribute
huge "
+"collections of photos, digital music, or software packages. The problem
is "
+"that this sort of data usually isn't changing at all. The collection
itself "
+"grows over time, but the individual files within the collection aren't
being "
+"changed. In this case, using Subversion is <quote>overkill.</quote> "
+"<placeholder type=\"footnote\" id=\"0\"/> There are simpler tools that "
+"efficiently replicate data <emphasis>without</emphasis> the overhead of "
+"tracking changes, such as <command>rsync</command> or <command>unison</"
+"command>."
+msgstr ""
+"假定你能够接受额外的工作流程，你一定要确定不要使用 Subversion 来解决其他工
具能"
+"够完成的很好的工作。例如，因为 Subversion 会复制所有的数据到参与者，一个常
见的"
+"误用是将其作为普通的分布式系统。问题是此类数据通常很少修改，在这种情况
下，使"
+"用 Subversion 有点<quote>过了</quote>。<placeholder type=\"footnote\"
id=\"0"
+"\"/>有一些可以复制数据更简单的工具，<emphasis>没有必要</emphasis>过度的跟
踪变"
+"更，例如 <command>rsync</command> 或 <command>unison</command>。"
+
+#. type: Content of: <book><preface><sect1><sect2><para><footnote><para>
+#: ../../en/book/ch00-preface.xml:810
+msgid "Or as a friend puts it, <quote>swatting a fly with a Buick.</quote>"
+msgstr "或者像一个朋友说的，<quote>用别克拍苍蝇</quote>。"
+
+#. type: Content of: <book><preface><sect1><sect2><title>
+#: ../../en/book/ch00-preface.xml:823
+msgid "Subversion's History"
+msgstr "Subversion 的历史"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:826
+msgid ""
+"<placeholder type=\"indexterm\" id=\"0\"/> In early 2000, CollabNet,
Inc. "
+"(<ulink url=\"http://www.collab.net\"/>) began seeking developers to
write a "
+"replacement for CVS. CollabNet offers a collaboration software suite
called "
+"CollabNet Enterprise Edition (CEE), of which one component is version "
+"control. Although CEE used CVS as its initial version control system,
CVS's "
+"limitations were obvious from the beginning, and CollabNet knew it would "
+"eventually have to find something better. Unfortunately, CVS had become
the "
+"de facto standard in the open source world largely because there "
+"<emphasis>wasn't</emphasis> anything better, at least not under a free "
+"license. So CollabNet determined to write a new version control system
from "
+"scratch, retaining the basic ideas of CVS, but without the bugs and "
+"misfeatures."
+msgstr ""
+"<placeholder type=\"indexterm\" id=\"0\"/>早在 2000 年，CollabNet, Inc. "
+"(<ulink url=\"http://www.collab.net\"/>)就开始寻找 CVS 替代产品的开发人
员。"
+"CollabNet 提供了一个名为 CollabNet 企业版(CEE)的协作软件套件。这个软件套件
的一"
+"个组成部分就是版本控制系统。尽管 CEE 在最初采用了 CVS 作为其版本控制系
统，但"
+"是 CVS 的局限性从一开始就很明显，CollabNet 知道，迟早要找到一个更好的替代
品。"
+"遗憾的是，CVS 已经成为开源世界事实上的标准，很大程度上是因为<emphasis>没有
</"
+"emphasis>更好的替代品，至少是没有可以自由使用的替代品。所以 CollabNet 决定
从头"
+"编写一个新的版本控制系统，这个系统保留 CVS 的基本思想，但是要修正其中错误
和不"
+"合理的特性。"
+
+#. type: Content of:
<book><preface><sect1><sect2><para><indexterm><primary>
+#: ../../en/book/ch00-preface.xml:827
+msgid "Subversion"
+msgstr "Subversion"
+
+#. type: Content of:
<book><preface><sect1><sect2><para><indexterm><secondary>
+#: ../../en/book/ch00-preface.xml:828
+msgid "history of"
+msgstr "历史"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:846
+msgid ""
+"In February 2000, they contacted Karl Fogel, the author of
<citetitle>Open "
+"Source Development with CVS</citetitle> (Coriolis, 1999), and asked if
he'd "
+"like to work on this new project. Coincidentally, at the time Karl was "
+"already discussing a design for a new version control system with his
friend "
+"Jim Blandy. In 1995, the two had started Cyclic Software, a company "
+"providing CVS support contracts, and although they later sold the
business, "
+"they still used CVS every day at their jobs. Their frustration with CVS
had "
+"led Jim to think carefully about better ways to manage versioned data,
and "
+"he'd already come up with not only the name <quote>Subversion,</quote>
but "
+"also the basic design of the Subversion data store. When CollabNet
called, "
+"Karl immediately agreed to work on the project, and Jim got his employer,
Red "
+"Hat Software, to essentially donate him to the project for an indefinite "
+"period of time. CollabNet hired Karl and Ben Collins-Sussman, and
detailed "
+"design work began in May 2000. With the help of some well-placed prods
from "
+"Brian Behlendorf and Jason Robbins of CollabNet, and from Greg Stein (at
the "
+"time an independent developer active in the WebDAV/DeltaV specification "
+"process), Subversion quickly attracted a community of active developers.
It "
+"turned out that many people had encountered the same frustrating
experiences "
+"with CVS and welcomed the chance to finally do something about it."
+msgstr ""
+"2000年2月，他们联系到 <citetitle>Open Source Development with
CVS</citetitle>"
+"(Coriolis, 1999) 的作者 Karl Fogel，并且询问他是否希望为这个新项目工作。巧
合的"
+"是，当时 Karl 正在与朋友 Jim Blandy 讨论设计一个新的版本控制系统。1995年
时，他"
+"们两人曾经开办了一个提供 CVS 支持的公司 Cyclic Software，尽管他们最终卖掉
了公"
+"司，但还是天天使用 CVS 进行日常工作。使用 CVS 时的挫折促使 Jim 认真的思考
如何"
+"管理版本化的数据，并且他当时不仅使用了 <quote>Subversion</quote> 这个名
字，并"
+"且已经完成了 Subversion 版本库的最初设计。所以当 CollabNet 提出邀请的时
候，"
+"Karl 马上同意为这个项目工作，同时 Jim 也找到了他的雇主—Red Hat 软件公司—允
许他"
+"到这个项目工作，并且没有限定最终的期限。CollabNet 雇佣了 Karl 和 Ben
Collins "
+"Sussman，详细设计工作从五月开始，在 CollabNet 中的 Brian Behlendorf 和
Jason "
+"Robbins，以及 Greg Stein(当时是一个独立开发者，活跃在 WebDAV/DeltaV 系统规
范制"
+"订工作中)恰到好处的激励下，Subversion 很快就吸引了许多活跃的开发者，结果是
许多"
+"对 CVS 有过失望经历的人很乐于为这个项目做些事情。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:872
+msgid ""
+"The original design team settled on some simple goals. They didn't want
to "
+"break new ground in version control methodology, they just wanted to fix "
+"CVS. They decided that Subversion would match CVS's features and
preserve "
+"the same development model, but not duplicate CVS's most obvious flaws.
And "
+"although it did not need to be a drop-in replacement for CVS, it should
be "
+"similar enough that any CVS user could make the switch with little
effort."
+msgstr ""
+"最初的设计小组设定了简单的开发目标。他们不想在版本控制方法学中开垦处女
地，他们"
+"只是希望修正 CVS。他们决定 Subversion 应符合 CVS 的特性，并保留相同的开发
模"
+"型，但不再重复 CVS 的一些显著缺陷。尽管 Subversion 并不需要成为 CVS 的完全
替代"
+"品，但它应该与 CVS 保持足够的相似性，以使 CVS 用户可以轻松的转移到
Subversion "
+"上。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:881
+msgid ""
+"After 14 months of coding, Subversion became <quote>self-hosting</quote>
on "
+"August 31, 2001. That is, Subversion developers stopped using CVS to
manage "
+"Subversion's own source code and started using Subversion instead."
+msgstr ""
+"经过14个月的编码，2001年8月31日，Subversion 能够<quote>自己管理自己
</quote>"
+"了，开发者停止使用 CVS 保存 Subversion 的代码，而使用 Subversion 本身。"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:886
+msgid ""
+"While CollabNet started the project, and still funds a large chunk of
the "
+"work (it pays the salaries of a few full-time Subversion developers), "
+"Subversion is run like most open source projects, governed by a loose, "
+"transparent set of rules that encourage meritocracy. CollabNet's
copyright "
+"license is fully compliant with the Debian Free Software Guidelines. In "
+"other words, anyone is free to download, modify, and redistribute
Subversion "
+"as he pleases; no permission from CollabNet or anyone else is required."
+msgstr ""
+"虽然 CollabNet 启动了这个项目，并且一直提供了大量的工作支持(它为一些全职
的 "
+"Subversion 开发者提供薪水)，但 Subversion 像其它许多开源项目一样，被松散
的, 透"
+"明的规则管理着，这样的规则激励着知识界的精英们。CollabNet 的版权许可证完全
符"
+"合 Debian 的自由软件方针。也就是说，任何人都可以根据自己的意愿自由的下载,
修改"
+"和重新发布 Subversion，不需要 CollabNet 或其他人的授权。"
+
+#. type: Content of: <book><preface><sect1><sect2><title>
+#: ../../en/book/ch00-preface.xml:901
+msgid "Subversion's Architecture"
+msgstr "Subversion 的架构"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:903
+msgid ""
+"<xref linkend=\"svn.intro.architecture.dia-1\"/> illustrates a
<quote>mile-"
+"high</quote> view of Subversion's design."
+msgstr ""
+"<xref linkend=\"svn.intro.architecture.dia-1\"/>给出了 Subversion 设计总体
上的"
+"<quote>俯视图</quote>。"
+
+#. type: Content of: <book><preface><sect1><sect2><figure><title>
+#: ../../en/book/ch00-preface.xml:908
+msgid "Subversion's architecture"
+msgstr "Subversion 的架构"
+
+#. type: Content of: <book><preface><sect1><sect2><figure>
+#: ../../en/book/ch00-preface.xml:909
+msgid "<graphic fileref=\"images/ch01dia1.png\"/>"
+msgstr "<graphic fileref=\"images/ch01dia1.png\"/>"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:912
+msgid ""
+"On one end is a Subversion repository that holds all of your versioned
data. "
+"On the other end is your Subversion client program, which manages local "
+"reflections of portions of that versioned data (called <quote>working
copies</"
+"quote>). Between these extremes are multiple routes through various "
+"Repository Access (RA) layers. Some of these routes go across computer "
+"networks and through network servers which then access the repository. "
+"Others bypass the network altogether and access the repository directly."
+msgstr ""
+"图中的一端是保存所有版本数据的 Subversion 版本库，另一端是 Subvesion 的客
户程"
+"序，管理着所有版本数据的本地影射(称为<quote>工作副本</quote>)，在这两极之
间是"
+"各种各样的版本库访问(RA)层，某些使用电脑网络通过网络服务器访问版本库，某些
则绕"
+"过网络服务器直接访问版本库。"
+
+#. type: Content of: <book><preface><sect1><sect2><title>
+#: ../../en/book/ch00-preface.xml:927
+msgid "Subversion's Components"
+msgstr "Subversion 的组件"
+
+#. type: Content of: <book><preface><sect1><sect2><para>
+#: ../../en/book/ch00-preface.xml:929
+msgid ""
+"Subversion, once installed, has a number of different pieces. The
following "
+"is a quick overview of what you get. Don't be alarmed if the brief "
+"descriptions leave you scratching your
head—<emphasis>plenty</emphasis> "
+"more pages in this book are devoted to alleviating that confusion."
+msgstr ""
+"安装好的 Subversion 由几个部分组成，下面将简单的介绍一下这些组件。下文的描
述或"
+"许过于简略，不易理解，但不用担心—本书后面的章节中会用<emphasis>更多的</"
+"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
+msgid "svn"
+msgstr "svn"
+
+#. type: Content of:
<book><preface><sect1><sect2><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:939
+msgid "The command-line client program"
+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
+msgid "svnversion"
+msgstr "svnversion"
+
+#. type: Content of:
<book><preface><sect1><sect2><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:946
+msgid ""
+"A program for reporting the state (in terms of revisions of the items "
+"present) of a working copy"
+msgstr "此工具用来显示工作副本的状态(用术语来说，就是当前项目的修订版本)。"
+
+#. 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
+msgid "svnlook"
+msgstr "svnlook"
+
+#. type: Content of:
<book><preface><sect1><sect2><variablelist><varlistentry><listitem><para>
+#: ../../en/book/ch00-preface.xml:954
+msgid "A tool for directly inspecting a Subversion repository"
+msgstr "直接查看 Subversion 版本库的工具"
+
+#. 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/c
==============================================================================
Diff truncated at 200k characters
More information about the svnbook-dev
mailing list