Merge pull request #1538 from codecombat/master

Master into production
2025-04-28 23:13:59 -04:00 · 2014-09-10 09:45:10 -04:00 · 2014-09-10 09:45:10 -04:00 · a7227bddcd
commit a7227bddcd
parent 638d509672 0b1f4ebada
10 changed files with 251 additions and 246 deletions
--- a/app/assets/main.html
+++ b/app/assets/main.html
@ -53,7 +53,10 @@
  <script>
    window.userObject = "userObjectTag";
  </script>
-  
+  <script type="text/javascript">
    var _bftn_options = { animation: 'banner' }
  </script>
  <script src="//widget.battleforthenet.com/widget.min.js" async></script>
  <script>require('initialize');</script>
 </head>
--- a/app/locale/de-AT.coffee
+++ b/app/locale/de-AT.coffee
@ -49,8 +49,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    blog: "Blog"
    forum: "Forum"
 #    account: "Account"
-#    profile: "Profile"
+    profile: "Profil"
-#    stats: "Stats"
+    stats: "Statistiken"
 #    code: "Code"
    admin: "Administration"
    home: "Home"
@ -79,7 +79,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
  recover:
    recover_account_title: "Account Wiederherstellung"
    send_password: "Wiederherstellungskennwort senden"
-#    recovery_sent: "Recovery email sent."
+    recovery_sent: "Wiederherstellungs-Email versandt."
  signup:
    create_account_title: "Account anlegen, um Fortschritt zu speichern"
@ -91,7 +91,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    sign_up: "Neuen Account anlegen"
    log_in: "mit Passwort einloggen"
    social_signup: "oder, du registriest dich über Facebook oder G+:"
-#    required: "You need to log in before you can go that way."
+    required: "Du musst dich vorher einloggen um dort hin zu gehen."
  home:
    slogan: "Lerne spielend Programmieren"
@ -105,11 +105,11 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    multiplayer: "Mehrspieler"
    for_developers: "Für Entwickler"
    javascript_blurb: "Die Sprache des Web. Geeignet für die Erstellung von Webseiten, WebApps, HTML5 Spielen und Servern.."
-#    python_blurb: "Simple yet powerful, Python is a great general purpose programming language."
+    python_blurb: "Einfach jedoch leistungsfähig, Python ist eine gute Allzweck-Programmiersprache."
    coffeescript_blurb: "Schönere JavaScript Syntax."
    clojure_blurb: "Ein modernes Lisp."
    lua_blurb: "Skriptsprache für Spiele."
-#    io_blurb: "Simple but obscure."
+    io_blurb: "Simpel aber obskur."
  play:
    choose_your_level: "Wähle dein Level"
@ -124,13 +124,13 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    campaign_multiplayer_description: "... in der Du Kopf-an-Kopf gegen andere Spieler programmierst."
    campaign_player_created: "Von Spielern erstellt"
    campaign_player_created_description: "... in welchem Du gegen die Kreativität eines <a href=\"/contribute#artisan\">Artisan Zauberers</a> kämpfst."
-#    campaign_classic_algorithms: "Classic Algorithms"
+    campaign_classic_algorithms: "Klassiche Algorithmen"
-#    campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science."
+    campaign_classic_algorithms_description: "... in welchem du die populärsten Algorithmen der Informatik lernst."
    level_difficulty: "Schwierigkeit: "
    play_as: "Spiele als "
    spectate: "Zuschauen"
-#    players: "players"
+    players: "Spieler"
-#    hours_played: "hours played"
+    hours_played: "Stunden gespielt"
  contact:
    contact_us: "Kontaktiere CodeCombat"
@ -191,7 +191,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
 #    email_any_notes: "Any Notifications"
 #    email_any_notes_description: "Disable to stop all activity notification emails."
-#    email_news: "News"
+    email_news: "News"
    email_recruit_notes: "Job-Angebote"
 #    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
    contributor_emails: "Unterstützer Email"
@ -220,9 +220,9 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    looking_for: "Suche nach:"
    last_updated: "zuletzt geändert:"
    contact: "Kontakt"
-#    active: "Looking for interview offers now"
+    active: "Suche jetzt nach Interview-Angeboten"
-#    inactive: "Not looking for offers right now"
+    inactive: "Suche momentan nicht nach Angeboten"
-#    complete: "complete"
+    complete: "komplett"
 #    next: "Next"
    next_city: "Stadt?"
    next_country: "Wähle dein Land."
@ -233,7 +233,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    next_work: "chronicle your work history."
 #    next_education: "recount your educational ordeals."
    next_projects: "Zeige bis zu 3 Projekte an denen du gearbeitet hast."
-#    next_links: "add any personal or social links."
+    next_links: "Füge beliebige persönliche oder soziale Links hinzu."
    next_photo: "Füge ein optionales professionelles Foto hinzu."
 #    next_active: "mark yourself open to offers to show up in searches."
    example_blog: "Blog"
@ -241,33 +241,33 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    links_header: "Persönliche Links"
    links_blurb: "Verlinke zu anderen Seiten oder Profilen die du hervorheben möchtest, wie z.B. dein GitHub, dein LinkedIn oder deinen Blog."
    links_name: "Link-Name"
-#    links_name_help: "What are you linking to?"
+    links_name_help: "Wozu verlinkst du?"
    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
+    basics_header: "Aktualisiere Grundangaben"
-#    basics_active: "Open to Offers"
+    basics_active: "Offen für Angebote"
-#    basics_active_help: "Want interview offers right now?"
+    basics_active_help: "Möchtest du nun Angebote für Vorstellungsgespräche erhalten?"
-#    basics_job_title: "Desired Job Title"
+    basics_job_title: "Gewünschter Job-Titel"
 #    basics_job_title_help: "What role are you looking for?"
    basics_city: "Stadt"
    basics_city_help: "Stadt in der du arbeiten möchtest (oder jetzt lebst)."
    basics_country: "Land"
    basics_country_help: "Land in dem du arbeiten möchtest (oder jetzt lebst)."
-#    basics_visa: "US Work Status"
+    basics_visa: "US Arbeitserlaubnis"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
+    basics_visa_help: "Bist du berechtigt in den USA zu arbeiten oder benötigst du Visa Sponsoring? (Wenn du in Kanada oder Australien lebst, markiere berechtigt.)"
-#    basics_looking_for: "Looking For"
+    basics_looking_for: "Suche nach"
    basics_looking_for_full_time: "Vollzeit"
    basics_looking_for_part_time: "Teilzeit"
    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
+    basics_looking_for_contracting: "Vertragsarbeit"
    basics_looking_for_internship: "Praktikum"
-#    basics_looking_for_help: "What kind of developer position do you want?"
+    basics_looking_for_help: "Was für eine Art Entwickler-Position suchst du?"
    name_header: "Trage deinen Namen ein"
    name_anonymous: "Anonymer Entwickler"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
+    name_help: "Name den Arbeitgeber sehen sollen, z.B. 'Nick Winter'."
 #    short_description_header: "Write a short description of yourself"
 #    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
 #    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
+    short_description_help: "Wer bist du und wonach suchst du? 140 Zeichen max."
    skills_header: "Fähigkeiten"
 #    skills_help: "Tag relevant developer skills in order of proficiency."
    long_description_header: "Beschreibe deine gewünschte Position"
@ -298,8 +298,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    education_duration_help: "Wann?"
    education_description: "Beschreibung"
 #    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
