diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index ceb160025..feb9503d5 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -842,18 +842,17 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
courses:
course: "课程"
-<<<<<<< HEAD
- courses: "课程"
- not_enrolled: "您没有注册这一节课。"
+ courses: "课程" #gonna see the script to determine the translation
+ not_enrolled: "您还没有报名参加本课程。"
visit_pref: "请到这个"
visit_suf: "网页注册。"
- select_class: "请选其中一门课堂"
+ select_class: "请选其中一门班级"
unnamed: "*未命名*"
select: "选择"
- unnamed_class: "课堂未命名"
- edit_settings: "编辑课堂设定"
- edit_settings1: "编辑课堂设定"
- progress: "课堂进度"
+ unnamed_class: "班级未命名"
+ edit_settings: "编辑班级设定"
+ edit_settings1: "编辑班级设定"
+ progress: "班级进度"
add_students: "添加学生"
stats: "统计"
total_students: "学生人数："
@@ -871,34 +870,34 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
played: "已通关"
play_time: "游戏时间："
completed: "完成："
- invite_students: "邀请学生加入此课堂。"
- invite_link_header: "参与课堂的縺结"
- invite_link_p_1: "把这个参与课堂的连结发给你的学生。" #this translation may need to change
+ invite_students: "邀请学生加入此班级。"
+ invite_link_header: "参与班级的縺结"
+ invite_link_p_1: "分享给您想分享的其他人以加入课程。" #this translation may need to change
invite_link_p_2: "或让我们代你直接发送电邮："
- capacity_used: "课程插槽已用："
+ capacity_used: "课程插槽已用：" # course slots? kinda in chinese
enter_emails: "输入学生电邮地址来邀请，每行一个"
send_invites: "发送邀请"
title: "标题"
description: "描述"
languages_available: "选择编程语言："
all_lang: "所有编程语言"
- show_progress: "向所有该课堂的人展示学生的进度" # translation may need to change
- creating_class: "课堂创建中..."
+ show_progress: "向所有该班级的人展示学生的进度" # translation may need to change
+ creating_class: "班级创建中..."
purchasing_course: "购买课程中..."
buy_course: "购买课程"
buy_course1: "购买这个课程"
- create_class: "创建课堂"
+ create_class: "创建班级"
select_all_courses: "可半价一次购买所有课程！"
all_courses: "所有课程"
number_students: "学生人数"
- enter_number_students: "输入该课堂的学生上限人数"
- name_class: "命名您的课堂"
+ enter_number_students: "输入该班级的学生上限人数"
+ name_class: "命名您的班级"
displayed_course_page: "这将会在课程页面显示，可被修改。"
buy: "购买"
purchasing_for: "你正在购买许可证，课程为"
creating_for: "您正在创建一个课程为"
for: "人数上限为" # Like in 'for 30 students'
- receive_code: "然后您会收到一个解锁码，把它分发给你的学生用来注册你的课堂。"
+ receive_code: "然后您会收到一个解锁码，把它分发给你的学生用来注册你的班级。"
free_trial: "老师可免费试用"
get_access: "获得个人使用权在评估的目的下来使用所有课程。"
questions: "有疑问？"
@@ -906,7 +905,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
question: "问：" # Like in 'Question'
question1: "这些课程和单人游戏之间的有什么区别？"
answer: "答：" # Like in 'Answer'
- answer1: "单人游戏是专为个人而设，而课程是专为课堂而设。"
+ answer1: "单人游戏是专为个人而设，而课程是专为班级而设。"
answer2: "在單人遊戲中有物品、寶石、英雄選擇、練級、和內購應用。課程有課堂管理功能，和老師可根據學生的水平而調整教學進度。"
teachers_click: "老师点击这里"
students_click: "学生点击这里"
@@ -919,7 +918,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
see_the: "详细资讯请看"
more_info: "。"
choose_course: "选择您的课程："
- enter_code: "输入一个解锁码来加入已存在的课堂"
+ enter_code: "输入一个解锁码来加入已存在的班级"
enter_code1: "输入解锁码"
enroll: "注册"
pick_from_classes: "从目前的课程选择"
@@ -928,93 +927,6 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
topics: "题目"
hours_content: "内容时间："
get_free: "取得免费课程！"
-=======
- courses: "更多课程"
- not_enrolled: "您还没有报名参加本课程。"
- visit_pref: "请点击"
- visit_suf: "此页面报名参加。"
- select_class: "选择其中一项课程"
- unnamed: "*未命名*"
- select: "选择"
- unnamed_class: "未命名班级"
- edit_settings: "编辑班级设定"
- edit_settings1: "编辑班级设定"
- progress: "班级进度"
- add_students: "增加学生"
- stats: "统计"
- total_students: "学生总数:"
- average_time: "平均游戏时间:"
- total_time: "总共游戏时间:"
- average_levels: "平均完成关卡:"
- total_levels: "总共完成关卡:"
-# furthest_level: "Furthest level completed:"
-# concepts_covered: "Concepts Covered"
- students: "学生"
- students1: "学生"
- expand_details: "扩展细节"
-# concepts: "Concepts"
- levels: "等级"
-# played: "Played"
- play_time: "游戏时间:"
- completed: "已完成:"
- invite_students: "邀请其他学生加入班级。"
- invite_link_header: "点击参加课程"
- invite_link_p_1: "分享给您想分享的其他人以加入课程"
- invite_link_p_2: "或者发送邮件给他们:"
-# capacity_used: "Course slots used:"
- enter_emails: "输入被邀请的E-mail地址，一行一个"
- send_invites: "发送邀请"
- title: "标题"
- description: "内容描述"
-# languages_available: "Select programming languages available to the class:"
- all_lang: "所有语言"
-# show_progress: "Show student progress to everyone in the class"
- creating_class: "创建班级中..."
-# purchasing_course: "Purchasing course..."
- buy_course: "购买课程"
- buy_course1: "购买此课程"
- create_class: "创建班级"
-# select_all_courses: "Select 'All Courses' for a 50% discount!"
- all_courses: "所有课程"
- number_students: "学生数量"
-# enter_number_students: "Enter the number of students you need for this class."
-# name_class: "Name your class"
-# displayed_course_page: "This will be displayed on the course page for you and your students. It can be changed later."
-# buy: "Buy"
-# purchasing_for: "You are purchasing a license for"
-# creating_for: "You are creating a class for"
-# for: "for" # Like in 'for 30 students'
-# receive_code: "Afterwards you will receive an unlock code to distribute to your students, which they can use to enroll in your class."
-# free_trial: "Free trial for teachers!"
-# get_access: "to get individual access to all courses for evalutaion purposes."
-# questions: "Questions?"
-# faq: "Courses FAQ"
-# question: "Q:" # Like in 'Question'
-# question1: "What's the difference between these courses and the single player game?"
-# answer: "A:" # Like in 'Answer'
-# answer1: "The single player game is designed for individuals, while the courses are designed for classes."
-# answer2: "The single player game has items, gems, hero selection, leveling up, and in-app purchases. Courses have classroom management features and streamlined student-focused level pacing."
-# teachers_click: "Teachers Click Here"
-# students_click: "Students Click Here"
-# courses_on_coco: "Courses on CodeCombat"
-# designed_to: "Courses are designed to introduce computer science concepts using CodeCombat's fun and engaging environment. CodeCombat levels are organized around key topics to encourage progressive learning, over the course of 5 hours."
-# more_in_less: "Learn more in less time"
-# no_experience: "No coding experience necesssary"
-# easy_monitor: "Easily monitor student progress"
-# purchase_for_class: "Purchase a course for your entire class. It's easy to sign up your students!"
-# see_the: "See the"
-# more_info: "for more information."
-# choose_course: "Choose Your Course:"
-# enter_code: "Enter an unlock code to join an existing class"
-# enter_code1: "Enter unlock code"
-# enroll: "Enroll"
-# pick_from_classes: "Pick from your current classes"
-# enter: "Enter"
-# or: "Or"
-# topics: "Topics"
-# hours_content: "Hours of content:"
-# get_free: "Get FREE course"
->>>>>>> codecombat/master
classes:
archmage_title: "大法师"