[svnbook] r5917 committed - branches/1.8/zh/book/ref-svn.xml
wuzhouhui at users.sourceforge.net
wuzhouhui at users.sourceforge.net
Sat May 11 08:04:15 CDT 2019
Revision: 5917
http://sourceforge.net/p/svnbook/source/5917
Author: wuzhouhui
Date: 2019-05-11 13:04:12 +0000 (Sat, 11 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-04 03:44:58 UTC (rev 5916)
+++ branches/1.8/zh/book/ref-svn.xml 2019-05-11 13:04:12 UTC (rev 5917)
@@ -8258,8 +8258,11 @@
</variablelist>
+ <!--
<para>The second column tells the status of a file's or
directory's properties:</para>
+ -->
+ <para>第二列指出文件或目录的属性的状态:</para>
<variablelist>
@@ -8266,7 +8269,10 @@
<varlistentry>
<term><literal>' '</literal></term>
<listitem>
+ <!--
<para>No modifications.</para>
+ -->
+ <para>没有变化.</para>
</listitem>
</varlistentry>
@@ -8273,8 +8279,11 @@
<varlistentry>
<term><literal>'M'</literal></term>
<listitem>
+ <!--
<para>Properties for this item have been
modified.</para>
+ -->
+ <para>属性被修改了.</para>
</listitem>
</varlistentry>
@@ -8281,17 +8290,24 @@
<varlistentry>
<term><literal>'C'</literal></term>
<listitem>
+ <!--
<para>Properties for this item are in conflict with
property updates received from the
repository.</para>
+ -->
+ <para>属性的修改含有冲突.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>The third column is populated only if the
working copy directory is locked (see
<xref linkend="svn.tour.cleanup"/>):</para>
+ -->
+ <para>第三列指出工作副本目录是否被锁定了 (见
+ <xref linkend="svn.tour.cleanup"/>):</para>
<variablelist>
@@ -8298,7 +8314,10 @@
<varlistentry>
<term><literal>' '</literal></term>
<listitem>
+ <!--
<para>Item is not locked.</para>
+ -->
+ <para>项目未被锁定.</para>
</listitem>
</varlistentry>
@@ -8305,14 +8324,20 @@
<varlistentry>
<term><literal>'L'</literal></term>
<listitem>
+ <!--
<para>Item is locked.</para>
+ -->
+ <para>项目已被锁定.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>The fourth column is populated only if the item is
scheduled for addition-with-history:</para>
+ -->
+ <para>第四列指出被添加的项目是否含有历史:</para>
<variablelist>
@@ -8319,7 +8344,10 @@
<varlistentry>
<term><literal>' '</literal></term>
<listitem>
+ <!--
<para>No history scheduled with commit.</para>
+ -->
+ <para>被添加的项目不含有历史.</para>
</listitem>
</varlistentry>
@@ -8326,15 +8354,22 @@
<varlistentry>
<term><literal>'+'</literal></term>
<listitem>
+ <!--
<para>History scheduled with commit.</para>
+ -->
+ <para>被添加的项目含有历史.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>The fifth column is populated only if the item is
switched relative to its parent (see <xref
linkend="svn.branchmerge.switchwc"/>):</para>
+ -->
+ <para>第五列指出项目是否相对于父目录进行了切换 (见 <xref
+ linkend="svn.branchmerge.switchwc"/>):</para>
<variablelist>
@@ -8341,7 +8376,10 @@
<varlistentry>
<term><literal>' '</literal></term>
<listitem>
+ <!--
<para>Item is a child of its parent directory.</para>
+ -->
+ <para>项目是父目录的子文件.</para>
</listitem>
</varlistentry>
@@ -8348,13 +8386,19 @@
<varlistentry>
<term><literal>'S'</literal></term>
<listitem>
+ <!--
<para>Item is switched.</para>
+ -->
+ <para>项目被切换过了.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>The sixth column is populated with lock information:</para>
+ -->
+ <para>第六列指出了关于锁的信息:</para>
<variablelist>
@@ -8361,12 +8405,18 @@
<varlistentry>
<term><literal>' '</literal></term>
<listitem>
- <para>When <option>--show-updates</option>
+ <!--
+ <para>When <option>- -show-updates</option>
(<option>-u</option>) is used, this means the file is not
- locked. If <option>--show-updates</option>
+ locked. If <option>- -show-updates</option>
(<option>-u</option>) is <emphasis>not</emphasis>
used, this merely means that the file is not locked
in this working copy.</para>
+ -->
+ <para>如果指定了选项 <option>--show-updates</option>
+ (<option>-u</option>), 则说明文件未被锁定. 如果没有指定选项
+ <option>--show-updates</option> (<option>-u</option>), 则说明
+ 文件在工作副本中未被锁定.</para>
</listitem>
</varlistentry>
@@ -8373,7 +8423,10 @@
<varlistentry>
<term><literal>'K'</literal></term>
<listitem>
+ <!--
<para>File is locked in this working copy.</para>
+ -->
+ <para>文件在工作副本中被锁定.</para>
</listitem>
</varlistentry>
@@ -8380,10 +8433,15 @@
<varlistentry>
<term><literal>'O'</literal></term>
<listitem>
+ <!--
<para>File is locked either by another user or in
another working copy. This appears only when
- <option>--show-updates</option>
+ <option>- -show-updates</option>
(<option>-u</option>) is used.</para>
+ -->
+ <para>文件被另一个用户或者在另一个工作副本中被锁定, 仅当指定选项
+ <option>--show-updates</option> (<option>-u</option>) 时才会出
+ 现该状态.</para>
</listitem>
</varlistentry>
@@ -8390,11 +8448,17 @@
<varlistentry>
<term><literal>'T'</literal></term>
<listitem>
+ <!--
<para>File was locked in this working copy, but the
lock has been <quote>stolen</quote> and is invalid.
The file is currently locked in the repository. This
- appears only when <option>--show-updates</option>
+ appears only when <option>- -show-updates</option>
(<option>-u</option>) is used.</para>
+ -->
+ <para>文件在工作副本中被锁定, 但是锁已经被 <quote>窃取</quote>, 并
+ 且不再有效. 文件当前在仓库中是处于被锁定的状态. 只有指定选项
+ <option>--show-updates</option> (<option>-u</option>) 时才会显示
+ 该状态.</para>
</listitem>
</varlistentry>
@@ -8401,18 +8465,27 @@
<varlistentry>
<term><literal>'B'</literal></term>
<listitem>
+ <!--
<para>File was locked in this working copy, but the
lock has been <quote>broken</quote> and is invalid.
The file is no longer locked. This appears only
- when <option>--show-updates</option>
+ when <option>- -show-updates</option>
(<option>-u</option>) is used.</para>
+ -->
+ <para>文件在工作副本中被锁定, 但是锁已经被 <quote>破坏</quote> 了,
+ 并且不再有效. 文件当前在仓库中未被锁定. 只有指定选项
+ <option>--show-updates</option> (<option>-u</option>) 时才会显示
+ 该状态.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>The seventh column is populated only if the item is
the victim of a tree conflict:</para>
+ -->
+ <para>第七列指出项目是否是目录冲突的受害者:</para>
<variablelist>
@@ -8419,7 +8492,10 @@
<varlistentry>
<term><literal>' '</literal></term>
<listitem>
+ <!--
<para>Item is not the victim of a tree conflict.</para>
+ -->
+ <para>项目不是目录冲突的受害都.</para>
</listitem>
</varlistentry>
@@ -8426,18 +8502,29 @@
<varlistentry>
<term><literal>'C'</literal></term>
<listitem>
+ <!--
<para>Item is the victim of a tree conflict.</para>
+ -->
+ <para>项目是目录冲突的受害者.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>The eighth column is always blank.</para>
+ -->
+ <para>第八列总是一个空格.</para>
+ <!--
<para>The out-of-date information appears in the ninth
column (only if you pass the
- <option>--show-updates</option> (<option>-u</option>)
+ <option>- -show-updates</option> (<option>-u</option>)
option):</para>
+ -->
+ <para>第九列指出仓库中是否有更新的版本 (只有指定选项
+ <option>--show-updates</option> (<option>-u</option>) 时才会显示该
+ 状态):</para>
<variablelist>
@@ -8444,7 +8531,10 @@
<varlistentry>
<term><literal>' '</literal></term>
<listitem>
+ <!--
<para>The item in your working copy is up to date.</para>
+ -->
+ <para>仓库中没有更新的版本.</para>
</listitem>
</varlistentry>
@@ -8451,32 +8541,52 @@
<varlistentry>
<term><literal>'*'</literal></term>
<listitem>
+ <!--
<para>A newer revision of the item exists on the
server.</para>
+ -->
+ <para>仓库中有更新的版本.</para>
</listitem>
</varlistentry>
</variablelist>
+ <!--
<para>The remaining fields are variable width and delimited
by spaces. The working revision is the next field if
- the <option>--show-updates</option> (<option>-u</option>)
- or <option>--verbose</option> (<option>-v</option>) option
+ the <option>- -show-updates</option> (<option>-u</option>)
+ or <option>- -verbose</option> (<option>-v</option>) option
is passed.</para>
+ -->
+ <para>剩下的字段长度不一, 字段之间用空格分开. 如果指定了选项
+ <option>--show-updates</option> (<option>-u</option>) 或
+ <option>--verbose</option> (<option>-v</option>), 则下一个字段是
+ 工作版本号.</para>
- <para>If the <option>--verbose</option>
+ <!--
+ <para>If the <option>- -verbose</option>
(<option>-v</option>) option is passed, the last committed
revision and last committed author are displayed
next.</para>
+ -->
+ <para>如果指定了选项 <option>--verbose</option> (<option>-v</option>),
+ 则下一个字段是最后一次提交的版本号和作者.</para>
+ <!--
<para>The working copy path is always the final field, so
it can include spaces.</para>
+ -->
+ <para>因为项目的工作副本路径总是最后一个字段, 因此路径内可以包含空格.
+ </para>
</refsect1>
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Options</title>
+ -->
+ <title>选项</title>
<informalexample>
<screen>
@@ -8495,10 +8605,16 @@
<!-- =============================================================== -->
<refsect1>
+ <!--
<title>Examples</title>
+ -->
+ <title>示例</title>
+ <!--
<para>This is the easiest way to find out what changes you
have made to your working copy:</para>
+ -->
+ <para>如果你想检查工作副本包含了哪些修改, 最方便的做法是:</para>
<informalexample>
<screen>
@@ -8508,14 +8624,20 @@
</screen>
</informalexample>
+ <!--
<para>If you want to find out what files in your working
copy are out of date, pass
- the <option>--show-updates</option> (<option>-u</option>)
+ the <option>- -show-updates</option> (<option>-u</option>)
option (this will <emphasis>not</emphasis> make any
changes to your working copy). Here you can see that
<filename>wc/foo.c</filename> has changed in the
repository since we last updated our working
copy:</para>
+ -->
+ <para>如果你想查看工作副本中的哪些文件已经过时了, 就加上选项
+ <option>--show-updates</option> (<option>-u</option>) (这个选项
+ <emphasis>不会</emphasis> 对工作副本作出任何修改). 下面的例子说明
+ 仓库中的 <filename>wc/foo.c</filename> 比工作副本中的更新:</para>
<informalexample>
<screen>
More information about the svnbook-dev
mailing list