[svnbook] r5912 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sat Apr 20 05:22:18 CDT 2019
Revision: 5912
http://sourceforge.net/p/svnbook/source/5912
Author: wuzhouhui
Date: 2019-04-20 10:22:13 +0000 (Sat, 20 Apr 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-04-14 11:41:45 UTC (rev 5911)
+++ branches/1.8/zh/book/ref-svn.xml 2019-04-20 10:22:13 UTC (rev 5912)
@@ -6304,11 +6304,16 @@
了冲突, 并被写到一个扩展名为 <filename>.svnpatch.rej</filename> 的
文件中.</para>
+ <!--
<para><command>svn patch</command> reports a status line for
patched file or directory using letter codes, very similar
to the way that <command>svn update</command> provides
notification. The letter codes have the following
meanings:</para>
+ -->
+ <para><command>svn patch</command> 为每一个打了补丁的文件或目录打印一
+ 行状态, 状态用一个字母表示, 和 <command>svn update</command> 非常类似.
+ 用来表示状态的字母有:</para>
<variablelist>
@@ -6315,7 +6320,10 @@
<varlistentry>
<term><literal>A</literal></term>
<listitem>
+ <!--
<para>Added</para>
+ -->
+ <para>新增 (Added)</para>
</listitem>
</varlistentry>
@@ -6322,7 +6330,10 @@
<varlistentry>
<term><literal>D</literal></term>
<listitem>
+ <!--
<para>Deleted</para>
+ -->
+ <para>删除 (Deleted)</para>
</listitem>
</varlistentry>
@@ -6329,7 +6340,10 @@
<varlistentry>
<term><literal>C</literal></term>
<listitem>
+ <!--
<para>Conflicted</para>
+ -->
+ <para>冲突 (Conflicted)</para>
</listitem>
</varlistentry>
@@ -6336,7 +6350,10 @@
<varlistentry>
<term><literal>G</literal></term>
<listitem>
+ <!--
<para>Merged</para>
+ -->
+ <para>合并 (Merged)</para>
</listitem>
</varlistentry>
@@ -6343,16 +6360,25 @@
<varlistentry>
<term><literal>U</literal></term>
<listitem>
+ <!--
<para>Updated</para>
+ -->
+ <para>更新 (Updated)</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>Changes applied with an offset or fuzz are reported on
lines starting with the '<literal>></literal>'
symbol. You should review such changes carefully.</para>
+ -->
+ <para>如果修改是在调整了偏移后应用的, 或者是被模糊应用的, 那么 Subversion
+ 将报告这一情况, 相关的信息在输出时以字母 <literal>></literal> 开始,
+ 用户应该认真审核这些修改.</para>
+ <!--
<para>If the patch removes all content from a file, that
file is automatically scheduled for deletion. Likewise,
if the patch creates a new file, that file is
@@ -6359,12 +6385,19 @@
automatically scheduled for addition. Use <command>svn
revert</command> to undo undesired deletions and
additions.</para>
+ -->
+ <para>如果补丁把文件的所有内容都删除了, 该文件将被自动删除. 类似的,
+ 如果补丁创建了新文件, 那么该文件将被自动添加. 命令 <command>svn
+ revert</command> 可以撤消所有不需要的删除或添加.</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -6379,8 +6412,12 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Apply a simple patch file generated by
the <command>svn diff</command> command. Our patch file
will create a new file, delete another file, and modify a
@@ -6387,6 +6424,10 @@
third's contents and properties. Here's the patch file
itself (which we'll assume is creatively named
<filename>PATCH</filename>):</para>
+ -->
+ <para>应用一个由 <command>svn diff</command> 生成的补丁, 该补丁删除了
+ 一个文件, 创建了另一个新文件, 并修改了第三个文件的内容和属性. 下面是
+ 补丁的内容 (假设该补丁的文件名就是 <filename>PATCH</filename>):</para>
<informalexample>
<programlisting>
@@ -6423,10 +6464,15 @@
</programlisting>
</informalexample>
+ <!--
<para>We can apply the previous patch file to another
working copy from our repository using <command>svn
patch</command>, and verify that it did the right thing by
using <command>svn diff</command>:</para>
+ -->
+ <para>下面我们将在工作副本中应用该补丁, 然后再用 <command>svn
+ diff</command> 检查 <command>svn patch</command> 的执行结果是否正确:
+ </para>
<informalexample>
<screen>
@@ -6470,14 +6516,20 @@
</screen>
</informalexample>
+ <!--
<para>Sometimes you might need Subversion to interpret a
patch <quote>in reverse</quote>—where added things
get treated as removed things, and vice-versa. Use
- the <option>--reverse-diff</option> option for this
+ the <option>- -reverse-diff</option> option for this
purpose. In the following example, we'll squirrel away
a patch file which describes the changes in our working
copy, and then use a reverse patch operation to undo those
changes.</para>
+ -->
+ <para>有时候, 用户可能想 <quote>逆向</quote> 应用补丁— 删除新增的
+ 行, 添加被删除的行. 选项 <option>--reverse-diff</option> 就是用来完成
+ 这一操作. 在下面的例子中, 我们先把工作副本的修改存放到一个补丁文件中,
+ 然后再通过逆向应用补丁来撤消工作副本的修改.</para>
<informalexample>
<screen>
@@ -6521,7 +6573,10 @@
<refnamediv>
<refname>svn propdel (pdel, pd)</refname>
+ <!--
<refpurpose>Remove a property from an item.</refpurpose>
+ -->
+ <refpurpose>删除一个属性.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -6531,8 +6586,12 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>This removes properties from files, directories, or
revisions. The first form removes versioned properties in
your working copy, and the second removes unversioned
@@ -6539,11 +6598,19 @@
remote properties on a repository revision
(<replaceable>TARGET</replaceable> determines only which
repository to access).</para>
+ -->
+ <para>该命令将从文件, 目录或版本号上删除一个属性. 命令的第一种形式在
+ 工作副本中删除一个版本化的属性; 第二种形式在仓库的版本号上删除一个
+ 非版本化的属性 (可选参数 <replaceable>TARGET</replaceable> 指定仓库
+ 的 URL).</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -6559,10 +6626,16 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Delete a property from a file in your working
copy:</para>
+ -->
+ <para>删除文件上的一个属性, 该文件是在工作副本中.</para>
<informalexample>
<screen>
@@ -6571,7 +6644,10 @@
</screen>
</informalexample>
+ <!--
<para>Delete a revision property:</para>
+ -->
+ <para>删除一个版本号上的属性:</para>
<informalexample>
<screen>
@@ -6596,9 +6672,13 @@
<refnamediv>
<refname>svn propedit (pedit, pe)</refname>
+ <!--
<refpurpose>Edit the property of one or more items under
version control. See <xref
linkend="svn.ref.svn.c.propset"/> later in this chapter.</refpurpose>
+ -->
+ <refpurpose>编辑一个或多个项目的版本化属性, 参考后面的 <xref
+ linkend="svn.ref.svn.c.propset"/>.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -6608,8 +6688,12 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>Edit one or more properties using your favorite
editor. The first form edits versioned properties in
your working copy, and the second edits unversioned
@@ -6616,11 +6700,18 @@
remote properties on a repository revision
(<replaceable>TARGET</replaceable> determines only which
repository to access).</para>
+ -->
+ <para>在编辑器中编辑一个或多个项目属性. 命令的第一种形式在工作副本中编辑
+ 版本化的属性; 第二种形式在仓库的版本号上编辑非版本化的属性 (可选参数
+ <replaceable>TARGET</replaceable> 指定仓库的 URL).</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -6639,10 +6730,17 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para><command>svn propedit</command> makes it easy to
modify properties that have multiple values:</para>
+ -->
+ <para><command>svn propedit</command> 非常适合编辑属性值比较复杂的属性.
+ </para>
<informalexample>
<screen>
@@ -6676,7 +6774,10 @@
<refnamediv>
<refname>svn propget (pget, pg)</refname>
+ <!--
<refpurpose>Print the value of a property.</refpurpose>
+ -->
+ <refpurpose>打印属性的值.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -6686,7 +6787,10 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
<para>Print the value of a property on files,
directories, or revisions. The first form prints the
More information about the svnbook-dev
mailing list