+    our_notes: "CodeCombat's Notizen"
-#    remarks: "Remarks"
+    remarks: "Kommentare"
    projects: "Projekte"
    projects_header: "Füge 3 Projekte hinzu"
    projects_header_2: "Projekte (Top 3)"
@ -319,17 +319,17 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    get_started: "Get Started"
 #    already_screened: "We've already technically screened all our candidates"
 #    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
+    filter_visa: "Visum"
-#    filter_visa_yes: "US Authorized"
+    filter_visa_yes: "US authorisiert"
-#    filter_visa_no: "Not Authorized"
+    filter_visa_no: "nicht authorisiert"
 #    filter_education_top: "Top School"
 #    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
+    filter_role_web_developer: "Web Entwickler"
-#    filter_role_software_developer: "Software Developer"
+    filter_role_software_developer: "Software Entwickler"
-#    filter_role_mobile_developer: "Mobile Developer"
+    filter_role_mobile_developer: "Mobile Entwickler"
-#    filter_experience: "Experience"
+    filter_experience: "Erfahrung"
-#    filter_experience_senior: "Senior"
+    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
+    filter_experience_junior: "Junior"
 #    filter_experience_recent_grad: "Recent Grad"
 #    filter_experience_student: "College Student"
 #    filter_results: "results"
@ -344,25 +344,25 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    make_hiring_easier: "Make my hiring easier, please."
    what: "Was ist CodeCombat?"
 #    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
+    cost: "Wieviel berechnen wir?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
    candidate_name: "Name"
 #    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
+    candidate_looking_for: "Sucht nach"
    candidate_role: "Rolle"
 #    candidate_top_skills: "Top Skills"
 #    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
+    candidate_last_updated: "Zuletzt aktualisiert"
-#    candidate_who: "Who"
+    candidate_who: "Wer"
 #    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
+    other_developers: "Andere Entwickler"
-#    inactive_developers: "Inactive Developers"
+    inactive_developers: "Inaktive Etwickler"
  play_level:
    done: "Fertig"
    customize_wizard: "Bearbeite den Zauberer"
    home: "Startseite"
-#    stop: "Stop"
+    stop: "Stopp"
    game_menu: "Spielmenü"
    guide: "Hilfe"
    restart: "Neustart"
@ -434,22 +434,22 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    time_total: "Total"
    time_goto: "Gehe zu"
    infinite_loop_try_again: "Erneut versuchen"
-#    infinite_loop_reset_level: "Reset Level"
+    infinite_loop_reset_level: "Level zurücksetzen"
    infinite_loop_comment_out: "Meinen Code auskommentieren"
 #  game_menu:
 #    inventory_tab: "Inventory"
-#    choose_hero_tab: "Restart Level"
+    choose_hero_tab: "Level neustarten"
-#    save_load_tab: "Save/Load"
+    save_load_tab: "Speichere/Lade"
-#    options_tab: "Options"
+    options_tab: "Einstellungen"
 #    guide_tab: "Guide"
-#    multiplayer_tab: "Multiplayer"
+    multiplayer_tab: "Mehrspieler"
 #    inventory_caption: "Equip your hero"
 #    choose_hero_caption: "Choose hero, language"
 #    save_load_caption: "... and view history"
-#    options_caption: "Configure settings"
+    options_caption: "konfiguriere Einstellungen"
-#    guide_caption: "Docs and tips"
+    guide_caption: "Doku und Tipps"
-#    multiplayer_caption: "Play with friends!"
+    multiplayer_caption: "Spiele mit Freunden!"
 #  inventory:
 #    temp: "Temp"
@ -457,13 +457,13 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #  choose_hero:
 #    temp: "Temp"
-#  save_load:
+  save_load:
-#    granularity_saved_games: "Saved"
+    granularity_saved_games: "Gespeichert"
-#    granularity_change_history: "History"
+    granularity_change_history: "Historie"
  options:
    general_options: "Allgemeine Einstellungen"
-#    volume_label: "Volume"
+    volume_label: "Lautstärke"
    music_label: "Musik"
    music_description: "Schalte Hintergrundmusik an/aus."
 #    autorun_label: "Autorun"
@ -491,7 +491,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
  multiplayer:
    multiplayer_title: "Mehrspieler Einstellungen"
-#    multiplayer_toggle: "Enable multiplayer"
+    multiplayer_toggle: "Aktiviere Mehrspieler"
    multiplayer_toggle_description: "Erlaube anderen an deinem Spiel teilzunehmen."
    multiplayer_link_description: "Gib diesen Link jedem, der mitmachen will."
    multiplayer_hint_label: "Hinweis:"
@ -504,7 +504,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    space: "Leertaste"
    enter: "Eingabetaste"
 #    escape: "Escape"
-#    shift: "Shift"
+    shift: "Umschalttaste"
 #    cast_spell: "Cast current spell."
 #    run_real_time: "Run in real time."
 #    continue_script: "Continue past current script."
@ -517,7 +517,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    toggle_grid: "Toggle grid overlay."
 #    toggle_pathfinding: "Toggle pathfinding overlay."
 #    beautify: "Beautify your code by standardizing its formatting."
-#    maximize_editor: "Maximize/minimize code editor."
+    maximize_editor: "Maximiere/Minimiere Code Editor."
 #    move_wizard: "Move your Wizard around the level."
  admin:
@ -558,7 +558,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    grassy: "Grassy"
    fork_title: "Forke neue Version"
    fork_creating: "Erzeuge Fork..."
-#    generate_terrain: "Generate Terrain"
+    generate_terrain: "Generiere Terrain"
    more: "Mehr"
    wiki: "Wiki"
    live_chat: "Live Chat"
@ -568,7 +568,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    level_tab_settings: "Einstellungen"
    level_tab_components: "Komponenten"
    level_tab_systems: "Systeme"
-#    level_tab_docs: "Documentation"
+    level_tab_docs: "Dokumentation"
    level_tab_thangs_title: "Aktuelle Thangs"
    level_tab_thangs_all: "Alle"
    level_tab_thangs_conditions: "Startbedingungen"
@ -652,21 +652,21 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    why_paragraph_2_italic_caps: "NEIN MUTTI ICH MUSS NOCH DEN LEVEL BEENDEN !"
    why_paragraph_2_suffix: "Deshalb ist CodeCombat ein Multiplayerspiel und kein spielähnlicher Kurs. Wir werden nicht aufhören bis du nicht mehr aufhören kannst -- nur diesmal ist das eine gute Sache."
    why_paragraph_3: "Wenn dich Spiele süchtig machen, dass lass dich von diesem süchtig machen und werde ein Zauberer des Technologiezeitalters."
-#    press_title: "Bloggers/Press"
+    press_title: "Blogger/Presse"
-#    press_paragraph_1_prefix: "Want to write about us? Feel free to download and use all of the resources included in our"
+    press_paragraph_1_prefix: "Sie möchten über uns schreiben? Laden und benutzen Sie ruhig alle Ressourcen in unserem"
-#    press_paragraph_1_link: "press packet"
+    press_paragraph_1_link: "Presse-Paket"
-#    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
+    press_paragraph_1_suffix: ". Alle Logos und Bilder können ohne unsere vorherige Zustimmung verwendet werden."
-#    team: "Team"
+    team: "Team"
-#    george_title: "CEO"
+    george_title: "CEO"
 #    george_blurb: "Businesser"
