Merge branch 'master' into production

app/locale/ar.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/bg.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "български език", englishDescri
     press_paragraph_1_link: "прес пакет"
     press_paragraph_1_suffix: "Всички логота и икони могат да бъдат използвани без да се свържете с нас директно."
     team: "Отбор"
-    george_title: "Съосновател"
+    nick_title: "Съосновател" # {change}
-#    george_blurb: "Businesser"
-    scott_title: "Съосновател"
-    scott_blurb: "Разумният"
-    nick_title: "Съосновател"
     nick_blurb: "Гуру на Мотивациите"
-    michael_title: "Програмист"
+    matt_title: "Съосновател" # {change}
-    michael_blurb: "Системен Администратор"
-    matt_title: "Съосновател"
     matt_blurb: "Колоездач"
-    cat_title: "Главен Артист"
+    cat_title: "Главен Артист" # {change}
     cat_blurb: "Повелителят на въздуха"
-    josh_title: "Дизайнер на играта"
+    scott_title: "Съосновател" # {change}
-    josh_blurb: "Подът е Лава"
+    scott_blurb: "Разумният"
-    jose_title: "Музика"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Стартирам"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Илюстрация"
+#    rob_title: "Software Engineer"
-    retrostyle_blurb: "Игра Ретро Стил"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Дизайнер на играта"
+    josh_blurb: "Подът е Лава"
+    retrostyle_title: "Илюстрация"
+    retrostyle_blurb: "Игра Ретро Стил"
+    jose_title: "Музика"
+    jose_blurb: "Стартирам"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/ca.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     press_paragraph_1_link: "paquet de premsa"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
     team: "Equip"
-#    george_title: "Cofounder"
-#    george_blurb: "Businesser"
-    scott_title: "Programador" # {change}
-#    scott_blurb: "Reasonable One"
     nick_title: "Programador" # {change}
 #    nick_blurb: "Motivation Guru"
-    michael_title: "Programador"
-#    michael_blurb: "Sys Admin"
     matt_title: "Programador" # {change}
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Programador" # {change}
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
     cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/cs.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     press_paragraph_1_link: "balíčku pro tisk"
     press_paragraph_1_suffix: ". Všechny loga a obrázky mohou být použity bez toho, abyste nás museli přímo kontaktovat."
     team: "Tým"
-    george_title: "Výkonný ředitel" # {change}
-    george_blurb: "Obchodník"
-    scott_title: "Programátor" # {change}
-    scott_blurb: "Ten potřebný"
     nick_title: "Programátor" # {change}
     nick_blurb: "Motivační guru"
-    michael_title: "Programátor"
-    michael_blurb: "Systémový administrátor"
     matt_title: "Programátor" # {change}
     matt_blurb: "Cyklista"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Programátor" # {change}
-#    josh_blurb: "Floor Is Lava"
+    scott_blurb: "Ten potřebný"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     email_settings_url: " nastavení emailu"
     email_description_suffix: "nebo skrze odkazy v odeslaných emailech si můžete nastavit nebo se kdykoliv odhlásit z naší korespondence."
     cost_title: "Cena"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights a Licence"
     contributor_title: "Licenční ujednání přispívatelů (CLA)"
     contributor_description_prefix: "Všichni přispívatelé jak na webu tak do projektu na GitHubu spadají pod naše "

app/locale/da.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/de-AT.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     press_paragraph_1_link: "Presse-Paket"
     press_paragraph_1_suffix: ". Alle Logos und Bilder können ohne unsere vorherige Zustimmung verwendet werden."
     team: "Team"
-    george_title: "CEO" # {change}
-    george_blurb: "Businesser"
-    scott_title: "Programmierer" # {change}
-    scott_blurb: "Der Vernünftige"
     nick_title: "Programmierer" # {change}
     nick_blurb: "Motivationsguru"
-    michael_title: "Programmierer"
-    michael_blurb: "Sys Admin"
     matt_title: "Programmierer" # {change}
     matt_blurb: "Radfahrer"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Programmierer" # {change}
-#    josh_blurb: "Floor Is Lava"
+    scott_blurb: "Der Vernünftige"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     email_settings_url: "deiner Emaileinstellungen"
     email_description_suffix: "oder durch von uns gesendete Links kannst du jederzeit deine Einstellungen ändern und Abonnements kündigen."
     cost_title: "Kosten"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights und Lizenzen"
     contributor_title: "Contributor License Agreement"
     contributor_description_prefix: "Alle Beiträge, sowohl auf unserer Webseite als auch in unserem GitHub Repository, unterliegen unserer"

app/locale/de-CH.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-    michael_title: "Programmierer"
-    michael_blurb: "System Admin"
     matt_title: "Programmierer" # {change}
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
     cat_blurb: "Luftbändiger"
-    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-    josh_blurb: "De Bode isch Lava"
+#    scott_blurb: "Reasonable One"
-    jose_title: "Musig"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Game Designer"
+    josh_blurb: "De Bode isch Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+    jose_title: "Musig"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     email_settings_url: "E-Mail Istellige"
     email_description_suffix: "oder dur d Links i de E-Mails wo mir schicked, chasch du jederziit dini Preferänze ändere und dich ganz eifach us de Mailing-Liste neh."
     cost_title: "Chöste"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/de-DE.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     press_paragraph_1_link: "Presse-Paket"
     press_paragraph_1_suffix: ". Alle Logos und Bilder können ohne unsere vorherige Zustimmung verwendet werden."
     team: "Team"
-    george_title: "CEO"
+    nick_title: "Programmierer" # {change}
-    george_blurb: "Vertriebler"
-    scott_title: "Programmierer"
-    scott_blurb: "Der Vernünftige"
-    nick_title: "Programmierer"
     nick_blurb: "Motivationsguru"
-    michael_title: "Programmierer"
-    michael_blurb: "Sys Admin"
     matt_title: "Programmierer" # {change}
     matt_blurb: "Radfahrer"
-    cat_title: "Chief Artisan"
+    cat_title: "Chief Artisan" # {change}
     cat_blurb: "Luftbändiger"
-    josh_title: "Spiel Designer"
+    scott_title: "Programmierer" # {change}
-    josh_blurb: "Boden ist Lava"
+    scott_blurb: "Der Vernünftige"
-    jose_title: "Musik"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Spiel Designer"
+    josh_blurb: "Boden ist Lava"
+    retrostyle_title: "Illustration"
+    retrostyle_blurb: "RetroStyle Games"
+    jose_title: "Musik"
+    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "An wen richtet sich CodeCombat?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."

app/locale/el.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     press_paragraph_1_link: "πακέτο τύπου"
     press_paragraph_1_suffix: ". Όλα τα λογότυπα και οι εικόνες μπορούν χρησιμοποιηθούν χωρίς να επικοινωνήσετε με εμάς άμεσα."
     team: "Ομάδα"
-    george_title: "Συνιδρυτής"
+    nick_title: "Συνιδρυτής" # {change}
-    george_blurb: " Ο Επιχειρηματικός"
-    scott_title: "Συνιδρυτής"
-    scott_blurb: "Ο Λογικός"
-    nick_title: "Συνιδρυτής"
     nick_blurb: "Γκουρού της Παρακίνησης"
-    michael_title: "Προγραμματιστής"
+    matt_title: "Συνιδρυτής" # {change}
-    michael_blurb: "Διαχειριστής Συστήματος"
-    matt_title: "Συνιδρυτής"
     matt_blurb: "Ποδηλάτης"
-    cat_title: "Κύριος Σχεδιαστής Επιπέδων"
+    cat_title: "Κύριος Σχεδιαστής Επιπέδων" # {change}
 #    cat_blurb: "Airbender"
-    josh_title: "Σχεδιαστής Παιχνιδιού"
+    scott_title: "Συνιδρυτής" # {change}
-    josh_blurb: "Το Πάτωμα Είναι Λάβα"
+    scott_blurb: "Ο Λογικός"
-    jose_title: "Μουσική"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Απογείωση"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Εικονογράφηση"
+#    rob_title: "Software Engineer"
-    retrostyle_blurb: "Ρετρό Παιχνίδια"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Σχεδιαστής Παιχνιδιού"
+    josh_blurb: "Το Πάτωμα Είναι Λάβα"
+    retrostyle_title: "Εικονογράφηση"
+    retrostyle_blurb: "Ρετρό Παιχνίδια"
+    jose_title: "Μουσική"
+    jose_blurb: "Απογείωση"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Για ποιον είναι το CodeCombat;"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     additional_resources_1_mid: "Οδηγός Εκπαιδευτικού για Μάθημα 1"
     additional_resources_1_suff: "Επεξηγήσεις και λύσεις για το κάθε επίπεδο."
     additional_resources_2_pref: "Συμπλήρωσε την"
-    additional_resources_2_suff: "για να κερδίσεις 15 ακόμα ώρες υλικού Δωρεάν για 2 μήνες."
+    additional_resources_2_suff: "για να κερδίσεις 15 ακόμα ώρες υλικού Δωρεάν για 2 μήνες." # {change}
     additional_resources_3_pref: "Επισκέψη"
     additional_resources_3_mid: "στα Forums των εκπαιδευτικών"
     additional_resources_3_suff: "για να επικοινωνήσεις με άλλους συναδέρφους που χρησιμοποιούν το CodeCombat."

app/locale/en-GB.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights and Licences"
     contributor_title: "Contributor Licence Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/en-US.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/en.coffee

@@ -553,17 +553,17 @@
     press_paragraph_1_link: "press packet"
     press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
     team: "Team"
-    nick_title: "Cofounder, CEO" # {change}
+    nick_title: "Cofounder, CEO"
     nick_blurb: "Motivation Guru"
-    matt_title: "Cofounder, CTO" # {change}
+    matt_title: "Cofounder, CTO"
     matt_blurb: "Bicyclist"
-    cat_title: "Game Designer" # {change}
+    cat_title: "Game Designer"
     cat_blurb: "Airbender"
-    scott_title: "Cofounder, Software Engineer" # {change}
+    scott_title: "Cofounder, Software Engineer"
     scott_blurb: "Reasonable One"
     maka_title: "Customer Advocate"
     maka_blurb: "Storyteller"
-    rob_title: "Software Engineer" # {change}
+    rob_title: "Software Engineer"
     rob_blurb: "Codes things and stuff"
     josh_c_title: "Game Designer"
     josh_c_blurb: "Designs games"
@@ -993,7 +993,7 @@
     additional_resources_1_mid: "Course 1 Teacher's Guide"
     additional_resources_1_suff: "explanations and solutions to each level."
     additional_resources_2_pref: "Complete our"
-    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
     additional_resources_3_pref: "Visit our"
     additional_resources_3_mid: "Teacher Forums"
     additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."

app/locale/eo.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/es-419.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     press_paragraph_1_link: "paquete de prensa"
     press_paragraph_1_suffix: ". Todos los logos e imágenes pueden ser usados sin contactarnos directamente."
     team: "Equipo"
-    george_title: "Cofundador"
+    nick_title: "Cofundador" # {change}
-    george_blurb: "Negociante"
-    scott_title: "Cofundador"
-    scott_blurb: "Razonable"
-    nick_title: "Cofundador"
     nick_blurb: "Gurú motivacional"
-    michael_title: "Programador"
+    matt_title: "Cofundador" # {change}
-    michael_blurb: "Sys Admin"
-    matt_title: "Cofundador"
     matt_blurb: "Bicicletero"
-    cat_title: "Jefe Artesano"
+    cat_title: "Jefe Artesano" # {change}
     cat_blurb: "Maestro del Aire"
-    josh_title: "Diseñador de Juegos"
+    scott_title: "Cofundador" # {change}
-    josh_blurb: "El piso es Lava"
+    scott_blurb: "Razonable"
-    jose_title: "Música"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Despegar"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Ilustración"
+    rob_title: "Ingeniero de Compilación" # {change}
-    retrostyle_blurb: "Juegos con estilo Retro"
-    rob_title: "Ingeniero de Compilación"
     rob_blurb: "Hace código y demás"
     josh_c_title: "Diseñador de Juegos"
     josh_c_blurb: "Diseña juegos"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Diseñador de Juegos"
+    josh_blurb: "El piso es Lava"
+    retrostyle_title: "Ilustración"
+    retrostyle_blurb: "Juegos con estilo Retro"
+    jose_title: "Música"
+    jose_blurb: "Despegar"
     carlos_title: "Manager de Región, Brasil"
     carlos_blurb: "Hombre apio"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "¿Para quienes es CodeCombat?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."

app/locale/es-ES.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     press_paragraph_1_link: "paquete de prensa"
     press_paragraph_1_suffix: ". Todos los logos y las imagenes pueden ser usados sin necesidad de contactarnos directamente."
     team: "Equipo"
