diff --git a/.gitignore b/.gitignore
index dc154815f..2c94a37bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,3 +96,5 @@ npm-debug.log*
 temp/
 ### If you add something here, copy it to the end of .npmignore, too. ###
 
+
+codecombat/
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index a86812edf..9e533f3a5 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -336,8 +336,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
 #    tip_open_source_contribute: "You can help CodeCombat improve!"
 #    tip_recurse: "To iterate is human, to recurse divine. - L. Peter Deutsch"
-#    tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus"
-#    tip_strong_opponents: "Even the strongest of opponents always has a weakness. - Itachi Uchiha"
+#    tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus("The Matrix")"
+#    tip_strong_opponents: "Even the strongest of opponents always has a weakness. - Itachi Uchiha("Naruto")"
 #    tip_paper_and_pen: "Before you start coding, you can always plan with a sheet of paper and a pen."
 
 #  game_menu:
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 71ed08a4a..719be3020 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -4,8 +4,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     no_ie: "抱歉！ Internet Explorer 8 等老式浏览器无法使用本网站。" # Warning that only shows up in IE8 and older
     no_mobile: "CodeCombat不是针对手机设备设计的，所以可能无法达到最好的体验！" # Warning that shows up on mobile devices
     play: "开始游戏" # The big play button that opens up the campaign view.
-    old_browser: "噢, 你的浏览器太老了, 不能运行CodeCombat. 抱歉!" # Warning that shows up on really old Firefox/Chrome/Safari
-    old_browser_suffix: "你可以继续重试下去，但八成不起作用，更新浏览器吧亲～"
+    old_browser: "噢, 您的浏览器太老了, 不能运行CodeCombat. 抱歉!" # Warning that shows up on really old Firefox/Chrome/Safari
+    old_browser_suffix: "您可以继续重试下去，但八成不起作用，更新浏览器吧亲～"
     ipad_browser: "坏消息:CodeCombat无法在iPad的浏览器中运行。好消息：我们的iPad应用正在等待苹果公司审批。"
     campaign: "战役模式"
     for_beginners: "适合初学者"
@@ -42,7 +42,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
   diplomat_suggestion:
     title: "帮助我们翻译CodeCombat" # This shows up when a player switches to a non-English language using the language selector.
     sub_heading: "我们需要您的语言技能"
-    pitch_body: "我们开发了英文版的CodeCombat，但是CodeCombat的玩家遍布全球。对于不熟悉英语的中文玩家，他们希望能玩简体中文版的CodeCombat，如果你中英文都很熟练，考虑加入我们“外交官”行列并参与CodeCombat的翻译，帮忙把CodeCombat网站和所有关卡翻译成简体中文。感谢！"
+    pitch_body: "我们开发了英文版的CodeCombat，但是CodeCombat的玩家遍布全球。对于不熟悉英语的中文玩家，他们希望能玩简体中文版的CodeCombat，如果您中英文都很熟练，考虑加入我们“外交官”行列并参与CodeCombat的翻译，帮忙把CodeCombat网站和所有关卡翻译成简体中文。感谢！"
     missing_translations: "没被翻译的文字将以英文显示。"
     learn_more: "了解更多成为翻译人员的说明"
     subscribe_as_diplomat: "提交翻译人员申请"
@@ -78,17 +78,17 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     awaiting_levels_adventurer_suffix: "来优先尝试新关卡"
     adjust_volume: "音量调节"
     campaign_multiplayer: "多人竞技场"
-    campaign_multiplayer_description: "……在这里你可以与其他玩家进行代码肉搏战。"
+    campaign_multiplayer_description: "……在这里您可以与其他玩家进行代码肉搏战。"
     campaign_old_multiplayer: "（过时的）旧的多人竞技场"
-    campaign_old_multiplayer_description: "一个文明时代的遗迹。没有模拟运行这些老的、英雄少的多人竞技场。"
+    campaign_old_multiplayer_description: "多个文明时代的遗迹。但已没有模拟运行这些陈旧、英雄芜绝的多人竞技场。"
 
   share_progress_modal:
-    blurb: "你的进度真快！快告诉其他人你从CodeCombat学到了什么！" # {change}
+    blurb: "您的进度真快！快告诉其他人您从CodeCombat学到了什么！" # {change}
     email_invalid: "邮件地址不可用。"
     form_blurb: "输入他们的邮件地址，让他们知道CodeCombat的有趣"
     form_label: "您的邮件地址"
     placeholder: "邮件地址"
-    title: "你做的太好了！"
+    title: "做的很好，学徒"
 
   login:
     sign_up: "注册"
@@ -96,11 +96,11 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     logging_in: "正在登录"
     log_out: "登出"
     forgot_password: "忘记密码?"
-    authenticate_gplus: "使用 G+ 授权"
-    load_profile: "载入 G+ 档案"
+    authenticate_gplus: "使用 Google+ 授权"
+    load_profile: "载入 Google+ 档案"
     finishing: "完成..."
     sign_in_with_facebook: "Facebook账号登录"
-    sign_in_with_gplus: " G+ 账号登录"
+    sign_in_with_gplus: " Google+ 账号登录"
     signup_switch: "是否创建新账户?"
 
   signup:
@@ -108,8 +108,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     creating: "账户创建中……"
     sign_up: "注册"
     log_in: "登录"
-    social_signup: "或者，你可以通过Facebook或G+注册："
-    required: "在做这件事情之前你必须先注册。"
+    social_signup: "或者，您可以通过Facebook或Google+注册："
+    required: "在做这件事情之前您必须先注册。"
     login_switch: "已经注册过账户?"
 
   recover:
@@ -118,8 +118,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     recovery_sent: "找回账户邮件已发送。"
 
   items:
-    primary: "右手"
-    secondary: "左手"
+    primary: "主要武器"
+    secondary: "次要武器"
     armor: "盔甲"
     accessories: "配饰"
     misc: "辅助道具"
@@ -240,7 +240,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     victory_title_prefix: ""
     victory_title_suffix: " 完成"
     victory_sign_up: "保存进度"
-    victory_sign_up_poke: "想保存你的代码？创建一个免费账户吧！"
+    victory_sign_up_poke: "想保存您的代码？创建一个免费账户吧！"
     victory_rate_the_level: "评估关卡：" # Only in old-style levels.
     victory_return_to_ladder: "返回"
     victory_play_continue: "继续游戏"
@@ -248,12 +248,12 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     victory_go_home: "返回主页"
     victory_review: "给我们反馈！"
     victory_review_placeholder: "关卡如何?"
-    victory_hour_of_code_done: "你完成了吗?"
+    victory_hour_of_code_done: "您完成了吗?"
     victory_hour_of_code_done_yes: "是的, 完成了!"
     victory_experience_gained: "获得经验"
     victory_gems_gained: "获得宝石"
     victory_new_item: "新的物品"
-    victory_viking_code_school: "这关真的超难! 如果你想成为一个软件开发人员，你就应该去试一下Viking Code School。在这里你可以把你的知识增长到另一个台阶。只需要14周你就能成为一个专业的网页开发人员。"
+    victory_viking_code_school: "这关真的超难! 如果您想成为一个软件开发人员，您就应该去试一下Viking Code School。在这里您可以把您的知识增长到另一个台阶。只需要14周您就能成为一个专业的网页开发人员。"
     victory_become_a_viking: "成为一个维京人吧"
     guide_title: "指南"
     tome_minion_spells: "助手的咒语" # Only in old-style levels.
@@ -268,7 +268,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tome_see_all_methods: "查看所有能够编辑的方法" # Title text for method list selector (shown when there are multiple programmable methods).
     tome_select_a_thang: "选择人物来 "
     tome_available_spells: "可用的法术"
-    tome_your_skills: "你的技能"
+    tome_your_skills: "您的技能"
     tome_help: "帮助"
     tome_current_method: "当前方法"
     hud_continue_short: "继续"
@@ -277,7 +277,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     keyboard_shortcuts: "快捷键"
     loading_ready: "载入完成!"
     loading_start: "开战"
-    problem_alert_title: "修正你的代码"
+    problem_alert_title: "修正您的代码"
     problem_alert_help: "帮助"
     time_current: "现在:"
     time_total: "最大:"
@@ -285,7 +285,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     non_user_code_problem_title: "不能读入关卡"
     infinite_loop_title: "有无限循环"
     infinite_loop_description: "建立世界的初始代码永远不会运行完毕。这可能是真的运行的很慢或者陷入了一个死循环。又或者可能存在bug。您可以尝试再次运行该代码，或者将代码重置为默认状态。如果仍旧解决不了，请让告诉我们。"
-    check_dev_console: "你也可以打开开发者界面看一下有什么可能出错了。"
+    check_dev_console: "您也可以打开开发者界面看一下有什么可能出错了。"
     check_dev_console_link: "(说明)"
     infinite_loop_try_again: "请重试"
     infinite_loop_reset_level: "重置等级"
@@ -300,24 +300,24 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_theory_practice: "在理论上，理论和实践之间是没有区别的。但在实践上，它们是有区别的。 - Yogi Berra"
     tip_error_free: "有两种方式可以写出没有错误的程序；但是只有第三种方式是有效的。 - Alan Perlis"
     tip_debugging_program: "如果说调试是清除错误的过程，那么编程就是放置错误的过程。- Edsger W. Dijkstra"
-    tip_forums: "到论坛去告诉我们你的想法！"
+    tip_forums: "到论坛去告诉我们您的想法！"
     tip_baby_coders: "在未来，就算小孩都能成为大法师。"
     tip_morale_improves: "在士气提升之前会一直进行读取。"
     tip_all_species: "我们相信每一个人都有同等的机会学习编程"
     tip_reticulating: "网格状锯齿。(指Maxis开发的许多游戏，如《模拟城市》、《孢子》中，加载进程中跑动时出现的卡顿现象)"
     tip_harry: "巫师, "
     tip_great_responsibility: "更强的编程技巧也意味着有更高的责任来进行调试。"
-    tip_munchkin: "如果你不吃掉你的蔬菜, 一个小矮人将在你睡着之后来找你。"
+    tip_munchkin: "如果您不吃掉您的蔬菜, 一个小矮人将在您睡着之后来找您。"
     tip_binary: "这个世界上只有10种人: 那些懂二进制的, 还有那些不懂二进制的。"
     tip_commitment_yoda: "一个程序员必须有高度的责任感和一颗认真的心。 - 尤达大师"
     tip_no_try: "做。 或是不做。 这世上不存在'尝试'这种东西。 - 尤达大师"
-    tip_patience: "你必须要有耐心，年轻的学徒 - 尤达大师"
+    tip_patience: "您必须要有耐心，年轻的学徒 - 尤达大师"
     tip_documented_bug: "一个写在文档里的漏洞不算漏洞, 那是个特色。"
     tip_impossible: "在事情未完成之前，一切都看似不可能。 - 纳尔逊·曼德拉"
-    tip_talk_is_cheap: "多说无用, 亮出你的代码。 - Linus Torvalds"
-    tip_first_language: "你所经历过最可怕的事情是你的第一门编程语言。 - Alan Kay"
+    tip_talk_is_cheap: "多说无用, 亮出您的代码。 - Linus Torvalds"
+    tip_first_language: "您所经历过最可怕的事情是您的第一门编程语言。 - Alan Kay"
     tip_hardware_problem: "问：换一个电灯泡需要几位程序员参与？答：一个都不需要，因为这属于硬件问题。"
-    tip_hofstadters_law: "侯世达定律：做事所花费的时间总是比你预期的要长，即使你的预期中考虑了侯世达定律。"
+    tip_hofstadters_law: "侯世达定律：做事所花费的时间总是比您预期的要长，即使您的预期中考虑了侯世达定律。"
     tip_premature_optimization: "过早的优化是万恶之源。 - 高德纳"
     tip_brute_force: "拿不准时就用穷举法。 - Ken Thompson"
     tip_extrapolation: "世界上只有两类人：一类人能够根据不完整的数据进行推断……"
@@ -330,15 +330,15 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_lines_of_code: "以代码行数为标准管理程序开发的进度跟用重量为标准管理飞船建造的进度一样愚蠢。 — Bill Gates"
     tip_source_code: "我想改变世界，但是他们不给我源代码。"
     tip_javascript_java: "Java和JavaScript的关系就好比是马和马云。 - Chris Heilmann"
-    tip_move_forward: "不管你做什么，前进就对了。 - Martin Luther King Jr."
-    tip_google: "有问题又不能解决？谷歌搜下就行了！"
-    tip_adding_evil: "加入万恶的压力。"
+    tip_move_forward: "不管您做什么，前进就对了。 - Martin Luther King Jr."
+    tip_google: "有问题又不能解决？谷歌搜下就行了！" ＃not sure China can use google?
+    tip_adding_evil: "增加一个邪恶掐捏"
     tip_hate_computers: "那些认为他们讨厌电脑的人，其实他们讨厌的是垃圾程序编写员。- Larry Niven"
-    tip_open_source_contribute: "你可以帮助「CodeCombat」提高！"
+    tip_open_source_contribute: "您可以帮助「CodeCombat」提高！"
     tip_recurse: "迭代为人，递归为神 - L. Peter Deutsch"
-    tip_free_your_mind: "丢掉一切私心杂念，丢掉害怕、疑问和拒信，解放你的思想。 - Morpheus（黑客帝国）"
-    tip_strong_opponents: "即使是最强大的对手也是有弱点的. - Itachi Uchiha"
-#    tip_paper_and_pen: "Before you start coding, you can always plan with a sheet of paper and a pen."
+    tip_free_your_mind: "丢掉一切私心杂念，丢掉害怕、疑问和拒信，解放您的思想。 - Morpheus（黑客帝国）"
+    tip_strong_opponents: "即使是最强大的对手也是有弱点的. - 宇智波鼬《火影忍者》"
+    tip_paper_and_pen: "在您开始编码之前，您可以随时用一张纸和一支笔作计划。"
 
   game_menu:
     inventory_tab: "道具箱"
