[svnbook] r5919 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sun May 19 08:25:15 CDT 2019
Revision: 5919
http://sourceforge.net/p/svnbook/source/5919
Author: wuzhouhui
Date: 2019-05-19 13:25:12 +0000 (Sun, 19 May 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-05-12 03:18:29 UTC (rev 5918)
+++ branches/1.8/zh/book/ref-svn.xml 2019-05-19 13:25:12 UTC (rev 5919)
@@ -8952,7 +8952,10 @@
<refnamediv>
<refname>svn unlock</refname>
+ <!--
<refpurpose>Unlock working copy paths or URLs.</refpurpose>
+ -->
+ <refpurpose>解锁工作副本路径或 URL.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -8961,21 +8964,34 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para>Unlock each <replaceable>TARGET</replaceable>. If any
<replaceable>TARGET</replaceable> is locked by
another user or no valid lock token exists in the working
copy, print a warning and continue unlocking the rest of
the <replaceable>TARGET</replaceable>s. Use
- <option>--force</option> to break a lock belonging to
+ <option>- -force</option> to break a lock belonging to
another user or working copy.</para>
+ -->
+ <para>解锁每一个 <replaceable>TARGET</replaceable>. 如果有任意一个
+ <replaceable>TARGET</replaceable> 被其他用户加锁了, 或者在工作副本
+ 中不存在有效的锁令牌, Subversion 就会打印一个警告, 然后继续解锁剩下
+ 的 <replaceable>TARGET</replaceable>. 为了破坏属于其他用户或工作副本
+ 的锁, 可以加上选项 <option>--force</option>.</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -8987,9 +9003,15 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Unlock two files in your working copy:</para>
+ -->
+ <para>解锁工作副本中的两个文件:</para>
<informalexample>
<screen>
@@ -8999,8 +9021,11 @@
</screen>
</informalexample>
+ <!--
<para>Unlock a file in your working copy that is currently
locked by another user:</para>
+ -->
+ <para>解锁工作副本里的一个文件, 但是该文件已经被其他用户加锁了:</para>
<informalexample>
<screen>
@@ -9011,7 +9036,10 @@
</screen>
</informalexample>
+ <!--
<para>Unlock a file without a working copy:</para>
+ -->
+ <para>在没有工作副本的情况下解锁一个文件:</para>
<informalexample>
<screen>
@@ -9020,8 +9048,11 @@
</screen>
</informalexample>
+ <!--
<para>For further details, see <xref
linkend="svn.advanced.locking"/>.</para>
+ -->
+ <para>更多的内容, 见 <xref linkend="svn.advanced.locking"/>.</para>
</refsect1>
</refentry>
@@ -9040,7 +9071,10 @@
<refnamediv>
<refname>svn update (up)</refname>
+ <!--
<refpurpose>Update your working copy.</refpurpose>
+ -->
+ <refpurpose>更新工作副本.</refpurpose>
</refnamediv>
<refsynopsisdiv>
@@ -9049,22 +9083,37 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Description</title>
+ -->
+ <title>描述</title>
+ <!--
<para><command>svn update</command> brings changes from the
repository into your working copy. If no revision is
given, it brings your working copy up to date with the
<literal>HEAD</literal> revision. Otherwise, it
synchronizes the working copy to the revision given by the
- <option>--revision</option> (<option>-r</option>) option.
+ <option>- -revision</option> (<option>-r</option>) option.
As part of the synchronization, <command>svn
update</command> also removes any stale locks (see
<xref linkend="svn.tour.cleanup"/>) found in the working
copy.</para>
+ -->
+ <para><command>svn update</command> 把仓库里的更新应用到工作副本里.
+ 如果没有指定版本号, 则默认是 <literal>HEAD</literal>, 否则的话,
+ <command>svn update</command> 把工作副本更新到由选项
+ <option>--revision</option> (<option>-r</option>) 所指定的版本号.
+ 作为更新操作的一部分, <command>svn update</command> 还会删除工作副本
+ 中已过时的锁 (见 <xref linkend="svn.tour.cleanup"/>).</para>
+ <!--
<para>For each updated item, it prints a line that starts
with a character reporting the action taken. These
characters have the following meaning:</para>
+ -->
+ <para>对每一个被更新的项目, Subversion 都会打印一行信息, 信息的开头是
+ 一个字符, 用于表示对项目所采取的动作, 这些字符有:</para>
<variablelist>
@@ -9071,7 +9120,10 @@
<varlistentry>
<term><literal>A</literal></term>
<listitem>
+ <!--
<para>Added</para>
+ -->
+ <para>新增</para>
</listitem>
</varlistentry>
@@ -9078,7 +9130,10 @@
<varlistentry>
<term><literal>B</literal></term>
<listitem>
+ <!--
<para>Broken lock (third column only)</para>
+ -->
+ <para>被破坏的锁 (只出现在第 3 列)</para>
</listitem>
</varlistentry>
@@ -9085,7 +9140,10 @@
<varlistentry>
<term><literal>D</literal></term>
<listitem>
+ <!--
<para>Deleted</para>
+ -->
+ <para>被删除</para>
</listitem>
</varlistentry>
@@ -9092,7 +9150,10 @@
<varlistentry>
<term><literal>U</literal></term>
<listitem>
+ <!--
<para>Updated</para>
+ -->
+ <para>被更新</para>
</listitem>
</varlistentry>
@@ -9099,7 +9160,10 @@
<varlistentry>
<term><literal>C</literal></term>
<listitem>
+ <!--
<para>Conflicted</para>
+ -->
+ <para>发生冲突</para>
</listitem>
</varlistentry>
@@ -9106,7 +9170,10 @@
<varlistentry>
<term><literal>G</literal></term>
<listitem>
+ <!--
<para>Merged</para>
+ -->
+ <para>被合并</para>
</listitem>
</varlistentry>
@@ -9113,28 +9180,45 @@
<varlistentry>
<term><literal>E</literal></term>
<listitem>
+ <!--
<para>Existed</para>
+ -->
+ <para>已存在</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>A character in the first column signifies an update to
the actual file, whereas updates to the file's properties
are shown in the second column. Lock information is
printed in the third column.</para>
+ -->
+ <para>出现在第一列的状态字符描述的是文件内容的更新, 出现在第二列的
+ 状态字符描述的是文件属性的更新, 出现在第三列的状态字符则描述的是
+ 关于锁的信息.</para>
+ <!--
<para>As with most subcommands, you can limit the scope of
the update operation to a particular tree depth using the
- <option>--depth</option> option. Alternatively, you can
- use the <option>--set-depth</option> option to set a new
+ <option>- -depth</option> option. Alternatively, you can
+ use the <option>- -set-depth</option> option to set a new
<quote>sticky</quote> working copy depth on the update
target.</para>
+ -->
+ <para>和大多数子命令一样, 你可以通过选项 <option>--depth</option>,
+ 把更新操作的作用范围限制在一定的范围内. 同样地, 还可以用选项
+ <option>--set-depth</option> 为目标路径设置新的 <quote>粘着</quote>
+ 深度.</para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -9155,10 +9239,16 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>Pick up repository changes that have happened since
your last update:</para>
+ -->
+ <para>把仓库中最新的内容更新到本地:</para>
<informalexample>
<screen>
@@ -9172,10 +9262,15 @@
</screen>
</informalexample>
+ <!--
<para>You can also <quote>update</quote> your working copy
to an older revision (Subversion doesn't have the concept
of <quote>sticky</quote> files like CVS does; see <xref
linkend="svn.forcvs"/>):</para>
+ -->
+ <para>还可以把工作副本 <quote>更新</quote> 一个更旧的版本 (与 CVS 相比,
+ Subversion 没有 <quote>粘着</quote> 文件的概念, 见 <xref
+ linkend="svn.forcvs"/>):</para>
<informalexample>
<screen>
@@ -9191,10 +9286,14 @@
</informalexample>
<tip>
+ <!--
<para>If you want to examine an older revision of a
single file, you may want to use <command>svn
cat</command> instead—it won't change your working
copy.</para>
+ -->
+ <para>如果你只是想看看某个文件在老版本时的内容, 更方便的做法是使用
+ 命令 <command>svn cat</command>—它不会修改工作副本.</para>
</tip>
<para><command>svn update</command> is also the primary
More information about the svnbook-dev
mailing list