-#    scott_title: "Programmer"
+    scott_title: "Programmierer"
-#    scott_blurb: "Reasonable One"
+    scott_blurb: "Der Vernünftige"
-#    nick_title: "Programmer"
+    nick_title: "Programmierer"
-#    nick_blurb: "Motivation Guru"
+    nick_blurb: "Motivationsguru"
-#    michael_title: "Programmer"
+    michael_title: "Programmierer"
-#    michael_blurb: "Sys Admin"
+    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+    matt_title: "Programmierer"
-#    matt_blurb: "Bicyclist"
+    matt_blurb: "Radfahrer"
  legal:
    page_title: "Rechtliches"
@ -732,14 +732,14 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
  contribute:
 #    page_title: "Contributing"
    character_classes_title: "Charakter Klassen"
-#    introduction_desc_intro: "We have high hopes for CodeCombat."
+    introduction_desc_intro: "Wir haben hohe Erwartungen für CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"
 #    introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours."
 #    introduction_desc_ending: "We hope you'll join our party!"
 #    introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt"
-#    alert_account_message_intro: "Hey there!"
+    alert_account_message_intro: "Hey du!"
-#    alert_account_message: "To subscribe for class emails, you'll need to be logged in first."
+    alert_account_message: "Um Klassen-Emails abonnieren zu können, musst du dich zuerst anmelden."
 #    archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever."
 #    archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever."
    class_attributes: "Klassenattribute"
@ -752,9 +752,9 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    join_desc_3: ", or find us in our "
 #    join_desc_4: "and we'll go from there!"
    join_url_email: "Emaile uns"
-#    join_url_hipchat: "public HipChat room"
+    join_url_hipchat: "öffentlicher HipChat Raum"
-#    more_about_archmage: "Learn More About Becoming an Archmage"
+    more_about_archmage: "Erfahre mehr darüber wie du ein Erzmagier werden kannst"
-#    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
+    archmage_subscribe_desc: "Erhalte Emails über neue Programmier-Möglichkeiten und Ankündigungen."
 #    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_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"
@ -762,13 +762,13 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    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!"
-#    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
+    artisan_join_desc: "Verwende den Level-Editor mit diesen Schritten, mehr oder weniger:"
-#    artisan_join_step1: "Read the documentation."
+    artisan_join_step1: "Lese die Dokumentation."
-#    artisan_join_step2: "Create a new level and explore existing levels."
+    artisan_join_step2: "Erstelle ein neues Level und erkunde existierende Level."
-#    artisan_join_step3: "Find us in our public HipChat room for help."
+    artisan_join_step3: "Finde uns im öffentlichen HipChat Raum, falls du Hilfe brauchst."
-#    artisan_join_step4: "Post your levels on the forum for feedback."
+    artisan_join_step4: "Poste deine Level im Forum um Feedback zu erhalten."
-#    more_about_artisan: "Learn More About Becoming an Artisan"
+    more_about_artisan: "Erfahre mehr darüber wie du ein Handwerker werden kannst"
-#    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
+    artisan_subscribe_desc: "Erhalte Emails über Level-Editor Updates und Ankündigungen."
 #    adventurer_summary: "Let us be clear about your role: you are the tank. You are going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class is for you."
 #    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
 #    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
@ -776,8 +776,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
 #    adventurer_forum_url: "our forum"
 #    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    more_about_adventurer: "Learn More About Becoming an Adventurer"
+    more_about_adventurer: "Erfahre mehr darüber wie du ein Abenteurer werden kannst"
-#    adventurer_subscribe_desc: "Get emails when there are new levels to test."
+    adventurer_subscribe_desc: "Erhalte Emails wenn es neue Levels zum Testen gibt."
 #    scribe_summary_pref: "CodeCombat is not just going to be a bunch of levels. It will also be a resource of programming knowledge that players can hook into. That way, each Artisan can link to a detailed article that for the player's edification: documentation akin to what the "
 #    scribe_summary_suf: " has built. If you enjoy explaining programming concepts, then this class is for you."
 #    scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
@ -786,8 +786,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    scribe_attribute_1: "Skill in words is pretty much all you need. Not only grammar and spelling, but able to convey complicated ideas to others."
    contact_us_url: "Kontaktiere uns"
 #    scribe_join_description: "tell us a little about yourself, your experience with programming and what sort of things you'd like to write about. We'll go from there!"
-#    more_about_scribe: "Learn More About Becoming a Scribe"
+    more_about_scribe: "Erfahre mehr darüber wie du ein Schreiber werden kannst"
-#    scribe_subscribe_desc: "Get emails about article writing announcements."
+    scribe_subscribe_desc: "Erhalte Emails über Ankündigungen zu schreibenden Artikeln."
 #    diplomat_summary: "There is a large interest in CodeCombat in other countries that do not speak English! We are looking for translators who are willing to spend their time translating the site's corpus of words so that CodeCombat is accessible across the world as soon as possible. If you'd like to help getting CodeCombat international, then this class is for you."
 #    diplomat_introduction_pref: "So, if there's one thing we learned from the "
 #    diplomat_launch_url: "launch in October"
@ -796,17 +796,17 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    diplomat_join_pref_github: "Find your language locale file "
 #    diplomat_github_url: "on GitHub"
 #    diplomat_join_suf_github: ", edit it online, and submit a pull request. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    more_about_diplomat: "Learn More About Becoming a Diplomat"
+    more_about_diplomat: "Erfahre mehr darüber wie du ein Diplomat werden kannst"
-#    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
+    diplomat_subscribe_desc: "Erhalte Emails über i18n Entwicklungen und Level die übersetzt werden müssen."
 #    ambassador_summary: "We are trying to build a community, and every community needs a support team when there are troubles. We have got chats, emails, and social networks so that our users can get acquainted with the game. If you want to help people get involved, have fun, and learn some programming, then this class is for you."
 #    ambassador_introduction: "This is a community we're building, and you are the connections. We've got Olark chats, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
 #    ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
 #    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
 #    ambassador_join_note_strong: "Note"
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-#    more_about_ambassador: "Learn More About Becoming an Ambassador"
+    more_about_ambassador: "Erfahre mehr darüber wie du ein Botschafter werden kannst"
-#    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
+    ambassador_subscribe_desc: "Erhalte Emails über Support-Updates and Mehrspieler-Entwicklungen."
-#    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
+    changes_auto_save: "Änderungen an Checkboxen werden automatisch gespeichert."
    diligent_scribes: "Unsere fleißgen Schreiber:"
    powerful_archmages: "Unsere mächtigen Erzmagier:"
    creative_artisans: "Unsere kreativen Handwerker:"
@ -858,11 +858,11 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    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."
    choose_opponent: "Wähle einen Gegner"
-#    select_your_language: "Select your language!"
+    select_your_language: "Wähle deine Sprache!"
    tutorial_play: "Spiele Tutorial"
    tutorial_recommended: "Empfohlen, wenn du noch nie zuvor gespielt hast."
    tutorial_skip: "Überspringe Tutorial"
-#    tutorial_not_sure: "Not sure what's going on?"
+    tutorial_not_sure: "Nicht sicher was hier ab geht?"
    tutorial_play_first: "Spiele zuerst das Tutorial."
    simple_ai: "Einfache KI"
    warmup: "Aufwärmen"
