From 6ab0eb4477930441bc4cf284dac94bc53b765e6e Mon Sep 17 00:00:00 2001 From: wanglinchun Date: Tue, 29 Apr 2014 09:48:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/softapplications/index.html.erb | 6 ++++++ config/locales/zh.yml | 21 ++++----------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/app/views/softapplications/index.html.erb b/app/views/softapplications/index.html.erb index edefb75e6..925fa7db5 100644 --- a/app/views/softapplications/index.html.erb +++ b/app/views/softapplications/index.html.erb @@ -74,3 +74,9 @@ <% end %> + + \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index f4b6fe0ce..fc7e90e97 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1425,7 +1425,7 @@ zh: label_has_praisers: 赞(%{count}) label_has_watchers: 关注(%{count}) label_has_fans: 粉丝(%{count}) - label_coursefile_sharingarea: 课程资源共享区 + label_coursefile_sharingarea: 课程文件共享专区 #modify by men label_x_has_fans: zero: 粉丝(%{count}) @@ -1547,7 +1547,6 @@ zh: label_sort_by_time: 按时间排序 label_sort_by_active: 按活跃度排序 label_sort_by_influence: 按影响力排序 - label_sort_by_activity: 按动态数排序 label_bids_published: 发布于 label_bids_published_ago: 之前 label_welcome_trustie: Trustie @@ -1668,7 +1667,7 @@ zh: label_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该项目。） label_course_view_student: 查看其他课程 label_course_student: 学生 - label_homework: 课程实践 + label_homework: 课程作业 label_course_file: 资源库 #资料共享 label_stores_index: 资源搜索 label_course_new_homework: 新建作业 @@ -1716,11 +1715,6 @@ zh: zero: 份资料 one: 份资料 other: 份资料 -#added by gcm - label_x_activity: - zero: 个动态 - one: 个动态 - other: 个动态 @@ -1765,10 +1759,6 @@ zh: label_has_been: 已经被 label_course_userd_by: 个课程引用 - - label_school_all: 中国高校 - - role_of_course: 课程角色 label_student: 学生 @@ -1829,8 +1819,7 @@ zh: label_sumbit_empty: 搜索内容不能为空 #add by linchun (竞赛相关) - label_upload_files: 上传资源 - label_relation_files: 关联已有资源 + label_upload_files: 上传文件 label_upload_softwarepackage: 上传软件包 label_upload_cuttingphoto: 上传截图 label_contests_reward_method: 奖励方式 @@ -1869,8 +1858,6 @@ zh: label_add_contest_succeed_fail: 添加失败,该应用已参赛. label_no_ftapplication: 暂无应用 label_edit_softapplication: 修改应用 - label_contest_settings: 配置竞赛 - label_contest_delete: 删除竞赛 - + \ No newline at end of file