-    george_title: "Co-Fundador"
+    nick_title: "Co-Fundador" # {change}
-    george_blurb: "Hombre de Negocios"
-    scott_title: "Co-Fundador"
-    scott_blurb: "Razonable"
-    nick_title: "Co-Fundador"
     nick_blurb: "Guru Motivacional"
-    michael_title: "Programador"
+    matt_title: "Co-Fundador" # {change}
-    michael_blurb: "Administrador de Sistemas"
-    matt_title: "Co-Fundador"
     matt_blurb: "Ciclista"
-    cat_title: "Jefe Artesano"
+    cat_title: "Jefe Artesano" # {change}
 #    cat_blurb: "Airbender"
-    josh_title: "Diseñador de Videojuegos"
+    scott_title: "Co-Fundador" # {change}
-#    josh_blurb: "Floor Is Lava"
+    scott_blurb: "Razonable"
-    jose_title: "Música"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Illustración"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Diseñador de Videojuegos"
+#    josh_blurb: "Floor Is Lava"
+    retrostyle_title: "Illustración"
+#    retrostyle_blurb: "RetroStyle Games"
+    jose_title: "Música"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     email_settings_url: "tus ajustes de correo electrónico"
     email_description_suffix: "o a través de los enlaces en los correos que te enviemos, puedes cambiar tus preferencias y darte de baja fácilmente en cualquier momento."
     cost_title: "Precio"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights y Licencias"
     contributor_title: "Acuerdo de Licencia del Colaborador"
     contributor_description_prefix: "Todas las colaboraciones, tanto en la web como en nuestro repositorio de GitHub, están sujetas a nuestro"

app/locale/et.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Eesti", englishDescription: "Estonian", tra
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/fa.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/fi.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Kenelle CodeCombat on tarkoitettu?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/fr.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     press_paragraph_1_link: "paquet de presse"
     press_paragraph_1_suffix: ". Tous les logos et images peuvent être utilisés sans nous contacter directement."
     team: "Équipe"
-    george_title: "PDG" # {change}
-    george_blurb: "Homme d'affaires"
-    scott_title: "Programmeur" # {change}
-    scott_blurb: "Raisonable"
     nick_title: "Programmeur" # {change}
     nick_blurb: "Gourou de Motivation"
-    michael_title: "Programmeur"
-    michael_blurb: "Sys Admin"
     matt_title: "Programmeur" # {change}
     matt_blurb: "Bicycliste"
-    cat_title: "Chef Artisan"
+    cat_title: "Chef Artisan" # {change}
     cat_blurb: "Seigneur de l'air"
-    josh_title: "Game Designer"
+    scott_title: "Programmeur" # {change}
-    josh_blurb: "Le plancher est de la lave"
+    scott_blurb: "Raisonable"
-    jose_title: "Musique"
+    maka_title: "Responsable clientèle"
-    jose_blurb: "Décollage"
+    maka_blurb: "Conteur"
-    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-    retrostyle_blurb: "Jeux RetroStyle"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
     josh_c_title: "Game Designer"
     josh_c_blurb: "Conçoit des jeux"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Game Designer"
+    josh_blurb: "Le plancher est de la lave"
+    retrostyle_title: "Illustration"
+    retrostyle_blurb: "Jeux RetroStyle"
+    jose_title: "Musique"
+    jose_blurb: "Décollage"
     carlos_title: "Manager de la région Brésil"
     carlos_blurb: "Homme-céleri"
-    maka_title: "Responsable clientèle"
-    maka_blurb: "Conteur"
 
   teachers:
     who_for_title: "A qui CodeCombat est-il destiné ?"
@@ -793,24 +791,24 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     course: "Cours"
     courses: "cours"
     create_new_class: "Créer une Nouvelle Classe"
-#    not_enrolled: "You are not enrolled in this course."
+    not_enrolled: "Vous n'êtes pas inscrit à ce cours."
-#    visit_pref: "Please visit the"
+    visit_pref: "Veuillez visiter la"
-#    visit_suf: "page to enroll."
+    visit_suf: "page d'inscription."
     select_class: "Selectionnez l'une de vos classes"
 #    unnamed: "*unnamed*"
     select: "Selectionner"
-#    unnamed_class: "Unnamed Class"
+    unnamed_class: "Classe sans nom"
     edit_settings: "modifier les réglages de la classe"
     edit_settings1: "Modifier les Réglages de la Classe"
     progress: "Evolution de la Classe"
     add_students: "Ajouter des Elèves"
     stats: "Statistiques"
-    total_students: "Nom total d'élèves:"
+    total_students: "Nombre total d'élèves:"
     average_time: "Temps moyen de jeu par niveau:"
     total_time: "Temps total de jeu:"
     average_levels: "Nombre de niveaux moyen complétés:"
     total_levels: "Total de niveaux complétés:"
-#    furthest_level: "Furthest level completed:"
+    furthest_level: "Meilleur niveau complété:"
     concepts_covered: "Conceptes Couverts"
     students: "Elèves"
     students1: "éleves"
@@ -818,14 +816,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     levels: "niveaux"
     played: "Joué"
     play_time: "Temps de jeu:"
-#    completed: "Completed:"
+    completed: "Complété:"
     invite_students: "Inviter des élèves à rejoindre cette classe."
     invite_link_header: "Lien pour rejoindre le cours"
     invite_link_p_1: "Partagez ce lien aux élèves voulant rejoindre le cours."
-#    invite_link_p_2: "Or have us email them directly:"
+    invite_link_p_2: "Ou laissez-nous leur envoyer un email directement:"
 #    capacity_used: "Course slots used:"
-    enter_emails: "Entrez les emails des élèves à inviter, à raisin d'un par ligne"
+    enter_emails: "Entrez les adresses emails des élèves à inviter, à raison d'une par ligne"
-    send_invites: "Envoyer les nvitations"
+    send_invites: "Envoyer les invitations"
     title: "Titre"
     description: "Description"
     creating_class: "Creation de la classe..."
@@ -845,7 +843,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     for: "pour" # 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: "Essai gratuit pour les professeurs!"
-#    get_access: "to get individual access to all courses for evalutaion purposes."
+    get_access: "pour obtenir un accès individuel à tous les cours pour évaluation."
     questions: "Questions?"
     teachers_click: "Professeurs, Clickez Ici"
     students_click: "Elèves, Clickez Ici"
@@ -854,31 +852,31 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     more_in_less: "Apprenez plus en moins de temps"
     no_experience: "Aucune expérience en développement requise"
     easy_monitor: "Suivez facilement la progression des élèves"
-#    purchase_for_class: "Purchase a course for your entire class. It's easy to sign up your students!"
+    purchase_for_class: "Achetez un cours pour votre classe. C'est très simple de rajouter vos élèves!"
 #    see_the: "See the"
     more_info: "pour plus d'informations."
     choose_course: "Choisissez votre cours:"
     enter_code: "Entrez un code de déverouillage pour rejoindre une classe existante"
     enter_code1: "Entrez le code de déverouillage"
-#    enroll: "Enroll"
+    enroll: "Inscription"
-#    pick_from_classes: "Pick from your current classes"
+    pick_from_classes: "Sélectionnez depuis vos classes actuelles"
     enter: "Entrer"
     or: "Ou"
     topics: "Sujets"
-#    hours_content: "Hours of content:"
+    hours_content: "Heures de contenu:"
     get_free: "Obtenez des cours GRATUITS"
-#    enroll_paid: "Enroll Students in Paid Courses"
+    enroll_paid: "Inscrire des élèves aux cours payants"
     you_have1: "Vous avez"
-#    you_have2: "unused paid enrollments"
+    you_have2: "inscriptions payantes non utilisées"
-#    use_one: "Use 1 paid enrollment for"
+    use_one: "Utilisez 1 inscription payante pour"
-#    use_multiple: "Use paid enrollments for the following students:"
+    use_multiple: "Utilisez des inscriptions payantes pour les élèves suivants:"
-#    already_enrolled: "already enrolled"
+    already_enrolled: "déjà inscrit"
     licenses_remaining: "licenses restantes:"
-#    insufficient_enrollments: "insufficient paid enrollments"
+    insufficient_enrollments: "inscriptions payantes insuffisantes"
-#    enroll_students: "Enroll Students"
+    enroll_students: "Inscrire des élèves"
-#    get_enrollments: "Get More Enrollments"
+    get_enrollments: "Obtenir plus d'inscriptions"
     change_language: "Changez la langue du cours"
-#    keep_using: "Keep Using"
+    keep_using: "Continuer à utiliser"
     switch_to: "Changer"
 #    greetings: "Greetings!"
     learn_p: "Apprendre Python"
@@ -887,8 +885,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     back_classrooms: "Retour à mes classes"
     back_courses: "Retour à mes cours"
     edit_details: "Modifier les informations de la classe"
-#    enrolled_courses: "enrolled in paid courses:"
+    enrolled_courses: "inscrit aux cours payants:"
-#    purchase_enrollments: "Purchase Enrollments"
+    purchase_enrollments: "Acheter des inscriptions"
     remove_student: "enlever l'élève"
     assign: "Assigner"
 #    to_assign: "to assign paid courses."
@@ -899,17 +897,17 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     play_campaign_title: "Jouer la Campagne"
     play_campaign_description: "Vous êtes prêts pour la prochaine étape! Explorez des centaines de niveaux stimulants, apprenez al programmation avancée, et rivalisez avec d'autres dans les arènes multijoueurs!"
     create_account_title: "Créer un compte"
-#    create_account_description: "Sign up for a FREE CodeCombat account and gain access to more levels, more programming skills, and more fun!"
+    create_account_description: "Inscrivez-vous GRATUITEMENT à CodeCombat et accédez à plus de niveaux, plus de compétences de programmation et plus de fun!"
     preview_campaign_title: "Campagne de démonstration"
     preview_campaign_description: "Ayez un aperçu de tout ce dont CodeCombat a à offrir avant de s'enregistrer GRATUITEMENT."
     arena: "Arène"
     arena_soon_title: "L'Arene arrive prochainement"
     arena_soon_description: "Nous travaillons sur une arene multijoueur pour les classes à la fin de"
-#    not_enrolled1: "Not enrolled"
+    not_enrolled1: "Non inscrit"
-#    not_enrolled2: "Ask your teacher to enroll you in the next course."
+    not_enrolled2: "Demandez à votre professeur de vous inscrire au cours suivant."
     next_course: "Cours suivant"
     coming_soon1: "Prochainement"
-#    coming_soon2: "We are hard at work making more courses for you!"
+    coming_soon2: "Nous travaillons dur pour faire plus de nouveaux cours!"
     available_levels: "Niveaux disponibles"
     welcome_to_courses: "Aventurier, bienvenu dans les leçons!"
     ready_to_play: "Prêt à jouer?"
@@ -932,10 +930,10 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     view_class: "voir la classe"
     view_levels: "voir les niveaux"
     join_class: "Rejoindre une classe"
-#    ask_teacher_for_code: "Ask your teacher if you have a CodeCombat class code! If so, enter it below:"
+    ask_teacher_for_code: "Demandez à votre professeur si vous avez un code de classe CodeComabt! Si c'est le cas, veuillez l'entrer ci-dessous:"
     enter_c_code: "<Entrer le Code de la Classe>"
     join: "Rejoindre"
-#    joining: "Joining class"
+    joining: "En train de rejoindre la classe"
     course_complete: "Cours Terminé"
     play_arena: "Jouer à l'Arene"
     start: "Démarrer"
@@ -956,22 +954,22 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     thank_you_suff: "plus d'élèves à des cours payants."
     return_to_class: "Retourner à la classe"
     return_to_course_man: "Retourn à la gestion des cours."
-#    students_not_enrolled: "students not enrolled"
+    students_not_enrolled: "élève non inscrits"
     total_all_classes: "Total Dans Toutes Les Classes"
-#    how_many_enrollments: "How many additional paid enrollments do you need?"
+    how_many_enrollments: "De combien d'inscriptions payantes supplémentaire avez-vous besoin?"
-#    each_student_access: "Each student in a class will get access to Courses 2-4 once they are enrolled in paid courses. You may assign each course to each student individually."
+    each_student_access: "Chaque élève dans une classe aura accès aux cours 2 à 4 une fois qu'ils sont inscrits dans les cours payants. Vous pouvez assignez chaque cours à chacun des élèves individuellement."
     purchase_now: "Achetez Maintenant"
-#    enrollments: "enrollments"
+    enrollments: "inscriptions"
     remove_student1: "Supprimer l'Elève"
     are_you_sure: "Etes-vous certain de vouloir supprimer cet élève de cette classe?"
     remove_description1: "L'élève n'aura plus accès à cette classe et les classes associées. L'évolution et les personnages ne seront pas supprimés, et l'élève pourra de nouveau rejoindre la classe n'importe quand."
