From bcf83328f2a46db9185bc2e9f1eddbe8fbc95d31 Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 9 Apr 2015 20:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=8C=E9=9D=A2=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/invite_members.html.erb | 2 +- config/locales/commons/en.yml | 16 ++- config/locales/commons/zh.yml | 7 +- config/locales/en.yml | 57 ++-------- config/locales/projects/en.yml | 57 +++++++++- config/locales/projects/zh.yml | 108 ++++++++++++++++-- config/locales/zh.yml | 121 +++++++-------------- 7 files changed, 217 insertions(+), 151 deletions(-) diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb index 55fa2487b..34764b24b 100644 --- a/app/views/projects/invite_members.html.erb +++ b/app/views/projects/invite_members.html.erb @@ -25,7 +25,7 @@ <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :method => :post}) do |f| %>
- + > <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js',:flag => true) }')" %>
diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml index 1386aef6e..0de058a0f 100644 --- a/config/locales/commons/en.yml +++ b/config/locales/commons/en.yml @@ -213,8 +213,12 @@ en: button_unfollow: Unfollow button_follow: Follow button_browse: Browse - - + button_create: Create + label_preview: Preview + button_update: Update + button_copy: Copy + + # # Trustie上传头像模块 # @@ -367,9 +371,9 @@ en: label_log_active_record_time_percent: "AR响应时间百分比" views: pagination: - first: "« 首页" - last: "末页 »" - previous: "« 上一页" - next: "下一页 »" + first: "« First" + last: "Last »" + previous: "« Previous" + next: "Next »" truncate: "..." \ No newline at end of file diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index b2224063e..c7d025f28 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -218,8 +218,11 @@ zh: button_watch: 跟踪 button_unwatch: 取消跟踪 button_browse: 浏览 - - + button_create: 提交 + label_preview: 预览 + button_update: 更新 + button_copy: 复制 + # # Trustie上传头像模块 # diff --git a/config/locales/en.yml b/config/locales/en.yml index ddde2e075..f5e0fc63d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -126,7 +126,7 @@ en: field_logo_size: Logo Size field_start_page: Start page field_subproject: Subproject - field_hours: Hours + field_activity: Activity field_spent_on: Date field_is_filter: Used as a filter @@ -401,7 +401,7 @@ en: other: "%{count} projects" label_project_all: All Projects label_project_latest: Latest projects - label_issue_new: New issue + label_issue_plural: Issues Tracking label_issue_view_all: View all issues label_issues_by: "Issues by %{value}" @@ -524,9 +524,8 @@ en: label_permissions: Permissions label_current_status: Current status label_new_statuses_allowed: New statuses allowed - label_all: all - label_any: any - label_none: none + + label_nobody: nobody label_next: Next label_previous: Previous @@ -550,42 +549,8 @@ en: label_comment_add: Add a comment label_comment_added: Comment added label_comment_delete: Delete comments - label_query: Custom query - label_query_plural: Custom queries - label_query_new: New query - label_my_queries: My custom queries - label_filter_add: Add filter - label_filter_plural: Query condition - label_equals: is - label_not_equals: is not - label_in_less_than: in less than - label_in_more_than: in more than - label_in_the_next_days: in the next - label_in_the_past_days: in the past - label_in_users: 'in the user ' - label_greater_or_equal: '>=' - label_less_or_equal: '<=' - label_between: between - label_in: in - label_today: today - label_all_time: all time - label_yesterday: yesterday - label_this_week: this week - label_last_week: last week - label_last_n_weeks: "last %{count} weeks" - label_last_n_days: "last %{count} days" - label_this_month: this month - label_last_month: last month - label_this_year: this year - label_date_range: Date range - label_less_than_ago: less than days ago - label_more_than_ago: more than days ago - label_ago: days ago - label_contains: contains - label_not_contains: doesn't contain - label_any_issues_in_project: any issues in project - label_any_issues_not_in_project: any issues not in project - label_no_issues_in_project: no issues in project + + label_day_plural: days label_repository: Repository #add by tan @@ -626,7 +591,7 @@ en: label_index_by_title: Index by title label_index_by_date: Index by date label_current_version: Current version - label_preview: Preview + label_feed_plural: Feeds label_changes_details: Details of all changes @@ -819,10 +784,9 @@ en: button_reset: Reset button_rename: Rename - button_copy: Copy button_copy_and_follow: Copy and follow button_annotate: Annotate - button_update: Update + button_configure: Configure button_quote: Quote button_duplicate: Duplicate @@ -1199,8 +1163,7 @@ en: label_issue_query_condition: Query condition label_homework_source: Task - label_issue_query: Query - label_issue_cancel_query: Cancel query + field_reward_type: The type of reward label_bid_publish: published label_bid_project: projects @@ -1521,7 +1484,7 @@ en: label_borad_project: Project-borad - + label_borad_course: Course-borad label_project_notice: release the notice diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 9eadfc46f..90d8f2e2b 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -73,7 +73,7 @@ en: # # 项目托管平台 # - # 项目成员 + # 项目成员列表 # label_member_list: Members @@ -139,10 +139,57 @@ en: label_issues_sum: 'Total' lable_issues_undo: 'Unresolved：' label_successful_create: Successfully created + label_query: Custom query + label_issue_new: New issue + + # 自定义查询 + + label_query_plural: Custom queries + label_query_new: New query + label_my_queries: My custom queries + label_filter_plural: Query condition + label_filter_add: Add filter + + label_contains: contains + label_not_contains: doesn't contain + label_any: any + label_none: none + label_all: all + label_equals: is + label_not_equals: is not + label_in_less_than: in less than + label_in_more_than: in more than + label_in_the_next_days: in the next + label_in_the_past_days: in the past + label_in_users: 'in the user ' + label_greater_or_equal: '>=' + label_less_or_equal: '<=' + label_between: between + label_in: in + label_today: today + label_all_time: all time + label_yesterday: yesterday + label_this_week: this week + label_last_week: last week + label_last_n_weeks: "last %{count} weeks" + label_last_n_days: "last %{count} days" + label_this_month: this month + label_last_month: last month + label_this_year: this year + label_date_range: Date range + label_less_than_ago: less than days ago + label_more_than_ago: more than days ago + label_ago: days ago + label_contains: contains + label_not_contains: doesn't contain + label_any_issues_in_project: any issues in project + label_any_issues_not_in_project: any issues not in project + label_no_issues_in_project: no issues in project - # + label_issue_query: Query + label_issue_cancel_query: Cancel query # 问题优先级 default_priority_low: Low @@ -150,7 +197,7 @@ en: default_priority_high: High default_priority_urgent: Urgent default_priority_immediate: Immediate - + field_hours: Hours # # 项目托管平台 @@ -205,7 +252,7 @@ en: label_input_email: Please input email address label_invite_trustie_user: "Invite Trustie registered users" - label_invite_trustie_user_tips: "Type to find users" + label_invite_trustie_user_tips: "Type nickname to find users" label_user_role_null: User and Role can not be blank！ label_invite_project: "invites you to join the project" label_invite_success: Successful invitation @@ -228,7 +275,7 @@ en: field_is_public: Public field_hidden_repo: code protected - button_create: Create + # diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index bb78fda4d..5a845c4d4 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -75,7 +75,7 @@ zh: # # 项目托管平台 # - # 项目成员 + # 项目成员列表 # label_member_list: 成员列表 @@ -139,22 +139,116 @@ zh: label_file_count: "个文件已上传" text_are_you_sure_all: 您确定要删除所有文件吗 + + # # 项目托管平台 # # 问题跟踪 + # label_successful_create: 创建成功 label_issues_sum: '问题总数' lable_issues_undo: '未解决：' - - # - - + label_issue_new: 新建问题 + label_query: 自定义查询 + + # 自定义查询 + label_query_plural: 自定义查询 + label_query_new: 新建查询 + label_filter_plural: 查询条件 + label_filter_add: 增加过滤器 + # 自定义查询> 过滤器类别 + field_status: 状态 + field_fixed_version: 目标版本 + field_assigned_to_role: 角色的成员 + field_category: 类别 + field_created_on: 创建于 + field_updated_on: 更新于 + field_closed_on: 已关闭 + field_start_date: 开始日期 + field_due_date: 计划完成日期 + field_estimated_hours: 预期时间 + field_assigned_to: 指派给 + field_priority: 优先级 + field_done_ratio: "% 完成" + field_is_private: 私有 + field_watcher: 跟踪者 + label_relates_to: 关联到 + label_duplicates: 重复 + label_duplicated_by: 与其重复 + label_blocks: 阻挡 + label_blocked_by: 被阻挡 + label_precedes: 优先于 + label_follows: 跟随于 + label_copied_to: 复制到 + label_copied_from: 复制于 + # 自定义查询> 过滤器属性 + label_contains: 包含 + label_not_contains: 不包含 + label_none: 无 + label_any: 全部 + label_all: 全部 + label_equals: 等于 + label_not_equals: 不等于 + label_open_issues: 打开 + label_closed_issues: 已关闭 + label_greater_or_equal: '>=' + label_less_or_equal: '<=' + label_between: 介于 + label_in_less_than: 剩余天数小于 + label_in_more_than: 剩余天数大于 + label_in_the_next_days: 之后 + label_in_the_past_days: 之前 + label_in: 剩余天数 + label_today: 今天 + label_all_time: 全部时间 + label_yesterday: 昨天 + label_this_week: 本周 + label_last_week: 上周 + label_last_n_weeks: 上 %{count} 周前 + label_last_n_days: "最后 %{count} 天" + label_this_month: 本月 + label_last_month: 上月 + label_this_year: 今年 + label_date_range: 日期范围 + label_less_than_ago: 之前天数少于 + label_more_than_ago: 之前天数大于 + label_ago: 之前第 + label_any_issues_in_project: 项目内任意问题 + label_any_issues_not_in_project: 项目外任意问题 + label_no_issues_in_project: 项目内无相关问题 + + label_issue_query: 查询 + label_issue_cancel_query: 取消查询 + + # 新建问题 + field_tracker: 跟踪 + field_subject: 主题 + field_quote: 描述 + label_change_properties: 修改属性 + # 属性同上自定义属性 default_priority_low: 低 default_priority_normal: 普通 default_priority_high: 高 default_priority_urgent: 紧急 - default_priority_immediate: 立刻 + default_priority_immediate: 立刻 + field_hours: 小时 + label_issue_watchers: 跟踪者 + label_search_for_watchers: 通过查找方式添加跟踪者 + + + #问题更新 + + #顶和踩 + label_issue_praise: 好问题，顶！ + label_issue_tread: 烂问题，踩！ + label_issue_praise_over: 我刚才顶过了~ + label_issue_tread_over: 我刚才踩过了~ + label_issue_not_praise_over: 不能顶自己~ + label_issue_not_treed_over: 不能踩自己~ + label_issues_score_not_enough: 积分不够，不能踩别人~ + + # @@ -231,7 +325,7 @@ zh: text_project_identifier_info: "小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。
一旦保存，标识无法修改。" field_is_public: 公开 field_hidden_repo: 隐藏代码库 - button_create: 提交 + # diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 5a95d1bd3..768a892fd 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -95,8 +95,7 @@ zh: field_author: 作者 - field_created_on: 创建于 - field_updated_on: 更新于 + field_field_format: 格式 field_is_for_all: 用于所有项目 field_possible_values: 可能的值 @@ -104,22 +103,19 @@ zh: field_min_length: 最小长度 field_max_length: 最大长度 field_value: 值 - field_category: 类别 + field_title: 标题 field_web_title: 浏览器标题 field_project: 项目 field_issue: 问题 - field_status: 状态 + field_notes: 说明 field_is_closed: 已关闭的问题 field_is_default: 默认值 - field_tracker: 跟踪 - field_subject: 主题 - field_quote: 描述 - field_due_date: 计划完成日期 - field_assigned_to: 指派给 - field_priority: 优先级 - field_fixed_version: 目标版本 + + + + field_user: 用户 field_principal: 用户 field_role: 角色 @@ -145,8 +141,8 @@ zh: field_attr_lastname: 姓氏属性 field_attr_mail: 邮件属性 field_onthefly: 即时用户生成 - field_start_date: 开始日期 - field_done_ratio: "% 完成" + + field_auth_source: 认证模式 field_hide_mail: 隐藏我的邮件地址 field_comments: 注释 @@ -154,7 +150,7 @@ zh: field_logo_size: logo大小 field_start_page: 起始页 field_subproject: 子项目 - field_hours: 小时 + field_activity: 活动 field_spent_on: 日期 field_is_filter: 作为过滤条件 @@ -162,7 +158,7 @@ zh: field_delay: 延期 field_assignable: 问题可指派给此角色 field_redirect_existing_links: 重定向到现有链接 - field_estimated_hours: 预期时间 + field_column_names: 列 field_time_entries: 工时 field_time_zone: 时区 @@ -171,13 +167,13 @@ zh: field_comments_sorting: 显示注释 field_parent_title: 上级页面 field_editable: 可编辑 - field_watcher: 跟踪者 + field_content: 内容 field_group_by: 根据此条件分组 field_sharing: 共享 field_parent_issue: 父任务 field_member_of_group: 用户组的成员 - field_assigned_to_role: 角色的成员 + field_text: 文本字段 field_visible: 可见的 @@ -386,7 +382,7 @@ zh: label_project_all: 所有的项目 label_project_latest: 最近的项目 label_issue: 问题 - label_issue_new: 新建问题 + label_issue_plural: 问题跟踪 label_issue_view_all: 查看所有问题 label_issues_by: "按 %{value} 分组显示问题" @@ -588,9 +584,9 @@ zh: label_export_to: 导出 label_read: 读取... label_public_projects: 公开的项目 - label_open_issues: 打开 + label_open_issues_plural: 打开 - label_closed_issues: 已关闭 + label_closed_issues_plural: 已关闭 label_x_open_issues_abbr_on_total: zero: 0 打开 / %{total} @@ -608,8 +604,7 @@ zh: label_permissions: 权限 label_current_status: 当前状态 label_new_statuses_allowed: 允许的新状态 - label_all: 全部 - label_none: 无 + label_nobody: 无人 label_next: 下一页 label_previous: 上一页 @@ -633,34 +628,10 @@ zh: label_comment_add: 添加评论 label_comment_added: 评论已添加 label_comment_delete: 删除评论 - label_query: 自定义查询 - label_query_plural: 自定义查询 - label_query_new: 新建查询 - label_filter_add: 增加过滤器 - - label_filter_plural: 查询条件 - label_equals: 等于 - label_not_equals: 不等于 - label_in_less_than: 剩余天数小于 - label_in_more_than: 剩余天数大于 - label_greater_or_equal: '>=' - label_less_or_equal: '<=' - label_in: 剩余天数 - label_today: 今天 - label_all_time: 全部时间 - label_yesterday: 昨天 - label_this_week: 本周 - label_last_week: 上周 - label_last_n_days: "最后 %{count} 天" - label_this_month: 本月 - label_last_month: 上月 - label_this_year: 今年 - label_date_range: 日期范围 - label_less_than_ago: 之前天数少于 - label_more_than_ago: 之前天数大于 - label_ago: 之前天数 - label_contains: 包含 - label_not_contains: 不包含 + + + + label_day_plural: 天 label_repository: 版本库 label_course_repository: 代码库 @@ -702,7 +673,7 @@ zh: label_index_by_title: 按标题索引 label_index_by_date: 按日期索引 label_current_version: 当前版本 - label_preview: 预览 + label_feed_plural: Feeds label_changes_details: 所有变更的详情 label_spent_time: 耗时 @@ -727,13 +698,7 @@ zh: label_loading: 载入中... label_relation_new: 新建关联 label_relation_delete: 删除关联 - label_relates_to: 关联到 - label_duplicates: 重复 - label_duplicated_by: 与其重复 - label_blocks: 阻挡 - label_blocked_by: 被阻挡 - label_precedes: 优先于 - label_follows: 跟随于 + label_end_to_start: 结束-开始 label_end_to_end: 结束-结束 label_start_to_start: 开始-开始 @@ -794,7 +759,7 @@ zh: #end label_user_commits: "代码提交" - label_user_newfeedback: "留言" ## huang添加的 + label_feedback_success: "留言成功" label_feedback_fail: "留言失败" label_user_login: "最后登录" @@ -827,7 +792,7 @@ zh: label_registration_automatic_activation: 自动激活帐号 label_display_per_page: "每页显示：%{value}" label_age: 提交时间 - label_change_properties: 修改属性 + label_general: 一般 label_scm: 管理系统 label_plugins: 插件 @@ -841,7 +806,7 @@ zh: label_planning: 计划 label_incoming_emails: 接收邮件 label_generate_key: 生成一个key - label_issue_watchers: 跟踪者 + label_example: 示例 label_display: 显示 label_sort: 排序 @@ -910,7 +875,7 @@ zh: button_copy: 复制 button_copy_and_follow: 复制并转到新问题 button_annotate: 追溯 - button_update: 更新 + button_configure: 配置 button_quote: 引用 button_duplicate: 副本 @@ -1025,7 +990,7 @@ zh: field_issues_visibility: 问题可见 label_issues_visibility_all: 全部问题 permission_set_own_issues_private: 设置自己的问题为公开或私有 - field_is_private: 私有 + permission_set_issues_private: 设置问题为公开或私有 label_issues_visibility_public: 全部非私有问题 text_issues_destroy_descendants_confirmation: 此操作同时会删除 %{count} 个子任务。 @@ -1045,7 +1010,7 @@ zh: text_scm_command_not_available: Scm命令不可用。 请检查管理面板的配置。 text_git_repository_note: 库中无内容。(e.g. /gitrepo, c:\gitrepo) notice_issue_successful_create: 问题 %{id} 已创建。 - label_between: 介于 + setting_issue_group_assignment: 允许问题被分配给组 label_diff: 查看差别 description_query_sort_criteria_direction: 排序方式 @@ -1100,7 +1065,7 @@ zh: text_issue_conflict_resolution_cancel: 取消我所有的变更并重新刷新显示 %{link} 。 permission_manage_related_issues: 相关问题管理 field_auth_source_ldap_filter: LDAP 过滤器 - label_search_for_watchers: 通过查找方式添加跟踪者 + notice_account_deleted: 您的账号已被永久删除（账号已无法恢复）。 setting_unsubscribe: 允许用户退订 button_delete_my_account: 删除我的账号 @@ -1136,16 +1101,13 @@ zh: label_attribute_of_assigned_to: 分配给 %{name} label_attribute_of_fixed_version: 目标版本 %{name} label_copy_subtasks: 复制子任务 - label_copied_to: 复制到 - label_copied_from: 复制于 - label_any_issues_in_project: 项目内任意问题 - label_any_issues_not_in_project: 项目外任意问题 + field_private_notes: 私有注解 permission_view_private_notes: 查看私有注解 permission_set_notes_private: 设置为私有注解 - label_no_issues_in_project: 项目内无相关问题 - label_any: 全部 - label_last_n_weeks: 上 %{count} 周前 + + + setting_cross_project_subtasks: 支持跨项目子任务 label_cross_project_descendants: 与子项目共享 label_cross_project_tree: 与项目树共享 @@ -1153,8 +1115,7 @@ zh: label_cross_project_system: 与所有项目共享 button_hide: 隐藏 setting_non_working_week_days: Non-working days - label_in_the_next_days: in the next - label_in_the_past_days: in the past + label_attribute_of_user: User's %{name} text_turning_multiple_off: If you disable multiple values, multiple values will be removed in order to preserve only one value per item. @@ -1168,7 +1129,7 @@ zh: label_gantt_progress_line: 进度线 setting_jsonp_enabled: Enable JSONP support field_inherit_members: Inherit members - field_closed_on: 已关闭 + setting_default_projects_tracker_ids: Default trackers for new projects label_total_time: 合计 #Customer added！Added by nie @@ -1401,12 +1362,7 @@ zh: # modified by bai label_welcome_leave_message: 您好！系统目前正在公测，有意见和建议请 label_welcome_click_me: 点击我 - label_issue_praise: 好问题，顶！ - label_issue_tread: 烂问题，踩！ - label_issue_praise_over: 我刚才顶过了~ - label_issue_tread_over: 我刚才踩过了~ - label_issue_not_praise_over: 不能顶自己~ - label_issue_not_treed_over: 不能踩自己~ + label_issues_score_not_enough: 积分不够，不能踩别人~ #end @@ -1442,8 +1398,7 @@ zh: label_tags_related: 相关标签 button_project_tags_add: 增加 label_issue_query_condition: 查询条件 - label_issue_query: 查询 - label_issue_cancel_query: 取消查询 + field_reward_type: 奖励类型 label_tags_no: 暂无标签！ label_course_description_no: 该课程未添加描述！