[svnbook] r5891 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Tue Feb 26 07:41:38 CST 2019
Revision: 5891
http://sourceforge.net/p/svnbook/source/5891
Author: wuzhouhui
Date: 2019-02-26 13:41:34 +0000 (Tue, 26 Feb 2019)
Log Message:
-----------
1.8/zh: translation of svn reference in progress
Modified Paths:
--------------
branches/1.8/zh/book/ref-svn.xml
Modified: branches/1.8/zh/book/ref-svn.xml
===================================================================
--- branches/1.8/zh/book/ref-svn.xml 2019-02-26 04:35:10 UTC (rev 5890)
+++ branches/1.8/zh/book/ref-svn.xml 2019-02-26 13:41:34 UTC (rev 5891)
@@ -895,6 +895,7 @@
<varlistentry id="svn.ref.svn.sw.native_eol">
<term><option>--native-eol</option> <replaceable>ARG</replaceable></term>
<listitem>
+ <!--
<para>Causes <command>svn export</command> to use a
specific end-of-line sequence as if it was the native
sequence for the client platform.
@@ -901,6 +902,12 @@
<replaceable>ARG</replaceable> may be one
of <literal>CR</literal>, <literal>LF</literal>,
or <literal>CRLF</literal>.</para>
+ -->
+ <para>告诉 <command>svn export</command> 使用指定的行结束标记作为
+ 系统的本地标记, 这将会影响那些 <literal>svn:eol-style</literal>
+ 属性值为 <literal>native</literal> 的文件.
+ <replaceable>ARG</replaceable> 的有效值包括 <literal>CR</literal>,
+ <literal>LF</literal> 和 <literal>CRLF</literal>.</para>
</listitem>
</varlistentry>
@@ -907,8 +914,12 @@
<varlistentry id="svn.ref.svn.sw.new">
<term><option>--new</option> <replaceable>ARG</replaceable></term>
<listitem>
+ <!--
<para>Uses <replaceable>ARG</replaceable> as the newer
target (for use with <command>svn diff</command>).</para>
+ -->
+ <para>使用 <replaceable>ARG</replaceable> 作为较新的目标 (与
+ <command>svn diff</command> 配合使用).</para>
</listitem>
</varlistentry>
@@ -915,13 +926,20 @@
<varlistentry id="svn.ref.svn.sw.no_auth_cache">
<term><option>--no-auth-cache</option></term>
<listitem>
+ <!--
<para>Prevents caching of authentication information
(e.g., username and password) in the Subversion runtime
configuration directories.</para>
+ -->
+ <para>禁止在 Subversion 运行时配置目录里缓存认证信息 (例如用户名
+ 和密码).</para>
<note>
+ <!--
<para>This option is accepted by
all <command>svn</command> subcommands.</para>
+ -->
+ <para>所有的 <command>svn</command> 子命令都支持该选项.</para>
</note>
</listitem>
</varlistentry>
@@ -929,9 +947,13 @@
<varlistentry id="svn.ref.svn.sw.no_auto_props">
<term><option>--no-auto-props</option></term>
<listitem>
+ <!--
<para>Disables automatic property setting, overriding the
<literal>enable-auto-props</literal> runtime
configuration directive.</para>
+ -->
+ <para>禁止自动属性设置, 该选项会覆盖运行时配置选项
+ <literal>enable-auto-props</literal>.</para>
</listitem>
</varlistentry>
@@ -938,10 +960,14 @@
<varlistentry id="svn.ref.svn.sw.no_diff_added">
<term><option>--no-diff-added</option></term>
<listitem>
+ <!--
<para>Prevents Subversion from printing differences for
added files. The default behavior when you add a file is to print
the same differences that you would see if you had added the entire
contents of an existing (empty) file.</para>
+ -->
+ <para>禁止为新增的文件输出差异. 默认情况下, 新文件的差异输出就像是
+ 往一个已有的空文件内写入了全部内容后的差异输出效果.</para>
</listitem>
</varlistentry>
@@ -948,11 +974,16 @@
<varlistentry id="svn.ref.svn.sw.no_diff_deleted">
<term><option>--no-diff-deleted</option></term>
<listitem>
+ <!--
<para>Prevents Subversion from printing differences for
deleted files. The default behavior when you remove a
file is for <command>svn diff</command> to print the
same differences that you would see if you had kept
the file but removed all of its content.</para>
+ -->
+ <para>禁止为删除了的文件输出差异. 默认情况下, 删除了的文件的差异
+ 输出就像是删除了文件的所有内容 (但不删除文件) 后的差异输出效果.
+ </para>
</listitem>
</varlistentry>
@@ -959,6 +990,7 @@
<varlistentry id="svn.ref.svn.sw.no_ignore">
<term><option>--no-ignore</option></term>
<listitem>
+ <!--
<para>Shows files in the status listing or adds/imports files
that would normally be omitted since they match a pattern
in the <literal>global-ignores</literal> configuration
@@ -967,6 +999,13 @@
linkend="svn.advanced.confarea.opts.config"/> and <xref
linkend="svn.advanced.props.special.ignore"/> for more
information.</para>
+ -->
+ <para>在显示工作副本状态, 添加文件或导入文件时不要忽略任何文件
+ (即使文件名与运行时配置选项 <literal>global-ignores</literal>,
+ 属性 <literal>svn:ignore</literal> 或属性
+ <literal>svn:global-ignores</literal> 里的模式相匹配), 更多的
+ 信息见 <xref linkend="svn.advanced.confarea.opts.config"/> 和
+ <xref linkend="svn.advanced.props.special.ignore"/>.</para>
</listitem>
</varlistentry>
@@ -973,11 +1012,16 @@
<varlistentry id="svn.ref.svn.sw.no_unlock">
<term><option>--no-unlock</option></term>
<listitem>
+ <!--
<para>Tells Subversion not to automatically unlock files.
(The default commit behavior is to unlock all files
listed as part of the commit.) See
<xref linkend="svn.advanced.locking"/> for more
information.</para>
+ -->
+ <para>告诉 Subversion 不要自动释放锁. (默认的提交行为会释放所有已
+ 提交的文件上的锁.) 更多的信息见 <xref
+ linkend="svn.advanced.locking"/>.</para>
</listitem>
</varlistentry>
@@ -984,6 +1028,7 @@
<varlistentry id="svn.ref.svn.sw.non_interactive">
<term><option>--non-interactive</option></term>
<listitem>
+ <!--
<para>Disables all interactive prompting. Some examples
of interactive prompting include requests for
authentication credentials and conflict resolution
@@ -991,16 +1036,29 @@
inside an automated script and it's more appropriate to
have Subversion fail than to prompt for more
information.</para>
+ -->
+ <para>禁止所有的交互式提示. 交互式提示的例子包括向用户请求认证证书
+ 和冲突解决. 如果你是在一个自动化的脚本中运行 Subversion, 那么比
+ 起向用户发出交互式请求, 更方便的做法是报错退出.</para>
+ <!--
<para>Beginning with Subversion 1.8, the <command>svn</command>
command-line client, by default, is non-interactive when standard
input is not a terminal device. Pass the
- <option>--force-interactive</option> option to make the client run
+ <option>- -force-interactive</option> option to make the client run
in interactive mode.</para>
+ -->
+ <para>从 Subversion 1.8 开始, 如果标准输入不是一个终端设备, 那么
+ <command>svn</command> 默认以非交互式模式运行. 为了强制
+ <command>svn</command> 以交互式模式运行, 可使用选项
+ <option>--force-interactive</option>.</para>
<note>
+ <!--
<para>This option is accepted by
all <command>svn</command> subcommands.</para>
+ -->
+ <para>所有的 <command>svn</command> 子命令都支持该选项.</para>
</note>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list