-#    remove_description2: "The activated paid license will not be returned."
+    remove_description2: "Une licence payante activée ne sera pas remboursée."
     keep_student: "Conserver l'Elève"
     removing_user: "Suppression de l'utilisateur"
     to_join_ask: "Pour rejoindre une classe, veuillez demander un code de déverouillage à votre professeur."
     join_this_class: "Rejoindre cette classe"
     enter_here: "<entrer le code de déverouillage>"
-#    successfully_joined: "Successfully joined"
+    successfully_joined: "Inscription avec succès"
     click_to_start: "Cliquer ici pour démarrer"
     my_courses: "Mes Cours"
     classroom: "Classe"
@@ -994,24 +992,24 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     additional_resources_1_mid: "Guide Professeur du Premier Cours"
     additional_resources_1_suff: "explications et solutions pour chaque niveaux."
     additional_resources_2_pref: "Complétez notre"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+    additional_resources_2_suff: "pour obtenir 15 heures de contenu supplémentaire! Pour une durée limitée, inscrivez autant d'élèves que vous voulez dans nos trois cours payant." # {change}
     additional_resources_3_pref: "Visitez notre"
     additional_resources_3_mid: "Forum des Professeurs"
     additional_resources_3_suff: "pour être mis en relations avec vos confrères qui utilisent CodeCombat."
-#    additional_resources_4_pref: "Check out our"
+    additional_resources_4_pref: "Faites un tour sur la"
     additional_resources_4_mid: "Page des Ecoles"
     additional_resources_4_suff: "pour en apprendre plus sur les offres CodeCombat à destination des classes."
     your_classes: "Vos Classes"
     no_classes: "Aucune classe pour le moment!"
     create_new_class1: "créer une nouvelle classe"
     available_courses: "Cours Disponibles"
-#    unused_enrollments: "Unused enrollments available:"
+    unused_enrollments: "Inscriptions non utilisées disponibles:"
-#    students_access: "All students get access to Introduction to Computer Science for free. One enrollment per student is required to assign them to paid CodeCombat courses. A single student does not need multiple enrollments to access all paid courses."
+    students_access: "Tous les élèves peuvent accéder gratuitement à l'Introduction aux Sciences Informations. Une inscription par élève est nécessaire pour rejoindre les cours payants de CodeCombat. Une seule inscription est nécessaire par élève pour accéder à tous les cours payants."
     active_courses: "cours actifs"
     no_students: "Aucun élève pour le moment!"
     add_students1: "ajouter des élèves"
     view_edit: "voir/modifier"
-#    students_enrolled: "students enrolled"
+    students_enrolled: "élèves inscrits"
     length: "Durée:"
 
   classes:
@@ -1267,7 +1265,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     singleplayer_title: "Niveaux solo"
     multiplayer_title: "Niveaux multijoueurs"
     achievements_title: "Succès"
-    last_played: "Dernièrement joués"
+    last_played: "Dernier niveau joué"
     status: "Statut"
     status_completed: "Terminé"
     status_unfinished: "Non terminé"
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     email_settings_url: "vos paramètres d'e-mail "
     email_description_suffix: "ou avec des liens disponibles dans nos e-mails, vous pouvez changer vos préférences ou vous désinscrire à tout moment."
     cost_title: "Coût"
-    cost_description_a: "CodeCombat est gratuit sur tous ses niveaux principaux, avec un abonnement de {{price}}$/mois pour l'accès à de nouveaux niveaux et {{gems}} gemmes bonus par mois. Vous pouvez annuler en un clic, et nous vous garantissons un remboursement intégral."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights et Licences"
     contributor_title: "Contributor License Agreement"
     contributor_description_prefix: "Toute contribution, sur le site et sur le répertoire GitHub, est sujette à nos"

app/locale/gl.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     press_paragraph_1_link: "paquete de prensa"
     press_paragraph_1_suffix: ". Todos os logos e as imaxes poden ser usadas sen necesidade de contactarnos directamente."
     team: "Equipo"
-    george_title: "CEO" # {change}
-    george_blurb: "Sección de Negocios"
-    scott_title: "Programador" # {change}
-    scott_blurb: "Razoable"
     nick_title: "Programador" # {change}
     nick_blurb: "Gurú Motivacional"
-    michael_title: "Programador"
-    michael_blurb: "Administrador de Sistemas"
     matt_title: "Programador" # {change}
     matt_blurb: "Ciclista"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Programador" # {change}
-#    josh_blurb: "Floor Is Lava"
+    scott_blurb: "Razoable"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     email_settings_url: "os teus axustes de correo electrónico"
     email_description_suffix: "ou a través das ligazóns nos correos que te enviemos, podes cambiar as túas preferencias e darte de baixa doadamente en calquera momento."
     cost_title: "Prezo"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Copyrights e Licenzas"
     contributor_title: "Acordo de Licenza do Colaborador"
     contributor_description_prefix: "Todas as colaboracións, tanto na web como no noso repositorio de GitHub, están suxeitas ao noso"

app/locale/he.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
     team: "צוות"
-    george_title: "מנכ\"ל" # {change}
-    george_blurb: "ביזנסר"
-    scott_title: "מתכנת" # {change}
-    scott_blurb: "אחד סביר"
     nick_title: "מתכנת" # {change}
     nick_blurb: "גורו מוטיבציה"
-    michael_title: "מתכנת"
-    michael_blurb: "מנהל מערכת"
     matt_title: "מתכנת" # {change}
     matt_blurb: "רוכב אופניים"
-    cat_title: "צ'יף אמן"
+    cat_title: "צ'יף אמן" # {change}
     cat_blurb: "כשף אוויר"
-    josh_title: "מעצב משחק"
+    scott_title: "מתכנת" # {change}
-    josh_blurb: "ארצפה היא לבה"
+    scott_blurb: "אחד סביר"
-    jose_title: "מוזיקה"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "מעצב משחק"
+    josh_blurb: "ארצפה היא לבה"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+    jose_title: "מוזיקה"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/hi.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/hu.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
     team: "Csapat"
-    george_title: "Főigazgató" # {change}
-    george_blurb: "Üzletelő"
-    scott_title: "Programozó" # {change}
-    scott_blurb: "Megfontolt"
     nick_title: "Programozó" # {change}
     nick_blurb: "Motivátor"
-    michael_title: "Programozó"
-    michael_blurb: "Rendszer Admin"
     matt_title: "Programozó" # {change}
     matt_blurb: "Bringás"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Programozó" # {change}
-#    josh_blurb: "Floor Is Lava"
+    scott_blurb: "Megfontolt"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Kinek való a CodeCombat?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/id.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/it.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     press_paragraph_1_link: "pacchetto per la stampa"
     press_paragraph_1_suffix: ". Tutti i loghi e le immagini possono essere usate senza contattarci direttamente."
     team: "Team"
-    george_title: "Co-fondatore"
-    george_blurb: "Imprenditore"
-    scott_title: "Programmatore" # {change}
-    scott_blurb: "Un Tipo Ragionevole"
     nick_title: "Programmatore" # {change}
     nick_blurb: "Guru motivatore"
-    michael_title: "Programmatore"
-    michael_blurb: "Amministratore di sistema"
     matt_title: "Programmatore" # {change}
     matt_blurb: "Ciclista"
-    cat_title: "Mastro artigiano"
+    cat_title: "Mastro artigiano" # {change}
     cat_blurb: "Manipolatore dell'aria"
-    josh_title: "Game Designer"
+    scott_title: "Programmatore" # {change}
-    josh_blurb: "Il pavimento è lava"
+    scott_blurb: "Un Tipo Ragionevole"
-    jose_title: "Musicista"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Prendiamo il volo"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Illustratore"
+    rob_title: "Ingegnere compilazione" # {change}
-    retrostyle_blurb: "Giochi retrò"
-    rob_title: "Ingegnere compilazione"
     rob_blurb: "Programmi, fatti e cose"
     josh_c_title: "Game Designer"
     josh_c_blurb: "Progettista giochi"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Game Designer"
+    josh_blurb: "Il pavimento è lava"
+    retrostyle_title: "Illustratore"
+    retrostyle_blurb: "Giochi retrò"
+    jose_title: "Musicista"
+    jose_blurb: "Prendiamo il volo"
     carlos_title: "Manager Regionale, Brasile"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "A chi è indirizzato CodeCombat?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."

app/locale/ja.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     press_paragraph_1_link: "プレスパケットをダウンロード"
     press_paragraph_1_suffix: "。全てのロゴやイメージは、私達に連絡することなく使用することができます。"
     team: "開発チーム"
-    george_title: "コーファウンダー" # {change}
-    george_blurb: "ビジネスの達人"
-    scott_title: "コーファウンダー" # {change}
-    scott_blurb: "リーズナブルな奴"
     nick_title: "コーファウンダー" # {change}
     nick_blurb: "モチベーションの達人"
-    michael_title: "プログラマー"
-    michael_blurb: "システム管理者"
     matt_title: "プログラマー" # {change}
     matt_blurb: "サイクリスト"
-    cat_title: "チーフアルティザン"
+    cat_title: "チーフアルティザン" # {change}
     cat_blurb: "エアベンダー"
-    josh_title: "ゲームデザイナー"
+    scott_title: "コーファウンダー" # {change}
-    josh_blurb: "床は溶岩"
+    scott_blurb: "リーズナブルな奴"
-    jose_title: "ミュージック"
+    maka_title: "顧客主義"
-    jose_blurb: "テークオフ"
+    maka_blurb: "ストーリーテラー"
-    retrostyle_title: "イラスト"
+    rob_title: "コンパイラーエンジニアー" # {change}
-    retrostyle_blurb: "レトロスタイルのゲーム"
-    rob_title: "コンパイラーエンジニアー"
     rob_blurb: "コードの道具と材料"
     josh_c_title: "ゲームデザイナー"
     josh_c_blurb: "ゲームのデザイン"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "ゲームデザイナー"
+    josh_blurb: "床は溶岩"
+    retrostyle_title: "イラスト"
+    retrostyle_blurb: "レトロスタイルのゲーム"
+    jose_title: "ミュージック"
+    jose_blurb: "テークオフ"
     carlos_title: "地域部長, ブラジル"
     carlos_blurb: "サラリーマン"
-    maka_title: "顧客主義"
-    maka_blurb: "ストーリーテラー"
 
   teachers:
     who_for_title: "CodeCombat が必要なひと"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/ko.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
     team: "팀"
-    george_title: "최고경영자" # {change}
-#    george_blurb: "Businesser"
-    scott_title: "프로그래머" # {change}
-#    scott_blurb: "Reasonable One"
     nick_title: "프로그래머" # {change}
 #    nick_blurb: "Motivation Guru"
-    michael_title: "프로그래머"
-#    michael_blurb: "Sys Admin"
     matt_title: "프로그래머" # {change}
     matt_blurb: "자전거 타는 사람"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "프로그래머" # {change}
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     email_settings_url: "이메일 설정"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/lt.coffee

@@ -1,23 +1,23 @@
 module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lithuanian", translation:
   home:
     slogan: "Išmok programuoti žaisdamas!"
-    no_ie: "CodeCombat su naršykle Internet Explorer 8 arba senesne. Atleiskite!" # Warning that only shows up in IE8 and older
+    no_ie: "Atsiprašome! CodeCombat neveikia su Internet Explorer 8 arba senesne naršyklės versija." # Warning that only shows up in IE8 and older
-    no_mobile: "CodeCombat neskirtas mobiliems įrenginiams ir gali veikti neteisingai!" # Warning that shows up on mobile devices
+    no_mobile: "CodeCombat neskirtas mobiliems įrenginiams ir gali neveikti!" # Warning that shows up on mobile devices
     play: "Žaisti" # The big play button that opens up the campaign view.
-#    play_campaign_version: "Play Campaign Version" # Shows up under big play button if you only play /courses
+    play_campaign_version: "Žaisti Kampanijos Versiją" # Shows up under big play button if you only play /courses
-#    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!" # Warning that shows up on really old Firefox/Chrome/Safari
+    old_browser: "Atsiprašome! Jūsų naršyklės versija per sena, kad galėtumėt žaisti CodeCombat." # Warning that shows up on really old Firefox/Chrome/Safari
-#    old_browser_suffix: "You can try anyway, but it probably won't work."
+    old_browser_suffix: "Galite bandyti, bet greičiausiai žaisti nepavyks."
-#    ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval."
+    ipad_browser: "Bloga žinia: CodeCombat neveikia iPad naršyklėje. Gera žinia: mūsų iPad žaidimo versija laukia Apple patvirtinimo."
     campaign: "Kampanija"
     for_beginners: "Naujokams"
 #    multiplayer: "Multiplayer" # Not currently shown on home page
