From 3bde3c8bc3769a032852843671c4f6e9a2a6f5dd Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 26 Jun 2017 13:12:08 +0000
Subject: [PATCH] Merged r16708 from trunk to 3.2-stable (#26261, #26263)

Simplified Chinese translation for 3.2-stable updated by Steven Wong.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@16717 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/locales/zh.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 8382f1a2f..9f0b12847 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1177,5 +1177,4 @@ zh:
   label_any_open_issues: 任意进行中的问题
   label_no_open_issues: 任意已关闭的问题
   label_default_values_for_new_users: 新用户默认值
-  error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted: Spent time cannot
-    be reassigned to an issue that is about to be deleted
+  error_cannot_reassign_time_entries_to_an_issue_about_to_be_deleted: 已用耗时不能重新分配到即将被删除的任务里。
-- 
2.39.5