Merged r14994 from trunk to 3.2-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.2-stable@14997 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 83d23ebcd7f7ef4426a65b2935870eee2c4f0ce1..7973b6e5f14cf7c4c56a77fe08a0855fbb04e811 100644 (file)
--- a/public/help/zh/wiki_syntax_detailed_textile.html
+++ b/public/help/zh/wiki_syntax_detailed_textile.html
@@ -139,7 +139,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>