@ -870,7 +870,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    friends_playing: "spielende Freunde"
    log_in_for_friends: "Melde dich an um mit deinen Freunden zu spielen!"
    social_connect_blurb: "Verbinde und spiele gegen deine Freunde!"
-#    invite_friends_to_battle: "Invite your friends to join you in battle!"
+    invite_friends_to_battle: "Lade deine Freunde zum Kampf ein!"
 #    fight: "Fight!"
 #    watch_victory: "Watch your victory"
 #    defeat_the: "Defeat the"
@ -911,13 +911,13 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    not_found: "Nicht gefunden."
    not_allowed: "Methode nicht erlaubt."
    timeout: "Server timeout."
-    conflict: "Resourcen Konflikt."
+    conflict: "Ressourcen Konflikt."
    bad_input: "Falsche Eingabe."
    server_error: "Server Fehler."
    unknown: "Unbekannter Fehler."
  resources:
-#    sessions: "Sessions"
+    sessions: "Sessions"
    your_sessions: "Meine Sessions"
    level: "Level"
    social_network_apis: "Social Network APIs"
@ -933,7 +933,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    patched_model: "Source Document"
    model: "Model"
    system: "System"
-#    systems: "Systems"
+    systems: "Systeme"
    component: "Komponente"
    components: "Komponenten"
    thang: "Thang"
@ -948,18 +948,18 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    source_document: "Source Document"
    document: "Dokument"
    sprite_sheet: "Sprite Sheet"
-#    employers: "Employers"
+    employers: "Arbeitgeber"
-#    candidates: "Candidates"
+    candidates: "Kandidaten"
    candidate_sessions: "Kandidat-Sessions"
    user_remark: "Benutzerkommentar"
-#    user_remarks: "User Remarks"
+    user_remarks: "Benutzerkommentare"
    versions: "Versionen"
    items: "Gegenstände"
-#    wizard: "Wizard"
+    wizard: "Zauberer"
 #    achievement: "Achievement"
 #    clas: "CLAs"
 #    play_counts: "Play Counts"
-#    feedback: "Feedback"
+    feedback: "Feedback"
  delta:
    added: "hinzugefügt"
@ -970,28 +970,28 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
    merge_conflict_with: "MERGE KONFLIKT MIT"
    no_changes: "Keine Änderungen"
-#  user:
+  user:
-#    stats: "Stats"
+    stats: "Statistiken"
-#    singleplayer_title: "Singleplayer Levels"
+    singleplayer_title: "Einzelspieler Level"
-#    multiplayer_title: "Multiplayer Levels"
+    multiplayer_title: "Mehrspieler Level"
 #    achievements_title: "Achievements"
-#    last_played: "Last Played"
+    last_played: "Zuletzt gespielt"
-#    status: "Status"
+    status: "Status"
 #    status_completed: "Completed"
 #    status_unfinished: "Unfinished"
 #    no_singleplayer: "No Singleplayer games played yet."
 #    no_multiplayer: "No Multiplayer games played yet."
 #    no_achievements: "No Achievements earned yet."
-#    favorite_prefix: "Favorite language is "
+    favorite_prefix: "Lieblingssprache ist "
 #    favorite_postfix: "."
 #  achievements:
 #    last_earned: "Last Earned"
-#    amount_achieved: "Amount"
+    amount_achieved: "Anzahl"
 #    achievement: "Achievement"
 #    category_contributor: "Contributor"
 #    category_miscellaneous: "Miscellaneous"
-#    category_levels: "Levels"
+    category_levels: "Level"
 #    category_undefined: "Uncategorized"
 #    current_xp_prefix: ""
 #    current_xp_postfix: " in total"
--- a/app/locale/de-DE.coffee
+++ b/app/locale/de-DE.coffee
@ -49,8 +49,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    blog: "Blog"
    forum: "Forum"
 #    account: "Account"
-#    profile: "Profile"
+    profile: "Profil"
-#    stats: "Stats"
+    stats: "Statistiken"
 #    code: "Code"
    admin: "Administration"
    home: "Home"
@ -79,7 +79,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
  recover:
    recover_account_title: "Account Wiederherstellung"
    send_password: "Wiederherstellungskennwort senden"
-#    recovery_sent: "Recovery email sent."
+    recovery_sent: "Wiederherstellungs-Email versandt."
  signup:
    create_account_title: "Account anlegen, um Fortschritt zu speichern"
@ -91,7 +91,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    sign_up: "Neuen Account anlegen"
    log_in: "mit Passwort einloggen"
    social_signup: "oder, du registriest dich über Facebook oder G+:"
-#    required: "You need to log in before you can go that way."
+    required: "Du musst dich vorher einloggen um dort hin zu gehen."
  home:
    slogan: "Lerne spielend Programmieren"
@ -105,11 +105,11 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    multiplayer: "Mehrspieler"
    for_developers: "Für Entwickler"
    javascript_blurb: "Die Sprache des Web. Geeignet für die Erstellung von Webseiten, WebApps, HTML5 Spielen und Servern.."
-#    python_blurb: "Simple yet powerful, Python is a great general purpose programming language."
+    python_blurb: "Einfach jedoch leistungsfähig, Python ist eine gute Allzweck-Programmiersprache."
    coffeescript_blurb: "Schönere JavaScript Syntax."
    clojure_blurb: "Ein modernes Lisp."
    lua_blurb: "Skriptsprache für Spiele."
-#    io_blurb: "Simple but obscure."
+    io_blurb: "Simpel aber obskur."
  play:
    choose_your_level: "Wähle dein Level"
@ -124,13 +124,13 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    campaign_multiplayer_description: "... in der Du Kopf-an-Kopf gegen andere Spieler programmierst."
    campaign_player_created: "Von Spielern erstellt"
    campaign_player_created_description: "... in welchem Du gegen die Kreativität eines <a href=\"/contribute#artisan\">Artisan Zauberers</a> kämpfst."
-#    campaign_classic_algorithms: "Classic Algorithms"
+    campaign_classic_algorithms: "Klassiche Algorithmen"
-#    campaign_classic_algorithms_description: "... in which you learn the most popular algorithms in Computer Science."
+    campaign_classic_algorithms_description: "... in welchem du die populärsten Algorithmen der Informatik lernst."
    level_difficulty: "Schwierigkeit: "
    play_as: "Spiele als "
    spectate: "Zuschauen"
-#    players: "players"
+    players: "Spieler"
-#    hours_played: "hours played"
+    hours_played: "Stunden gespielt"
  contact:
    contact_us: "Kontaktiere CodeCombat"
@ -191,7 +191,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
 #    email_any_notes: "Any Notifications"
 #    email_any_notes_description: "Disable to stop all activity notification emails."
-#    email_news: "News"
+    email_news: "News"
    email_recruit_notes: "Job-Angebote"
 #    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
    contributor_emails: "Unterstützer Email"
@ -220,9 +220,9 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    looking_for: "Suche nach:"
    last_updated: "zuletzt geändert:"
    contact: "Kontakt"
-#    active: "Looking for interview offers now"
+    active: "Suche jetzt nach Interview-Angeboten"
-#    inactive: "Not looking for offers right now"
+    inactive: "Suche momentan nicht nach Angeboten"
-#    complete: "complete"
+    complete: "komplett"
 #    next: "Next"
    next_city: "Stadt?"
    next_country: "Wähle dein Land."
@ -233,7 +233,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    next_work: "chronicle your work history."
 #    next_education: "recount your educational ordeals."
    next_projects: "Zeige bis zu 3 Projekte an denen du gearbeitet hast."
