Merge branch 'master' of git://github.com/edavis10/redmine

config/locales/en-GB.yml

@@ -221,7 +221,7 @@ en-GB:
   field_tracker: Tracker
   field_subject: Subject
   field_due_date: Due date
-  field_assigned_to: Assigned to
+  field_assigned_to: Assignee
   field_priority: Priority
   field_fixed_version: Target version
   field_user: User

config/locales/en.yml

@@ -224,7 +224,7 @@ en:
   field_tracker: Tracker
   field_subject: Subject
   field_due_date: Due date
-  field_assigned_to: Assigned to
+  field_assigned_to: Assignee
   field_priority: Priority
   field_fixed_version: Target version
   field_user: User

config/locales/fr.yml

@@ -916,14 +916,14 @@ fr:
   enumeration_system_activity: Activité système
   label_board_sticky: Sticky
   label_board_locked: Verrouillé
-  error_unable_delete_issue_status: Unable to delete issue status
-  error_can_not_delete_custom_field: Unable to delete custom field
-  error_unable_to_connect: Unable to connect ({{value}})
-  error_can_not_remove_role: This role is in use and can not be deleted.
-  error_can_not_delete_tracker: This tracker contains issues and can't be deleted.
+  error_unable_delete_issue_status: Impossible de supprimer le statut de demande
+  error_can_not_delete_custom_field: Impossible de supprimer le champ personnalisé
+  error_unable_to_connect: Connexion impossible ({{value}})
+  error_can_not_remove_role: Ce rôle est utilisé et ne peut pas être supprimé.
+  error_can_not_delete_tracker: Ce tracker contient des demandes et ne peut pas être supprimé.
   field_principal: Principal
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
+  notice_failed_to_save_members: "Erreur lors de la sauvegarde des membres: {{errors}}."
+  text_zoom_out: Zoom arrière
+  text_zoom_in: Zoom avant
+  notice_unable_delete_time_entry: Impossible de supprimer le temps passé.
+  label_overall_spent_time: Temps passé global

config/locales/ru.yml

@@ -1019,7 +1019,7 @@ ru:
   label_close_versions: Закрыть завершенные версии
   label_board_sticky: Прикреплена
   label_board_locked: Заблокирована
-  field_principal: Глава
+  field_principal: Имя
   text_zoom_out: Отдалить
   text_zoom_in: Приблизить
   notice_unable_delete_time_entry: Невозможно удалить запись журнала.

config/locales/zh.yml

@@ -907,22 +907,22 @@ zh:
   label_board_sticky: 置顶
   label_board_locked: 锁定
   permission_export_wiki_pages: 导出 wiki 页面
-  setting_cache_formatted_text: 缓存已格式化文字
+  setting_cache_formatted_text: 缓存格式化文本
   permission_manage_project_activities: 管理项目活动
   error_unable_delete_issue_status: 无法删除问题状态
-  label_profile: 配置概况
-  permission_manage_subtasks: Manage subtasks
-  field_parent_issue: Parent task
-  label_subtask_plural: Subtasks
-  label_project_copy_notifications: Send email notifications during the project copy
+  label_profile: 简介
+  permission_manage_subtasks: 管理子任务
+  field_parent_issue: 父任务
+  label_subtask_plural: 子任务
+  label_project_copy_notifications: 复制项目时发送邮件通知
   error_can_not_delete_custom_field: 不能删除自定义属性
   error_unable_to_connect: 不能连接到 ({{value}})
   error_can_not_remove_role: 该角色正在使用中, 不能删除.
   error_can_not_delete_tracker: 该跟踪标签包含问题, 不能删除.
   field_principal: Principal
-  label_my_page_block: My page block
-  notice_failed_to_save_members: "Failed to save member(s): {{errors}}."
-  text_zoom_out: Zoom out
-  text_zoom_in: Zoom in
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
+  label_my_page_block: 我的工作台模块
+  notice_failed_to_save_members: "成员保存失败：{{errors}}。"
+  text_zoom_out: 缩小
+  text_zoom_in: 放大
+  notice_unable_delete_time_entry: 无法删除工时记录。
+  label_overall_spent_time: 所有项目耗用工时