From b48e8eeecf3374442bb0319ba16c73e53e9bafe5 Mon Sep 17 00:00:00 2001
From: yuliang123 <jessicaly1993@outlook.com>
Date: Sat, 12 Mar 2016 21:39:26 +0100
Subject: [PATCH 1/4] Update zh-HANS.coffee
---
app/locale/zh-HANS.coffee | 61 ++++++++++++++++++++-------------------
1 file changed, 31 insertions(+), 30 deletions(-)
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 6ba80fba4..5b9d486e6 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -701,36 +701,37 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
more_info_3: "是个与其他使用CodeCombat的教育工作者联系的良好平台。"
# teachers_quote:
-# name: "Quote Form"
-# title: "Request a Quote"
-# subtitle: "Get CodeCombat in your classroom, club, school or district!"
-# email_exists: "User exists with this email."
-# phone_number: "Phone number"
-# phone_number_help: "Where can we reach you during the workday?"
-# role_label: "Your role"
-# role_help: "Select your primary role."
-# tech_coordinator: "Technology coordinator"
-# advisor: "Advisor"
-# principal: "Principal"
-# superintendent: "Superintendent"
-# parent: "Parent"
-# organization_label: "Name of School/District"
-# city: "City"
-# state: "State"
-# country: "Country"
-# num_students_help: "How many do you anticipate enrolling in CodeCombat?"
-# education_level_label: "Education Level of Students"
-# education_level_help: "Choose as many as apply."
-# elementary_school: "Elementary School"
-# high_school: "High School"
-# please_explain: "(please explain)"
-# middle_school: "Middle School"
-# college_plus: "College or higher"
-# anything_else: "Anything else we should know?"
-# thanks_header: "Thanks for requesting a quote!"
-# thanks_p: "We'll be in touch soon. Questions? Email us:"
-# thanks_anon: "Login or sign up with your account below to access your two free enrollments (we’ll notify you by email when they have been approved, which usually takes less than 48 hours). As always, the first hour of content is free for an unlimited number of students."
-# thanks_logged_in: "Your two free enrollments are pending approval. We’ll notify you by email when they have been approved (usually within 48 hours). As always, the first hour of content is free for an unlimited number of students."
+ name: "申请表"
+ title: "申请一个班级"
+ subtitle: "在教室，兴趣小组，学校或社区使用CodeCombat"
+ email_exists: "此邮箱地址已被占用"
+ phone_number: "联系电话"
+ phone_number_help: "我们在何时可以联系您？"
+ role_label: "您的职务"
+ role_help: "选择您主要的职务"
+ tech_coordinator: "技术指导"
+ advisor: "指导教授"
+ principal: "校长"
+ superintendent: "教育负责人"
+ parent: "家长"
+ organization_label: "学校名称或地区"
+ city: "市"
+ state: "州／省"
+ country: "国家"
+ num_students_help: "您期望有多少学生参与CodeCombat?"
+ education_level_label: "学生受教育程度"
+ education_level_help: "可多选"
+ elementary_school: "小学"
+ high_school: "初中"
+ please_explain: "其它"
+ middle_school: "高中"
+ college_plus: "大学或以上"
+ anything_else: "其它我们应该知道的？"
+ thanks_header: "谢谢您的申请表"
+ thanks_p: "我们将尽快联系您。有问题？我们的电子邮件："
+ thanks_anon: "登陆您的账户，获取两个免费的名额（当您的申请被批准，我们将通过邮件通知您，这个过程通常不会超过48个小时）。通常，第一个小时的内容是免费的，不限学生数量。"
+ thanks_logged_in: "您有两个免费名额有待批准。您的申请被批准，我们将通过邮件通知您（通常在48小时之内）。并且通常，第一个小时的内容是免费的，不限学生数量。"
+
versions:
save_version_title: "保存新版本"
From 1a11ade67b66f79933380ae1fd736fceec9c541a Mon Sep 17 00:00:00 2001
From: yuliang123 <jessicaly1993@outlook.com>
Date: Sat, 12 Mar 2016 21:51:20 +0100
Subject: [PATCH 2/4] Update zh-HANS.coffee
---
app/locale/zh-HANS.coffee | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 5b9d486e6..df0b85b5a 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -700,7 +700,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
more_info_2: "教师论坛"
more_info_3: "是个与其他使用CodeCombat的教育工作者联系的良好平台。"
-# teachers_quote:
+ teachers_quote:
name: "申请表"
title: "申请一个班级"
subtitle: "在教室，兴趣小组，学校或社区使用CodeCombat"
From 286b8161ca9e5f05066ded08777eca479980fa57 Mon Sep 17 00:00:00 2001
From: Chengxin Ma <machengxinchina@gmail.com>
Date: Sun, 13 Mar 2016 22:37:26 +0100
Subject: [PATCH 3/4] Update zh-HANS.coffee
---
app/locale/zh-HANS.coffee | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index df0b85b5a..715a1e68b 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -706,7 +706,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
subtitle: "在教室，兴趣小组，学校或社区使用CodeCombat"
email_exists: "此邮箱地址已被占用"
phone_number: "联系电话"
- phone_number_help: "我们在何时可以联系您？"
+ phone_number_help: "我们可以在何时联系您？"
role_label: "您的职务"
role_help: "选择您主要的职务"
tech_coordinator: "技术指导"
@@ -714,7 +714,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
principal: "校长"
superintendent: "教育负责人"
parent: "家长"
- organization_label: "学校名称或地区"
+ organization_label: "学校或地区名称"
city: "市"
state: "州／省"
country: "国家"
@@ -723,14 +723,14 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
education_level_help: "可多选"
elementary_school: "小学"
high_school: "初中"
- please_explain: "其它"
+ please_explain: "其他(请注明)"
middle_school: "高中"
college_plus: "大学或以上"
- anything_else: "其它我们应该知道的？"
- thanks_header: "谢谢您的申请表"
- thanks_p: "我们将尽快联系您。有问题？我们的电子邮件："
- thanks_anon: "登陆您的账户，获取两个免费的名额（当您的申请被批准，我们将通过邮件通知您，这个过程通常不会超过48个小时）。通常，第一个小时的内容是免费的，不限学生数量。"
- thanks_logged_in: "您有两个免费名额有待批准。您的申请被批准，我们将通过邮件通知您（通常在48小时之内）。并且通常，第一个小时的内容是免费的，不限学生数量。"
+ anything_else: "备注事宜"
+ thanks_header: "感谢您的申请！"
+ thanks_p: "我们将尽快联系您。如有有任何问题，请给我们发送电子邮件："
+ thanks_anon: "登录您的账户，获取两个免费名额（当您的申请被批准后，我们将通过邮件通知您，通常在48小时之内）。和以往一样，第一个小时的内容是免费的，不限学生数量。"
+ thanks_logged_in: "您有两个免费名额有待批准。当您的申请被批准后，我们将通过邮件通知您（通常在48小时之内）。和以往一样，第一个小时的内容是免费的，不限学生数量。"
versions:
From d2cefce7da28cc9ff1fd12662507a19b7b7363a7 Mon Sep 17 00:00:00 2001
From: Chengxin Ma <machengxinchina@gmail.com>
Date: Sun, 13 Mar 2016 22:42:12 +0100
Subject: [PATCH 4/4] Update zh-HANS.coffee
---
app/locale/zh-HANS.coffee | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 715a1e68b..0d6fad080 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -706,7 +706,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
subtitle: "在教室，兴趣小组，学校或社区使用CodeCombat"
email_exists: "此邮箱地址已被占用"
phone_number: "联系电话"
- phone_number_help: "我们可以在何时联系您？"
+ phone_number_help: "我们可以在何处联络到您？（限工作日）"
role_label: "您的职务"
role_help: "选择您主要的职务"
tech_coordinator: "技术指导"
@@ -729,7 +729,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
anything_else: "备注事宜"
thanks_header: "感谢您的申请！"
thanks_p: "我们将尽快联系您。如有有任何问题，请给我们发送电子邮件："
- thanks_anon: "登录您的账户，获取两个免费名额（当您的申请被批准后，我们将通过邮件通知您，通常在48小时之内）。和以往一样，第一个小时的内容是免费的，不限学生数量。"
+ thanks_anon: "登录您的账户，获取两个免费名额（当您的申请被批准后，我们将通过邮件通知您，此过程通常在48小时之内）。和以往一样，第一个小时的内容是免费的，不限学生数量。"
thanks_logged_in: "您有两个免费名额有待批准。当您的申请被批准后，我们将通过邮件通知您（通常在48小时之内）。和以往一样，第一个小时的内容是免费的，不限学生数量。"