Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master

app/locale/ar.coffee

@@ -224,6 +224,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."

app/locale/bg.coffee

@@ -224,6 +224,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."

app/locale/ca.coffee

@@ -224,6 +224,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."

app/locale/cs.coffee

@@ -224,6 +224,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."

app/locale/da.coffee

@@ -224,6 +224,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."

app/locale/de.coffee

@@ -224,6 +224,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,8 +233,8 @@ 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."
+    editor_config_behaviors_label: "Intelligentes Verhalten"
+    editor_config_behaviors_description: "Vervollständigt automatisch Klammern und Anführungszeichen."
 #    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."

app/locale/el.coffee

@@ -224,6 +224,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."

app/locale/en-AU.coffee

@@ -224,6 +224,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."

app/locale/en-GB.coffee

@@ -224,6 +224,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."

app/locale/en-US.coffee

@@ -224,6 +224,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."

app/locale/en.coffee

@@ -224,6 +224,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."

app/locale/es-419.coffee

@@ -224,6 +224,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."

app/locale/es-ES.coffee

@@ -224,6 +224,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."

app/locale/es.coffee

@@ -224,6 +224,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."

app/locale/fa.coffee

@@ -224,6 +224,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."

app/locale/fi.coffee

@@ -224,6 +224,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."

app/locale/fr.coffee

@@ -224,6 +224,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."

app/locale/he.coffee

@@ -224,6 +224,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."

app/locale/hi.coffee

@@ -224,6 +224,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."

app/locale/hu.coffee

@@ -224,6 +224,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."

app/locale/id.coffee

@@ -224,6 +224,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."

app/locale/it.coffee

@@ -224,6 +224,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."

app/locale/ja.coffee

@@ -224,6 +224,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."

app/locale/ko.coffee

@@ -224,6 +224,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: "일반적인 에디터와 마찬가지인 단축키 설정"

app/locale/lt.coffee

@@ -224,6 +224,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."

app/locale/ms.coffee

@@ -224,6 +224,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."

app/locale/nb.coffee

@@ -224,6 +224,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."

app/locale/nl-BE.coffee

@@ -224,6 +224,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     skip_tutorial: "Overslaan (esc)"
     editor_config: "Editor Configuratie"
     editor_config_title: "Editor Configuratie"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Toets instellingen"
 #    editor_config_keybindings_default: "Default (Ace)"
     editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors."

app/locale/nl-NL.coffee

@@ -224,6 +224,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     skip_tutorial: "Overslaan (esc)"
     editor_config: "Editor Configuratie"
     editor_config_title: "Editor Configuratie"
+#    editor_config_language_label: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Toets instellingen"
 #    editor_config_keybindings_default: "Default (Ace)"
     editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors."

app/locale/nl.coffee

@@ -224,6 +224,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: "Programming Language"
+#    editor_config_language_description: "Define the programming language you want to code in."
     editor_config_keybindings_label: "Toets instellingen"
     editor_config_keybindings_default: "Standaard (Ace)"
     editor_config_keybindings_description: "Voeg extra shortcuts toe van de gebruikelijke editors."

app/locale/nn.coffee

@@ -224,6 +224,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."

app/locale/no.coffee

@@ -224,6 +224,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."

app/locale/pl.coffee

@@ -224,6 +224,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."

app/locale/pt-BR.coffee

@@ -224,6 +224,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."

app/locale/pt-PT.coffee

@@ -224,6 +224,8 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
     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."

app/locale/pt.coffee

@@ -224,6 +224,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."

app/locale/ro.coffee

@@ -224,6 +224,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."

app/locale/ru.coffee

@@ -224,6 +224,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: "Добавляет дополнительные сочетания, известные из популярных редакторов."

app/locale/sk.coffee

@@ -224,6 +224,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."

app/locale/sl.coffee

@@ -224,6 +224,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."

app/locale/sr.coffee

@@ -224,6 +224,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."

app/locale/sv.coffee

@@ -224,6 +224,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."

app/locale/th.coffee

@@ -224,6 +224,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."

app/locale/tr.coffee

@@ -224,6 +224,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."

app/locale/uk.coffee

@@ -224,6 +224,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."

app/locale/ur.coffee

@@ -224,6 +224,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."

app/locale/vi.coffee

@@ -224,6 +224,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."

app/locale/zh-HANS.coffee

@@ -224,6 +224,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."

app/locale/zh-HANT.coffee

@@ -224,6 +224,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."

app/locale/zh.coffee

@@ -224,6 +224,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."

app/templates/play/level/modal/editor_config.jade

@@ -5,6 +5,12 @@ 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)
@@ -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
-

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: ->

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}>"

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()

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()

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.17",
     "underscore.string": "~2.3.3",
     "firebase": "~1.0.2",
     "catiline": "~2.9.3"

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}