-#    next_links: "add any personal or social links."
+    next_links: "Füge beliebige persönliche oder soziale Links hinzu."
    next_photo: "Füge ein optionales professionelles Foto hinzu."
 #    next_active: "mark yourself open to offers to show up in searches."
    example_blog: "Blog"
@ -241,33 +241,33 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    links_header: "Persönliche Links"
    links_blurb: "Verlinke zu anderen Seiten oder Profilen die du hervorheben möchtest, wie z.B. dein GitHub, dein LinkedIn oder deinen Blog."
    links_name: "Link-Name"
-#    links_name_help: "What are you linking to?"
+    links_name_help: "Wozu verlinkst du?"
    links_link_blurb: "Link URL"
-#    basics_header: "Update basic info"
+    basics_header: "Aktualisiere Grundangaben"
-#    basics_active: "Open to Offers"
+    basics_active: "Offen für Angebote"
-#    basics_active_help: "Want interview offers right now?"
+    basics_active_help: "Möchtest du nun Angebote für Vorstellungsgespräche erhalten?"
-#    basics_job_title: "Desired Job Title"
+    basics_job_title: "Gewünschter Job-Titel"
 #    basics_job_title_help: "What role are you looking for?"
    basics_city: "Stadt"
    basics_city_help: "Stadt in der du arbeiten möchtest (oder jetzt lebst)."
    basics_country: "Land"
    basics_country_help: "Land in dem du arbeiten möchtest (oder jetzt lebst)."
-#    basics_visa: "US Work Status"
+    basics_visa: "US Arbeitserlaubnis"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
+    basics_visa_help: "Bist du berechtigt in den USA zu arbeiten oder benötigst du Visa Sponsoring? (Wenn du in Kanada oder Australien lebst, markiere berechtigt.)"
-#    basics_looking_for: "Looking For"
+    basics_looking_for: "Suche nach"
    basics_looking_for_full_time: "Vollzeit"
    basics_looking_for_part_time: "Teilzeit"
    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
+    basics_looking_for_contracting: "Vertragsarbeit"
    basics_looking_for_internship: "Praktikum"
-#    basics_looking_for_help: "What kind of developer position do you want?"
+    basics_looking_for_help: "Was für eine Art Entwickler-Position suchst du?"
    name_header: "Trage deinen Namen ein"
    name_anonymous: "Anonymer Entwickler"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
+    name_help: "Name den Arbeitgeber sehen sollen, z.B. 'Nick Winter'."
 #    short_description_header: "Write a short description of yourself"
 #    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
 #    short_description: "Tagline"
-#    short_description_help: "Who are you, and what are you looking for? 140 characters max."
+    short_description_help: "Wer bist du und wonach suchst du? 140 Zeichen max."
    skills_header: "Fähigkeiten"
 #    skills_help: "Tag relevant developer skills in order of proficiency."
    long_description_header: "Beschreibe deine gewünschte Position"
@ -298,8 +298,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    education_duration_help: "Wann?"
    education_description: "Beschreibung"
 #    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
-#    our_notes: "CodeCombat's Notes"
+    our_notes: "CodeCombat's Notizen"
-#    remarks: "Remarks"
+    remarks: "Kommentare"
    projects: "Projekte"
    projects_header: "Füge 3 Projekte hinzu"
    projects_header_2: "Projekte (Top 3)"
@ -319,17 +319,17 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    get_started: "Get Started"
 #    already_screened: "We've already technically screened all our candidates"
 #    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
+    filter_visa: "Visum"
-#    filter_visa_yes: "US Authorized"
+    filter_visa_yes: "US authorisiert"
-#    filter_visa_no: "Not Authorized"
+    filter_visa_no: "nicht authorisiert"
 #    filter_education_top: "Top School"
 #    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
+    filter_role_web_developer: "Web Entwickler"
-#    filter_role_software_developer: "Software Developer"
+    filter_role_software_developer: "Software Entwickler"
-#    filter_role_mobile_developer: "Mobile Developer"
+    filter_role_mobile_developer: "Mobile Entwickler"
-#    filter_experience: "Experience"
+    filter_experience: "Erfahrung"
-#    filter_experience_senior: "Senior"
+    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
+    filter_experience_junior: "Junior"
 #    filter_experience_recent_grad: "Recent Grad"
 #    filter_experience_student: "College Student"
 #    filter_results: "results"
@ -344,25 +344,25 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    make_hiring_easier: "Make my hiring easier, please."
    what: "Was ist CodeCombat?"
 #    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
+    cost: "Wieviel berechnen wir?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
    candidate_name: "Name"
 #    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
+    candidate_looking_for: "Sucht nach"
    candidate_role: "Rolle"
 #    candidate_top_skills: "Top Skills"
 #    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
+    candidate_last_updated: "Zuletzt aktualisiert"
-#    candidate_who: "Who"
+    candidate_who: "Wer"
 #    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
+    other_developers: "Andere Entwickler"
-#    inactive_developers: "Inactive Developers"
+    inactive_developers: "Inaktive Etwickler"
  play_level:
    done: "Fertig"
    customize_wizard: "Bearbeite den Zauberer"
    home: "Startseite"
-#    stop: "Stop"
+    stop: "Stopp"
    game_menu: "Spielmenü"
    guide: "Hilfe"
    restart: "Neustart"
@ -434,22 +434,22 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    time_total: "Total"
    time_goto: "Gehe zu"
    infinite_loop_try_again: "Erneut versuchen"
-#    infinite_loop_reset_level: "Reset Level"
+    infinite_loop_reset_level: "Level zurücksetzen"
    infinite_loop_comment_out: "Meinen Code auskommentieren"
 #  game_menu:
 #    inventory_tab: "Inventory"
-#    choose_hero_tab: "Restart Level"
+    choose_hero_tab: "Level neustarten"
-#    save_load_tab: "Save/Load"
+    save_load_tab: "Speichere/Lade"
-#    options_tab: "Options"
+    options_tab: "Einstellungen"
 #    guide_tab: "Guide"
-#    multiplayer_tab: "Multiplayer"
+    multiplayer_tab: "Mehrspieler"
 #    inventory_caption: "Equip your hero"
 #    choose_hero_caption: "Choose hero, language"
 #    save_load_caption: "... and view history"
-#    options_caption: "Configure settings"
+    options_caption: "konfiguriere Einstellungen"
-#    guide_caption: "Docs and tips"
+    guide_caption: "Doku und Tipps"
-#    multiplayer_caption: "Play with friends!"
+    multiplayer_caption: "Spiele mit Freunden!"
 #  inventory:
 #    temp: "Temp"
@ -457,13 +457,13 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #  choose_hero:
 #    temp: "Temp"
-#  save_load:
+  save_load:
-#    granularity_saved_games: "Saved"
+    granularity_saved_games: "Gespeichert"
-#    granularity_change_history: "History"
+    granularity_change_history: "Historie"
  options:
    general_options: "Allgemeine Einstellungen"
-#    volume_label: "Volume"
+    volume_label: "Lautstärke"
    music_label: "Musik"
    music_description: "Schalte Hintergrundmusik an/aus."
 #    autorun_label: "Autorun"
@ -491,7 +491,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
  multiplayer:
    multiplayer_title: "Mehrspieler Einstellungen"
