[svnbook] r5916 committed - branches/1.8/zh/book/ref-svn.xml

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Fri May 3 22:45:01 CDT 2019


Revision: 5916
          http://sourceforge.net/p/svnbook/source/5916
Author:   wuzhouhui
Date:     2019-05-04 03:44:58 +0000 (Sat, 04 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-02 04:00:35 UTC (rev 5915)
+++ branches/1.8/zh/book/ref-svn.xml	2019-05-04 03:44:58 UTC (rev 5916)
@@ -7923,7 +7923,10 @@
 
     <refnamediv>
       <refname>svn revert</refname>
+      <!--
       <refpurpose>Undo all local edits.</refpurpose>
+      -->
+      <refpurpose>撤消所有的本地修改.</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
@@ -7932,8 +7935,12 @@
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Description</title>
+      -->
+      <title>描述</title>
 
+      <!--
       <para>Reverts any local changes to a file or directory and
         resolves any conflicted states.  <command>svn
         revert</command> will revert not only the contents of an
@@ -7942,11 +7949,19 @@
         operations that you may have performed (e.g., files scheduled
         for addition or deletion can be
         <quote>unscheduled</quote>).</para>
+      -->
+      <para>撤消文件或目录上的本地修改, 并解决可能存在的冲突状态. <command>svn
+          revert</command> 不仅撤消内容上的修改, 还会撤消属性上的修改. 最后,
+        <command>svn revert</command> 还能撤消被添加, 删除或移动 (但还未提交)
+        的项目.</para>
     </refsect1>
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Options</title>
+      -->
+      <title>选项</title>
 
       <informalexample>
         <screen>
@@ -7961,9 +7976,15 @@
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Examples</title>
+      -->
+      <title>示例</title>
 
+      <!--
       <para>Discard changes to a file:</para>
+      -->
+      <para>撤消文件上的所有修改:</para>
 
       <informalexample>
         <screen>
@@ -7972,8 +7993,12 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>If you want to revert a whole directory of files,
-        use the <option>--depth=infinity</option> option:</para>
+        use the <option>- -depth=infinity</option> option:</para>
+      -->
+      <para>如果你希望递归地撤消一个目录内的所有修改, 就加上选项
+        <option>--depth=infinity</option>:</para>
 
       <informalexample>
         <screen>
@@ -7984,8 +8009,11 @@
 </screen>
       </informalexample>
 
+      <!--
       <para>Lastly, you can undo any scheduling
         operations:</para>
+      -->
+      <para>最后, 你还可以撤消已添加的项目:</para>
 
       <informalexample>
         <screen>
@@ -8005,6 +8033,7 @@
       </informalexample>
 
       <warning>
+      <!--
         <para><command>svn revert</command> is inherently
           dangerous, since its entire purpose is to throw away
           data—namely, your uncommitted changes.  Once
@@ -8011,12 +8040,22 @@
           you've reverted, Subversion provides <emphasis>no
           way</emphasis> to get back those uncommitted
           changes.</para>
+      -->
+        <para>使用 <command>svn revert</command> 具有一定的危险性, 因为它会
+          丢弃所有的本地修改, 也就是用户未提交的修改. 这些本地修改一旦被撤消
+          了, Subversion <emphasis>没有任何办法</emphasis> 再把它们恢复回来.
+        </para>
 
+      <!--
         <para>If you provide no targets to <command>svn
           revert</command>, it will do nothing.  To protect you
           from accidentally losing changes in your working
           copy, <command>svn revert</command> requires you to
           explicitly provide at least one target.</para>
+      -->
+        <para>如果用户没有为 <command>svn revert</command> 指定任何目标路径,
+          它将什么也不会做, 这是为了避免用户不小心丢失自己的本地修改, 因此
+          <command>svn revert</command> 要求用户必须显式地指定目标路径.</para>
       </warning>
 
     </refsect1>
@@ -8035,7 +8074,10 @@
 
     <refnamediv>
       <refname>svn status (stat, st)</refname>
+      <!--
       <refpurpose>Print the status of working copy files and directories.</refpurpose>
+      -->
+      <refpurpose>打印工作副本中文件或目录的状态.</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>
@@ -8044,25 +8086,45 @@
 
     <!-- =============================================================== -->
     <refsect1>
+      <!--
       <title>Description</title>
+      -->
+      <title>描述</title>
 
+      <!--
       <para>Print the status of working copy files and
         directories.  With no arguments, it prints only locally
         modified items (no repository access).  With
-        <option>--show-updates</option> (<option>-u</option>), it
+        <option>- -show-updates</option> (<option>-u</option>), it
+                                  ### TODO
         adds working revision and server out-of-date information.
-        With <option>--verbose</option> (<option>-v</option>), it
+        With <option>- -verbose</option> (<option>-v</option>), it
         prints full revision information on every item.
-        With <option>--quiet</option> (<option>-q</option>), it
+        With <option>- -quiet</option> (<option>-q</option>), it
         prints only summary information about locally modified
         items.</para>
+      -->
+      <para>打印工作副本中文件或目录的状态. 如果没有指定任何选项, <command>svn
+          status</command> 将只打印本地已修改的项目 (不会访问仓库). 如果添加了
+        <option>--show-updates</option> (<option>-u</option>), 命令除了会打印
+        工作副本内的版本号外, 还会打印服务器上的信息. 如果添加了选项
+        <option>--verbose</option> (<option>-v</option>), 它将打印每一项的
+        完整的版本号信息. 如果添加了选项 <option>--quiet</option>
+        (<option>-q</option>), 它就只打印与本地已修改项目有关的总结信息.</para>
 
+      <!--
       <para>The first seven columns in the output are each one
         character wide, and each column gives you information
         about a different aspect of each working copy item.</para>
+      -->
+      <para>输出中每一行的前 7 列包含了描述项目状态的字符, 每一列都从不同
+        的角度描述项目的状态.</para>
       
+      <!--
       <para>The first column indicates that an item
         was added, deleted, or otherwise changed:</para>
+      -->
+      <para>第一列指出项目是新增的, 被删除的, 还是已修改的:</para>
 
       <variablelist>
         
@@ -8069,7 +8131,10 @@
         <varlistentry>
           <term><literal>' '</literal></term>
           <listitem>
+      <!--
             <para>No modifications.</para>
+      -->
+            <para>没有任何变化.</para>
           </listitem>
         </varlistentry>
 
@@ -8076,7 +8141,10 @@
         <varlistentry>
           <term><literal>'A'</literal></term>
           <listitem>
+      <!--
             <para>Item is scheduled for addition.</para>
+      -->
+            <para>该项是新增的.</para>
           </listitem>
         </varlistentry>
 
@@ -8083,7 +8151,10 @@
         <varlistentry>
           <term><literal>'D'</literal></term>
           <listitem>
+      <!--
             <para>Item is scheduled for deletion.</para>
+      -->
+            <para>该项已被删除.</para>
           </listitem>
         </varlistentry>
 
@@ -8090,7 +8161,10 @@
         <varlistentry>
           <term><literal>'M'</literal></term>
           <listitem>
+      <!--
             <para>Item has been modified.</para>
+      -->
+            <para>该项已被修改.</para>
           </listitem>
         </varlistentry>
 
@@ -8097,10 +8171,14 @@
         <varlistentry>
           <term><literal>'R'</literal></term>
           <listitem>
+      <!--
             <para>Item has been replaced in your working copy.
             This means the file was scheduled for deletion, and
             then a new file with the same name was scheduled for
             addition in its place.</para>
+      -->
+          <para>该项被工作副本中的其他项目替换了. 这意味着原来的项目已被删除,
+            然后在原来的位置上添加了一个新项目.</para>
           </listitem>
         </varlistentry>
 
@@ -8107,9 +8185,13 @@
         <varlistentry>
           <term><literal>'C'</literal></term>
           <listitem>
+      <!--
             <para>The contents (as opposed to the properties) of
               the item conflict with updates received from the
               repository.</para>  
+      -->
+            <para>项目在工作副本中的内容 (不包含属性) 和从服务器上接收到的
+              更新有冲突.</para>
           </listitem>
         </varlistentry>
 
@@ -8116,7 +8198,10 @@
         <varlistentry>
           <term><literal>'X'</literal></term>
           <listitem>
+      <!--
             <para>Item is present because of an externals definition.</para>
+      -->
+            <para>项目是通过外部定义创建的.</para>
           </listitem>
         </varlistentry>
 
@@ -8123,8 +8208,12 @@
         <varlistentry>
           <term><literal>'I'</literal></term>
           <listitem>
+      <!--
             <para>Item is being ignored (e.g., with the 
               <literal>svn:ignore</literal> property).</para>
+      -->
+            <para>项目是被忽略的 (例如由于属性 <literal>svn:ignore</literal>).
+            </para>
           </listitem>
         </varlistentry>
 
@@ -8131,7 +8220,10 @@
         <varlistentry>
           <term><literal>'?'</literal></term>
           <listitem>
+      <!--
             <para>Item is not under version control.</para>
+      -->
+            <para>项目不被版本控制.</para>
           </listitem>
         </varlistentry>
 
@@ -8138,10 +8230,15 @@
         <varlistentry>
           <term><literal>'!'</literal></term>
           <listitem>
+      <!--
             <para>Item is missing (e.g., you moved or deleted it
               without using <command>svn</command>).  This also
               indicates that a directory is incomplete (a checkout
               or update was interrupted).</para>
+      -->
+            <para>项目失踪了 (例如用户没有使用 <command>svn</command> 提供了
+              命令来移动或删除项目). 这同时也意味着目录是不完整的 (例如检出或
+              更新操作被中断了).</para>
           </listitem>
         </varlistentry>
 
@@ -8148,9 +8245,14 @@
         <varlistentry>
           <term><literal>'~'</literal></term>
           <listitem>
+      <!--
             <para>Item is versioned as one kind of object (file,
               directory, link), but has been replaced by a different
               kind of object.</para>
+      -->
+            <para>项目是作为一种文件类型 (例如普通文件, 目录文件或符号链接)
+              存放到仓库中, 但是现在工作副本中的项目已经被另一种文件类型所
+              取代.</para>
           </listitem>
         </varlistentry>
 




More information about the svnbook-dev mailing list