Merged r15704 from trunk to 3.2-stable (#23375, #23171)

Simplified Chinese translation for 3.1-stable updated by Tigergm Wu.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15710 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ab1d87fa7b867af9784543272fc51d1e9c38bdb3..fbae07878e6f3b7151245871255d2f6936c2b926 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -133,7 +133,7 @@ zh:
         not_same_project: "不属于同一个项目"
         circular_dependency: "此关联将导致循环依赖"
         cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务"
-        earlier_than_minimum_start_date: "cannot be earlier than %{date} because of preceding issues"
+        earlier_than_minimum_start_date: "不能早于 %{date} 由于有前置问题"
 
   actionview_instancetag_blank_option: 请选择
 
@@ -969,7 +969,7 @@ zh:
   notice_issue_successful_create: 问题 %{id} 已创建。
   label_between: 介于
   setting_issue_group_assignment: 允许问题被分配给组
-  label_diff: diff
+  label_diff: 差异
   description_query_sort_criteria_direction: 排序方式
   description_project_scope: 搜索范围
   description_filter: 过滤器
@@ -1094,8 +1094,8 @@ zh:
   notice_new_password_must_be_different: 新密码必须和旧密码不同
   setting_mail_handler_excluded_filenames: 移除符合下列名称的附件
   text_convert_available: 可使用 ImageMagick 转换图片格式 (可选)
-  label_link: Link
-  label_only: only
+  label_link: 连接
+  label_only: 仅于
   label_drop_down_list: 下拉列表
   label_checkboxes: 复选框
   label_link_values_to: 链接数值至此网址