[svnbook] r5897 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sat Mar 9 04:20:21 CST 2019
Revision: 5897
http://sourceforge.net/p/svnbook/source/5897
Author: wuzhouhui
Date: 2019-03-09 10:20:19 +0000 (Sat, 09 Mar 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-03-03 04:33:46 UTC (rev 5896)
+++ branches/1.8/zh/book/ref-svn.xml 2019-03-09 10:20:19 UTC (rev 5897)
@@ -1450,6 +1450,7 @@
<varlistentry id="svn.ref.svn.sw.show_copies_as_adds">
<term><option>--show-copies-as-adds</option></term>
<listitem>
+ <!--
<para>Enables a special output mode for <command>svn
diff</command> in which the content difference for a
file created via a copy operation appears as it would
@@ -1457,6 +1458,10 @@
as an addition to an empty file) rather than as a delta
against the original file from which the copy was
created.</para>
+ -->
+ <para>告诉 <command>svn diff</command> 在显示通过复制得到的文件
+ 的差异时, 不要显示它们与被复制的源文件之间的差异, 而是把它们当作
+ 全新的文件 (就好像往一个空文件中写了内容后的差异输出).</para>
</listitem>
</varlistentry>
@@ -1463,9 +1468,13 @@
<varlistentry id="svn.ref.svn.sw.show_inherited_props">
<term><option>--show-inherited-props</option></term>
<listitem>
+ <!--
<para>Causes <command>svn propget</command> and <command>
svn proplist</command> to display the versioned properties
inherited by the target file or directory.</para>
+ -->
+ <para>告诉 <command>svn propget</command> 和 <command>svn
+ proplist</command> 显示继承到的版本化属性.</para>
</listitem>
</varlistentry>
@@ -1472,6 +1481,7 @@
<varlistentry id="svn.ref.svn.sw.show_revs">
<term><option>--show-revs</option> <replaceable>ARG</replaceable></term>
<listitem>
+ <!--
<para>Used to make <command>svn mergeinfo</command>
display certain classes of merge tracking
information. <replaceable>ARG</replaceable> may be
@@ -1479,6 +1489,11 @@
or <literal>eligible</literal>, indicating a desire to
see revisions either already merged or eligible for future
merge from the specified source URL, respectively.</para>
+ -->
+ <para>告诉 <command>svn mergeinfo</command> 显示特定各类的合并跟踪
+ 信息. <replaceable>ARG</replaceable> 可以是
+ <literal>merged</literal> 或 <literal>eligible</literal>, 分别表示
+ 已经合并的版本号和未来有资格被合并的版本号.</para>
</listitem>
</varlistentry>
@@ -1485,11 +1500,16 @@
<varlistentry id="svn.ref.svn.sw.show_updates">
<term><option>--show-updates</option> (<option>-u</option>)</term>
<listitem>
+ <!--
<para>Causes the client to display information about
which files in your working copy are out of date.
This doesn't actually update any of your
files—it just shows you which files will be
updated if you then use <command>svn update</command>.</para>
+ -->
+ <para>要求客户端显示关于文件是否过时的信息, 它不会更新工作副本中的
+ 文件—它只是会告诉你在下一次执行 <command>svn update</command>
+ 时, 哪些文件将被更新.</para>
</listitem>
</varlistentry>
@@ -1496,6 +1516,7 @@
<varlistentry id="svn.ref.svn.sw.stop_on_copy">
<term><option>--stop-on-copy</option></term>
<listitem>
+ <!--
<para>Causes a Subversion subcommand that traverses
the history of a versioned resource to stop harvesting
that historical information when a copy—that is, a
@@ -1502,6 +1523,10 @@
location in history where that resource was copied from
another location in the repository—is
encountered.</para>
+ -->
+ <para>该选项将导致 Subversion 子命令在遍历历史时, 如果遇到了复制
+ —即历史中某一位置上的资源是通过复制仓库中其他位置来得到的
+ —则不再往前遍历历史.</para>
</listitem>
</varlistentry>
@@ -1508,9 +1533,14 @@
<varlistentry id="svn.ref.svn.sw.strict">
<term><option>--strict</option></term>
<listitem>
+ <!--
<para>Causes Subversion to use strict semantics, a notion
that is rather vague unless talking about specific
subcommands (namely, <command>svn propget</command>).</para>
+ -->
+ <para>告诉 Subversion 使用更严格的语义, 在谈到
+ <quote>更严格的语义</quote> 时, 必须关联上特定的子命令 (即
+ <command>svn propget</command>) 才能解释清楚.</para>
</listitem>
</varlistentry>
@@ -1517,10 +1547,14 @@
<varlistentry id="svn.ref.svn.sw.strip">
<term><option>--strip</option> <replaceable>NUM</replaceable></term>
<listitem>
+ <!--
<para>Used by <command>svn patch</command> to
ignore <replaceable>NUM</replaceable> leading path
components found on paths specified in the patch input
file.</para>
+ -->
+ <para>用于 <command>svn patch</command> 忽略补丁文件中的前
+ <replaceable>NUM</replaceable> 个路径分量.</para>
</listitem>
</varlistentry>
@@ -1527,8 +1561,11 @@
<varlistentry id="svn.ref.svn.sw.summarize">
<term><option>--summarize</option></term>
<listitem>
+ <!--
<para>Display only high-level summary notifications about
the operation instead of its detailed output.</para>
+ -->
+ <para>告诉子命令只显示总结性的信息.</para>
</listitem>
</varlistentry>
@@ -1535,13 +1572,19 @@
<varlistentry id="svn.ref.svn.sw.targets">
<term><option>--targets</option> <replaceable>FILENAME</replaceable></term>
<listitem>
+ <!--
<para>Tells Subversion to read additional target paths for
the operation from <replaceable>FILENAME</replaceable>.
<replaceable>FILENAME</replaceable> should contain one
path per line, with each path expected to use the same
+ ### TODO
encoding and formatting that it would if you had
specified it directly as an argument on the command
line.</para>
+ -->
+ <para>告诉子命令从文件 <filename>FILENAME</filename> 读取额外的目标
+ 路径参数. <filename>FILENAME</filename> 的每一行都是一个路径, 路径
+ 的编码和格式应该和命令行上的路径参数相同.</para>
</listitem>
</varlistentry>
@@ -1548,7 +1591,8 @@
<varlistentry id="svn.ref.svn.sw.trust_server_cert">
<term><option>--trust-server-cert</option></term>
<listitem>
- <para>When used with <option>--non-interactive</option>,
+ <!--
+ <para>When used with <option>- -non-interactive</option>,
instructs Subversion to accept SSL server certificates
issued by unknown certificate authorities without first
prompting the user. For security's sake, you should use
@@ -1555,10 +1599,18 @@
this option only when the integrity of the remote server
and the network path between it and your client is known
to be trustworthy.</para>
+ -->
+ <para>和选项 <option>--non-interactive</option> 一起使用时, 指示
+ Subversion 接受由未知的证书机构颁发的 SSL 服务器证书, 而不必提
+ 示用户. 为了安全起见, 只有当远程服务器和网络路径的完整性很可靠
+ 时才能使用该选项.</para>
<note>
+ <!--
<para>This option is accepted by
all <command>svn</command> subcommands.</para>
+ -->
+ <para>所有的 <command>svn</command> 子命令都支持该选项.</para>
</note>
</listitem>
</varlistentry>
@@ -1566,8 +1618,11 @@
<varlistentry id="svn.ref.svn.sw.use_merge_history">
<term><option>--use-merge-history</option> (<option>-g</option>)</term>
<listitem>
+ <!--
<para>Uses or displays additional information from merge
history.</para>
+ -->
+ <para>使用或显示来自合并历史的额外信息.</para>
</listitem>
</varlistentry>
@@ -1574,14 +1629,22 @@
<varlistentry id="svn.ref.svn.sw.username">
<term><option>--username</option> <replaceable>NAME</replaceable></term>
<listitem>
+ <!--
<para>Specifies the username to use when authenticating
against a Subversion server. If not provided, or if
incorrect, Subversion will prompt you for this
information as needed.</para>
+ -->
+ <para>指定用于向 Subversion 服务器认证的用户名, 如果没有指定用户名
+ 或者指定的用户名不正确, Subversion 将会再次提示用户输入用户名.
+ </para>
<note>
+ <!--
<para>This option is accepted by
all <command>svn</command> subcommands.</para>
+ -->
+ <para>所有的 <command>svn</command> 子命令都支持该选项.</para>
</note>
</listitem>
</varlistentry>
@@ -1589,11 +1652,15 @@
<varlistentry id="svn.ref.svn.sw.verbose">
<term><option>--verbose</option> (<option>-v</option>)</term>
<listitem>
+ <!--
<para>Requests that the client print out as much
information as it can while running any subcommand.
This may result in Subversion printing out additional
fields, detailed information about every file, or
additional information regarding its actions.</para>
+ -->
+ <para>要求子命令输出更详细的信息, 这可能会导致客户端输出额外的字段,
+ 关于每个文件的详细信息, 或与操作有关的额外信息.</para>
</listitem>
</varlistentry>
@@ -1600,12 +1667,18 @@
<varlistentry id="svn.ref.svn.sw.version">
<term><option>--version</option></term>
<listitem>
+ <!--
<para>Prints the client version info. This information
includes not only the version number of the client, but
also a listing of all repository access modules that the
client can use to access a Subversion repository.
- With <option>--quiet</option> (<option>-q</option>) it
+ With <option>- -quiet</option> (<option>-q</option>) it
prints only the version number in a compact form.</para>
+ -->
+ <para>打印客户端的版本信息. 版本信息不仅包括客户端的版本号 (这里的
+ 版本号指的是软件的版本, 注意不要和 Subversion 的版本号 (revision)
+ 混淆), 还有客户端支持的所有仓库访问模块. 如果加上了选项
+ <option>--quiet</option> (<option>-q</option>), 则只打印版本号.</para>
</listitem>
</varlistentry>
@@ -1612,11 +1685,16 @@
<varlistentry id="svn.ref.svn.sw.with_all_revprops">
<term><option>--with-all-revprops</option></term>
<listitem>
- <para>Used with the <option>--xml</option> option
+ <!--
+ <para>Used with the <option>- -xml</option> option
to <command>svn log</command>, instructs Subversion to
retrieve and display all revision properties—the
standard ones used internally by Subversion as well as any
user-defined ones—in the log output.</para>
+ -->
+ <para>和选项 <option>--xml</option> 一起使用, 指示 Subversion 检索并
+ 输出所有的版本号属性—包括 Subversion 保留给自己内部使用的属性
+ 和用户的自定义属性—到日志中.</para>
</listitem>
</varlistentry>
@@ -1623,11 +1701,16 @@
<varlistentry id="svn.ref.svn.sw.with_no_revprops">
<term><option>--with-no-revprops</option></term>
<listitem>
- <para>Used with the <option>--xml</option> option
+ <!--
+ <para>Used with the <option>- -xml</option> option
to <command>svn log</command>, instructs Subversion to
omit all revision properties—including the standard
log message, author, and revision datestamp—from the
log output.</para>
+ -->
+ <para>和选项 <option>--xml</option> 一起用在命令 <command>svn
+ log</command> 时, 指示 Subversion 在日志输出中忽略所有的版本号
+ 属性—包括标准的日志消息, 作者和版本号时间戳属性.</para>
</listitem>
</varlistentry>
@@ -1634,13 +1717,24 @@
<varlistentry id="svn.ref.svn.sw.with_revprop">
<term><option>--with-revprop</option> <replaceable>ARG</replaceable></term>
<listitem>
+ <!--
<para>When used with any command that writes to the
repository, sets the revision property, using the
<replaceable>NAME=VALUE</replaceable> format,
<replaceable>NAME</replaceable> to
<replaceable>VALUE</replaceable>. When used with
- <command>svn log</command> in <option>--xml</option> mode, this displays the value of
+ <command>svn log</command> in <option>- -xml</option> mode, this displays the value of
<replaceable>ARG</replaceable> in the log output.</para>
+ -->
+ <para>如何该选项和其他需要向仓库写数据的命令一起使用时, 它可用于设置
+ 版本号属性, 格式是
+ <userinput><replaceable>NAME</replaceable>=<replaceable>VALUE</replaceable></userinput>,
+ 意思是把属性 <replaceable>NAME</replaceable> 的值设置成
+ <replaceable>VALUE</replaceable>; 如果该选项和
+ <option>--xml</option> 一起用在命令 <command>svn log</command> 里,
+ 那么 <replaceable>ARG</replaceable> 的值将会显示在日志输出中.
+ </para>
+
</listitem>
</varlistentry>
@@ -1647,10 +1741,15 @@
<varlistentry id="svn.ref.svn.sw.xml">
<term><option>--xml</option></term>
<listitem>
+ <!--
<para>Prints output in XML format. XML schemas for the
output (in RELAX NG format) are maintained in
the <filename>subversion/svn/schema/</filename>
directory of the Subversion source tree.</para>
+ -->
+ <para>按照 XML 格式打印输出. 输出所使用的 XML 模式 (使用 RELAX NG
+ 格式) 的相关文件位于 Subversion 源代码树的
+ <filename>subversion/svn/schema/</filename> 目录内.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list