-#    multiplayer_toggle: "Enable multiplayer"
+    multiplayer_toggle: "Aktiviere Mehrspieler"
    multiplayer_toggle_description: "Erlaube anderen an deinem Spiel teilzunehmen."
    multiplayer_link_description: "Gib diesen Link jedem, der mitmachen will."
    multiplayer_hint_label: "Hinweis:"
@ -504,7 +504,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    space: "Leertaste"
    enter: "Eingabetaste"
 #    escape: "Escape"
-#    shift: "Shift"
+    shift: "Umschalttaste"
 #    cast_spell: "Cast current spell."
 #    run_real_time: "Run in real time."
 #    continue_script: "Continue past current script."
@ -517,7 +517,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    toggle_grid: "Toggle grid overlay."
 #    toggle_pathfinding: "Toggle pathfinding overlay."
 #    beautify: "Beautify your code by standardizing its formatting."
-#    maximize_editor: "Maximize/minimize code editor."
+    maximize_editor: "Maximiere/Minimiere Code Editor."
 #    move_wizard: "Move your Wizard around the level."
  admin:
@ -558,7 +558,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    grassy: "Grassy"
    fork_title: "Forke neue Version"
    fork_creating: "Erzeuge Fork..."
-#    generate_terrain: "Generate Terrain"
+    generate_terrain: "Generiere Terrain"
    more: "Mehr"
    wiki: "Wiki"
    live_chat: "Live Chat"
@ -568,7 +568,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    level_tab_settings: "Einstellungen"
    level_tab_components: "Komponenten"
    level_tab_systems: "Systeme"
-#    level_tab_docs: "Documentation"
+    level_tab_docs: "Dokumentation"
    level_tab_thangs_title: "Aktuelle Thangs"
    level_tab_thangs_all: "Alle"
    level_tab_thangs_conditions: "Startbedingungen"
@ -652,21 +652,21 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    why_paragraph_2_italic_caps: "NEIN MUTTI ICH MUSS NOCH DEN LEVEL BEENDEN !"
    why_paragraph_2_suffix: "Deshalb ist CodeCombat ein Multiplayerspiel und kein spielähnlicher Kurs. Wir werden nicht aufhören bis du nicht mehr aufhören kannst -- nur diesmal ist das eine gute Sache."
    why_paragraph_3: "Wenn dich Spiele süchtig machen, dass lass dich von diesem süchtig machen und werde ein Zauberer des Technologiezeitalters."
-#    press_title: "Bloggers/Press"
+    press_title: "Blogger/Presse"
-#    press_paragraph_1_prefix: "Want to write about us? Feel free to download and use all of the resources included in our"
+    press_paragraph_1_prefix: "Sie möchten über uns schreiben? Laden und benutzen Sie ruhig alle Ressourcen in unserem"
-#    press_paragraph_1_link: "press packet"
+    press_paragraph_1_link: "Presse-Paket"
-#    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
+    press_paragraph_1_suffix: ". Alle Logos und Bilder können ohne unsere vorherige Zustimmung verwendet werden."
-#    team: "Team"
+    team: "Team"
-#    george_title: "CEO"
+    george_title: "CEO"
 #    george_blurb: "Businesser"
-#    scott_title: "Programmer"
+    scott_title: "Programmierer"
-#    scott_blurb: "Reasonable One"
+    scott_blurb: "Der Vernünftige"
-#    nick_title: "Programmer"
+    nick_title: "Programmierer"
-#    nick_blurb: "Motivation Guru"
+    nick_blurb: "Motivationsguru"
-#    michael_title: "Programmer"
+    michael_title: "Programmierer"
-#    michael_blurb: "Sys Admin"
+    michael_blurb: "Sys Admin"
-#    matt_title: "Programmer"
+    matt_title: "Programmierer"
-#    matt_blurb: "Bicyclist"
+    matt_blurb: "Radfahrer"
  legal:
    page_title: "Rechtliches"
@ -732,14 +732,14 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
  contribute:
 #    page_title: "Contributing"
    character_classes_title: "Charakter Klassen"
-#    introduction_desc_intro: "We have high hopes for CodeCombat."
+    introduction_desc_intro: "Wir haben hohe Erwartungen für CodeCombat."
 #    introduction_desc_pref: "We want to be where programmers of all stripes come to learn and play together, introduce others to the wonderful world of coding, and reflect the best parts of the community. We can't and don't want to do that alone; what makes projects like GitHub, Stack Overflow and Linux great are the people who use them and build on them. To that end, "
 #    introduction_desc_github_url: "CodeCombat is totally open source"
 #    introduction_desc_suf: ", and we aim to provide as many ways as possible for you to take part and make this project as much yours as ours."
 #    introduction_desc_ending: "We hope you'll join our party!"
 #    introduction_desc_signature: "- Nick, George, Scott, Michael, Jeremy and Matt"
-#    alert_account_message_intro: "Hey there!"
+    alert_account_message_intro: "Hey du!"
-#    alert_account_message: "To subscribe for class emails, you'll need to be logged in first."
+    alert_account_message: "Um Klassen-Emails abonnieren zu können, musst du dich zuerst anmelden."
 #    archmage_summary: "Interested in working on game graphics, user interface design, database and server organization, multiplayer networking, physics, sound, or game engine performance? Want to help build a game to help other people learn what you are good at? We have a lot to do and if you are an experienced programmer and want to develop for CodeCombat, this class is for you. We would love your help building the best programming game ever."
 #    archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever."
    class_attributes: "Klassenattribute"
@ -752,9 +752,9 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    join_desc_3: ", or find us in our "
 #    join_desc_4: "and we'll go from there!"
    join_url_email: "Emaile uns"
-#    join_url_hipchat: "public HipChat room"
+    join_url_hipchat: "öffentlicher HipChat Raum"
-#    more_about_archmage: "Learn More About Becoming an Archmage"
+    more_about_archmage: "Erfahre mehr darüber wie du ein Erzmagier werden kannst"
-#    archmage_subscribe_desc: "Get emails on new coding opportunities and announcements."
+    archmage_subscribe_desc: "Erhalte Emails über neue Programmier-Möglichkeiten und Ankündigungen."
 #    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_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"
@ -762,13 +762,13 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    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!"
-#    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
+    artisan_join_desc: "Verwende den Level-Editor mit diesen Schritten, mehr oder weniger:"
-#    artisan_join_step1: "Read the documentation."
+    artisan_join_step1: "Lese die Dokumentation."
-#    artisan_join_step2: "Create a new level and explore existing levels."
+    artisan_join_step2: "Erstelle ein neues Level und erkunde existierende Level."
-#    artisan_join_step3: "Find us in our public HipChat room for help."
+    artisan_join_step3: "Finde uns im öffentlichen HipChat Raum, falls du Hilfe brauchst."
-#    artisan_join_step4: "Post your levels on the forum for feedback."
+    artisan_join_step4: "Poste deine Level im Forum um Feedback zu erhalten."
-#    more_about_artisan: "Learn More About Becoming an Artisan"
+    more_about_artisan: "Erfahre mehr darüber wie du ein Handwerker werden kannst"
-#    artisan_subscribe_desc: "Get emails on level editor updates and announcements."
+    artisan_subscribe_desc: "Erhalte Emails über Level-Editor Updates und Ankündigungen."
 #    adventurer_summary: "Let us be clear about your role: you are the tank. You are going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class is for you."
 #    adventurer_introduction: "Let's be clear about your role: you are the tank. You're going to take heavy damage. We need people to try out brand-new levels and help identify how to make things better. The pain will be enormous; making good games is a long process and no one gets it right the first time. If you can endure and have a high constitution score, then this class might be for you."
 #    adventurer_attribute_1: "A thirst for learning. You want to learn how to code and we want to teach you how to code. You'll probably be doing most of the teaching in this case, though."