@@ -349,12 +349,12 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     guide_tips: "小技巧"
     multiplayer_tab: "多人游戏"
     auth_tab: "注册"
-    inventory_caption: "装备你的英雄"
+    inventory_caption: "装备您的英雄"
     choose_hero_caption: "选择英雄和语言"
     save_load_caption: "... 观看历史"
     options_caption: "确认设置"
     guide_caption: "文档和提示"
-    multiplayer_caption: "与你的朋友一起玩!"
+    multiplayer_caption: "与您的朋友一起玩!"
     auth_caption: "保存进度"
 
   leaderboard:
@@ -398,39 +398,39 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     price: "x3500 / 月"
 
   subscribe:
-    comparison_blurb: "亲，订阅CodeCombat，大力的提升你的技能！"
-    feature1: "60+ 基本关卡（4个世界）" # {change}
-    feature2: "7 个强大 <strong>英雄</strong>以及各式非凡技能!" # {change}
-    feature3: "30+ 奖励关卡" # {change}
+    comparison_blurb: "亲，订阅CodeCombat，大力的提升您的技能！"
+    feature1: "100+ 基本关卡（4个世界）" # {change}
+    feature2: "10 个强大 <strong>英雄</strong>以及各式非凡技能!" # {change}
+    feature3: "70+ 奖励关卡" # {change}
     feature4: "每月享有3500额外宝石"
     feature5: "视频教学"
     feature6: "专业邮件支援"
-    feature7: "私人 <strong>氏族</strong>"
+    feature7: "私人 <strong>部落</strong>"
     free: "免费"
     month: "月"
     subscribe_title: "订阅"
     unsubscribe: "取消订阅"
     confirm_unsubscribe: "确认取消订阅"
-    never_mind: "没关系，我们依然喜欢你"
+    never_mind: "没关系，我们依然喜欢您"
     thank_you_months_prefix: "感谢您这"
     thank_you_months_suffix: "个月以来对我们的支持。"
     thank_you: "感谢您支持CodeCombat."
     sorry_to_see_you_go: "真舍不得亲离开啊! 请一定要让我们知道哪里做的还不够好。"
     unsubscribe_feedback_placeholder: "噢, 我们做了神马?"
-    parent_button: "请求你的父母"
-    parent_email_description: "我们会发送邮件给你的父母让他们帮你订阅CodeCombat。"
+    parent_button: "请求您的父母"
+    parent_email_description: "我们会发送邮件给您的父母让他们帮您订阅CodeCombat。"
     parent_email_input_invalid: "邮件地址不正确。"
     parent_email_input_label: "父母邮件地址"
     parent_email_input_placeholder: "输入父母邮件地址"
     parent_email_send: "发送邮件"
     parent_email_sent: "邮件已发送!"
-    parent_email_title: "什么是你父母的邮件地址？"
+    parent_email_title: "什么是您父母的邮件地址？"
     parents: "致家长"
     parents_title: "您的孩子将要学习编写程序。" # {change}
     parents_blurb1: "通过使用CodeCombat，您的孩子将学习编写真正的程序代码。他们将学到简单指令，进而处理更复杂的问题。"
-    parents_blurb1a: "不用怀疑计算机编程能力将是您的孩子作为一个成年人的基本技能。到2020年，77%的工作将会需要编码能力，并且软件工程师将在世界各地成为高需求职业。你知道吗，计算机科学是收入最高的大学学位？"
+    parents_blurb1a: "不用怀疑计算机编程能力将是您的孩子作为一个成年人的基本技能。到2020年，77%的工作将会需要编码能力，并且软件工程师将在世界各地成为高需求职业。您知道吗，计算机科学是收入最高的大学学位？"
     parents_blurb2: "每月支付9.9美元，他们每周都会有新的挑战，并且通过电子邮件获得专业程序员的指导。" # {change}
-    parents_blurb3: "无风险承诺：100%退款，一键退款。"
+    parents_blurb3: "无风险承诺：100%退款，一键取消订阅。"
     payment_methods: "付费方式"
     payment_methods_title: "可接受的付款方式"
     payment_methods_blurb1: "我们现有的付费方式有信用卡和支付宝"
@@ -492,7 +492,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     blocks: "格挡" # As in "this shield blocks this much damage"
     backstab: "背刺" # As in "this dagger does this much backstab damage"
     skills: "技能"
-    attack_1: "交易"
+    attack_1: "造成"
     attack_2: "列表"
     attack_3: "武器攻击力."
     health_1: "收益"
@@ -536,7 +536,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     editor_config_level_language_label: "本关卡编程语言"
     editor_config_level_language_description: "针对本关设定使用的编程语言。"
     editor_config_default_language_label: "默认编程语言"
-    editor_config_default_language_description: "在开始新游戏前确认你要在这个等级的游戏中使用的编程语言。"
+    editor_config_default_language_description: "在开始新游戏前确认您要在这个等级的游戏中使用的编程语言。"
     editor_config_keybindings_label: "快捷键绑定"
     editor_config_keybindings_default: "默认 (Ace)"
     editor_config_keybindings_description: "在命令编辑器中增加已知的快捷键。"
@@ -551,13 +551,13 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 
   about:
     why_codecombat: "为什么选择CodeCombat?"
-    why_paragraph_1: "如果你想学习如何编程，你根本不需要上课。你需要的是写好多代码，并且享受这个过程。"
+    why_paragraph_1: "如果您想学习如何编程，您根本不需要上课。您需要的是写好多代码，并且享受这个过程。"
     why_paragraph_2_prefix: "这才是编程的要义。编程应该是有趣的过程。不该是"
     why_paragraph_2_italic: "哇又一个奖章诶"
     why_paragraph_2_center: "那种“好玩”，而是"
     why_paragraph_2_italic_caps: "老妈，我得先把这关打完！"
-    why_paragraph_2_suffix: "这就是为什么CodeCombat是个多人游戏，而不是一个游戏化的编程课。你不停，我们就不停——但这次这是件好事。"
-    why_paragraph_3: "如果你一定要对游戏上瘾，那就对这个游戏上瘾，然后成为科技时代的法师吧。"
+    why_paragraph_2_suffix: "这就是为什么CodeCombat是个多人游戏，而不是一个游戏化的编程课。您不停，我们就不停——但这次这是件好事。"
+    why_paragraph_3: "如果您一定要对游戏上瘾，那就对这个游戏上瘾，然后成为科技时代的法师吧。"
     press_title: "博客/媒体"
     press_paragraph_1_prefix: "想要报道我们？ 您可以自由下载和使用"
     press_paragraph_1_link: "成套宣传包"
@@ -595,21 +595,21 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     teacher_subs_2: "教师调查"
     teacher_subs_3: "建立您的订阅。"
     sub_includes_title: "订阅里包含了什么内容？"
-    sub_includes_1: "除了100多个基础关卡，学生包月订阅还可以使用这些附加功能："
-    sub_includes_2: "超过60个练习关卡" # {change}
+    sub_includes_1: "除了100＋个基础关卡，学生包月订阅还可以使用这些附加功能："
+    sub_includes_2: "超过70个练习关卡" # {change}
     sub_includes_3: "视频教学"
     sub_includes_4: "优质的电子邮件支持"
     sub_includes_5: "10个具有独特技能的新英雄"
     sub_includes_6: "每月享有3500额外宝石"
-    sub_includes_7: "私有团队"
+    sub_includes_7: "私人部落"
     monitor_progress_title: "我要如何查看学生的进度？"
     monitor_progress_1: "要查看学生的进度，可以通过建立一个"
-    monitor_progress_2: "在你的课程。"
-    monitor_progress_3: "为了添加一个学生，可以给他们发送一个你的团队的邀请链接，这个在"
+    monitor_progress_2: "在您的课程。"
+    monitor_progress_3: "为了添加一个学生，可以给他们发送一个您的部落的邀请链接，这个在"
     monitor_progress_4: "页面。"
-    monitor_progress_5: "当他们加入之后，你可以在你的团队页面看到这些学生的进度汇总。"
-    private_clans_1: "私有团队为每个学生增加了隐私和详细的进度信息。"
-    private_clans_2: "为了添加一个私有团队，可以勾选'私有团队'复选框，在你建立一个"
+    monitor_progress_5: "当他们加入之后，您可以在您的部落页面看到这些学生的进度汇总。"
+    private_clans_1: "私人部落为每个学生增加了隐私和详细的进度信息。"
+    private_clans_2: "为了添加一个私人部落，可以勾选'私人部落'选择框，在您建立一个"
     private_clans_3: "。"
     who_for_title: "谁是CodeCombat的使用对象呢？"
     who_for_1: "我们建议让9岁及以上的学生使用CodeCombat。无需任何编程经验。"
@@ -621,8 +621,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     how_much_title: "每月的订阅费用是多少?"
     how_much_1: ""
     how_much_2: "每月订阅"
-    how_much_3: "每月$9.99, 并可随时要求退款."
-    how_much_4: "另外，团体购买者将享受折扣优惠"
+    how_much_3: "每月9.99美元，并可随时取消订阅。"
+    how_much_4: "另外，团体购买者将享受折扣优惠："
     how_much_5: "我们接受一次性的打折购买以及每年订阅的团体，比如班级或者学校。请联系"
     how_much_6: "来获取详情。"
     more_info_title: "我可以在哪里找到更多信息？"
@@ -630,36 +630,35 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     more_info_2: "教师论坛"
     more_info_3: "是个与其他使用CodeCombat的教育工作者联系的良好平台。"
     sys_requirements_title: "系统需求"
-    sys_requirements_1: "因为CodeCombat是个游戏，它对于电脑的要求很高以运行的顺畅。我们已经优化过他以便让他能在每一个最新浏览器或是比较旧的电脑跑得顺畅，所以每一个人都能享受CodeCombat带来的乐趣。如上，为了使你顺利的完成Hour of Code的学习，我们建议你：" # {change}
+    sys_requirements_1: "因为CodeCombat是个游戏，它对于电脑的要求很高以运行的顺畅。我们已经优化过他以便让他能在每一个最新浏览器或是比较旧的电脑跑得顺畅，所以每一个人都能享受CodeCombat带来的乐趣。如上，为了使您顺利的完成Hour of Code的学习，我们建议您：" # {change}
     sys_requirements_2: "使用最新版本的Chrome或是Firefox." # {change}
 
-#  teachers_survey:
-#    title: "Teacher Survey"
-#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
-#    retrieving: "Retrieving information..."
-#    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed."
-#    approved_1: "Your application for a free trial subscription was"
-#    approved_2: "approved."
-#    approved_3: "Further instructions have been sent to"
-#    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied."
-#    contact_1: "Please contact"
-#    contact_2: "if you have further questions."
-#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
-#    description_2: "teachers"
-#    description_3: "page."
-#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
-#    email: "Email Address"
-#    school: "Name of School"
-#    location: "Name of City"
-#    age_students: "How old are your students?"
-#    under: "Under"
-#    other: "Other:"
-#    amount_students: "How many students do you teach?"
-#    hear_about: "How did you hear about CodeCombat?"
-#    fill_fields: "Please fill out all fields."
-#    thanks: "Thanks! We'll send you setup instructions shortly."
+  teachers_survey:
+    title: "教师调查"
+    must_be_logged: "您需要先登入。请先注册或者在上方的目录中点击登入。"
+    retrieving: "检索信息中..."
+    being_reviewed_1: "您的免费订阅试用申请正在"
+    being_reviewed_2: "审核。"
+    approved_1: "您的免费订阅试用申请已被"
+    approved_2: "批准。"
+    approved_3: "进一步的说明已被送往"
+    denied_1: "您的免费订阅试用申请已被"
+    denied_2: "拒絕。"
+    contact_1: "请联系"
+    contact_2: "如果我们为教师提供免费订阅用评估的目的。您可以找到更多的信息在我们的"
+    description_2: "教师"
+    description_3: "页面。"
+    description_4: "请填写此简单问卷，我们将会向您的电子邮件发送设置说明。"
+    email: "电邮地址"
+    school: "学校名字"
+    location: "城市"
+    age_students: "您的学生年龄为多少？"
+    under: "几岁以下"
+    other: "其他:"
+    amount_students: "请问您有多少学生需要教导？"
+    hear_about: "您是怎么知道CodeComabat的？"
+    fill_fields: "请填写所有问题。"
+    thanks: "非常感谢！我们会很快寄您设置说明。"
 
   versions:
     save_version_title: "保存新版本"
@@ -669,25 +668,25 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     cla_url: "贡献者许可协议"
     cla_suffix: "。"
     cla_agree: "我同意"
-    owner_approve: "你所做出的修改必须经拥有者确认才能生效。"
+    owner_approve: "您所做出的修改必须经拥有者确认才能生效。"
 
   contact:
     contact_us: "联系我们"
-    welcome: "我们很乐意收到你的邮件！请用这个表单给我们发邮件。 "
-    forum_prefix: "如果你想发布任何公开的东西, 可以试试"
+    welcome: "我们很乐意收到您的邮件！请用这个表单给我们发邮件。 "
+    forum_prefix: "如果您想发布任何公开的东西, 可以试试"
     forum_page: "我们的论坛"
     forum_suffix: ""
     faq_prefix: "这里还有一个"
     faq: "FAQ"
-    subscribe_prefix: "如果你需要帮助解决一个关卡，请"
+    subscribe_prefix: "如果您需要帮助解决一个关卡，请"
     subscribe: "订阅CodeCombat"
