diff --git a/app/lib/auth.coffee b/app/lib/auth.coffee
index 5a14effb0..78862d733 100644
--- a/app/lib/auth.coffee
+++ b/app/lib/auth.coffee
@@ -5,13 +5,16 @@ storage = require 'lib/storage'
 module.exports.CURRENT_USER_KEY = CURRENT_USER_KEY = 'whoami'
 BEEN_HERE_BEFORE_KEY = 'beenHereBefore'
 
-module.exports.createUser = (userObject, failure=backboneFailure) ->
+module.exports.createUser = (userObject, failure=backboneFailure, nextURL=null) ->
   user = new User(userObject)
   user.save({}, {
   error: failure,
   success: (model) ->
     storage.save(CURRENT_USER_KEY, model)
-    window.location.reload()
+    if nextURL
+      window.location.href = nextURL
+    else
+      window.location.reload()
   })
 
 module.exports.loginUser = (userObject, failure=genericFailure) ->
@@ -43,7 +46,7 @@ init = ->
   module.exports.me = window.me = new User(storedUser)
   me.url = -> '/auth/whoami'
   me.fetch()
-  
+
   retry = -> me.fetch() # blindly try again
   error = -> setTimeout(retry, 1000) # blindly try again
   me.on 'error', error, @
diff --git a/app/lib/world/names.coffee b/app/lib/world/names.coffee
index dbd0be82b..fc0a6aff9 100644
--- a/app/lib/world/names.coffee
+++ b/app/lib/world/names.coffee
@@ -67,6 +67,7 @@ module.exports.thangNames = thangNames =
     "Gorgin"
     "Coco"
     "Buffy"
