[svnbook] r5363 committed - branches/1.8/zh/book/ch03-advanced-topics.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Thu Jul 20 08:23:45 CDT 2017
Revision: 5363
http://sourceforge.net/p/svnbook/source/5363
Author: wuzhouhui
Date: 2017-07-20 13:23:45 +0000 (Thu, 20 Jul 2017)
Log Message:
-----------
Branch 1.8/zh: translation of chapter 3 in progress
Modified Paths:
--------------
branches/1.8/zh/book/ch03-advanced-topics.xml
Modified: branches/1.8/zh/book/ch03-advanced-topics.xml
===================================================================
--- branches/1.8/zh/book/ch03-advanced-topics.xml 2017-07-18 13:53:26 UTC (rev 5362)
+++ branches/1.8/zh/book/ch03-advanced-topics.xml 2017-07-20 13:23:45 UTC (rev 5363)
@@ -2874,6 +2874,7 @@
<varlistentry>
<term><literal>svn:mime-type</literal></term>
<listitem>
+ <!--
<para>If present on a file, the value indicates the file's
MIME type. This allows the client to decide whether
line-based contextual merging is safe to perform during
@@ -2881,6 +2882,12 @@
fetched via a web browser. See
<xref linkend="svn.advanced.props.special.mime-type"
/>.</para>
+ -->
+ <para>如果属性出现在一个文件上, 那么属性值指出了文件的 MIME 类型,
+ 当更新时, 属性可以帮助客户端判断是否可以安全地对文件进行基于行
+ 的合并操作. 另外, 当用户通过网页浏览器获取文件时, 该属性还会影
+ 文件的具体行为. 更多的信息参考
+ <xref linkend="svn.advanced.props.special.mime-type"/>.</para>
</listitem>
</varlistentry>
@@ -2887,6 +2894,7 @@
<varlistentry>
<term><literal>svn:ignore</literal></term>
<listitem>
+ <!--
<para>If present on a directory, the value is a list of
<emphasis>unversioned</emphasis> file patterns to be
ignored by <command>svn status</command> and other
@@ -2893,6 +2901,11 @@
subcommands. See
<xref linkend="svn.advanced.props.special.ignore"
/>.</para>
+ -->
+ <para>如果该属性出现在一个目录上, 属性值是一个未被版本化的文件
+ 模式列表, 条例模式的文件会被 <command>svn status</command> 和
+ 其他子命令忽略, 见
+ <xref linkend="svn.advanced.props.special.ignore"/>.</para>
</listitem>
</varlistentry>
@@ -2899,6 +2912,7 @@
<varlistentry>
<term><literal>svn:global-ignores</literal></term>
<listitem>
+ <!--
<para>If present on a directory, the value is a list of
<emphasis>unversioned</emphasis> file patterns to be
ignored by <command>svn status</command> and other
@@ -2908,6 +2922,14 @@
immediate file children. See
<xref linkend="svn.advanced.props.special.ignore"
/>.</para>
+ -->
+ <para>如果该属性出现在一个目录上, 属性值是一个未被版本化的文件
+ 模式列表, 符合模式的文件会被 <command>svn status</command> 和
+ 其他子命令忽略, 但是和 <literal>svn:ignore</literal> 不同的是,
+ 这些模式会应用到目录内 <emphasis>所有的</emphasis> 子目录及其
+ 子文件, 而不仅仅是目录的直接子文件, 见
+ <xref linkend="svn.advanced.props.special.ignore"
+ />.</para>
</listitem>
</varlistentry>
@@ -2914,10 +2936,15 @@
<varlistentry>
<term><literal>svn:keywords</literal></term>
<listitem>
+ <!--
<para>If present on a file, the value tells the client how
to expand particular keywords within the file. See
<xref linkend="svn.advanced.props.special.keywords"
/>.</para>
+ -->
+ <para>如果该属性出现在一个文件上, 属性的值指出了客户端应该如何
+ 扩展文件内的特定关键词, 见
+ <xref linkend="svn.advanced.props.special.keywords" />.</para>
</listitem>
</varlistentry>
@@ -2924,11 +2951,17 @@
<varlistentry>
<term><literal>svn:eol-style</literal></term>
<listitem>
+ <!--
<para>If present on a file, the value tells the client how
to manipulate the file's line-endings in the working
copy and in exported trees. See
<xref linkend="svn.advanced.props.special.eol-style" />
and <xref linkend="svn.ref.svn.c.export" />.</para>
+ -->
+ <para>如果该属性出现在一个文件上, 则属性的值指出了客户端应该如何
+ 处理工作副本和导出目录里的文件的行终止符, 见
+ <xref linkend="svn.advanced.props.special.eol-style" />
+ 和 <xref linkend="svn.ref.svn.c.export" />.</para>
</listitem>
</varlistentry>
@@ -2935,10 +2968,15 @@
<varlistentry>
<term><literal>svn:externals</literal></term>
<listitem>
+ <!--
<para>If present on a directory, the value is a multiline
list of other paths and URLs the client should check
out. See <xref linkend="svn.advanced.externals"
/>.</para>
+ -->
+ <para>如果该属性出现在一个目录上, 则属性的值是一个包含了多个路径
+ 和 URL 的列表, 这些路径和 URL 都是客户端需要检出的内容, 见
+ <xref linkend="svn.advanced.externals"/>.</para>
</listitem>
</varlistentry>
@@ -2945,6 +2983,7 @@
<varlistentry>
<term><literal>svn:special</literal></term>
<listitem>
+ <!--
<para>If present on a file, indicates that the file is not
an ordinary file, but a symbolic link or other special
object.<footnote><para>As of this writing, symbolic
@@ -2951,6 +2990,11 @@
links are indeed the only <quote>special</quote>
objects. But there might be more in future releases of
Subversion.</para></footnote></para>
+ -->
+ <para>如果该属性出现在一个文件上, 则表示该文件不是一个普通的文件,
+ 可能是一个符号链接或其他特殊的对象<footnote><para>在写到这里时,
+ 符号链接是已知的唯一一个 <quote>特殊</quote> 对象, 在以后
+ 的版本里可能会出现更多种类的特殊对象.</para></footnote></para>
</listitem>
</varlistentry>
@@ -2957,11 +3001,17 @@
<varlistentry>
<term><literal>svn:needs-lock</literal></term>
<listitem>
+ <!--
<para>If present on a file, tells the client to make the
file read-only in the working copy, as a reminder that
the file should be locked before editing begins. See
<xref linkend="svn.advanced.locking.lock-communication"
/>.</para>
+ -->
+ <para>如果该属性出现在一个文件上, 客户端就会把工作副本里的这个
+ 文件设置成只读, 也就是提醒用户在编辑文件之前需要加锁, 见
+ <xref linkend="svn.advanced.locking.lock-communication"
+ />.</para>
</listitem>
</varlistentry>
@@ -2968,11 +3018,17 @@
<varlistentry>
<term><literal>svn:mergeinfo</literal></term>
<listitem>
+ <!--
<para>Used by Subversion to track merge data. See
<xref linkend="svn.branchmerge.basicmerging.mergeinfo"
/> for details, but you should never edit this property
unless you <emphasis>really</emphasis> know what you're
doing.</para>
+ -->
+ <para>Subversion 使用该属性跟踪合并信息, 更多的细节见
+ <xref linkend="svn.branchmerge.basicmerging.mergeinfo"/>,
+ 除非你 <emphasis>真得</emphasis> 知道自己在做什么, 否则不要
+ 编辑该属性.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list