-    subscribe_suffix: "并且我们很乐意给你提供代码相关的帮助"
-    subscriber_support: "既然你已经订阅了CodeCombat，我们将给你提供优先帮助"
+    subscribe_suffix: "并且我们很乐意给您提供代码相关的帮助"
+    subscriber_support: "既然您已经订阅了CodeCombat，我们将给您提供优先帮助"
     screenshot_included: "包含截屏"
     where_reply: "我们应该回复谁？"
     send: "反馈意见"
     contact_candidate: "联系参选人" # Deprecated
-    recruitment_reminder: "用这张表格来联系你希望面试的求职者。但请记住如果你雇佣了他，CodeCombat会收取这位员工第一年工资的15%作为佣金。佣金需在雇佣此员工时就付清并且在之后的90天内如果此员工离职会100%退款。兼职，远程办公员工，合同工以及实习生都可免除此费用。" # Deprecated
+    recruitment_reminder: "用这张表格来联系您希望面试的求职者。但请记住如果您雇佣了他，CodeCombat会收取这位员工第一年工资的15%作为佣金。佣金需在雇佣此员工时就付清并且在之后的90天内如果此员工离职会100%退款。兼职，远程办公员工，合同工以及实习生都可免除此费用。" # Deprecated
 
   account_settings:
     title: "账户设置"
@@ -706,8 +705,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     admin: "管理"
     new_password: "新密码"
     new_password_verify: "核实"
-    type_in_email: "输入你的邮箱地址来确认删除" # {change}
-    type_in_password: "同样的，输入你的密码。"
+    type_in_email: "输入您的邮箱地址来确认删除" # {change}
+    type_in_password: "同样的，输入您的密码。"
     email_subscriptions: "邮箱订阅"
     email_subscriptions_none: "取消订阅"
     email_announcements: "通知"
@@ -718,7 +717,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     email_any_notes_description: "取消接收所有活动提醒邮件"
     email_news: "新消息"
     email_recruit_notes: "工作机会"
-    email_recruit_notes_description: "如果你干的不错, 我们会联系并提供你更好的工作。"
+    email_recruit_notes_description: "如果您干的不错, 我们会联系并提供您更好的工作。"
     contributor_emails: "贡献者通知"
     contribute_prefix: "我们在寻找志同道合的人！请到"
     contribute_page: "贡献页面"
@@ -729,8 +728,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     password_mismatch: "密码不匹配。"
     password_repeat: "请重新键入密码。"
     job_profile: "工作经历" # Rest of this section (the job profile stuff and wizard stuff) is deprecated
-    job_profile_approved: "你填写的工作经历将由CodeCombat认证。 雇主将看到这些信息，除非你将它设置为不启用状态或者连续四周没有更新。"
-    job_profile_explanation: "你好! 请填写下列信息, 我们将使用它帮你寻找一份软件开发的工作。"
+    job_profile_approved: "您填写的工作经历将由CodeCombat认证。 雇主将看到这些信息，除非您将它设置为不启用状态或者连续四周没有更新。"
+    job_profile_explanation: "您好! 请填写下列信息, 我们将使用它帮您寻找一份软件开发的工作。"
     sample_profile: "查看示例"
     view_profile: "浏览个人信息"
 
@@ -752,20 +751,20 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     toggle_debug: "显示/关闭调试信息"
     toggle_grid: "显示/关闭网格提示"
     toggle_pathfinding: "显示/关闭路径寻找提示"
-    beautify: "利用标准编码格式美化你的代码。"
+    beautify: "利用标准编码格式美化您的代码。"
     maximize_editor: "最大化/最小化代码编辑器"
 
   community:
     main_title: "CodeCombat社区"
-    introduction: "看看下面这些你可以参与的项目，如果有你喜欢的就加入进来吧。 我们期待着与您一起工作。"
+    introduction: "看看下面这些您可以参与的项目，如果有您喜欢的就加入进来吧。 我们期待着与您一起工作。"
     level_editor_prefix: "使用"
-    level_editor_suffix: "来创建和编辑关卡。你可以通过这个工具来给你的同学，朋友，兄弟姐妹们设计谜题，或者用于教学或比赛。如果你觉得直接开始建立一个关卡可能非常困难，那么可以先从一个现成（但尚未完成）的关卡开始做起。"
+    level_editor_suffix: "来创建和编辑关卡。您可以通过这个工具来给您的同学，朋友，兄弟姐妹们设计谜题，或者用于教学或比赛。如果您觉得直接开始建立一个关卡可能非常困难，那么可以先从一个现成（但尚未完成）的关卡开始做起。"
     thang_editor_prefix: "我们管游戏中的单位叫 '物品'。 利用"
     thang_editor_suffix: "来改良CodeCombat中的原材料。让游戏中的东西可以被捡起来扔出去，改变游戏动画的指向，调整一些东西的生命值，或上传您自制的素材。"
-    article_editor_prefix: "你在游戏中发现了错误了吗？想要自己设计一些指令吗？来看看我们的"
+    article_editor_prefix: "您在游戏中发现了错误了吗？想要自己设计一些指令吗？来看看我们的"
     article_editor_suffix: "来帮助玩家从游戏中学到更多的知识。"
     find_us: "通过这些站点联系我们"
-#    social_github: "Check out all our code on GitHub"
+    social_github: "在GitHub上查看我们的代码"
     social_blog: "阅读CodeCombat在Sett上面的博客"
     social_discource: "在我们的论坛参与讨论"
     social_facebook: "关注CodeCombat的Facebook主页"
@@ -774,54 +773,54 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     social_hipchat: "在公共的CodeCombat HipChat聊天室与我们进行交流"
     contribute_to_the_project: "为项目做贡献"
 
-#  clans:
-#    clan: "Clan"
-#    clans: "Clans"
-#    new_name: "New clan name"
-#    new_description: "New clan description"
-#    make_private: "Make clan private"
-#    subs_only: "subscribers only"
-#    create_clan: "Create New Clan"
-#    private_preview: "Preview"
-#    public_clans: "Public Clans"
-#    my_clans: "My Clans"
-#    clan_name: "Clan Name"
-#    name: "Name"
-#    chieftain: "Chieftain"
-#    type: "Type"
-#    edit_clan_name: "Edit Clan Name"
-#    edit_clan_description: "Edit Clan Description"
-#    edit_name: "edit name"
-#    edit_description: "edit description"
-#    private: "(private)"
-#    summary: "Summary"
-#    average_level: "Average Level"
-#    average_achievements: "Average Achievements"
-#    delete_clan: "Delete Clan"
-#    leave_clan: "Leave Clan"
-#    join_clan: "Join Clan"
-#    invite_1: "Invite:"
-#    invite_2: "*Invite players to this Clan by sending them this link."
-#    members: "Members"
-#    progress: "Progress"
-#    not_started_1: "not started"
-#    started_1: "started"
-#    complete_1: "complete"
-#    exp_levels: "Expand levels"
-#    rem_hero: "Remove Hero"
-#    status: "Status"
-#    complete_2: "Complete"
-#    started_2: "Started"
-#    not_started_2: "Not Started"
-#    view_solution: "Click to view solution."
-#    latest_achievement: "Latest Achievement"
-#    playtime: "Playtime"
-#    last_played: "Last played"
+  clans:
+    clan: "部落"
+    clans: "部落"
+    new_name: "新部落的名字"
+    new_description: "新部落的描述"
+    make_private: "设定部落为私人"
+    subs_only: "只限订阅"
+    create_clan: "创建新的部落"
+    private_preview: "预览"
+    public_clans: "公开部落"
+    my_clans: "我的部落"
+    clan_name: "部落名字"
+    name: "名字"
+    chieftain: "首领"
+    type: "种类"
+    edit_clan_name: "编辑部落的名字"
+    edit_clan_description: "编辑部落的描述"
+    edit_name: "编辑名字"
+    edit_description: "编辑描述"
+    private: "(私人)"
+    summary: "综述"
+    average_level: "平均等级"
+    average_achievements: "平均成就"
+    delete_clan: "刪除部落"
+    leave_clan: "离开部落"
+    join_clan: "加人部落"
+    invite_1: "邀请："
+    invite_2: "*透过这个链接来邀请玩家加入部落。"
+    members: "成员"
+    progress: "进度"
+    not_started_1: "还没开始"
+    started_1: "已开始"
+    complete_1: "完成"
+    exp_levels: "展开关卡"
+    rem_hero: "移除英雄"
+    status: "状态"
+    complete_2: "完成"
+    started_2: "已开始"
+    not_started_2: "还没开始"
+    view_solution: "点击查阅答案。"
+    latest_achievement: "最新成就"
+    playtime: "游戏时间"
+    last_played: "最后玩了"
 
   classes:
     archmage_title: "大法师"
     archmage_title_description: "(代码编写人员)"
-    archmage_summary: "如果你是对教育类游戏感兴趣的程序开发者，那么就选择大法师来为CodeCombat编写代码吧！"
+    archmage_summary: "如果您是对教育类游戏感兴趣的程序开发者，那么就选择大法师来为CodeCombat编写代码吧！"
     artisan_title: "工匠师"
     artisan_title_description: "(关卡创造人员)"
     artisan_summary: "建立游戏关卡并分享给朋友们。那么就选择工匠来教其他人编程吧。"
@@ -853,8 +852,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     indoor: "室内"
     desert: "沙漠"
     grassy: "草地"
-#    mountain: "Mountain"
-#    glacier: "Glacier"
+    mountain: "高山"
+    glacier: "冰川"
     small: "小的"
     large: "大的"
     fork_title: "派生新版本"
@@ -914,86 +913,86 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     thang_search_title: "在这里搜索物品类型"
     level_search_title: "在这里搜索关卡"
     achievement_search_title: "搜索目标"
-#    poll_search_title: "Search Polls"
-    read_only_warning2: "提示：你不能保存任何编辑，因为你没有登陆"
+    poll_search_title: "搜寻投票"
+    read_only_warning2: "提示：您不能保存任何编辑，因为您没有登陆"
     no_achievements: "这个关卡还没有被赋予任何目标。"
     achievement_query_misc: "关闭杂项的成就"
     achievement_query_goals: "关闭通关的成就"
     level_completion: "关卡完成"
     pop_i18n: "完善 I18N"
     tasks: "任务"
-#    clear_storage: "Clear your local changes"
-#    add_system_title: "Add Systems to Level"
+    clear_storage: "清除您本地的变更"
+    add_system_title: "添加系统到关卡"
     done_adding: "添加完毕"
 
   article:
     edit_btn_preview: "预览"
     edit_article_title: "编辑提示"
 
-#  polls:
-#    priority: "Priority"
+  polls:
+    priority: "优先次序"
 
   contribute:
     page_title: "贡献"
-    intro_blurb: "CodeCombat是完全开源的软体！上千个玩家帮助了我们建设了这整个游戏，就是你今天看到的一样！快加入我们然后为CodeCombat打开新的章节，将世界带领进入编程世代前进吧！"
-    alert_account_message_intro: "你好！"
+    intro_blurb: "CodeCombat是完全开源的软体！上千个玩家帮助了我们建设了这整个游戏，就是您今天看到的一样！快加入我们然后为CodeCombat打开新的章节，将世界带领进入编程世代前进吧！"
+    alert_account_message_intro: "您好！"
     alert_account_message: "想要订阅邮件？ 您必须先登录"
-    archmage_introduction: "制作游戏时，最令人激动的事莫过于整合诸多东西。图像、音响、实时网络交流、社交网络，从底层数据库管理到服务器运维，再到用户界面的设计和实现。制作游戏有很多事情要做，所以如果你有编程经验,  那么你应该选择这个职业。我们会很高兴在制作史上最好编程游戏的路上有你的陪伴。"
+    archmage_introduction: "制作游戏时，最令人激动的事莫过于整合诸多东西。图像、音响、实时网络交流、社交网络，从底层数据库管理到服务器运维，再到用户界面的设计和实现。制作游戏有很多事情要做，所以如果您有编程经验,  那么您应该选择这个职业。我们会很高兴在制作史上最好编程游戏的路上有您的陪伴。"
     class_attributes: "职业说明"
     archmage_attribute_1_pref: "了解 "
-    archmage_attribute_1_suf: "，或者想要学习。我们的多数代码都是用它写成的。如果你喜欢 Ruby 或者 Python，那你肯定会感到非常熟悉。它就是 JavaScript，但它的语法更友好。"
-    archmage_attribute_2: "编程经验和干劲。我们可以帮你走上正轨，但我们恐怕没多少时间培训你。"
+    archmage_attribute_1_suf: "，或者想要学习。我们的多数代码都是用它写成的。如果您喜欢 Ruby 或者 Python，那您肯定会感到非常熟悉。它就是 JavaScript，但它的语法更友好。"
+    archmage_attribute_2: "编程经验和干劲。我们可以帮您走上正轨，但我们恐怕没多少时间培训您。"
     how_to_join: "如何加入"
     join_desc_1: "谁都可以加入！先看看我们的"
-    join_desc_2: "，然后勾选下面的复选框，这样你就会作为勇敢的大法师收到我们的邮件。如果你想和开发人员聊天或者更深入地参与，可以"
+    join_desc_2: "，然后勾选下面的复选框，这样您就会作为勇敢的大法师收到我们的邮件。如果您想和开发人员聊天或者更深入地参与，可以"
     join_desc_3: " 或者去我们的"
     join_desc_4: "，然后我们有话好说！"
     join_url_email: "给我们发邮件"
     join_url_hipchat: " HipChat聊天室"
     archmage_subscribe_desc: "通过电子邮件获得新的编码机会和公告。"