-#    for_developers: "For Developers" # Not currently shown on home page.
+    for_developers: "Programuotojams" # Not currently shown on home page.
     or_ipad: "Arba atsisiųskite iPad'ui"
 
   nav:
     play: "Lygiai" # The top nav bar entry where players choose which levels to play
     community: "Bendruomenė"
-#    courses: "Courses"
+    courses: "Kursai"
     editor: "Redaktorius"
     blog: "Blog'as"
     forum: "Forumas"
@@ -43,17 +43,17 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     page_not_found: "Puslapis nerastas"
 
   diplomat_suggestion:
-#    title: "Help translate CodeCombat!" # This shows up when a player switches to a non-English language using the language selector.
+    title: "Padėkite išversti CodeCombat!" # This shows up when a player switches to a non-English language using the language selector.
-#    sub_heading: "We need your language skills."
+    sub_heading: "Mums reikia jūsų kalbos įgudžių."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Lithuanian but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Lithuanian."
+    pitch_body: "Mes kuriame CodeCombat Angliškai, bet mes turime žaidėjų visame pasaulyje. Daugelis jų norėtų žaisti Lietuvoje, tačiau nesupranta Angliškai. Jei tu gerai moki abi kalbas, prašom užsiregistruoti ir tapti Diplomatu. Taip galėsi padėti išversti CodeCombat interneto svetainę ir visus lygius į Lietuvių kalbą."
-    missing_translations: "Until we can translate everything into Lithuanian, you'll see English when Lithuanian isn't available."
+    missing_translations: "Kol viską išversime į Lietuvių kalbą, dar neišverstą tekstą matysite užrašytą Anglų kalba."
-#    learn_more: "Learn more about being a Diplomat"
+    learn_more: "Sužinoti daugiau apie tapimą Diplomatu"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    subscribe_as_diplomat: "Noriu tapti Diplomatu"
 
   play:
     play_as: "Žaisti kaip" # Ladder page
-#    compete: "Compete!" # Course details page
+    compete: "Varžytis!" # Course details page
-    spectate: "Stebėtojas" # Ladder page
+    spectate: "Stebėti" # Ladder page
     players: "žaidėjai" # Hover over a level on /play
     hours_played: "valandų žaista" # Hover over a level on /play
     items: "Daiktai" # Tooltip on item shop button from /play
@@ -72,7 +72,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     next: "Kitas" # Go from choose hero to choose inventory before playing a level
     change_hero: "Keisti Herojų" # Go back from choose inventory to choose hero
     buy_gems: "Pirkti Deimantus"
-#    subscription_required: "Subscription Required"
+    subscription_required: "Reikalingas patvirtinimas"
     anonymous: "Anoniminis Žaidėjas"
     level_difficulty: "Sudėtingumas: "
 #    play_classroom_version: "Play Classroom Version" # Choose a level in campaign version that you also can play in one of your courses
@@ -86,13 +86,13 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    campaign_old_multiplayer: "(Deprecated) Old Multiplayer Arenas"
 #    campaign_old_multiplayer_description: "Relics of a more civilized age. No simulations are run for these older, hero-less multiplayer arenas."
 
-#  share_progress_modal:
+  share_progress_modal:
-#    blurb: "You’re making great progress! Tell your parent how much you've learned with CodeCombat."
+    blurb: "Tau puikiai sekasi! Parodyk tėvams kiek jau išmokai su CodeCombat."
-#    email_invalid: "Email address invalid."
+    email_invalid: "Neteisingas el. pašto adresas."
-#    form_blurb: "Enter your parent's email below and we’ll show them!"
+    form_blurb: "Įvesk tėvų el. pašto adresą ir mes jiems parodysim!"
-#    form_label: "Email Address"
+    form_label: "El. pašto adresas"
-#    placeholder: "email address"
+    placeholder: "el. pašto adresas"
-#    title: "Excellent Work, Apprentice"
+    title: "Puikiai padirbėta, Mokinį!"
 
   login:
     sign_up: "Sukurti paskyrą"
@@ -114,14 +114,14 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     log_in: "prisijungti slaptažodžio pagalba"
     required: "PRieš tęsiant kelią turite prisijungti."
     login_switch: "Jau turite paskyrą?"
-#    school_name: "School Name and City"
+    school_name: "Mokyklos pavadinimas ir miestas"
-#    optional: "optional"
+    optional: "nebūtinas"
-#    school_name_placeholder: "Example High School, Springfield, IL"
+    school_name_placeholder: "Pavyzdžiui: Šiaulių Kolegija, Šiauliai"
 
-#  recover:
+  recover:
-#    recover_account_title: "Recover Account"
+    recover_account_title: "Susigrąžinti paskyrą"
-#    send_password: "Send Recovery Password"
+    send_password: "Siųsti susigrąžinimo slaptažodį"
-#    recovery_sent: "Recovery email sent."
+    recovery_sent: "Susigražinimo laiškas išsiųstas."
 
   items:
     primary: "Pagrindiniai"
@@ -148,50 +148,50 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     actions: "Veiksmai"
     info: "Informacija"
     help: "Pagalba"
-#    watch: "Watch"
+    watch: "Žiūrėti"
-#    unwatch: "Unwatch"
+    unwatch: "Nebežiūrėti"
-#    submit_patch: "Submit Patch"
+    submit_patch: "Pateikti pataisymą"
-#    submit_changes: "Submit Changes"
+    submit_changes: "Pateikti pakeitimus"
-#    save_changes: "Save Changes"
+    save_changes: "Saugoti pakeitimus"
 
   general:
     and: "ir"
     name: "Vardas"
     date: "Data"
 #    body: "Body"
-#    version: "Version"
+    version: "Versija"
-#    pending: "Pending"
+    pending: "Laukiama"
-#    accepted: "Accepted"
+    accepted: "Priimtas"
-#    rejected: "Rejected"
+    rejected: "Atmestas"
-#    withdrawn: "Withdrawn"
+    withdrawn: "Pasitraukęs"
     accept: "Priimti"
     reject: "Atmesti"
-#    withdraw: "Withdraw"
+    withdraw: "Pasitraukti"
-#    submitter: "Submitter"
+    submitter: "Teikėjas"
-#    submitted: "Submitted"
+    submitted: "Pateikta"
-#    commit_msg: "Commit Message"
+    commit_msg: "Patvirtinti Žinutę"
-#    version_history: "Version History"
+    version_history: "Versijų Istorija"
-#    version_history_for: "Version History for: "
+    version_history_for: "Versijos istorija: "
-#    select_changes: "Select two changes below to see the difference."
+    select_changes: "Kad pamatytum skirtumą, pažymėk du pakeitimus žemiau."
-#    undo_prefix: "Undo"
+    undo_prefix: "Atgal"
-#    undo_shortcut: "(Ctrl+Z)"
+    undo_shortcut: "(Ctrl+Z)"
-#    redo_prefix: "Redo"
+    redo_prefix: "Pirmyn"
-#    redo_shortcut: "(Ctrl+Shift+Z)"
+    redo_shortcut: "(Ctrl+Shift+Z)"
-#    play_preview: "Play preview of current level"
+    play_preview: "Esamo žaidimo lygio peržiūra"
-#    result: "Result"
+    result: "Rezultatas"
-#    results: "Results"
+    results: "Rezultatai"
-#    description: "Description"
+    description: "Aprašymas"
     or: "arba"
-#    subject: "Subject"
+    subject: "Tema"
-#    email: "Email"
+    email: "El. paštas"
     password: "Slaptažodis"
-#    message: "Message"
+    message: "Žinutė"
     code: "Kodas"
 #    ladder: "Ladder"
-#    when: "When"
+    when: "Kai"
-#    opponent: "Opponent"
+    opponent: "Priešininkas"
     rank: "Rangas"
-#    score: "Score"
+    score: "Taškai"
     win: "Pergalė"
     loss: "Pralaimėjimas"
     tie: "Lygiosios"
@@ -221,10 +221,10 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     years: "metai"
 
   play_level:
-#    completed_level: "Completed Level:"
+    completed_level: "Įveiktas Lygis:"
-#    course: "Course:"
+    course: "Kursas:"
     done: "Gerai"
-#    next_level: "Next Level:"
+    next_level: "Kitas Lygis:"
     next_game: "Kitas žaidimas"
     show_menu: "Parodyti žaidimo meniu"
 #    home: "Home" # Not used any more, will be removed soon.
@@ -242,34 +242,34 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     failing: "Nesėkmingai"
     control_bar_multiplayer: "Žaidimas keliese"
     control_bar_join_game: "Prisijungti prie žaidimo"
-    reload: "Perkrauti"
+    reload: "Atstatyti"
-    reload_title: "Perkrauti visą kodą?"
+    reload_title: "Atstatyti visą kodą?"
     reload_really: "Ar tikrai norite atsukti visą lygį į pradžią?"
-    reload_confirm: "Perkrauti viską"
+    reload_confirm: "Atstatyti viską"
     victory: "Pergalė"
     victory_title_prefix: ""
     victory_title_suffix: " baigta"
     victory_sign_up: "Užsiregistruokite, kad išsaugotumėte pažangą"
     victory_sign_up_poke: "Norite išsaugoti savo kodą? Sukurkite paskyrą nemokamai!"
-#    victory_rate_the_level: "How fun was this level?"
+    victory_rate_the_level: "Ar patiko šis lygis?"
 #    victory_return_to_ladder: "Return to Ladder"
     victory_saving_progress: "Išsaugoma pažanga"
     victory_go_home: "Į Pradžią"
-#    victory_review: "Tell us more!"
+    victory_review: "Papasakok daugiau!"
     victory_review_placeholder: "Ar Jums patiko lygis?"
     victory_hour_of_code_done: "Ar pabaigėte?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
+    victory_hour_of_code_done_yes: "Taip, aš užbaigiau savo Kodo Valandą™!"
     victory_experience_gained: "Gauta XP"
     victory_gems_gained: "Gauta Deimantų"
     victory_new_item: "Naujas Daiktas"
-#    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
+    victory_viking_code_school: "Po paraliais, tu katik įveikei sunkujį lygį! Jei tu dar nesi programuotojas, tai bent turėtum būti. Tu katik paspartinai priėmimą į Vikingų Kodo Mokyklą, kur savo įgudžius gali perkelti į naują lygį ir, per 14 sąvaičių, gali tapti profesionaliu internetinių sistemų programuotoju."
-#    victory_become_a_viking: "Become a Viking"
+    victory_become_a_viking: "Tapk Vikingu"
     guide_title: "Vedlys"
     tome_cast_button_run: "Paleisti"
     tome_cast_button_running: "Leidžiama"
     tome_cast_button_ran: "Paleista"
     tome_submit_button: "Pateikti"
-#    tome_reload_method: "Reload original code for this method" # Title text for individual method reload button.
+    tome_reload_method: "Atstatyti originalų kodą šiam metodui" # Title text for individual method reload button.
     tome_select_method: "Pasirinkti Metodą"
     tome_see_all_methods: "Visi metodai, kuriuos galite keisti" # Title text for method list selector (shown when there are multiple programmable methods).
 #    tome_select_a_thang: "Select Someone for "
@@ -290,9 +290,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    infinite_loop_description: "The initial code to build the world never finished running. It's probably either really slow or has an infinite loop. Or there might be a bug. You can either try running this code again or reset the code to the default state. If that doesn't fix it, please let us know."
 #    check_dev_console: "You can also open the developer console to see what might be going wrong."
 #    check_dev_console_link: "(instructions)"
-#    infinite_loop_try_again: "Try Again"
+    infinite_loop_try_again: "Bandyk dar kartą"
-#    infinite_loop_reset_level: "Reset Level"
+    infinite_loop_reset_level: "Pradėti lygi išnaujo"
-#    infinite_loop_comment_out: "Comment Out My Code"
+    infinite_loop_comment_out: "Užkomentuoti mano kodą"
     tip_toggle_play: "Įjunkite ir išjunkite Pauzę spaudžiant Ctrl+P."
     tip_scrub_shortcut: "Naudokite Ctrl+[ ir Ctrl+] persukimui pirmyn ir atgal."
     tip_guide_exists: "Pasirinkite punktą Vedlys žaidimo meniu (puslapio viršuje), jame rasite naudingos informacijos."
@@ -301,10 +301,10 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     tip_beta_launch: "CodeCombat Beta versija startavo 2013 m. spalio mėnesį."
     tip_think_solution: "Galvok ne apie problemą, o apie sprendimą."
     tip_theory_practice: "Teoriškai nėra skirtuma tarp teorijos ir praktikos. Praktiškai - yra. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+    tip_error_free: "Yra du būdai parašyti programą be klaidų; tik trečiasis suveikia. - Alan Perlis"
