From 7a974437e6414682d6b318a3b1130d728f51907a Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 6 Jun 2016 05:23:46 +0000
Subject: [PATCH] Merged r15473 from trunk to 3.3-stable (#22983)

Simplified Chinese translation updated by Haihan Ji.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15474 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/locales/zh.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 4d71c38e8..38726d3aa 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1189,9 +1189,9 @@ zh:
   mail_body_security_notification_notify_disabled: 邮件地址 %{value} 不再接收通知.
   mail_body_settings_updated: "下列设置已更新:"
   field_remote_ip: IP 地址
-  label_wiki_page_new: New wiki page
-  label_relations: Relations
-  button_filter: Filter
-  mail_body_password_updated: Your password has been changed.
-  label_no_preview: No preview available
-  setting_new_project_issue_tab_enabled: Display the "New issue" tab
+  label_wiki_page_new: 新建Wiki页面
+  label_relations: 相关的问题
+  button_filter: 设置为过滤条件
+  mail_body_password_updated: 您的密码已经变更。
+  label_no_preview: 没有可以显示的预览内容
+  setting_new_project_issue_tab_enabled: 显示“新建问题”标签
-- 
2.39.5