-    artisan_introduction_pref: "我们必须设计更多的关卡! 大家为了更多的游戏内容在高声呐喊，但是我们靠自己只能创建这些。现在你的电脑就是一关！我们的关卡编辑器刚刚完成了基本功能，所以创造关卡的时候请小心使用。只要你有制作关卡的灵感，不管是简单的for循环还是"
-    artisan_introduction_suf: "这种东西，这个职业都很适合你。"
+    artisan_introduction_pref: "我们必须设计更多的关卡! 大家为了更多的游戏内容在高声呐喊，但是我们靠自己只能创建这些。现在您的电脑就是一关！我们的关卡编辑器刚刚完成了基本功能，所以创造关卡的时候请小心使用。只要您有制作关卡的灵感，不管是简单的for循环还是"
+    artisan_introduction_suf: "这种东西，这个职业都很适合您。"
     artisan_attribute_1: "任何类似的创建内容经验都有加分，无论是暴雪的关卡编辑器，但这不是必须的条件。"
-    artisan_attribute_2: "渴望完成全部的测试和迭代。要做一个优秀的关卡，你需要把它给别的玩家观察他们怎么玩，然后时刻准备着找到很多细节去打磨。"
-    artisan_attribute_3: "探险家般的忍耐力。我们的关卡编辑器非常的初级，还会有很多不好用的地方。唔，我已经提前告诉你了~"
+    artisan_attribute_2: "渴望完成全部的测试和迭代。要做一个优秀的关卡，您需要把它给别的玩家观察他们怎么玩，然后时刻准备着找到很多细节去打磨。"
+    artisan_attribute_3: "探险家般的忍耐力。我们的关卡编辑器非常的初级，还会有很多不好用的地方。唔，我已经提前告诉您了~"
     artisan_join_desc: "如下步骤使用关卡编辑器:"
     artisan_join_step1: "阅读文档。"
     artisan_join_step2: "创建一个新关卡 以及探索已经存在的关卡。"
     artisan_join_step3: "来我们的HipChat聊天室寻求帮助。"
-    artisan_join_step4: "吧你的关卡发到论坛让别人给你评价。"
+    artisan_join_step4: "吧您的关卡发到论坛让别人给您评价。"
     artisan_subscribe_desc: "通过电子邮件获得关卡编辑器更新和公告。"
-    adventurer_introduction: "现在就来了解你的角色吧：你是一辆战车，并将要承担沉重的攻击。我们需要人来尝试下我们新开的关卡以了解怎么样才能使每一样东西更美好。一开始虽然会非常辛苦；可是制造出一个最好的游戏是一个很长的过程，在这个过程中，没有人可以第一次就成功。如果你挺过去了并且自我感觉良好，那么这个位置就是为你而准备的。"
-    adventurer_attribute_1: "学习的冲动！你想要学好怎么编程，与此同时我们也想要教你怎么编程。虽然你可能会觉得你大多数时间你反而都在教导。这，就是学习。"
+    adventurer_introduction: "现在就来了解您的角色吧：您是一辆战车，并将要承担沉重的攻击。我们需要人来尝试下我们新开的关卡以了解怎么样才能使每一样东西更美好。一开始虽然会非常辛苦；可是制造出一个最好的游戏是一个很长的过程，在这个过程中，没有人可以第一次就成功。如果您挺过去了并且自我感觉良好，那么这个位置就是为您而准备的。"
+    adventurer_attribute_1: "学习的冲动！您想要学好怎么编程，与此同时我们也想要教您怎么编程。虽然您可能会觉得您大多数时间您反而都在教导。这，就是学习。"
     adventurer_attribute_2: "魅力！温柔但懂得表达事态；了解并知道如何改进。"
     adventurer_join_pref: "无论是与工匠一起工作，或者只是在下面的格子打勾以获得新关卡测试的通知，我们也会发布关于对新关卡的看法。"
     adventurer_forum_url: "我们的论坛"
-    adventurer_join_suf: "如果你更喜欢以这些方式被通知, 那就在这里注册吧!"
+    adventurer_join_suf: "如果您更喜欢以这些方式被通知, 那就在这里注册吧!"
     adventurer_subscribe_desc: "通过电子邮件获得新关卡通知。"
     scribe_introduction_pref: "CodeCombat不只是拥有一堆等级或关卡。它也是个知识的源泉，一个编程的宝典，一个人人都可以参与的，有趣的游戏。比起每个工匠都要详细解释其中的奥秘，他们可以以更简单的方式将自己的东西连接到一篇已经准备好的文章给玩家阅读。 有些东西就像 "
     scribe_introduction_url_mozilla: "Mozilla开发者社区"
-    scribe_introduction_suf: " 被建成。如果你那有趣的想法能把编程的理论简易的带出来，那么这里就是你的所属了。"
-    scribe_attribute_1: "你需要具备在文字语言上的技能。不仅仅是语法和拼音，重要的是能传达各种各样想法给别人。"
+    scribe_introduction_suf: " 被建成。如果您那有趣的想法能把编程的理论简易的带出来，那么这里就是您的所属了。"
+    scribe_attribute_1: "您需要具备在文字语言上的技能。不仅仅是语法和拼音，重要的是能传达各种各样想法给别人。"
     contact_us_url: "联系我们"
-    scribe_join_description: "介绍下你自己, 比如你的编程经历和你喜欢的东西, 我们将会努力的去了解你！!"
+    scribe_join_description: "介绍下您自己, 比如您的编程经历和您喜欢的东西, 我们将会努力的去了解您！!"
     scribe_subscribe_desc: "通过电子邮件获得写作新文档的通知。"
     diplomat_introduction_pref: "如果说我们从"
     diplomat_launch_url: "十月的发布"
-    diplomat_introduction_suf: "中得到了什么启发：那就是全世界的人都对很喜欢CodeCombat。我们召集了一群翻译者，希望能尽快地把网站上的信息翻译成各国文字。如果你对CodeCombat的内容很感兴趣，想让世界上的每一个人都有机会一同体验，就快来成为外交官吧。"
-    diplomat_attribute_1: "既会说流利的英语，也熟悉自己的语言。编程是一件很复杂的事情，而要翻译复杂的概念，你必须对两种语言都在行！"
-    diplomat_i18n_page_prefix: "你可以在我们的"
+    diplomat_introduction_suf: "中得到了什么启发：那就是全世界的人都对很喜欢CodeCombat。我们召集了一群翻译者，希望能尽快地把网站上的信息翻译成各国文字。如果您对CodeCombat的内容很感兴趣，想让世界上的每一个人都有机会一同体验，就快来成为外交官吧。"
+    diplomat_attribute_1: "既会说流利的英语，也熟悉自己的语言。编程是一件很复杂的事情，而要翻译复杂的概念，您必须对两种语言都在行！"
+    diplomat_i18n_page_prefix: "您可以在我们的"
     diplomat_i18n_page: "翻译页面"
     diplomat_i18n_page_suffix: "开始翻译游戏，或者在我们的GitHub页面上进行。"
     diplomat_join_pref_github: "在"
     diplomat_github_url: "GitHub"
-    diplomat_join_suf_github: "找到中文语言文件 (简体中文的是:CodeCombat/app/locale/zh-HANS.coffee)，在线编辑它，完成后提交一个合并请求。你也可以勾上下面这个复选框来关注最新的国际化开发！"
+    diplomat_join_suf_github: "找到中文语言文件 (简体中文的是:CodeCombat/app/locale/zh-HANS.coffee)，在线编辑它，完成后提交一个合并请求。您也可以勾上下面这个复选框来关注最新的国际化开发！"
     diplomat_subscribe_desc: "接受有关国际化开发和翻译任务的邮件"
-    ambassador_introduction: "这是一个正在成长的社区，而你将成为我们与世界的联结点。大家可以通过各种即时聊天平台、邮件、或是参与者众多的社交网络来认识及讨论我们的游戏。如果你喜欢帮助大家，一起参与各类项目，一起获得乐趣。与我们同行，一起感受CodeCombat的脉搏，绝对是一个适合你的职业。"
+    ambassador_introduction: "这是一个正在成长的社区，而您将成为我们与世界的联结点。大家可以通过各种即时聊天平台、邮件、或是参与者众多的社交网络来认识及讨论我们的游戏。如果您喜欢帮助大家，一起参与各类项目，一起获得乐趣。与我们同行，一起感受CodeCombat的脉搏，绝对是一个适合您的职业。"
     ambassador_attribute_1: "具备出色的沟通能力。能够分辨出玩家遇到的问题并帮助他们解决问题。与此同时，和我们保持联系，帮助反馈玩家们的喜怒哀乐！"
-    ambassador_join_desc: "介绍一下你自己：你做过什么？你喜欢做什么？我们将从这里开始了解你！"
+    ambassador_join_desc: "介绍一下您自己：您做过什么？您喜欢做什么？我们将从这里开始了解您！"
     ambassador_join_note_strong: "注意"
-    ambassador_join_note_desc: "我们其中一个想法是要制造一个当玩家们在解决问题上有难度时可以要求其他比较强的玩家来协助他们的多人游戏。这将会是一个很好的办法让使节们可以更容易的协助玩家！如有任何更新，我们会在第一时间通知你！"
+    ambassador_join_note_desc: "我们其中一个想法是要制造一个当玩家们在解决问题上有难度时可以要求其他比较强的玩家来协助他们的多人游戏。这将会是一个很好的办法让使节们可以更容易的协助玩家！如有任何更新，我们会在第一时间通知您！"
     ambassador_subscribe_desc: "通过电子邮件获得支持系统的现状，以及多人游戏方面的新进展。"
-    changes_auto_save: "在你勾选复选框后，更改将自动保存。"
+    changes_auto_save: "在您勾选复选框后，更改将自动保存。"
     diligent_scribes: "我们勤奋的文书:"
     powerful_archmages: "我们强力的大法师:"
     creative_artisans: "我们极具创意的工匠:"
@@ -1005,17 +1004,17 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     please_login: "对战之前请先登录。"
     my_matches: "我的对手"
     simulate: "模拟"
-    simulation_explanation: "通过模拟游戏，你可以让你的游戏更快的得到评分。"
+    simulation_explanation: "通过模拟游戏，您可以让您的游戏更快的得到评分。"
     simulate_games: "模拟游戏！"
     simulate_all: "重置并模拟游戏！"
-    games_simulated_by: "由你模拟过的游戏数:"
-    games_simulated_for: "为你模拟过的游戏数:"
+    games_simulated_by: "由您模拟过的游戏数:"
+    games_simulated_for: "为您模拟过的游戏数:"
     games_simulated: "模拟次数"
     games_played: "被模拟次数"
     ratio: "比率"
     leaderboard: "排行榜"
     battle_as: "我要加入这一方 "
-    summary_your: "你 "
+    summary_your: "您 "
     summary_matches: "对手 - "
     summary_wins: " 胜利, "
     summary_losses: " 失败"
@@ -1027,13 +1026,13 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     rank_being_ranked: "已评价"
     rank_last_submitted: "已提交"
     help_simulate: "模拟游戏需要帮助？"
-    code_being_simulated: "你的新代码正在被其他玩家模拟评分。这个将会刷新，作为一个新游戏开始。"
+    code_being_simulated: "您的新代码正在被其他玩家模拟评分。这个将会刷新，作为一个新游戏开始。"
     no_ranked_matches_pre: "没有排名对决给 "
-    no_ranked_matches_post: " 啊哈哟！去更其他玩家打过了再回来这里查看你游戏排名吧！"
+    no_ranked_matches_post: " 啊哈哟！去更其他玩家打过了再回来这里查看您游戏排名吧！"
     choose_opponent: "选择一个对手"
-    select_your_language: "选择你使用的语言!"
+    select_your_language: "选择您使用的语言!"
     tutorial_play: "玩教程"
-    tutorial_recommended: "如果你从未玩过的话,推荐先玩下教程"
+    tutorial_recommended: "如果您从未玩过的话,推荐先玩下教程"
     tutorial_skip: "跳过教材"
     tutorial_not_sure: "不知道怎么玩?"
     tutorial_play_first: "先玩一次教程。"
@@ -1042,15 +1041,15 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     friends_playing: "联机"
     log_in_for_friends: "登陆然后跟朋友一起玩！"
     social_connect_blurb: "连接然后与朋友对战！"
-    invite_friends_to_battle: "邀请你的朋友参加战斗！"
+    invite_friends_to_battle: "邀请您的朋友参加战斗！"
     fight: "战斗！"
-    watch_victory: "观看你的胜利"
+    watch_victory: "观看您的胜利"
     defeat_the: "击败了"
     tournament_started: "，锦标赛已开始"
     tournament_ends: "锦标赛结束"
-    tournament_ended: "Tournament ended"
+    tournament_ended: "锦标赛已结束"
     tournament_rules: "锦标赛规则"
-    tournament_blurb: "写代码，收金币，建军队，碎敌军，赢奖品，以及在我们奖励多达$40,000的Greed tournament里升级你的事业！ 快去查阅详情！"
+    tournament_blurb: "写代码，收金币，建军队，碎敌军，赢奖品，以及在我们奖励多达$40,000的Greed tournament里升级您的事业！ 快去查阅详情！"
     tournament_blurb_criss_cross: "赢得竞拍，建造道路，智胜对手，夺取宝石，在纵横交错锦标赛中完成生涯晋级! 现在就查看详情！"
 #    tournament_blurb_zero_sum: "Unleash your coding creativity in both gold gathering and battle tactics in this alpine mirror match between red sorcerer and blue sorcerer. The tournament began on Friday, March 27 and will run until Monday, April 6 at 5PM PDT. Compete for fun and glory! Check out the details"
     tournament_blurb_blog: "关注我们的博客"
@@ -1071,7 +1070,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     no_achievements: "还未得到任何成就。"
     favorite_prefix: "最喜爱的语言是 "
     favorite_postfix: "。"