-#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+    tip_debugging_program: "Jei derinimas yra procesas klaidoms šalinti, tai programavimas turėtų būti procesas klaidoms padaryti. - Edsger W. Dijkstra"
     tip_forums: "Aplankykite forumą ir parašykite mums Jūsų nuomonę!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
+    tip_baby_coders: "Ateityje ir kūdikiai bus Arkimagais."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
@@ -463,7 +463,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
     programming_language: "Programavimo kalba"
     programming_language_description: "Kokią programavimo kalbą norėtum naudoti?"
     default: "Numatytasis"
-#    experimental: "Experimental"
+    experimental: "Eksperimentinis"
     python_blurb: "Paprasta bet galinga. Puikiai tinka ir naujokams ir ekspertams."
     javascript_blurb: "WWW tinklo kalba. (Nepainiokite su Java.)"
     coffeescript_blurb: "JavaScript su malonesne sintakse."
@@ -516,9 +516,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    returns: "Returns"
 #    granted_by: "Granted by"
 
-#  save_load:
+  save_load:
-#    granularity_saved_games: "Saved"
+    granularity_saved_games: "Išsaugotas"
-#    granularity_change_history: "History"
+    granularity_change_history: "Istorija"
 
   options:
     general_options: "Bendri nustatymai" # Check out the Options tab in the Game Menu while playing a level
@@ -552,32 +552,30 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1017,22 +1015,22 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
   classes:
     archmage_title: "Arkimagas"
     archmage_title_description: "(Koderis)"
-#    archmage_summary: "If you are a developer interested in coding educational games, become an archmage to help us build CodeCombat!"
+    archmage_summary: "Jei tu esi programuotojas ir norėtum programuoti mokomuosius žiadimus, tapk Arkimagu ir padėk mums kurti CodeCombat!"
-    artisan_title: "Menininkas"
+    artisan_title: "Meistras"
     artisan_title_description: "(Lygių architektas)"
-#    artisan_summary: "Build and share levels for you and your friends to play. Become an Artisan to learn the art of teaching others to program."
+    artisan_summary: "Kurk ir dalinkis lygiais su savo draugais. Tapk Meistru ir mokykis meno mokyti kitus programuoti."
     adventurer_title: "Nuotykių ieškotojas"
     adventurer_title_description: "(Lygių bandytojas)"
-#    adventurer_summary: "Get our new levels (even our subscriber content) for free one week early and help us work out bugs before our public release."
+    adventurer_summary: "Gauk naujausius lygius nemokamai. Net savaitę anksčiau ir padėk mums ištaisyti klaidas prieš oficialų pristatymą."
     scribe_title: "Raštininkas"
     scribe_title_description: "(Straipsnių redaktorius)"
-#    scribe_summary: "Good code needs good documentation. Write, edit, and improve the docs read by millions of players across the globe."
+    scribe_summary: "Geram kodui reikia geros dokumentacijos. Kurk, redaguok ir tobulink dokumentus, kuriuos skaito milijonai žaidėjų visame pasaulyje."
     diplomat_title: "Diplomatas"
     diplomat_title_description: "(Vertėjas)"
-#    diplomat_summary: "CodeCombat is localized in 45+ languages by our Diplomats. Help us out and contribute translations."
+    diplomat_summary: "Diplomatų dėka CodeCombat yra verčiamas į daugiau kaip 45 kalbas. Tu gali mums padėti tapdamas vertėju."
     ambassador_title: "Ambasadorius"
     ambassador_title_description: "(Palaikymas)"
-#    ambassador_summary: "Tame our forum users and provide direction for those with questions. Our ambassadors represent CodeCombat to the world."
+    ambassador_summary: "Nuramink mūsų forumo naudotojus ir suteik pagalbą tiems kas turi klausimų. Mūsų Ambasadoriai atstovauja CodeCombat visam pasauliui."
 
 #  editor:
 #    main_title: "CodeCombat Editors"
@@ -1126,8 +1124,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    edit_btn_preview: "Preview"
 #    edit_article_title: "Edit Article"
 
-#  polls:
+  polls:
-#    priority: "Priority"
+    priority: "Prioritetas"
 
 #  contribute:
 #    page_title: "Contributing"
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/mk-MK.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Македонски", englishDescription:
     press_paragraph_1_link: "пакет за печат"
     press_paragraph_1_suffix: ". Сите логоа и слики можат да бидат користени без да не контактираш директно."
     team: "Тим"
-    george_title: "(CEO) Извршен директор" # {change}
-    george_blurb: "Бизнисер"
-    scott_title: "Програмер" # {change}
-    scott_blurb: "Оној разумниот"
     nick_title: "Програмер" # {change}
     nick_blurb: "Мотивациски гуру"
-    michael_title: "Програмер"
-    michael_blurb: "Систем администратор"
     matt_title: "Програмер" # {change}
     matt_blurb: "Бициклист"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Програмер" # {change}
-#    josh_blurb: "Floor Is Lava"
+    scott_blurb: "Оној разумниот"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/ms.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Hakcipta dan Pemelesenan"
     contributor_title: "Persetujuan Lesen Penyumbang"
     contributor_description_prefix: "Kesemua sumbangan, termasuk di dalam laman dan di dalam repositiri GitHub, tertakluk kepada"

app/locale/my.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "မြန်မာစကား", englishDes
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/nb.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     press_paragraph_1_link: "pressepakke"
     press_paragraph_1_suffix: ". Alle logoer og bilder kan brukes uten å kontakte oss direkte."
     team: "Teamet"
-    george_title: "Adm.dir." # {change}
-    george_blurb: "Business-nisse"
-    scott_title: "Programmerer" # {change}
-    scott_blurb: "Den fornuftige"
     nick_title: "Programmerer" # {change}
     nick_blurb: "Motivasjonsguru"
-    michael_title: "Programmerer"
-    michael_blurb: "Systemadministrator"
     matt_title: "Programmerer" # {change}
     matt_blurb: "Syklist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Programmerer" # {change}
-#    josh_blurb: "Floor Is Lava"
+    scott_blurb: "Den fornuftige"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     email_settings_url: "epost-innstillingene dine"
     email_description_suffix: "eller via linker i epostene vi sender til deg, kan du endre hvilke eposter du ønsker å motta og enkelt avslutte abonnementet når som helst."
     cost_title: "Pris"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Kopirettigheter og lisenser"
     contributor_title: "Lisensavtale for bidragsytere"
     contributor_description_prefix: "Alle bidrag, både gjort gjennom brukergrensesnittet og i kodelageret på GitHub, er underlagt vår"

app/locale/nl-BE.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     email_settings_url: "jouw e-mail instellingen"
     email_description_suffix: "of via urls in de emails die wij verzenden, kan je jouw instellingen wijzigen en ten allen tijden uitschrijven."
     cost_title: "Kosten"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Auteursrechten en licenties"
     contributor_title: "Licentieovereenkomst voor vrijwilligers"
     contributor_description_prefix: "Alle bijdragen, zowel op de website als op onze GitHub repository, vallen onder onze"

app/locale/nl-NL.coffee

@@ -52,7 +52,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 
   play:
     play_as: "Speel als " # Ladder page
-    compete: "Compleet!" # Course details page //in English it says 'complete', so translated that instead.
+    compete: "Compleet!" # Course details page
     spectate: "Toeschouwen" # Ladder page
     players: "Spelers" # Hover over a level on /play
     hours_played: "Speeltijd" # Hover over a level on /play
@@ -484,8 +484,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     blocks: "Blokkeert" # As in "this shield blocks this much damage"
 #    backstab: "Backstab" # As in "this dagger does this much backstab damage"
     skills: "Vaardigheden"
-#   attack_1: "brengt [x damge] toe" # In Dutch we say 'brings [x damge] to...' Alternative: 'veroorzaakt [x damage] (causes [x damage])
+#    attack_1: "Deals"
-#    attack_2: "of listed" # what is the context?
+#    attack_2: "of listed"
     attack_3: "Wapen schade."
 #    health_1: "Gains"
 #    health_2: "of listed"
@@ -502,8 +502,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     action: "Actie"
     spell: "toverspreuk"
     action_name: "naam"
-    action_cooldown: "Duurt" # As in duration
+    action_cooldown: "Duurt"
-    action_specific_cooldown: "Afkoeling" # This literally means cooldown/coolingdown. If it needs to include a time element, it should be 'afkoeltijd'.
+    action_specific_cooldown: "Afkoeling"
     action_damage: "Schade"
     action_range: "Bereik"
     action_radius: "Straal"
@@ -513,7 +513,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     current_value: "Huidige waarde"
     default_value: "Standaard waarde"
     parameters: "Parameters"
-#    returns: "Returns" 
+#    returns: "Returns"
     granted_by: "Verleend door"
 
   save_load:
@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     press_paragraph_1_link: "journalistieke pakket"
     press_paragraph_1_suffix: ". Alle logo's en afbeeldingen mogen worden gebruikt zonder direct contact met ons op te nemen."
     team: "Team"
-    george_title: "CEO" # {change}
-    george_blurb: "Zaken type"
-    scott_title: "Programmeur" # {change}
-    scott_blurb: "de Redelijke"
     nick_title: "Programmeur" # {change}
     nick_blurb: "Motivatie Goeroe"
-    michael_title: "Programmeur"
-    michael_blurb: "Systeembeheerder"
     matt_title: "Programmeur" # {change}
     matt_blurb: "Fietser"
-    cat_title: "Hoofd Ambachtsman"
+    cat_title: "Hoofd Ambachtsman" # {change}
 #    cat_blurb: "Airbender"
-    josh_title: "Game Designer" # In Dutch people would use the english term.
+    scott_title: "Programmeur" # {change}
-    josh_blurb: "Vloer Is Lava"
+    scott_blurb: "de Redelijke"
-    jose_title: "Muziek"
+    maka_title: "Klanten Ombudsman"
-#    jose_blurb: "Taking Off"
+    maka_blurb: "VerhalenVerteller"
-    retrostyle_title: "Illustraties"
+    rob_title: "Compiler Ontwerper" # {change}
-    retrostyle_blurb: "RetroStijl Games"
-    rob_title: "Compiler Ontwerper"
     rob_blurb: "Programmeert dingen en spullen"
     josh_c_title: "Game Designer"
     josh_c_blurb: "Ontwikkeld games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Game Designer"
+    josh_blurb: "Vloer Is Lava"
+    retrostyle_title: "Illustraties"
+    retrostyle_blurb: "RetroStijl Games"
+    jose_title: "Muziek"
+#    jose_blurb: "Taking Off"
     carlos_title: "Regio Manager, Brazilië"
     carlos_blurb: "Selderij Man"
-    maka_title: "Klanten Ombudsman"
-    maka_blurb: "VerhalenVerteller"
 
   teachers:
     who_for_title: "Voor wie is CodeCombat?"
@@ -664,14 +662,14 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     admin: "Beheerder"
     manage_subscription: "Klik hier om je abonnement te beheren."
     new_password: "Nieuw Wachtwoord"
-    new_password_verify: "Controleer" # Controleer means 'check'. Verifieer also means check, but it is very formal. Children wouldn't know what it means.
+    new_password_verify: "Controleer"
     type_in_email: "Typ je e-mail in om de verwijdering te bevestigen."
     type_in_email_progress: "Vul je e-mail in om te bevestigen dat je jouw voortgang wilt verwijderen."
     type_in_password: "Typ ook je wachtwoord in."
     email_subscriptions: "E-mail Abonnementen"
     email_subscriptions_none: "Geen E-mail Abonnementen."
     email_announcements: "Aankondigingen"
-    email_announcements_description: "Ontvang e-mails over het laatste nieuws en de ontwikkelingen bij CodeCombat." 
+    email_announcements_description: "Ontvang e-mails over het laatste nieuws en de ontwikkelingen bij CodeCombat."
     email_notifications: "Notificaties"
     email_notifications_summary: "Instellingen voor gepersonaliseerde, automatische meldingen via e-mail omtrent je activiteit op CodeCombat."
     email_any_notes: "Alle Meldingen"
@@ -704,7 +702,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    scrub_playback: "Scrub back and forward through time."
 #    single_scrub_playback: "Scrub back and forward through time by a single frame."
 #    scrub_execution: "Scrub through current spell execution."
-    toggle_debug: "Toggle debug display." # This already is correct Dutch.
+    toggle_debug: "Toggle debug display."
     toggle_grid: "Toggle rooster weergave."
     toggle_pathfinding: "Toggle padvind weergave."
     beautify: "Verfraai je code door de opmaak overal gelijk te maken."
@@ -755,7 +753,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     average_achievements: "Gemiddelde Prestaties"
     delete_clan: "Delete Clan"
     leave_clan: "Verlaat Clan"