+    "Allankrita"
   ]
   "Peasant": [
     "Yorik"
@@ -97,6 +98,7 @@ module.exports.thangNames = thangNames =
     "Hilda"
     "Icey"
     "Matilda"
+    "Mertia"
   ]
   "Archer F": [
     "Phoebe"
@@ -199,6 +201,7 @@ module.exports.thangNames = thangNames =
     "Gurulax"
     "Mokrul"
     "Polifemo"
+    "Muthyala"
   ]
   "Ogre F": [
     "Nareng"
@@ -268,6 +271,7 @@ module.exports.thangNames = thangNames =
     "Gom"
     "Gogg"
     "Ghuk"
+    "Makas"
   ]
   "Ogre Thrower": [
     "Kyrgg"
@@ -284,6 +288,7 @@ module.exports.thangNames = thangNames =
     "Makas"
     "Rakash"
     "Drumbaa"
+    "Pinakin"
   ]
   "Burl": [
     "Borlit"
@@ -291,6 +296,7 @@ module.exports.thangNames = thangNames =
   ]
   "Griffin Rider": [
     "Aeoldan"
+    "Bestarius"
   ]
   "Potion Master": [
     "Snake"
@@ -298,12 +304,14 @@ module.exports.thangNames = thangNames =
     "Zander"
     "Arora"
     "Curie"
+    "Clause"
   ]
   "Librarian": [
     "Hushbaum"
     "Matilda"
     "Agnes"
     "Agathe"
+    "Satish"
   ]
   "Equestrian": [
     "Reynaldo"
diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee
index b61580832..ae1634a04 100644
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     sending: "ارسال..."
     cancel: "الغي"
     save: "احفض"
+#    create: "Create"
     delay_1_sec: "ثانية"
     delay_3_sec: "3 ثواني"
     delay_5_sec: "5 ثواني"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee
index bf28857cb..02a48185f 100644
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "български език", englishDescri
     sending: "Изпращане..."
     cancel: "Отказ"
     save: "Запис"
+#    create: "Create"
     delay_1_sec: "1 секунда"
     delay_3_sec: "3 секунди"
     delay_5_sec: "5 секунди"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "български език", englishDescri
   login:
     sign_up: "Създай Профил"
     log_in: "Вход"
+#    logging_in: "Logging In"
     log_out: "Изход"
     recover: "Възстанови акаунт"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "български език", englishDescri
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "български език", englishDescri
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee
index 595ac7bb3..b556bb751 100644
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     sending: "Enviant..."
     cancel: "Cancel·lant"
     save: "Guardar"
+#    create: "Create"
     delay_1_sec: "1 segon"
     delay_3_sec: "3 segons"
     delay_5_sec: "5 segons"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
   login:
     sign_up: "Crear un compte"
     log_in: "Iniciar Sessió"
+#    logging_in: "Logging In"
     log_out: "Tancar Sessió"
     recover: "Recuperar un compte"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee
index d69702f93..d46a5ffc9 100644
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     sending: "Odesílání..."
     cancel: "Zrušit"
     save: "Uložit"
+#    create: "Create"
     delay_1_sec: "1 vteřina"
     delay_3_sec: "3 vteřiny"
     delay_5_sec: "5 vteřin"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
   login:
     sign_up: "Vytvořit účet"
     log_in: "Přihlásit"
+#    logging_in: "Logging In"
     log_out: "Odhlásit"
     recover: "obnovit účet"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,7 +470,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     more_about_archmage: "Dozvědět se více o tom, jak se stát mocným Arcimágem"
     archmage_subscribe_desc: "Dostávat emailem oznámení a informacemi nových programovacích příležitostech"
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
     artisan_introduction_pref: "Musíme vytvářet další úrovně! Lidé nás prosí o další obsah, ale sami zvládáme vytvořit jen málo. Naším prvním pracovním zastavením je první úroveň. Editor úrovní je tak-tak použitelný i pro jeho vlastní tvůrce. Máte-li vizi pro vytvoření vnořených úrovní alá "
     artisan_introduction_suf: "pak neváhejte, toto je vaše destinace."
     artisan_attribute_1: "Předchozí zkušenosti s vytvářením podobného obsahu by byly vítány, například z editorů úrovní Blizzardu, ale nejsou vyžadovány!"
diff --git a/app/locale/da.coffee b/app/locale/da.coffee
index 200d6c873..e43633763 100644
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     sending: "Sender..."
     cancel: "Annuller"
     save: "Gem"
+#    create: "Create"
     delay_1_sec: "1 sekund"
     delay_3_sec: "3 sekunder"
     delay_5_sec: "5 sekunder"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
   login:
     sign_up: "opret ny konto"
     log_in: "Log Ind"
+#    logging_in: "Logging In"
     log_out: "Log Ud"
     recover: "genskab konto"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     skip_tutorial: "Spring over (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Tastaturgenveje"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/de.coffee b/app/locale/de.coffee
index 0b16ea9a5..7450a566d 100644
--- a/app/locale/de.coffee
+++ b/app/locale/de.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     sending: "Übertrage..."
     cancel: "Abbrechen"
     save: "Speichern"
+#    create: "Create"
     delay_1_sec: "1 Sekunde"
     delay_3_sec: "3 Sekunden"
     delay_5_sec: "5 Sekunden"
@@ -12,13 +13,13 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    fork: "Fork"
     play: "Abspielen"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  units:
+    second: "Sekunde"
+    seconds: "Sekunden"
+    minute: "Minute"
+    minutes: "Minuten"
+    hour: "Stunde"
+    hours: "Stunden"
 
   modal:
     close: "Schließen"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
   login:
     sign_up: "Registrieren"
     log_in: "Einloggen"
+#    logging_in: "Logging In"
     log_out: "Ausloggen"
     recover: "Account wiederherstellen"
 
@@ -76,7 +78,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     play: "Spielen"
     old_browser: "Oh! Dein Browser ist zu alt für CodeCombat. Sorry!"
     old_browser_suffix: "Du kannst es trotzdem versuchen, aber es wird wahrscheinlich nicht funktionieren."
-#    campaign: "Campaign"
+    campaign: "Kampagne"
     for_beginners: "Für Anfänger"
     multiplayer: "Mehrspieler"
     for_developers: "Für Entwickler"
@@ -195,9 +197,9 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     victory_sign_up: "Melde Dich an, um Fortschritte zu speichern"
     victory_sign_up_poke: "Möchtest Du Neuigkeiten per Mail erhalten? Erstelle einen kostenlosen Account und wir halten Dich auf dem Laufenden."
     victory_rate_the_level: "Bewerte das Level: "
-#    victory_rank_my_game: "Rank My Game"
-#    victory_ranking_game: "Submitting..."
-#    victory_return_to_ladder: "Return to Ladder"
+    victory_rank_my_game: "Werte mein Spiel"
+    victory_ranking_game: "Einreichen..."
+    victory_return_to_ladder: "Zurück zur Rangliste"
     victory_play_next_level: "Spiel das nächste Level"
     victory_go_home: "Geh auf die Startseite"
     victory_review: "Erzähl uns davon!"
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     skip_tutorial: "Überspringen (Esc)"
     editor_config: "Editor Einstellungen"
     editor_config_title: "Editor Einstellungen"
+    editor_config_language_label: "Programmiersprache"
+    editor_config_language_description: "Bestimme die Programmiersprache in der du arbeiten möchtest."
     editor_config_keybindings_label: "Tastenbelegung"
     editor_config_keybindings_default: "Standard (Ace)"
     editor_config_keybindings_description: "Fügt zusätzliche Tastenkombinationen, bekannt aus anderen Editoren, hinzu"
@@ -231,35 +235,35 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     editor_config_invisibles_description: "Zeigt unsichtbare Zeichen wie Leertasten an."
     editor_config_indentguides_label: "Zeige Einrückungshilfe"
     editor_config_indentguides_description: "Zeigt vertikale Linien an um Einrückungen besser zu sehen."
-#    editor_config_behaviors_label: "Smart Behaviors"
-#    editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes."
-#    loading_ready: "Ready!"
-#    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
-#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
-#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
-#    tip_guide_exists: "Click the guide at the top of the page for useful info."
-#    tip_open_source: "CodeCombat is 100% open source!"
-#    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
-#    tip_js_beginning: "JavaScript is just the beginning."
-#    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
-#    think_solution: "Think of the solution, not the problem."
-#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - 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_forums: "Head over to the forums and tell us what you think!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
-#    tip_morale_improves: "Loading will continue until morale improves."
-#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
+    editor_config_behaviors_label: "Intelligentes Verhalten"
+    editor_config_behaviors_description: "Vervollständigt automatisch Klammern und Anführungszeichen."
+    loading_ready: "Bereit!"
+    tip_insert_positions: "Halte 'Umschalt' gedrückt und klicke auf die Karte um die Koordinaten einzufügen."
+    tip_toggle_play: "Wechsel zwischen Play und Pause mit Strg+P."
+    tip_scrub_shortcut: "Spule vor und zurück mit Strg+[ und Strg+]"
+    tip_guide_exists: "Klicke auf die Anleitung am oberen Ende der Seite für nützliche Informationen"
+    tip_open_source: "CodeCombat ist 100% quelloffen!"
+    tip_beta_launch: "CodeCombat startete seine Beta im Oktober 2013."
+    tip_js_beginning: "JavaScript ist nur der Anfang."
+    tip_autocast_setting: "Ändere die Einstellungen für das automatische Ausführen über das Zahnrad neben dem Ausführen Knopf"
+    think_solution: "Denke über die Lösung nach, nicht über das Problem."
+    tip_theory_practice: "In der Theorie gibt es keinen Unterschied zwischen Theorie und Praxis. In der Praxis schon. - Yogi Berra"
+    tip_error_free: "Es gibt zwei Wege fehlerfreie Programme zu schreiben; nur der Dritte funktioniert. - Alan Perlis"
+    tip_debugging_program: "Wenn Debugging der Prozess zum Fehler entfernen ist, dann muss Programmieren der Prozess sein Fehler zu machen. - Edsger W. Dijkstra"
+    tip_forums: "Gehe zum Forum und sage uns was du denkst!"
+    tip_baby_coders: "In der Zukunft werden sogar Babies Erzmagier sein."
+    tip_morale_improves: "Das Laden wird weiter gehen bis die Stimmung sich verbessert."
+    tip_all_species: "Wir glauben an gleiche Chancen für alle Arten Programmieren zu lernen."
 #    tip_reticulating: "Reticulating spines."
-#    tip_harry: "Yer a Wizard, "
-#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
-#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
-#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
-#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
+    tip_harry: "Du bist ein Zauberer, "
+    tip_great_responsibility: "Mit großen Programmierfähigkeiten kommt große Verantwortung."
+    tip_munchkin: "Wenn du dein Gemüse nicht isst, besucht dich ein Zwerg während du schläfst."
+    tip_binary: "Es gibt auf der Welt nur 10 Arten von Menschen: die, welche Binär verstehen und die, welche nicht."
+    tip_commitment_yoda: "Ein Programmier muss die größte Hingabe haben, den ernstesten Verstand. ~ Yoda"
+    tip_no_try: "Tu. Oder tu nicht. Es gibt kein Versuchen. - Yoda"
+    tip_patience: "Geduld du musst haben, junger Padawan. - Yoda"
+    tip_documented_bug: "Ein dokumentierter Fehler ist kein Fehler; er ist ein Merkmal."
+    tip_impossible: "Es wirkt immer unmöglich bis es vollbracht ist. - Nelson Mandela"
     time_current: "Aktuell"
     time_total: "Total"
     time_goto: "Gehe zu"
@@ -288,8 +292,8 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     contact_us: "setze dich mit uns in Verbindung!"
     hipchat_prefix: "Besuche uns auch in unserem"
     hipchat_url: "HipChat room."
-#    revert: "Revert"
-#    revert_models: "Revert Models"
+    revert: "Zurücksetzen"
+    revert_models: "Models zurücksetzen."
     level_some_options: "Einige Einstellungsmöglichkeiten?"
     level_tab_thangs: "Thangs"
     level_tab_scripts: "Skripte"
@@ -308,7 +312,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     level_components_title: "Zurück zu allen Thangs"
     level_components_type: "Typ"
     level_component_edit_title: "Komponente bearbeiten"
-#    level_component_config_schema: "Config Schema"
+    level_component_config_schema: "Konfigurationsschema"
     level_component_settings: "Einstellungen"
     level_system_edit_title: "System bearbeiten"
     create_system_title: "neues System erstellen"
@@ -331,7 +335,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     body: "Inhalt"
     version: "Version"
     commit_msg: "Commit Nachricht"
-#    history: "History"
+    history: "Verlauf"
     version_history_for: "Versionsgeschichte für: "
     result: "Ergebnis"
     results: "Ergebnisse"
@@ -340,15 +344,15 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     email: "Email"
     password: "Passwort"
     message: "Nachricht"
-#    code: "Code"
-#    ladder: "Ladder"
-#    when: "When"
-#    opponent: "Opponent"
-#    rank: "Rank"
-#    score: "Score"
-#    win: "Win"
-#    loss: "Loss"
-#    tie: "Tie"
+    code: "Code"
+    ladder: "Rangliste"
+    when: "Wann"
+    opponent: "Gegner"
+    rank: "Rang"
+    score: "Punktzahl"
+    win: "Sieg"
+    loss: "Niederlage"
+    tie: "Unentschieden"
     easy: "Einfach"
     medium: "Mittel"
     hard: "Schwer"
@@ -374,7 +378,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
     nick_description: "Programmierzauberer, exzentrischer Motivationskünstler und  Auf-den-Kopf-stell-Experimentierer. Nick könnte alles mögliche tun und entschied CodeCombat zu bauen."
     jeremy_description: "Kundendienstmagier, Usability Tester und Community-Organisator. Wahrscheinlich hast du schon mit Jeremy gesprochen."
     michael_description: "Programmierer, Systemadministrator und studentisch technisches Wunderkind, Michael hält unsere Server am Laufen."
-#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!"
+    glen_description: "Programmier und leidenschaftlicher Spieleentwickler mit der Motivation die Welt, durch das Entwickeln von Sachen die zählen, zu einem besseren Platz zu machen. Das Wort 'unmöglich' kann nicht in seinem Wortschatz gefunden werden. Neue Fähigkeiten zu lernen ist seine Leidenschaft!"
 
   legal:
     page_title: "Rechtliches"
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/el.coffee b/app/locale/el.coffee
index 1741ad6f3..db12d6a5c 100644
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
     sending: "Αποστολή ..."
     cancel: "Ακύρωση"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
   login:
     sign_up: "Δημιούργησε Λογαριασμό"
     log_in: "Σύνδεση"
+#    logging_in: "Logging In"
     log_out: "Αποσύνδεση"
     recover: "Κάντε ανάκτηση του λογαριασμού σας"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/en-AU.coffee b/app/locale/en-AU.coffee
index a4938fc7a..1ef791725 100644
--- a/app/locale/en-AU.coffee
+++ b/app/locale/en-AU.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee
index 9adacaab0..d815f11cc 100644
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index 6e8a79b62..3e0d493e0 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index 4b07bac03..b52e049d6 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     sending: "Sending..."
     cancel: "Cancel"
     save: "Save"
+    create: "Create"
     delay_1_sec: "1 second"
     delay_3_sec: "3 seconds"
     delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
   login:
     sign_up: "Create Account"
     log_in: "Log In"
+    logging_in: "Logging In"
     log_out: "Log Out"
     recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     skip_tutorial: "Skip (esc)"
     editor_config: "Editor Config"
     editor_config_title: "Editor Configuration"
+    editor_config_language_label: "Programming Language"
+    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Key Bindings"
     editor_config_keybindings_default: "Default (Ace)"
     editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -320,6 +324,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     article_search_title: "Search Articles Here"
     thang_search_title: "Search Thang Types Here"
     level_search_title: "Search Levels Here"
+    read_only_warning: "Note: you can't save any edits here, because you're not logged in as an admin."
 
   article:
     edit_btn_preview: "Preview"
@@ -467,9 +472,9 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
     more_about_archmage: "Learn More About Becoming an Archmage"
     archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
     artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-    artisan_summary_suf: "then this class is for you."
+    artisan_summary_suf: ", then this class is for you."
     artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-    artisan_introduction_suf: "then this class might be for you."
+    artisan_introduction_suf: ", then this class might be for you."
     artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
     artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
     artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee
index b00e98d03..62b503e40 100644
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
     sending: "Enviando..."
     cancel: "Cancelar"
 #    save: "Save"
+#    create: "Create"
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
   login:
     sign_up: "Crear Cuenta"
     log_in: "Entrar"
+#    logging_in: "Logging In"
     log_out: "Salir"
     recover: "recuperar cuenta"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index 79d4e8ef0..bbbccea1b 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     sending: "Enviando..."
     cancel: "Cancelar"
     save: "Guardar"
+#    create: "Create"
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
   login:
     sign_up: "Crear una cuenta"
     log_in: "Entrar"
+#    logging_in: "Logging In"
     log_out: "Salir"
     recover: "recuperar cuenta"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     more_about_archmage: "Aprende más sobre convertirte en un poderoso Archimago"
     archmage_subscribe_desc: "Recibe correos sobre nuevos anuncios y oportunidades de codificar."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-    artisan_summary_suf: "entonces esta Clase es la tuya."
+    artisan_summary_suf: ", entonces esta Clase es la tuya."
     artisan_introduction_pref: "¡Debemos construir niveles adicionales! La gente clama por más contenido y solo podemos crear unos cuantos. Ahora mismo tu estación de trabajo es el nivel uno; nuestro editor de niveles es apenas usable por sus creadores, así que ten cuidado. Si tienes visiones de campañas que alcanzan el infinito"
-    artisan_introduction_suf: "entonces esta Clase es ideal para ti."
+    artisan_introduction_suf: ", entonces esta Clase es ideal para ti."
     artisan_attribute_1: "Cualquier experiencia creando contenido similar estaría bien, como por ejemplo el editor de niveles de Blizzard. ¡Aunque no es necesaria!"
     artisan_attribute_2: "Un anhelo de hacer un montón de testeo e iteraciones. Para hacer buenos niveles necesitas mostrárselos a otros y mirar como juegan, además de estar preparado para encontrar los fallos a reparar."
     artisan_attribute_3: "Por el momento, la resistencia va a la par con el Aventurero. Nuestro editor de niveles está a un nivel de desarrollo temprano y puede ser muy frustrante usarlo. ¡Estás advertido!"
diff --git a/app/locale/es.coffee b/app/locale/es.coffee
index 8a59ff812..7ff407ced 100644
--- a/app/locale/es.coffee
+++ b/app/locale/es.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     sending: "Enviando..."
     cancel: "Cancelar"
     save: "Guardar"
+#    create: "Create"
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
   login:
     sign_up: "Crear Cuenta"
     log_in: "Iniciar Sesión"
+#    logging_in: "Logging In"
     log_out: "Cerrar Sesión"
     recover: "recuperar cuenta"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     skip_tutorial: "Saltar (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee
index d91e19e22..52b82c69e 100644
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     sending: "...در حال ارسال"
     cancel: "لغو"
     save: "ذخیره "
+#    create: "Create"
     delay_1_sec: "1 ثانیه"
     delay_3_sec: "3 ثانیه"
     delay_5_sec: "5 ثانیه"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
   login:
     sign_up: "ایجاد حساب کاربری"
     log_in: "ورود"
+#    logging_in: "Logging In"
     log_out: "خروج"
     recover: "بازیابی حساب کاربری"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee
index c750083fe..e6f05d307 100644
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee
index 7b0eae3b0..5797e343e 100644
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     sending: "Envoi..."
     cancel: "Annuler"
     save: "Sauvegarder"
+#    create: "Create"
     delay_1_sec: "1 seconde"
     delay_3_sec: "3 secondes"
     delay_5_sec: "5 secondes"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
   login:
     sign_up: "Créer un compte"
     log_in: "Connexion"
+#    logging_in: "Logging In"
     log_out: "Déconnexion"
     recover: "récupérer son compte"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     skip_tutorial: "Passer (esc)"
     editor_config: "Config de l'éditeur"
     editor_config_title: "Configuration de l'éditeur"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Raccourcis clavier"
     editor_config_keybindings_default: "Par défault (Ace)"
     editor_config_keybindings_description: "Ajouter de nouveaux raccourcis connus depuis l'éditeur commun."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     more_about_archmage: "En apprendre plus sur devenir un puissant archimage"
     archmage_subscribe_desc: "Recevoir un email sur les nouvelles possibilités de développement et des annonces."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
     artisan_introduction_pref: "Nous devons créer des niveaux additionnels! Les gens veulent plus de contenu, et nous ne pouvons pas tous les créer nous-mêmes. Maintenant votre station de travail est au niveau un ; notre éditeur de niveaux est à peine utilisable même par ses créateurs, donc méfiez-vous. Si vous avez des idées sur la boucle for de"
-    artisan_introduction_suf: "cette classe est faite pour vous."
+    artisan_introduction_suf: ", cette classe est faite pour vous."
     artisan_attribute_1: "Une expérience dans la création de contenu comme celui-ci serait un plus, comme utiliser l'éditeur de niveaux de Blizzard. Mais ce n'est pas nécessaire!"
     artisan_attribute_2: "Vous aspirez à faire beaucoup de tests et d'itérations. Pour faire de bons niveaux, vous aurez besoin de les proposer aux autres et les regarder les jouer, et être prêt à trouver un grand nombre de choses à corriger."
     artisan_attribute_3: "Pour l'heure, endurance en binôme avec un Aventurier. Notre éditeur de niveaux est vraiment préliminaire et frustrant à l'utilisation. Vous êtes prévenus!"
diff --git a/app/locale/he.coffee b/app/locale/he.coffee
index e3966af95..2281828a4 100644
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     sending: "...שולח"
     cancel: "ביטול"
     save: "שמור"
+#    create: "Create"
     delay_1_sec: "שניה אחת"
     delay_3_sec: "שלוש שניות"
     delay_5_sec: "חמש שניות"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
   login:
     sign_up: "הירשם"
     log_in: "היכנס"
+#    logging_in: "Logging In"
     log_out: "צא"
     recover: "שחזר סיסמה"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee
index 406135762..5165f38e2 100644
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee
index e162d61f6..2c8a626b3 100644
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     sending: "Küldés..."
     cancel: "Mégse"
     save: "Mentés"
+#    create: "Create"
     delay_1_sec: "1 másodperc"
     delay_3_sec: "3 másodperc"
     delay_5_sec: "5 másodperc"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
   login:
     sign_up: "Regisztráció"
     log_in: "Bejelentkezés"
+#    logging_in: "Logging In"
     log_out: "Kijelentkezés"
     recover: "meglévő fiók visszaállítása"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/id.coffee b/app/locale/id.coffee
index 1c9b3b97e..f142263d0 100644
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/it.coffee b/app/locale/it.coffee
index 0206d742d..f6ca3ad08 100644
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     sending: "Invio in corso..."
     cancel: "Annulla"
     save: "Salva"
+#    create: "Create"
     delay_1_sec: "1 secondo"
     delay_3_sec: "3 secondi"
     delay_5_sec: "5 secondi"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
   login:
     sign_up: "Crea account"
     log_in: "Accedi"
+#    logging_in: "Logging In"
     log_out: "Disconnetti"
     recover: "Recupera account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     skip_tutorial: "Salta (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     more_about_archmage: "Leggi di più su cosa vuol dire diventare un potente Arcimago"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index 0d2286c8f..f27bfce8f 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     sending: "送信中..."
     cancel: "キャンセル"
     save: "保存"
+#    create: "Create"
     delay_1_sec: "1秒"
     delay_3_sec: "3秒"
     delay_5_sec: "5秒"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
   login:
     sign_up: "アカウント登録"
     log_in: "ログイン"
+#    logging_in: "Logging In"
     log_out: "ログアウト"
     recover: "パスワードを忘れた場合はこちら"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee
index cac92fa8d..1508eeb7a 100644
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     sending: "보내는 중입니다..."
     cancel: "취소"
     save: "저장"
+#    create: "Create"
     delay_1_sec: "1초"
     delay_3_sec: "3초"
     delay_5_sec: "5초"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
   login:
     sign_up: "계정 생성"
     log_in: "로그인"
+#    logging_in: "Logging In"
     log_out: "로그아웃"
     recover: "계정 복구"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     skip_tutorial: "넘기기 (esc)"
     editor_config: "에디터 설정"
     editor_config_title: "에디터 설정"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "단축키 설정"
     editor_config_keybindings_default: "기본(Ace)"
     editor_config_keybindings_description: "일반적인 에디터와 마찬가지인 단축키 설정"
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee
index 962c8ee6b..c411cccbc 100644
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee
index 6be2a2396..25ed25c51 100644
--- a/app/locale/ms.coffee
+++ b/app/locale/ms.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     sending: "Menghantar maklumat.."
     cancel: "Batal"
     save: "Simpan data"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
   login:
     sign_up: "Buat Akaun"
     log_in: "Log Masuk"
+#    logging_in: "Logging In"
     log_out: "Log Keluar"
     recover: "Perbaharui Akaun"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee
index 19cefee72..b08126953 100644
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    sending: "Sending..."
     cancel: "Avbryt"
 #    save: "Save"
+#    create: "Create"
     delay_1_sec: "1 sekunder"
     delay_3_sec: "3 sekunder"
     delay_5_sec: "5 sekunder"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
   login:
     sign_up: "Lag konto"
     log_in: "Logg Inn"
+#    logging_in: "Logging In"
     log_out: "Logg Ut"
     recover: "gjenåpne konto"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee
index b790f13da..a4824a9eb 100644
--- a/app/locale/nl-BE.coffee
+++ b/app/locale/nl-BE.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     sending: "Verzenden..."
     cancel: "Annuleren"
     save: "Opslagen"
+    create: "Creëer"
     delay_1_sec: "1 seconde"
     delay_3_sec: "3 secondes"
     delay_5_sec: "5 secondes"
@@ -12,13 +13,13 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     fork: "Fork"
     play: "Spelen"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  units:
+    second: "seconde"
+    seconds: "seconden"
+    minute: "minuut"
+    minutes: "minuten"
+    hour: "uur"
+    hours: "uren"
 
   modal:
     close: "Sluiten"
@@ -39,19 +40,20 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     about: "Over Ons"
     contact: "Contact"
     twitter_follow: "Volgen"
-    employers: "Werknemers"
+    employers: "Werkgevers"
 
   versions:
     save_version_title: "Nieuwe versie opslagen"
     new_major_version: "Nieuwe hoofd versie"
-    cla_prefix: "Om bewerkingen op te slagen, moet je eerst akkoord gaan met onze"
+    cla_prefix: "Om bewerkingen op te slaan, moet je eerst akkoord gaan met onze"
     cla_url: "CLA"
     cla_suffix: "."
     cla_agree: "IK GA AKKOORD"
 
   login:
-    sign_up: "Account Maken"
+    sign_up: "Account maken"
     log_in: "Inloggen"
+    logging_in: "Bezig met inloggen"
     log_out: "Uitloggen"
     recover: "account herstellen"
 
@@ -60,7 +62,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     send_password: "Verzend nieuw wachtwoord"
 
   signup:
-    create_account_title: "Maak een account aan om je progressie op te slagen"
+    create_account_title: "Maak een account aan om je vooruitgang op te slaan"
     description: "Het is gratis. We hebben maar een paar dingen nodig en dan kan je aan de slag:"
     email_announcements: "Ontvang aankondigingen via email"
     coppa: "13+ of niet uit de VS"
@@ -78,7 +80,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     old_browser_suffix: "Je kan toch proberen, maar het zal waarschijnlijk niet werken!"
     campaign: "Campagne"
     for_beginners: "Voor Beginners"
-#    multiplayer: "Multiplayer"
+    multiplayer: "Multiplayer"
     for_developers: "Voor ontwikkelaars"
 
   play:
@@ -87,7 +89,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     adventurer_forum: "het Avonturiersforum"
     adventurer_suffix: "."
     campaign_beginner: "Beginnercampagne"
-    campaign_beginner_description: "... waarin je de toverkunst van programmeren leert."
+    campaign_beginner_description: "... waarin je de toverkunst van het programmeren leert."
     campaign_dev: "Willekeurige moeilijkere levels"
     campaign_dev_description: "... waarin je de interface leert kennen terwijl je wat moeilijkers doet."
     campaign_multiplayer: "Multiplayer Arena's"
@@ -96,7 +98,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     campaign_player_created_description: "... waarin je ten strijde trekt tegen de creativiteit van andere <a href=\"/contribute#artisan\">Ambachtelijke Tovenaars</a>."
     level_difficulty: "Moeilijkheidsgraad: "
     play_as: "Speel als "
-    spectate: "Schouw toe"
+    spectate: "Toeschouwen"
 
   contact:
     contact_us: "Contact opnemen met CodeCombat"
@@ -126,19 +128,19 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     spell: "Spreuk"
     boots: "Laarzen"
     hue: "Hue"
-    saturation: "Saturation"
-    lightness: "Lightness"
+    saturation: "Saturatie"
+    lightness: "Helderheid"
 
   account_settings:
     title: "Account Instellingen"
-    not_logged_in: "Log in of maak een account om je instellingen aan te passen."
+    not_logged_in: "Log in of maak een account aan om je instellingen aan te passen."
     autosave: "Aanpassingen Automatisch Opgeslagen"
     me_tab: "Ik"
     picture_tab: "Afbeelding"
     wizard_tab: "Tovenaar"
     password_tab: "Wachtwoord"
     emails_tab: "Emails"
-#    admin: "Admin"
+    admin: "Administrator"
     gravatar_select: "Selecteer welke Gravatar foto je wilt gebruiken"
     gravatar_add_photos: "Voeg thumbnails en foto's toe aan je Gravatar account, gekoppeld aan jouw email-adres, om een afbeelding te kiezen."
     gravatar_add_more_photos: "Voeg meer afbeeldingen toe aan je Gravatar account om ze hier te gebruiken."
@@ -151,8 +153,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     email_notifications_description: "Krijg periodieke meldingen voor jouw account."
     email_announcements_description: "Verkrijg emails over het laatste nieuws en de ontwikkelingen bij CodeCombat."
     contributor_emails: "Medewerker Klasse emails"
-    contribute_prefix: "We zoeken mensen om bij ons feest aan te voegen! Bekijk de "
-    contribute_page: "contributiepagina"
+    contribute_prefix: "We zoeken mensen om met ons te komen feesten! Bekijk de "
+    contribute_page: "bijdragepagina"
     contribute_suffix: " om meer te weten te komen."
     email_toggle: "Vink alles aan/af"
     error_saving: "Fout Tijdens Het Opslaan"
@@ -162,7 +164,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
   account_profile:
     edit_settings: "Instellingen Aanpassen"
     profile_for_prefix: "Profiel voor "
-#    profile_for_suffix: ""
+    profile_for_suffix: ""
     profile: "Profiel"
     user_not_found: "Geen gebruiker gevonden. Controleer de URL?"
     gravatar_not_found_mine: "We konden geen account vinden gekoppeld met:"
@@ -190,9 +192,9 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     reload_title: "Alle Code Herladen?"
     reload_really: "Weet je zeker dat je dit level tot het begin wilt herladen?"
     reload_confirm: "Herlaad Alles"
-#    victory_title_prefix: ""
+    victory_title_prefix: ""
     victory_title_suffix: " Compleet"
-    victory_sign_up: "Schrijf je in om je progressie op te slaan"
+    victory_sign_up: "Schrijf je in om je vooruitgang op te slaan"
     victory_sign_up_poke: "Wil je jouw code opslaan? Maak een gratis account aan!"
     victory_rate_the_level: "Beoordeel het level: "
     victory_rank_my_game: "Rankschik mijn Wedstrijd"
@@ -224,45 +226,47 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     skip_tutorial: "Overslaan (esc)"
     editor_config: "Editor Configuratie"
     editor_config_title: "Editor Configuratie"
+    editor_config_language_label: "Programmeertaal"
+    editor_config_language_description: "Definieer de programmeertaal waarin jij wilt programmeren."
     editor_config_keybindings_label: "Toets instellingen"
-#    editor_config_keybindings_default: "Default (Ace)"
+    editor_config_keybindings_default: "Standaard (Ace)"
     editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors."
     editor_config_invisibles_label: "Toon onzichtbare"
     editor_config_invisibles_description: "Toon onzichtbare whitespace karakters."
     editor_config_indentguides_label: "Toon inspringing regels"
     editor_config_indentguides_description: "Toon verticale hulplijnen om de zichtbaarheid te verbeteren."
     editor_config_behaviors_label: "Slim gedrag"
-    editor_config_behaviors_description: "Auto-aanvulling (gekrulde) haakjes en aanhalingstekens."
-#    loading_ready: "Ready!"
-#    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
-#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
-#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
-#    tip_guide_exists: "Click the guide at the top of the page for useful info."
-#    tip_open_source: "CodeCombat is 100% open source!"
-#    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
-#    tip_js_beginning: "JavaScript is just the beginning."
-#    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
-#    think_solution: "Think of the solution, not the problem."
-#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - 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_forums: "Head over to the forums and tell us what you think!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
-#    tip_morale_improves: "Loading will continue until morale improves."
-#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
+    editor_config_behaviors_description: "Automatisch aanvullen van (gekrulde) haakjes en aanhalingstekens."
+    loading_ready: "Klaar!"
+    tip_insert_positions: "Shift+Klik een punt op de kaart om het toe te voegen aan je spreuk editor."
+    tip_toggle_play: "Verwissel speel/pauze met Ctrl+P."
+    tip_scrub_shortcut: "Ctrl+[ en Ctrl+] om terug te spoelen en vooruit te spoelen."
+    tip_guide_exists: "Klik op de handleiding bovenaan het scherm voor nuttige informatie."
+    tip_open_source: "CodeCombat is 100% open source!"
+    tip_beta_launch: "CodeCombat lanceerde zijn beta versie in Oktober, 2013."
+    tip_js_beginning: "JavaScript is nog maar het begin."
+    tip_autocast_setting: "Verander de autocast instelling door te klikken op het tandwiel naast de cast knop."
+    think_solution: "Denk aan de oplossing, niet aan het probleem"
+    tip_theory_practice: "In theorie is er geen verschil tussen de theorie en de praktijk; in de praktijk is er wel een verschil. - Yogi Berra"
+    tip_error_free: "Er zijn twee manieren om fout-vrije code te schrijven, maar enkele de derde manier werkt. - Alan Perlis"
+    tip_debugging_program: "Als debuggen het proces is om bugs te verwijderen, dan moet programmeren het proces zijn om ze erin te stoppen. - Edsger W. Dijkstra"
+    tip_forums: "Ga naar de forums en vertel ons wat je denkt!"
+    tip_baby_coders: "Zelfs babies zullen in de toekomst een Tovenaar zijn."
+    tip_morale_improves: "Het spel zal blijven laden tot de moreel verbeterd."
+    tip_all_species: "Wij geloven in gelijke kansen voor alle wezens om te leren programmeren."
 #    tip_reticulating: "Reticulating spines."
-#    tip_harry: "Yer a Wizard, "
-#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
-#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
-#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
-#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
-#    time_current: "Now:"
-#    time_total: "Max:"
-#    time_goto: "Go to:"
+    tip_harry: "Je bent een tovenaar, "
+    tip_great_responsibility: "Met een groots talent voor programmeren komt een grootse debug verantwoordelijkheid."
+    tip_munchkin: "Als je je groentjes niet opeet zal een munchkin je ontvoeren terwijl je slaapt."
+    tip_binary: "Er zijn 10 soorten mensen in de wereld: Mensen die binair kunnen tellen en mensen die dat niet kunnen."
+    tip_commitment_yoda: "Een programmeur moet de grootste inzet hebben, een meest serieuze geest. ~ Yoda"
+    tip_no_try: "Doe het. Of doe het niet. Je kunt niet proberen. - Yoda"
+    tip_patience: "Geduld moet je hebben, jonge Padawan. - Yoda"
+    tip_documented_bug: "Een gedocumenteerde fout is geen fout; het is deel van het programma."
+    tip_impossible: "Het lijkt altijd onmogelijk tot het gedaan wordt. - Nelson Mandela"
+    time_current: "Nu:"
+    time_total: "Maximum:"
+    time_goto: "Ga naar:"
 
   admin:
     av_title: "Administrator panels"
@@ -273,7 +277,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     av_other_debug_base_url: "Base (om base.jade te debuggen)"
     u_title: "Gebruikerslijst"
     lg_title: "Laatste Spelletjes"
-#    clas: "CLAs"
+    clas: "CLAs"
 
   editor:
     main_title: "CodeCombat Editors"
@@ -281,10 +285,10 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     article_title: "Artikel Editor"
     article_description: "Schrijf artikels die spelers een overzicht geven over programmeer concepten die kunnen gebruikt worden over een variëteit van levels en campagnes."
     thang_title: "Thang Editor"
-    thang_description: "Maak eenheden, beschrijf hun standaard logica, graphics en audio. Momenteel is enkel het importeren van vector graphics geëxporteerd in Flash ondersteund."
+    thang_description: "Maak eenheden, beschrijf hun standaard logica, graphics en audio. Momenteel is enkel het importeren van vector graphics geëxporteerd uit Flash ondersteund."
     level_title: "Level Editor"
-    level_description: "Bevat het programma om te programmeren, audio te uploaden en aangepaste logica te creëren om alle soorten levels te maken. Het is alles wat wijzelf ook gebruiken!"
-    security_notice: "Veel belangrijke elementen in deze editors zijn momenteel niet actief. Met dat wij de veiligheid van deze systemen verbeteren, zullen ook deze elementen beschikbaar worden. Indien u deze elementen al eerder wil gebruiken, "
+    level_description: "Bevat de benodigdheden om scripts te schrijven, audio te uploaden en aangepaste logica te creëren om alle soorten levels te maken. Het is alles wat wij zelf ook gebruiken!"
+    security_notice: "Veel belangrijke elementen in deze editors zijn momenteel niet actief. Als wij de veiligheid van deze systemen verbeteren, zullen ook deze elementen beschikbaar worden. Indien u deze elementen al eerder wil gebruiken, "
     contact_us: "contacteer ons!"
     hipchat_prefix: "Je kan ons ook vinden in ons"
     hipchat_url: "(Engelstalig) HipChat kanaal."
@@ -301,7 +305,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     level_tab_thangs_add: "Voeg element toe"
     level_settings_title: "Instellingen"
     level_component_tab_title: "Huidige Componenten"
-    level_component_btn_new: "Maak een nieuw component aan"
+    level_component_btn_new: "Maak een nieuwe component aan"
     level_systems_tab_title: "Huidige Systemen"
     level_systems_btn_new: "Maak een nieuw systeem aan"
     level_systems_btn_add: "Voeg Systeem toe"
@@ -312,7 +316,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     level_component_settings: "Instellingen"
     level_system_edit_title: "Wijzig Systeem"
     create_system_title: "Maak een nieuw Systeem aan"
-    new_component_title: "Maak een nieuw Component aan"
+    new_component_title: "Maak een nieuwe Component aan"
     new_component_field_system: "Systeem"
     new_article_title: "Maak een Nieuw Artikel"
     new_thang_title: "Maak een Nieuw Thang Type"
@@ -348,7 +352,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     score: "Score"
     win: "Win"
     loss: "Verlies"
-    tie: "Gelijk"
+    tie: "Gelijkstand"
     easy: "Gemakkelijk"
     medium: "Medium"
     hard: "Moeilijk"
@@ -359,7 +363,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     who_description_prefix: "hebben samen CodeCombat opgericht in 2013. We creëerden ook "
     who_description_suffix: "en in 2008, groeide het uit tot de #1 web en iOS applicatie om Chinese en Japanse karakters te leren schrijven."
     who_description_ending: "Nu is het tijd om mensen te leren programmeren."
-    why_paragraph_1: "Tijdens het maken van Skritter wist George niet hoe hij moest programmeren en was hij constant gefrustreerd doordat hij zijn ideeën niet kon verwezelijken. Nadien probeerde hij te studeren maar de lessen gingen te traag. Ook zijn huisgenoot wou opnieuw studeren en stopte met lesgeven. Hij probeerde Codecademy maar was al snel \"verveeld\". Iedere week startte een andere vriend met Codecademy, met telkens als resultaat dat hij/zij vrij snel met de lessen stopte. We realiseerden ons dat het hetzelfde probleem was zoals we al eerder hadden opgelost met Skritter: mensen leren iets via langzame en intensieve lessen, terwijl ze het eigenlijk zo snel mogelijk nodig hebben via uitgebreide oefeningen. Wij weten hoe dat op te lossen."
+    why_paragraph_1: "Tijdens het maken van Skritter wist George niet hoe hij moest programmeren en was hij constant gefrustreerd doordat hij zijn ideeën niet kon verwezelijken. Nadien probeerde hij te studeren maar de lessen gingen te traag. Ook zijn huisgenoot wou opnieuw studeren en stopte met lesgeven. Hij probeerde Codecademy maar was al snel \"verveeld\". Iedere week startte een andere vriend met Codecademy, met telkens als resultaat dat hij/zij vrij snel met de lessen stopte. We realiseerden ons dat het hetzelfde probleem was zoals we al eerder hadden opgelost met Skritter: mensen leren iets via langzame en intensieve lessen, terwijl ze eigenlijk beter een snelle en uitgebreide opleiding nodig hebben. Wij weten hoe dat op te lossen."
     why_paragraph_2: "Wil je leren programmeren? Je hebt geen lessen nodig. Je moet vooral veel code schrijven en je amuseren terwijl je dit doet."
     why_paragraph_3_prefix: "Dat is waar programmeren om draait. Het moet tof zijn. Niet tof zoals"
     why_paragraph_3_italic: "joepie een medaille"
@@ -381,13 +385,13 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     opensource_intro: "CodeCombat is gratis en volledig open source."
     opensource_description_prefix: "Bekijk "
     github_url: "onze GitHub"
-    opensource_description_center: "en help ons als je wil! CodeCombat is gebouwd met de hulp van duizende open source projecten, en wij zijn er gek van. Bekijk ook "
+    opensource_description_center: "en help ons als je wil! CodeCombat is gebouwd met de hulp van tientallen open source projecten, en wij zijn er gek op. Bekijk ook "
     archmage_wiki_url: "onze Tovenaar wiki"
-    opensource_description_suffix: "voor een lijst van de software dat dit spel mogelijk maakt."
+    opensource_description_suffix: "voor een lijst van de software die dit spel mogelijk maakt."
     practices_title: "Goede Respectvolle gewoonten"
-    practices_description: "Dit zijn onze beloften aan u, de speler, en iets minder juridische jargon."
+    practices_description: "Dit zijn onze beloften aan u, de speler, in een iets minder juridische jargon."
     privacy_title: "Privacy"
-    privacy_description: "We zullen nooit jouw persoonlijke informatie verkopen. We willen geld verdienen dankzij aanwerving in verloop van tijd, maar je mag op je twee oren slapen dat wij nooit jouw persoonlijke informatie zullen verspreiden aan geïnteresseerde bedrijven zonder dat jij daar expliciet mee akkoord gaat."
+    privacy_description: "We zullen nooit jouw persoonlijke informatie verkopen. We willen in verloop van tijd geld verdienen dankzij aanwervingen, maar je mag op je beide oren slapen dat wij nooit jouw persoonlijke informatie zullen verspreiden aan geïnteresseerde bedrijven zonder dat jij daar expliciet mee akkoord gaat."
     security_title: "Beveiliging"
     security_description: "We streven ernaar om jouw persoonlijke informatie veilig te bewaren. Onze website is open en beschikbaar voor iedereen, opdat ons beveiliging systeem kan worden nagekeken en geoptimaliseerd door iedereen die dat wil. Dit alles is mogelijk doordat we volledig open source en transparant zijn."
     email_title: "E-mail"
@@ -399,7 +403,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     recruitment_title: "Aanwervingen"
     recruitment_description_prefix: "Hier bij CodeCombat, ga je ontplooien tot een krachtige tovenoor-niet enkel virtueel, maar ook in het echt."
     url_hire_programmers: "Niemand kan snel genoeg programmeurs aanwerven"
-    recruitment_description_suffix: "dus eenmaal je jouw vaardigheden hebt aangescherp en ermee akkoord gaat, zullen we jouw beste codeer prestaties voorstellen aan duizenden bedrijven die niet kunnen wachten om jou aan te werven. Zij betalen ons een beetje, maar betalen jou"
+    recruitment_description_suffix: "dus eenmaal je jouw vaardigheden hebt aangescherp en ermee akkoord gaat, zullen we jouw beste programmeer prestaties voorstellen aan duizenden werkgevers die niet kunnen wachten om jou aan te werven. Zij betalen ons een beetje, maar betalen jou"
     recruitment_description_italic: "enorm veel"
     recruitment_description_ending: "de site blijft volledig gratis en iedereen is gelukkig. Dat is het plan."
     copyrights_title: "Auteursrechten en licenties"
@@ -408,25 +412,25 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     cla_url: "CLA"
     contributor_description_suffix: "waarmee je moet akkoord gaan voordat wij jouw bijdragen kunnen gebruiken."
     code_title: "Code - MIT"
-    code_description_prefix: "Alle code in het bezit van CodeCombat of aanwezig op codecombat.com, zowel in de GitHub respository of in de codecombat.com database, is erkend onder de"
+    code_description_prefix: "Alle code in het bezit van CodeCombat of aanwezig op codecombat.com, zowel in de GitHub respository als in de codecombat.com database, is erkend onder de"
     mit_license_url: "MIT licentie"
-    code_description_suffix: "Dit geldt ook voor code in Systemen en Componenten dat publiekelijk is gemaakt met als doelstellingen het maken van levels."
+    code_description_suffix: "Dit geldt ook voor code in Systemen en Componenten dat publiek is gemaakt met als doel het maken van levels."
     art_title: "Art/Music - Creative Commons "
     art_description_prefix: "Alle gemeenschappelijke inhoud valt onder de"
     cc_license_url: "Creative Commons Attribution 4.0 Internationale Licentie"
-    art_description_suffix: "Gemeenschappelijke inhoud is alles dat algemeen verkrijgbaar is bij CodeCombat voor het doel levels te maken. Dit omvat:"
+    art_description_suffix: "Gemeenschappelijke inhoud is alles dat algemeen verkrijgbaar is bij CodeCombat met als doel levels te maken. Dit omvat:"
     art_music: "Muziek"
     art_sound: "Geluid"
-    art_artwork: "Artwork"
+    art_artwork: "Illustraties"
     art_sprites: "Sprites"
     art_other: "Eender wat en al het creatief werk dat niet als code aanzien wordt en verkrijgbaar is bij het aanmaken van levels."
-    art_access: "Momenteel is er geen universeel en gebruiksvriendelijk systeem voor het ophalen van deze assets. In het algemeen, worden deze opgehaald via de links zoals gebruikt door de website. Contacteer ons voor assitentie, of help ons met de website uit te breiden en de assets bereikbaarder te maken."
+    art_access: "Momenteel is er geen universeel en gebruiksvriendelijk systeem voor het ophalen van deze assets. In het algemeen, worden deze opgehaald via de links zoals gebruikt door de website. Contacteer ons voor assistentie, of help ons met de website uit te breiden en de assets bereikbaarder te maken."
     art_paragraph_1: "Voor toekenning, gelieve de naam en link naar codecombat.com te plaatsen waar dit passend is voor de vorm waarin het voorkomt. Bijvoorbeeld:"
     use_list_1: "Wanneer gebruikt in een film of een ander spel, voeg codecombat.com toe in de credits."
-    use_list_2: "Wanneer toegepast op een website, inclusief een link naar het gebruik, bijvoorbeeld onderaan een afbeelding. Of in een algemene webpagina waar je eventueel ook andere Create Commons werken en open source software vernoemd die je gebruikt op de website. Iets dat alreeds duidelijk is gespecificeerd met CodeCombat, zoals een blog artikel, dat CodeCombat vernoemt, heeft geen aparte vermelding nodig."
-    art_paragraph_2: "Wanneer de gebruikte inhoud is gemaakt door een gebruiker van codecombat.com, vernoem hem/haar in plaats van ons en volg verspreidingsaanwijzingen van die brons als die er zijn."
+    use_list_2: "Wanneer toegepast op een website, inclusief een link naar het gebruik, bijvoorbeeld onderaan een afbeelding. Of in een algemene webpagina waar je eventueel ook andere Creative Commons werken en open source software vernoemd die je gebruikt op de website. Iets dat al duidelijk gerelateerd is met CodeCombat, zoals een blog artikel dat CodeCombat vernoemd, heeft geen aparte vermelding nodig."
+    art_paragraph_2: "Wanneer de gebruikte inhoud is gemaakt door een gebruiker van codecombat.com, vernoem hem/haar in plaats van ons en volg toekenningsaanwijzingen als deze in de beschrijving van de bron staan."
     rights_title: "Rechten Voorbehouden"
-    rights_desc: "Alle rechten zijn voorbehouden voor de Levels. Dit omvat:"
+    rights_desc: "Alle rechten zijn voorbehouden voor de Levels zelf. Dit omvat:"
     rights_scripts: "Scripts"
     rights_unit: "Eenheid Configuratie"
     rights_description: "Beschrijvingen"
@@ -443,77 +447,77 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     introduction_desc_intro: "We hebben hoge verwachtingen over CodeCombat."
     introduction_desc_pref: "We willen zijn waar programmeurs van alle niveaus komen om te leren en samen te spelen, anderen introduceren aan de wondere wereld van code, en de beste delen van de gemeenschap te reflecteren. We kunnen en willen dit niet alleen doen; wat projecten zoals GitHub, Stack Overflow en Linux groots en succesvol maken, zijn de mensen die deze software gebruiken en verbeteren. Daartoe, "
     introduction_desc_github_url: "CodeCombat is volledig open source"
-    introduction_desc_suf: ", en we mikken ernaar om zoveel mogelijk manieren mogelijk maken voor u om deel te nemen en dit project van zowel jou als ons te maken."
+    introduction_desc_suf: ", en we streven ernaar om op zoveel mogelijk manieren het mogelijk te maken voor u om deel te nemen en dit project van zowel jou als ons te maken."
     introduction_desc_ending: "We hopen dat je met ons meedoet!"
     introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy en Glen"
     alert_account_message_intro: "Hallo!"
     alert_account_message_pref: "Om je te abonneren voor de klasse e-mails, moet je eerst "
     alert_account_message_suf: "."
     alert_account_message_create_url: "een account aanmaken"
-    archmage_summary: "Geïnteresserd in werken aan game graphics, user interface design, database- en serverorganisatie, multiplayer networking, physics, geluid of game engine prestaties? Wil jij helpen een game te bouwen wat anderen leert waar jij goed in bent? We moeten nog veel doen en als jij een ervaren programmeur bent en wil ontwikkelen voor CodeCombat, dan is dit de klasse voor jou. We zouden graag je hulp hebben bij het maken van de beste programmeergame ooit."
-    archmage_introduction: "Een van de beste aspecten aan het maken van spelletjes is dat zij zoveel verschillende zaken omvatten. Visualisaties, geluid, real-time netwerken, sociale netwerken, en natuurlijk veel van de voorkomende aspecten van programmeren, van low-level database beheer en server administratie tot gebruiksvriendelijke interfaces maken. Er is veel te doen, en als jij een ervaren programmeur bent met de motivatie om je handen veel te maken met CodeCombat, dan ben je de tovenaar die wij zoeken! We zouden graag jouw help hebben met het bouwen aan het allerbeste programmeerspel ooit."
+    archmage_summary: "Geïnteresserd in het werken aan game graphics, user interface design, database- en serverorganisatie, multiplayer networking, physics, geluid of game engine prestaties? Wil jij helpen een game te bouwen wat anderen leert waar jij goed in bent? We moeten nog veel doen en als jij een ervaren programmeur bent en wil ontwikkelen voor CodeCombat, dan is dit de klasse voor jou. We zouden graag je hulp hebben bij het maken van de beste programmeergame ooit."
+    archmage_introduction: "Een van de beste aspecten aan het maken van spelletjes is dat zij zoveel verschillende zaken omvatten. Visualisaties, geluid, real-time netwerken, sociale netwerken, en natuurlijk enkele veelvoorkomende aspecten van programmeren, van low-level database beheer en server administratie tot gebruiksvriendelijke interfaces maken. Er is veel te doen, en als jij een ervaren programmeur bent met de motivatie om je volledig te verdiepen in de details van CodeCombat, dan ben je de tovenaar die wij zoeken! We zouden graag jouw hulp krijgen bij het bouwen van het allerbeste programmeerspel ooit."
     class_attributes: "Klasse kenmerken"
     archmage_attribute_1_pref: "Ervaring met "
     archmage_attribute_1_suf: ", of de wil om het te leren. De meeste van onze code is in deze taal. Indien je een fan van Ruby of Python bent, zal je je meteen thuis voelen! Het is zoals JavaScript, maar met een mooiere syntax."
     archmage_attribute_2: "Ervaring in programmeren en individueel initiatief. We kunnen jou helpen bij het opstarten, maar kunnen niet veel tijd spenderen om je op te leiden."
     how_to_join: "Hoe deel te nemen"
     join_desc_1: "Iedereen kan helpen! Bekijk onze "
-    join_desc_2: "om te starten, en vink het vierkantje hieronder aan om jouzelf te abonneren als dappere tovenaar en het laatste magische nieuws te ontvangen. Wil je met ons praten over wat er te doen is of hoe je nog meer met ons kan samenwerken? "
+    join_desc_2: "om te starten, en vink het vierkantje hieronder aan om jezelf te abonneren als dappere tovenaar en het laatste magische nieuws te ontvangen. Wil je met ons praten over wat er te doen is of hoe je nog meer kunt helpen? "
     join_desc_3: ", of vind ons in "
     join_desc_4: "en we bekijken het verder vandaar!"
     join_url_email: "E-mail ons"
     join_url_hipchat: "ons publiek (Engelstalig) HipChat kanaal"
     more_about_archmage: "Leer meer over hoe je een Machtige Tovenaar kan worden"
-    archmage_subscribe_desc: "Ontvang e-mails met nieuwe codeer oppurtiniteiten en aankondigingen."
-    artisan_summary_pref: "Wil je levels ontwerpen en CodeCombat's arsenaal vergroten? Mensen spelen sneller door onze content dan wij bij kunnen houden! Op dit moment is onze level editor nog wat kaal, dus wees daarvan bewust. Levels maken zal een beetje uitdagend en buggy zijn. Als jij een visie van campagnes hebt van for-loops tot"
-    artisan_summary_suf: "dan is dit de klasse voor jou."
-    artisan_introduction_pref: "We moeten meer levels bouwen! Mensen schreeuwen om meer inhoud, en er zijn ook maar zoveel levels dat wij kunnen maken. Momenteel is jouw werkplaats level een; onze level editor is amper gebruikt door zelfs ons, wees dus voorzichtig. Indien je visioenen hebt van campagnes, gaande van for-loops tot"
-    artisan_introduction_suf: "dan is deze klasse waarschijnlijk iets voor jou."
-    artisan_attribute_1: "Enige ervaring in het maken van gelijkbare inhoud. Bijvoorbeeld ervaring het gebruiken van Blizzard's level editor. Maar dit is niet vereist!"
-    artisan_attribute_2: "Tot in detail testen en itereren staat voor jou gelijk aan plezier. Om goede levels te maken, moet jet het door anderen laten spelen en bereid zijn om een hele boel aan te passen."
-    artisan_attribute_3: "Momenteel heb je nog veel geduld nodig, doordat onze editor nog vrij ruw is en op je frustraties kan werken. Samenwerken met een Adventurer kan jou ook veel helpen."
-    artisan_join_desc: "Gebruik de Level Editor in deze volgorde, min of meer:"
+    archmage_subscribe_desc: "Ontvang e-mails met nieuwe programmeer mogelijkheden en aankondigingen."
+    artisan_summary_pref: "Wil je levels ontwerpen en CodeCombat's arsenaal vergroten? Mensen spelen sneller door onze content dan wij bij kunnen houden! Op dit moment is onze level editor nog wat beperkt, dus wees daarvan bewust. Het maken van levels zal een uitdaging zijn met een grote kans op fouten. Als jij een visie van campagnes hebt van for-loops tot"
+    artisan_summary_suf: ", dan is dit de klasse voor jou."
+    artisan_introduction_pref: "We moeten meer levels bouwen! Mensen schreeuwen om meer inhoud, en er zijn ook maar zoveel levels dat wij kunnen maken. Momenteel is jouw werkplaats level een; onze level editor wordt zelfs door ons amper gebruikt, dus wees voorzichtig. Indien je een visie hebt van een campagne, gaande van for-loops tot"
+    artisan_introduction_suf: ", dan is deze klasse waarschijnlijk iets voor jou."
+    artisan_attribute_1: "Enige ervaring in het maken van vergelijkbare inhoud. Bijvoorbeeld ervaring in het gebruiken van Blizzard's level editor. Maar dit is niet vereist!"
+    artisan_attribute_2: "Tot in het detail testen en opnieuw proberen staat voor jou gelijk aan plezier. Om goede levels te maken, moet je het door anderen laten spelen en bereid zijn om een hele boel aan te passen."
+    artisan_attribute_3: "Momenteel heb je nog veel geduld nodig, doordat onze editor nog vrij ruw is en op je zenuwen kan werken. Samenwerken met een Avonturier kan jou ook veel helpen."
+    artisan_join_desc: "Gebruik de Level Editor min of meer in deze volgorde:"
     artisan_join_step1: "Lees de documentatie."
     artisan_join_step2: "Maak een nieuw level en bestudeer reeds bestaande levels."
     artisan_join_step3: "Praat met ons in ons publieke (Engelstalige) HipChat kanaal voor hulp. (optioneel)"
     artisan_join_step4: "Maak een bericht over jouw level op ons forum voor feedback."
     more_about_artisan: "Leer meer over hoe je een Creatieve Ambachtsman kan worden."
     artisan_subscribe_desc: "Ontvang e-mails met nieuws over de Level Editor."
-    adventurer_summary: "Laten we duidelijk zijn over je rol: jij bent de tank. Jij krijgt de zware klappen te verduren. We hebben mensen nodig om spiksplinternieuwe levels te proberen en te kijken hoe deze beter kunnen. De pijn zal groot zijn, het maken van een goede game is een lang proces en niemand doet het de eerste keer goed. Als jij dit kan verduren en een hoge constitution score hebt, dan is dit de klasse voor jou."
-    adventurer_introduction: "Laten we duidelijk zijn over je rol: jij bent de tank. Jij krijgt de zware klappen te verduren. We hebben mensen nodig om spiksplinternieuwe levels te proberen en te kijken hoe deze beter kunnen. De pijn zal groot zijn, het maken van een goede game is een lang proces en niemand doet het de eerste keer goed. Als jij dit kan verduren en een hoge constitution score hebt, dan is dit de klasse voor jou."
+    adventurer_summary: "Laten we duidelijk zijn over je rol: jij bent de tank. Jij krijgt de zware klappen te verduren. We hebben mensen nodig om spiksplinternieuwe levels te proberen en te kijken hoe deze beter kunnen. Je zult veel afzien, want het maken van een goede game is een lang proces en niemand doet het de eerste keer goed. Als jij dit kan verduren en een hoog uihoudingsvermogen hebt, dan is dit de klasse voor jou."
+    adventurer_introduction: "Laten we duidelijk zijn over je rol: jij bent de tank. Jij krijgt de zware klappen te verduren. We hebben mensen nodig om spiksplinternieuwe levels uit te proberen en te kijken hoe deze beter kunnen. Je zult veel afzien.Het maken van een goede game is een lang proces en niemand doet het de eerste keer goed. Als jij dit kan verduren en een hoog uihoudingsvermogen hebt, dan is dit de klasse voor jou."
     adventurer_attribute_1: "Een wil om te leren. Jij wilt leren hoe je programmeert en wij willen het jou leren. Je zal overigens zelf het meeste leren doen."
     adventurer_attribute_2: "Charismatisch. Wees netjes maar duidelijk over wat er beter kan en geef suggesties over hoe het beter kan."
-    adventurer_join_pref: "Werk samen met een Ambachtsman of recruteer er een, of tik het veld hieronder aan om e-mails te ontvangen wanneer er nieuwe levels zijn om te testen. We zullen ook posten over levels die beoordeeld moeten worden op onze netwerken zoals"
+    adventurer_join_pref: "Werk samen met een Ambachtsman of recruteer er een, of tik het veld hieronder aan om e-mails te ontvangen wanneer er nieuwe levels zijn om te testen. We zullen ook berichten over levels die beoordeeld moeten worden op onze netwerken zoals"
     adventurer_forum_url: "ons forum"
     adventurer_join_suf: "dus als je liever op deze manier wordt geïnformeerd, schrijf je daar in!"
-    more_about_adventurer: "Leer meer over hoe je een dappere avonturier kunt worden."
+    more_about_adventurer: "Leer meer over hoe je een Dappere Avonturier kunt worden."
     adventurer_subscribe_desc: "Ontvang e-mails wanneer er nieuwe levels zijn die getest moeten worden."
-    scribe_summary_pref: "CodeCombat is meer dan slechts een aantal levels, het zal ook een bron van kennis kennis zijn en een wiki met programmeerconcepten waar levels op in kunnen gaan. Op die manier zal een Ambachtslied  een link kunnen geven naar een artikel wat past bij een level. Net zoiets als het  "
+    scribe_summary_pref: "CodeCombat is meer dan slechts een aantal levels, het zal ook een bron van kennis zijn die spelers kunnen nakijken. Op die manier zal een Ambachtsman een link kunnen geven naar een artikel dat past bij een level. Net zoiets als het "
     scribe_summary_suf: " heeft gebouwd. Als jij het leuk vindt programmeerconcepten uit te leggen, dan is deze klasse iets voor jou."
-    scribe_introduction_pref: "CodeCombat is meer dan slechts een aantal levels, het zal ook een bron van kennis kennis zijn en een wiki met programmeerconcepten waar levels op in kunnen gaan. Op die manier zal elk Ambachtslied niet in detail hoeven uit te leggen wat een vergelijkingsoperator is, maar een link kunnen geven naar een artikel wat deze informatie bevat voor de speler. Net zoiets als het  "
+    scribe_introduction_pref: "CodeCombat is meer dan slechts een aantal levels, het zal ook een bron van kennis zijn en een wiki met programmeerconcepten waar levels op in kunnen gaan. Op die manier zal niet elke Ambachtsman in detail hoeven uit te leggen wat een vergelijkingsoperator is, maar een link kunnen geven naar een artikel die deze informatie al verduidelijkt voor speler. Net zoiets als het "
     scribe_introduction_url_mozilla: "Mozilla Developer Network"
     scribe_introduction_suf: " heeft gebouwd. Als jij het leuk vindt om programmeerconcepten uit te leggen in Markdown-vorm, dan is deze klasse wellicht iets voor jou."
-    scribe_attribute_1: "Taal-skills zijn praktisch alles wat je nodig hebt. Niet alleen grammatica of spelling, maar ook moeilijke ideeën overbrengen aan anderen."
+    scribe_attribute_1: "Taalvaardigheid is praktisch alles wat je nodig hebt. Je moet niet enkel bedreven zijn in grammatica en spelling, maar ook moeilijke ideeën kunnen overbrengen aan anderen."
     contact_us_url: "Contacteer ons"
     scribe_join_description: "vertel ons wat over jezelf, je ervaring met programmeren en over wat voor soort dingen je graag zou schrijven. Verder zien we wel!"
     more_about_scribe: "Leer meer over het worden van een ijverige Klerk."
     scribe_subscribe_desc: "Ontvang e-mails met aankondigingen over het schrijven van artikelen."
-    diplomat_summary: "Er is grote interesse in CodeCombat in landen waar geen Engels wordt gesproken! We zijn op zoek naar vertalers wie tijd willen spenderen aan het vertalen van de site's corpus aan woorden zodat CodeCombat zo snel mogelijk toegankelijk wordt voor heel de wereld. Als jij wilt helpen met CodeCombat internationaal maken, dan is dit de klasse voor jou."
+    diplomat_summary: "Er is grote interesse voor CodeCombat in landen waar geen Engels wordt gesproken! We zijn op zoek naar vertalers die tijd willen spenderen aan het vertalen van de site's corpus aan woorden zodat CodeCombat zo snel mogelijk toegankelijk wordt voor de hele wereld. Als jij wilt helpen om CodeCombat internationaal maken, dan is dit de klasse voor jou."
     diplomat_introduction_pref: "Dus, als er iets is wat we geleerd hebben van de "
     diplomat_launch_url: "release in oktober"
-    diplomat_introduction_suf: "dan is het wel dat er een significante interesse is in CodeCombat in andere landen, vooral Brazilië! We zijn een corps aan vertalers aan het creëren dat ijverig de ene set woorden in een andere omzet om CodeCombat zo toegankelijk te maken als mogelijk in heel de wereld. Als jij het leuk vindt glimpsen op te vangen van aankomende content en deze levels zo snel mogelijk naar je landgenoten te krijgen, dan is dit de klasse voor jou."
-    diplomat_attribute_1: "Vloeiend Engels en de taal waar naar je wilt vertalen kunnen spreken. Wanneer je moeilijke ideeën wilt overbrengen, is het belangrijk beide goed te kunnen!"
+    diplomat_introduction_suf: "dan is het wel dat er een enorme belangstelling is voor CodeCombat in andere landen, vooral Brazilië! We zijn een groep van vertalers aan het creëren dat ijverig de ene set woorden in de andere omzet om CodeCombat zo toegankelijk mogelijk te maken in de hele wereld. Als jij het leuk vindt glimpsen op te vangen van aankomende content en deze levels zo snel mogelijk naar je landgenoten te krijgen, dan is dit de klasse voor jou."
+    diplomat_attribute_1: "Vloeiend Engels en de taal waar naar je wilt vertalen kunnen spreken. Wanneer je moeilijke ideeën wilt overbrengen, is het belangrijk beide talen goed te begrijpen!"
     diplomat_join_pref_github: "Vind van jouw taal het locale bestand "
     diplomat_github_url: "op GitHub"
     diplomat_join_suf_github: ", edit het online, en submit een pull request. Daarnaast kun je hieronder aanvinken als je up-to-date wilt worden gehouden met nieuwe internationalisatie-ontwikkelingen."
     more_about_diplomat: "Leer meer over het worden van een geweldige Diplomaat"
     diplomat_subscribe_desc: "Ontvang e-mails over i18n ontwikkelingen en levels om te vertalen."
     ambassador_summary: "We proberen een gemeenschap te bouwen en elke gemeenschap heeft een supportteam nodig wanneer er problemen zijn. We hebben chats, e-mails en sociale netwerken zodat onze gebruikers het spel kunnen leren kennen. Als jij mensen wilt helpen betrokken te raken, plezier te hebben en wat te leren programmeren, dan is dit wellicht de klasse voor jou."
-    ambassador_introduction: "We zijn een community aan het uitbouwen, en jij maakt er deel van uit. We hebben Olark chatkamers, emails, en soeciale netwerken met veel andere mensen waarmee je kan praten en hulp kan vragen over het spel en om bij te leren. Als jij mensen wil helpen en te werken nabij de hartslag van CodeCombat in het bijsturen van onze toekomstvisie, dan is dit de geknipte klasse voor jou!"
+    ambassador_introduction: "We zijn een gemeenschap aan het uitbouwen, en jij maakt er deel van uit. We hebben Olark chatkamers, emails, en sociale netwerken met veel andere mensen waarmee je kan praten en hulp aan kan vragen over het spel of om bij te leren. Als jij mensen wil helpen en te werken nabij de hartslag van CodeCombat in het bijsturen van onze toekomstvisie, dan is dit de geknipte klasse voor jou!"
     ambassador_attribute_1: "Communicatieskills. Problemen die spelers hebben kunnen identificeren en ze helpen deze op te lossen. Verder zul je ook de rest van ons geïnformeerd houden over wat de spelers zeggen, wat ze leuk vinden, wat ze minder vinden en waar er meer van moet zijn!"
     ambassador_join_desc: "vertel ons wat over jezelf, wat je hebt gedaan en wat je graag zou doen. We zien verder wel!"
     ambassador_join_note_strong: "Opmerking"
-    ambassador_join_note_desc: "Een van onze topprioriteiten is om een multiplayer te bouwen waar spelers die moeite hebben een level op te lossen een wizard met een hoger level kunnen oproepen om te helpen. Dit zal een goede manier zijn voor ambassadeurs om hun ding te doen. We houden je op de hoogte!"
+    ambassador_join_note_desc: "Een van onze topprioriteiten is om een multiplayer te bouwen waar spelers die moeite hebben een level op te lossen een tovenaar met een hoger level kunnen oproepen om te helpen. Dit zal een goede manier zijn voor ambassadeurs om hun ding te doen. We houden je op de hoogte!"
     more_about_ambassador: "Leer meer over het worden van een behulpzame Ambassadeur"
     ambassador_subscribe_desc: "Ontvang e-mails met updates over ondersteuning en multiplayer-ontwikkelingen."
     counselor_summary: "Geen van de rollen hierboven in jouw interessegebied? Maak je geen zorgen, we zijn op zoek naar iedereen die wil helpen met het ontwikkelen van CodeCombat! Als je geïnteresseerd bent in lesgeven, gameontwikkeling, open source management of iets anders waarvan je denkt dat het relevant voor ons is, dan is dit de klasse voor jou."
@@ -529,7 +533,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     creative_artisans: "Onze creatieve Ambachtslieden:"
     brave_adventurers: "Onze dappere Avonturiers:"
     translating_diplomats: "Onze vertalende Diplomaten:"
-    helpful_ambassadors: "Onze helpvolle Ambassadeurs:"
+    helpful_ambassadors: "Onze behulpzame Ambassadeurs:"
 
   classes:
     archmage_title: "Tovenaar"
@@ -554,8 +558,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     simulation_explanation: "Door spellen te simuleren kan je zelf sneller beoordeeld worden!"
     simulate_games: "Simuleer spellen!"
     simulate_all: "RESET EN SIMULEER SPELLEN"
-#    games_simulated_by: "Games simulated by you:"
-#    games_simulated_for: "Games simulated for you:"
+    games_simulated_by: "Door jou gesimuleerde spellen:"
+    games_simulated_for: "Voor jou gesimuleerde spellen:"
     leaderboard: "Leaderboard"
     battle_as: "Vecht als "
     summary_your: "Jouw "
@@ -575,7 +579,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     tutorial_play: "Speel de Tutorial"
     tutorial_recommended: "Aanbevolen als je nog niet eerder hebt gespeeld"
     tutorial_skip: "Sla Tutorial over"
-    tutorial_not_sure: "Niet zeker wat er aan de gang is?"
+    tutorial_not_sure: "Niet zeker wat er aan de hand is?"
     tutorial_play_first: "Speel eerst de Tutorial."
     simple_ai: "Simpele AI"
     warmup: "Opwarming"
@@ -583,14 +587,14 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 
   multiplayer_launch:
     introducing_dungeon_arena: "Introductie van Dungeon Arena"
-    new_way: "De nieuwe manier om te concurreren met code."
+    new_way: "17 maart, 2014: De nieuwe manier om te concurreren met code."
     to_battle: "Naar het slagveld, ontwikkelaars!"
-    modern_day_sorcerer: "Kan jij programmeren? Hoe stoer is dat. Jij bent een modere voetballer! is het niet tijd dat je jouw magische krachten gebruikt voor het controlleren van jou minions in het slagveld? En nee, we praten heir niet over robots."
-    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."
-    ladder_explanation: "Kies jouw helden, betover jouw mens of ogre legers, en beklim jouw weg naar de top in de ladder, door het verslagen van vriend en vijand. Daag nu je vrienden uit in multiplayer coding arenas en verkrijg faam en glorie. Indien je creatief bent, kan je zelfs"
+    modern_day_sorcerer: "Kan jij programmeren? Dat is pas stoer. Jij bent een modere tovenaar! Is het niet tijd dat je jouw magische krachten gebruikt voor het besturen van jou minions in het slagveld? En nee, we praten hier niet over robots."
+    arenas_are_here: "CodeCombat's kop aan kop multiplayer arena's zijn er."
+    ladder_explanation: "Kies jouw helden, betover jouw mensen of ogre legers, en beklim jouw weg naar de top in de ladder, door het verslagen van vriend en vijand. Daag nu je vrienden uit in de multiplayer programmeer arena's en verdien eeuwige roem. Indien je creatief bent, kan je zelfs"
     fork_our_arenas: "onze arenas forken"
     create_worlds: "en jouw eigen werelden creëren."
-    javascript_rusty: "Jouw JavaScript is een beetje roest? Wees niet bang, er is een"
+    javascript_rusty: "Jouw JavaScript is een beetje roestig? Wees niet bang, er is een"
     tutorial: "tutorial"
     new_to_programming: ". Ben je net begonnen met programmeren? Speel dan eerst onze beginners campagne."
     so_ready: "Ik ben hier zo klaar voor"
diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee
index f813bc8aa..3664ba69d 100644
--- a/app/locale/nl-NL.coffee
+++ b/app/locale/nl-NL.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     sending: "Verzenden..."
     cancel: "Annuleren"
     save: "Opslagen"
+    create: "Creëer"
     delay_1_sec: "1 seconde"
     delay_3_sec: "3 secondes"
     delay_5_sec: "5 secondes"
@@ -12,13 +13,13 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     fork: "Fork"
     play: "Spelen"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  units:
+    second: "seconde"
+    seconds: "seconden"
+    minute: "minuut"
+    minutes: "minuten"
+    hour: "uur"
+    hours: "uren"
 
   modal:
     close: "Sluiten"
@@ -39,19 +40,20 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     about: "Over Ons"
     contact: "Contact"
     twitter_follow: "Volgen"
-    employers: "Werknemers"
+    employers: "Werkgevers"
 
   versions:
     save_version_title: "Nieuwe versie opslagen"
     new_major_version: "Nieuwe hoofd versie"
-    cla_prefix: "Om bewerkingen op te slagen, moet je eerst akkoord gaan met onze"
+    cla_prefix: "Om bewerkingen op te slaan, moet je eerst akkoord gaan met onze"
     cla_url: "CLA"
     cla_suffix: "."
     cla_agree: "IK GA AKKOORD"
 
   login:
-    sign_up: "Account Maken"
+    sign_up: "Account maken"
     log_in: "Inloggen"
+    logging_in: "Bezig met inloggen"
     log_out: "Uitloggen"
     recover: "account herstellen"
 
@@ -60,7 +62,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     send_password: "Verzend nieuw wachtwoord"
 
   signup:
-    create_account_title: "Maak een account aan om je progressie op te slagen"
+    create_account_title: "Maak een account aan om je vooruitgang op te slaan"
     description: "Het is gratis. We hebben maar een paar dingen nodig en dan kan je aan de slag:"
     email_announcements: "Ontvang aankondigingen via email"
     coppa: "13+ of niet uit de VS"
@@ -78,7 +80,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     old_browser_suffix: "Je kan toch proberen, maar het zal waarschijnlijk niet werken!"
     campaign: "Campagne"
     for_beginners: "Voor Beginners"
-#    multiplayer: "Multiplayer"
+    multiplayer: "Multiplayer"
     for_developers: "Voor ontwikkelaars"
 
   play:
@@ -87,7 +89,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     adventurer_forum: "het Avonturiersforum"
     adventurer_suffix: "."
     campaign_beginner: "Beginnercampagne"
-    campaign_beginner_description: "... waarin je de toverkunst van programmeren leert."
+    campaign_beginner_description: "... waarin je de toverkunst van het programmeren leert."
     campaign_dev: "Willekeurige moeilijkere levels"
     campaign_dev_description: "... waarin je de interface leert kennen terwijl je wat moeilijkers doet."
     campaign_multiplayer: "Multiplayer Arena's"
@@ -96,7 +98,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     campaign_player_created_description: "... waarin je ten strijde trekt tegen de creativiteit van andere <a href=\"/contribute#artisan\">Ambachtelijke Tovenaars</a>."
     level_difficulty: "Moeilijkheidsgraad: "
     play_as: "Speel als "
-    spectate: "Schouw toe"
+    spectate: "Toeschouwen"
 
   contact:
     contact_us: "Contact opnemen met CodeCombat"
@@ -126,19 +128,19 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     spell: "Spreuk"
     boots: "Laarzen"
     hue: "Hue"
-    saturation: "Saturation"
-    lightness: "Lightness"
+    saturation: "Saturatie"
+    lightness: "Helderheid"
 
   account_settings:
     title: "Account Instellingen"
-    not_logged_in: "Log in of maak een account om je instellingen aan te passen."
+    not_logged_in: "Log in of maak een account aan om je instellingen aan te passen."
     autosave: "Aanpassingen Automatisch Opgeslagen"
     me_tab: "Ik"
     picture_tab: "Afbeelding"
     wizard_tab: "Tovenaar"
     password_tab: "Wachtwoord"
     emails_tab: "Emails"
-#    admin: "Admin"
+    admin: "Administrator"
     gravatar_select: "Selecteer welke Gravatar foto je wilt gebruiken"
     gravatar_add_photos: "Voeg thumbnails en foto's toe aan je Gravatar account, gekoppeld aan jouw email-adres, om een afbeelding te kiezen."
     gravatar_add_more_photos: "Voeg meer afbeeldingen toe aan je Gravatar account om ze hier te gebruiken."
@@ -151,8 +153,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     email_notifications_description: "Krijg periodieke meldingen voor jouw account."
     email_announcements_description: "Verkrijg emails over het laatste nieuws en de ontwikkelingen bij CodeCombat."
     contributor_emails: "Medewerker Klasse emails"
-    contribute_prefix: "We zoeken mensen om bij ons feest aan te voegen! Bekijk de "
-    contribute_page: "contributiepagina"
+    contribute_prefix: "We zoeken mensen om met ons te komen feesten! Bekijk de "
+    contribute_page: "bijdragepagina"
     contribute_suffix: " om meer te weten te komen."
     email_toggle: "Vink alles aan/af"
     error_saving: "Fout Tijdens Het Opslaan"
@@ -162,7 +164,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
   account_profile:
     edit_settings: "Instellingen Aanpassen"
     profile_for_prefix: "Profiel voor "
-#    profile_for_suffix: ""
+    profile_for_suffix: ""
     profile: "Profiel"
     user_not_found: "Geen gebruiker gevonden. Controleer de URL?"
     gravatar_not_found_mine: "We konden geen account vinden gekoppeld met:"
@@ -190,9 +192,9 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     reload_title: "Alle Code Herladen?"
     reload_really: "Weet je zeker dat je dit level tot het begin wilt herladen?"
     reload_confirm: "Herlaad Alles"
-#    victory_title_prefix: ""
+    victory_title_prefix: ""
     victory_title_suffix: " Compleet"
-    victory_sign_up: "Schrijf je in om je progressie op te slaan"
+    victory_sign_up: "Schrijf je in om je vooruitgang op te slaan"
     victory_sign_up_poke: "Wil je jouw code opslaan? Maak een gratis account aan!"
     victory_rate_the_level: "Beoordeel het level: "
     victory_rank_my_game: "Rankschik mijn Wedstrijd"
@@ -224,45 +226,47 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     skip_tutorial: "Overslaan (esc)"
     editor_config: "Editor Configuratie"
     editor_config_title: "Editor Configuratie"
+    editor_config_language_label: "Programmeertaal"
+    editor_config_language_description: "Definieer de programmeertaal waarin jij wilt programmeren."
     editor_config_keybindings_label: "Toets instellingen"
-#    editor_config_keybindings_default: "Default (Ace)"
+    editor_config_keybindings_default: "Standaard (Ace)"
     editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors."
     editor_config_invisibles_label: "Toon onzichtbare"
     editor_config_invisibles_description: "Toon onzichtbare whitespace karakters."
     editor_config_indentguides_label: "Toon inspringing regels"
     editor_config_indentguides_description: "Toon verticale hulplijnen om de zichtbaarheid te verbeteren."
     editor_config_behaviors_label: "Slim gedrag"
-    editor_config_behaviors_description: "Auto-aanvulling (gekrulde) haakjes en aanhalingstekens."
-#    loading_ready: "Ready!"
-#    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
-#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
-#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
-#    tip_guide_exists: "Click the guide at the top of the page for useful info."
-#    tip_open_source: "CodeCombat is 100% open source!"
-#    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
-#    tip_js_beginning: "JavaScript is just the beginning."
-#    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
-#    think_solution: "Think of the solution, not the problem."
-#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - 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_forums: "Head over to the forums and tell us what you think!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
-#    tip_morale_improves: "Loading will continue until morale improves."
-#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
+    editor_config_behaviors_description: "Automatisch aanvullen van (gekrulde) haakjes en aanhalingstekens."
+    loading_ready: "Klaar!"
+    tip_insert_positions: "Shift+Klik een punt op de kaart om het toe te voegen aan je spreuk editor."
+    tip_toggle_play: "Verwissel speel/pauze met Ctrl+P."
+    tip_scrub_shortcut: "Ctrl+[ en Ctrl+] om terug te spoelen en vooruit te spoelen."
+    tip_guide_exists: "Klik op de handleiding bovenaan het scherm voor nuttige informatie."
+    tip_open_source: "CodeCombat is 100% open source!"
+    tip_beta_launch: "CodeCombat lanceerde zijn beta versie in Oktober, 2013."
+    tip_js_beginning: "JavaScript is nog maar het begin."
+    tip_autocast_setting: "Verander de autocast instelling door te klikken op het tandwiel naast de cast knop."
+    think_solution: "Denk aan de oplossing, niet aan het probleem"
+    tip_theory_practice: "In theorie is er geen verschil tussen de theorie en de praktijk; in de praktijk is er wel een verschil. - Yogi Berra"
+    tip_error_free: "Er zijn twee manieren om fout-vrije code te schrijven, maar enkele de derde manier werkt. - Alan Perlis"
+    tip_debugging_program: "Als debuggen het proces is om bugs te verwijderen, dan moet programmeren het proces zijn om ze erin te stoppen. - Edsger W. Dijkstra"
+    tip_forums: "Ga naar de forums en vertel ons wat je denkt!"
+    tip_baby_coders: "Zelfs babies zullen in de toekomst een Tovenaar zijn."
+    tip_morale_improves: "Het spel zal blijven laden tot de moreel verbeterd."
+    tip_all_species: "Wij geloven in gelijke kansen voor alle wezens om te leren programmeren."
 #    tip_reticulating: "Reticulating spines."
-#    tip_harry: "Yer a Wizard, "
-#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
-#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
-#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
-#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
-#    time_current: "Now:"
-#    time_total: "Max:"
-#    time_goto: "Go to:"
+    tip_harry: "Je bent een tovenaar, "
+    tip_great_responsibility: "Met een groots talent voor programmeren komt een grootse debug verantwoordelijkheid."
+    tip_munchkin: "Als je je groentjes niet opeet zal een munchkin je ontvoeren terwijl je slaapt."
+    tip_binary: "Er zijn 10 soorten mensen in de wereld: Mensen die binair kunnen tellen en mensen die dat niet kunnen."
+    tip_commitment_yoda: "Een programmeur moet de grootste inzet hebben, een meest serieuze geest. ~ Yoda"
+    tip_no_try: "Doe het. Of doe het niet. Je kunt niet proberen. - Yoda"
+    tip_patience: "Geduld moet je hebben, jonge Padawan. - Yoda"
+    tip_documented_bug: "Een gedocumenteerde fout is geen fout; het is deel van het programma."
+    tip_impossible: "Het lijkt altijd onmogelijk tot het gedaan wordt. - Nelson Mandela"
+    time_current: "Nu:"
+    time_total: "Maximum:"
+    time_goto: "Ga naar:"
 
   admin:
     av_title: "Administrator panels"
@@ -273,7 +277,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     av_other_debug_base_url: "Base (om base.jade te debuggen)"
     u_title: "Gebruikerslijst"
     lg_title: "Laatste Spelletjes"
-#    clas: "CLAs"
+    clas: "CLAs"
 
   editor:
     main_title: "CodeCombat Editors"
@@ -281,10 +285,10 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     article_title: "Artikel Editor"
     article_description: "Schrijf artikels die spelers een overzicht geven over programmeer concepten die kunnen gebruikt worden over een variëteit van levels en campagnes."
     thang_title: "Thang Editor"
-    thang_description: "Maak eenheden, beschrijf hun standaard logica, graphics en audio. Momenteel is enkel het importeren van vector graphics geëxporteerd in Flash ondersteund."
+    thang_description: "Maak eenheden, beschrijf hun standaard logica, graphics en audio. Momenteel is enkel het importeren van vector graphics geëxporteerd uit Flash ondersteund."
     level_title: "Level Editor"
-    level_description: "Bevat het programma om te programmeren, audio te uploaden en aangepaste logica te creëren om alle soorten levels te maken. Het is alles wat wijzelf ook gebruiken!"
-    security_notice: "Veel belangrijke elementen in deze editors zijn momenteel niet actief. Met dat wij de veiligheid van deze systemen verbeteren, zullen ook deze elementen beschikbaar worden. Indien u deze elementen al eerder wil gebruiken, "
+    level_description: "Bevat de benodigdheden om scripts te schrijven, audio te uploaden en aangepaste logica te creëren om alle soorten levels te maken. Het is alles wat wij zelf ook gebruiken!"
+    security_notice: "Veel belangrijke elementen in deze editors zijn momenteel niet actief. Als wij de veiligheid van deze systemen verbeteren, zullen ook deze elementen beschikbaar worden. Indien u deze elementen al eerder wil gebruiken, "
     contact_us: "contacteer ons!"
     hipchat_prefix: "Je kan ons ook vinden in ons"
     hipchat_url: "(Engelstalig) HipChat kanaal."
@@ -301,7 +305,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     level_tab_thangs_add: "Voeg element toe"
     level_settings_title: "Instellingen"
     level_component_tab_title: "Huidige Componenten"
-    level_component_btn_new: "Maak een nieuw component aan"
+    level_component_btn_new: "Maak een nieuwe component aan"
     level_systems_tab_title: "Huidige Systemen"
     level_systems_btn_new: "Maak een nieuw systeem aan"
     level_systems_btn_add: "Voeg Systeem toe"
@@ -312,7 +316,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     level_component_settings: "Instellingen"
     level_system_edit_title: "Wijzig Systeem"
     create_system_title: "Maak een nieuw Systeem aan"
-    new_component_title: "Maak een nieuw Component aan"
+    new_component_title: "Maak een nieuwe Component aan"
     new_component_field_system: "Systeem"
     new_article_title: "Maak een Nieuw Artikel"
     new_thang_title: "Maak een Nieuw Thang Type"
@@ -348,7 +352,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     score: "Score"
     win: "Win"
     loss: "Verlies"
-    tie: "Gelijk"
+    tie: "Gelijkstand"
     easy: "Gemakkelijk"
     medium: "Medium"
     hard: "Moeilijk"
@@ -359,7 +363,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     who_description_prefix: "hebben samen CodeCombat opgericht in 2013. We creëerden ook "
     who_description_suffix: "en in 2008, groeide het uit tot de #1 web en iOS applicatie om Chinese en Japanse karakters te leren schrijven."
     who_description_ending: "Nu is het tijd om mensen te leren programmeren."
-    why_paragraph_1: "Tijdens het maken van Skritter wist George niet hoe hij moest programmeren en was hij constant gefrustreerd doordat hij zijn ideeën niet kon verwezelijken. Nadien probeerde hij te studeren maar de lessen gingen te traag. Ook zijn huisgenoot wou opnieuw studeren en stopte met lesgeven. Hij probeerde Codecademy maar was al snel \"verveeld\". Iedere week startte een andere vriend met Codecademy, met telkens als resultaat dat hij/zij vrij snel met de lessen stopte. We realiseerden ons dat het hetzelfde probleem was zoals we al eerder hadden opgelost met Skritter: mensen leren iets via langzame en intensieve lessen, terwijl ze het eigenlijk zo snel mogelijk nodig hebben via uitgebreide oefeningen. Wij weten hoe dat op te lossen."
+    why_paragraph_1: "Tijdens het maken van Skritter wist George niet hoe hij moest programmeren en was hij constant gefrustreerd doordat hij zijn ideeën niet kon verwezelijken. Nadien probeerde hij te studeren maar de lessen gingen te traag. Ook zijn huisgenoot wou opnieuw studeren en stopte met lesgeven. Hij probeerde Codecademy maar was al snel \"verveeld\". Iedere week startte een andere vriend met Codecademy, met telkens als resultaat dat hij/zij vrij snel met de lessen stopte. We realiseerden ons dat het hetzelfde probleem was zoals we al eerder hadden opgelost met Skritter: mensen leren iets via langzame en intensieve lessen, terwijl ze eigenlijk beter een snelle en uitgebreide opleiding nodig hebben. Wij weten hoe dat op te lossen."
     why_paragraph_2: "Wil je leren programmeren? Je hebt geen lessen nodig. Je moet vooral veel code schrijven en je amuseren terwijl je dit doet."
     why_paragraph_3_prefix: "Dat is waar programmeren om draait. Het moet tof zijn. Niet tof zoals"
     why_paragraph_3_italic: "joepie een medaille"
@@ -381,13 +385,13 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     opensource_intro: "CodeCombat is gratis en volledig open source."
     opensource_description_prefix: "Bekijk "
     github_url: "onze GitHub"
-    opensource_description_center: "en help ons als je wil! CodeCombat is gebouwd met de hulp van duizende open source projecten, en wij zijn er gek van. Bekijk ook "
+    opensource_description_center: "en help ons als je wil! CodeCombat is gebouwd met de hulp van tientallen open source projecten, en wij zijn er gek op. Bekijk ook "
     archmage_wiki_url: "onze Tovenaar wiki"
-    opensource_description_suffix: "voor een lijst van de software dat dit spel mogelijk maakt."
+    opensource_description_suffix: "voor een lijst van de software die dit spel mogelijk maakt."
     practices_title: "Goede Respectvolle gewoonten"
-    practices_description: "Dit zijn onze beloften aan u, de speler, en iets minder juridische jargon."
+    practices_description: "Dit zijn onze beloften aan u, de speler, in een iets minder juridische jargon."
     privacy_title: "Privacy"
-    privacy_description: "We zullen nooit jouw persoonlijke informatie verkopen. We willen geld verdienen dankzij aanwerving in verloop van tijd, maar je mag op je twee oren slapen dat wij nooit jouw persoonlijke informatie zullen verspreiden aan geïnteresseerde bedrijven zonder dat jij daar expliciet mee akkoord gaat."
+    privacy_description: "We zullen nooit jouw persoonlijke informatie verkopen. We willen in verloop van tijd geld verdienen dankzij aanwervingen, maar je mag op je beide oren slapen dat wij nooit jouw persoonlijke informatie zullen verspreiden aan geïnteresseerde bedrijven zonder dat jij daar expliciet mee akkoord gaat."
     security_title: "Beveiliging"
     security_description: "We streven ernaar om jouw persoonlijke informatie veilig te bewaren. Onze website is open en beschikbaar voor iedereen, opdat ons beveiliging systeem kan worden nagekeken en geoptimaliseerd door iedereen die dat wil. Dit alles is mogelijk doordat we volledig open source en transparant zijn."
     email_title: "E-mail"
@@ -399,7 +403,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     recruitment_title: "Aanwervingen"
     recruitment_description_prefix: "Hier bij CodeCombat, ga je ontplooien tot een krachtige tovenoor-niet enkel virtueel, maar ook in het echt."
     url_hire_programmers: "Niemand kan snel genoeg programmeurs aanwerven"
-    recruitment_description_suffix: "dus eenmaal je jouw vaardigheden hebt aangescherp en ermee akkoord gaat, zullen we jouw beste codeer prestaties voorstellen aan duizenden bedrijven die niet kunnen wachten om jou aan te werven. Zij betalen ons een beetje, maar betalen jou"
+    recruitment_description_suffix: "dus eenmaal je jouw vaardigheden hebt aangescherp en ermee akkoord gaat, zullen we jouw beste programmeer prestaties voorstellen aan duizenden werkgevers die niet kunnen wachten om jou aan te werven. Zij betalen ons een beetje, maar betalen jou"
     recruitment_description_italic: "enorm veel"
     recruitment_description_ending: "de site blijft volledig gratis en iedereen is gelukkig. Dat is het plan."
     copyrights_title: "Auteursrechten en licenties"
@@ -408,25 +412,25 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     cla_url: "CLA"
     contributor_description_suffix: "waarmee je moet akkoord gaan voordat wij jouw bijdragen kunnen gebruiken."
     code_title: "Code - MIT"
-    code_description_prefix: "Alle code in het bezit van CodeCombat of aanwezig op codecombat.com, zowel in de GitHub respository of in de codecombat.com database, is erkend onder de"
+    code_description_prefix: "Alle code in het bezit van CodeCombat of aanwezig op codecombat.com, zowel in de GitHub respository als in de codecombat.com database, is erkend onder de"
     mit_license_url: "MIT licentie"
-    code_description_suffix: "Dit geldt ook voor code in Systemen en Componenten dat publiekelijk is gemaakt met als doelstellingen het maken van levels."
+    code_description_suffix: "Dit geldt ook voor code in Systemen en Componenten dat publiek is gemaakt met als doel het maken van levels."
     art_title: "Art/Music - Creative Commons "
     art_description_prefix: "Alle gemeenschappelijke inhoud valt onder de"
     cc_license_url: "Creative Commons Attribution 4.0 Internationale Licentie"
-    art_description_suffix: "Gemeenschappelijke inhoud is alles dat algemeen verkrijgbaar is bij CodeCombat voor het doel levels te maken. Dit omvat:"
+    art_description_suffix: "Gemeenschappelijke inhoud is alles dat algemeen verkrijgbaar is bij CodeCombat met als doel levels te maken. Dit omvat:"
     art_music: "Muziek"
     art_sound: "Geluid"
-    art_artwork: "Artwork"
+    art_artwork: "Illustraties"
     art_sprites: "Sprites"
     art_other: "Eender wat en al het creatief werk dat niet als code aanzien wordt en verkrijgbaar is bij het aanmaken van levels."
-    art_access: "Momenteel is er geen universeel en gebruiksvriendelijk systeem voor het ophalen van deze assets. In het algemeen, worden deze opgehaald via de links zoals gebruikt door de website. Contacteer ons voor assitentie, of help ons met de website uit te breiden en de assets bereikbaarder te maken."
+    art_access: "Momenteel is er geen universeel en gebruiksvriendelijk systeem voor het ophalen van deze assets. In het algemeen, worden deze opgehaald via de links zoals gebruikt door de website. Contacteer ons voor assistentie, of help ons met de website uit te breiden en de assets bereikbaarder te maken."
     art_paragraph_1: "Voor toekenning, gelieve de naam en link naar codecombat.com te plaatsen waar dit passend is voor de vorm waarin het voorkomt. Bijvoorbeeld:"
     use_list_1: "Wanneer gebruikt in een film of een ander spel, voeg codecombat.com toe in de credits."
-    use_list_2: "Wanneer toegepast op een website, inclusief een link naar het gebruik, bijvoorbeeld onderaan een afbeelding. Of in een algemene webpagina waar je eventueel ook andere Create Commons werken en open source software vernoemd die je gebruikt op de website. Iets dat alreeds duidelijk is gespecificeerd met CodeCombat, zoals een blog artikel, dat CodeCombat vernoemt, heeft geen aparte vermelding nodig."
-    art_paragraph_2: "Wanneer de gebruikte inhoud is gemaakt door een gebruiker van codecombat.com, vernoem hem/haar in plaats van ons en volg verspreidingsaanwijzingen van die brons als die er zijn."
+    use_list_2: "Wanneer toegepast op een website, inclusief een link naar het gebruik, bijvoorbeeld onderaan een afbeelding. Of in een algemene webpagina waar je eventueel ook andere Creative Commons werken en open source software vernoemd die je gebruikt op de website. Iets dat al duidelijk gerelateerd is met CodeCombat, zoals een blog artikel dat CodeCombat vernoemd, heeft geen aparte vermelding nodig."
+    art_paragraph_2: "Wanneer de gebruikte inhoud is gemaakt door een gebruiker van codecombat.com, vernoem hem/haar in plaats van ons en volg toekenningsaanwijzingen als deze in de beschrijving van de bron staan."
     rights_title: "Rechten Voorbehouden"
-    rights_desc: "Alle rechten zijn voorbehouden voor de Levels. Dit omvat:"
+    rights_desc: "Alle rechten zijn voorbehouden voor de Levels zelf. Dit omvat:"
     rights_scripts: "Scripts"
     rights_unit: "Eenheid Configuratie"
     rights_description: "Beschrijvingen"
@@ -443,77 +447,77 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     introduction_desc_intro: "We hebben hoge verwachtingen over CodeCombat."
     introduction_desc_pref: "We willen zijn waar programmeurs van alle niveaus komen om te leren en samen te spelen, anderen introduceren aan de wondere wereld van code, en de beste delen van de gemeenschap te reflecteren. We kunnen en willen dit niet alleen doen; wat projecten zoals GitHub, Stack Overflow en Linux groots en succesvol maken, zijn de mensen die deze software gebruiken en verbeteren. Daartoe, "
     introduction_desc_github_url: "CodeCombat is volledig open source"
-    introduction_desc_suf: ", en we mikken ernaar om zoveel mogelijk manieren mogelijk maken voor u om deel te nemen en dit project van zowel jou als ons te maken."
+    introduction_desc_suf: ", en we streven ernaar om op zoveel mogelijk manieren het mogelijk te maken voor u om deel te nemen en dit project van zowel jou als ons te maken."
     introduction_desc_ending: "We hopen dat je met ons meedoet!"
     introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy en Glen"
     alert_account_message_intro: "Hallo!"
     alert_account_message_pref: "Om je te abonneren voor de klasse e-mails, moet je eerst "
     alert_account_message_suf: "."
     alert_account_message_create_url: "een account aanmaken"
-    archmage_summary: "Geïnteresserd in werken aan game graphics, user interface design, database- en serverorganisatie, multiplayer networking, physics, geluid of game engine prestaties? Wil jij helpen een game te bouwen wat anderen leert waar jij goed in bent? We moeten nog veel doen en als jij een ervaren programmeur bent en wil ontwikkelen voor CodeCombat, dan is dit de klasse voor jou. We zouden graag je hulp hebben bij het maken van de beste programmeergame ooit."
-    archmage_introduction: "Een van de beste aspecten aan het maken van spelletjes is dat zij zoveel verschillende zaken omvatten. Visualisaties, geluid, real-time netwerken, sociale netwerken, en natuurlijk veel van de voorkomende aspecten van programmeren, van low-level database beheer en server administratie tot gebruiksvriendelijke interfaces maken. Er is veel te doen, en als jij een ervaren programmeur bent met de motivatie om je handen veel te maken met CodeCombat, dan ben je de tovenaar die wij zoeken! We zouden graag jouw help hebben met het bouwen aan het allerbeste programmeerspel ooit."
+    archmage_summary: "Geïnteresserd in het werken aan game graphics, user interface design, database- en serverorganisatie, multiplayer networking, physics, geluid of game engine prestaties? Wil jij helpen een game te bouwen wat anderen leert waar jij goed in bent? We moeten nog veel doen en als jij een ervaren programmeur bent en wil ontwikkelen voor CodeCombat, dan is dit de klasse voor jou. We zouden graag je hulp hebben bij het maken van de beste programmeergame ooit."
+    archmage_introduction: "Een van de beste aspecten aan het maken van spelletjes is dat zij zoveel verschillende zaken omvatten. Visualisaties, geluid, real-time netwerken, sociale netwerken, en natuurlijk enkele veelvoorkomende aspecten van programmeren, van low-level database beheer en server administratie tot gebruiksvriendelijke interfaces maken. Er is veel te doen, en als jij een ervaren programmeur bent met de motivatie om je volledig te verdiepen in de details van CodeCombat, dan ben je de tovenaar die wij zoeken! We zouden graag jouw hulp krijgen bij het bouwen van het allerbeste programmeerspel ooit."
     class_attributes: "Klasse kenmerken"
     archmage_attribute_1_pref: "Ervaring met "
     archmage_attribute_1_suf: ", of de wil om het te leren. De meeste van onze code is in deze taal. Indien je een fan van Ruby of Python bent, zal je je meteen thuis voelen! Het is zoals JavaScript, maar met een mooiere syntax."
     archmage_attribute_2: "Ervaring in programmeren en individueel initiatief. We kunnen jou helpen bij het opstarten, maar kunnen niet veel tijd spenderen om je op te leiden."
     how_to_join: "Hoe deel te nemen"
     join_desc_1: "Iedereen kan helpen! Bekijk onze "
-    join_desc_2: "om te starten, en vink het vierkantje hieronder aan om jouzelf te abonneren als dappere tovenaar en het laatste magische nieuws te ontvangen. Wil je met ons praten over wat er te doen is of hoe je nog meer met ons kan samenwerken? "
+    join_desc_2: "om te starten, en vink het vierkantje hieronder aan om jezelf te abonneren als dappere tovenaar en het laatste magische nieuws te ontvangen. Wil je met ons praten over wat er te doen is of hoe je nog meer kunt helpen? "
     join_desc_3: ", of vind ons in "
     join_desc_4: "en we bekijken het verder vandaar!"
     join_url_email: "E-mail ons"
     join_url_hipchat: "ons publiek (Engelstalig) HipChat kanaal"
     more_about_archmage: "Leer meer over hoe je een Machtige Tovenaar kan worden"
-    archmage_subscribe_desc: "Ontvang e-mails met nieuwe codeer oppurtiniteiten en aankondigingen."
-    artisan_summary_pref: "Wil je levels ontwerpen en CodeCombat's arsenaal vergroten? Mensen spelen sneller door onze content dan wij bij kunnen houden! Op dit moment is onze level editor nog wat kaal, dus wees daarvan bewust. Levels maken zal een beetje uitdagend en buggy zijn. Als jij een visie van campagnes hebt van for-loops tot"
-    artisan_summary_suf: "dan is dit de klasse voor jou."
-    artisan_introduction_pref: "We moeten meer levels bouwen! Mensen schreeuwen om meer inhoud, en er zijn ook maar zoveel levels dat wij kunnen maken. Momenteel is jouw werkplaats level een; onze level editor is amper gebruikt door zelfs ons, wees dus voorzichtig. Indien je visioenen hebt van campagnes, gaande van for-loops tot"
-    artisan_introduction_suf: "dan is deze klasse waarschijnlijk iets voor jou."
-    artisan_attribute_1: "Enige ervaring in het maken van gelijkbare inhoud. Bijvoorbeeld ervaring het gebruiken van Blizzard's level editor. Maar dit is niet vereist!"
-    artisan_attribute_2: "Tot in detail testen en itereren staat voor jou gelijk aan plezier. Om goede levels te maken, moet jet het door anderen laten spelen en bereid zijn om een hele boel aan te passen."
-    artisan_attribute_3: "Momenteel heb je nog veel geduld nodig, doordat onze editor nog vrij ruw is en op je frustraties kan werken. Samenwerken met een Adventurer kan jou ook veel helpen."
-    artisan_join_desc: "Gebruik de Level Editor in deze volgorde, min of meer:"
+    archmage_subscribe_desc: "Ontvang e-mails met nieuwe programmeer mogelijkheden en aankondigingen."
+    artisan_summary_pref: "Wil je levels ontwerpen en CodeCombat's arsenaal vergroten? Mensen spelen sneller door onze content dan wij bij kunnen houden! Op dit moment is onze level editor nog wat beperkt, dus wees daarvan bewust. Het maken van levels zal een uitdaging zijn met een grote kans op fouten. Als jij een visie van campagnes hebt van for-loops tot"
+    artisan_summary_suf: ", dan is dit de klasse voor jou."
+    artisan_introduction_pref: "We moeten meer levels bouwen! Mensen schreeuwen om meer inhoud, en er zijn ook maar zoveel levels dat wij kunnen maken. Momenteel is jouw werkplaats level een; onze level editor wordt zelfs door ons amper gebruikt, dus wees voorzichtig. Indien je een visie hebt van een campagne, gaande van for-loops tot"
+    artisan_introduction_suf: ", dan is deze klasse waarschijnlijk iets voor jou."
+    artisan_attribute_1: "Enige ervaring in het maken van vergelijkbare inhoud. Bijvoorbeeld ervaring in het gebruiken van Blizzard's level editor. Maar dit is niet vereist!"
+    artisan_attribute_2: "Tot in het detail testen en opnieuw proberen staat voor jou gelijk aan plezier. Om goede levels te maken, moet je het door anderen laten spelen en bereid zijn om een hele boel aan te passen."
+    artisan_attribute_3: "Momenteel heb je nog veel geduld nodig, doordat onze editor nog vrij ruw is en op je zenuwen kan werken. Samenwerken met een Avonturier kan jou ook veel helpen."
+    artisan_join_desc: "Gebruik de Level Editor min of meer in deze volgorde:"
     artisan_join_step1: "Lees de documentatie."
     artisan_join_step2: "Maak een nieuw level en bestudeer reeds bestaande levels."
     artisan_join_step3: "Praat met ons in ons publieke (Engelstalige) HipChat kanaal voor hulp. (optioneel)"
     artisan_join_step4: "Maak een bericht over jouw level op ons forum voor feedback."
     more_about_artisan: "Leer meer over hoe je een Creatieve Ambachtsman kan worden."
     artisan_subscribe_desc: "Ontvang e-mails met nieuws over de Level Editor."
-    adventurer_summary: "Laten we duidelijk zijn over je rol: jij bent de tank. Jij krijgt de zware klappen te verduren. We hebben mensen nodig om spiksplinternieuwe levels te proberen en te kijken hoe deze beter kunnen. De pijn zal groot zijn, het maken van een goede game is een lang proces en niemand doet het de eerste keer goed. Als jij dit kan verduren en een hoge constitution score hebt, dan is dit de klasse voor jou."
-    adventurer_introduction: "Laten we duidelijk zijn over je rol: jij bent de tank. Jij krijgt de zware klappen te verduren. We hebben mensen nodig om spiksplinternieuwe levels te proberen en te kijken hoe deze beter kunnen. De pijn zal groot zijn, het maken van een goede game is een lang proces en niemand doet het de eerste keer goed. Als jij dit kan verduren en een hoge constitution score hebt, dan is dit de klasse voor jou."
+    adventurer_summary: "Laten we duidelijk zijn over je rol: jij bent de tank. Jij krijgt de zware klappen te verduren. We hebben mensen nodig om spiksplinternieuwe levels te proberen en te kijken hoe deze beter kunnen. Je zult veel afzien, want het maken van een goede game is een lang proces en niemand doet het de eerste keer goed. Als jij dit kan verduren en een hoog uihoudingsvermogen hebt, dan is dit de klasse voor jou."
+    adventurer_introduction: "Laten we duidelijk zijn over je rol: jij bent de tank. Jij krijgt de zware klappen te verduren. We hebben mensen nodig om spiksplinternieuwe levels uit te proberen en te kijken hoe deze beter kunnen. Je zult veel afzien.Het maken van een goede game is een lang proces en niemand doet het de eerste keer goed. Als jij dit kan verduren en een hoog uihoudingsvermogen hebt, dan is dit de klasse voor jou."
     adventurer_attribute_1: "Een wil om te leren. Jij wilt leren hoe je programmeert en wij willen het jou leren. Je zal overigens zelf het meeste leren doen."
     adventurer_attribute_2: "Charismatisch. Wees netjes maar duidelijk over wat er beter kan en geef suggesties over hoe het beter kan."
-    adventurer_join_pref: "Werk samen met een Ambachtsman of recruteer er een, of tik het veld hieronder aan om e-mails te ontvangen wanneer er nieuwe levels zijn om te testen. We zullen ook posten over levels die beoordeeld moeten worden op onze netwerken zoals"
+    adventurer_join_pref: "Werk samen met een Ambachtsman of recruteer er een, of tik het veld hieronder aan om e-mails te ontvangen wanneer er nieuwe levels zijn om te testen. We zullen ook berichten over levels die beoordeeld moeten worden op onze netwerken zoals"
     adventurer_forum_url: "ons forum"
     adventurer_join_suf: "dus als je liever op deze manier wordt geïnformeerd, schrijf je daar in!"
-    more_about_adventurer: "Leer meer over hoe je een dappere avonturier kunt worden."
+    more_about_adventurer: "Leer meer over hoe je een Dappere Avonturier kunt worden."
     adventurer_subscribe_desc: "Ontvang e-mails wanneer er nieuwe levels zijn die getest moeten worden."
-    scribe_summary_pref: "CodeCombat is meer dan slechts een aantal levels, het zal ook een bron van kennis kennis zijn en een wiki met programmeerconcepten waar levels op in kunnen gaan. Op die manier zal een Ambachtslied  een link kunnen geven naar een artikel wat past bij een level. Net zoiets als het  "
+    scribe_summary_pref: "CodeCombat is meer dan slechts een aantal levels, het zal ook een bron van kennis zijn die spelers kunnen nakijken. Op die manier zal een Ambachtsman een link kunnen geven naar een artikel dat past bij een level. Net zoiets als het "
     scribe_summary_suf: " heeft gebouwd. Als jij het leuk vindt programmeerconcepten uit te leggen, dan is deze klasse iets voor jou."
-    scribe_introduction_pref: "CodeCombat is meer dan slechts een aantal levels, het zal ook een bron van kennis kennis zijn en een wiki met programmeerconcepten waar levels op in kunnen gaan. Op die manier zal elk Ambachtslied niet in detail hoeven uit te leggen wat een vergelijkingsoperator is, maar een link kunnen geven naar een artikel wat deze informatie bevat voor de speler. Net zoiets als het  "
+    scribe_introduction_pref: "CodeCombat is meer dan slechts een aantal levels, het zal ook een bron van kennis zijn en een wiki met programmeerconcepten waar levels op in kunnen gaan. Op die manier zal niet elke Ambachtsman in detail hoeven uit te leggen wat een vergelijkingsoperator is, maar een link kunnen geven naar een artikel die deze informatie al verduidelijkt voor speler. Net zoiets als het "
     scribe_introduction_url_mozilla: "Mozilla Developer Network"
     scribe_introduction_suf: " heeft gebouwd. Als jij het leuk vindt om programmeerconcepten uit te leggen in Markdown-vorm, dan is deze klasse wellicht iets voor jou."
-    scribe_attribute_1: "Taal-skills zijn praktisch alles wat je nodig hebt. Niet alleen grammatica of spelling, maar ook moeilijke ideeën overbrengen aan anderen."
+    scribe_attribute_1: "Taalvaardigheid is praktisch alles wat je nodig hebt. Je moet niet enkel bedreven zijn in grammatica en spelling, maar ook moeilijke ideeën kunnen overbrengen aan anderen."
     contact_us_url: "Contacteer ons"
     scribe_join_description: "vertel ons wat over jezelf, je ervaring met programmeren en over wat voor soort dingen je graag zou schrijven. Verder zien we wel!"
     more_about_scribe: "Leer meer over het worden van een ijverige Klerk."
     scribe_subscribe_desc: "Ontvang e-mails met aankondigingen over het schrijven van artikelen."
-    diplomat_summary: "Er is grote interesse in CodeCombat in landen waar geen Engels wordt gesproken! We zijn op zoek naar vertalers wie tijd willen spenderen aan het vertalen van de site's corpus aan woorden zodat CodeCombat zo snel mogelijk toegankelijk wordt voor heel de wereld. Als jij wilt helpen met CodeCombat internationaal maken, dan is dit de klasse voor jou."
+    diplomat_summary: "Er is grote interesse voor CodeCombat in landen waar geen Engels wordt gesproken! We zijn op zoek naar vertalers die tijd willen spenderen aan het vertalen van de site's corpus aan woorden zodat CodeCombat zo snel mogelijk toegankelijk wordt voor de hele wereld. Als jij wilt helpen om CodeCombat internationaal maken, dan is dit de klasse voor jou."
     diplomat_introduction_pref: "Dus, als er iets is wat we geleerd hebben van de "
     diplomat_launch_url: "release in oktober"
-    diplomat_introduction_suf: "dan is het wel dat er een significante interesse is in CodeCombat in andere landen, vooral Brazilië! We zijn een corps aan vertalers aan het creëren dat ijverig de ene set woorden in een andere omzet om CodeCombat zo toegankelijk te maken als mogelijk in heel de wereld. Als jij het leuk vindt glimpsen op te vangen van aankomende content en deze levels zo snel mogelijk naar je landgenoten te krijgen, dan is dit de klasse voor jou."
-    diplomat_attribute_1: "Vloeiend Engels en de taal waar naar je wilt vertalen kunnen spreken. Wanneer je moeilijke ideeën wilt overbrengen, is het belangrijk beide goed te kunnen!"
+    diplomat_introduction_suf: "dan is het wel dat er een enorme belangstelling is voor CodeCombat in andere landen, vooral Brazilië! We zijn een groep van vertalers aan het creëren dat ijverig de ene set woorden in de andere omzet om CodeCombat zo toegankelijk mogelijk te maken in de hele wereld. Als jij het leuk vindt glimpsen op te vangen van aankomende content en deze levels zo snel mogelijk naar je landgenoten te krijgen, dan is dit de klasse voor jou."
+    diplomat_attribute_1: "Vloeiend Engels en de taal waar naar je wilt vertalen kunnen spreken. Wanneer je moeilijke ideeën wilt overbrengen, is het belangrijk beide talen goed te begrijpen!"
     diplomat_join_pref_github: "Vind van jouw taal het locale bestand "
     diplomat_github_url: "op GitHub"
     diplomat_join_suf_github: ", edit het online, en submit een pull request. Daarnaast kun je hieronder aanvinken als je up-to-date wilt worden gehouden met nieuwe internationalisatie-ontwikkelingen."
     more_about_diplomat: "Leer meer over het worden van een geweldige Diplomaat"
     diplomat_subscribe_desc: "Ontvang e-mails over i18n ontwikkelingen en levels om te vertalen."
     ambassador_summary: "We proberen een gemeenschap te bouwen en elke gemeenschap heeft een supportteam nodig wanneer er problemen zijn. We hebben chats, e-mails en sociale netwerken zodat onze gebruikers het spel kunnen leren kennen. Als jij mensen wilt helpen betrokken te raken, plezier te hebben en wat te leren programmeren, dan is dit wellicht de klasse voor jou."
-    ambassador_introduction: "We zijn een community aan het uitbouwen, en jij maakt er deel van uit. We hebben Olark chatkamers, emails, en soeciale netwerken met veel andere mensen waarmee je kan praten en hulp kan vragen over het spel en om bij te leren. Als jij mensen wil helpen en te werken nabij de hartslag van CodeCombat in het bijsturen van onze toekomstvisie, dan is dit de geknipte klasse voor jou!"
+    ambassador_introduction: "We zijn een gemeenschap aan het uitbouwen, en jij maakt er deel van uit. We hebben Olark chatkamers, emails, en sociale netwerken met veel andere mensen waarmee je kan praten en hulp aan kan vragen over het spel of om bij te leren. Als jij mensen wil helpen en te werken nabij de hartslag van CodeCombat in het bijsturen van onze toekomstvisie, dan is dit de geknipte klasse voor jou!"
     ambassador_attribute_1: "Communicatieskills. Problemen die spelers hebben kunnen identificeren en ze helpen deze op te lossen. Verder zul je ook de rest van ons geïnformeerd houden over wat de spelers zeggen, wat ze leuk vinden, wat ze minder vinden en waar er meer van moet zijn!"
     ambassador_join_desc: "vertel ons wat over jezelf, wat je hebt gedaan en wat je graag zou doen. We zien verder wel!"
     ambassador_join_note_strong: "Opmerking"
-    ambassador_join_note_desc: "Een van onze topprioriteiten is om een multiplayer te bouwen waar spelers die moeite hebben een level op te lossen een wizard met een hoger level kunnen oproepen om te helpen. Dit zal een goede manier zijn voor ambassadeurs om hun ding te doen. We houden je op de hoogte!"
+    ambassador_join_note_desc: "Een van onze topprioriteiten is om een multiplayer te bouwen waar spelers die moeite hebben een level op te lossen een tovenaar met een hoger level kunnen oproepen om te helpen. Dit zal een goede manier zijn voor ambassadeurs om hun ding te doen. We houden je op de hoogte!"
     more_about_ambassador: "Leer meer over het worden van een behulpzame Ambassadeur"
     ambassador_subscribe_desc: "Ontvang e-mails met updates over ondersteuning en multiplayer-ontwikkelingen."
     counselor_summary: "Geen van de rollen hierboven in jouw interessegebied? Maak je geen zorgen, we zijn op zoek naar iedereen die wil helpen met het ontwikkelen van CodeCombat! Als je geïnteresseerd bent in lesgeven, gameontwikkeling, open source management of iets anders waarvan je denkt dat het relevant voor ons is, dan is dit de klasse voor jou."
@@ -529,7 +533,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     creative_artisans: "Onze creatieve Ambachtslieden:"
     brave_adventurers: "Onze dappere Avonturiers:"
     translating_diplomats: "Onze vertalende Diplomaten:"
-    helpful_ambassadors: "Onze helpvolle Ambassadeurs:"
+    helpful_ambassadors: "Onze behulpzame Ambassadeurs:"
 
   classes:
     archmage_title: "Tovenaar"
@@ -554,8 +558,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     simulation_explanation: "Door spellen te simuleren kan je zelf sneller beoordeeld worden!"
     simulate_games: "Simuleer spellen!"
     simulate_all: "RESET EN SIMULEER SPELLEN"
-#    games_simulated_by: "Games simulated by you:"
-#    games_simulated_for: "Games simulated for you:"
+    games_simulated_by: "Door jou gesimuleerde spellen:"
+    games_simulated_for: "Voor jou gesimuleerde spellen:"
     leaderboard: "Leaderboard"
     battle_as: "Vecht als "
     summary_your: "Jouw "
@@ -575,7 +579,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     tutorial_play: "Speel de Tutorial"
     tutorial_recommended: "Aanbevolen als je nog niet eerder hebt gespeeld"
     tutorial_skip: "Sla Tutorial over"
-    tutorial_not_sure: "Niet zeker wat er aan de gang is?"
+    tutorial_not_sure: "Niet zeker wat er aan de hand is?"
     tutorial_play_first: "Speel eerst de Tutorial."
     simple_ai: "Simpele AI"
     warmup: "Opwarming"
@@ -583,14 +587,14 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 
   multiplayer_launch:
     introducing_dungeon_arena: "Introductie van Dungeon Arena"
-    new_way: "De nieuwe manier om te concurreren met code."
+    new_way: "17 maart, 2014: De nieuwe manier om te concurreren met code."
     to_battle: "Naar het slagveld, ontwikkelaars!"
-    modern_day_sorcerer: "Kan jij programmeren? Hoe stoer is dat. Jij bent een modere voetballer! is het niet tijd dat je jouw magische krachten gebruikt voor het controlleren van jou minions in het slagveld? En nee, we praten heir niet over robots."
-    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."
-    ladder_explanation: "Kies jouw helden, betover jouw mens of ogre legers, en beklim jouw weg naar de top in de ladder, door het verslagen van vriend en vijand. Daag nu je vrienden uit in multiplayer coding arenas en verkrijg faam en glorie. Indien je creatief bent, kan je zelfs"
+    modern_day_sorcerer: "Kan jij programmeren? Dat is pas stoer. Jij bent een modere tovenaar! Is het niet tijd dat je jouw magische krachten gebruikt voor het besturen van jou minions in het slagveld? En nee, we praten hier niet over robots."
+    arenas_are_here: "CodeCombat's kop aan kop multiplayer arena's zijn er."
+    ladder_explanation: "Kies jouw helden, betover jouw mensen of ogre legers, en beklim jouw weg naar de top in de ladder, door het verslagen van vriend en vijand. Daag nu je vrienden uit in de multiplayer programmeer arena's en verdien eeuwige roem. Indien je creatief bent, kan je zelfs"
     fork_our_arenas: "onze arenas forken"
     create_worlds: "en jouw eigen werelden creëren."
-    javascript_rusty: "Jouw JavaScript is een beetje roest? Wees niet bang, er is een"
+    javascript_rusty: "Jouw JavaScript is een beetje roestig? Wees niet bang, er is een"
     tutorial: "tutorial"
     new_to_programming: ". Ben je net begonnen met programmeren? Speel dan eerst onze beginners campagne."
     so_ready: "Ik ben hier zo klaar voor"
diff --git a/app/locale/nl.coffee b/app/locale/nl.coffee
index e2de4d9df..e69fe027d 100644
--- a/app/locale/nl.coffee
+++ b/app/locale/nl.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     sending: "Verzenden..."
     cancel: "Annuleren"
     save: "Opslagen"
+    create: "Creëer"
     delay_1_sec: "1 seconde"
     delay_3_sec: "3 secondes"
     delay_5_sec: "5 secondes"
@@ -12,13 +13,13 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     fork: "Fork"
     play: "Spelen"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  units:
+    second: "seconde"
+    seconds: "seconden"
+    minute: "minuut"
+    minutes: "minuten"
+    hour: "uur"
+    hours: "uren"
 
   modal:
     close: "Sluiten"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
   login:
     sign_up: "Account maken"
     log_in: "Inloggen"
+    logging_in: "Bezig met inloggen"
     log_out: "Uitloggen"
     recover: "account herstellen"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     skip_tutorial: "Overslaan (esc)"
     editor_config: "Editor Configuratie"
     editor_config_title: "Editor Configuratie"
+    editor_config_language_label: "Programmeertaal"
+    editor_config_language_description: "Definieer de programmeertaal waarin jij wilt programmeren."
     editor_config_keybindings_label: "Toets instellingen"
     editor_config_keybindings_default: "Standaard (Ace)"
     editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors."
@@ -242,27 +246,27 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     tip_beta_launch: "CodeCombat lanceerde zijn beta versie in Oktober, 2013."
     tip_js_beginning: "JavaScript is nog maar het begin."
     tip_autocast_setting: "Verander de autocast instelling door te klikken op het tandwiel naast de cast knop."
-#    think_solution: "Think of the solution, not the problem."
-#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - 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_forums: "Head over to the forums and tell us what you think!"
+    think_solution: "Denk aan de oplossing, niet aan het probleem"
+    tip_theory_practice: "In theorie is er geen verschil tussen de theorie en de praktijk; in de praktijk is er wel een verschil. - Yogi Berra"
+    tip_error_free: "Er zijn twee manieren om fout-vrije code te schrijven, maar enkele de derde manier werkt. - Alan Perlis"
+    tip_debugging_program: "Als debuggen het proces is om bugs te verwijderen, dan moet programmeren het proces zijn om ze erin te stoppen. - Edsger W. Dijkstra"
+    tip_forums: "Ga naar de forums en vertel ons wat je denkt!"
     tip_baby_coders: "Zelfs babies zullen in de toekomst een Tovenaar zijn."
     tip_morale_improves: "Het spel zal blijven laden tot de moreel verbeterd."
     tip_all_species: "Wij geloven in gelijke kansen voor alle wezens om te leren programmeren."
 #    tip_reticulating: "Reticulating spines."
     tip_harry: "Je bent een tovenaar, "
-#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
-#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
-#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
-#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
-#    time_current: "Now:"
-#    time_total: "Max:"
-#    time_goto: "Go to:"
+    tip_great_responsibility: "Met een groots talent voor programmeren komt een grootse debug verantwoordelijkheid."
+    tip_munchkin: "Als je je groentjes niet opeet zal een munchkin je ontvoeren terwijl je slaapt."
+    tip_binary: "Er zijn 10 soorten mensen in de wereld: Mensen die binair kunnen tellen en mensen die dat niet kunnen."
+    tip_commitment_yoda: "Een programmeur moet de grootste inzet hebben, een meest serieuze geest. ~ Yoda"
+    tip_no_try: "Doe het. Of doe het niet. Je kunt niet proberen. - Yoda"
+    tip_patience: "Geduld moet je hebben, jonge Padawan. - Yoda"
+    tip_documented_bug: "Een gedocumenteerde fout is geen fout; het is deel van het programma."
+    tip_impossible: "Het lijkt altijd onmogelijk tot het gedaan wordt. - Nelson Mandela"
+    time_current: "Nu:"
+    time_total: "Maximum:"
+    time_goto: "Ga naar:"
 
   admin:
     av_title: "Administrator panels"
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t
     more_about_archmage: "Leer meer over hoe je een Machtige Tovenaar kan worden"
     archmage_subscribe_desc: "Ontvang e-mails met nieuwe programmeer mogelijkheden en aankondigingen."
     artisan_summary_pref: "Wil je levels ontwerpen en CodeCombat's arsenaal vergroten? Mensen spelen sneller door onze content dan wij bij kunnen houden! Op dit moment is onze level editor nog wat beperkt, dus wees daarvan bewust. Het maken van levels zal een uitdaging zijn met een grote kans op fouten. Als jij een visie van campagnes hebt van for-loops tot"
-    artisan_summary_suf: "dan is dit de klasse voor jou."
+    artisan_summary_suf: ", dan is dit de klasse voor jou."
     artisan_introduction_pref: "We moeten meer levels bouwen! Mensen schreeuwen om meer inhoud, en er zijn ook maar zoveel levels dat wij kunnen maken. Momenteel is jouw werkplaats level een; onze level editor wordt zelfs door ons amper gebruikt, dus wees voorzichtig. Indien je een visie hebt van een campagne, gaande van for-loops tot"
-    artisan_introduction_suf: "dan is deze klasse waarschijnlijk iets voor jou."
+    artisan_introduction_suf: ", dan is deze klasse waarschijnlijk iets voor jou."
     artisan_attribute_1: "Enige ervaring in het maken van vergelijkbare inhoud. Bijvoorbeeld ervaring in het gebruiken van Blizzard's level editor. Maar dit is niet vereist!"
     artisan_attribute_2: "Tot in het detail testen en opnieuw proberen staat voor jou gelijk aan plezier. Om goede levels te maken, moet je het door anderen laten spelen en bereid zijn om een hele boel aan te passen."
     artisan_attribute_3: "Momenteel heb je nog veel geduld nodig, doordat onze editor nog vrij ruw is en op je zenuwen kan werken. Samenwerken met een Avonturier kan jou ook veel helpen."
diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee
index 22f12947f..4dc969190 100644
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/no.coffee b/app/locale/no.coffee
index 2b401c494..a64438ce8 100644
--- a/app/locale/no.coffee
+++ b/app/locale/no.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    sending: "Sending..."
     cancel: "Avbryt"
 #    save: "Save"
+#    create: "Create"
     delay_1_sec: "1 sekunder"
     delay_3_sec: "3 sekunder"
     delay_5_sec: "5 sekunder"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
   login:
     sign_up: "Lag konto"
     log_in: "Logg Inn"
+#    logging_in: "Logging In"
     log_out: "Logg Ut"
     recover: "gjenåpne konto"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee
index d8d4f85ec..72db4f7ce 100644
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     sending: "Wysyłanie…"
     cancel: "Anuluj"
     save: "Zapisz"
+#    create: "Create"
     delay_1_sec: "1 sekunda"
     delay_3_sec: "3 sekundy"
     delay_5_sec: "5 sekund"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
   login:
     sign_up: "Stwórz konto"
     log_in: "Zaloguj się"
+#    logging_in: "Logging In"
     log_out: "Wyloguj się"
     recover: "odzyskaj konto"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
     skip_tutorial: "Pomiń (esc)"
     editor_config: "Konfiguracja edytora"
     editor_config_title: "Konfiguracja edytora"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Przypisania klawiszy"
     editor_config_keybindings_default: "Domyślny (Ace)"
     editor_config_keybindings_description: "Dodaje skróty znane z popularnych edytorów."
diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee
index 3802d0956..d1bdfe010 100644
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     sending: "Enviando..."
     cancel: "Cancelar"
     save: "Salvar"
+#    create: "Create"
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
   login:
     sign_up: "Criar conta"
     log_in: "Entrar"
+#    logging_in: "Logging In"
     log_out: "Sair"
     recover: "Recuperar sua conta"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     skip_tutorial: "Pular (esc)"
     editor_config: "Editor de Configurações"
     editor_config_title: "Editor de Configurações"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Teclas de Atalho"
     editor_config_keybindings_default: "Padrão (Ace)"
     editor_config_keybindings_description: "Adicionar atalhos conhecidos de editores comuns."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
     more_about_archmage: "Saiba Mais Sobre Como Se Tornar Um Poderoso Arquimago"
     archmage_subscribe_desc: "Receba email sobre novas oportunidades para codificar e anúncios."
     artisan_summary_pref: "Quer criar níveis e ampliar o arsenal do CodeCombat? As pessoas estão jogando com o nosso conteúdo em um ritmo mais rápido do que podemos construir! Neste momento, nosso editor de níveis é instável, então fique esperto. Fazer os níveis será um pouco desafiador e com alguns bugs. Se você tem visões de campanhas abrangendo for-loops para"
-    artisan_summary_suf: "então essa classe é para você."
+    artisan_summary_suf: ", então essa classe é para você."
     artisan_introduction_pref: "Nós devemos contruir níveis adicionais! Pessoas estão clamando por mais conteúdo, e só podemos contruir tantos de nós mesmos. Agora sua estação de trabalho é o nível um; nosso Editor de Níveis é pouco utilizável até mesmo para seus criadores, então fique esperto. Se você tem visões de campanhas abrangendo for-loops para"
-    artisan_introduction_suf: "para, em seguida, esta classe pode ser para você."
+    artisan_introduction_suf: ", esta classe pode ser para você."
     artisan_attribute_1: "Qualquer experiência em construir conteúdo como esse seria legal, como usando os editores de nível da Blizzard. Mas não é obrigatório!"
     artisan_attribute_2: "Um desejo ardente de fazer um monte de testes e iteração. Para fazer bons níveis, você precisa levá-lo para os outros e vê-los jogar, e estar preparado para encontrar muitas coisas para consertar."
     artisan_attribute_3: "Por enquanto, a resistência em par com um Aventureiro. Nosso Editor de Níveis é super preliminar e frustrante para usar. Você foi avisado!"
diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee
index d6744433c..fa98c389f 100644
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@@ -4,7 +4,8 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     saving: "A guardar..."
     sending: "A enviar..."
     cancel: "Cancelar"
-    save: "Save"
+    save: "Guardar"
+    create: "Create"
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
   login:
     sign_up: "Criar conta"
     log_in: "Iniciar sessão"
+#    logging_in: "Logging In"
     log_out: "Sair"
     recover: "recuperar conta"
 
@@ -121,7 +123,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     title: "Definições do Wizard"
     customize_avatar: "Altera o teu Avatar"
     clothes: "Roupas"
-    trim: "Faixa"
+    trim: "Pormenores"
     cloud: "Nuvem"
     spell: "Feitiço"
     boots: "Botas"
@@ -162,7 +164,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
   account_profile:
     edit_settings: "Editar Definições"
     profile_for_prefix: "Perfil de "
-#    profile_for_suffix: ""
+    profile_for_suffix: ""
     profile: "Perfil"
     user_not_found: "Nenhum utilizador encontrado. Verifica o URL?"
     gravatar_not_found_mine: "Não conseguimos encontrar o teu perfil associado com:"
@@ -190,14 +192,14 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     reload_title: "Recarregar todo o código?"
     reload_really: "Tens a certeza que queres recarregar este nível de volta ao início?"
     reload_confirm: "Recarregar tudo"
-#    victory_title_prefix: ""
+    victory_title_prefix: ""
     victory_title_suffix: " Concluído"
     victory_sign_up: "Cria uma conta para guardar o teu progresso"
     victory_sign_up_poke: "Queres guardar o teu código? Cria uma conta grátis!"
     victory_rate_the_level: "Classifica este nível: "
     victory_rank_my_game: "Classifica o meu jogo"
     victory_ranking_game: "A submeter..."
-#    victory_return_to_ladder: "Return to Ladder"
+    victory_return_to_ladder: "Voltar à Classificação"
     victory_play_next_level: "Jogar próximo nível"
     victory_go_home: "Ir para o Inicio"
     victory_review: "Conta-nos mais!"
@@ -212,8 +214,8 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     tome_minion_spells: "Feitiços dos teus Minions"
     tome_read_only_spells: "Feitiços apenas de leitura"
     tome_other_units: "Outras Unidades"
-#    tome_cast_button_castable: "Cast Spell"
-    tome_cast_button_casting: "A lançar"
+    tome_cast_button_castable: "Lançar Feitiço"
+    tome_cast_button_casting: "A Lançar Feitiço"
     tome_cast_button_cast: "Lançar Feitiço"
 #    tome_autocast_delay: "Autocast Delay"
     tome_select_spell: "Escolhe um Feitiço"
@@ -222,17 +224,19 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     hud_continue: "Continuar (shift-espaço)"
     spell_saved: "Feitiço Guardado"
     skip_tutorial: "Saltar (esc)"
-#    editor_config: "Editor Config"
-#    editor_config_title: "Editor Configuration"
-#    editor_config_keybindings_label: "Key Bindings"
-#    editor_config_keybindings_default: "Default (Ace)"
-#    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
-#    editor_config_invisibles_label: "Show Invisibles"
-#    editor_config_invisibles_description: "Displays invisibles such as spaces or tabs."
-#    editor_config_indentguides_label: "Show Indent Guides"
-#    editor_config_indentguides_description: "Displays vertical lines to see indentation better."
-#    editor_config_behaviors_label: "Smart Behaviors"
-#    editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes."
+    editor_config: "Configurar Editor"
+    editor_config_title: "Configuração do Editor"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
+    editor_config_keybindings_label: "Atalhos de Teclado"
+    editor_config_keybindings_default: "Predefinição (Ace)"
+    editor_config_keybindings_description: "Adiciona atalhos de teclado de acordo com o editor escolhido"
+    editor_config_invisibles_label: "Mostrar Invisíveis"
+    editor_config_invisibles_description: "Mostra caracteres invisíveis como espaços e tabulações"
+    editor_config_indentguides_label: "Mostrar Guias"
+    editor_config_indentguides_description: "Mostra linhas verticais de acordo com a identação."
+    editor_config_behaviors_label: "Comportamentos Inteligentes"
+    editor_config_behaviors_description: "Completa automaticamente chavetas, parêntesis e aspas"
 #    loading_ready: "Ready!"
 #    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
 #    tip_toggle_play: "Toggle play/paused with Ctrl+P."
@@ -267,8 +271,8 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
   admin:
     av_title: "Visualizações de Admin"
     av_entities_sub_title: "Entidades"
-    av_entities_users_url: "utilizadores"
-    av_entities_active_instances_url: "Activar Instancias"
+    av_entities_users_url: "Utilizadores"
+    av_entities_active_instances_url: "Activar Instâncias"
     av_other_sub_title: "Outro"
     av_other_debug_base_url: "Base (para fazer debug base.jade)"
     u_title: "Lista de Utilizadores"
@@ -315,11 +319,11 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     new_component_title: "Criar novo Componente"
     new_component_field_system: "Sistema"
     new_article_title: "Criar um Novo Artigo"
-    new_thang_title: "Criar um Novo tipo the Thang"
+    new_thang_title: "Criar um Novo Tipo de Thang"
     new_level_title: "Criar um Novo Nível"
-    article_search_title: "Procura Artigos Aqui"
-    thang_search_title: "Procura Tipos de Thang Aqui"
-    level_search_title: "Procura Níveis aqui"
+    article_search_title: "Procurar Artigos Aqui"
+    thang_search_title: "Procurar Tipos de Thang Aqui"
+    level_search_title: "Procurar Níveis Aqui"
 
   article:
     edit_btn_preview: "Visualizar"
@@ -341,7 +345,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     password: "Palavra-passe"
     message: "Mensagem"
     code: "Código"
-#    ladder: "Ladder"
+    ladder: "Classificação"
     when: "quando"
     opponent: "Adversário"
     rank: "Classificação"
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
@@ -548,36 +552,36 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     counselor_title_description: "(Expert/ Professor)"
 
   ladder:
-#    please_login: "Please log in first before playing a ladder game."
+    please_login: "Por favor, faz log in antes de jogar um jogo para o campeonato."
     my_matches: "Os meus jogos"
     simulate: "Simular"
-#    simulation_explanation: "By simulating games you can get your game ranked faster!"
-#    simulate_games: "Simulate Games!"
+    simulation_explanation: "Simulando jogos podes fazer com que o teu jogo seja classificado mais rapidamente!"
+    simulate_games: "Simular Jogos!"
 #    simulate_all: "RESET AND SIMULATE GAMES"
 #    games_simulated_by: "Games simulated by you:"
 #    games_simulated_for: "Games simulated for you:"
-#    leaderboard: "Leaderboard"
-#    battle_as: "Battle as "
-#    summary_your: "Your "
-#    summary_matches: "Matches - "
+    leaderboard: "Tabela de Classificação"
+    battle_as: "Lutar como "
+    summary_your: "As tuas "
+    summary_matches: "Partidas - "
     summary_wins: " Vitórias, "
     summary_losses: " Derrotas"
-#    rank_no_code: "No New Code to Rank"
+    rank_no_code: "Sem código novo para classificar"
     rank_my_game: "Classifica o meu jogo!"
     rank_submitting: "A submeter..."
     rank_submitted: "Submetido para Classificação"
     rank_failed: "Falhou a Classificar"
     rank_being_ranked: "Jogo a ser Classificado"
-#    code_being_simulated: "Your new code is being simulated by other players for ranking. This will refresh as new matches come in."
-#    no_ranked_matches_pre: "No ranked matches for the "
-#    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
+    code_being_simulated: "O teu código está a ser simulado por outros jogadores, para ser classificado. Isto será actualizado quando surgirem novas partidas."
+    no_ranked_matches_pre: "Sem jogos classificados pela equipa "
+    no_ranked_matches_post: "! Joga contra alguns adversários e volta aqui para veres o teu jogo classificado."
     choose_opponent: "Escolhe um Adversário"
     tutorial_play: "Jogar Tutorial"
     tutorial_recommended: "Recomendado se nunca jogaste antes"
     tutorial_skip: "Saltar Tutorial"
     tutorial_not_sure: "Não tens a certeza do que se passa?"
     tutorial_play_first: "Joga o Tutorial primeiro."
-#    simple_ai: "Simple AI"
+    simple_ai: "Inteligência Artificial Simples"
     warmup: "Aquecimento"
     vs: "VS"
 
@@ -585,11 +589,11 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     introducing_dungeon_arena: "Introduzindo a Dungeon Arena"
     new_way: "Uma nova forma de competir com código."
     to_battle: "Às armas, Programadores!"
-#    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
+    modern_day_sorcerer: "Sabes programar? És tão forte! És um feiticeiro dos tempos modernos! Será que não está na altura de usares os teus poderes mágicos de programação para comandar os teus servos em combates épicos? E não estamos a falar de robots."
     arenas_are_here: "As arenas mano-a-mano multiplayer de CodeCombat estão aqui."
-#    ladder_explanation: "Choose your heroes, enchant your human or ogre armies, and climb your way over defeated fellow Wizards to reach the top of the ladders–then challenge your friends in our glorious, asynchronous multiplayer coding arenas. If you're feeling creative, you can even"
-#    fork_our_arenas: "fork our arenas"
-    create_worlds: "e cria os teus próprios mundos."
+    ladder_explanation: "Escolhe os teus heróis, encanta os teus exércitos de ogres ou humanos, e constrói o teu caminho, derrotando outros Feiticeiros para chegares ao topo da classificação. Depois, desafia os teus amigos para gloriosas arenas de programação multijogador. Se te sentes criativo, podes até"
+    fork_our_arenas: "alterar as nossas arenas"
+    create_worlds: "e criar os teus próprios mundos."
     javascript_rusty: "O teu JavaScript está enferrujado? Não te preocupes; Existe um"
     tutorial: "tutorial"
     new_to_programming: ". Novo na programação? Faz a Campanha para Iniciantes para expandires as tuas capacidades."
diff --git a/app/locale/pt.coffee b/app/locale/pt.coffee
index 7008fc8fb..eeb23e9d2 100644
--- a/app/locale/pt.coffee
+++ b/app/locale/pt.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
     sending: "Enviando..."
     cancel: "Cancelar"
 #    save: "Save"
+#    create: "Create"
     delay_1_sec: "1 segundo"
     delay_3_sec: "3 segundos"
     delay_5_sec: "5 segundos"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
   login:
     sign_up: "Criar conta"
     log_in: "Entrar"
+#    logging_in: "Logging In"
     log_out: "Sair"
     recover: "recuperar sua conta"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee
index 789bd1159..673eac87f 100644
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     sending: "Se trimite..."
     cancel: "Anulează"
     save: "Salvează"
+#    create: "Create"
     delay_1_sec: "1 secundă"
     delay_3_sec: "3 secunde"
     delay_5_sec: "5 secunde"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
   login:
     sign_up: "Crează cont"
     log_in: "Log In"
+#    logging_in: "Logging In"
     log_out: "Log Out"
     recover: "recuperează cont"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     skip_tutorial: "Sari peste (esc)"
     editor_config: "Editor Config"
     editor_config_title: "Configurare Editor"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Mapare taste"
     editor_config_keybindings_default: "Default (Ace)"
     editor_config_keybindings_description: "Adaugă comenzi rapide suplimentare cunoscute din editoarele obisnuite."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     more_about_archmage: "Învață mai multe despre cum să devi un Archmage"
     archmage_subscribe_desc: "Primește email-uri despre noi oportunități de progrmare și anunțuri."
     artisan_summary_pref: "Vrei să creezi nivele și să extinzi arsenalul CodeCombat? Oamenii ne termină nivelele mai repede decât putem să le creăm! Momentan, editorul nostru de nivele este rudimentar, așa că aveți grijă. Crearea de nivele va fi o mică provocare și va mai avea câteva bug-uri. Dacă ai viziuni cu campanii care cuprind loop-uri for pentru"
-    artisan_summary_suf: "atunci asta e clasa pentru tine."
+    artisan_summary_suf: ", atunci asta e clasa pentru tine."
     artisan_introduction_pref: "Trebuie să construim nivele adiționale! Oamenii sunt nerăbdători pentru mai mult conținut, și noi putem face doar atât singuri. Momentan editorul de nivele abia este utilizabil până și de creatorii lui, așa că aveți grijă. Dacă ai viziuni cu campanii care cuprind loop-uri for pentru"
-    artisan_introduction_suf: "atunci aceasta ar fi clasa pentru tine."
+    artisan_introduction_suf: ", atunci aceasta ar fi clasa pentru tine."
     artisan_attribute_1: "Orice experiență în crearea de conținut ca acesta ar fi de preferat, precum folosirea editoarelor de nivele de la Blizzard. Dar nu este obligatoriu!"
     artisan_attribute_2: "Un chef de a face o mulțime de teste și iterări. Pentru a face nivele bune, trebuie să testați pe mai mulți oameni și să obțineți feedback, și să fiți pregăți să reparați o mulțime de lucruri."
     artisan_attribute_3: "Pentru moment trebui să ai nervi de oțel. Editorul nostru de nivele este abia la început și încă are multe probleme. Ai fost avertizat!"
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 9d1ec2d22..701d4c0a9 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     sending: "Отправка..."
     cancel: "Отмена"
     save: "Сохранить"
+    create: "Создать"
     delay_1_sec: "1 секунда"
     delay_3_sec: "3 секунды"
     delay_5_sec: "5 секунд"
@@ -12,13 +13,13 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     fork: "Форк"
     play: "Играть"
 
-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  units:
+    second: "секунда"
+    seconds: "секунд(ы)"
+    minute: "минута"
+    minutes: "минут(ы)"
+    hour: "час"
+    hours: "часа(ов)"
 
   modal:
     close: "Закрыть"
@@ -32,7 +33,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     editor: "Редактор"
     blog: "Блог"
     forum: "Форум"
-    admin: "Администратор"
+    admin: "Админ"
     home: "Домой"
     contribute: "Сотрудничество"
     legal: "Юридическая информация"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
   login:
     sign_up: "Создать аккаунт"
     log_in: "Войти"
+    logging_in: "Вход..."
     log_out: "Выйти"
     recover: "восстановить аккаунт"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     skip_tutorial: "Пропуск (Esc)"
     editor_config: "Настройки редактора"
     editor_config_title: "Настройки редактора"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Сочетания клавиш"
     editor_config_keybindings_default: "По умолчанию (Ace)"
     editor_config_keybindings_description: "Добавляет дополнительные сочетания, известные из популярных редакторов."
@@ -260,9 +264,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tip_patience: "Терпением ты обладать должен, юный падаван. - Yoda"
     tip_documented_bug: "Документированный баг не является багом; это фича."
     tip_impossible: "Это всегда кажется невозможным, пока не сделано. - Nelson Mandela"
-#    time_current: "Now:"
-#    time_total: "Max:"
-#    time_goto: "Go to:"
+    time_current: "Текущее:"
+    time_total: "Максимальное:"
+    time_goto: "Перейти на:"
 
   admin:
     av_title: "Админ панель"
@@ -387,7 +391,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     practices_title: "Уважаемые лучшие практики"
     practices_description: "Это наши обещания тебе, игроку, менее юридическим языком."
     privacy_title: "Конфиденциальность"
-    privacy_description: "Мы не будем продавать какой-либо личной информации. Мы намерены заработать деньги с помощью рекрутинга в конечном счёте, но будьте уверены, мы не будем распространять вашу личную информацию заинтересованным компаниям без вашего явного согласия."
+    privacy_description: "Мы не будем продавать какую-либо личную информацию. Мы намерены заработать деньги с помощью рекрутинга в конечном счёте, но будьте уверены, мы не будем распространять вашу личную информацию заинтересованным компаниям без вашего явного согласия."
     security_title: "Безопасность"
     security_description: "Мы стремимся сохранить вашу личную информацию в безопасности. Как проект с открытым исходным кодом, наш сайт открыт для всех в вопросах пересмотра и совершенствования систем безопасности."
     email_title: "Email"
@@ -459,7 +463,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     how_to_join: "Как присоединиться"
     join_desc_1: "Любой желающий может помочь! Просто ознакомьтесь с нашим "
     join_desc_2: "чтобы начать, и установите флажок ниже, чтобы отметить себя как отважного Архимага и получать последние новости через email. Хотите поговорить о том, что делать или как принять более активное участие? "
-    join_desc_3: "или найдите нас в "
+    join_desc_3: " или найдите нас в "
     join_desc_4: "и мы решим, откуда можно начать!"
     join_url_email: "Напишите нам"
     join_url_hipchat: "публичной комнате HipChat"
diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee
index 4c58049a7..7d712fcfd 100644
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     sending: "Odosiela sa..."
     cancel: "Zruš"
     save: "Ulož"
+#    create: "Create"
     delay_1_sec: "1 sekunda"
     delay_3_sec: "3 sekundy"
     delay_5_sec: "5 sekúnd"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
   login:
     sign_up: "Vytvor účet"
     log_in: "Prihlás sa"
+#    logging_in: "Logging In"
     log_out: "Odhlás sa"
     recover: "obnov"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee
index 56cbd080b..565ae2335 100644
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee
index 0437de30c..9c49c79ee 100644
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     sending: "Шаље се..."
     cancel: "Откажи"
 #    save: "Save"
+#    create: "Create"
     delay_1_sec: "1 секунда"
     delay_3_sec: "3 секунде"
     delay_5_sec: "5 секунди"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
   login:
     sign_up: "Направи Налог"
     log_in: "Улогуј Се"
+#    logging_in: "Logging In"
     log_out: "Излогуј Се"
     recover: "Поврати налог"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee
index 577ffb5bc..64556f8ba 100644
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     sending: "Skickar..."
     cancel: "Avbryt"
     save: "Spara"
+#    create: "Create"
     delay_1_sec: "1 sekund"
     delay_3_sec: "3 sekunder"
     delay_5_sec: "5 sekunder"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
   login:
     sign_up: "Skapa konto"
     log_in: "Logga in"
+#    logging_in: "Logging In"
     log_out: "Logga ut"
     recover: "glömt lösenord"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     skip_tutorial: "Hoppa över (esc)"
     editor_config: "Ställ in redigerare"
     editor_config_title: "Redigerarinställningar"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Kortkommandon"
     editor_config_keybindings_default: "Standard (Ace)"
     editor_config_keybindings_description: "Lägger till ytterligare kortkommandon kända från vanliga redigerare."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     more_about_archmage: "Lär dig mer om att bli en huvudmagiker"
     archmage_subscribe_desc: "Få mail om nya kodmöjligheter och tillkännagivanden."
     artisan_summary_pref: "Vill du designa nivåer och utvidga CodeCombats arsenal? Folk spelar igenom vårt innehåll snabbare än vi kan bygga! För tillfället är vår nivåredigerare ganska mager, så var uppmärksam. Att skapa nivåer kommer att vara lite utmanande och buggigt. Om du har visioner av kampanjer som sträcker sig från for-loopar till"
-    artisan_summary_suf: "är den här klassen för dig."
+    artisan_summary_suf: ", är den här klassen för dig."
     artisan_introduction_pref: "Vi måste bygga fler nivåer! Människor kräver mer innehåll, och vi kan bara bygga en viss mängd själva. Just nu är arbetsstation nivå ett; vår nivåredigerare är knappt användbar ens av dess skapare, så var uppmärksam. Om du har visioner av kampanjer som sträcker sig från for-loopar till"
-    artisan_introduction_suf: "är den här klassen kanske något för dig."
+    artisan_introduction_suf: ", är den här klassen kanske något för dig."
     artisan_attribute_1: "Någon erfarenhet av att bygga liknande innehåll vore bra, som till exempel Blizzards nivåredigerare. Det är dock inget krav!"
     artisan_attribute_2: "En vilja att göra en hel del testande och upprepning. För att göra bra nivåer, måste du ta dem till andra och se dem spela den, och vara beredd på att hitta många saker att laga."
     artisan_attribute_3: "För tillfället, uthållighet i klass med en äventyrare. Vår nivåredigerare är väldigt preliminär och frustrerande att använda. Du är varnad!"
diff --git a/app/locale/th.coffee b/app/locale/th.coffee
index f7155c267..9904dde0c 100644
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    sending: "Sending..."
     cancel: "ยกเลิก"
 #    save: "Save"
+#    create: "Create"
     delay_1_sec: "1 วินาที"
     delay_3_sec: "3 วินาที"
     delay_5_sec: "5 วินาที"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
   login:
     sign_up: "ลงทะเบียนใหม่"
     log_in: "ลงชื่อเข้าใช้"
+#    logging_in: "Logging In"
     log_out: "ลงชื่ื่อออก"
     recover: "กู้บัญชีการใช้งาน"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee
index e1cc00b36..b5c4b3d57 100644
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     sending: "Gönderiliyor..."
     cancel: "İptal"
     save: "Kaydet"
+#    create: "Create"
     delay_1_sec: "1 saniye"
     delay_3_sec: "3 saniye"
     delay_5_sec: "5 saniye"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
   login:
     sign_up: "Kaydol"
     log_in: "Giriş Yap"
+#    logging_in: "Logging In"
     log_out: "Çıkış Yap"
     recover: "şifrenizi sıfırlayabilirsiniz."
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee
index c0c9b4076..21c88cbf1 100644
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
     sending: "Надсилання..."
     cancel: "Відміна"
     save: "Зберегти"
+#    create: "Create"
     delay_1_sec: "1 секунда"
     delay_3_sec: "3 секунди"
     delay_5_sec: "5 секунд"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
   login:
     sign_up: "створити акаунт"
     log_in: "Увійти"
+#    logging_in: "Logging In"
     log_out: "Вийти"
     recover: "відновити акаунт"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "українська мова", englishDesc
     skip_tutorial: "Пропустити (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
     editor_config_keybindings_default: "За замовчуванням (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -356,36 +360,36 @@ module.exports = nativeDescription: "українська мова", englishDesc
   about:
     who_is_codecombat: "Хто є CodeCombat?"
     why_codecombat: "Чому CodeCombat?"
-    who_description_prefix: "Взагалом розпочався CodeCombat у 2013. Ми також створили "
-#    who_description_suffix: "in 2008, growing it to the #1 web and iOS application for learning to write Chinese and Japanese characters."
+    who_description_prefix: "разом започаткували CodeCombat у 2013. Ми також створили "
+    who_description_suffix: "у 2008 і вивели його на перше місце серед web та iOS додаткив, що навчають писати китайською та японською."
     who_description_ending: "Зараз час вчити людей писати код."
-#    why_paragraph_1: "When making Skritter, George didn't know how to program and was constantly frustrated by his inability to implement his ideas. Afterwards, he tried learning, but the lessons were too slow. His housemate, wanting to reskill and stop teaching, tried Codecademy, but \"got bored.\" Each week another friend started Codecademy, then dropped off. We realized it was the same problem we'd solved with Skritter: people learning a skill via slow, intensive lessons when what they need is fast, extensive practice. We know how to fix that."
-#    why_paragraph_2: "Need to learn to code? You don't need lessons. You need to write a lot of code and have a great time doing it."
-#    why_paragraph_3_prefix: "That's what programming is about. It's gotta be fun. Not fun like"
-#    why_paragraph_3_italic: "yay a badge"
-#    why_paragraph_3_center: "but fun like"
+    why_paragraph_1: "Створюючи Skritter, George не знав програмування й постійно засмучувався через неможливість самостійно втілити власні ідеї. Зрештою він спробував вивчитися, але навчання йшло надто повільною  Сусід Джорджа, бажаючи оновити знання, спробував Codecademy, але \"стало нудно.\" Щотижня хтось з друзів починав навчання у Codecademy, але кидав. Ми зрозуміли, що зіткнулися з тією ж проблемою. що під час створення Skritter: люди набувають навичок через повільні, інтенсивні лекції, тоді як усе, чого вони потребують, це швидка, екстенсивна практика. І ми знаємо, як це полагодити."
+    why_paragraph_2: "Хочете навчитися писати код? Вам не потрібні уроки. Вам потрібно писати багато коду і добре розважитись у цей час. "
+    why_paragraph_3_prefix: "Ось що таке програмування насправді. Це має бути весело. Не просто кумедно штибу"
+    why_paragraph_3_italic: "дивіться, я маю бейджик, "
+    why_paragraph_3_center: "а весело - штибу"
     why_paragraph_3_italic_caps: "НІ, МАМО, Я МАЮ ПРОЙТИ РІВЕНЬ!"
-#    why_paragraph_3_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing."
-#    why_paragraph_4: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age."
-#    why_ending: "And hey, it's free. "
-#    why_ending_url: "Start wizarding now!"
-#    george_description: "CEO, business guy, web designer, game designer, and champion of beginning programmers everywhere."
-#    scott_description: "Programmer extraordinaire, software architect, kitchen wizard, and master of finances. Scott is the reasonable one."
-#    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
-#    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
-#    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
-#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!"
+    why_paragraph_3_suffix: "Ось чому CodeCombat - мультиплеєрна гра, а не гейміфікований курс уроків. Ми не зупинимося, доки ви не включитеся на повну, і це чудово. "
+    why_paragraph_4: "Якщо ви плануєте бути залежним від якоїсь гри, оберіть цю - і перетворіться на одного з чарівників ери інформаційних технологій."
+    why_ending: "І так, це безкоштовно. "
+    why_ending_url: "Починаймо чародійства прямо зараз!"
+    george_description: "CEO, знавець бізнесу, веб-дизайнер, гейм-дизайнер і ватажок програмістів-початківців з усього світу."
+    scott_description: "Екстраординарний програміст, архітектор програмного забезпечення, кулінарний чарівник та майстер фінансів. Скотт - розсудливий."
+    nick_description: "Чарівник програмування, ексцентричний маг мотивації та непересічний експериментатор. Нік здатен зробити будь-що, і він обрав зробити CodeCombat."
+    jeremy_description: "Чарівник підтримки користувачів, тестер юзабіліті та організатор спільноти; ви ймовірно вже спілкувались з Джеремі."
+    michael_description: "Програміст, адмін та загадковий технічний вундеркінд, Майкл - та людина, що утримує наші сервери онлайн."
+    glen_description: "Програміст та натхненний розробник ігор, що мріє зробити цей світ краще, створюючи дійсно значущі речі. Ніколи не вживає слова \"неможливо\". Дізнаватися нове - для нього найбільша насолода!"
 
   legal:
-    page_title: "Юридичні нотатки"
-#    opensource_intro: "CodeCombat is free to play and completely open source."
-#    opensource_description_prefix: "Check out "
-    github_url: "наш GitHub"
-#    opensource_description_center: "and help out if you like! CodeCombat is built on dozens of open source projects, and we love them. See "
-#    archmage_wiki_url: "our Archmage wiki"
-#    opensource_description_suffix: "for a list of the software that makes this game possible."
-#    practices_title: "Respectful Best Practices"
-#    practices_description: "These are our promises to you, the player, in slightly less legalese."
+    page_title: "Юридична інформація"
+    opensource_intro: "CodeCombat - безкоштовна гра з повністю відкритим кодом."
+    opensource_description_prefix: "Завітайте"
+    github_url: "на наш GitHub"
+    opensource_description_center: "та долучайтесь, якщо хочете! CodeCombat побудовано на десятках проектів із вікритим кодом. і ми любимо їх. Перегляньте "
+    archmage_wiki_url: "нашу wiki для Архімагів,"
+    opensource_description_suffix: "щоб побачити списки ПЗ, яке робить цю гру можливою."
+    practices_title: "Шановні найкращі гравці"
+#    practices_description: "These are our promi ses to you, the player, in slightly less legalese."
 #    privacy_title: "Privacy"
 #    privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent."
 #    security_title: "Security"
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee
index 923fb3fe4..ea9c2377e 100644
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    sending: "Sending..."
 #    cancel: "Cancel"
 #    save: "Save"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #  login:
 #    sign_up: "Create Account"
 #    log_in: "Log In"
+#    logging_in: "Logging In"
 #    log_out: "Log Out"
 #    recover: "recover account"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee
index d5d563f7a..6a04a79c4 100644
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     sending: "Gởi..."
     cancel: "Hủy"
     save: "Lưu"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
   login:
     sign_up: "Tạo tài khoản"
     log_in: "Đăng nhập"
+#    logging_in: "Logging In"
     log_out: "Đăng xuất"
     recover: "Khôi phục tài khoản"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 946a003a9..deede5373 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     sending: "发送中……"
     cancel: "取消"
     save: "保存"
+#    create: "Create"
     delay_1_sec: "1 秒"
     delay_3_sec: "3 秒"
     delay_5_sec: "5 秒"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
   login:
     sign_up: "注册"
     log_in: "登录"
+#    logging_in: "Logging In"
     log_out: "登出"
     recover: "找回账户"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     skip_tutorial: "跳过（esc）"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -468,7 +472,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     artisan_summary_pref: "想要设计 CodeCombat 的关卡吗？人们玩的比我们做的快多了！现在我们的关卡编辑器还很基本，所以做起关卡来会有点麻烦，还会有bug。只要你有制作关卡的灵感，不管是简单的for循环还是"
     artisan_summary_suf: "这种东西，这个职业都很适合你。"
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 8c761d5a3..29f4d258a 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     sending: "發送中...."
     cancel: "取消"
     save: "存檔"
+#    create: "Create"
     delay_1_sec: "1 秒"
     delay_3_sec: "3 秒"
     delay_5_sec: "5 秒"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
   login:
     sign_up: "註冊"
     log_in: "登入"
+#    logging_in: "Logging In"
     log_out: "登出"
     recover: "找回帳號"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/locale/zh.coffee b/app/locale/zh.coffee
index b6e955925..d3ee927da 100644
--- a/app/locale/zh.coffee
+++ b/app/locale/zh.coffee
@@ -5,6 +5,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
     sending: "在发送中。。。"
     cancel: "退出"
     save: "保存"
+#    create: "Create"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
@@ -52,6 +53,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
   login:
     sign_up: "注册"
     log_in: "登录"
+#    logging_in: "Logging In"
     log_out: "登出"
     recover: "找回账户"
 
@@ -224,6 +226,8 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    skip_tutorial: "Skip (esc)"
 #    editor_config: "Editor Config"
 #    editor_config_title: "Editor Configuration"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
 #    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
@@ -466,9 +470,9 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    more_about_archmage: "Learn More About Becoming an Archmage"
 #    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
 #    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
-#    artisan_summary_suf: "then this class is for you."
+#    artisan_summary_suf: ", then this class is for you."
 #    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: "then this class might be for you."
+#    artisan_introduction_suf: ", then this class might be for you."
 #    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
 #    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
diff --git a/app/models/CocoModel.coffee b/app/models/CocoModel.coffee
index c0014deab..9f4a88556 100644
--- a/app/models/CocoModel.coffee
+++ b/app/models/CocoModel.coffee
@@ -59,10 +59,12 @@ class CocoModel extends Backbone.Model
   loadSchema: ->
     return if @constructor.schema.loading
     @constructor.schema.fetch()
-    @constructor.schema.once 'sync', =>
-      @constructor.schema.loaded = true
-      @addSchemaDefaults()
-      @trigger 'schema-loaded'
+    @listenToOnce(@constructor.schema, 'sync', @onConstructorSync)
+
+  onConstructorSync: ->
+    @constructor.schema.loaded = true
+    @addSchemaDefaults()
+    @trigger 'schema-loaded'
 
   @hasSchema: -> return @schema?.loaded
   schema: -> return @constructor.schema
diff --git a/app/styles/play.sass b/app/styles/play.sass
index 83611f8b8..e3e31d8fa 100644
--- a/app/styles/play.sass
+++ b/app/styles/play.sass
@@ -15,6 +15,14 @@
   a[disabled] .level
     opacity: 0.7
 
+  a.complete h3:after
+    content: " - Complete!"
+    color: green
+
+  a.started h3:after
+    content: " - Started"
+    color: desaturate(green, 50%)
+
   .level
     @include box-sizing(border-box)
     border: 1px solid transparent
@@ -40,4 +48,4 @@
 
   .alert-warning h2
     color: black
-    text-align: center
\ No newline at end of file
+    text-align: center
diff --git a/app/templates/base.jade b/app/templates/base.jade
index 7af238a4d..7bc9817f2 100644
--- a/app/templates/base.jade
+++ b/app/templates/base.jade
@@ -22,16 +22,16 @@ body
 
         ul(class='navbar-link-text').nav.navbar-nav.pull-right
           li.play
-            a.header-font(href='/play', data-i18n="nav.navbar-nav.play") Levels
+            a.header-font(href='/play', data-i18n="nav.play") Levels
           li.editor
-            a.header-font(href='/editor', data-i18n="nav.navbar-nav.editor") Editor
+            a.header-font(href='/editor', data-i18n="nav.editor") Editor
           li.blog
-            a.header-font(href='http://blog.codecombat.com/', data-i18n="nav.navbar-nav.blog") Blog
+            a.header-font(href='http://blog.codecombat.com/', data-i18n="nav.blog") Blog
           li.forum
-            a.header-font(href='http://discourse.codecombat.com/', data-i18n="nav.navbar-nav.forum") Forum
+            a.header-font(href='http://discourse.codecombat.com/', data-i18n="nav.forum") Forum
           if me.isAdmin()
             li.admin
-              a.header-font(href='/admin', data-i18n="nav.navbar-nav.admin") Admin
+              a.header-font(href='/admin', data-i18n="nav.admin") Admin
 
   block outer_content
     #outer-content-wrapper
@@ -63,4 +63,4 @@ body
         a.mixpanel-badge(href="https://mixpanel.com/f/partner")
           img(src="//cdn.mxpnl.com/site_media/images/partner/badge_light.png", alt="Mobile Analytics")
         a.firebase-bade(href="https://www.firebase.com/")
-          img(src="/images/pages/base/firebase.png", alt="Powered by Firebase")
\ No newline at end of file
+          img(src="/images/pages/base/firebase.png", alt="Powered by Firebase")
diff --git a/app/templates/contribute/artisan.jade b/app/templates/contribute/artisan.jade
index da7a274d4..9e6d1320d 100644
--- a/app/templates/contribute/artisan.jade
+++ b/app/templates/contribute/artisan.jade
@@ -24,10 +24,9 @@ block content
           | If you have visions of campaigns spanning for-loops to
         span  
         a(href="http://stackoverflow.com/questions/758088/seeking-contrived-example-code-continuations/758105#758105")
-          |  Mondo Bizzaro 
-        span  
+          | Mondo Bizzaro
         span(data-i18n="contribute.artisan_introduction_suf")
-          | to then this class might be for you.
+          | , then this class might be for you.
     
       h4(data-i18n="contribute.class_attributes") Class Attributes
       ul
diff --git a/app/templates/contribute/contribute.jade b/app/templates/contribute/contribute.jade
index 4d19f5c86..ffb7045a6 100644
--- a/app/templates/contribute/contribute.jade
+++ b/app/templates/contribute/contribute.jade
@@ -94,10 +94,9 @@ block content
             | of campaigns spanning for-loops to
           span  
           a(href="http://stackoverflow.com/questions/758088/seeking-contrived-example-code-continuations/758105#758105")
-            |  Mondo Bizzaro 
-          span  
+            | Mondo Bizzaro
           span(data-i18n="contribute.artisan_summary_suf")
-            | then this class is for you.
+            | , then this class is for you.
 
         a(href="/contribute/artisan")
           p.lead(data-i18n="contribute.more_about_artisan")
diff --git a/app/templates/editor/level/thangs_tab.jade b/app/templates/editor/level/thangs_tab.jade
index f70446bd6..b0b86868c 100644
--- a/app/templates/editor/level/thangs_tab.jade
+++ b/app/templates/editor/level/thangs_tab.jade
@@ -17,6 +17,11 @@
 .world-container.thangs-column
   h3(data-i18n="editor.level_tab_thangs_conditions") Starting Conditions
   #canvas-wrapper
+    ul.dropdown-menu#contextmenu
+      li#delete
+        a Delete
+      li#duplicate
+        a Duplicate
     canvas(width=1848, height=1178)#surface
     #canvas-left-gradient.gradient
     #canvas-top-gradient.gradient
diff --git a/app/templates/loading.jade b/app/templates/loading.jade
index 3844fa3cf..519808a00 100644
--- a/app/templates/loading.jade
+++ b/app/templates/loading.jade
@@ -1,8 +1,4 @@
-extends /templates/base
-
-block content
-
-  .loading-screen
-    h1(data-i18n="common.loading") Loading...
-    .progress.progress-striped.active
-      .progress-bar
\ No newline at end of file
+.loading-screen
+  h1(data-i18n="common.loading") Loading...
+  .progress.progress-striped.active
+    .progress-bar
\ No newline at end of file
diff --git a/app/templates/play.jade b/app/templates/play.jade
index 6f3a77edd..911f14c92 100644
--- a/app/templates/play.jade
+++ b/app/templates/play.jade
@@ -22,7 +22,7 @@ block content
           a(href="/play/#{campaign.levels[0].levelPath || 'level'}/#{campaign.levels[0].id}", data-i18n="play.campaign_#{campaign.id}")= campaign.name
         p.campaign-description(data-i18n="[html]play.campaign_#{campaign.id}_description")!= campaign.description
         each level in campaign.levels
-          a(href=level.disabled ? "/play" : "/play/#{level.levelPath || 'level'}/#{level.id}", disabled=level.disabled)
+          a(href=level.disabled ? "/play" : "/play/#{level.levelPath || 'level'}/#{level.id}", disabled=level.disabled, class=levelStatusMap[level.id] || '')
             .level.row
               if level.image
                 img.level-image(src="#{level.image}", alt="#{level.name}")
diff --git a/app/templates/play/level/modal/editor_config.jade b/app/templates/play/level/modal/editor_config.jade
index 761616ab3..8353d82b6 100644
--- a/app/templates/play/level/modal/editor_config.jade
+++ b/app/templates/play/level/modal/editor_config.jade
@@ -5,9 +5,15 @@ block modal-header-content
 
 block modal-body-content
   .form
+    .form-group.select-group
+      label.control-label(for="tome-language" data-i18n="play_level.editor_config_language_label") Programming Language
+      select#tome-language(name="language")
+        option(value="javascript" selected=(language === "javascript")) JavaScript
+        option(value="coffeescript" selected=(language === "coffeescript")) CoffeeScript
+      span.help-block(data-i18n="play_level.editor_config_language_description") Define the programming language you want to code in.
     .form-group.select-group
       label.control-label(for="tome-key-bindings" data-i18n="play_level.editor_config_keybindings_label") Key Bindings
-      select#tome-key-bindings(name="keyBindings", type="checkbox", checked=multiplayer)
+      select#tome-key-bindings(name="keyBindings")
         option(value="default" selected=(keyBindings === "default") data-i18n="play_level.editor_config_keybindings_default") Default (Ace)
         option(value="vim" selected=(keyBindings === "vim")) Vim
         option(value="emacs" selected=(keyBindings === "emacs")) Emacs
@@ -27,7 +33,6 @@ block modal-body-content
         input#tome-behaviors(name="behaviors", type="checkbox", checked=behaviors)
         span(data-i18n="play_level.editor_config_behaviors_label") Smart Behaviors
       span.help-block(data-i18n="play_level.editor_config_behaviors_description") Autocompletes brackets, braces, and quotes.
-    
+
 block modal-footer-content
   a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="modal.close").btn.btn-primary Close
-
diff --git a/app/views/editor/article/edit.coffee b/app/views/editor/article/edit.coffee
index 5dfa85e41..875dc6113 100644
--- a/app/views/editor/article/edit.coffee
+++ b/app/views/editor/article/edit.coffee
@@ -21,20 +21,21 @@ module.exports = class ArticleEditView extends View
     @article = new Article(_id: @articleID)
     @article.saveBackups = true
 
-    @listenToOnce(@article, 'error', 
-      () => 
+    @listenToOnce(@article, 'error',
+      () =>
         @hideLoading()
 
         # Hack: editor components appear after calling insertSubView.
-        # So we need to hide them first. 
+        # So we need to hide them first.
         $(@$el).find('.main-content-area').children('*').not('#error-view').remove()
 
         @insertSubView(new ErrorView())
     )
 
     @article.fetch()
+    @article.loadSchema()
     @listenToOnce(@article, 'sync', @onArticleSync)
-    @listenTo(@article, 'schema-loaded', @buildTreema)
+    @listenToOnce(@article, 'schema-loaded', @buildTreema)
     @pushChangesToPreview = _.throttle(@pushChangesToPreview, 500)
 
   onArticleSync: ->
@@ -74,6 +75,11 @@ module.exports = class ArticleEditView extends View
     context.authorized = me.isAdmin() or @article.hasWriteAccess(me)
     context
 
+  afterRender: ->
+    super()
+    return if @startsLoading
+    @showReadOnly() unless me.isAdmin() or @article.hasWriteAccess(me)
+
   openPreview: =>
     @preview = window.open('/editor/article/x/preview', 'preview', 'height=800,width=600')
     @preview.focus() if window.focus
diff --git a/app/views/editor/components/main.coffee b/app/views/editor/components/main.coffee
index 6210e66bd..7b813595b 100644
--- a/app/views/editor/components/main.coffee
+++ b/app/views/editor/components/main.coffee
@@ -3,6 +3,7 @@ template = require 'templates/editor/components/main'
 
 Level = require 'models/Level'
 LevelComponent = require 'models/LevelComponent'
+LevelSystem = require 'models/LevelSystem'
 ComponentsCollection = require 'collections/ComponentsCollection'
 ComponentConfigView = require './config'
 
@@ -20,7 +21,8 @@ module.exports = class ThangComponentEditView extends CocoView
   render: =>
     return if @destroyed
     for model in [Level, LevelComponent]
-      (new model()).on 'schema-loaded', @render unless model.schema?.loaded
+      temp = new model()
+      @listenToOnce temp, 'schema-loaded', @render unless model.schema?.loaded
     if not @componentCollection
       @componentCollection = @supermodel.getCollection new ComponentsCollection()
     unless @componentCollection.loaded
@@ -104,7 +106,7 @@ module.exports = class ThangComponentEditView extends CocoView
 
     toRemoveTreema = []
     dependent_class = 'treema-dependent'
-    try     
+    try
       for index, child of @extantComponentsTreema.childrenTreemas
         $(child.$el).removeClass(dependent_class)
 
@@ -157,6 +159,18 @@ module.exports = class ThangComponentEditView extends CocoView
     @reportChanges()
 
   onAddComponentEnterPressed: (node) =>
+    extantSystems =
+      (@supermodel.getModelByOriginalAndMajorVersion LevelSystem, sn.original, sn.majorVersion).attributes.name.toLowerCase() for idx, sn of @level.get('systems')
+    requireSystem = node.data.system.toLowerCase()
+
+    if requireSystem not in extantSystems
+      warn_element = 'Component <b>' + node.data.name + '</b> requires system <b>' + requireSystem + '</b> which is currently not specified in this level.'
+      noty({
+        text: warn_element,
+        layout: 'bottomLeft',
+        type: 'warning'
+      })
+
     currentSelection = @addComponentsTreema?.getLastSelectedTreema()?.data._id
 
     id = node.data._id
diff --git a/app/views/editor/level/component/edit.coffee b/app/views/editor/level/component/edit.coffee
index d1ecea023..7571e9a80 100644
--- a/app/views/editor/level/component/edit.coffee
+++ b/app/views/editor/level/component/edit.coffee
@@ -34,7 +34,7 @@ module.exports = class LevelComponentEditView extends View
     schema = _.cloneDeep LevelComponent.schema.attributes
     schema.properties = _.pick schema.properties, (value, key) => key in @editableSettings
     schema.required = _.intersection schema.required, @editableSettings
-
+    
     treemaOptions =
       supermodel: @supermodel
       schema: schema
diff --git a/app/views/editor/level/edit.coffee b/app/views/editor/level/edit.coffee
index 313308895..b685d457f 100644
--- a/app/views/editor/level/edit.coffee
+++ b/app/views/editor/level/edit.coffee
@@ -45,8 +45,8 @@ module.exports = class EditorLevelView extends View
     @level = new Level _id: @levelID
     @listenToOnce(@level, 'sync', @onLevelLoaded)
 
-    @listenToOnce(@supermodel, 'error', 
-      () => 
+    @listenToOnce(@supermodel, 'error',
+      () =>
         @hideLoading()
         @insertSubView(new ErrorView())
     )
@@ -88,6 +88,7 @@ module.exports = class EditorLevelView extends View
     @componentsTab = @insertSubView new ComponentsTabView supermodel: @supermodel
     @systemsTab = @insertSubView new SystemsTabView supermodel: @supermodel
     Backbone.Mediator.publish 'level-loaded', level: @level
+    @showReadOnly() unless me.isAdmin() or @level.hasWriteAccess(me)
 
   onPlayLevel: (e) ->
     sendLevel = =>
@@ -115,4 +116,4 @@ module.exports = class EditorLevelView extends View
   showVersionHistory: (e) ->
     versionHistoryView = new VersionHistoryView level:@level, @levelID
     @openModalView versionHistoryView
-    Backbone.Mediator.publish 'level:view-switched', e
\ No newline at end of file
+    Backbone.Mediator.publish 'level:view-switched', e
diff --git a/app/views/editor/level/thangs_tab_view.coffee b/app/views/editor/level/thangs_tab_view.coffee
index 72f245a7f..243b1e540 100644
--- a/app/views/editor/level/thangs_tab_view.coffee
+++ b/app/views/editor/level/thangs_tab_view.coffee
@@ -48,6 +48,8 @@ module.exports = class ThangsTabView extends View
 
   events:
     'click #extant-thangs-filter button': 'onFilterExtantThangs'
+    'click #delete': 'onDeleteClicked'
+    'click #duplicate': 'onDuplicateClicked'
 
   shortcuts:
     'esc': 'selectAddThang'
@@ -61,6 +63,7 @@ module.exports = class ThangsTabView extends View
     @thangTypes = @supermodel.getCollection new ThangTypeSearchCollection()  # should load depended-on Components, too
     @listenToOnce(@thangTypes, 'sync', @onThangTypesLoaded)
     @thangTypes.fetch()
+    $(document).bind 'contextmenu', @preventDefaultContextMenu
 
     # just loading all Components for now: https://github.com/codecombat/codecombat/issues/405
     @componentCollection = @supermodel.getCollection new ComponentsCollection()
@@ -185,11 +188,14 @@ module.exports = class ThangsTabView extends View
   onSpriteMouseDown: (e) ->
     # Sprite clicks happen after stage clicks, but we need to know whether a sprite is being clicked.
     clearTimeout @backgroundAddClickTimeout
+    if e.originalEvent.nativeEvent.button == 2
+      @onSpriteContextMenu e
 
   onStageMouseDown: (e) ->
     if @addThangSprite
       # If we click on the background, we need to add @addThangSprite, but not if onSpriteMouseDown will fire.
       @backgroundAddClickTimeout = _.defer => @onExtantThangSelected {}
+    $('#contextmenu').hide()
 
   onSpriteDragged: (e) ->
     return unless @selectedExtantThang and e.thang?.id is @selectedExtantThang?.id
@@ -418,7 +424,29 @@ module.exports = class ThangsTabView extends View
     @editThangView = null
     @onThangsChanged()
     @$el.find('.thangs-column').show()
-
+    
+  preventDefaultContextMenu: (e) ->
+    e.preventDefault()
+    
+  onSpriteContextMenu: (e) ->
+    {clientX, clientY} = e.originalEvent.nativeEvent
+    if @addThangType
+      $('#duplicate a').html 'Stop Duplicate'
+    else
+      $('#duplicate a').html 'Duplicate'
+    $('#contextmenu').css { position: 'fixed', left: clientX, top: clientY }
+    $('#contextmenu').show()
+    
+  onDeleteClicked: (e) ->
+    $('#contextmenu').hide()
+    @deleteSelectedExtantThang e
+  
+  onDuplicateClicked: (e) ->
+    $('#contextmenu').hide()
+    if !@addThangType
+      thang = @selectedExtantThang.spriteName
+      e.target = $(".add-thang-palette-icon[data-thang-type='" + thang + "']").get 0
+    @selectAddThang e
 
 class ThangsNode extends TreemaNode.nodeMap.array
   valueClass: 'treema-array-replacement'
diff --git a/app/views/editor/thang/edit.coffee b/app/views/editor/thang/edit.coffee
index c467e04c0..660280e54 100644
--- a/app/views/editor/thang/edit.coffee
+++ b/app/views/editor/thang/edit.coffee
@@ -45,12 +45,12 @@ module.exports = class ThangTypeEditView extends View
     @thangType = new ThangType(_id: @thangTypeID)
     @thangType.saveBackups = true
 
-    @listenToOnce(@thangType, 'error', 
-      () => 
+    @listenToOnce(@thangType, 'error',
+      () =>
         @hideLoading()
 
         # Hack: editor components appear after calling insertSubView.
-        # So we need to hide them first. 
+        # So we need to hide them first.
         $(@$el).find('.main-content-area').children('*').not('#error-view').remove()
 
         @insertSubView(new ErrorView())
@@ -90,6 +90,7 @@ module.exports = class ThangTypeEditView extends View
     @initSliders()
     @initComponents()
     @insertSubView(new ColorsTabView(@thangType))
+    @showReadOnly() unless me.isAdmin() or @thangType.hasWriteAccess(me)
 
   initComponents: =>
     options =
diff --git a/app/views/kinds/CocoView.coffee b/app/views/kinds/CocoView.coffee
index 780743391..ed81e4a20 100644
--- a/app/views/kinds/CocoView.coffee
+++ b/app/views/kinds/CocoView.coffee
@@ -47,6 +47,7 @@ module.exports = class CocoView extends Backbone.View
     @destroyed = true
     @off = doNothing
     @destroy = doNothing
+    $.noty.closeAll()
 
   afterInsert: ->
 
@@ -56,6 +57,7 @@ module.exports = class CocoView extends Backbone.View
     @hidden = true
     @stopListeningToShortcuts()
     view.willDisappear() for id, view of @subviews
+    $.noty.closeAll()
 
   didReappear: ->
     # the router brings back this view from the cache
@@ -134,9 +136,7 @@ module.exports = class CocoView extends Backbone.View
 
   showLoading: ($el=@$el) ->
     $el.find('>').addClass('hidden')
-    $el.append($('<div class="loading-screen"></div>')
-    .append('<h2>Loading</h2>')
-    .append('<div class="progress progress-striped active loading"><div class="progress-bar"></div></div>'))
+    $el.append loadingScreenTemplate()
     @_lastLoading = $el
 
   hideLoading: ->
@@ -145,6 +145,11 @@ module.exports = class CocoView extends Backbone.View
     @_lastLoading.find('>').removeClass('hidden')
     @_lastLoading = null
 
+  showReadOnly: ->
+    return if me.isAdmin()
+    warning = $.i18n.t 'editor.read_only_warning', defaultValue: "Note: you can't save any edits here, because you're not logged in as an admin."
+    noty text: warning, layout: 'center', type: 'information', killer: true, timeout: 5000
+
   # Loading ModalViews
 
   enableModalInProgress: (modal) ->
diff --git a/app/views/modal/signup_modal.coffee b/app/views/modal/signup_modal.coffee
index 8a39d0dca..5ecbc07c5 100644
--- a/app/views/modal/signup_modal.coffee
+++ b/app/views/modal/signup_modal.coffee
@@ -37,7 +37,7 @@ module.exports = class SignupModalView extends View
 
   checkAge: (e) ->
     $("#signup-button", @$el).prop 'disabled', not $(e.target).prop('checked')
-    
+
   getRenderData: ->
     c = super()
     c.showRequiredError = @options.showRequiredError
@@ -61,4 +61,4 @@ module.exports = class SignupModalView extends View
     return forms.applyErrorsToForm(@$el, res.errors) unless res.valid
     window.tracker?.trackEvent 'Finished Signup'
     @enableModalInProgress(@$el)
-    createUser(userObject)
+    createUser userObject, null, window.nextLevelURL
diff --git a/app/views/play/level/modal/editor_config_modal.coffee b/app/views/play/level/modal/editor_config_modal.coffee
index 044a4dfaa..6be98b44d 100644
--- a/app/views/play/level/modal/editor_config_modal.coffee
+++ b/app/views/play/level/modal/editor_config_modal.coffee
@@ -8,14 +8,16 @@ module.exports = class EditorConfigModal extends View
   aceConfig: {}
 
   defaultConfig:
+    language: 'javascript'
     keyBindings: 'default'
     invisibles: false
     indentGuides: false
     behaviors: false
 
   events:
-    'change #tome-invisibles': 'updateInvisiblesSelection'
-    'change #tome-key-bindings': 'updateKeyBindingsSelection'
+    'change #tome-invisibles': 'updateInvisibles'
+    'change #tome-language': 'updateLanguage'
+    'change #tome-key-bindings': 'updateKeyBindings'
     'change #tome-indent-guides': 'updateIndentGuides'
     'change #tome-behaviors': 'updateBehaviors'
 
@@ -26,16 +28,20 @@ module.exports = class EditorConfigModal extends View
     @aceConfig = _.cloneDeep me.get('aceConfig') ? {}
     @aceConfig = _.defaults @aceConfig, @defaultConfig
     c = super()
+    c.language = @aceConfig.language
     c.keyBindings = @aceConfig.keyBindings
     c.invisibles = @aceConfig.invisibles
     c.indentGuides = @aceConfig.indentGuides
     c.behaviors = @aceConfig.behaviors
     c
 
-  updateInvisiblesSelection: ->
+  updateLanguage: ->
+    @aceConfig.language = @$el.find('#tome-language').val()
+
+  updateInvisibles: ->
     @aceConfig.invisibles = @$el.find('#tome-invisibles').prop('checked')
 
-  updateKeyBindingsSelection: ->
+  updateKeyBindings: ->
     @aceConfig.keyBindings = @$el.find('#tome-key-bindings').val()
 
   updateIndentGuides: ->
@@ -48,12 +54,15 @@ module.exports = class EditorConfigModal extends View
     super()
 
   onHidden: ->
+    oldLanguage = @aceConfig.language
+    @aceConfig.language = @$el.find('#tome-language').val()
     @aceConfig.invisibles = @$el.find('#tome-invisibles').prop('checked')
     @aceConfig.keyBindings = @$el.find('#tome-key-bindings').val()
     @aceConfig.indentGuides = @$el.find('#tome-indent-guides').prop('checked')
     @aceConfig.behaviors = @$el.find('#tome-behaviors').prop('checked')
     me.set 'aceConfig', @aceConfig
-    Backbone.Mediator.publish 'change:editor-config'
+    Backbone.Mediator.publish 'tome:change-config'
+    Backbone.Mediator.publish 'tome:change-language' unless @aceConfig.language isnt oldLanguage
     me.save()
 
   destroy: ->
diff --git a/app/views/play/level/tome/spell.coffee b/app/views/play/level/tome/spell.coffee
index deaf856f8..a0cb680cb 100644
--- a/app/views/play/level/tome/spell.coffee
+++ b/app/views/play/level/tome/spell.coffee
@@ -85,11 +85,13 @@ module.exports = class Spell
     aether.hasChangedSignificantly (newSource ? @originalSource), (currentSource ? @source), true, true
 
   createAether: (thang) ->
+    aceConfig = me.get('aceConfig') ? {}
     aetherOptions =
       problems:
         jshint_W040: {level: "ignore"}
         jshint_W030: {level: "ignore"}  # aether_NoEffect instead
         aether_MissingThis: {level: (if thang.requiresThis then 'error' else 'warning')}
+      language: aceConfig.language ? 'javascript'
       functionName: @name
       functionParameters: @parameters
       yieldConditionally: thang.plan?
@@ -107,5 +109,12 @@ module.exports = class Spell
     aether = new Aether aetherOptions
     aether
 
+  updateLanguageAether: ->
+    aceConfig = me.get('aceConfig') ? {}
+    for thangId, spellThang of @thangs
+      spellThang.aether?.setLanguage (aceConfig.language ? 'javascript')
+      spellThang.castAether = null
+    @transpile()
+
   toString: ->
     "<Spell: #{@spellKey}>"
diff --git a/app/views/play/level/tome/spell_view.coffee b/app/views/play/level/tome/spell_view.coffee
index e55e03210..17a813459 100644
--- a/app/views/play/level/tome/spell_view.coffee
+++ b/app/views/play/level/tome/spell_view.coffee
@@ -15,6 +15,10 @@ module.exports = class SpellView extends View
   eventsSuppressed: true
   writable: true
 
+  editModes:
+    'javascript': 'ace/mode/javascript'
+    'coffeescript': 'ace/mode/coffee'
+
   keyBindings:
     'default': null
     'vim': 'ace/keyboard/vim'
@@ -34,8 +38,9 @@ module.exports = class SpellView extends View
     'modal-closed': 'focus'
     'focus-editor': 'focus'
     'tome:spell-statement-index-updated': 'onStatementIndexUpdated'
+    'tome:change-language': 'onChangeLanguage'
+    'tome:change-config': 'onChangeEditorConfig'
     'spell-beautify': 'onSpellBeautify'
-    'change:editor-config': 'onChangeEditorConfig'
 
   events:
     'mouseout': 'onMouseOut'
@@ -67,7 +72,7 @@ module.exports = class SpellView extends View
     @aceSession = @ace.getSession()
     @aceDoc = @aceSession.getDocument()
     @aceSession.setUseWorker false
-    @aceSession.setMode 'ace/mode/javascript'
+    @aceSession.setMode @editModes[aceConfig.language ? 'javascript']
     @aceSession.setWrapLimitRange null
     @aceSession.setUseWrapMode true
     @aceSession.setNewLineMode "unix"
@@ -562,10 +567,15 @@ module.exports = class SpellView extends View
     @ace.setValue pretty
 
   onChangeEditorConfig: (e) ->
-    aceConfig = me.get 'aceConfig'
-    @ace.setDisplayIndentGuides (aceConfig.indentGuides || false)
-    @ace.setShowInvisibles (aceConfig.invisibles || false)
-    @ace.setKeyboardHandler (@keyBindings[aceConfig.keyBindings] || null)
+    aceConfig = me.get('aceConfig') ? {}
+    @ace.setDisplayIndentGuides aceConfig.indentGuides # default false
+    @ace.setShowInvisibles aceConfig.invisibles # default false
+    @ace.setKeyboardHandler @keyBindings[aceConfig.keyBindings ? 'default']
+    # @aceSession.setMode @editModes[aceConfig.language ? 'javascript']
+
+  onChangeLanguage: (e) ->
+    aceConfig = me.get('aceConfig') ? {}
+    @aceSession.setMode @editModes[aceConfig.language ? 'javascript']
 
   dismiss: ->
     @recompile() if @spell.hasChangedSignificantly @getSource()
diff --git a/app/views/play/level/tome/tome_view.coffee b/app/views/play/level/tome/tome_view.coffee
index a60179969..e7cc1d7e8 100644
--- a/app/views/play/level/tome/tome_view.coffee
+++ b/app/views/play/level/tome/tome_view.coffee
@@ -48,6 +48,7 @@ module.exports = class TomeView extends View
     'tome:spell-loaded': "onSpellLoaded"
     'tome:cast-spell': "onCastSpell"
     'tome:toggle-spell-list': 'onToggleSpellList'
+    'tome:change-language': 'updateLanguageForAllSpells'
     'surface:sprite-selected': 'onSpriteSelected'
     'god:new-world-created': 'onNewWorld'
 
@@ -215,6 +216,9 @@ module.exports = class TomeView extends View
     spell.view.reloadCode false for spellKey, spell of @spells when spell.team is me.team
     Backbone.Mediator.publish 'tome:cast-spells', spells: @spells
 
+  updateLanguageForAllSpells: ->
+    spell.updateLanguageAether() for spellKey, spell of @spells
+
   destroy: ->
     spell.destroy() for spellKey, spell of @spells
     @worker?._close()
diff --git a/app/views/play/level_view.coffee b/app/views/play/level_view.coffee
index 083d99cb0..bd60b867f 100644
--- a/app/views/play/level_view.coffee
+++ b/app/views/play/level_view.coffee
@@ -274,10 +274,12 @@ module.exports = class PlayLevelView extends View
     setTimeout(@preloadNextLevel, 3000)
 
   showVictory: ->
-    options = {level: @level, supermodel: @supermodel, session:@session}
+    options = {level: @level, supermodel: @supermodel, session: @session}
     docs = new VictoryModal(options)
     @openModalView(docs)
     window.tracker?.trackEvent 'Saw Victory', level: @world.name, label: @world.name
+    if me.get('anonymous')
+      window.nextLevelURL = @getNextLevelID()  # Signup will go here on completion instead of reloading.
 
   onRestartLevel: ->
     @tome.reloadAllCode()
@@ -294,11 +296,10 @@ module.exports = class PlayLevelView extends View
     window.tracker?.trackEvent 'Saw Initial Infinite Loop', level: @world.name, label: @world.name
 
   onPlayNextLevel: ->
-    nextLevel = @getNextLevel()
-    nextLevelID = nextLevel.get('slug') or nextLevel.id
-    url = "/play/level/#{nextLevelID}"
+    nextLevelID = @getNextLevelID()
+    nextLevelURL = @getNextLevelURL()
     Backbone.Mediator.publish 'router:navigate', {
-      route: url,
+      route: nextLevelURL,
       viewClass: PlayLevelView,
       viewArgs: [{supermodel:@supermodel}, nextLevelID]}
 
@@ -307,6 +308,12 @@ module.exports = class PlayLevelView extends View
     levels = @supermodel.getModels(Level)
     return l for l in levels when l.get('original') is nextLevelOriginal
 
+  getNextLevelID: ->
+    nextLevel = @getNextLevel()
+    nextLevelID = nextLevel.get('slug') or nextLevel.id
+
+  getNextLevelURL: -> "/play/level/#{@getNextLevelID()}"
+
   onHighlightDom: (e) ->
     if e.delay
       delay = e.delay
@@ -471,5 +478,6 @@ module.exports = class PlayLevelView extends View
     clearInterval(@pointerInterval)
     @bus?.destroy()
     #@instance.save() unless @instance.loading
+    delete window.nextLevelURL
     console.profileEnd?() if PROFILE_ME
     super()
diff --git a/app/views/play_view.coffee b/app/views/play_view.coffee
index 6a92978e3..349f900c7 100644
--- a/app/views/play_view.coffee
+++ b/app/views/play_view.coffee
@@ -1,10 +1,32 @@
 View = require 'views/kinds/RootView'
 template = require 'templates/play'
+LevelSession = require 'models/LevelSession'
+CocoCollection = require 'models/CocoCollection'
+
+class LevelSessionsCollection extends CocoCollection
+  url: ''
+  model: LevelSession
+
+  constructor: (model) ->
+    super()
+    @url = "/db/user/#{me.id}/level.sessions?project=state.complete,levelID"
 
 module.exports = class PlayView extends View
   id: "play-view"
   template: template
 
+  constructor: (options) ->
+    super options
+    @levelStatusMap = {}
+    @sessions = new LevelSessionsCollection()
+    @sessions.fetch()
+    @listenToOnce @sessions, 'sync', @onSessionsLoaded
+
+  onSessionsLoaded: (e) ->
+    for session in @sessions.models
+      @levelStatusMap[session.get('levelID')] = if session.get('state')?.complete then 'complete' else 'started'
+    @render()
+
   getRenderData: (context={}) ->
     context = super(context)
     context.home = true
@@ -198,7 +220,7 @@ module.exports = class PlayView extends View
       {id: "dev", name: "Random Harder Levels", description: "... in which you learn the interface while doing something a little harder.", levels: experienced}
       {id: "player_created", name: "Player-Created", description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>.", levels: playerCreated}
     ]
-
+    context.levelStatusMap = @levelStatusMap
     context
 
   afterRender: ->
diff --git a/bower.json b/bower.json
index b499ee391..bd24eb94c 100644
--- a/bower.json
+++ b/bower.json
@@ -32,7 +32,7 @@
     "firepad": "~0.1.2",
     "marked": "~0.3.0",
     "moment": "~2.5.0",
-    "aether": "~0.1.14",
+    "aether": "~0.1.18",
     "underscore.string": "~2.3.3",
     "firebase": "~1.0.2",
     "catiline": "~2.9.3"
diff --git a/scripts/devSetup/ruby.py b/scripts/devSetup/ruby.py
index 09174a8f4..410ec6ead 100644
--- a/scripts/devSetup/ruby.py
+++ b/scripts/devSetup/ruby.py
@@ -34,7 +34,7 @@ class Ruby(dependency.Dependency):
         elif operating_system == u"mac":
             raise errors.CoCoError(u"Ruby should be installed with Mac OSX machines. Please install Ruby.")
         elif operating_system == u"linux":
-            raise errors.CoCoError(u"Please install Ruby (try 'sudo apt-get install ruby').\nIf you are not using Ubuntu then please see your Linux Distribution's documentation for help installing ruby."")
+            raise errors.CoCoError(u"Please install Ruby (try 'sudo apt-get install ruby').\nIf you are not using Ubuntu then please see your Linux Distribution's documentation for help installing ruby.")
     def install_ruby_on_windows(self):
         raise NotImplementedError
 
diff --git a/scripts/windows/coco-dev-setup/batch/config/config.coco b/scripts/windows/coco-dev-setup/batch/config/config.coco
index 3ce86efa4..c79721d85 100755
--- a/scripts/windows/coco-dev-setup/batch/config/config.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/config.coco
@@ -1,3 +1,6 @@
 version=1.0
 author=GlenDC
-copyright=CodeCombat.com � 2013-2014
\ No newline at end of file
+copyright=CodeCombat.com � 2013-2014
+github_url=https://github.com/codecombat/codecombat.git
+github_ssh=git@github.com:codecombat/codecombat.git
+database_backup=http://23.21.59.137/dump.tar.gz
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/downloads.coco b/scripts/windows/coco-dev-setup/batch/config/downloads.coco
index 47253f152..6f4d23b22 100755
--- a/scripts/windows/coco-dev-setup/batch/config/downloads.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/downloads.coco
@@ -2,19 +2,21 @@
 	[32]
 		nodejs=http://nodejs.org/dist/v0.10.25/node-v0.10.25-x86.msi
 		ruby=http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353.exe?direct
-		python=http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi
+		python=https://www.python.org/ftp/python/2.7.6/python-2.7.6.msi
 	[64]
 		nodejs=http://nodejs.org/dist/v0.10.25/x64/node-v0.10.25-x64.msi
 		ruby=http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353-x64.exe?direct
-		python=http://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi
+		python=https://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi
+		winsdk=http://download.microsoft.com/download/A/6/A/A6AC035D-DA3F-4F0C-ADA4-37C8E5D34E3D/winsdk_web.exe
 	[general]
 		gitbash=https://msysgit.googlecode.com/files/Git-1.8.5.2-preview20131230.exe
-[win7]
+		visualstudio2010=http://download.microsoft.com/download/1/D/9/1D9A6C0E-FC89-43EE-9658-B9F0E3A76983/vc_web.exe
+[Win7]
 	[32]
 		mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-i386-2.5.4.zip
 	[64]
 		mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2008plus-2.5.4.zip
-[vista]
+[Vista]
 	[64]
 		mongodb=http://fastdl.mongodb.org/win32/mongodb-win32-x86_64-2.5.4.zip
 	[32]
diff --git a/scripts/windows/coco-dev-setup/batch/config/finished_header.coco b/scripts/windows/coco-dev-setup/batch/config/finished_header.coco
new file mode 100755
index 000000000..3e8f64b02
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/finished_header.coco
@@ -0,0 +1,7 @@
+              ______ _____ _   _ _____ _____ _   _  ___________ 
+              |  ___|_   _| \ | |_   _/  ___| | | ||  ___|  _  \
+              | |_    | | |  \| | | | \ `--.| |_| || |__ | | | |
+              |  _|   | | | . ` | | |  `--. \  _  ||  __|| | | |
+              | |    _| |_| |\  |_| |_/\__/ / | | || |___| |/ / 
+              \_|    \___/\_| \_/\___/\____/\_| |_/\____/|___/  
+              
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/github_header.coco b/scripts/windows/coco-dev-setup/batch/config/github_header.coco
new file mode 100755
index 000000000..dd979561d
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/github_header.coco
@@ -0,0 +1,7 @@
+                     _____ _____ _____ _   _ _   _______ 
+                    |  __ \_   _|_   _| | | | | | | ___ \
+                    | |  \/ | |   | | | |_| | | | | |_/ /
+                    | | __  | |   | | |  _  | | | | ___ \
+                    | |_\ \_| |_  | | | | | | |_| | |_/ /
+                     \____/\___/  \_/ \_| |_/\___/\____/ 
+ 
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/info.coco b/scripts/windows/coco-dev-setup/batch/config/info.coco
deleted file mode 100755
index 66ee83329..000000000
--- a/scripts/windows/coco-dev-setup/batch/config/info.coco
+++ /dev/null
@@ -1,9 +0,0 @@
-======================================================================
-   _____           _        _____                 _           _   
-  /  __ \         | |      /  __ \               | |         | |  
-  | /  \/ ___   __| | ___  | /  \/ ___  _ __ ___ | |__   __ _| |_ 
-  | |    / _ \ / _` |/ _ \ | |    / _ \| '_ ` _ \| '_ \ / _` | __|
-  | \__/\ (_) | (_| |  __/ | \__/\ (_) | | | | | | |_) | (_| | |_ 
-   \____/\___/ \__,_|\___|  \____/\___/|_| |_| |_|_.__/ \__,_|\__|
-
-======================================================================
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/install_header.coco b/scripts/windows/coco-dev-setup/batch/config/install_header.coco
new file mode 100755
index 000000000..a804e1db3
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/install_header.coco
@@ -0,0 +1,7 @@
+              _____  ___________ _____ _    _  ___  ______ _____      
+             /  ___||  _  |  ___|_   _| |  | |/ _ \ | ___ \  ___|     
+             \ `--. | | | | |_    | | | |  | / /_\ \| |_/ / |__       
+              `--. \| | | |  _|   | | | |/\| |  _  ||    /|  __|      
+             /\__/ /\ \_/ / |     | | \  /\  / | | || |\ \| |___      
+             \____/  \___/\_|     \_/  \/  \/\_| |_/\_| \_\____/  
+         
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco b/scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
new file mode 100755
index 000000000..968e651dd
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/npm_and_brunch_header.coco
@@ -0,0 +1,7 @@
+     _   _ _________  ___          ____________ _   _ _   _ _____  _   _ 
+    | \ | || ___ \  \/  |          | ___ \ ___ \ | | | \ | /  __ \| | | |
+    |  \| || |_/ / .  . |  ______  | |_/ / |_/ / | | |  \| | /  \/| |_| |
+    | . ` ||  __/| |\/| | |______| | ___ \    /| | | | . ` | |    |  _  |
+    | |\  || |   | |  | |          | |_/ / |\ \| |_| | |\  | \__/\| | | |
+    \_| \_/\_|   \_|  |_/          \____/\_| \_|\___/\_| \_/\____/\_| |_/
+                                                                        
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/config/readme.coco b/scripts/windows/coco-dev-setup/batch/config/readme.coco
new file mode 100755
index 000000000..40665c28c
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/config/readme.coco
@@ -0,0 +1,29 @@
+       _____           _        _____                 _           _   
+      /  __ \         | |      /  __ \               | |         | |  
+      | /  \/ ___   __| | ___  | /  \/ ___  _ __ ___ | |__   __ _| |_ 
+      | |    / _ \ / _` |/ _ \ | |    / _ \| '_ ` _ \| '_ \ / _` | __|
+      | \__/\ (_) | (_| |  __/ | \__/\ (_) | | | | | | |_) | (_| | |_ 
+       \____/\___/ \__,_|\___|  \____/\___/|_| |_| |_|_.__/ \__,_|\__|
+ 
+=============================================================================
+ 
+Congratulations, you are now part of the CodeCombat community.
+Now that your Develop Environment has been setup, you are ready to start
+contributing and help us make this world a better place.
+ 
+Do you have questions or would you like to meet us?
+Talk with us on hipchat @ https://www.hipchat.com/g3plnOKqa
+ 
+Another way to reach is, is by visiting our forum.
+You can find it @ http://discourse.codecombat.com/
+ 
+You can read about the latest developments on our blog site.
+This one can be found @ http://blog.codecombat.com/
+ 
+Last but not least, you can find most of our documentation
+and information on our wiki @ https://github.com/codecombat/codecombat/wiki
+ 
+We hope you'll enjoy yourself within our community, just as much as us.
+ 
+ 
+                            - Nick, George, Scott, Michael, Jeremy and Glen
diff --git a/scripts/windows/coco-dev-setup/batch/config/tips.coco b/scripts/windows/coco-dev-setup/batch/config/tips.coco
index b15f7d6e2..0a4bb84c4 100755
--- a/scripts/windows/coco-dev-setup/batch/config/tips.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/tips.coco
@@ -1,5 +1,7 @@
-  1) This program is all about automating the setup of the CoCo environment
-  2) When there is a question, please answer carefull and correct
-  3) This setup is still in beta and may contain bugs
-  4) You can report bugs @ 'https://github.com/codecombat/codecombat/issues'
-  5) Having questions/suggestions? Talk with us on HipChat via CodeCombat.com
\ No newline at end of file
+  1) When there is a question, please answer carefull and correct
+  2) This setup is still in beta and may contain bugs
+  3) You can report bugs @ 'https://github.com/codecombat/codecombat/issues'
+  4) Having questions/suggestions? Talk with us on HipChat via CodeCombat.com
+ 
+  You can find a step-by-step guide for this installation on our wiki.
+  https://github.com/codecombat/codecombat/wiki/<guide_path>
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/get_config.bat b/scripts/windows/coco-dev-setup/batch/get_config.bat
deleted file mode 100755
index ccd995c70..000000000
--- a/scripts/windows/coco-dev-setup/batch/get_config.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-get_var config/config.coco %1
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/get_download.bat b/scripts/windows/coco-dev-setup/batch/get_download.bat
deleted file mode 100755
index 38f745faf..000000000
--- a/scripts/windows/coco-dev-setup/batch/get_download.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-get_var config/downloads.coco %1
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/get_text.bat b/scripts/windows/coco-dev-setup/batch/get_text.bat
deleted file mode 100755
index e7a5d399b..000000000
--- a/scripts/windows/coco-dev-setup/batch/get_text.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-get_var localisation/%1.coco %2 
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/get_var.exe b/scripts/windows/coco-dev-setup/batch/get_var.exe
deleted file mode 100755
index e07a3cf14..000000000
Binary files a/scripts/windows/coco-dev-setup/batch/get_var.exe and /dev/null differ
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/de.coco b/scripts/windows/coco-dev-setup/batch/localisation/de.coco
new file mode 100755
index 000000000..01c77c7ea
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localisation/de.coco
@@ -0,0 +1,66 @@
+[global]
+	native=Deutsch
+	intro=Ab jetzt senden wir unser Feedback in Englisch!
+[install]
+	[system]
+		bit=-Bit System erkannt.
+		prefix=Es wurde das Betriebssystem
+		sufix=erkannt.
+		xp=Windows XP wird nicht unterstützt. Installation abgebrochen.
+	[process]
+		sks=Sind die für CodeCombat benötigten Programme bereits installiert?
+		skq=Wir empfehlen Ihnen, mit „Nein“ zu antorten, falls Sie unsicher sind.
+		skc=Überspringe Installation der Programme...
+		1=Ohne Software von Drittanbietern könnte CodeCombat nicht entwickelt werden.
+		2=Aus diesem Grund müssen Sie diese Software installieren,
+		3=um sich in der Community zu engagieren.
+		4=Wenn Sie ein Programm bereits installiert haben, brechen Sie die Installation bitte ab.
+		prefix=Haben Sie bereits die aktuellste Version von
+		sufix=installiert?
+		downloading=wird heruntergeladen...
+		installing=wird installiert...
+		unzipping=wird entpackt...
+		cleaning=wird aufgeräumt...
+		mongodbpath=Bitte geben Sie den kompletten Pfad an, an dem MongoDB installiert werden soll
+[github]
+	[intro]
+		opensource=Wie Du bereits weißt, ist CodeCombat Open Source.
+		online=Unser Quellcode ist komplett auf Github.
+		manual=Wenn Du möchtest, kannst du das komplette Git Repository selbst herunterladen und nach deinen wünschen einrichten.
+		norec=Allerdings empfehlen wir, dass du den Prozess statt dessen uns überlässt.
+	[skip]
+		question=Willst du das lokale Git Setup selbst vornehmen?
+		consequence=Bit vergewissere dich, dass das Repository korrekt heruntergeladen wurde, bevor du fortfährst.
+		donotclose=Bitte schließe dieses Fenster nicht.
+		wait=Wenn du fertig bist, drücke eine beliebige Taste zum Fortfahren...
+	[process]
+		path=Gebe bitte den kompletten Pfad zu deinem CodeCombat Git Repository ein: 
+		checkout=Bitte gib den kompletten Pfad ein, an dem du die CodeCombat Umgebung einrichten willst
+		bashi=Diese Installation benötigt die Git Bash.
+		bashp64=Die Git Bash ist standardmäßig in 'C:\Program Files (x86)\Git' installiert.
+		bashp32=Die Git Bash ist standardmäßig in 'C:\Program Files\Git' installiert.
+		bashq=Bitte gebe den kompletten Pfad zur Git Bash ein, oder drücke Enter, um den Standardpfad zu verwenden
+		ssh=Willst du das Repository via SSH auschecken?
+[npm]
+	install=Installing bower, brunch, nodemon and sendwithus...
+	binstall=Installing bower packages...
+	sass=Installing sass...
+	npm=Installing npm...
+	brnch=Starting brunch....
+	mongodb=Setting up a MongoDB database for you...
+	database=Downloading the last version of the CodeCombat database...
+	script=Preparing the automatic startup script for you...
+[error]
+	path=Dieser Pfad existiert bereits. Willst du ihn wirklich überschreiben?
+	exist=Dieser Pfad exisitert nicht. Bitte versuche es erneut...
+[end]
+	succesfull=Die CodeCombat Entwicklungsumgebung wurde erfoglreich installiert.
+	thankyou=Vielen Dank für die Unterstützung und bis bald.
+	readme=Willst du das README lesen, um weitere Informationen zu erhalten?
+[start]
+	1=Von nun an kannst du die Entwicklungsumgebung starten unter
+	2=einmal mit der Maus klicken.
+	3=  1) Einfach Doppelklicken
+	4=und warten bis die Entwicklungsumgebung fertig geladen hat.
+	5=  2) Jetzt 'localhost:3000' in deinem bevorzugten Browser aufrufen.
+	6=Fertig. Du bist nun bereit, bei CodeCombat mitzuarbeiten!
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/en.coco b/scripts/windows/coco-dev-setup/batch/localisation/en.coco
index 03442cea3..71f18b2d1 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/en.coco
+++ b/scripts/windows/coco-dev-setup/batch/localisation/en.coco
@@ -1,41 +1,66 @@
 [global]
 	native=English
-	bye=Bye Bye!
+	intro=From now on we'll send our feedback in English!
 [install]
-	begin=Installation has begun, this can take a while... Please stay tuned...
-	close=Don't close any windows please, unless specified explicitly.
-[dai]
-	title=[DOWNLOADING AND INSTALLING 3RD PARTY SOFTWARE]
-	downloading=downloading:
-	installing=installing:
-	cancel=Download and Installation cancelled...
-	software=Software has been installed...
-	devenv=Installation of the Developers Environment is complete!
-	stop=Installation has been stopped...
-	unpacking=unpacking and moving:
-	bower=Installing bower, brunch, nodemon and sendwithus...
-[git]
-	stored=CodeCombat is safely stored on a git repository.
-	clapp=Therefore you need a git command-line application (Git-bash).
-	examples=Examples: git-bash, CygWin, ...
-	question=Do you already have git-bash?
-	path=Enter the path to where you installed Git-bash
-	checkout=Checking out the Git Repository...
-	username=Please enter your github username:
-[nodejs]
-	question=Do you already have the latest version of node-js installed?
-	path=Please enter the full path of the location you installed nodejs to:
-[ruby]
-	question=Do you already have the latest version of ruby installed?
-[mongodb]
-	question=Do you already have the latest version of mongo-db installed?
-	path=Enter the path where you would like to install MongoDB:
-[python]
-	question=Do you already have the latest version of python installed?
+	[system]
+		bit=-bit computer detected.
+		prefix=The operating system
+		sufix=was detected.
+		xp=We don't support Windows XP, installation cancelled.
+	[process]
+		sks=Have you already installed all the software needed for CodeCombat?
+		skq=We recommand that you reply negative in case you're not sure.
+		skc=Skipping the installation of the software...
+		1=CodeCombat couldn't be developed without third-party software.
+		2=That's why you'll need to install this software,
+		3=in order to start contributing to our community.
+		4=Cancel the installation if you already have the application.
+		prefix=Do you already have the latest version of
+		sufix=installed?
+		downloading=is downloading...
+		installing=is installing...
+		unzipping=is unzipping...
+		cleaning=is cleaning...
+		mongodbpath=Please define the full path where mongodb should be installed
+[github]
+	[intro]
+		opensource=CodeCombat is opensource, like you already know.
+		online=All our sourcecode can be found online at Github.
+		manual=You can choose to do the entire Git setup yourself.
+		norec=However we recommend that you instead let us handle it instead.
+	[skip]
+		question=Do you want to do the Local Git setup manually yourself?
+		consequence=Make sure you have correctly setup your repository before processing.
+		donotclose=Do not close this window please.
+		wait=When you're ready, press any key to continue...
+	[process]
+		path=Please give the full path of your CodeCombat git repository: 
+		checkout=Please enter the full path where you want to install your CodeCombat environment
+		bashi=This installation requires Git Bash.
+		bashp64=Git bash is by default installed at 'C:\Program Files (x86)\Git'.
+		bashp32=Git bash is by default installed at 'C:\Program Files\Git'.
+		bashq=Please enter the full path where git bash is installed or just press enter if it's in the default location
+		ssh=Do you want to checkout the repository via ssh?
+[npm]
+	install=Installing bower, brunch, nodemon and sendwithus...
+	binstall=Installing bower packages...
+	sass=Installing sass...
+	npm=Installing npm...
+	brnch=Starting brunch....
+	mongodb=Setting up a MongoDB database for you...
+	db=Downloading the last version of the CodeCombat database...
+	script=Preparing the automatic startup script for you...
 [error]
-	xp=Sadly we can't support Windows XP... Please upgrade your OS!
-	os=Machine OS cannot be determined...
-	osreport=Report your OS to the developers @ CodeCombat.com...
-	nocleaning=... Cleaning up has been disabled... Terminating Script!
-	git_app_path=The path to your git application is incorrect, please try again...
-	invalid_path=The path you entered is invalid, please try again...
\ No newline at end of file
+	path=That path already exists, are you sure you want to overwrite it?
+	exist=That path doesn't exist. Please try again...
+[end]
+	succesfull=The setup of the CodeCombat Dev. Environment was succesfull.
+	thankyou=Thank you already for your contribution and see you soon.
+	readme=Do you want to read the README for more information?
+[start]
+	1=From now on you can start the dev. environment at
+	2=the touch of a single mouse click.
+	3=  1) Just double click
+	4=     and let the environment start up.
+	5=  2) Now just open 'localhost:3000' in your prefered browser.
+	6=That's it, you're now ready to start working on CodeCombat!
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/languages.coco b/scripts/windows/coco-dev-setup/batch/localisation/languages.coco
new file mode 100755
index 000000000..da3331dfe
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/localisation/languages.coco
@@ -0,0 +1,3 @@
+en
+nl
+de
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
index a5f9a1abe..cae6e19ed 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
+++ b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
@@ -1,41 +1,66 @@
 [global]
-	native=English
-	bye=Bye Bye!
+	native=Nederlands
+	intro=Vanaf nu geven we onze feedback in het Nederlands!
 [install]
-	begin=De installatie is begonnen, dit kan een tijdje duren. Geduld alsjeblieft...
-	close=Don't close any windows please, unless specified explicitly.
-[dai]
-	title=[DOWNLOADING AND INSTALLING 3RD PARTY SOFTWARE]
-	downloading=downloading:
-	installing=installing:
-	cancel=Download and Installation cancelled...
-	software=Software has been installed...
-	devenv=Installation of the Developers Environment is complete!
-	stop=Installation has been stopped...
-	unpacking=unpacking and moving:
-	bower=Installing bower, brunch, nodemon and sendwithus...
-[git]
-	stored=CodeCombat is safely stored on a git repository.
-	clapp=Therefore you need a git command-line application (Git-bash).
-	examples=Examples: git-bash, CygWin, ...
-	question=Do you already have git-bash?
-	path=Enter the path to where you installed Git-bash
-	checkout=Checking out the Git Repository...
-	username=Please enter your github username:
-[nodejs]
-	question=Do you already have the latest version of node-js installed?
-	path=Please enter the full path of the location you installed nodejs to:
-[ruby]
-	question=Do you already have the latest version of ruby installed?
-[mongodb]
-	question=Do you already have the latest version of mongo-db installed?
-	path=Enter the path where you would like to install MongoDB:
-[python]
-	question=Do you already have the latest version of python installed?
+	[system]
+		bit=-bit computer gedetecteerd.
+		prefix=Het besturingsysteem
+		sufix=is gedetecteerd.
+		xp=Wij ondersteunen Windows XP niet, installatie geanulleerd.
+	[process]
+		sks=Heb je alle benodige software al geinstalleerd?
+		skq=We raden aan dat je negatief antwoord indien je niet zeker bent.
+		skc=De installatie van software wordt geanulleerd...
+		1=CodeCombat kon niet worden ontwikkeld zonder third-party software.
+		2=Dat is waarom je deze software moet installeren,
+		3=zodat je je kan beginnen met het bijdragen tot onze gemeenschap.
+		4=Annuleer de installatie als je de applicatie al hebt.
+		prefix=Heb je al de laatste versie van
+		sufix=geinstalleerd?
+		downloading=is aan het downloaden...
+		installing=is aan het installeren...
+		unzipping=is aan het uitpakken...
+		cleaning=is aan het opkuisen...
+		mongodbpath=Geef het volledige pad op, waar mongodb mag worden geinstalleerd
+[github]
+	[intro]
+		opensource=CodeCombat is opensource, zoals je waarschijnlijk wel al weet.
+		online=Je kan al onze sourcecode vinden op Github.
+		manual=Indien je wil, kan je de Git setup manueel doen.
+		norec=Maar wij raden aan dat je ons dit automatisch laat afhandellen.
+	[skip]
+		question=Wil je de lokale Git setup manueel doen?
+		consequence=Zorg er zeker voor dat jouw git repository correct is.
+		donotclose=Sluit dit venster niet alsjeblieft.
+		wait=Wanneer je klaar bent, druk dan eender welke toets om verder te gaan...
+	[process]
+		path=Geef alsjeblieft het volledige pad van je CodeCombat git repository: 
+		checkout=Geef alsjeblieft het volledige pad waar je de CodeCombat Ontwikkelings omgeving will installeren
+		bashi=Deze installatie maakt gebruik van Git Bash.
+		bashp64=Git bash is normaal geinstalleerd in 'C:\Program Files (x86)\Git'.
+		bashp32=Git bash is normaal geinstalleerd in 'C:\Program Files\Git'.
+		bashq=Geef alsjeblieft het volledige pad op van Git Bash of druk gewoon op enter indien je het pad niet gewijzigd heeft
+		ssh=Wil je het git project downloaden via ssh?
+[npm]
+	install=Installing bower, brunch, nodemon and sendwithus...
+	binstall=Installing bower packages...
+	sass=Installing sass...
+	npm=Installing npm...
+	brnch=Starting brunch....
+	mongodb=Setting up a MongoDB database for you...
+	database=Downloading the last version of the CodeCombat database...
+	script=Preparing the automatic startup script for you...
 [error]
-	xp=Sadly we can't support Windows XP... Please upgrade your OS!
-	os=Machine OS cannot be determined...
-	osreport=Report your OS to the developers @ CodeCombat.com...
-	nocleaning=... Cleaning up has been disabled... Terminating Script!
-	git_app_path=The path to your git application is incorrect, please try again...
-	invalid_path=The path you entered is invalid, please try again...
\ No newline at end of file
+	path=Dat pad bestaat al, ben je zeker dat je het wil overschrijven?
+	exist=Dat pad bestaat niet, probeer alsjeblieft opnieuw...
+[end]
+	succesfull=De installatie van de CodeCombat-Ontwikkelings omgeving was succesvol.
+	thankyou=Alvast bedankt voor al je werk en tot binnenkort.
+	readme=Wil je de LEESMIJ lezen voor meer informatie?
+[start]
+	1=Vanaf nu kan je de ontwikkelings omgeving opstarten
+	2=met het gemak van een enkele muisklik.
+	3=  1) Dubbelklik op
+	4=en laat de omgeving opstarten.
+	5=  2) Nu kan je 'localhost:3000' openen in je browser naar voorkeur.
+	6=Dat is het, je bent nu klaar om te starten met je werk aan CodeCombat.
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_header.bat b/scripts/windows/coco-dev-setup/batch/print_header.bat
deleted file mode 100755
index cf538540d..000000000
--- a/scripts/windows/coco-dev-setup/batch/print_header.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-print_file config/header.coco
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_info.bat b/scripts/windows/coco-dev-setup/batch/print_info.bat
deleted file mode 100755
index 76a3a6117..000000000
--- a/scripts/windows/coco-dev-setup/batch/print_info.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-print_file config/info.coco
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_license.bat b/scripts/windows/coco-dev-setup/batch/print_license.bat
deleted file mode 100755
index 37ab5110f..000000000
--- a/scripts/windows/coco-dev-setup/batch/print_license.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-print_file config/license.coco
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_tips.bat b/scripts/windows/coco-dev-setup/batch/print_tips.bat
deleted file mode 100755
index 1be9a8691..000000000
--- a/scripts/windows/coco-dev-setup/batch/print_tips.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-setlocal EnableDelayedExpansion
-print_file config/tips.coco
-endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat b/scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
new file mode 100755
index 000000000..fe7ffdd8c
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
@@ -0,0 +1,5 @@
+set /p res="%1 [Y/N]: "
+set "result=unset"
+if "%res%"=="Y" (set "result=true")
+if "%res%"=="y" (set "result=true")
+if "%result%"=="unset" (set "result=false")
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
new file mode 100755
index 000000000..b72e74dbd
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_app.bat
@@ -0,0 +1,68 @@
+set "temp_directory=c:\.coco\"
+set "curl_app=..\utilities\curl.exe"
+set "zu_app=..\utilities\7za.exe"
+
+if NOT exist "%temp_directory%" (
+	md %temp_directory%
+)
+
+call get_local_text install-process-prefix
+call get_local_text install-process-sufix
+
+call ask_question "!install_process_prefix! %1 !install_process_sufix!"
+
+if "%result%"=="true" (
+	goto:exit_installation
+)
+
+call print_dashed_seperator
+
+call get_extension %2 download_extension
+call get_local_text install-process-downloading
+echo %1 !install_process_downloading!
+set "install_file=!temp_directory!%1.!download_extension!"
+%curl_app% -k %2 -o !install_file!
+
+if "%download_extension%"=="zip" (
+	set "package_path=!temp_directory!%1\"
+
+	%zu_app% x !install_file! -o!package_path! -y
+
+	for /f "delims=" %%a in ('dir !package_path! /on /ad /b') do @set mongodb_original_directory=%%a
+
+	call print_dashed_seperator
+	goto:get_mongodb_path
+
+	:get_mongodb_path
+		call get_local_text install-process-mongodbpath
+		set /p "mongodb_path=!install_process_mongodbpath!: "
+		if exist "%mongodb_path%" (
+			call get_local_text error-path
+			call ask_question "!error_path!"
+			if "!result!"=="false" (
+				call print_dashed_seperator
+				goto:get_mongodb_path
+			) else (
+				rmdir /s /q %mongodb_path%
+			)
+		)
+	md %mongodb_path%
+
+	%systemroot%\System32\xcopy !package_path!!mongodb_original_directory! !mongodb_path! /r /h /s /e /y
+	goto:clean_up
+)
+
+call get_local_text install-process-installing
+echo %1 !install_process_installing!
+echo.
+start /WAIT !install_file!
+goto:clean_up
+
+:clean_up
+	call get_local_text install-process-cleaning
+	echo %1 !install_process_cleaning!
+	rmdir /s /q "!temp_directory!"
+	goto:exit_installation
+
+:exit_installation
+	call print_dashed_seperator
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
new file mode 100755
index 000000000..65c41f58d
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
@@ -0,0 +1,48 @@
+call print_install_header
+call print_dashed_seperator
+
+call get_local_text install-process-sks
+echo !install_process_sks!
+
+call get_local_text install-process-skq
+call ask_question "!install_process_skq!"
+
+call print_dashed_seperator
+
+if "%result%"=="true" (
+	call get_local_text install-process-skc
+	echo !install_process_skc!
+	call print_dashed_seperator
+	goto:exit_setup
+)
+
+call get_system_information
+call print_dashed_seperator
+
+if %system_info_os% == XP (
+	call get_local_text install-system-xp
+	echo !install_system_xp!
+	call print_exit
+)
+
+call get_category ..\\config\\downloads.coco downloads download_names downloads_count general-general general-%system_info_bit% %system_info_os%-%system_info_bit%
+
+call get_local_text install-process-1
+call get_local_text install-process-2
+call get_local_text install-process-3
+call get_local_text install-process-4
+
+echo !install_process_1!
+echo !install_process_2!
+echo !install_process_3!
+echo !install_process_4!
+
+call print_dashed_seperator
+
+for /l %%i in (1, 1, !downloads_count!) do (
+	call download_and_install_app !download_names[%%i]! !downloads[%%i]!
+)
+
+goto:exit_setup
+
+:exit_setup
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_array.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
new file mode 100755
index 000000000..a699365ad
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
@@ -0,0 +1,6 @@
+set "file=%1"
+set /a %3=0
+for /F "usebackq delims=" %%a in ("%file%") do (
+	set /A %3+=1
+	call set %2[%%%3%%]=%%a
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_category.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_category.bat
new file mode 100755
index 000000000..44384806f
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_category.bat
@@ -0,0 +1,3 @@
+for /f "delims=" %%a in ('..\\utilities\\get_category.exe %*') do (
+	%%a
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
new file mode 100755
index 000000000..8925febdf
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
@@ -0,0 +1 @@
+for /f "delims=" %%a in ('..\\utilities\\get_var.exe ..\\config\\config.coco %1') do set "%%a"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
new file mode 100755
index 000000000..e72c2cca6
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
@@ -0,0 +1 @@
+for /f "delims=" %%a in ('..\\utilities\\get_var.exe ..\\config\\downloads.coco %1') do set "%%a"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
new file mode 100755
index 000000000..6e4525784
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_extension.bat
@@ -0,0 +1,3 @@
+for /f "delims=" %%a in ('..\\utilities\\get_extension.exe %1 %2') do (
+	%%a
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
new file mode 100755
index 000000000..54223b7c0
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
@@ -0,0 +1,36 @@
+echo Some feedback is sent in your system's language
+echo but most feedback is sent and localised by us.
+echo Here is a list of languages:
+call print_dashed_seperator
+
+call get_array ..\\localisation\\languages.coco languages language_count
+for /l %%i in (1,1,%language_count%) do (
+	call get_text !languages[%%i]! "global-native"
+	echo   [%%i] !global_native!
+)
+
+goto:get_localisation_id
+
+:get_localisation_id
+	call print_dashed_seperator
+	set /p "localisation_id=Enter the language ID of your preference and press <ENTER>: "
+	goto:validation_check
+
+:validation_check
+	set "localisation_is_false="
+	set /a local_id = %localisation_id%
+	if !local_id! EQU 0 set localisation_is_false=1
+	if !local_id! LSS 1 set localisation_is_false=1
+	if !local_id! GTR !language_count! set localisation_is_false=1
+	if defined localisation_is_false (
+		echo The id you entered is invalid, please try again...
+		goto:get_localisation_id
+	) else (
+		set language_id=!languages[%local_id%]!
+		call get_text !language_id! "global-native"
+		call print_dashed_seperator
+		echo You have choosen !global_native! as your language.
+		call get_text !language_id! "global-intro"
+		echo !global_intro!
+		call print_seperator
+	)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
new file mode 100755
index 000000000..c27e768d9
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
@@ -0,0 +1 @@
+call get_text %language_id% %1
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat
new file mode 100755
index 000000000..8e2560551
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_path_safe.bat
@@ -0,0 +1,10 @@
+goto:get_safe_path
+
+:get_safe_path
+	set /p "tmp_safe_path=%1"
+	if not exist "%tmp_safe_path%" (
+		call get_local_text error-exist
+		echo !error_exist!
+		call print_dashed_seperator
+		goto:get_safe_path
+	)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
new file mode 100755
index 000000000..542ffe73c
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
@@ -0,0 +1,31 @@
+if exist "%PROGRAMFILES(X86)%" (
+	call:set_bit 64
+) else (
+	call:set_bit 32
+)
+
+for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
+if "%version%" == "5.2" ( call:set_os XP )
+if "%version%" == "6.0" ( call:set_os Vista )
+if "%version%" == "6.1" ( call:set_os Win7 )
+:: we handle win8.0 as win7
+if "%version%" == "6.2" ( call:set_os Win7 )
+:: we handle win8.1 as win7
+if "%version%" == "6.3" ( call:set_os Win7 )
+
+goto:end
+
+:set_bit
+	call get_local_text install-system-bit
+	set system_info_bit=%~1
+	echo %system_info_bit%%install_system_bit%
+goto:eof
+
+:set_os
+	set system_info_os=%~1
+	call get_local_text install-system-prefix
+	call get_local_text install-system-sufix
+	echo %install_system_prefix% %system_info_os% %install_system_sufix%
+goto:eof
+
+:end
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
new file mode 100755
index 000000000..a212b3625
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
@@ -0,0 +1,3 @@
+for /f "delims=" %%a in ('..\\utilities\\get_var.exe ..\\localisation\\%1.coco %2') do (
+	set "%%a"
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
new file mode 100755
index 000000000..6c8952bc3
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/github_setup.bat
@@ -0,0 +1,115 @@
+call print_github_header
+call print_dashed_seperator
+
+call get_local_text github-intro-opensource
+call get_local_text github-intro-online
+call get_local_text github-intro-manual
+call get_local_text github-intro-norec
+
+echo !github_intro_opensource!
+echo !github_intro_online!
+echo !github_intro_manual!
+echo !github_intro_norec!
+
+call print_dashed_seperator
+
+call get_local_text github-skip-question
+call ask_question "!github_skip_question!"
+call print_dashed_seperator
+
+if "%result%"=="true" (
+	call get_local_text github-skip-consequence
+	echo !github_skip_consequence!
+
+	call get_local_text github-skip-donotclose
+	echo !github_skip_donotclose!
+
+	call get_local_text github-skip-wait
+	set /p "github_skip_wait=!github_skip_wait!"
+
+	call print_dashed_seperator
+
+	call get_local_text github-process-path
+	call get_path_safe "!github_process_path!"
+	set "repository_path=!tmp_safe_path!"
+
+	goto:exit_git_setup
+)
+
+goto:get_bash_path
+
+:get_bash_path
+	call get_local_text github-process-bashi
+	echo !github_process_bashi!
+
+	if not defined install_system_bit (
+		call print_dashed_seperator
+		call get_system_information
+		call print_dashed_seperator
+	)
+
+	if "%system_info_bit%"=="64" (
+		call get_local_text github-process-bashp64
+		echo !github_process_bashp64!
+	) else (
+		call get_local_text github-process-bashp32
+		echo !github_process_bashp32!
+	)
+
+	call get_local_text github-process-bashq
+	set /p "git_bash_path=!github_process_bashq!: "
+
+	if not defined git_bash_path (
+		if "%system_info_bit%"=="64" (
+			set "git_bash_path=C:\Program Files (x86)\Git"
+		) else (
+			set "git_bash_path=C:\Program Files\Git"
+		)
+		goto:get_git_path
+	)
+
+	if not exist "%git_bash_path%" (
+		call get_local_text error-exist
+		echo !error_exist!
+		call print_dashed_seperator
+		goto:get_bash_path
+	) else (
+		goto:get_git_path
+	)
+goto:eof
+
+:get_git_path
+	call print_dashed_seperator
+	call get_local_text github-process-checkout
+	set /p "repository_path=!github_process_checkout!: "
+	if exist !repository_path! (
+		call get_local_text error-path
+		call ask_question "!error_path!"
+		if "!result!"=="false" (
+			call print_dashed_seperator
+			goto:get_git_path
+		) else (
+			rmdir /s /q %repository_path%
+			goto:git_checkout
+		)
+	) else (
+		goto:git_checkout
+	)
+goto:eof
+
+:git_checkout
+	md "%repository_path%"
+	set "repository_path=%repository_path%\coco"
+
+	call print_dashed_seperator
+	set "git_app_path=%git_bash_path%\bin\git.exe"
+
+	call get_config github_url
+	"%git_app_path%" clone "!github_url!" "%repository_path%"
+
+	goto:exit_git_setup
+goto:eof
+
+:exit_git_setup
+	call print_dashed_seperator
+goto:eof
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
new file mode 100755
index 000000000..ae3572b36
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/npm_and_brunch_setup.bat
@@ -0,0 +1,89 @@
+call print_npm_and_brunch_header
+call print_dashed_seperator
+
+set work_directory=%CD%
+
+set "curl_app=..\utilities\curl.exe"
+set "zu_app=..\utilities\7za.exe"
+set "keystuff=..\utilities\keystuff.exe"
+
+set "coco_root=!repository_path!\coco"
+
+goto:automatic_script
+
+call get_local_text npm-install
+echo !npm_install!
+
+cd !coco_root!
+start /wait cmd /c "echo !npm_install! & npm install -g bower brunch nodemon sendwithus"
+cd !work_directory!
+
+call print_dashed_seperator
+call get_local_text npm-binstall
+echo !npm_binstall!
+
+cd "!coco_root!"
+start /wait cmd /c "echo !npm_binstall! & bower install"
+cd "!work_directory!"
+
+call print_dashed_seperator
+call get_local_text npm-sass
+echo !npm_sass!
+
+cd "!coco_root!"
+start /wait cmd /c "echo !npm_sass! & gem install sass"
+cd "!work_directory!"
+
+call print_dashed_seperator
+call get_local_text npm-npm
+echo !npm_npm!
+
+cd "!coco_root!"
+start /wait cmd /c "echo !npm_npm! & npm install"
+cd "!work_directory!"
+
+:: --- MONGODB
+
+:mongodb
+call print_dashed_seperator
+call get_local_text npm-mongodb
+echo !npm_mongodb!
+
+set "mdb_directory=!repository_path!\cocodb"
+
+if exist mdb_directory (
+	rmdir /s /q "!mdb_directory!"
+)
+
+md !mdb_directory!
+
+call print_dashed_seperator
+call get_local_text npm-db
+echo !npm_db!
+
+call get_config database_backup
+
+cd !mdb_directory!
+
+start cmd /c "%work_directory%\%keystuff% Alt-Tab && mongod --setParameter textSearchEnabled=true --dbpath !mdb_directory!"
+
+%curl_app% -k !database_backup! -o dump.tar.gz
+
+start /wait cmd /c "%work_directory%\%keystuff% Alt-Tab && %zu_app% e dump.tar.gz && del dump.tar.gz && %zu_app% x dump.tar && del dump.tar"
+
+start /wait cmd /c "mongorestore dump"
+
+rmdir /s /q db
+
+:: --- AUTOMATIC SCRIPT
+
+::automatic_script
+call print_dashed_seperator
+call get_local_text npm-script
+echo !npm_script!
+
+:: --- END
+
+call print_dashed_seperator
+
+pause
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat b/scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat
new file mode 100755
index 000000000..484f3dd75
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/open_readme.bat
@@ -0,0 +1 @@
+call open_text_file ..\\config\\readme.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat
new file mode 100755
index 000000000..6271391d8
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat
@@ -0,0 +1 @@
+start notepad.exe %1
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
new file mode 100755
index 000000000..727d7e61c
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
@@ -0,0 +1,3 @@
+echo.
+echo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+echo.
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
new file mode 100755
index 000000000..6f1051cc6
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
@@ -0,0 +1,2 @@
+set /p res="Press any key to exit..."
+exit
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
similarity index 58%
rename from scripts/windows/coco-dev-setup/batch/print_file.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
index 7857ee47d..f40867969 100755
--- a/scripts/windows/coco-dev-setup/batch/print_file.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
@@ -1,7 +1,4 @@
-@echo off
-setlocal EnableDelayedExpansion
 set "file=%1"
 for /f "usebackq tokens=* delims=;" %%a in ("%file%") do (
 	echo.%%a
-)
-endlocal
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat
new file mode 100755
index 000000000..d7b5572c8
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_finished_header.bat
@@ -0,0 +1 @@
+call print_file ..\\config\\finished_header.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat
new file mode 100755
index 000000000..d5cbe3e95
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_github_header.bat
@@ -0,0 +1 @@
+call print_file ..\\config\\github_header.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
new file mode 100755
index 000000000..328405e67
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
@@ -0,0 +1 @@
+call print_file ..\\config\\header.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_info.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
new file mode 100755
index 000000000..7af731410
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
@@ -0,0 +1 @@
+print_file ..\\config\\info.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat
new file mode 100755
index 000000000..0d430ad8c
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_install_header.bat
@@ -0,0 +1 @@
+call print_file ..\\config\\install_header.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
new file mode 100755
index 000000000..a208ca559
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
@@ -0,0 +1 @@
+print_file ..\\config\\license.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat
new file mode 100755
index 000000000..9f9ea2164
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_npm_and_brunch_header.bat
@@ -0,0 +1 @@
+call print_file ..\\config\\npm_and_brunch_header.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
new file mode 100755
index 000000000..c68792d46
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
@@ -0,0 +1,3 @@
+echo.
+echo -----------------------------------------------------------------------------
+echo.
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
new file mode 100755
index 000000000..c00833574
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
@@ -0,0 +1 @@
+print_file ..\\config\\tips.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
new file mode 100755
index 000000000..df02ccc36
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
@@ -0,0 +1,67 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+Color 0A
+mode con: cols=78 lines=55
+
+call print_header
+call print_dashed_seperator
+
+call get_config version
+call get_config author
+call get_config copyright
+echo Welcome to the automated Installation of the CodeCombat Dev. Environment!
+echo v%version% authored by %author% and published by %copyright%.
+call print_seperator
+
+echo Before we start the installation, here are some tips:
+call print_tips
+call print_seperator
+
+call sign_license
+
+call get_language
+
+call download_and_install_applications
+
+call github_setup
+
+:: This will be available in v2.0
+::call npm_and_brunch_setup
+
+call print_finished_header
+call print_dashed_seperator
+
+call get_local_text end-succesfull
+call get_local_text end-thankyou
+echo %end_succesfull%
+echo %end_thankyou%
+
+call print_dashed_seperator
+
+call get_local_text start-1
+call get_local_text start-2
+call get_local_text start-3
+call get_local_text start-4
+call get_local_text start-5
+call get_local_text start-6
+
+echo !start_1!
+echo !start_2!
+echo.
+echo !start_3! '!repository_path!\coco\SCOCODE.bat'
+echo !start_4!
+echo !start_5!
+echo.
+echo !start_6!
+
+call print_dashed_seperator
+
+call get_local_text end-readme
+call ask_question "!end_readme!"
+
+if "%result%"=="true" (
+	call open_readme
+)
+
+endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat b/scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
new file mode 100755
index 000000000..139ddfd80
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
@@ -0,0 +1,15 @@
+echo In order to continue the installation of the developers environment
+echo you will have to read and agree with the following license:
+call print_dashed_seperator
+
+call print_license
+call print_dashed_seperator
+
+call ask_question "Have you read the license and do you agree with it?"
+call print_dashed_seperator
+
+if "%result%"=="false" (
+	echo This setup can't happen without an agreement.
+	echo Installation and Setup of the CodeCombat environment is cancelled.
+	call print_exit
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/setup.bat b/scripts/windows/coco-dev-setup/batch/setup.bat
new file mode 100755
index 000000000..aa57d4523
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/setup.bat
@@ -0,0 +1,2 @@
+cd scripts
+setup.bat
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/coco-dev-win-setup-1.0.zip b/scripts/windows/coco-dev-setup/coco-dev-win-setup-1.0.zip
new file mode 100755
index 000000000..95bb68fee
Binary files /dev/null and b/scripts/windows/coco-dev-setup/coco-dev-win-setup-1.0.zip differ
diff --git a/scripts/windows/coco-dev-setup/dev-setup-packer.bat b/scripts/windows/coco-dev-setup/dev-setup-packer.bat
index 8c8d74d8a..49ba67cdf 100755
--- a/scripts/windows/coco-dev-setup/dev-setup-packer.bat
+++ b/scripts/windows/coco-dev-setup/dev-setup-packer.bat
@@ -5,26 +5,11 @@ setlocal EnableDelayedExpansion
 set "ZU-app=batch\utilities\7za.exe"
 set "title=coco-dev-win-setup"
 
-call:parse_file_new "batch\config\config" cnfg n
-set "sf=%cnfg[1]%"
+cd batch\\scripts\\
+call get_config version
+cd ..\\..\\
 
-%ZU-app% a "%title%-%sf%.zip" .\batch\*
-
-
-:: ================= FUNCTIONS =========================
-
-:parse_file
-  set "file=%~1"
-  for /F "usebackq delims=" %%a in ("%file%") do (
-    set /A %~3+=1
-    call set %~2[%%%~3%%]=%%a
-  )
-goto:eof
-
-:parse_file_new
-  set /A %~3=0
-  call:parse_file %~1 %~2 %~3
-goto:eof
+%ZU-app% a "%title%-%version%.zip" .\batch\*
 
 :: =================== EOF =============================
 
diff --git a/scripts/windows/coco-dev-setup/batch/recycle_bin/dev-setup.bat b/scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/recycle_bin/dev-setup.bat
rename to scripts/windows/coco-dev-setup/recycle_bin/dev-setup.bat
diff --git a/scripts/windows/coco-dev-setup/batch/recycle_bin/git-test.bat b/scripts/windows/coco-dev-setup/recycle_bin/git-test.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/recycle_bin/git-test.bat
rename to scripts/windows/coco-dev-setup/recycle_bin/git-test.bat
diff --git a/scripts/windows/coco-dev-setup/src/get_category.cpp b/scripts/windows/coco-dev-setup/src/get_category.cpp
new file mode 100755
index 000000000..971c3aefb
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/src/get_category.cpp
@@ -0,0 +1,146 @@
+#include "stdafx.h"
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <sstream>
+#include <string>
+
+#define tstring std::wstring
+#define tcout std::wcout
+
+static const tstring DEF_URL = L"http://www.google.com";
+
+int ErrorReport(const tstring & str, int value = 0)
+{
+	tcout << str.c_str();
+	return value;
+}
+
+void GetHashInfo(tstring id, std::vector<std::wstring> & info) {
+	while(id.size() > 0)
+	{
+		size_t pos = id.find(L'-');
+		
+		tstring substr =
+			id.substr(0, pos == tstring::npos ? id.length() : pos);
+		info.push_back(substr);
+		
+		if(pos == tstring::npos) id = L"";
+		else
+		{
+			++pos;
+			id = id.substr(pos, id.length() - pos);
+		}
+	}
+}
+
+void SetArrayVariable(
+	const tstring & name,
+	int id,
+	const tstring & line
+	)
+{
+	tcout << L"set \"";
+	tcout << name;
+	tcout << L"[" << id << "]";
+	tcout << L"=" << line;
+	tcout << L"\"" << std::endl;
+}
+
+void FillArray(
+	const std::vector<tstring> & info,
+	const tstring & name,
+	const tstring & id_array_name,
+	const tstring & file,
+	int & id
+	)
+{
+	if(info.size() == 0) return;
+
+	auto it = info.begin();
+	size_t indention = 0;
+	unsigned int nlc = 0;
+
+	std::wifstream infile(file.c_str(), std::ifstream::in);
+
+	if(!infile)
+	{
+	#ifdef _DEBUG
+		tcout << file.c_str() << std::endl;
+		tcout << strerror(errno) << std::endl;
+	#endif
+		return;
+	}
+
+	tstring line;
+	int counter = 1;
+	while (std::getline(infile, line))
+	{
+		size_t cpos = line.find('[');
+		if(cpos == tstring::npos)
+		{
+			cpos = line.find_first_not_of(L" \t\r\n");
+		}
+		if(nlc++ == 0 || cpos == indention)
+		{
+			indention = cpos;
+			if(it == info.end())
+			{
+				size_t pos = line.find(L'=') + 1;
+				SetArrayVariable(
+					name, id,
+					line.substr(pos, line.size() - pos)
+					);
+				SetArrayVariable(
+					id_array_name, id++,
+					line.substr(cpos, pos - 3)
+					);
+				++counter;
+			}
+			else if(line.find(*it) != tstring::npos)
+			{
+				++it;
+				nlc = 0;
+			}
+		}
+		else if(counter > 1)
+		{
+			return;
+		}
+	}
+
+	infile.close();
+	return;
+}
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+	if(argc == 1)
+		return ErrorReport(L"Please specify a localisation file.");
+	else if(argc == 2)
+		return ErrorReport(L"Please specify the name of the array.");
+	else if(argc == 3)
+		return ErrorReport(L"Please specify the name of the name-array.");
+	else if(argc == 4)
+		return ErrorReport(L"Please specify the counter parameter.");
+	else if(argc == 5)
+		return ErrorReport(L"Please specify one or more categories you are looking for.");
+
+	tstring file, name, counter_name, id_array_name;
+	file = argv[1];
+	name = argv[2];
+	id_array_name = argv[3];
+	counter_name = argv[4];
+	int id = 1;
+
+	for(int i = 5 ; i < argc ; ++i)
+	{
+		std::vector<tstring> information;
+		GetHashInfo(argv[i], information);
+		FillArray(information, name, id_array_name, file, id);
+	}
+
+	tcout << L"set \"" << counter_name << L"=" << (id - 1) << L"\"";
+
+	return 0;
+}
diff --git a/scripts/windows/coco-dev-setup/src/get_extension.cpp b/scripts/windows/coco-dev-setup/src/get_extension.cpp
new file mode 100755
index 000000000..f311ac93f
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/src/get_extension.cpp
@@ -0,0 +1,36 @@
+#include "stdafx.h"
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <sstream>
+#include <string>
+
+#define tstring std::wstring
+#define tcout std::wcout
+
+int ErrorReport(const tstring & str, int value = 0)
+{
+	tcout << str.c_str();
+	return value;
+}
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+	if(argc == 1)
+		return ErrorReport(L"Please specify a download URL.");
+	if(argc == 2)
+		return ErrorReport(L"Please specify a name for your variable.");
+
+	tstring url, name, extension;
+	url = argv[1];
+	name = argv[2];
+
+	if(url.find(L"exe") != tstring::npos) extension = L"exe";
+	else if(url.find(L"msi") != tstring::npos) extension = L"msi";
+	else if(url.find(L"zip") != tstring::npos) extension = L"zip";
+
+	tcout << L"set \"" << name << L"=";
+	tcout << extension <<  L"\"";
+
+	return 0;
+}
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/src/get_var.cpp b/scripts/windows/coco-dev-setup/src/get_var.cpp
new file mode 100755
index 000000000..e69b0be1c
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/src/get_var.cpp
@@ -0,0 +1,108 @@
+#include "stdafx.h"
+#include <iostream>
+#include <fstream>
+#include <vector>
+#include <sstream>
+#include <string>
+
+#define tstring std::wstring
+#define tcout std::wcout
+
+static const tstring DEF_URL = L"http://www.google.com";
+
+int ErrorReport(const tstring & str, int value = 0)
+{
+	tcout << str.c_str();
+	return value;
+}
+
+void GetHashInfo(tstring id, std::vector<std::wstring> & info) {
+	while(id.size() > 0)
+	{
+		size_t pos = id.find(L'-');
+		
+		tstring substr =
+			id.substr(0, pos == tstring::npos ? id.length() : pos);
+		info.push_back(substr);
+		
+		if(pos == tstring::npos) id = L"";
+		else
+		{
+			++pos;
+			id = id.substr(pos, id.length() - pos);
+		}
+	}
+}
+
+std::wstring GetText(const std::vector<tstring> & info, const tstring & file)
+{
+	if(info.size() == 0) return L"Info Size is 0.";
+
+	auto it = info.begin();
+	auto last = info.end() - 1;
+	size_t indention = 0;
+	unsigned int nlc = 0;
+
+	std::wifstream infile(file.c_str(), std::ifstream::in);
+
+	if(!infile)
+	{
+	#ifdef _DEBUG
+		tcout << file.c_str() << std::endl;
+		tcout << strerror(errno) << std::endl;
+	#endif
+		return L"File couldn't be opened.";
+	}
+
+	tstring line;
+	while (std::getline(infile, line))
+	{
+		size_t cpos = line.find('[');
+		if(nlc++ == 0 || cpos == indention)
+		{
+			indention = cpos;
+			if(line.find(*it) != tstring::npos)
+			{
+				if(it == last)
+				{
+					size_t pos = line.find(L'=') + 1;
+					infile.close();
+					return line.substr(pos, line.size() - pos);
+				}
+				else
+				{
+					++it;
+					nlc = 0;
+				}
+			}
+		}
+	}
+
+	infile.close();
+	return L"Var couldn't be found.";
+}
+
+int _tmain(int argc, _TCHAR* argv[])
+{
+	if(argc == 1)
+		return ErrorReport(L"Please specify a localisation file.");
+	else if(argc == 2)
+		return ErrorReport(L"Please specify the ID you are looking for.");
+
+	tstring file, hash;
+	file = argv[1];
+	hash = argv[2];
+
+	std::vector<tstring> information;
+	GetHashInfo(hash, information);
+
+	size_t size = information.size();
+	for(unsigned int i = 0 ; i < size ; ++i)
+	{
+		tcout << information[i];
+		if(i != size - 1) tcout << L"_";
+	}
+	tcout << L"=" << GetText(information, file);
+
+	return 0;
+}
diff --git a/server/commons/Handler.coffee b/server/commons/Handler.coffee
index 2f11b5dbf..d026ea54f 100644
--- a/server/commons/Handler.coffee
+++ b/server/commons/Handler.coffee
@@ -5,7 +5,7 @@ errors = require './errors'
 log = require 'winston'
 
 PROJECT = {original:1, name:1, version:1, description: 1, slug:1, kind: 1}
-FETCH_LIMIT = 150
+FETCH_LIMIT = 200
 
 module.exports = class Handler
   # subclasses should override these properties
@@ -47,7 +47,9 @@ module.exports = class Handler
   sendNotFoundError: (res) -> errors.notFound(res)
   sendMethodNotAllowed: (res) -> errors.badMethod(res)
   sendBadInputError: (res, message) -> errors.badInput(res, message)
-  sendDatabaseError: (res, err) -> errors.serverError(res, 'Database error, ' + err)
+  sendDatabaseError: (res, err) ->
+    log.error "Database error, #{err}"
+    errors.serverError(res, 'Database error, ' + err)
 
   sendError: (res, code, message) ->
     errors.custom(res, code, message)
@@ -110,8 +112,7 @@ module.exports = class Handler
         log.warn "Whoa, we haven't yet thought about public properties for User projection yet."
       else
         projection = {}
-        for field in req.query.project.split(',')
-          projection[field] = 1
+        projection[field] = 1 for field in req.query.project.split(',')
     for filter in filters
       callback = (err, results) =>
         return @sendDatabaseError(res, err) if err
@@ -251,9 +252,13 @@ module.exports = class Handler
       return @sendDatabaseError(res, err) if err
       return @sendNotFoundError(res) unless parentDocument?
       return @sendUnauthorizedError(res) unless @hasAccessToDocument(req, parentDocument)
+      editableProperties = @getEditableProperties req, parentDocument
       updatedObject = parentDocument.toObject()
-      changes = _.pick req.body, @getEditableProperties(req, parentDocument)
-      _.extend updatedObject, changes
+      for prop in editableProperties
+        if (val = req.body[prop])?
+          updatedObject[prop] = val
+        else if updatedObject[prop]?
+          delete updatedObject[prop]
       delete updatedObject._id
       major = req.body.version?.major
 
@@ -303,8 +308,11 @@ module.exports = class Handler
       done(err, document)
 
   saveChangesToDocument: (req, document, done) ->
-    for prop in @getEditableProperties(req, document)
-      document.set(prop, req.body[prop]) if req.body[prop]?
+    for prop in @getEditableProperties req, document
+      if (val = req.body[prop])?
+        document.set prop, val
+      else if document.get(prop)? and req.method isnt 'PATCH'
+        document.set prop, 'undefined'
     obj = document.toObject()
 
     # Hack to get saving of Users to work. Probably should replace these props with strings
diff --git a/server/levels/sessions/level_session_handler.coffee b/server/levels/sessions/level_session_handler.coffee
index d3ab07830..ca8680a17 100644
--- a/server/levels/sessions/level_session_handler.coffee
+++ b/server/levels/sessions/level_session_handler.coffee
@@ -1,5 +1,6 @@
 LevelSession = require('./LevelSession')
 Handler = require('../../commons/Handler')
+log = require 'winston'
 
 TIMEOUT = 1000 * 30 # no activity for 30 seconds means it's not active
 
@@ -10,7 +11,11 @@ class LevelSessionHandler extends Handler
                        'chat', 'teamSpells', 'submitted', 'unsubscribed']
 
   getByRelationship: (req, res, args...) ->
-    return @sendNotFoundError(res) unless args.length is 2 and args[1] is 'active'
+    return @getActiveSessions req, res if args.length is 2 and args[1] is 'active'
+    return @sendNotFoundError(res)
+
+  getActiveSessions: (req, res) ->
+    return @sendUnauthorizedError(res) unless req.user.isAdmin()
     start = new Date()
     start = new Date(start.getTime() - TIMEOUT)
     query = @modelClass.find({'changed': {$gt: start}})
diff --git a/server/users/user_handler.coffee b/server/users/user_handler.coffee
index 174445436..168f10d91 100644
--- a/server/users/user_handler.coffee
+++ b/server/users/user_handler.coffee
@@ -7,6 +7,8 @@ mongoose = require 'mongoose'
 config = require '../../server_config'
 errors = require '../commons/errors'
 async = require 'async'
+log = require 'winston'
+LevelSession = require('../levels/sessions/LevelSession')
 
 serverProperties = ['passwordHash', 'emailLower', 'nameLower', 'passwordReset']
 privateProperties = [
@@ -55,7 +57,8 @@ UserHandler = class UserHandler extends Handler
       fbAT = req.query.facebookAccessToken
       return callback(null, req, user) unless fbID and fbAT
       url = "https://graph.facebook.com/me?access_token=#{fbAT}"
-      request(url, (error, response, body) ->
+      request(url, (err, response, body) ->
+        log.warn "Error grabbing FB token: #{err}" if err
         body = JSON.parse(body)
         emailsMatch = req.body.email is body.email
         return callback(res:'Invalid Facebook Access Token.', code:422) unless emailsMatch
@@ -68,7 +71,8 @@ UserHandler = class UserHandler extends Handler
       gpAT = req.query.gplusAccessToken
       return callback(null, req, user) unless gpID and gpAT
       url = "https://www.googleapis.com/oauth2/v2/userinfo?access_token=#{gpAT}"
-      request(url, (error, response, body) ->
+      request(url, (err, response, body) ->
+        log.warn "Error grabbing G+ token: #{err}" if err
         body = JSON.parse(body)
         emailsMatch = req.body.email is body.email
         return callback(res:'Invalid G+ Access Token.', code:422) unless emailsMatch
@@ -81,6 +85,7 @@ UserHandler = class UserHandler extends Handler
       emailLower = req.body.email.toLowerCase()
       return callback(null, req, user) if emailLower is user.get('emailLower')
       User.findOne({emailLower:emailLower}).exec (err, otherUser) ->
+        log.error "Database error setting user email: #{err}" if err
         return callback(res:'Database error.', code:500) if err
 
         if (req.query.gplusID or req.query.facebookID) and otherUser
@@ -100,6 +105,7 @@ UserHandler = class UserHandler extends Handler
       nameLower = req.body.name?.toLowerCase()
       return callback(null, req, user) if nameLower is user.get('nameLower')
       User.findOne({nameLower:nameLower}).exec (err, otherUser) ->
+        log.error "Database error setting user name: #{err}" if err
         return callback(res:'Database error.', code:500) if err
         r = {message:'is already used by another account', property:'name'}
         return callback({res:r, code:409}) if otherUser
@@ -164,6 +170,7 @@ UserHandler = class UserHandler extends Handler
     return @avatar(req, res, args[0]) if args[1] is 'avatar'
     return @getNamesByIds(req, res) if args[1] is 'names'
     return @nameToID(req, res, args[0]) if args[1] is 'nameToID'
+    return @getLevelSessions(req, res, args[0]) if args[1] is 'level.sessions'
     return @sendNotFoundError(res)
 
   agreeToCLA: (req, res) ->
@@ -189,4 +196,17 @@ UserHandler = class UserHandler extends Handler
       res.redirect(document?.get('photoURL') or '/images/generic-wizard-icon.png')
       res.end()
 
+  getLevelSessions: (req, res, userID) ->
+    return @sendUnauthorizedError(res) unless req.user._id+'' is userID or req.user.isAdmin()
+    query = {'creator': userID}
+    projection = null
+    if req.query.project
+      projection = {}
+      projection[field] = 1 for field in req.query.project.split(',')
+    LevelSession.find(query).select(projection).exec (err, documents) =>
+      return @sendDatabaseError(res, err) if err
+      documents = (@formatEntity(req, doc) for doc in documents)
+      @sendSuccess(res, documents)
+
+
 module.exports = new UserHandler()
diff --git a/server/users/user_schema.coffee b/server/users/user_schema.coffee
index c6399576f..18d526de5 100644
--- a/server/users/user_schema.coffee
+++ b/server/users/user_schema.coffee
@@ -47,6 +47,7 @@ UserSchema = c.object {},
     colorConfig: c.object {additionalProperties: c.colorConfig()}
 
   aceConfig: c.object {},
+    language: {type: 'string', 'default': 'javascript', 'enum': ['javascript', 'coffeescript']}
     keyBindings: {type: 'string', 'default': 'default', 'enum': ['default', 'vim', 'emacs']}
     invisibles: {type: 'boolean', 'default': false}
     indentGuides: {type: 'boolean', 'default': false}
diff --git a/vendor/scripts/jquery.noty.packaged.min.js b/vendor/scripts/jquery.noty.packaged.min.js
new file mode 100644
index 000000000..a304cd9c1
--- /dev/null
+++ b/vendor/scripts/jquery.noty.packaged.min.js
@@ -0,0 +1 @@
+"function"!=typeof Object.create&&(Object.create=function(a){function b(){}return b.prototype=a,new b}),function(a){var b={init:function(b){return this.options=a.extend({},a.noty.defaults,b),this.options.layout=this.options.custom?a.noty.layouts.inline:a.noty.layouts[this.options.layout],a.noty.themes[this.options.theme]?this.options.theme=a.noty.themes[this.options.theme]:b.themeClassName=this.options.theme,delete b.layout,delete b.theme,this.options=a.extend({},this.options,this.options.layout.options),this.options.id="noty_"+(new Date).getTime()*Math.floor(1e6*Math.random()),this.options=a.extend({},this.options,b),this._build(),this},_build:function(){var b=a('<div class="noty_bar noty_type_'+this.options.type+'"></div>').attr("id",this.options.id);if(b.append(this.options.template).find(".noty_text").html(this.options.text),this.$bar=null!==this.options.layout.parent.object?a(this.options.layout.parent.object).css(this.options.layout.parent.css).append(b):b,this.options.themeClassName&&this.$bar.addClass(this.options.themeClassName).addClass("noty_container_type_"+this.options.type),this.options.buttons){this.options.closeWith=[],this.options.timeout=!1;var c=a("<div/>").addClass("noty_buttons");null!==this.options.layout.parent.object?this.$bar.find(".noty_bar").append(c):this.$bar.append(c);var d=this;a.each(this.options.buttons,function(b,c){var e=a("<button/>").addClass(c.addClass?c.addClass:"gray").html(c.text).attr("id",c.id?c.id:"button-"+b).appendTo(d.$bar.find(".noty_buttons")).bind("click",function(){a.isFunction(c.onClick)&&c.onClick.call(e,d)})})}this.$message=this.$bar.find(".noty_message"),this.$closeButton=this.$bar.find(".noty_close"),this.$buttons=this.$bar.find(".noty_buttons"),a.noty.store[this.options.id]=this},show:function(){var b=this;return b.options.custom?b.options.custom.find(b.options.layout.container.selector).append(b.$bar):a(b.options.layout.container.selector).append(b.$bar),b.options.theme&&b.options.theme.style&&b.options.theme.style.apply(b),"function"===a.type(b.options.layout.css)?this.options.layout.css.apply(b.$bar):b.$bar.css(this.options.layout.css||{}),b.$bar.addClass(b.options.layout.addClass),b.options.layout.container.style.apply(a(b.options.layout.container.selector)),b.showing=!0,b.options.theme&&b.options.theme.style&&b.options.theme.callback.onShow.apply(this),a.inArray("click",b.options.closeWith)>-1&&b.$bar.css("cursor","pointer").one("click",function(a){b.stopPropagation(a),b.options.callback.onCloseClick&&b.options.callback.onCloseClick.apply(b),b.close()}),a.inArray("hover",b.options.closeWith)>-1&&b.$bar.one("mouseenter",function(){b.close()}),a.inArray("button",b.options.closeWith)>-1&&b.$closeButton.one("click",function(a){b.stopPropagation(a),b.close()}),-1==a.inArray("button",b.options.closeWith)&&b.$closeButton.remove(),b.options.callback.onShow&&b.options.callback.onShow.apply(b),b.$bar.animate(b.options.animation.open,b.options.animation.speed,b.options.animation.easing,function(){b.options.callback.afterShow&&b.options.callback.afterShow.apply(b),b.showing=!1,b.shown=!0}),b.options.timeout&&b.$bar.delay(b.options.timeout).promise().done(function(){b.close()}),this},close:function(){if(!(this.closed||this.$bar&&this.$bar.hasClass("i-am-closing-now"))){var b=this;if(this.showing)return b.$bar.queue(function(){b.close.apply(b)}),void 0;if(!this.shown&&!this.showing){var c=[];return a.each(a.noty.queue,function(a,d){d.options.id!=b.options.id&&c.push(d)}),a.noty.queue=c,void 0}b.$bar.addClass("i-am-closing-now"),b.options.callback.onClose&&b.options.callback.onClose.apply(b),b.$bar.clearQueue().stop().animate(b.options.animation.close,b.options.animation.speed,b.options.animation.easing,function(){b.options.callback.afterClose&&b.options.callback.afterClose.apply(b)}).promise().done(function(){b.options.modal&&(a.notyRenderer.setModalCount(-1),0==a.notyRenderer.getModalCount()&&a(".noty_modal").fadeOut("fast",function(){a(this).remove()})),a.notyRenderer.setLayoutCountFor(b,-1),0==a.notyRenderer.getLayoutCountFor(b)&&a(b.options.layout.container.selector).remove(),"undefined"!=typeof b.$bar&&null!==b.$bar&&(b.$bar.remove(),b.$bar=null,b.closed=!0),delete a.noty.store[b.options.id],b.options.theme.callback&&b.options.theme.callback.onClose&&b.options.theme.callback.onClose.apply(b),b.options.dismissQueue||(a.noty.ontap=!0,a.notyRenderer.render()),b.options.maxVisible>0&&b.options.dismissQueue&&a.notyRenderer.render()})}},setText:function(a){return this.closed||(this.options.text=a,this.$bar.find(".noty_text").html(a)),this},setType:function(a){return this.closed||(this.options.type=a,this.options.theme.style.apply(this),this.options.theme.callback.onShow.apply(this)),this},setTimeout:function(a){if(!this.closed){var b=this;this.options.timeout=a,b.$bar.delay(b.options.timeout).promise().done(function(){b.close()})}return this},stopPropagation:function(a){a=a||window.event,"undefined"!=typeof a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},closed:!1,showing:!1,shown:!1};a.notyRenderer={},a.notyRenderer.init=function(c){var d=Object.create(b).init(c);return d.options.killer&&a.noty.closeAll(),d.options.force?a.noty.queue.unshift(d):a.noty.queue.push(d),a.notyRenderer.render(),"object"==a.noty.returns?d:d.options.id},a.notyRenderer.render=function(){var b=a.noty.queue[0];"object"===a.type(b)?b.options.dismissQueue?b.options.maxVisible>0?a(b.options.layout.container.selector+" li").length<b.options.maxVisible&&a.notyRenderer.show(a.noty.queue.shift()):a.notyRenderer.show(a.noty.queue.shift()):a.noty.ontap&&(a.notyRenderer.show(a.noty.queue.shift()),a.noty.ontap=!1):a.noty.ontap=!0},a.notyRenderer.show=function(b){b.options.modal&&(a.notyRenderer.createModalFor(b),a.notyRenderer.setModalCount(1)),b.options.custom?0==b.options.custom.find(b.options.layout.container.selector).length?b.options.custom.append(a(b.options.layout.container.object).addClass("i-am-new")):b.options.custom.find(b.options.layout.container.selector).removeClass("i-am-new"):0==a(b.options.layout.container.selector).length?a("body").append(a(b.options.layout.container.object).addClass("i-am-new")):a(b.options.layout.container.selector).removeClass("i-am-new"),a.notyRenderer.setLayoutCountFor(b,1),b.show()},a.notyRenderer.createModalFor=function(b){if(0==a(".noty_modal").length){var c=a("<div/>").addClass("noty_modal").addClass(b.options.theme).data("noty_modal_count",0);b.options.theme.modal&&b.options.theme.modal.css&&c.css(b.options.theme.modal.css),c.prependTo(a("body")).fadeIn("fast")}},a.notyRenderer.getLayoutCountFor=function(b){return a(b.options.layout.container.selector).data("noty_layout_count")||0},a.notyRenderer.setLayoutCountFor=function(b,c){return a(b.options.layout.container.selector).data("noty_layout_count",a.notyRenderer.getLayoutCountFor(b)+c)},a.notyRenderer.getModalCount=function(){return a(".noty_modal").data("noty_modal_count")||0},a.notyRenderer.setModalCount=function(b){return a(".noty_modal").data("noty_modal_count",a.notyRenderer.getModalCount()+b)},a.fn.noty=function(b){return b.custom=a(this),a.notyRenderer.init(b)},a.noty={},a.noty.queue=[],a.noty.ontap=!0,a.noty.layouts={},a.noty.themes={},a.noty.returns="object",a.noty.store={},a.noty.get=function(b){return a.noty.store.hasOwnProperty(b)?a.noty.store[b]:!1},a.noty.close=function(b){return a.noty.get(b)?a.noty.get(b).close():!1},a.noty.setText=function(b,c){return a.noty.get(b)?a.noty.get(b).setText(c):!1},a.noty.setType=function(b,c){return a.noty.get(b)?a.noty.get(b).setType(c):!1},a.noty.clearQueue=function(){a.noty.queue=[]},a.noty.closeAll=function(){a.noty.clearQueue(),a.each(a.noty.store,function(a,b){b.close()})};var c=window.alert;a.noty.consumeAlert=function(b){window.alert=function(c){b?b.text=c:b={text:c},a.notyRenderer.init(b)}},a.noty.stopConsumeAlert=function(){window.alert=c},a.noty.defaults={layout:"top",theme:"defaultTheme",type:"alert",text:"",dismissQueue:!0,template:'<div class="noty_message"><span class="noty_text"></span><div class="noty_close"></div></div>',animation:{open:{height:"toggle"},close:{height:"toggle"},easing:"swing",speed:500},timeout:!1,force:!1,modal:!1,maxVisible:5,killer:!1,closeWith:["click"],callback:{onShow:function(){},afterShow:function(){},onClose:function(){},afterClose:function(){},onCloseClick:function(){}},buttons:!1},a(window).resize(function(){a.each(a.noty.layouts,function(b,c){c.container.style.apply(a(c.container.selector))})})}(jQuery),window.noty=function(a){return jQuery.notyRenderer.init(a)},function(a){a.noty.layouts.bottom={name:"bottom",options:{},container:{object:'<ul id="noty_bottom_layout_container" />',selector:"ul#noty_bottom_layout_container",style:function(){a(this).css({bottom:0,left:"5%",position:"fixed",width:"90%",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:9999999})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none"},addClass:""}}(jQuery),function(a){a.noty.layouts.bottomCenter={name:"bottomCenter",options:{},container:{object:'<ul id="noty_bottomCenter_layout_container" />',selector:"ul#noty_bottomCenter_layout_container",style:function(){a(this).css({bottom:20,left:0,position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7}),a(this).css({left:(a(window).width()-a(this).outerWidth(!1))/2+"px"})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.layouts.bottomLeft={name:"bottomLeft",options:{},container:{object:'<ul id="noty_bottomLeft_layout_container" />',selector:"ul#noty_bottomLeft_layout_container",style:function(){a(this).css({bottom:20,left:20,position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7}),window.innerWidth<600&&a(this).css({left:5})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.layouts.bottomRight={name:"bottomRight",options:{},container:{object:'<ul id="noty_bottomRight_layout_container" />',selector:"ul#noty_bottomRight_layout_container",style:function(){a(this).css({bottom:20,right:20,position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7}),window.innerWidth<600&&a(this).css({right:5})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.layouts.center={name:"center",options:{},container:{object:'<ul id="noty_center_layout_container" />',selector:"ul#noty_center_layout_container",style:function(){a(this).css({position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7});var b=a(this).clone().css({visibility:"hidden",display:"block",position:"absolute",top:0,left:0}).attr("id","dupe");a("body").append(b),b.find(".i-am-closing-now").remove(),b.find("li").css("display","block");var c=b.height();b.remove(),a(this).hasClass("i-am-new")?a(this).css({left:(a(window).width()-a(this).outerWidth(!1))/2+"px",top:(a(window).height()-c)/2+"px"}):a(this).animate({left:(a(window).width()-a(this).outerWidth(!1))/2+"px",top:(a(window).height()-c)/2+"px"},500)}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.layouts.centerLeft={name:"centerLeft",options:{},container:{object:'<ul id="noty_centerLeft_layout_container" />',selector:"ul#noty_centerLeft_layout_container",style:function(){a(this).css({left:20,position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7});var b=a(this).clone().css({visibility:"hidden",display:"block",position:"absolute",top:0,left:0}).attr("id","dupe");a("body").append(b),b.find(".i-am-closing-now").remove(),b.find("li").css("display","block");var c=b.height();b.remove(),a(this).hasClass("i-am-new")?a(this).css({top:(a(window).height()-c)/2+"px"}):a(this).animate({top:(a(window).height()-c)/2+"px"},500),window.innerWidth<600&&a(this).css({left:5})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.layouts.centerRight={name:"centerRight",options:{},container:{object:'<ul id="noty_centerRight_layout_container" />',selector:"ul#noty_centerRight_layout_container",style:function(){a(this).css({right:20,position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7});var b=a(this).clone().css({visibility:"hidden",display:"block",position:"absolute",top:0,left:0}).attr("id","dupe");a("body").append(b),b.find(".i-am-closing-now").remove(),b.find("li").css("display","block");var c=b.height();b.remove(),a(this).hasClass("i-am-new")?a(this).css({top:(a(window).height()-c)/2+"px"}):a(this).animate({top:(a(window).height()-c)/2+"px"},500),window.innerWidth<600&&a(this).css({right:5})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.layouts.inline={name:"inline",options:{},container:{object:'<ul class="noty_inline_layout_container" />',selector:"ul.noty_inline_layout_container",style:function(){a(this).css({width:"100%",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:9999999})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none"},addClass:""}}(jQuery),function(a){a.noty.layouts.top={name:"top",options:{},container:{object:'<ul id="noty_top_layout_container" />',selector:"ul#noty_top_layout_container",style:function(){a(this).css({top:0,left:"5%",position:"fixed",width:"90%",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:9999999})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none"},addClass:""}}(jQuery),function(a){a.noty.layouts.topCenter={name:"topCenter",options:{},container:{object:'<ul id="noty_topCenter_layout_container" />',selector:"ul#noty_topCenter_layout_container",style:function(){a(this).css({top:20,left:0,position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7}),a(this).css({left:(a(window).width()-a(this).outerWidth(!1))/2+"px"})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.layouts.topLeft={name:"topLeft",options:{},container:{object:'<ul id="noty_topLeft_layout_container" />',selector:"ul#noty_topLeft_layout_container",style:function(){a(this).css({top:20,left:20,position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7}),window.innerWidth<600&&a(this).css({left:5})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.layouts.topRight={name:"topRight",options:{},container:{object:'<ul id="noty_topRight_layout_container" />',selector:"ul#noty_topRight_layout_container",style:function(){a(this).css({top:20,right:20,position:"fixed",width:"310px",height:"auto",margin:0,padding:0,listStyleType:"none",zIndex:1e7}),window.innerWidth<600&&a(this).css({right:5})}},parent:{object:"<li />",selector:"li",css:{}},css:{display:"none",width:"310px"},addClass:""}}(jQuery),function(a){a.noty.themes.defaultTheme={name:"defaultTheme",helpers:{borderFix:function(){if(this.options.dismissQueue){var b=this.options.layout.container.selector+" "+this.options.layout.parent.selector;switch(this.options.layout.name){case"top":a(b).css({borderRadius:"0px 0px 0px 0px"}),a(b).last().css({borderRadius:"0px 0px 5px 5px"});break;case"topCenter":case"topLeft":case"topRight":case"bottomCenter":case"bottomLeft":case"bottomRight":case"center":case"centerLeft":case"centerRight":case"inline":a(b).css({borderRadius:"0px 0px 0px 0px"}),a(b).first().css({"border-top-left-radius":"5px","border-top-right-radius":"5px"}),a(b).last().css({"border-bottom-left-radius":"5px","border-bottom-right-radius":"5px"});break;case"bottom":a(b).css({borderRadius:"0px 0px 0px 0px"}),a(b).first().css({borderRadius:"5px 5px 0px 0px"})}}}},modal:{css:{position:"fixed",width:"100%",height:"100%",backgroundColor:"#000",zIndex:1e4,opacity:.6,display:"none",left:0,top:0}},style:function(){switch(this.$bar.css({overflow:"hidden",background:"url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABsAAAAoCAYAAAAPOoFWAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPZJREFUeNq81tsOgjAMANB2ov7/7ypaN7IlIwi9rGuT8QSc9EIDAsAznxvY4pXPKr05RUE5MEVB+TyWfCEl9LZApYopCmo9C4FKSMtYoI8Bwv79aQJU4l6hXXCZrQbokJEksxHo9KMOgc6w1atHXM8K9DVC7FQnJ0i8iK3QooGgbnyKgMDygBWyYFZoqx4qS27KqLZJjA1D0jK6QJcYEQEiWv9PGkTsbqxQ8oT+ZtZB6AkdsJnQDnMoHXHLGKOgDYuCWmYhEERCI5gaamW0bnHdA3k2ltlIN+2qKRyCND0bhqSYCyTB3CAOc4WusBEIpkeBuPgJMAAX8Hs1NfqHRgAAAABJRU5ErkJggg==') repeat-x scroll left top #fff"}),this.$message.css({fontSize:"13px",lineHeight:"16px",textAlign:"center",padding:"8px 10px 9px",width:"auto",position:"relative"}),this.$closeButton.css({position:"absolute",top:4,right:4,width:10,height:10,background:"url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAATpJREFUeNoszrFqVFEUheG19zlz7sQ7ijMQBAvfYBqbpJCoZSAQbOwEE1IHGytbLQUJ8SUktW8gCCFJMSGSNxCmFBJO7j5rpXD6n5/P5vM53H3b3T9LOiB5AQDuDjM7BnA7DMPHDGBH0nuSzwHsRcRVRNRSysuU0i6AOwA/02w2+9Fae00SEbEh6SGAR5K+k3zWWptKepCm0+kpyRoRGyRBcpPkDsn1iEBr7drdP2VJZyQXERGSPpiZAViTBACXKaV9kqd5uVzCzO5KKb/d/UZSDwD/eyxqree1VqSu6zKAF2Z2RPJJaw0rAkjOJT0m+SuT/AbgDcmnkmBmfwAsJL1dXQ8lWY6IGwB1ZbrOOb8zs8thGP4COFwx/mE8Ho9Go9ErMzvJOW/1fY/JZIJSypqZfXX3L13X9fcDAKJct1sx3OiuAAAAAElFTkSuQmCC)",display:"none",cursor:"pointer"}),this.$buttons.css({padding:5,textAlign:"right",borderTop:"1px solid #ccc",backgroundColor:"#fff"}),this.$buttons.find("button").css({marginLeft:5}),this.$buttons.find("button:first").css({marginLeft:0}),this.$bar.bind({mouseenter:function(){a(this).find(".noty_close").stop().fadeTo("normal",1)},mouseleave:function(){a(this).find(".noty_close").stop().fadeTo("normal",0)}}),this.options.layout.name){case"top":this.$bar.css({borderRadius:"0px 0px 5px 5px",borderBottom:"2px solid #eee",borderLeft:"2px solid #eee",borderRight:"2px solid #eee",boxShadow:"0 2px 4px rgba(0, 0, 0, 0.1)"});break;case"topCenter":case"center":case"bottomCenter":case"inline":this.$bar.css({borderRadius:"5px",border:"1px solid #eee",boxShadow:"0 2px 4px rgba(0, 0, 0, 0.1)"}),this.$message.css({fontSize:"13px",textAlign:"center"});break;case"topLeft":case"topRight":case"bottomLeft":case"bottomRight":case"centerLeft":case"centerRight":this.$bar.css({borderRadius:"5px",border:"1px solid #eee",boxShadow:"0 2px 4px rgba(0, 0, 0, 0.1)"}),this.$message.css({fontSize:"13px",textAlign:"left"});break;case"bottom":this.$bar.css({borderRadius:"5px 5px 0px 0px",borderTop:"2px solid #eee",borderLeft:"2px solid #eee",borderRight:"2px solid #eee",boxShadow:"0 -2px 4px rgba(0, 0, 0, 0.1)"});break;default:this.$bar.css({border:"2px solid #eee",boxShadow:"0 2px 4px rgba(0, 0, 0, 0.1)"})}switch(this.options.type){case"alert":case"notification":this.$bar.css({backgroundColor:"#FFF",borderColor:"#CCC",color:"#444"});break;case"warning":this.$bar.css({backgroundColor:"#FFEAA8",borderColor:"#FFC237",color:"#826200"}),this.$buttons.css({borderTop:"1px solid #FFC237"});break;case"error":this.$bar.css({backgroundColor:"red",borderColor:"darkred",color:"#FFF"}),this.$message.css({fontWeight:"bold"}),this.$buttons.css({borderTop:"1px solid darkred"});break;case"information":this.$bar.css({backgroundColor:"#57B7E2",borderColor:"#0B90C4",color:"#FFF"}),this.$buttons.css({borderTop:"1px solid #0B90C4"});break;case"success":this.$bar.css({backgroundColor:"lightgreen",borderColor:"#50C24E",color:"darkgreen"}),this.$buttons.css({borderTop:"1px solid #50C24E"});break;default:this.$bar.css({backgroundColor:"#FFF",borderColor:"#CCC",color:"#444"})}},callback:{onShow:function(){a.noty.themes.defaultTheme.helpers.borderFix.apply(this)},onClose:function(){a.noty.themes.defaultTheme.helpers.borderFix.apply(this)}}}}(jQuery);
\ No newline at end of file