@ -776,8 +776,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    adventurer_join_pref: "Either get together with (or recruit!) an Artisan and work with them, or check the box below to receive emails when there are new levels to test. We'll also be posting about levels to review on our networks like"
 #    adventurer_forum_url: "our forum"
 #    adventurer_join_suf: "so if you prefer to be notified those ways, sign up there!"
-#    more_about_adventurer: "Learn More About Becoming an Adventurer"
+    more_about_adventurer: "Erfahre mehr darüber wie du ein Abenteurer werden kannst"
-#    adventurer_subscribe_desc: "Get emails when there are new levels to test."
+    adventurer_subscribe_desc: "Erhalte Emails wenn es neue Levels zum Testen gibt."
 #    scribe_summary_pref: "CodeCombat is not just going to be a bunch of levels. It will also be a resource of programming knowledge that players can hook into. That way, each Artisan can link to a detailed article that for the player's edification: documentation akin to what the "
 #    scribe_summary_suf: " has built. If you enjoy explaining programming concepts, then this class is for you."
 #    scribe_introduction_pref: "CodeCombat isn't just going to be a bunch of levels. It will also include a resource for knowledge, a wiki of programming concepts that levels can hook into. That way rather than each Artisan having to describe in detail what a comparison operator is, they can simply link their level to the Article describing them that is already written for the player's edification. Something along the lines of what the "
@ -786,8 +786,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    scribe_attribute_1: "Skill in words is pretty much all you need. Not only grammar and spelling, but able to convey complicated ideas to others."
    contact_us_url: "Kontaktiere uns"
 #    scribe_join_description: "tell us a little about yourself, your experience with programming and what sort of things you'd like to write about. We'll go from there!"
-#    more_about_scribe: "Learn More About Becoming a Scribe"
+    more_about_scribe: "Erfahre mehr darüber wie du ein Schreiber werden kannst"
-#    scribe_subscribe_desc: "Get emails about article writing announcements."
+    scribe_subscribe_desc: "Erhalte Emails über Ankündigungen zu schreibenden Artikeln."
 #    diplomat_summary: "There is a large interest in CodeCombat in other countries that do not speak English! We are looking for translators who are willing to spend their time translating the site's corpus of words so that CodeCombat is accessible across the world as soon as possible. If you'd like to help getting CodeCombat international, then this class is for you."
 #    diplomat_introduction_pref: "So, if there's one thing we learned from the "
 #    diplomat_launch_url: "launch in October"
@ -796,17 +796,17 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    diplomat_join_pref_github: "Find your language locale file "
 #    diplomat_github_url: "on GitHub"
 #    diplomat_join_suf_github: ", edit it online, and submit a pull request. Also, check this box below to keep up-to-date on new internationalization developments!"
-#    more_about_diplomat: "Learn More About Becoming a Diplomat"
+    more_about_diplomat: "Erfahre mehr darüber wie du ein Diplomat werden kannst"
-#    diplomat_subscribe_desc: "Get emails about i18n developments and levels to translate."
+    diplomat_subscribe_desc: "Erhalte Emails über i18n Entwicklungen und Level die übersetzt werden müssen."
 #    ambassador_summary: "We are trying to build a community, and every community needs a support team when there are troubles. We have got chats, emails, and social networks so that our users can get acquainted with the game. If you want to help people get involved, have fun, and learn some programming, then this class is for you."
 #    ambassador_introduction: "This is a community we're building, and you are the connections. We've got Olark chats, emails, and social networks with lots of people to talk with and help get acquainted with the game and learn from. If you want to help people get involved and have fun, and get a good feel of the pulse of CodeCombat and where we're going, then this class might be for you."
 #    ambassador_attribute_1: "Communication skills. Be able to identify the problems players are having and help them solve them. Also, keep the rest of us informed about what players are saying, what they like and don't like and want more of!"
 #    ambassador_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll go from there!"
 #    ambassador_join_note_strong: "Note"
 #    ambassador_join_note_desc: "One of our top priorities is to build multiplayer where players having difficulty solving levels can summon higher level wizards to help them. This will be a great way for ambassadors to do their thing. We'll keep you posted!"
-#    more_about_ambassador: "Learn More About Becoming an Ambassador"
+    more_about_ambassador: "Erfahre mehr darüber wie du ein Botschafter werden kannst"
-#    ambassador_subscribe_desc: "Get emails on support updates and multiplayer developments."
+    ambassador_subscribe_desc: "Erhalte Emails über Support-Updates and Mehrspieler-Entwicklungen."
-#    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
+    changes_auto_save: "Änderungen an Checkboxen werden automatisch gespeichert."
    diligent_scribes: "Unsere fleißgen Schreiber:"
    powerful_archmages: "Unsere mächtigen Erzmagier:"
    creative_artisans: "Unsere kreativen Handwerker:"
@ -858,11 +858,11 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    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."
    choose_opponent: "Wähle einen Gegner"
-#    select_your_language: "Select your language!"
+    select_your_language: "Wähle deine Sprache!"
    tutorial_play: "Spiele Tutorial"
    tutorial_recommended: "Empfohlen, wenn du noch nie zuvor gespielt hast."
    tutorial_skip: "Überspringe Tutorial"
-#    tutorial_not_sure: "Not sure what's going on?"
+    tutorial_not_sure: "Nicht sicher was hier ab geht?"
    tutorial_play_first: "Spiele zuerst das Tutorial."
    simple_ai: "Einfache KI"
    warmup: "Aufwärmen"
@ -870,7 +870,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    friends_playing: "spielende Freunde"
    log_in_for_friends: "Melde dich an um mit deinen Freunden zu spielen!"
    social_connect_blurb: "Verbinde und spiele gegen deine Freunde!"
-#    invite_friends_to_battle: "Invite your friends to join you in battle!"
+    invite_friends_to_battle: "Lade deine Freunde zum Kampf ein!"
 #    fight: "Fight!"
 #    watch_victory: "Watch your victory"
 #    defeat_the: "Defeat the"
@ -911,13 +911,13 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    not_found: "Nicht gefunden."
    not_allowed: "Methode nicht erlaubt."
    timeout: "Server timeout."
-    conflict: "Resourcen Konflikt."
+    conflict: "Ressourcen Konflikt."
    bad_input: "Falsche Eingabe."
    server_error: "Server Fehler."
    unknown: "Unbekannter Fehler."
  resources:
-#    sessions: "Sessions"
+    sessions: "Sessions"
    your_sessions: "Meine Sessions"
    level: "Level"
    social_network_apis: "Social Network APIs"
@ -933,7 +933,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    patched_model: "Source Document"
    model: "Model"
    system: "System"
-#    systems: "Systems"
+    systems: "Systeme"
    component: "Komponente"
    components: "Komponenten"
    thang: "Thang"
@ -948,18 +948,18 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    source_document: "Source Document"
    document: "Dokument"
    sprite_sheet: "Sprite Sheet"
-#    employers: "Employers"
+    employers: "Arbeitgeber"
-#    candidates: "Candidates"
+    candidates: "Kandidaten"
    candidate_sessions: "Kandidat-Sessions"
    user_remark: "Benutzerkommentar"
