summaryrefslogtreecommitdiffstats
path: root/public/help
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-06 11:22:26 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2016-01-06 11:22:26 +0000
commit26056f3291c5546ea1f7c2ee9164e7515caf9009 (patch)
treeb896542659f8fb1c45ffb0c2b8d4a23beea708bc /public/help
parentb2d4a2d74e4d215770c84802a555bec900c6cb90 (diff)
downloadredmine-26056f3291c5546ea1f7c2ee9164e7515caf9009.tar.gz
redmine-26056f3291c5546ea1f7c2ee9164e7515caf9009.zip
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
Diffstat (limited to 'public/help')
-rw-r--r--public/help/zh/wiki_syntax_detailed_textile.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/public/help/zh/wiki_syntax_detailed_textile.html b/public/help/zh/wiki_syntax_detailed_textile.html
index 83d23ebcd..7973b6e5f 100644
--- 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>