summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-06-26 13:03:49 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-06-26 13:03:49 +0000
commit830f2819622caae638889e72c9850dd52b7e4b19 (patch)
treed03f9388f465aab9b3c7ae0d89034ddb4644aad4 /config
parente9eddce08ca4c91e438e345e456835a8a8757da8 (diff)
downloadredmine-830f2819622caae638889e72c9850dd52b7e4b19.tar.gz
redmine-830f2819622caae638889e72c9850dd52b7e4b19.zip
Merged r16708 from trunk to 3.4-stable (#26261, #26263)
Simplified Chinese translation for 3.2-stable updated by Steven Wong. git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16712 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'config')
-rw-r--r--config/locales/zh.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f14d2fe3f..834242f5d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1203,8 +1203,7 @@ zh:
setting_mail_handler_enable_regex_delimiters: Enable regular expressions
error_move_of_child_not_possible: 'Subtask %{child} could not be moved to the new
project: %{errors}'
- 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: 已用耗时不能重新分配到即将被删除的任务里。
setting_timelog_required_fields: Required fields for time logs
label_attribute_of_object: '%{object_name}''s %{name}'
label_user_mail_option_only_assigned: Only for things I watch or I am assigned to