-#    user_remarks: "User Remarks"
+    user_remarks: "Benutzerkommentare"
    versions: "Versionen"
    items: "Gegenstände"
-#    wizard: "Wizard"
+    wizard: "Zauberer"
 #    achievement: "Achievement"
 #    clas: "CLAs"
 #    play_counts: "Play Counts"
-#    feedback: "Feedback"
+    feedback: "Feedback"
  delta:
    added: "hinzugefügt"
@ -970,28 +970,28 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
    merge_conflict_with: "MERGE KONFLIKT MIT"
    no_changes: "Keine Änderungen"
-#  user:
+  user:
-#    stats: "Stats"
+    stats: "Statistiken"
-#    singleplayer_title: "Singleplayer Levels"
+    singleplayer_title: "Einzelspieler Level"
-#    multiplayer_title: "Multiplayer Levels"
+    multiplayer_title: "Mehrspieler Level"
 #    achievements_title: "Achievements"
-#    last_played: "Last Played"
+    last_played: "Zuletzt gespielt"
-#    status: "Status"
+    status: "Status"
 #    status_completed: "Completed"
 #    status_unfinished: "Unfinished"
 #    no_singleplayer: "No Singleplayer games played yet."
 #    no_multiplayer: "No Multiplayer games played yet."
 #    no_achievements: "No Achievements earned yet."
-#    favorite_prefix: "Favorite language is "
+    favorite_prefix: "Lieblingssprache ist "
 #    favorite_postfix: "."
 #  achievements:
 #    last_earned: "Last Earned"
-#    amount_achieved: "Amount"
+    amount_achieved: "Anzahl"
 #    achievement: "Achievement"
 #    category_contributor: "Contributor"
 #    category_miscellaneous: "Miscellaneous"
-#    category_levels: "Levels"
+    category_levels: "Level"
 #    category_undefined: "Uncategorized"
 #    current_xp_prefix: ""
 #    current_xp_postfix: " in total"
--- a/app/models/CocoModel.coffee
+++ b/app/models/CocoModel.coffee
@ -96,7 +96,9 @@ class CocoModel extends Backbone.Model
  schema: -> return @constructor.schema
  getValidationErrors: ->
-    errors = tv4.validateMultiple(@attributes, @constructor.schema or {}).errors
+    # Since Backbone unset only sets things to undefined instead of deleting them, we ignore undefined properties.
    definedAttributes = _.pick @attributes, (v) -> v isnt undefined
    errors = tv4.validateMultiple(definedAttributes, @constructor.schema or {}).errors
    return errors if errors?.length
  validate: ->
--- a/app/schemas/subscriptions/tome.coffee
+++ b/app/schemas/subscriptions/tome.coffee
@ -41,7 +41,7 @@ module.exports =
  'tome:palette-updated': c.object {title: 'Palette Updated', description: 'Published when the spell palette has just been updated.'},
    thangID: {type: 'string'}
-    entryGroups: {type: 'object', additionalProperties: {type: 'array', items: {type: 'object'}}}
+    entryGroups: {type: 'object', additionalProperties: {type: 'string'}}
  'tome:palette-hovered': c.object {title: 'Palette Hovered', description: 'Published when you hover over a Thang in the spell palette', required: ['thang', 'prop', 'entry']},
    thang: {type: 'object'}
--- a/app/views/contribute/DiplomatView.coffee
+++ b/app/views/contribute/DiplomatView.coffee
@ -40,7 +40,7 @@ module.exports = class DiplomatView extends ContributeClassView
    'en-GB': []        # English (UK), English (UK)
    'en-AU': []        # English (AU), English (AU)
    ru: ['fess89', 'ser-storchak', 'Mr A', 'a1ip', 'iulianR', 'EagleTA', 'kisik21', 'Shpionus', 'kerradus', 'ImmortalJoker']             # русский язык, Russian
-    'de-DE': ['Dirk', 'faabsen', 'HiroP0', 'Anon', 'bkimminich', 'bahuma20', 'domenukk', 'dkundel']        # Deutsch (Deutschland), German (Germany)
+    'de-DE': ['Dirk', 'faabsen', 'HiroP0', 'Anon', 'bkimminich', 'bahuma20', 'domenukk', 'dkundel', 'djsmith85']        # Deutsch (Deutschland), German (Germany)
    'de-AT': ['djsmith85']        # Deutsch (Österreich), German (Austria)
    'de-CH': ['greyhusky']        # Deutsch (Schweiz), German (Switzerland)
    'es-419': ['Jesús Ruppel', 'Matthew Burt', 'Mariano Luzza', '2xG', ]       # español (América Latina), Spanish (Latin America)
--- a/app/views/editor/ForkModal.coffee
+++ b/app/views/editor/ForkModal.coffee
@ -31,7 +31,7 @@ module.exports = class ForkModal extends ModalView
    newModel.unset 'parent'
    newModel.set 'commitMessage', "Forked from #{@model.get('name')}"
    newModel.set 'name', @$el.find('#fork-model-name').val()
-    if @model.schema.properties.permissions
+    if @model.schema().properties.permissions
      newModel.set 'permissions', [access: 'owner', target: me.id]
    newPathPrefix = "editor/#{@editorPath}/"
    res = newModel.save()
--- a/app/views/modal/NewModelModal.coffee
+++ b/app/views/modal/NewModelModal.coffee
@ -28,7 +28,7 @@ module.exports = class NewModelModal extends ModalView
    model = new @model
    name = @$el.find('#name').val()
    model.set('name', name)
-    if @model.schema.properties.permissions
+    if @model.schema().properties.permissions
      model.set 'permissions', [{access: 'owner', target: me.id}]
    model.set(key, prop) for key, prop of @properties if @properties?
    model
--- a/app/views/play/level/tome/SpellPaletteView.coffee
+++ b/app/views/play/level/tome/SpellPaletteView.coffee
@ -140,7 +140,7 @@ module.exports = class SpellPaletteView extends CocoView
        @entryGroupNames.this = thisName
        iOSEntryGroups[thisName] = iOSEntryGroups.this
        delete iOSEntryGroups.this
-    Backbone.Mediator.publish 'tome:palette-updated', entryGroups: iOSEntryGroups
+    Backbone.Mediator.publish 'tome:palette-updated', thangID: @thang.id, entryGroups: JSON.stringify(iOSEntryGroups)  # TODO: make it sort these by granting items if it's a hero level
  addEntry: (doc, shortenize, tabbify, isSnippet=false) ->
    writable = (if _.isString(doc) then doc else doc.name) in (@thang.apiUserProperties ? [])
--- a/scripts/windows/coco-dev-setup/batch/config/config.coco
+++ b/scripts/windows/coco-dev-setup/batch/config/config.coco
@ -2,8 +2,8 @@
 <variables>
    <version>3.5</version>
    <author>GlenDC</author>
-    <copyright>CodeCombat.com © 2013-2014</copyright>
+    <copyright>CodeCombat.com © 2013-2014</copyright>
    <github_url>https://github.com/codecombat/codecombat.git</github_url>
    <github_ssh>git@github.com:codecombat/codecombat.git</github_ssh>
-    <database_backup>http://23.21.59.137/dump.tar.gz</database_backup>
+    <database_backup>http://54.91.159.37/dump.tar.gz</database_backup>
-</variables>
+</variables>