-    not_member_of_clans: "还不是任何一个团队里的成员。"
+    not_member_of_clans: "还不是任何一个部落里的成员。"
 
   achievements:
     last_earned: "最近取得的"
@@ -1111,42 +1110,42 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     cost: "花费"
     next_payment: "下个付款"
     card: "银行卡"
-    status_unsubscribed_active: "你还没有订阅所以不会被收费，但你的帐号还可以正常使用"
-    status_unsubscribed: "只要一个CodeCombat订阅，你就可以玩转全部新关卡，用遍全部英雄，物品，以及获得更多的宝石哦！"
+    status_unsubscribed_active: "您还没有订阅所以不会被收费，但您的帐号还可以正常使用"
+    status_unsubscribed: "只要一个CodeCombat订阅，您就可以玩转全部新关卡，用遍全部英雄，物品，以及获得更多的宝石哦！"
 
   account_invoices:
     amount: "金额（美元）"
     declined: "您的付款被拒"
-    invalid_amount: "请输入美元金额"
-#    not_logged_in: "Log in or create an account to access invoices."
-#    pay: "Pay Invoice"
-    purchasing: "购买中……"
-    retrying: "服务器错误，重试中。"
+    invalid_amount: "请输入美元金额。"
+    not_logged_in: "登录或创建一个帐户来获得发票。"
+    pay: "付费发票"
+    purchasing: "购买中···"
+    retrying: "伺服器错误，重试中。"
     success: "支付成功。谢谢！"
 
   loading_error:
     could_not_load: "载入失败"
     connection_failure: "连接失败。"
-    unauthorized: "你需要登录才行。 你是不是把 cookies 禁用了?"
-    forbidden: "你没有权限。"
+    unauthorized: "您需要登录才行。 您是不是把 cookies 禁用了?"
+    forbidden: "您没有权限。"
     not_found: "没找到。"
     not_allowed: "方法不允许。"
     timeout: "服务器超时。"
     conflict: "资源冲突。"
-    bad_input: "坏输入。"
+    bad_input: "錯误输入。"
     server_error: "服务器错误。"
     unknown: "未知错误。"
 
   resources:
-    sessions: "会期"
-    your_sessions: "你的会期"
+    sessions: "会议"
+    your_sessions: "您的会议"
     level: "等级"
     social_network_apis: "社交网络 APIs"
     facebook_status: "Facebook 状态"
     facebook_friends: "Facebook 朋友"
-    facebook_friend_sessions: "Facebook 朋友会期"
-    gplus_friends: "G+ 朋友"
-    gplus_friend_sessions: "G+ 朋友会期"
+    facebook_friend_sessions: "Facebook 朋友会议"
+    gplus_friends: "Google+ 朋友"
+    gplus_friend_sessions: "Google+ 朋友会议"
     leaderboard: "排行榜"
     user_schema: "用户模式"
     user_profile: "用户信息"
@@ -1160,8 +1159,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     components: "组件"
     thang: "物品"
     thangs: "物品"
-    level_session: "你的会期"
-    opponent_session: "对方会期"
+    level_session: "您的会议"
+    opponent_session: "对方会议"
     article: "文章"
     user_names: "用户名"
     thang_names: "物品名称"
@@ -1169,10 +1168,10 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     top_simulators: "顶尖模拟者"
     source_document: "原档"
     document: "文档"
-    sprite_sheet: "SpriteSheet"
+    sprite_sheet: "贴图集"
     employers: "雇主"
     candidates: "应征者"
-    candidate_sessions: "应征者会期"
+    candidate_sessions: "应征者会议"
     user_remark: "用户备注"
     user_remarks: "用户备注"
     versions: "版本"
@@ -1188,32 +1187,32 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     poll: "调查"
     user_polls_record: "投票结果"
 
-#  concepts:
-#    advanced_strings: "Advanced Strings"
-#    algorithms: "Algorithms"
-#    arguments: "Arguments"
-#    arithmetic: "Arithmetic"
-#    arrays: "Arrays"
-#    basic_syntax: "Basic Syntax"
-#    boolean_logic: "Boolean Logic"
-#    break_statements: "Break Statements"
-#    classes: "Classes"
-#    for_loops: "For Loops"
-#    functions: "Functions"
-#    if_statements: "If Statements"
-#    input_handling: "Input Handling"
-#    math_operations: "Math Operations"
-#    object_literals: "Object Literals"
-#    strings: "Strings"
-#    variables: "Variables"
-#    vectors: "Vectors"
-#    while_loops: "Loops"
-#    recursion: "Recursion"
+  concepts:
+    advanced_strings: "高级字符串"
+    algorithms: "算法"
+    arguments: "参数"
+    arithmetic: "四则运算"
+    arrays: "阵列"
+    basic_syntax: "基本语法"
+    boolean_logic: "布尔逻辑"
+    break_statements: "Break语句"
+    classes: "类别"
+    for_loops: "For循环"
+    functions: "函数"
+    if_statements: "If语句"
+    input_handling: "输入处理"
+    math_operations: "输入处理"
+    object_literals: "对象常量"
+    strings: "字符串"
+    variables: "变量"
+    vectors: "向量"
+    while_loops: "循环"
+    recursion: "递归"
 
   delta:
     added: "被添加"
     modified: "被修改"
-#    not_modified: "Not Modified"
+    not_modified: "未修改"
     deleted: "被删除"
     moved_index: "被移动的索引"
     text_diff: "文本变化"
@@ -1231,14 +1230,14 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     multiplayer_hint_label: "提示："
     multiplayer_hint: " 点击全选，然后按Apple-C（苹果电脑）或Ctrl-C复制链接。"
     multiplayer_coming_soon: "多人游戏的更多特性！"
-    multiplayer_sign_in_leaderboard: "注册并登录账号，就可以将你的成就发布到排行榜上。"
+    multiplayer_sign_in_leaderboard: "注册并登录账号，就可以将您的成就发布到排行榜上。"
 
   legal:
     page_title: "法律"
     opensource_intro: "CodeCombat是一个自由发挥，完全开源的项目。"
     opensource_description_prefix: "查看 "
     github_url: "我们的GitHub"
-    opensource_description_center: "并做你想做的修改吧！CodeCombat是构筑在几十个开源项目之上的，然后我们都喜欢它们。看 "
+    opensource_description_center: "并做您想做的修改吧！CodeCombat是构筑在几十个开源项目之上的，然后我们都喜欢它们。看 "
     archmage_wiki_url: "我们大法师的维基页"
     opensource_description_suffix: " 看看是哪些人让这个游戏成为可能。"
     practices_title: "尊重最佳实践"
@@ -1271,11 +1270,11 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     art_artwork: "图画"
     art_sprites: "精灵"
     art_other: "所有制作关卡时公开的，不是代码的创造性产品。"
-    art_access: "目前还没有简便通用的下载素材的方式。一般来讲，从网站上使用的URL下载，或者联系我们寻找帮助。当然你也可以帮我们扩展网站，让这些资源更容易下载。"
+    art_access: "目前还没有简便通用的下载素材的方式。一般来讲，从网站上使用的URL下载，或者联系我们寻找帮助。当然您也可以帮我们扩展网站，让这些资源更容易下载。"
     art_paragraph_1: "关于署名，请说明并在使用处附近，或对媒体形式来说合适的地方提供一个CodeCombat.com 的链接。举例："
     use_list_1: "如果是用在电影里或者其他游戏里，请在制作人员表中加入CodeCombat.com."
-    use_list_2: "如果用在网站上，将链接在使用的地方附近，比如图片下面，或者一个你放置其他 Creative Commons 署名和开源软件协议的专门页面。如果你的内容明确提到关于CodeCombat，那你就不需要额外署名。"
-    art_paragraph_2: "如果你使用的内容不是由CodeCombat制作，而是由CodeCombat.com 上其他的用户制作的，那你应该给他们署名。如果相应资源的页面上有署名指示，那你应该遵循那些指示。"
+    use_list_2: "如果用在网站上，将链接在使用的地方附近，比如图片下面，或者一个您放置其他 Creative Commons 署名和开源软件协议的专门页面。如果您的内容明确提到关于CodeCombat，那您就不需要额外署名。"
+    art_paragraph_2: "如果您使用的内容不是由CodeCombat制作，而是由CodeCombat.com 上其他的用户制作的，那您应该给他们署名。如果相应资源的页面上有署名指示，那您应该遵循那些指示。"
     rights_title: "版权所有"
     rights_desc: "所有关卡由他们自己版权所有。这包括"
     rights_scripts: "脚本"
@@ -1285,7 +1284,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     rights_media: "声音、音乐以及其他专门为某个关卡制作，而不对其他关卡开放的创造性内容"
     rights_clarification: "澄清：所有在关卡编辑器里公开用于制作关卡的资源都是在CC协议下发布的，而使用关卡编辑器制作，或者在关卡制作过程中上传的内容则不是。"
     nutshell_title: "简而言之"
-    nutshell_description: "我们在关卡编辑器里公开的任何资源，你都可以在制作关卡时随意使用，但我们保留限制在CodeCombat.com 之上创建的关卡本身传播的权利，因为我们以后可能决定为它们收费。"
+    nutshell_description: "我们在关卡编辑器里公开的任何资源，您都可以在制作关卡时随意使用，但我们保留限制在CodeCombat.com 之上创建的关卡本身传播的权利，因为我们以后可能决定为它们收费。"
     canonical: "这篇说明的英文版本是权威版本。如果各个翻译版本之间有任何冲突，以英文版为准。"
 
   ladder_prizes:
@@ -1306,7 +1305,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     one_month_coupon: "固本: 选择 Rails 或者 HTML"
     one_month_discount: "折扣 30% : 选择 Rails 或者 HTML"
     license: "许可证"
-    oreilly: "你选择的电子书"
+    oreilly: "您选择的电子书"
 
   account_profile:
     settings: "设置" # We are not actively recruiting right now, so there's no need to add new translations for this section.
@@ -1324,85 +1323,85 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     complete: "完成"
     next: "下一步"
     next_city: "城市?"
-    next_country: "选择你所处的国家"
+    next_country: "选择您所处的国家"
     next_name: "名字?"
-    next_short_description: "简短描述你自己。"
-    next_long_description: "描述一下你希望找到何种工作。"
+    next_short_description: "简短描述您自己。"
+    next_long_description: "描述一下您希望找到何种工作。"
     next_skills: "列出至少五个技能。"
-    next_work: "你的过往工作经验"
+    next_work: "您的过往工作经验"
     next_education: "教育经历"
-    next_projects: "展示你曾经参与过的至多3个项目。"
+    next_projects: "展示您曾经参与过的至多3个项目。"
     next_links: "添加任何个人网站或社交媒体链接。"
     next_photo: "添加一张职业的照片（可选）。"
     next_active: "将自己标记为正在寻求工作机会以使自己的名字出现在搜索结果中。"
-    example_blog: "你的博客"
+    example_blog: "您的博客"
     example_personal_site: "个人主页"
     links_header: "个人网站链接"
-    links_blurb: "链接任何你希望展示的网站或介绍，例如你的Github，你的LinkedIn，或是你的博客。"
+    links_blurb: "链接任何您希望展示的网站或介绍，例如您的Github，您的LinkedIn，或是您的博客。"
     links_name: "链接名称"
-    links_name_help: "你希望链接到什么？"
+    links_name_help: "您希望链接到什么？"
     links_link_blurb: "链接的URL"
     basics_header: "更新基本信息"
     basics_active: "接受工作邀请"
     basics_active_help: "希望现在就接到面试邀请？"
     basics_job_title: "期望职位"
-    basics_job_title_help: "你希望在工作中扮演何种角色？"
+    basics_job_title_help: "您希望在工作中扮演何种角色？"
     basics_city: "城市"
-    basics_city_help: "你希望在哪座城市工作（或现在居住在哪座城市）。"
+    basics_city_help: "您希望在哪座城市工作（或现在居住在哪座城市）。"
     basics_country: "国家"
-    basics_country_help: "你希望在哪个国家工作（或现在居住在哪个国家）。"
+    basics_country_help: "您希望在哪个国家工作（或现在居住在哪个国家）。"
     basics_visa: "美国工作签证状态"
-    basics_visa_help: "你是否有权在美国合法地工作，或者你是否需要公司资助办理美国工作签证？"
+    basics_visa_help: "您是否有权在美国合法地工作，或者您是否需要公司资助办理美国工作签证？"
     basics_looking_for: "寻找"
     basics_looking_for_full_time: "全职"
     basics_looking_for_part_time: "兼职"
     basics_looking_for_remote: "远程工作"
     basics_looking_for_contracting: "合同制工作"
     basics_looking_for_internship: "实习"
-    basics_looking_for_help: "你希望找到哪种开发者职位？"
-    name_header: "请填写你的姓名"
+    basics_looking_for_help: "您希望找到哪种开发者职位？"
+    name_header: "请填写您的姓名"
     name_anonymous: "匿名开发者"
-    name_help: "你希望雇主看到的名字，例如‘Nick Winter'。"
+    name_help: "您希望雇主看到的名字，例如‘Nick Winter'。"
     short_description_header: "写一段简短的自我介绍"
-    short_description_blurb: "在此添加一段简介让雇主一眼就发现你是否是他们正在寻找的开发者。"
+    short_description_blurb: "在此添加一段简介让雇主一眼就发现您是否是他们正在寻找的开发者。"
     short_description: "简短介绍"
-    short_description_help: "你是谁，你在寻求什么？请勿超过140个字符。"
+    short_description_help: "您是谁，您在寻求什么？请勿超过140个字符。"
     skills_header: "技能"