-    join_clan: "Ga bij een Clan" # Now it says 'join a clan', like: "click here to join a clan". If the context is more like: join THIS clan. Then the current translation is wrong.
+    join_clan: "Ga bij een Clan"
     invite_1: "Uitnodigen:"
     invite_2: "*Nodig spelers uit in deze clan door hen deze link te sturen."
     members: "Leden"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     email_settings_url: "jouw e-mail instellingen"
     email_description_suffix: "of via urls in de emails die wij verzenden, kan je jouw instellingen wijzigen en ten allen tijden uitschrijven."
     cost_title: "Kosten"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Auteursrechten en licenties"
     contributor_title: "Licentieovereenkomst voor vrijwilligers"
     contributor_description_prefix: "Alle bijdragen, zowel op de website als op onze GitHub repository, vallen onder onze"

app/locale/nn.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/pl.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     press_paragraph_1_link: "pakiecie prasowym "
     press_paragraph_1_suffix: ". Wszystkie loga i obrazki mogą zostać wykorzystane bez naszej wiedzy."
     team: "Zespół"
-    george_title: "Współzałożyciel"
+    nick_title: "Współzałożyciel" # {change}
-    george_blurb: "Pan Prezes"
-    scott_title: "Współzałożyciel"
-    scott_blurb: "Jedyny Rozsądny"
-    nick_title: "Współzałożyciel"
     nick_blurb: "Guru Motywacji"
-    michael_title: "Programista"
+    matt_title: "Programista" # {change}
-    michael_blurb: "Sys Admin"
-    matt_title: "Programista"
     matt_blurb: "Rowerzysta"
-    cat_title: "Główny Rzemieślnik"
+    cat_title: "Główny Rzemieślnik" # {change}
     cat_blurb: "Airbender"
-    josh_title: "Projektant Gier"
+    scott_title: "Współzałożyciel" # {change}
-    josh_blurb: "Podłoga to lawa"
+    scott_blurb: "Jedyny Rozsądny"
-    jose_title: "Muzyka"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Odnosi Sukces"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Ilustracje"
+#    rob_title: "Software Engineer"
-    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Projektant Gier"
+    josh_blurb: "Podłoga to lawa"
+    retrostyle_title: "Ilustracje"
+    retrostyle_blurb: "RetroStyle Games"
+    jose_title: "Muzyka"
+    jose_blurb: "Odnosi Sukces"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     email_settings_url: "twoje ustawienia e-mail"
     email_description_suffix: "lub poprzez linki w e-mailach, które wysyłamy, możesz zmienić swoje ustawienia i w prosty sposób wypisać się z subskrypcji w dowolnym momencie."
     cost_title: "Koszty"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Prawa autorskie i licencje"
     contributor_title: "Umowa licencyjna dla współtwórców (CLA)"
     contributor_description_prefix: "Wszyscy współtwórcy, zarówno ci ze strony jak i ci z GitHuba, podlegają naszemu"

app/locale/pt-BR.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     press_paragraph_1_link: "Midia Kit"
     press_paragraph_1_suffix: ". Todas as logomarcas e imagens podem ser usadas sem nos contactar previamente."
     team: "Time"
-    george_title: "Cofundador"
+    nick_title: "Cofundador" # {change}
-    george_blurb: "Administrador"
-    scott_title: "Cofundador"
-    scott_blurb: "O Sensato"
-    nick_title: "Cofundador"
     nick_blurb: "Guru Motivacional"
-    michael_title: "Programador"
+    matt_title: "Cofundador" # {change}
-    michael_blurb: "Administrador de Sistemas"
-    matt_title: "Cofundador"
     matt_blurb: "O Ciclista"
-    cat_title: "Chefe Artesão"
+    cat_title: "Chefe Artesão" # {change}
     cat_blurb: "Corta-vento"
-    josh_title: "Game Designer"
+    scott_title: "Cofundador" # {change}
-    josh_blurb: "O chão vai tremer"
+    scott_blurb: "O Sensato"
-    jose_title: "Músico"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Sou descolado"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Ilustração"
+    rob_title: "Engenheiro Compilador" # {change}
-    retrostyle_blurb: "Games estilo Retrô"
-    rob_title: "Engenheiro Compilador"
     rob_blurb: "Os paranauês dos códigos"
     josh_c_title: "Game Designer"
     josh_c_blurb: "Desenha jogos"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Game Designer"
+    josh_blurb: "O chão vai tremer"
+    retrostyle_title: "Ilustração"
+    retrostyle_blurb: "Games estilo Retrô"
+    jose_title: "Músico"
+    jose_blurb: "Sou descolado"
     carlos_title: "Gerente Regional, Brasil"
     carlos_blurb: "O Homem Célere"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Para quem é indicado o CodeCombat?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     email_settings_url: "das suas configurações de email"
     email_description_suffix: "ou através de links nos emails que enviarmos, você pode trocar as preferências e facilmente se desinscrever a qualquer hora."
     cost_title: "Custo"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Direitos Autorais e Licenças"
     contributor_title: "Contrato de Licença de Colaborador"
     contributor_description_prefix: "Todos os colaboradores, tanto no nosso site quando no nosso repositório no GitHub estão sujeitos ao nosso"

app/locale/pt-PT.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     press_paragraph_1_link: "pacote de imprensa"
     press_paragraph_1_suffix: ". Todos os logótipos e imagens podem ser usados sem sermos contactados diretamente."
     team: "Equipa"
-    george_title: "Co-fundador"
+    nick_title: "Co-fundador, CEO"
-    george_blurb: "Homem de Negócios"
-    scott_title: "Co-fundador"
-    scott_blurb: "O Sensato"
-    nick_title: "Co-fundador"
     nick_blurb: "Guru da Motivação"
-    michael_title: "Programador"
+    matt_title: "Co-fundador, CTO"
-    michael_blurb: "Administrador de Sistemas"
-    matt_title: "Co-fundador"
     matt_blurb: "Ciclista"
-    cat_title: "Artesã Chefe"
+    cat_title: "'Designer' de Jogos"
     cat_blurb: "Mágica"
-    josh_title: "'Designer' de Jogos"
+    scott_title: "Co-fundador, Engenheiro de 'Software'"
-    josh_blurb: "'Floor Is Lava'"
+    scott_blurb: "O Sensato"
-    jose_title: "Música"
+    maka_title: "Defensor dos Clientes"
-    jose_blurb: "'Taking Off'"
+    maka_blurb: "Contador de Histórias"
-    retrostyle_title: "Ilustração"
+    rob_title: "Engenheiro de 'Software'"
-    retrostyle_blurb: "'RetroStyle Games'"
-    rob_title: "Engenheiro de Compilação"
     rob_blurb: "Programa Muitas Coisas"
     josh_c_title: "'Designer' de Jogos"
     josh_c_blurb: "Projeta Jogos"
+    robin_title: "Pesquisa e Projeção de 'UX'"
+    robin_blurb: "'Scaffolding'"
+    josh_title: "'Designer' de Jogos"
+    josh_blurb: "'Floor Is Lava'"
+    retrostyle_title: "Ilustração"
+    retrostyle_blurb: "'RetroStyle Games'"
+    jose_title: "Música"
+    jose_blurb: "'Taking Off'"
     carlos_title: "Gestor Regional, Brasil"
     carlos_blurb: "Homem do Dinheiro"
-    maka_title: "Defensor dos Clientes"
-    maka_blurb: "Contador de Histórias"
 
   teachers:
     who_for_title: "Para quem é o CodeCombat?"
@@ -867,9 +865,9 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     topics: "Tópicos"
     hours_content: "Horas de conteúdo:"
     get_free: "Obter curso GRÁTIS"
-#    enroll_paid: "Enroll Students in Paid Courses"
+    enroll_paid: "Inscrever Estudantes em Cursos Pagos"
-#    you_have1: "You have"
+    you_have1: "Tens"
-#    you_have2: "unused paid enrollments"
+    you_have2: "inscrições pagas por usar"
 #    use_one: "Use 1 paid enrollment for"
 #    use_multiple: "Use paid enrollments for the following students:"
 #    already_enrolled: "already enrolled"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."

app/locale/ro.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     press_paragraph_1_link: "pachetul pentru presă"
     press_paragraph_1_suffix: ". Toate logourile si imaginile pot fi folosite fără să ne contactezi direct."
     team: "Echipa"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Pentru cine este CodeCombat?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     email_settings_url: "setările tale de email"
     email_description_suffix: " sau prin link-urile din email-urile care vi le trimitem, puteți să schimbați preferințele și să vâ dezabonați oricând."
     cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Drepturi de autor și licențe"
     contributor_title: "Acord de licență Contributor"
     contributor_description_prefix: "Toți contribuitorii, atât pe site cât și pe GitHub-ul nostru, sunt supuși la"

app/locale/ru.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     press_paragraph_1_link: "пресс-пакет"
     press_paragraph_1_suffix: ". Все изображения могут быть использованы без предварительного уведомления."
     team: "Команда"
-    george_title: "Сооснователь"
+    nick_title: "Сооснователь" # {change}
-    george_blurb: "Деловой"
-    scott_title: "Сооснователь"
-    scott_blurb: "Разумный"
-    nick_title: "Сооснователь"
     nick_blurb: "Гуру мотивации"
-    michael_title: "Программист"
+    matt_title: "Сооснователь" # {change}
-    michael_blurb: "Сисадмин"
-    matt_title: "Сооснователь"
     matt_blurb: "Велосипедист"
-    cat_title: "Главный ремесленник"
+    cat_title: "Главный ремесленник" # {change}
     cat_blurb: "Повелитель стихий"
-    josh_title: "Дизайнер игры"
+    scott_title: "Сооснователь" # {change}
-    josh_blurb: "Пол - это лава"
+    scott_blurb: "Разумный"
-    jose_title: "Музыка"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "На взлет"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Иллюстрирование"
+#    rob_title: "Software Engineer"
-    retrostyle_blurb: "Игры в стиле ретро"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Дизайнер игры"
+    josh_blurb: "Пол - это лава"
+    retrostyle_title: "Иллюстрирование"
+    retrostyle_blurb: "Игры в стиле ретро"
+    jose_title: "Музыка"
+    jose_blurb: "На взлет"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Для кого предназначен CodeCombat?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."

app/locale/sk.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     press_paragraph_1_link: "tlačovom balíčku"
     press_paragraph_1_suffix: ". Všetky logá a obrázky môžeš použiť bez toho, aby si nás priamo kontaktoval."
     team: "Tím"
-    george_title: "Spoluzakladateľ"
+    nick_title: "Spoluzakladateľ" # {change}
-    george_blurb: "Podnikateľ"
-    scott_title: "Spoluzakladateľ"
-    scott_blurb: "Ten rozumný"
-    nick_title: "Spoluzakladateľ"
     nick_blurb: "Motivačný Guru"
-    michael_title: "Programátor"
-    michael_blurb: "Systémový administrátor"
     matt_title: "Programátor" # {change}
     matt_blurb: "Bicyklista"
-    cat_title: "Najvyššia remeselníčka"
+    cat_title: "Najvyššia remeselníčka" # {change}
     cat_blurb: "Ohýbačka vzduchu"
-    josh_title: "Dizajnér hier"
+    scott_title: "Spoluzakladateľ" # {change}
-    josh_blurb: "Podlaha je láva"
+    scott_blurb: "Ten rozumný"
-    jose_title: "Hudba"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Vzlet"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Ilustrácia"
+#    rob_title: "Software Engineer"
-    retrostyle_blurb: "Retro hry"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Dizajnér hier"
+    josh_blurb: "Podlaha je láva"
+    retrostyle_title: "Ilustrácia"
+    retrostyle_blurb: "Retro hry"
+    jose_title: "Hudba"
+    jose_blurb: "Vzlet"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Pre koho je určený CodeComabt ?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/sl.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/sr.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/sv.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     press_paragraph_1_link: "presspaket"
     press_paragraph_1_suffix: ". Alla loggor och bilder kan användas utan att kontakta oss direkt."
     team: "Team"
-    george_title: "Medgrundare"
+    nick_title: "Medgrundare" # {change}
-    george_blurb: "Businesser"
-    scott_title: "Medgrundare"
-#    scott_blurb: "Reasonable One"
-    nick_title: "Medgrundare"
 #    nick_blurb: "Motivation Guru"
-    michael_title: "Programmerare"
+    matt_title: "Medgrundare" # {change}
-    michael_blurb: "Sys Admin"
-    matt_title: "Medgrundare"
     matt_blurb: "Cyklist"
-    cat_title: "Chefshantverkare"
+    cat_title: "Chefshantverkare" # {change}
 #    cat_blurb: "Airbender"
-    josh_title: "Speldesigner"
+    scott_title: "Medgrundare" # {change}
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-    jose_title: "Musik"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Illustration"
+    rob_title: "Kompileringsingenjör" # {change}
-    retrostyle_blurb: "RetroStyle Games"
-    rob_title: "Kompileringsingenjör"
     rob_blurb: "Kodar saker"
     josh_c_title: "Speldesigner"
     josh_c_blurb: "Designar spel"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Speldesigner"
