From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Wed, 6 Jan 2016 11:30:28 +0000 (+0000)
Subject: Merged r14994 from trunk to 3.1-stable (#21456, #21650)
X-Git-Tag: 3.1.4~26
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=822c30beb569d38417b9212537cce9c6229b1cd4;p=redmine.git

Merged r14994 from trunk to 3.1-stable (#21456, #21650)

Simplified Chinese wiki "project:someproject" translation for 2.6-stable updated by Hang Xie.

r13795 changed English "project:someproject" to project:some-project.
However, Japanese and Traditional Chinese kept translated "project:some-project".
Therefore, this Simplified Chinese translation is valid.

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15000 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/public/help/zh/wiki_syntax_detailed_textile.html b/public/help/zh/wiki_syntax_detailed_textile.html
index da96f4930..2f56bb5ba 100644
--- a/public/help/zh/wiki_syntax_detailed_textile.html
+++ b/public/help/zh/wiki_syntax_detailed_textile.html
@@ -144,7 +144,7 @@
             <li>项目:
                 <ul>
                     <li><strong>project#3</strong> (链接至id为3的项目)</li>
-                    <li><strong>project:some-project</strong> (link to project with name or slug of "some-project")</li>
+                    <li><strong>project:someproject</strong> (链接至名称为"someproject"的项目)</li>
                     <li><strong>project:"Some Project"</strong> (use double quotes for project name containing spaces)</li>
                 </ul></li>
         </ul>