-    skills_help: "按照熟练程度列出你所掌握的与开发有关的技能。"
-    long_description_header: "详细描述你所期望的职位"
-    long_description_blurb: "告诉我们你的优点与你感兴趣的职位"
+    skills_help: "按照熟练程度列出您所掌握的与开发有关的技能。"
+    long_description_header: "详细描述您所期望的职位"
+    long_description_blurb: "告诉我们您的优点与您感兴趣的职位"
     long_description: "描述"
-    long_description_help: "向潜在的雇主描述你自己。尽量简明扼要。我们建议你列出你最感兴趣的职位。请勿超过600个字符。"
+    long_description_help: "向潜在的雇主描述您自己。尽量简明扼要。我们建议您列出您最感兴趣的职位。请勿超过600个字符。"
     work_experience: "工作经验"
-    work_header: "按时间顺序列出你的工作经历"
+    work_header: "按时间顺序列出您的工作经历"
     work_years: "工作年限"
-    work_years_help: "你有多少年职业的（有正常收入）软件开发经验？"
+    work_years_help: "您有多少年职业的（有正常收入）软件开发经验？"
     work_blurb: "列出相关的工作经验，从最近的开始。"
     work_employer: "雇主"
-    work_employer_help: "你雇主的名字。"
+    work_employer_help: "您雇主的名字。"
     work_role: "职称"
-    work_role_help: "你的职称是什么或者说你扮演何种角色？"
+    work_role_help: "您的职称是什么或者说您扮演何种角色？"
     work_duration: "起止时间"
-    work_duration_help: "你在什么时间段在职？"
+    work_duration_help: "您在什么时间段在职？"
     work_description: "描述"
-    work_description_help: "你在那里主要的工作是什么？（140个字符；选填）"
+    work_description_help: "您在那里主要的工作是什么？（140个字符；选填）"
     education: "教育程度"
-    education_header: "列出你的教育经历。"
-    education_blurb: "列出你在校学习的经历。"
+    education_header: "列出您的教育经历。"
+    education_blurb: "列出您在校学习的经历。"
     education_school: "学校"
-    education_school_help: "你就读的学校的名字。"
+    education_school_help: "您就读的学校的名字。"
     education_degree: "学位"
-    education_degree_help: "你的学位以及你学习的方向是什么？"
+    education_degree_help: "您的学位以及您学习的方向是什么？"
     education_duration: "时间"
     education_duration_help: "什么时候？"
     education_description: "描述"
-    education_description_help: "说说任何与你的教育经历相关的东西。（140个字符；选填）"
+    education_description_help: "说说任何与您的教育经历相关的东西。（140个字符；选填）"
     our_notes: "CodeCombat的评注"
     remarks: "评价"
     projects: "项目"
     projects_header: "添加3个项目"
     projects_header_2: "项目（前3个）"
-    projects_blurb: "展示你所参加的可以让雇主感到惊叹的项目。"
+    projects_blurb: "展示您所参加的可以让雇主感到惊叹的项目。"
     project_name: "项目名称"
     project_name_help: "项目被称作什么？"
     project_description: "描述"
@@ -1419,7 +1418,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     hire_developers_not_credentials: "我们只招聘开发人员，不招聘证书。" # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
     get_started: "入门"
     already_screened: "我们已经筛选过所有应征者了"
-    filter_further: "， 但是你也可以进一步筛选:"
+    filter_further: "， 但是您也可以进一步筛选:"
     filter_visa: "Visa"
     filter_visa_yes: "US认证"
     filter_visa_no: "未认证"
@@ -1435,12 +1434,12 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     filter_experience_student: "学院生"
     filter_results: "成绩"
     start_hiring: "开始招聘。"
-    reasons: "三个你该通过我们招聘的理由："
+    reasons: "三个您该通过我们招聘的理由："
     everyone_looking: "每一个来这里的人是为了找寻他们的下一个机会。"
-    everyone_looking_blurb: "忘了那20%的LinkedIn InMain回复率。每一个被我们列入这个站点的人希望找到他们的下一个位置以及将会回应你要求自我介绍的请求。"
-    weeding: "坐下吧！我们已经为你将不必要的都去除了。"
-    weeding_blurb: "每一位被我们列举的玩家都已经通过筛选，他们都有非凡的技能。我们也通过电话进行筛选以选择应征者及记下他们的资料来节省你的时间。"
-    pass_screen: "他们一定会通过你的技术能力测试的！"
+    everyone_looking_blurb: "忘了那20%的LinkedIn InMain回复率。每一个被我们列入这个站点的人希望找到他们的下一个位置以及将会回应您要求自我介绍的请求。"
+    weeding: "坐下吧！我们已经为您将不必要的都去除了。"
+    weeding_blurb: "每一位被我们列举的玩家都已经通过筛选，他们都有非凡的技能。我们也通过电话进行筛选以选择应征者及记下他们的资料来节省您的时间。"
+    pass_screen: "他们一定会通过您的技术能力测试的！"
     pass_screen_blurb: "看过他们的代码后才做出决定。有个雇主发现比起直接从Hacker News招聘，更多应征者通过他的技术能力测试。"
     make_hiring_easier: "请让我的招聘变得容易。"
     what: "什么是CodeCombat？"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 54825315a..20b5cc28e 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -58,13 +58,13 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     owned: "擁有" # For items you own
     locked: "鎖定"
     purchasable: "可購買" # For a hero you unlocked but haven't purchased
-    available: "啟用"
+    available: "可用"
     skills_granted: "將習得技能" # Property documentation details
     heroes: "英雄" # Tooltip on hero shop button from /play
     achievements: "成就" # Tooltip on achievement list button from /play
     account: "帳號" # Tooltip on account button from /play
     settings: "設定" # Tooltip on settings button from /play
-#    poll: "Poll" # Tooltip on poll button from /play
+    poll: "投票" # Tooltip on poll button from /play
     next: "下一步" # Go from choose hero to choose inventory before playing a level
     change_hero: "更換英雄" # Go back from choose inventory to choose hero
     choose_inventory: "裝備物品"
@@ -73,14 +73,14 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     anonymous: "匿名玩家"
     level_difficulty: "難度"
     campaign_beginner: "新手指南"
-    awaiting_levels_adventurer_prefix: "我們每周將釋出五個等級。" # {change}
+    awaiting_levels_adventurer_prefix: "我們每周將釋出五個關卡。" # {change}
     awaiting_levels_adventurer: "註冊成為冒險家"
     awaiting_levels_adventurer_suffix: "成為第一個挑戰新關卡的冒險家吧!"
     adjust_volume: "調整音量"
     campaign_multiplayer: "多人競技場"
     campaign_multiplayer_description: "...在這裡您可以和其他玩家進行對戰。"
     campaign_old_multiplayer: "（過時的）舊多人競技場"
-    campaign_old_multiplayer_description: "多個文明時代的遺跡。已沒有模擬運行這些陳舊、蕪絕英雄多人競技場。"
+    campaign_old_multiplayer_description: "多個文明時代的遺跡。已沒有模擬運行這些陳舊、英雄蕪絕的多人競技場。"
 
   share_progress_modal:
     blurb: "您正在建立優秀的進度! 告訴別人您已經從CodeCombat學習到多少東西." # {change}
@@ -118,8 +118,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     recovery_sent: "密碼重置的信件已寄出."
 
   items:
-    primary: "攻擊"
-    secondary: "防禦"
+    primary: "主要武器"
+    secondary: "次要武器"
     armor: "裝甲"
     accessories: "飾品"
     misc: "輔助"
@@ -253,7 +253,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     victory_experience_gained: "取得經驗值"
     victory_gems_gained: "取得寶石"
     victory_new_item: "新的物品"
-    victory_viking_code_school: "太厲害了, 你剛完成了非常困難的關卡! 如果你想成為一個軟件開發人員，你就應該去試一下Viking Code School。在這裡你可以把你的知識增長到另一個台階。只需要14個星期你就能成為一個專業的網頁開發人員。"
+    victory_viking_code_school: "太厲害了, 您剛完成了非常困難的關卡! 如果您想成為一個軟件開發人員，您就應該去試一下Viking Code School。在這裡您可以把您的知識增長到另一個台階。只需要14個星期您就能成為一個專業的網頁開發人員。"
     victory_become_a_viking: "成為一個維京人。"
     guide_title: "指南"
     tome_minion_spells: "助手的咒語" # Only in old-style levels.
@@ -284,8 +284,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     time_goto: "前往:"
     non_user_code_problem_title: "無法加載關卡"
     infinite_loop_title: "檢測到無限循環"
-    infinite_loop_description: "建立世界的初始代碼還沒有運行完畢。這可能是真的很慢或出現無限循環，或者存在一個bug。你可以嘗試再次運行這段代碼，或重置代碼為默認狀態。如果還是解決不了問題，請聯繫我們。."
-    check_dev_console: "你也可以打開開發者界面看一下有什麼可能出錯了。"
+    infinite_loop_description: "建立世界的初始代碼還沒有運行完畢。這可能是真的很慢或出現無限循環，或者存在一個bug。您可以嘗試再次運行這段代碼，或重置代碼為默認狀態。如果還是解決不了問題，請聯繫我們。."
+    check_dev_console: "您也可以打開開發者界面看一下有什麼可能出錯了。"
     check_dev_console_link: "(說明)"
     infinite_loop_try_again: "再試一次"
     infinite_loop_reset_level: "重置關卡"
@@ -314,7 +314,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     tip_patience: "年輕的學徒，您必須擁有耐心. - Yoda"
     tip_documented_bug: "一個寫在文件裡的錯誤不是錯誤;它是功能."
     tip_impossible: "事情總是看起來不可能直到它成真那刻. - Nelson Mandela"
-    tip_talk_is_cheap: "多說無益，公開您的代碼. - Linus Torvalds"
+    tip_talk_is_cheap: "多說無益，放「碼」過來. - Linus Torvalds"
     tip_first_language: "您經歷的第一門程式語言是最慘痛的事情. - Alan Kay"
     tip_hardware_problem: "Q: 換一顆燈泡需要多少位程序員?  A: 一位也不用, 它是個硬體問題."
     tip_hofstadters_law: "Hofstadter 定律: 完成一件複雜的事花費的時間總是超乎預期, 甚至您早已知道這個現象( Hofstadter 定律)."
@@ -332,13 +332,13 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     tip_javascript_java: "Java 和 JavaScript 的關係就好比馬和馬雲. - Chris Heilmann"
     tip_move_forward: "不論您做啥, 持續前進. - Martin Luther King Jr."
     tip_google: "擁有一個您不能解決的問題? Google 它!"
-    tip_adding_evil: "增加一個邪惡之捏."
+    tip_adding_evil: "增加一個邪惡掐揑."
     tip_hate_computers: "關於自我覺得恨透電腦的那群人. 其實他們真正應該恨的事情是糟糕的程序員. - Larry Niven"
-    tip_open_source_contribute: "你可以幫助「CodeCombat」提高！"
+    tip_open_source_contribute: "您可以幫助「CodeCombat」提高！"
     tip_recurse: "迭代者人也，遞歸者神也 - L. Peter Deutsch"
-    tip_free_your_mind: "放下一切私心雜念，丟棄害怕、疑問和拒信，解放你的思維。 - 莫菲斯（駭客任務）"
-#    tip_strong_opponents: "Even the strongest of opponents always has a weakness. - Itachi Uchiha"
-#    tip_paper_and_pen: "Before you start coding, you can always plan with a sheet of paper and a pen."
+    tip_free_your_mind: "放下一切私心雜念，丟棄害怕、疑問和拒信，解放您的思維。 - 莫菲斯（駭客任務）"
+    tip_strong_opponents: "即使是最强大的對手也有弱点的. - 宇智波鼬《火影忍者》"
+    tip_paper_and_pen: "在您開始編碼之前，您可以隨時用一張紙和一支筆作計劃。"
 
   game_menu:
     inventory_tab: "倉庫"
@@ -395,17 +395,17 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     prompt_body: "想要取得更多?"
     prompt_button: "進入商店"
     recovered: "先前購買的寶石已回復. 請重新載入頁面."
-#    price: "x3500 / mo"
+    price: "x3500 / 月"
 
   subscribe:
     comparison_blurb: "訂閱 CodeCombat 來磨練您的技巧!"
-    feature1: "60 個以上的基本關卡散佈在4張地圖中" # {change}
-    feature2: "7 個強壯的<strong>新英雄</strong>並每隻都有不同技巧!" # {change}
-    feature3: "30 個以上的額外關卡" # {change}
+    feature1: "100 個以上的基本關卡散佈在4張地圖中" # {change}
+    feature2: "10 個強壯的<strong>新英雄</strong>並每隻都有不同技巧!" # {change}
+    feature3: "70 個以上的額外關卡" # {change}
     feature4: "每個月<strong>3500顆額外寶石</strong>!"
     feature5: "視頻教學"
     feature6: "頂級信箱支援"
-#    feature7: "Private <strong>Clans</strong>"
+    feature7: "私人 <strong>部落</strong>"
     free: "免費"
     month: "月"
     subscribe_title: "訂閱"
@@ -428,43 +428,43 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     parents: "致家長"
     parents_title: "您的孩子將學習編寫程式." # {change}
     parents_blurb1: "使用 CodeCombat , 您的孩子學習真正的編寫程式. 他們學習從簡單的指令，漸進到更加進階的課題."
-#    parents_blurb1a: "Computer programming is an essential skill that your child will undoubtedly use as an adult. By 2020, basic software skills will be needed by 77% of jobs, and software engineers are in high demand across the world. Did you know that Computer Science is the highest-paid university degree?"
+    parents_blurb1a: "不要懷疑計算機編程能力將是您的孩子作為一個成年人的基本技能。到2020年，77%的工作將會需要編碼能力，並且軟件工程師將在世界各地成為高需求職業。您知道嗎，計算機科學是收入最高的大學學位。"
     parents_blurb2: "每月支付 $9.99 美金, 他們每週獲得新挑戰以及使用信件取得專業程式員的幫助." # {change}
     parents_blurb3: "沒有風險: 保證 100% 退費, 一步取消訂閱."
