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

wuzhouhui at users.sourceforge.net wuzhouhui at users.sourceforge.net
Sat Feb 23 22:09:30 CST 2019


Revision: 5887
          http://sourceforge.net/p/svnbook/source/5887
Author:   wuzhouhui
Date:     2019-02-24 04:09:28 +0000 (Sun, 24 Feb 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-02-24 02:23:53 UTC (rev 5886)
+++ branches/1.8/zh/book/ref-svn.xml	2019-02-24 04:09:28 UTC (rev 5887)
@@ -553,50 +553,79 @@
       <varlistentry id="svn.ref.svn.sw.extensions">
         <term><option>--extensions</option> (<option>-x</option>) <replaceable>ARG</replaceable></term>
         <listitem>
+      <!--
           <para>Specifies customizations which Subversion should
             make when performing difference calculations.  Valid
             extensions include:</para>
+      -->
+          <para>为 Subversion 的差异比较指定扩展选项, 有效的扩展选项有:</para>
           <variablelist>
             <varlistentry>
               <term><option>--ignore-space-change</option> (<option>-b</option>)</term>
               <listitem>
+      <!--
                 <para>Ignore changes in the amount of white space.</para>
+      -->
+                <para>忽略空白字符在数量方面的变化.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
               <term><option>--ignore-all-space</option> (<option>-w</option>)</term>
               <listitem>
+      <!--
                 <para>Ignore all white space.</para>
+      -->
+                <para>忽略所有的空白字符.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
               <term><option>--ignore-eol-style</option></term>
               <listitem>
+      <!--
                 <para>Ignore changes in EOL (end-of-line) style.</para>
+      -->
+                <para>忽略 EOL (end-of-line, 行结束标记) 的变化.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
               <term><option>--show-c-function</option> (<option>-p</option>)</term>
               <listitem>
+      <!--
                 <para>Show C function names in the diff output.</para>
+      -->
+                <para>在差异比较输出中显示 C 语言的函数名.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
               <term><option>--unified</option> (<option>-u</option>)</term>
               <listitem>
+      <!--
                 <para>Show three lines of unified diff context.</para>
+      -->
+                <para>显示宽度为 3 行的标准差异上下文.</para>
               </listitem>
             </varlistentry>
           </variablelist>
+      <!--
           <para>The default value of <replaceable>ARG</replaceable>
             is <literal>-u</literal>.  If you wish to pass multiple
             arguments, you must enclose all of them in quotes.</para>
+      -->
+          <para><replaceable>ARG</replaceable> 的默认值是
+            <literal>-u</literal>, 如果你希望指定多个扩展选项, 就把它们放在一
+            对双引号中.</para>
+      <!--
           <para>Note that when Subversion is configured to invoke an
             external diff command, the value of
-            the <option>--extension</option> (<option>-x</option>)
+            the <option>- -extensions</option> (<option>-x</option>)
             option isn't restricted to the previously mentioned
             options, but may be <emphasis>any</emphasis> additional
             arguments which Subversion should pass to that command.</para>
+      -->
+          <para>需要注意的是, 如果差异比较引擎是一个外部的差异比较工具, 那么
+            选项 <option>--extensions</option> (<option>-x</option>) 的值
+            不仅限于以上提到的这些, 而是可以设置成 <emphasis>任意</emphasis>
+            值.</para>
         </listitem>
       </varlistentry>
 
@@ -603,6 +632,7 @@
       <varlistentry id="svn.ref.svn.sw.file">
         <term><option>--file</option> (<option>-F</option>) <replaceable>FILENAME</replaceable></term>
         <listitem>
+      <!--
           <para>Uses the contents of the named file for the
             specified subcommand.  Different subcommands do
             different things with this content.  For example,
@@ -609,6 +639,10 @@
             <command>svn commit</command> uses the content as a
             commit log message, whereas <command>svn
             propset</command> uses it as a property value.</para>
+      -->
+        <para>将文件的内容传递给子命令, 不同的子命令将文件内容用于不同的目的,
+          例如 <command>svn commit</command> 把文件内容作为提交日志消息, 而
+          <command>svn propset</command> 把文件内容作为属性值.</para>
         </listitem>
       </varlistentry>
 
@@ -615,6 +649,7 @@
       <varlistentry id="svn.ref.svn.sw.force">
         <term><option>--force</option></term>
         <listitem>
+      <!--
           <para>Forces a particular command or operation to run.
             Subversion will prevent you from performing some
             operations in normal usage, but you can pass this option
@@ -624,6 +659,12 @@
             of doing your own electrical work with the power
             on—if you don't know what you're doing, you're
             likely to get a nasty shock.</para>
+      -->
+          <para>强迫命令或操作往下执行. 在正常使用时, Subversion 会阻止用户
+            执行某些操作, 但是用户可以用这个选项告诉 Subversion: <quote>我
+              知道我正在做什么, 也知道这样做的可能后果, 所以请继续往下执行.
+            </quote> 用这个选项就好像一个电工在未断电的情况下工作—如果
+            你不知道自己正在做什么, 你可能会对命令的执行结果感到震惊.</para>
         </listitem>
       </varlistentry>
       
@@ -630,21 +671,35 @@
       <varlistentry id="svn.ref.svn.sw.force_log">
         <term><option>--force-log</option></term>
         <listitem>
+      <!--
           <para>Forces a suspicious parameter passed to the
-            <option>--message</option> (<option>-m</option>) or
-            <option>--file</option> (<option>-F</option>) option to
+            <option>- -message</option> (<option>-m</option>) or
+            <option>- -file</option> (<option>-F</option>) option to
             be accepted as valid.  By default, Subversion will
             produce an error if parameters to these options look
             like they might instead be targets of the subcommand.
             For example, if you pass a versioned file's path to the
-            <option>--file</option> (<option>-F</option>) option,
+            <option>- -file</option> (<option>-F</option>) option,
             Subversion will assume you've made a mistake, that the
             path was instead intended as the target of the
             operation, and that you simply failed to provide some
             other—unversioned—file as the source of your
             log message.  To assert your intent and override these
-            types of errors, pass the <option>--force-log</option>
+            types of errors, pass the <option>- -force-log</option>
             option to subcommands that accept log messages.</para>
+      -->
+          <para>迫使 Subversion 接受传递给 <option>--message</option>
+            (<option>-m</option>) 或 <option>--file</option>
+            (<option>-F</option>) 的可疑参数, 默认情况下, 如果传递给这两个
+            选项的参数看起来好像是子命令的目标参数, 那么 Subversion 将会报
+            错退出. 比如说用户向选项 <option>--file</option>
+            (<option>-F</option>) 传递了一个处于版本控制下的文件路径,
+            Subversion 将会认为用户犯了一个错误: 这个文件路径应该作为子命令
+            的目标参数, 选项 <option>--file</option> (<option>-F</option>)
+            的参数应该是一个未被版本控制的文件路径. 为了表明自己的意图, 并且
+            防止 Subversion 进行这种检查, 用户就可以用选项
+            <option>--force-log</option> 迫使 Subversion 无条件地接受日志消息.
+          </para>
         </listitem>
       </varlistentry>
 
@@ -651,12 +706,19 @@
       <varlistentry id="svn.ref.svn.sw.force_interactive">
         <term><option>--force-interactive</option></term>
         <listitem>
+      <!--
           <para>Forces the <command>svn</command> command-line client to run in
             interactive mode when standard input is not a terminal device.</para>
+      -->
+          <para>如果标准输入不是一个终端设备, 强制 <command>svn</command> 以
+            交互模式运行.</para>
 
           <note>
+      <!--
             <para>This option is accepted by
               all <command>svn</command> subcommands.</para>
+      -->
+            <para>所有的 <command>svn</command> 子命令都支持该选项.</para>
           </note>
         </listitem>
       </varlistentry>
@@ -664,9 +726,13 @@
       <varlistentry id="svn.ref.svn.sw.git">
         <term><option>--git</option></term>
         <listitem>
+      <!--
           <para>Enables a special output mode for <command>svn
             diff</command> designed for cross-compatibility with the
             popular Git distributed version control system.</para>
+      -->
+          <para>按照分布式版本控制系统 Git 的格式, 输出 <command>svn
+              diff</command> 的标准差异输出.</para>
         </listitem>
       </varlistentry>
 
@@ -673,9 +739,14 @@
       <varlistentry id="svn.ref.svn.sw.help">
         <term><option>--help</option> (<option>-h</option>, <option>-?</option>)</term>
         <listitem>
+      <!--
           <para>If used with one or more subcommands, shows the
             built-in help text for each.  If used alone, it displays
             the general client help text.</para>
+      -->
+          <para>如果在执行时带了一个或多个子命令, 则显示各个子命令的内建帮助
+            文档. 如果只是单独使用, 则显示客户端命令行工具的总体帮助文档.
+          </para>
         </listitem>
       </varlistentry>
       
@@ -682,11 +753,18 @@
       <varlistentry id="svn.ref.svn.sw.ignore_ancestry">
         <term><option>--ignore-ancestry</option></term>
         <listitem>
+      <!--
           <para>Tells Subversion to ignore ancestry when calculating
+                         ### TODO
             differences (rely on path contents alone).  Also disables
             <xref linkend="svn.branchmerge.basicmerging.mergetracking"/>
             when used with the <command>svn merge</command> subcommand.
         </para>
+      -->
+        <para>告诉 Subversion 在计算差异时忽略祖先 (仅依赖路径内容), 对
+          <command>svn merge</command> 而言, 该选项还会禁止
+          <xref linkend="svn.branchmerge.basicmerging.mergetracking"/>.
+        </para>
         </listitem>
       </varlistentry>
     
@@ -693,8 +771,11 @@
       <varlistentry id="svn.ref.svn.sw.ignore_externals">
         <term><option>--ignore-externals</option></term>
         <listitem>
+      <!--
           <para>Tells Subversion to ignore externals definitions and
             the external working copies managed by them.</para>
+      -->
+          <para>忽略外部定义和外部工作副本.</para>
         </listitem>
       </varlistentry>
     
@@ -701,7 +782,10 @@
       <varlistentry id="svn.ref.svn.sw.ignore_keywords">
         <term><option>--ignore-keywords</option></term>
         <listitem>
+      <!--
           <para>Disables keyword expansion.</para>
+      -->
+          <para>禁止关键字替换.</para>
         </listitem>
       </varlistentry>
 
@@ -708,8 +792,11 @@
       <varlistentry id="svn.ref.svn.sw.ignore_properties">
         <term><option>--ignore-properties</option></term>
         <listitem>
+      <!--
           <para>Instructs <command>svn diff</command> to suppress
             output of property changes.</para>
+      -->
+          <para>告诉 <command>svn diff</command> 忽略属性的变化.</para>
         </listitem>
       </varlistentry>
 




More information about the svnbook-dev mailing list