[svnbook] r5856 committed - branches/1.8/zh/book/ch07-customizing-svn.xml

[wuzhouhui at users.sourceforge.net]

Revision: 5856
          http://sourceforge.net/p/svnbook/source/5856
Author:   wuzhouhui
Date:     2018-12-30 03:52:17 +0000 (Sun, 30 Dec 2018)
Log Message:
-----------
1.8/zh: translation of chapter 7 in progress

Modified Paths:
--------------
    branches/1.8/zh/book/ch07-customizing-svn.xml

Modified: branches/1.8/zh/book/ch07-customizing-svn.xml
===================================================================
--- branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-28 13:33:03 UTC (rev 5855)
+++ branches/1.8/zh/book/ch07-customizing-svn.xml	2018-12-30 03:52:17 UTC (rev 5856)
@@ -1818,6 +1818,7 @@
         然后它使用意大利字符集把文件名和日志消息转换成 UTF-8 编码, 再发送给
         仓库.</para>
 
+      <!--
       <para>Note that while the repository demands UTF-8 filenames and
         log messages, it <emphasis>does not</emphasis> pay attention
         to file contents.  Subversion treats file contents as opaque
@@ -1824,12 +1825,22 @@
         strings of bytes, and neither client nor server makes an
         attempt to understand the character set or encoding of the
         contents.</para>
+      -->
+      <para>注意, 虽然仓库要求文件名和日志消息必须是 UTF-8 编码, 但它并不在乎
+        文件的内容是什么编码, Subversion 把文件的内容看成是不透明的字节串,
+        服务器端和客户端都不会试图去理解文件内容的字符集或编码方案.</para>
 
       <sidebar>
+      <!--
         <title>Character Set Conversion Errors</title>
+      -->
+        <title>字符集转换错误</title>
 
+      <!--
         <para>While using Subversion, you might get hit with an error
           related to character set conversions:</para>
+      -->
+        <para>在使用 Subversion 时, 你可能会遇到下面这种错误:</para>
 
         <informalexample>
           <screen>
@@ -1840,6 +1851,7 @@
 </screen>
         </informalexample>
     
+      <!--
         <para>Errors such as this typically occur when the Subversion
           client has received a UTF-8 string from the repository, but
           not all of the characters in that string can be represented
@@ -1848,7 +1860,14 @@
           has committed a Japanese filename, you're likely to see this
           error when you receive the file during an <command>svn
           update</command>.</para>
+      -->
+      <para>发生这种错误的典型情况是 Subversion 客户端接收到了仓库发来的 UTF-8
+        字符串, 但并非字符串中的所有字符都能用本地字符集进行表示. 比如说你的
+        本地语言是 <literal>en_US</literal>, 但你的同事却提交了一个用日文命名
+        的文件, 当你执行命令 <command>svn update</command> 时可能就会遇到这种
+        错误.</para>
 
+      <!--
         <para>The solution is either to set your locale to something
           that <emphasis>can</emphasis> represent the incoming UTF-8
           data, or to change the filename or log message in the
@@ -1856,6 +1875,11 @@
           hand—projects should decide on common languages ahead of
           time so that all participants are using the same
           locale.)</para>
+      -->
+        <para>解决办法之一是使用一种 <emphasis>可以</emphasis> 表示所有 UTF-8
+          字符的本地语言. 或者是修改仓库中的文件名和日志消息 (别忘了和你的日本
+          同事打声招呼—应该提前决定好项目所使用的语言, 这样的话所有的
+          参与者都能使用相同的本地语言.</para>
       </sidebar>
 
     </sect2>