-#    payment_methods: "Payment Methods"
-#    payment_methods_title: "Accepted Payment Methods"
-#    payment_methods_blurb1: "We currently accept credit cards and Alipay."
-#    payment_methods_blurb2: "If you require an alternate form of payment, please contact"
+    payment_methods: "付費方法"
+    payment_methods_title: "可接受的付款方式"
+    payment_methods_blurb1: "我們現有的付費方式有信用卡和支付寶"
+    payment_methods_blurb2: "如果您想用其他付費方式,請聯繫我們"
     stripe_description: "每月訂閱"
     subscription_required_to_play: "您將需要訂閱來開啟這關."
     unlock_help_videos: "訂閱來解開所有鎖住得教學影片."
-#    personal_sub: "Personal Subscription" # Accounts Subscription View below
-#    loading_info: "Loading subscription information..."
-#    managed_by: "Managed by"
-#    will_be_cancelled: "Will be cancelled on"
-#    currently_free: "You currently have a free subscription"
-#    currently_free_until: "You currently have a free subscription until"
-#    was_free_until: "You had a free subscription until"
-#    managed_subs: "Managed Subscriptions"
-#    managed_subs_desc: "Add subscriptions for other players (students, children, etc.)"
-#    managed_subs_desc_2: "Recipients must have a CodeCombat account associated with the email address you provide."
-#    group_discounts: "Group discounts"
-#    group_discounts_1: "We also offer group discounts for bulk subscriptions."
-#    group_discounts_1st: "1st subscription"
-#    group_discounts_full: "Full price"
-#    group_discounts_2nd: "Subscriptions 2-11"
-#    group_discounts_20: "20% off"
-#    group_discounts_12th: "Subscriptions 12+"
-#    group_discounts_40: "40% off"
-#    subscribing: "Subscribing..."
-#    recipient_emails_placeholder: "Enter email address to subscribe, one per line."
-#    subscribe_users: "Subscribe Users"
-#    users_subscribed: "Users subscribed:"
-#    no_users_subscribed: "No users subscribed, please double check your email addresses."
-#    current_recipients: "Current Recipients"
-#    unsubscribing: "Unsubscribing..."
-#    subscribe_prepaid: "Click Subscribe to use prepaid code"
-#    using_prepaid: "Using prepaid code for monthly subscription"
+    personal_sub: "個人訂閱" # Accounts Subscription View below
+    loading_info: "正在加載訂閱內容···"
+    managed_by: "管理"
+    will_be_cancelled: "將被取消"
+    currently_free: "您目前有一個免費訂閱"
+    currently_free_until: "您目前有一個免費訂閱，直到"
+    was_free_until: "您有過一個免費訂閱，直到"
+    managed_subs: "管理訂閱"
+    managed_subs_desc: "為其他玩家（學生、兒童等）添加訂閱。"
+    managed_subs_desc_2: "收件人必須有一個與您提供的電子郵件地址相關聯的codecombat帳戶。."
+    group_discounts: "團購價"
+    group_discounts_1: "我們還為批量訂閱提供團購價"
+    group_discounts_1st: "1個訂閱"
+    group_discounts_full: "全價"
+    group_discounts_2nd: "2-11個訂閱"
+    group_discounts_20: "八折"
+    group_discounts_12th: "12＋個訂閱"
+    group_discounts_40: "六折"
+    subscribing: "訂閱中・・・"
+    recipient_emails_placeholder: "請輸入電子郵件地址來訂閱，每行一個。"
+    subscribe_users: "訂閱用戶"
+    users_subscribed: "用戶訂閱："
+    no_users_subscribed: "沒有用戶訂閱，請仔細檢查您的電子郵件地址。"
+    current_recipients: "當前收件人"
+    unsubscribing: "取消訂閱中・・・"
+    subscribe_prepaid: "點擊訂閱來使用預付代碼"
+    using_prepaid: "使用預付費代碼進行每月訂閱"
 
   choose_hero:
     choose_hero: "選擇您的英雄"
@@ -477,9 +477,9 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     coffeescript_blurb: "懶人版的 Javascript。"
     clojure_blurb: "Lisp 進化版。"
     lua_blurb: "許多遊戲引擎支援的程式語言。"
-    io_blurb: "簡單但不有名。"
+    io_blurb: "簡單但不出名。"
     status: "狀態"
-    hero_type: "种类"
+    hero_type: "種類"
     weapons: "武器"
     weapons_warrior: "刀劍 - 短距離、非魔法"
     weapons_ranger: "十字弓, 槍砲 - 長距離、非魔法"
@@ -487,19 +487,19 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     attack: "傷害" # Can also translate as "Attack"
     health: "血量"
     speed: "速度"
-    regeneration: "再生"
+    regeneration: "恢復"
     range: "距離" # As in "attack or visual range"
     blocks: "格擋" # As in "this shield blocks this much damage"
     backstab: "背刺" # As in "this dagger does this much backstab damage"
     skills: "技能"
-#    attack_1: "Deals"
-#    attack_2: "of listed"
-#    attack_3: "weapon damage."
-#    health_1: "Gains"
-#    health_2: "of listed"
-#    health_3: "armor health."
-#    speed_1: "Moves at"
-#    speed_2: "meters per second."
+    attack_1: "造成"
+    attack_2: "例表"
+    attack_3: "武器傷害。"
+    health_1: "收穫"
+    health_2: "例表"
+    health_3: "裝備血量。"
+    speed_1: "移動速度"
+    speed_2: "米每秒。"
     available_for_purchase: "可以購買" # Shows up when you have unlocked, but not purchased, a hero in the hero store
     level_to_unlock: "解鎖關卡:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
     restricted_to_certain_heroes: "特定英雄才可遊玩此關卡。"
@@ -556,7 +556,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     why_paragraph_2_italic: "「耶！拿到獎章了。」"
     why_paragraph_2_center: "的有趣, 而是"
     why_paragraph_2_italic_caps: "「媽我不要出去玩，我要寫完這段！」"
-    why_paragraph_2_suffix: "般引人入勝。這是為甚麼CodeCombat被設計成多人對戰「遊戲」，而不是遊戲化「課程」。在您對這遊戲無法自拔之前，我們是不會放棄的─幫然，這個遊戲，將是有益於您的。"
+    why_paragraph_2_suffix: "般引人入勝。這是為甚麼CodeCombat被設計成多人對戰「遊戲」，而不是遊戲化「課程」。在您對這遊戲無法自拔之前，我們是不會放棄的─當然，這個遊戲，將是有益於您的。"
     why_paragraph_3: "如果您要沉迷遊戲的話，就來沉迷CodeCombat，成為科技時代的魔法師吧！"
     press_title: "部落格/新聞稿"
     press_paragraph_1_prefix: "想要撰寫有關我們的文章？請自由取用或下載我們的"
@@ -573,93 +573,93 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     michael_blurb: "系統管理員"
     matt_title: "程式員" # {change}
     matt_blurb: "競速單車玩家"
-#    cat_title: "Chief Artisan"
-#    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
-#    josh_blurb: "Floor Is Lava"
-#    jose_title: "Music"
-#    jose_blurb: "Taking Off"
-#    retrostyle_title: "Illustration"
-#    retrostyle_blurb: "RetroStyle Games"
+    cat_title: "首席開卡設計師"
+    cat_blurb: "氣宗"
+    josh_title: "遊戲設計師"
+    josh_blurb: "地面是熔岩"
+    jose_title: "音樂"
+    jose_blurb: "放輕鬆"
+    retrostyle_title: "插畫師"
+    retrostyle_blurb: "復古風格的遊戲"
 
   teachers:
     title: "CodeCombat致教師的說明"
-#    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
-#    intro_2: "No experience required!"
-#    free_title: "How much does it cost?"
-#    cost_china: "CodeCombat in China is free for the first five levels, after which it costs $9.99 USD per month for access to our other 140+ levels on our exclusive China servers."
-#    free_1: "There are 100+ FREE levels which cover every concept."
-#    free_2: "A monthly subscription provides access to video tutorials and extra practice levels."
-#    teacher_subs_title: "Teachers get free subscriptions!"
-#    teacher_subs_1: "Please fill out our"
-#    teacher_subs_2: "Teacher Survey"
-#    teacher_subs_3: "to set up your subscription."
-#    sub_includes_title: "What is included in the subscription?"
-#    sub_includes_1: "In addition to the 100+ basic levels, students with a monthly subscription get access to these additional features:"
-#    sub_includes_2: "70+ practice levels"
-#    sub_includes_3: "Video tutorials"
-#    sub_includes_4: "Premium email support"
-#    sub_includes_5: "10 new heroes with unique skills to master"
-#    sub_includes_6: "3500 bonus gems every month"
-#    sub_includes_7: "Private Clans"
-#    monitor_progress_title: "How do I monitor student progress?"
-#    monitor_progress_1: "Student progress can be monitored by creating a"
-#    monitor_progress_2: "for your class."
-#    monitor_progress_3: "To add a student, send them the invite link for your Clan, which is on the"
-#    monitor_progress_4: "page."
-#    monitor_progress_5: "After they join, you will see a summary of the student's progress on your Clan's page."
-#    private_clans_1: "Private Clans provide increased privacy and detailed progress information for each student."
-#    private_clans_2: "To create a private Clan, check the 'Make clan private' checkbox when creating a"
-#    private_clans_3: "."
-#    who_for_title: "Who is CodeCombat for?"
-#    who_for_1: "We recommend CodeCombat for students aged 9 and up. No prior programming experience is needed."
-#    who_for_2: "We've designed CodeCombat to appeal to both boys and girls."
-#    material_title: "How much material is there?"
-#    material_china: "Approximately 40 hours of gameplay spread over 170+ subscriber-only levels so far."
-#    material_1: "Approximately 25 hours of free content and an additional 15 hours of subscriber content."
-#    concepts_title: "What concepts are covered?"
-#    how_much_title: "How much does a monthly subscription cost?"
-#    how_much_1: "A"
-#    how_much_2: "monthly subscription"
-#    how_much_3: "costs $9.99, and can be cancelled anytime."
-#    how_much_4: "Additionally, we provide discounts for larger groups:"
-#    how_much_5: "We accept discounted one-time purchases and yearly subscription purchases for groups, such as a class or school.  Please contact"
-#    how_much_6: "for more details."
-#    more_info_title: "Where can I find more information?"
-#    more_info_1: "Our"
-#    more_info_2: "teachers forum"
-#    more_info_3: "is a good place to connect with fellow educators who are using CodeCombat."
+    intro_1: "CodeCombat 是一個教編程的網上游戲。學生會用編程語言寫代碼。"
+    intro_2: "無需經驗！"
+    free_title: "要多少錢？"
+    cost_china: "CodeCombat的前5個關卡在中國是免費的，在這之後需花費每月9.99美元來訪問我們架設在中國專屬服務器上的140多個關卡。"
+    free_1: "有100多個覆蓋了所有理論的免費關卡。"
+    free_2: "包月訂閱可以訪問視頻教程和額外的練習關卡。"
+    teacher_subs_title: "教師可免費訂閱！"
+    teacher_subs_1: "請聯繫"
+    teacher_subs_2: "教師調查"
+    teacher_subs_3: "建立您的訂閱。"
+    sub_includes_title: "訂閱裡包含了什麼內容？"
+    sub_includes_1: "除了100＋個基礎關卡，學生包月訂閱還可以使用這些附加功能："
+    sub_includes_2: "超過70個練習關卡"
+    sub_includes_3: "視頻教學"
+    sub_includes_4: "獨特的電子郵件支援"
+    sub_includes_5: "10个具有独特技能的新英雄"
+    sub_includes_6: "每月享有3500額外寶石"
+    sub_includes_7: "私人部落"
+    monitor_progress_title: "我要如何查看學生的進度？"
+    monitor_progress_1: "要查看學生的進度，可以通過建立一個"
+    monitor_progress_2: "在你的課程。"
+    monitor_progress_3: "添加一個學生，可以透過發送一個你的部落邀請鏈接給他們，這個在"
+    monitor_progress_4: "頁面。"
+    monitor_progress_5: "當他們加入之後，你可以在你的部落頁面看到這些學生的進度匯總。"
+    private_clans_1: "私人部落提升了每個學生的隱私和詳細的進度信息。"
+    private_clans_2: "為了添加一個私人部落，可以勾選“私人部落”選擇框，在你建立一個"
+    private_clans_3: "."
+    who_for_title: "誰是CodeCombat的使用對象呢？"
+    who_for_1: "我們建議讓9歲及以上的學生使用CodeCombat。無需任何編程經驗。"
+    who_for_2: "我們設計CodeCombat來吸引男生女生。"
+    material_title: "這裡有多少素材呢？"
+    material_china: "約40小時的遊戲時間和目前為止超過170個的訂閱關卡。"
+    material_1: "大约25个小时的免费内容和额外的15个小时的订阅内容。"
+    concepts_title: "包括了哪些理論知識？"
+    how_much_title: "每月的订阅费用是多少?"
+    how_much_1: ""
+    how_much_2: "每月訂閱"
+    how_much_3: "每月9.99美元，並可隨時取消訂閱。"
+    how_much_4: "另外，團體購買者將享受折扣優惠："
+    how_much_5: "我们接受一次性的打折购买以及每年订阅的团体，比如班级或者学校。请联系"
+    how_much_6: "來獲取詳情。"
+    more_info_title: "我可以在哪裡找到更多信息？"
+    more_info_1: "我們的"
+    more_info_2: "教師論壇"
+    more_info_3: "是個與其他使用CodeCombat的教育工作者聯繫的良好平台。"
     sys_requirements_title: "系統要求"
     sys_requirements_1: "因為CodeCombat是遊戲, 相比播放影片它讓電腦花費更多資源去順暢的執行. 為了讓所有人都可以接觸，我們已經讓它在現在的瀏覽器和老舊的電腦上執行最佳化. 以下是我們為了讓您順暢體驗Hour of Code所給的系統建議:" # {change}
     sys_requirements_2: "使用較新的Chrome or Firefox版本." # {change}
 