+#    josh_blurb: "Floor Is Lava"
+    retrostyle_title: "Illustration"
+    retrostyle_blurb: "RetroStyle Games"
+    jose_title: "Musik"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Vem är CodeCombat för?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     email_settings_url: "dina mejlinställningar"
     email_description_suffix: "eller genom länkar i mejlen vi skickar kan du ändra dina inställningar och lätt avprenumerera när som helst."
     cost_title: "Kostnad"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Upphovsrätt och licenser"
     contributor_title: "Överenskommelse för bidragarlicens"
     contributor_description_prefix: "Alla bidrag, både på sajten och på vårt GitHub-repo, faller under vår"

app/locale/th.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-    george_title: "ผู้ร่วมก่อตั้ง"
+    nick_title: "ผู้ร่วมก่อตั้ง" # {change}
-#    george_blurb: "Businesser"
-    scott_title: "ผู้ร่วมก่อตั้ง"
-#    scott_blurb: "Reasonable One"
-    nick_title: "ผู้ร่วมก่อตั้ง"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+    matt_title: "ผู้ร่วมก่อตั้งผู้ร่วมก่อตั้ง" # {change}
-#    michael_blurb: "Sys Admin"
-    matt_title: "ผู้ร่วมก่อตั้งผู้ร่วมก่อตั้ง"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "ผู้ร่วมก่อตั้ง" # {change}
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/tr.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    press_paragraph_1_link: "press packet"
     press_paragraph_1_suffix: ". Tüm logolar bizimle iletişime geçilmeden kullanılabilir."
     team: "Takım"
-    george_title: "CEO" # {change}
-#    george_blurb: "Businesser"
-    scott_title: "Programcı" # {change}
-#    scott_blurb: "Reasonable One"
     nick_title: "Programcı" # {change}
 #    nick_blurb: "Motivation Guru"
-    michael_title: "Programcı"
-#    michael_blurb: "Sys Admin"
     matt_title: "Programcı" # {change}
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Programcı" # {change}
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     email_settings_url: "eposta ayarları sayfasından,"
     email_description_suffix: "ister size gönderdiğimiz epostadaki linklerden, tercihlerinizi değiştirebilir ve aboneliğinizi anında iptal edebilirsiniz."
     cost_title: "Ücret"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Telif Hakları ve Lisanslar"
     contributor_title: "Katılımcı Lisans Sözleşmesi"
     contributor_description_prefix: "GitHub ve siteye yapılan tüm katılımlar, devam etmeden önce kabul etmeniz gereken"

app/locale/uk.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Українська", englishDescription:
     press_paragraph_1_link: "набору-для-преси"
     press_paragraph_1_suffix: ". Всі логотипи та зображення можна використовувати, не зв'язуючись із нами напряму."
     team: "Команда"
-    george_title: "Співзасновник"
+    nick_title: "Співзасновник" # {change}
-    george_blurb: "Бізнесмен"
-    scott_title: "Співзасновник"
-    scott_blurb: "Розумник"
-    nick_title: "Співзасновник"
     nick_blurb: "Ґуру мотивації"
-    michael_title: "Програміст"
+    matt_title: "Співзасновник" # {change}
-    michael_blurb: "Сисадмін"
-    matt_title: "Співзасновник"
     matt_blurb: "Велосипедист"
-    cat_title: "Головний ремісник"
+    cat_title: "Головний ремісник" # {change}
     cat_blurb: "Маг повітря"
-    josh_title: "Дизайнер гри"
+    scott_title: "Співзасновник" # {change}
-    josh_blurb: "Підлога - це лава"
+    scott_blurb: "Розумник"
-    jose_title: "Музика"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "Hа зліт"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "Ілюстрація"
+#    rob_title: "Software Engineer"
-    retrostyle_blurb: "Ігри в стилі ретро"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "Дизайнер гри"
+    josh_blurb: "Підлога - це лава"
+    retrostyle_title: "Ілюстрація"
+    retrostyle_blurb: "Ігри в стилі ретро"
+    jose_title: "Музика"
+    jose_blurb: "Hа зліт"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "Для кого призначений CodeCombat?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     email_settings_url: "налаштування Вашого email"
     email_description_suffix: "або через посилання в повідомленнях, котрі ми присилаємо, Ви можете змінити свої уподобання і легко відмовитись від підписки в будь-який час."
     cost_title: "Вартість"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "Авторські права та ліцензії"
     contributor_title: "Авторська ліцензійна згода"
     contributor_description_prefix: "Усі права, як на сайті так і у нашому сховищі GitHub, є у відповідності з нашими"

app/locale/ur.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/uz.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/vi.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-    george_title: "Tổng giám đốc điều hành" # {change}
-#    george_blurb: "Businesser"
-    scott_title: "Lập trình viên" # {change}
-    scott_blurb: "Một người có lý trí, biết suy luận"
     nick_title: "Lập trình viên" # {change}
 #    nick_blurb: "Motivation Guru"
-    michael_title: "Lập trình viên"
-#    michael_blurb: "Sys Admin"
     matt_title: "Lập trình viên" # {change}
     matt_blurb: "Một người thích đi xe đạp"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+    scott_title: "Lập trình viên" # {change}
-#    josh_blurb: "Floor Is Lava"
+    scott_blurb: "Một người có lý trí, biết suy luận"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "CodeCombat dành cho ai ?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/zh-HANS.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     press_paragraph_1_link: "成套宣传包"
     press_paragraph_1_suffix: "里的所有材料。 所有商标和图像的使用都不必事先联系我们。"
     team: "团队"
-    george_title: "共同创始人"
+    nick_title: "共同创始人" # {change}
-    george_blurb: "商人"
-    scott_title: "共同创始人"
-    scott_blurb: "理性至上"
-    nick_title: "共同创始人"
     nick_blurb: "充满动力的大牛"
-    michael_title: "程序员"
+    matt_title: "共同创始人" # {change}
-    michael_blurb: "系统管理员"
-    matt_title: "共同创始人"
     matt_blurb: "自行车爱好者"
-    cat_title: "首席关卡设计师"
+    cat_title: "首席关卡设计师" # {change}
     cat_blurb: "气宗"
-    josh_title: "游戏设计师"
+    scott_title: "共同创始人" # {change}
-    josh_blurb: "地面是熔岩"
+    scott_blurb: "理性至上"
-    jose_title: "音乐"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "放轻松"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "插画师"
+    rob_title: "编译器工程师" # {change}
-    retrostyle_blurb: "复古风格的游戏"
-    rob_title: "编译器工程师"
     rob_blurb: "编代码之类的"
     josh_c_title: "游戏设计师"
     josh_c_blurb: "设计游戏"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "游戏设计师"
+    josh_blurb: "地面是熔岩"
+    retrostyle_title: "插画师"
+    retrostyle_blurb: "复古风格的游戏"
+    jose_title: "音乐"
+    jose_blurb: "放轻松"
     carlos_title: "地区经理, 巴西"
     carlos_blurb: "食草男"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "谁是CodeCombat的使用对象呢？"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     email_settings_url: "您的电子邮件设置"
     email_description_suffix: "或者我们发送的邮件中的链接，您可以随时更改您的偏好设置或者随时取消订阅。"
     cost_title: "花费"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "版权与许可"
     contributor_title: "贡献者许可协议"
     contributor_description_prefix: "所有对本网站或是GitHub代码库的贡献都依照我们的"

app/locale/zh-HANT.coffee

@@ -407,7 +407,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     feature4: "每個月<strong>3500顆額外寶石</strong>！"
     feature5: "影片教學"
     feature6: "頂級信箱支援"
-    feature7: "私人 <strong>部落</strong>"
+    feature7: "私密<strong>部落</strong>"
     free: "免費"
     month: "月"
     must_be_logged: "您需要先登入。請先註冊或者在上方的目錄中點擊登入。"
@@ -552,32 +552,30 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     press_paragraph_1_link: "新聞稿懶人包"
     press_paragraph_1_suffix: "，裡面所有的LOGO和圖片都可以使用，並且不必另外知會我們。"
     team: "製作團隊"
-    george_title: "共同創辦人"
+    nick_title: "程式員" # {change}
-    george_blurb: "商人"
-    scott_title: "共同創辦人"
-    scott_blurb: "理性至上"
-    nick_title: "程式員"
     nick_blurb: "亢奮的Guru"
-    michael_title: "共同創辦人"
+    matt_title: "共同創辦人" # {change}
-    michael_blurb: "系統管理員"
-    matt_title: "共同創辦人"
     matt_blurb: "競速單車玩家"
-    cat_title: "首席開卡設計師"
+    cat_title: "首席開卡設計師" # {change}
     cat_blurb: "氣宗"
-    josh_title: "遊戲設計師"
+    scott_title: "共同創辦人" # {change}
-    josh_blurb: "地面是熔岩"
+    scott_blurb: "理性至上"
-    jose_title: "音樂"
+#    maka_title: "Customer Advocate"
-    jose_blurb: "放輕鬆"
+#    maka_blurb: "Storyteller"
-    retrostyle_title: "插畫師"
+    rob_title: "編譯工程師" # {change}
-    retrostyle_blurb: "復古風格的遊戲"
-    rob_title: "編譯工程師"
     rob_blurb: "編寫一些的程式碼"
     josh_c_title: "遊戲設計師"
     josh_c_blurb: "設計遊戲"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+    josh_title: "遊戲設計師"
+    josh_blurb: "地面是熔岩"
+    retrostyle_title: "插畫師"
+    retrostyle_blurb: "復古風格的遊戲"
+    jose_title: "音樂"
+    jose_blurb: "放輕鬆"
     carlos_title: "區經理 - 巴西"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
   teachers:
     who_for_title: "誰是CodeCombat的使用對象呢？"
@@ -734,22 +732,22 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     clans: "部落"
     new_name: "新部落的名字"
     new_description: "新部落的描述"
-    make_private: "設定部落為私人"
+    make_private: "設定部落為私密"
     subs_only: "只限訂閱"
-    create_clan: "創建新的部落"
+    create_clan: "建立新的部落"
     private_preview: "預覽"
-#    private_clans: "private clans"
+    private_clans: "私密部落"
     public_clans: "公共部落"
     my_clans: "我的部落"
     clan_name: "部落名字"
     name: "名字"
     chieftain: "首領"
     type: "種類"
-    edit_clan_name: "編輯部落的名字"
+    edit_clan_name: "編輯部落的名稱"
     edit_clan_description: "編輯部落的描述"
-    edit_name: "編輯名字"
+    edit_name: "編輯名稱"
     edit_description: "編輯描述"
-    private: "私人"
+    private: "私密"
     summary: "綜述"
     average_level: "平均等級"
     average_achievements: "平均成就"
@@ -787,7 +785,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     track_concepts6b: "按姓名或進度排序成員"
     track_concepts7: "需要邀請"
     track_concepts8: "來加入"
-#    private_require_sub: "Private clans require a subscription to create or join."
+    private_require_sub: "需要訂閱才可以建立或加入私密部落"
 
   courses:
     course: "課程"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1175,13 +1173,13 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     diplomat_introduction_pref: "所以，如果說我們從"
     diplomat_launch_url: " 十月的那次上線 "
     diplomat_introduction_suf: "中得到了怎樣的啟發：那就是在許多國家有許多人對CodeCombat產生興趣！我們正在建立一群翻譯者，急於將一組組的英文翻譯成各國語言讓CodeCombat可以讓全世界更多人都可以接觸。如果您喜歡搶先閱讀新內容並且讓您的國人都可以儘速的擁有，那麼這職業也許適合您。"
-    diplomat_attribute_1: "擁有流利的英文並且喜歡翻譯某種語言。當傳遞複雜想法時，您必須這兩種語言都是熟悉的！"
+    diplomat_attribute_1: "擁有流利的英文並且精通欲翻譯的語言。當傳遞複雜想法時，您必須融會貫通這兩種語言！"
     diplomat_i18n_page_prefix: "您可以從我們的"
     diplomat_i18n_page: " 翻譯頁面 "
-    diplomat_i18n_page_suffix: "或者從我們在 GitHub 上的頁面開始翻譯我們的關卡。"
+    diplomat_i18n_page_suffix: "開始翻譯我們的關卡，或者在 GitHub 翻譯我們的介面及網站。"
     diplomat_join_pref_github: "在"
     diplomat_github_url: " GitHub "
