From ab18dfcaa882f45276db8f49ae45c05375951778 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 31 Jan 2015 17:19:13 +0800
Subject: [PATCH] =?UTF-8?q?School=20=3D>=20=20=E4=B8=AD=E5=9B=BD=E9=AB=98?=
 =?UTF-8?q?=E6=A0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/en.yml | 2 +-
 config/locales/zh.yml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index cb89070ff..b7a2b59eb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1774,7 +1774,7 @@ en:
   label_project_deposit: Projects
   label_course_practice: Courses
   label_forum_all: Forums
-  label_school_all: Schools 
+#  label_school_all: Schools
   label_contest_innovate: Competition community  
   label_software_user: Users
   label_requirement_enterprise: Requirements
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 50c29bd05..02f4afba6 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2421,6 +2421,7 @@ zh:
   review_assignments: 评审任务
   label_my_school: 我的学校
   label_all_schol: 全部学校
+  label_school_all: 中国高校
   label_select_province: 请选择省份
   label_search_conditions_not_null: 搜索条件不能为空