-#  teachers_survey:
-#    title: "Teacher Survey"
-#    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
-#    retrieving: "Retrieving information..."
-#    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed."
-#    approved_1: "Your application for a free trial subscription was"
-#    approved_2: "approved."
-#    approved_3: "Further instructions have been sent to"
-#    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied."
-#    contact_1: "Please contact"
-#    contact_2: "if you have further questions."
-#    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
-#    description_2: "teachers"
-#    description_3: "page."
-#    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
-#    email: "Email Address"
-#    school: "Name of School"
-#    location: "Name of City"
-#    age_students: "How old are your students?"
-#    under: "Under"
-#    other: "Other:"
-#    amount_students: "How many students do you teach?"
-#    hear_about: "How did you hear about CodeCombat?"
-#    fill_fields: "Please fill out all fields."
-#    thanks: "Thanks! We'll send you setup instructions shortly."
+  teachers_survey:
+    title: "教師調查"
+    must_be_logged: "您需要先登入。請先註冊或者在上方的目錄中點擊登入。"
+    retrieving: "檢索信息中..."
+    being_reviewed_1: "您的免費訂閱試用申請正在"
+    being_reviewed_2: "審核。"
+    approved_1: "您的免費訂閱試用申請已被"
+    approved_2: "批准。"
+    approved_3: "進一步的說明已被送往"
+    denied_1: "您的免費訂閱試用申請已被"
+    denied_2: "拒絕。"
+    contact_1: "請聯繫"
+    contact_2: "如果您有更多的疑問。"
+    description_1: "我們為教師提供免費訂閱用評估的目的。您可以找到更多的信息在我們的"
+    description_2: "教師"
+    description_3: "頁面。"
+    description_4: "請填寫此簡單問卷，我們將會向您的電子郵件發送設置說明。"
+    email: "電郵地址"
+    school: "學校名字"
+    location: "城市"
+    age_students: "您的學生年齡為多少？"
+    under: "幾歲以下"
+    other: "其他:"
+    amount_students: "請問您有多少學生需要教導？"
+    hear_about: "您是怎麼知道CodeComabat的？"
+    fill_fields: "請填寫所有問題。"
+    thanks: "非常感謝！我們會很快寄你設置說明。"
 
   versions:
     save_version_title: "保存新版本"
@@ -669,7 +669,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     cla_url: "貢獻者許可協議"
     cla_suffix: "。"
     cla_agree: "我同意"
-#    owner_approve: "An owner will need to approve it before your changes will become visible."
+    owner_approve: "您所做出的修改必须经拥有者确认才能生效。"
 
   contact:
     contact_us: "聯繫我們"
@@ -697,7 +697,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     picture_tab: "頭像"
     delete_account_tab: "刪除您的帳戶"
     wrong_email: "錯誤的Email"
-#    wrong_password: "Wrong Password"
+    wrong_password: "密碼錯誤"
     upload_picture: "上傳圖片"
     delete_this_account: "永久性的刪除帳戶"
     god_mode: "上帝模式"
@@ -707,7 +707,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     new_password: "新密碼"
     new_password_verify: "確認密碼"
     type_in_email: "輸入您的Email來確認刪除" # {change}
-#    type_in_password: "Also, type in your password."
+    type_in_password: "還有輸入您的密碼。"
     email_subscriptions: "訂閱"
     email_subscriptions_none: "無Email訂閱"
     email_announcements: "通知"
@@ -738,7 +738,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     keyboard_shortcuts: "鍵盤快捷鍵"
     space: "Space"
     enter: "Enter"
-#    press_enter: "press enter"
+    press_enter: "按Enter"
     escape: "Esc"
     shift: "Shift"
     run_code: "執行當前腳本"
@@ -765,7 +765,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     article_editor_prefix: "看到有錯誤在我們的文件中嗎? 想要自己設計指令嗎? 查看我們的"
     article_editor_suffix: "以及幫助CodeCombat玩家獲得更多知識在遊戲中."
     find_us: "通過這些網站連繫我們"
-#    social_github: "Check out all our code on GitHub"
+    social_github: "在GitHub上查看我們的代碼"
     social_blog: "閱讀CodeCombat在Sett上的部落格"
     social_discource: "加入我們在Discourse論壇上的討論"
     social_facebook: "關注CodeCombat的Facebook"
@@ -774,49 +774,49 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     social_hipchat: "通過公共的HipChat與我們交流"
     contribute_to_the_project: "貢獻這專案"
 
-#  clans:
-#    clan: "Clan"
-#    clans: "Clans"
-#    new_name: "New clan name"
-#    new_description: "New clan description"
-#    make_private: "Make clan private"
-#    subs_only: "subscribers only"
-#    create_clan: "Create New Clan"
-#    private_preview: "Preview"
-#    public_clans: "Public Clans"
-#    my_clans: "My Clans"
-#    clan_name: "Clan Name"
-#    name: "Name"
-#    chieftain: "Chieftain"
-#    type: "Type"
-#    edit_clan_name: "Edit Clan Name"
-#    edit_clan_description: "Edit Clan Description"
-#    edit_name: "edit name"
-#    edit_description: "edit description"
-#    private: "(private)"
-#    summary: "Summary"
-#    average_level: "Average Level"
-#    average_achievements: "Average Achievements"
-#    delete_clan: "Delete Clan"
-#    leave_clan: "Leave Clan"
-#    join_clan: "Join Clan"
-#    invite_1: "Invite:"
-#    invite_2: "*Invite players to this Clan by sending them this link."
-#    members: "Members"
-#    progress: "Progress"
-#    not_started_1: "not started"
-#    started_1: "started"
-#    complete_1: "complete"
-#    exp_levels: "Expand levels"
-#    rem_hero: "Remove Hero"
-#    status: "Status"
-#    complete_2: "Complete"
-#    started_2: "Started"
-#    not_started_2: "Not Started"
-#    view_solution: "Click to view solution."
-#    latest_achievement: "Latest Achievement"
-#    playtime: "Playtime"
-#    last_played: "Last played"
+  Clans:
+    clan: "部落"
+    clans: "部落"
+    new_name: "新部落的名字"
+    new_description: "新部落的描述"
+    make_private: "設定部落為私人"
+    subs_only: "只限訂閱"
+    create_clan: "創建新的部落"
+    private_preview: "預覽"
+    public_clans: "公共部落"
+    my_clans: "我的部落"
+    clan_name: "部落名字"
+    name: "名字"
+    chieftain: "首領"
+    type: "種類"
+    edit_clan_name: "編輯部落的名字"
+    edit_clan_description: "編輯部落的描述"
+    edit_name: "編輯名字"
+    edit_description: "編輯描述"
+    private: "（私人）"
+    summary: "綜述"
+    average_level: "平均等級"
+    average_achievements: "平均成就"
+    delete_clan: "刪除部落"
+    leave_clan: "離開部落"
+    join_clan: "加入部落"
+    invite_1: "邀請："
+    invite_2: "*透過這個鏈接來邀請玩家加入部落。"
+    members: "成員"
+    progress: "進度"
+    not_started_1: "尚未開始"
+    started_1: "已開始"
+    complete_1: "完成"
+    exp_levels: "展開關卡"
+    rem_hero: "移除英雄"
+    status: "狀態"
+    complete_2: "完成"
+    started_2: "已開始"
+    not_started_2: "尚未開始"
+    view_solution: "點擊查閱答案。"
+    latest_achievement: "最新成就"
+    playtime: "遊戲時間"
+    last_played: "最後玩了"
 
   classes:
     archmage_title: "大法師"
@@ -853,8 +853,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     indoor: "室內"
     desert: "沙漠"
     grassy: "草地"
-#    mountain: "Mountain"
-#    glacier: "Glacier"
+    mountain: "高山"
+    glacier: "冰川"
     small: "小的"
     large: "大的"
     fork_title: "產生新分支"
@@ -877,7 +877,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     level_tab_thangs_all: "所有的"
     level_tab_thangs_conditions: "啟動條件"
     level_tab_thangs_add: "增加物體"
-#    level_tab_thangs_search: "Search thangs"
+    level_tab_thangs_search: "搜索物體"
     add_components: "增加組件"
     component_configs: "組件組態"
     config_thang: "雙擊來構建物體"
@@ -923,8 +923,8 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     pop_i18n: "填寫 I18N"
     tasks: "任務"
     clear_storage: "清除您本機端的變更"
-#    add_system_title: "Add Systems to Level"
-#    done_adding: "Done Adding"
+    add_system_title: "添加系統到關卡"
+    done_adding: "添加完成"
 
   article:
     edit_btn_preview: "預覽"
@@ -1046,7 +1046,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     fight: "戰鬥!"
     watch_victory: "觀看您的勝利"
     defeat_the: "擊敗"
-#    tournament_started: ", started"
+    tournament_started: "，錦標賽已開始"
     tournament_ends: "錦標賽結束"
     tournament_ended: "錦標賽已結束"
     tournament_rules: "錦標賽規則"
@@ -1071,7 +1071,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     no_achievements: "還沒有取得成就."
     favorite_prefix: "語言喜好為"
     favorite_postfix: "."
-#    not_member_of_clans: "Not a member of any clans yet."
+    not_member_of_clans: "還不是任何一個部落裡的成員。"
 
   achievements:
     last_earned: "最近一次"
@@ -1097,7 +1097,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     payments: "付款"
     purchased: "已購買"
     subscription: "訂閱"
-#    invoices: "Invoices"
+    invoices: "收據"
     service_apple: "設備: Apple"
     service_web: "設備: Web"
     paid_on: "支付"
@@ -1114,15 +1114,15 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     status_unsubscribed_active: "您尚未訂閱並且將不會收到賬單，但是您的帳號現在仍然是有效的."
     status_unsubscribed: "借由訂閱CodeCombat，取得存取新關卡，新英雄，新物品和額外寶石的資格!"
 
-#  account_invoices:
-#    amount: "Amount in US dollars"
-#    declined: "Your card was declined"
-#    invalid_amount: "Please enter a US dollar amount."
-#    not_logged_in: "Log in or create an account to access invoices."
-#    pay: "Pay Invoice"
-#    purchasing: "Purchasing..."
-#    retrying: "Server error, retrying."
-#    success: "Successfully paid. Thanks!"
+  account_invoices:
+    amount: "金額（美元）"
+    declined: "您的付款被拒"
+    invalid_amount: "請輸入美元金額。"
+    not_logged_in: "登錄或創建一個帳戶來獲取發票。"
+    pay: "付費發票"
+    purchasing: "購買中···"
+    retrying: "服務器錯誤，重試中。"
+    success: "支付成功。謝謝！"
 
   loading_error:
     could_not_load: "從伺服器載入失敗"
@@ -1177,7 +1177,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     user_remarks: "用戶備註"
     versions: "版本"
     items: "項目"
-#    hero: "Hero"
+    hero: "英雄"
     heroes: "英雄"
     achievement: "成就"
     clas: "貢獻者許可協議"
@@ -1185,35 +1185,35 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     feedback: "回饋"
     payment_info: "付款訊息"
     campaigns: "征戰"
-#    poll: "Poll"
-#    user_polls_record: "Poll Voting History"
+    poll: "投票"
+    user_polls_record: "投票結果"
 
-#  concepts:
-#    advanced_strings: "Advanced Strings"
-#    algorithms: "Algorithms"
-#    arguments: "Arguments"
-#    arithmetic: "Arithmetic"
-#    arrays: "Arrays"
-#    basic_syntax: "Basic Syntax"
-#    boolean_logic: "Boolean Logic"
-#    break_statements: "Break Statements"
-#    classes: "Classes"
-#    for_loops: "For Loops"
-#    functions: "Functions"
-#    if_statements: "If Statements"
-#    input_handling: "Input Handling"
-#    math_operations: "Math Operations"
-#    object_literals: "Object Literals"
-#    strings: "Strings"
-#    variables: "Variables"
-#    vectors: "Vectors"
-#    while_loops: "Loops"
-#    recursion: "Recursion"
+  concepts:
+    advanced_strings: "高級字符串"
+    algorithms: "算法"
+    arguments: "參數"
+    arithmetic: "四則運算"
+    arrays: "陣列"
+    basic_syntax: "基本語法"
+    boolean_logic: "布爾邏輯"
+    break_statements: "Break語句"
+    classes: "類別"
+    for_loops: "For循環"
+    functions: "函數"
+    if_statements: "If語句"
+    input_handling: "輸入處理"
+    math_operations: "數學運算"
+    object_literals: "對象常量"
+    strings: "字符串"
+    variables: "變量"
+    vectors: "向量"
+    while_loops: "循環"
+    recursion: "遞歸"
 
   delta:
     added: "已填加"
     modified: "已修改"
-#    not_modified: "Not Modified"
+    not_modified: "未修改"
     deleted: "已刪除"
     moved_index: "已移動的索引"
     text_diff: "文本變化"
@@ -1306,7 +1306,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     one_month_coupon: "固本: 選擇 Rails 或者 HTML"
     one_month_discount: "折扣 30% : 選擇 Rails 或者 HTML"
     license: "許可證"
-    oreilly: "你選擇的電子書"
+    oreilly: "您選擇的電子書"
 
   account_profile:
     settings: "設定" # We are not actively recruiting right now, so there's no need to add new translations for this section.