-    diplomat_join_suf_github: "找到您的語言文件 (繁體中文的是：codecombat/app/locale/zh-HANT.coffee)，在線編輯它，並且上傳一個 pull 請求。另外，勾選底下的條件來藉由郵件獲得及時的國際化開發！"
+    diplomat_join_suf_github: "找到您的語言文件 (繁體中文的是：codecombat/app/locale/zh-HANT.coffee)，在線編輯它，並且上傳一個 pull 請求。另外，勾選底下的方框以藉由郵件獲得及時的國際化開發！"
     diplomat_subscribe_desc: "取得國際化開發和待翻譯關卡的郵件。"
     ambassador_introduction: "這是個我們正在建立的社群，您將是我們與世界的連接點。我們在論壇、郵件、社群網路上和許多人交談並且幫助彼此熟悉遊戲以及互相學習。如果您想要幫助其他人參與並且從中獲得許多樂趣，以及樂於感受CodeCombat的脈搏和我們將前往的地方，那麼這職業也許適合您。"
     ambassador_attribute_1: "溝通技巧。可以找到玩家正面臨的問題並且幫助他們解決。另外，保持與我們聯繫玩家們討論的、喜愛的、厭惡的以及想要的！"
@@ -1292,7 +1290,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 
   account:
     payments: "付款"
-    prepaid_codes: "充值碼"
+    prepaid_codes: "儲值碼"
     purchased: "已購買"
     subscription: "訂閱"
     invoices: "收據"
@@ -1339,7 +1337,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    copy_link: "You can copy the code's link and send it to someone."
 #    quantity: "Quantity"
 #    redeemed: "Redeemed"
-#    no_codes: "No codes yet！"
+#    no_codes: "No codes yet!"
 #    you_can1: "You can"
 #    you_can2: "purchase a prepaid code"
 #    you_can3: "that can be applied to your own account or given to others."
@@ -1420,25 +1418,25 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
 #    users: "Users"
 
   concepts:
-    advanced_strings: "高級字符串"
+    advanced_strings: "進階字串"
     algorithms: "算法"
-    arguments: "參數"
+    arguments: "引數"
     arithmetic: "四則運算"
     arrays: "陣列"
     basic_syntax: "基本語法"
     boolean_logic: "布林邏輯"
-    break_statements: "Break語句"
+    break_statements: "break敘述"
     classes: "類"
-    continue_statements: "Continue 語句"
+    continue_statements: "continue敘述"
-    for_loops: "For迴圈"
+    for_loops: "for迴圈"
     functions: "函數"
     graphics: "圖形"
-    if_statements: "If語句"
+    if_statements: "if敘述"
     input_handling: "輸入處理"
     math_operations: "數學運算"
     object_literals: "對象常量"
     parameters: "參數"
-    strings: "字符串"
+    strings: "字串"
     variables: "變數"
     vectors: "向量"
     while_loops: "while迴圈"
@@ -1467,11 +1465,11 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
   legal:
     page_title: "條文"
     opensource_intro: "CodeCombat是完全的開源。"
-    opensource_description_prefix: "查看 "
+    opensource_description_prefix: "查看"
     github_url: "我們的 GitHub"
-    opensource_description_center: "並且如果有興趣也歡迎您的幫助！ CodeCombat是建立在許多的開源專案上，並且我們深愛它們。查看 "
+    opensource_description_center: "並且如果有興趣也歡迎您的幫助！ CodeCombat是建立在許多的開源專案上，並且我們深愛它們。查看"
     archmage_wiki_url: "我們的大法師wiki"
-    opensource_description_suffix: " 尋求創造這款遊戲的相關軟體列表。"
+    opensource_description_suffix: "尋求創造這款遊戲的相關軟體列表。"
     practices_title: "值得尊敬的最佳實踐"
     practices_description: "這些是我們給您，給玩家的承諾，儘管這在法律上略顯不足。"
     privacy_title: "隱私"
@@ -1480,7 +1478,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     security_description: "我們渴望保持您的個人資訊是安全的。身為一個開源的專案，我們的網站是開放給任何人來檢視並且提升我們的安全系統。"
     email_title: "郵件"
     email_description_prefix: "我們將不會使您的信箱氾濫的收到垃圾信。不論"
-    email_settings_url: " 在您的郵件設定 "
+    email_settings_url: "在您的郵件設定"
     email_description_suffix: "或在我們送出的信件上都有留著我們的聯結，您可以更改您的喜好並且輕易的隨時取消訂閱。"
     cost_title: "花費"
     cost_description: "CodeCombat在核心的關卡是全部免費，但只要花費一個月${{price}}美金來訂閱，您將在每個月取得額外的關卡和{{gems}}顆寶石。您可以輕易地取消訂閱並且保證取得100%的退費。"
@@ -1518,7 +1516,7 @@ module.exports = nativeDescription: "繁體中文", englishDescription: "Chinese
     nutshell_title: "簡而言之"
     nutshell_description: "我們在關卡編輯器裡公開的任何資源，您都可以在製作關卡時隨意使用，但我們保留在 codecombat.com 之上創建的關卡本身傳播的權利，因為我們往後可能決定以它們收費。"
     canonical: "我們宣告這篇說明的英文版本是權威版本。如果各個翻譯版本之間有任何衝突，以英文版為準。"
-#    third_party_title: "Third Party Services"
+    third_party_title: "第三方服務"
 #    third_party_description: "CodeCombat uses the following third party services (among others):"
 
   ladder_prizes:

app/locale/zh-WUU-HANS.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    email_settings_url: "your email settings"
 #    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
 #    cost_title: "Cost"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
 #    copyrights_title: "Copyrights and Licenses"
 #    contributor_title: "Contributor License Agreement"
 #    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"

app/locale/zh-WUU-HANT.coffee

@@ -552,32 +552,30 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    press_paragraph_1_link: "press packet"
 #    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
 #    team: "Team"
-#    george_title: "Cofounder"
+#    nick_title: "Cofounder, CEO"
-#    george_blurb: "Businesser"
-#    scott_title: "Cofounder"
-#    scott_blurb: "Reasonable One"
-#    nick_title: "Cofounder"
 #    nick_blurb: "Motivation Guru"
-#    michael_title: "Programmer"
+#    matt_title: "Cofounder, CTO"
-#    michael_blurb: "Sys Admin"
-#    matt_title: "Cofounder"
 #    matt_blurb: "Bicyclist"
-#    cat_title: "Chief Artisan"
+#    cat_title: "Game Designer"
 #    cat_blurb: "Airbender"
-#    josh_title: "Game Designer"
+#    scott_title: "Cofounder, Software Engineer"
-#    josh_blurb: "Floor Is Lava"
+#    scott_blurb: "Reasonable One"
-#    jose_title: "Music"
+#    maka_title: "Customer Advocate"
-#    jose_blurb: "Taking Off"
+#    maka_blurb: "Storyteller"
-#    retrostyle_title: "Illustration"
+#    rob_title: "Software Engineer"
-#    retrostyle_blurb: "RetroStyle Games"
-#    rob_title: "Compiler Engineer"
 #    rob_blurb: "Codes things and stuff"
 #    josh_c_title: "Game Designer"
 #    josh_c_blurb: "Designs games"
+#    robin_title: "UX Design & Research"
+#    robin_blurb: "Scaffolding"
+#    josh_title: "Game Designer"
+#    josh_blurb: "Floor Is Lava"
+#    retrostyle_title: "Illustration"
+#    retrostyle_blurb: "RetroStyle Games"
+#    jose_title: "Music"
+#    jose_blurb: "Taking Off"
 #    carlos_title: "Region Manager, Brazil"
 #    carlos_blurb: "Celery Man"
-#    maka_title: "Customer Advocate"
-#    maka_blurb: "Storyteller"
 
 #  teachers:
 #    who_for_title: "Who is CodeCombat for?"
@@ -994,7 +992,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    additional_resources_1_mid: "Course 1 Teacher's Guide"
 #    additional_resources_1_suff: "explanations and solutions to each level."
 #    additional_resources_2_pref: "Complete our"
-#    additional_resources_2_suff: "to get 15 more hours of content! For a limited time, enroll as many students as you want in our three paid courses."
+#    additional_resources_2_suff: "to get two free enrollments for the rest of our paid courses."
 #    additional_resources_3_pref: "Visit our"
 #    additional_resources_3_mid: "Teacher Forums"
 #    additional_resources_3_suff: "to connect to fellow educators who are using CodeCombat."
@@ -1483,7 +1481,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     email_settings_url: "設定爾個電子郵箱"
     email_description_suffix: "要勿我裏發畀爾個信裏向有鏈接，爾随低2都好改偏向設定要勿取消訂閱。"
     cost_title: "花銷"
-#    cost_description_a: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
+#    cost_description: "CodeCombat is free to play for all of its core levels, with a ${{price}} USD/mo subscription for access to extra level branches and {{gems}} bonus gems per month. You can cancel with a click, and we offer a 100% money-back guarantee."
     copyrights_title: "版權搭許可"
     contributor_title: "貢獻者許可協議"
     contributor_description_prefix: "所有對本網站要勿 GitHub 代碼庫個努力都照我裏個"

app/models/Level.coffee

@@ -28,7 +28,13 @@ module.exports = class Level extends CocoModel
     # Figure out ThangTypes' Components
     tmap = {}
     tmap[t.thangType] = true for t in o.thangs ? []
-    o.thangTypes = (original: tt.get('original'), name: tt.get('name'), components: $.extend(true, [], tt.get('components')) for tt in supermodel.getModels ThangType when tmap[tt.get('original')] or (tt.get('components') and not tt.notInLevel))
+    sessionHeroes = [session?.get('heroConfig')?.thangType, otherSession?.get('heroConfig')?.thangType]
+    o.thangTypes = []
+    for tt in supermodel.getModels ThangType
+      if tmap[tt.get('original')] or
+        (tt.get('kind') isnt 'Hero' and tt.get('kind')? and tt.get('components') and not tt.notInLevel) or
+        (tt.get('kind') is 'Hero' and ((@get('type', true) in ['course', 'course-ladder']) or tt.get('original') in sessionHeroes))
+          o.thangTypes.push (original: tt.get('original'), name: tt.get('name'), components: $.extend(true, [], tt.get('components')))
     @sortThangComponents o.thangTypes, o.levelComponents, 'ThangType'
     @fillInDefaultComponentConfiguration o.thangTypes, o.levelComponents
 

bin/coco-mongodb

@@ -71,7 +71,7 @@ def which(cmd, mode=os.F_OK | os.X_OK, path=None):
 
 
 current_directory = os.path.dirname(os.path.realpath(sys.argv[0]))
-allowedMongoVersions = ["v2.6", "v3.0"]
+allowedMongoVersions = ["v2.6", "v3.0", "v3.2"]
 if which("mongod") and any(i in subprocess.check_output("mongod --version",shell=True) for i in allowedMongoVersions):
     mongo_executable = "mongod"
 else:

scripts/analytics/mongodb/queries/subscribersByCountry.js

@@ -0,0 +1,22 @@
+// Print out subscribers by special country (China, Brazil)
+
+// Usage:
+// mongo <address>:<port>/<database> <script file> -u <username> -p <password>
+
+var countries = ['brazil', 'china'];
+countries.forEach(function(country) {
+  print('---' + country.toUpperCase() + '---');
+  var cursor = db.users.find({country: country, stripe: {$exists: true}}, {email: 1, country: 1, stripe: 1, name: 1});
+  var users = [];
+  var inactiveUsers = [];
+  while (cursor.hasNext()) {
+    var user = cursor.next();
+    if (!user.stripe.subscriptionID) {
+      inactiveUsers.push(user);
+      continue;
+    }
+    users.push(user);
+    print([user._id, user.country, user.email, user.name, JSON.stringify(user.stripe, null, 0)].join('\t'));
+  }
+  print('Had', users.length, 'active subscribers and', inactiveUsers.length, 'possible former subscribers in', country, '\n');
+});

server/levels/sessions/level_session_handler.coffee

@@ -37,7 +37,7 @@ class LevelSessionHandler extends Handler
     return @sendForbiddenError(res) unless req.user?.isAdmin()
 
     levelSlug = req.query.slug or req.body.slug
-    limit = req.query.limit or req.body.limit or 7
+    limit = parseInt req.query.limit or req.body.limit or 7
 
     return @sendSuccess res, [] unless levelSlug?
 

server/users/User.coffee

@@ -31,6 +31,7 @@ UserSchema.index({'slug': 1}, {name: 'slug index', sparse: true, unique: true})
 UserSchema.index({'stripe.subscriptionID': 1}, {unique: true, sparse: true})
 UserSchema.index({'siteref': 1}, {name: 'siteref index', sparse: true})
 UserSchema.index({'schoolName': 1}, {name: 'schoolName index', sparse: true})
+UserSchema.index({'country': 1}, {name: 'country index', sparse: true})
 
 UserSchema.post('init', ->
   @set('anonymous', false) if @get('email')