From d003a67a3ad4be19a32e4b7448a7342cf116159a Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 6 Jan 2016 11:30:39 +0000
Subject: [PATCH] Merged r14995 from trunk to 3.1-stable (#21456)

Simplified Chinese wiki translation for 3.1-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15001 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../help/zh/wiki_syntax_detailed_textile.html  | 18 +++++++++---------
 public/help/zh/wiki_syntax_textile.html        | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/public/help/zh/wiki_syntax_detailed_textile.html b/public/help/zh/wiki_syntax_detailed_textile.html
index 2f56bb5ba..8211adda3 100644
--- a/public/help/zh/wiki_syntax_detailed_textile.html
+++ b/public/help/zh/wiki_syntax_detailed_textile.html
@@ -125,11 +125,11 @@
         </ul>
 
         <ul>
-            <li>Forums:
+            <li>论坛：
                 <ul>
-                    <li><strong>forum#1</strong> (link to forum with id 1</li>
-                    <li><strong>forum:Support</strong> (link to forum named Support)</li>
-                    <li><strong>forum:"Technical Support"</strong> (use double quotes if forum name contains spaces)</li>
+                    <li><strong>forum#1</strong> (链接至id为2的论坛)</li>
+                    <li><strong>forum:Support</strong> (链接至名称为"Support"的论坛)</li>
+                    <li><strong>forum:"Technical Support"</strong> (论坛名称包含空格时使用双引号表示)</li>
                 </ul></li>
         </ul>
 
@@ -145,16 +145,16 @@
                 <ul>
                     <li><strong>project#3</strong> (链接至id为3的项目)</li>
                     <li><strong>project:someproject</strong> (链接至名称为"someproject"的项目)</li>
-                    <li><strong>project:"Some Project"</strong> (use double quotes for project name containing spaces)</li>
+                    <li><strong>project:"Some Project"</strong> (项目名称包含空格时，使用双引号来表示)</li>
                 </ul></li>
         </ul>
 
         <ul>
-            <li>News:
+            <li>新闻:
                 <ul>
-                    <li><strong>news#2</strong> (link to news item with id 2)</li>
-                    <li><strong>news:Greetings</strong> (link to news item named "Greetings")</li>
-                    <li><strong>news:"First Release"</strong> (use double quotes if news item name contains spaces)</li>
+                    <li><strong>news#2</strong> (链接至id为1的新闻)</li>
+                    <li><strong>news:Greetings</strong> (链接至名称为"Greetings"的新闻)</li>
+                    <li><strong>news:"First Release"</strong> (新闻名称包含空格时，使用双引号来表示)</li>
                 </ul></li>
         </ul>
 
diff --git a/public/help/zh/wiki_syntax_textile.html b/public/help/zh/wiki_syntax_textile.html
index d3de76000..c077f7591 100644
--- a/public/help/zh/wiki_syntax_textile.html
+++ b/public/help/zh/wiki_syntax_textile.html
@@ -37,9 +37,9 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
 </pre>
 </td></tr>
 
-<tr><th colspan="3">Lists</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />** Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br />## Sub<br /># Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr>
+<tr><th colspan="3">列表</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="不排序列表" /></th><td>* 列表项 1<br />** Sub<br />* 列表项 2</td><td><ul><li>列表项 1<ul><li>子项</li></ul></li><li>列表项 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="排序列表" /></th><td># 列表项 1<br />## Sub<br /># 列表项 2</td><td><ol><li>列表项 1<ol><li>子项</li></ol></li><li>列表项 2</li></ol></td></tr>
 
 <tr><th colspan="3">标题</th></tr>
 <tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="标题 1" /></th><td>h1. 标题 1</td><td><h1>标题 1</h1></td></tr>
@@ -57,11 +57,11 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
 <tr><th></th><td>commit:f30e13e43</td><td>提交: <a href="#">f30e13e4</a></td></tr>
 <tr><th></th><td>source:some/file</td><td>代码：<a href="#">source:some/file</a></td></tr>
 
-<tr><th colspan="3">Inline images</th></tr>
+<tr><th colspan="3">内嵌图片</th></tr>
 <tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
 <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
 
-<tr><th colspan="3">Tables</th></tr>
+<tr><th colspan="3">表格</th></tr>
 <tr>
   <th></th>
   <td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td>
@@ -70,8 +70,8 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
       <tbody>
         <th>A</th><th>B</th><th>C</th>
         <tr><td>A</td><td>B</td><td>C</td></tr>
-        <tr><td rowspan="2">row span</td><td>B</td><td>C</td></tr>
-        <tr><td colspan="2">col span</td></tr>
+        <tr><td rowspan="2">行合并</td><td>B</td><td>C</td></tr>
+        <tr><td colspan="2">列合并</td></tr>
       </tbody>
     </table>
   </td>
-- 
2.39.5