Merge branch 'master' of https://github.com/codecombat/codecombat

2025-03-24 11:50:58 -04:00 · 2014-03-19 17:11:53 -07:00 · 2014-03-19 17:11:53 -07:00 · 954a3ac4cb
commit 954a3ac4cb
parent b6c9b6276c 225fd6d355
64 changed files with 1861 additions and 1503 deletions
--- a/app/assets/javascripts/workers/worker_world.js
+++ b/app/assets/javascripts/workers/worker_world.js
@ -5,6 +5,32 @@
 if(typeof window !== 'undefined' || !self.importScripts)
  throw "Attempt to load worker_world into main window instead of web worker.";

+// Taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind
+// This is here for running simuations in enviroments lacking function.bind (PhantomJS mostly)
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function (oThis) {
+    if (typeof this !== "function") {
+      // closest thing possible to the ECMAScript 5 internal IsCallable function
+      throw new TypeError("Function.prototype.bind (Shim) - target is not callable");
+    }
+
+    var aArgs = Array.prototype.slice.call(arguments, 1), 
+        fToBind = this, 
+        fNOP = function () {},
+        fBound = function () {
+          return fToBind.apply(this instanceof fNOP && oThis
+                                 ? this
+                                 : oThis,
+                               aArgs.concat(Array.prototype.slice.call(arguments)));
+        };
+
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+
+    return fBound;
+  };
+}
+
 // assign global window so that Brunch's require (in world.js) can go into it
 self.window = self;
 self.workerID = "Worker";
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
    nick_description: "Programátorský kouzelník, excentrický motivační mág i experimentátor. Nick by mohl dělat de-facto cokoliv, ale zvolil si vytvořit CodeCombat."
    jeremy_description: "Mistr zákaznické podpory, tester použitelnosti a organizátor komunity. Je velmi pravděpodobné, že jste si spolu již psali."
    michael_description: "Programátor, systémový administrátor a král podsvětí technického zázemí. Michael udržuje naše servery online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Licence"
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/de.coffee
+++ b/app/locale/de.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra
    nick_description: "Programmierzauberer, exzentrischer Motivationskünstler und  Auf-den-Kopf-stell-Experimentierer. Nick könnte alles mögliche tun und entschied CodeCombat zu bauen."
    jeremy_description: "Kundendienstmagier, Usability Tester und Community-Organisator. Wahrscheinlich hast du schon mit Jeremy gesprochen."
    michael_description: "Programmierer, Systemadministrator und studentisch technisches Wunderkind, Michael hält unsere Server am Laufen."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Rechtliches"
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/en-AU.coffee
+++ b/app/locale/en-AU.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that matter. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
    nick_description: "Mago de la programación, hechicero excéntrico de la motivación y experimentador del revés. Nick pudo haber hecho cualquier cosa y eligió desarrollar CodeCombat."
    jeremy_description: "Mago de la atención al cliente, tester de usabilidad y organizador de la comunidad; es probable que ya hayas hablado con Jeremy."
    michael_description: "Programador, administrador de sistemas y prodigio técnico, Michael es el encargado de mantener nuestros servidores en línea."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Legal"
--- a/app/locale/es.coffee
+++ b/app/locale/es.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@ -217,14 +217,14 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    editor_config: "Config de l'éditeur"
    editor_config_title: "Configuration de l'éditeur"
    editor_config_keybindings_label: "Raccourcis clavier"
-#    editor_config_keybindings_default: "Default (Ace)"
+    editor_config_keybindings_default: "Par défault (Ace)"
    editor_config_keybindings_description: "Ajouter de nouveaux raccourcis connus depuis l'éditeur commun."
-    editor_config_invisibles_label: "Afficher l'invisible"
-#    editor_config_invisibles_description: "Displays invisibles such as spaces or tabs."
-#    editor_config_indentguides_label: "Show Indent Guides"
-#    editor_config_indentguides_description: "Displays vertical lines to see indentation better."
-#    editor_config_behaviors_label: "Smart Behaviors"
-#    editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes."
+    editor_config_invisibles_label: "Afficher les caractères non-imprimables"
+    editor_config_invisibles_description: "Permet d'afficher les caractères comme les espaces et les tabulations."
+    editor_config_indentguides_label: "Montrer les indentations"
+    editor_config_indentguides_description: "Affiche des guides verticaux qui permettent de visualiser l'indentation."
+    editor_config_behaviors_label: "Auto-complétion"
+    editor_config_behaviors_description: "Ferme automatiquement les accolades, parenthèses, et chaînes de caractères."

  admin:
    av_title: "Vues d'administrateurs"
@ -249,8 +249,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    contact_us: "contactez nous!"
    hipchat_prefix: "Vous pouvez aussi nous trouver dans notre "
    hipchat_url: "conversation HipChat."
-#    revert: "Revert"
-#    revert_models: "Revert Models"
+    revert: "Annuler"
+    revert_models: "Annuler les modèles"
    level_some_options: "Quelques options?"
    level_tab_thangs: "Thangs"
    level_tab_scripts: "Scripts"
@ -269,18 +269,18 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    level_components_title: "Retourner à tous les Thangs"
    level_components_type: "Type"
    level_component_edit_title: "Éditer le composant"
-#    level_component_config_schema: "Config Schema"
-#    level_component_settings: "Settings"
+    level_component_config_schema: "Configurer le schéma"
+    level_component_settings: "Options"
    level_system_edit_title: "Éditer le système"
    create_system_title: "Créer un nouveau système"
    new_component_title: "Créer un nouveau composant"
    new_component_field_system: "Système"
-#    new_article_title: "Create a New Article"
-#    new_thang_title: "Create a New Thang Type"
-#    new_level_title: "Create a New Level"
-#    article_search_title: "Search Articles Here"
-#    thang_search_title: "Search Thang Types Here"
-#    level_search_title: "Search Levels Here"
+    new_article_title: "Créer un nouvel article"
+    new_thang_title: "Créer un nouveau Type Thang"
+    new_level_title: "Créer un nouveau niveau"
+    article_search_title: "Rechercher dans les articles"
+    thang_search_title: "Rechercher dans les types Thang"
+    level_search_title: "Rechercher dans les niveaux"

  article:
    edit_btn_preview: "Prévisualiser"
@ -292,27 +292,27 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    body: "Corps"
    version: "Version"
    commit_msg: "Message de mise à jour"
-#    history: "History"
-#    version_history_for: "Version History for: "
-#    result: "Result"
+    history: "Historique"
+    version_history_for: "Historique des versions pour : "
+    result: "Resultat"
    results: "Résultats"
    description: "Description"
    or: "ou"
    email: "Email"
-#    password: "Password"
+    password: "Mot de passe"
    message: "Message"
-#    code: "Code"
-#    ladder: "Ladder"
-#    when: "When"
-#    opponent: "Opponent"
-#    rank: "Rank"
-#    score: "Score"
-#    win: "Win"
-#    loss: "Loss"
-#    tie: "Tie"
-#    easy: "Easy"
-#    medium: "Medium"
-#    hard: "Hard"
+    code: "Code"
+    ladder: "Companion"
+    when: "Lorsuqe"
+    opponent: "Adversaire"
+    rank: "Rang"
+    score: "Score"
+    win: "Victoire"
+    loss: "Défaite"
+    tie: "Ex-aequo"
+    easy: "Facile"
+    medium: "Moyen"
+    hard: "Difficile"

  about:
    who_is_codecombat: "Qui est CodeCombat?"
@ -335,6 +335,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    nick_description: "Assistant programmeur, mage à la motivation excentrique, et bidouilleur de l'extrême. Nick peut faire n'importe quoi mais il a choisi CodeCombat."
    jeremy_description: "Mage de l'assistance client, testeur de maniabilité, et community manager; vous avez probablement déjà parlé avec Jeremy."
    michael_description: "Programmeur, administrateur réseau, et l'enfant prodige du premier cycle, Michael est la personne qui maintient nos serveurs en ligne."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Légal"
@ -507,37 +508,37 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    counselor_title: "Conseiller"
    counselor_title_description: "(Expert/Professeur)"

-#  ladder:
-#    please_login: "Please log in first before playing a ladder game."
-#    my_matches: "My Matches"
-#    simulate: "Simulate"
-#    simulation_explanation: "By simulating games you can get your game ranked faster!"
-#    simulate_games: "Simulate Games!"
-#    simulate_all: "RESET AND SIMULATE GAMES"
-#    leaderboard: "Leaderboard"
-#    battle_as: "Battle as "
-#    summary_your: "Your "
-#    summary_matches: "Matches - "
-#    summary_wins: " Wins, "
-#    summary_losses: " Losses"
-#    rank_no_code: "No New Code to Rank"
-#    rank_my_game: "Rank My Game!"
-#    rank_submitting: "Submitting..."
-#    rank_submitted: "Submitted for Ranking"
-#    rank_failed: "Failed to Rank"
-#    rank_being_ranked: "Game Being Ranked"
-#    code_being_simulated: "Your new code is being simulated by other players for ranking. This will refresh as new matches come in."
-#    no_ranked_matches_pre: "No ranked matches for the "
-#    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
-#    choose_opponent: "Choose an Opponent"
-#    tutorial_play: "Play Tutorial"
-#    tutorial_recommended: "Recommended if you've never played before"
-#    tutorial_skip: "Skip Tutorial"
-#    tutorial_not_sure: "Not sure what's going on?"
-#    tutorial_play_first: "Play the Tutorial first."
-#    simple_ai: "Simple AI"
-#    warmup: "Warmup"
-#    vs: "VS"
+  ladder:
+#    please_login: "Identifie toi avant de jouer à un ladder game."
+    my_matches: "Mes Matchs"
+    simulate: "Simuler"
+    simulation_explanation: "En simulant une partie, tu peux classer ton rang plus rapidement!"
+    simulate_games: "Simuler une Partie!"
+    simulate_all: "REINITIALISER ET SIMULER DES PARTIES"
+    leaderboard: "Classement"
+    battle_as: "Combattre comme "
+    summary_your: "Vos "
+    summary_matches: "Matchs - "
+    summary_wins: " Victoires, "
+    summary_losses: " Défaites"
+    rank_no_code: "Nouveau Code à Classer"
+    rank_my_game: "Classer ma Partie!"
+    rank_submitting: "Soumission en cours..."
+    rank_submitted: "Soumis pour le Classement"
+    rank_failed: "Erreur lors du Classement"
+    rank_being_ranked: "Partie en cours de Classement"
+    code_being_simulated: "Votre nouveau code est en cours de simulation par les autres joueurs pour le classement. Cela va se rafraichir lors que d'autres matchs auront lieu."
+    no_ranked_matches_pre: "Pas de match classé pour l'équipe "
+    no_ranked_matches_post: "! Affronte d'autres compétiteurs et reviens ici pour classer ta partie."
+    choose_opponent: "Choisir un Adversaire"
+    tutorial_play: "Jouer au Tutoriel"
+    tutorial_recommended: "Recommendé si tu n'as jamais joué avant"
+    tutorial_skip: "Passer le Tutoriel"
+    tutorial_not_sure: "Pas sûr de ce qu'il se passe?"
+    tutorial_play_first: "Jouer au Tutoriel d'abord."
+    simple_ai: "IA simple"
+    warmup: "Préchauffe"
+    vs: "VS"

 #  multiplayer_launch:
 #    introducing_dungeon_arena: "Introducing Dungeon Arena"
@ -548,7 +549,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    ladder_explanation: "Choose your heroes, enchant your human or ogre armies, and climb your way over defeated fellow Wizards to reach the top of the ladders–then challenge your friends in our glorious, asynchronous multiplayer coding arenas. If you're feeling creative, you can even"
 #    fork_our_arenas: "fork our arenas"
 #    create_worlds: "and create your own worlds."
-#    javascript_rusty: "JavaScript a bit rusty? Don't worry; there's a"
-#    tutorial: "tutorial"
-#    new_to_programming: ". New to programming? Hit our beginner campaign to skill up."
-#    so_ready: "I Am So Ready for This"
+    javascript_rusty: "JavaScript un peu rouillé? Pas de souci; il y a un"
+    tutorial: "tutoriel"
+    new_to_programming: ". Débutant en programmation? Essaie la campagne débutant pour progresser."
+    so_ready: "Je Suis Prêt Pour Ca"
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@ -9,7 +9,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
    delay_3_sec: "שלוש שניות"
    delay_5_sec: "חמש שניות"
    manual: "מדריך"
-#    fork: "Fork"
+    fork: "קילשון"
    play: "שחק"

  modal:
@ -26,141 +26,141 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
    forum: "פורום"
    admin: "אדמין"
    home: "בית"
-#    contribute: "Contribute"
-#    legal: "Legal"
-#    about: "About"
-#    contact: "Contact"
-#    twitter_follow: "Follow"
-#    employers: "Employers"
+    contribute: "תרום"
+    legal: "משפטי"
+    about: "עלינו"
+    contact: "צור קשר"
+    twitter_follow: "עקוב אחרינו בטוויטר"
+    employers: "עובדים"

-#  versions:
-#    save_version_title: "Save New Version"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
+  versions:
+    save_version_title: "שמור גרסה חדשה"
+    new_major_version: "גרסה חשובה חדשה"
+    cla_prefix: "כדי לשמור יש להירשם לאתר"
 #    cla_url: "CLA"
 #    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_agree: "אני מסכים"

-#  login:
-#    sign_up: "Create Account"
-#    log_in: "Log In"
-#    log_out: "Log Out"
-#    recover: "recover account"
+  login:
+    sign_up: "הירשם"
+    log_in: "היכנס"
+    log_out: "צא"
+    recover: "שחזר סיסמה"

-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "שחזר סיסמה"
+    send_password: "שלח סיסמה חדשה"

-#  signup:
-#    create_account_title: "Create Account to Save Progress"
-#    description: "It's free. Just need a couple things and you'll be good to go:"
-#    email_announcements: "Receive announcements by email"
-#    coppa: "13+ or non-USA "
-#    coppa_why: "(Why?)"
-#    creating: "Creating Account..."
-#    sign_up: "Sign Up"
-#    log_in: "log in with password"
+  signup:
+    create_account_title: "הירשם כדי לשמור את התקדמותך"
+    description: "זה בחינם. רק כמה דברים וסיימנו:"
+    email_announcements: "קבל הודעות באימייל"
+    coppa: "בן יותר משלוש עשרה או לא בארצות הברית"
+    coppa_why: "(למה?)"
+    creating: "יוצר חשבון..."
+    sign_up: "הירשם"
+    log_in: "כנס עם סיסמה"

-#  home:
-#    slogan: "Learn to Code JavaScript by Playing a Game"
-#    no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!"
-#    no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!"
-#    play: "Play"
-#    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
-#    old_browser_suffix: "You can try anyway, but it probably won't work."
-#    campaign: "Campaign"
-#    for_beginners: "For Beginners"
-#    multiplayer: "Multiplayer"
-#    for_developers: "For Developers"
+  home:
+    slogan: "גם לשחק וגם ללמוד לתכנת"
+    no_ie: "המשחק לא עובד באקפלורר 9 וישן יותר. סליחה!"
+    no_mobile: "המשחק לא עוצב לטלפונים ואולי לא יעבוד"
+    play: "שחק"
+    old_browser: "או או, נראה כי הדפדפן שלך יותר מידי ישן כדי להריץ את המשחק. סליחה!"
+    old_browser_suffix: "אתה יכול לנסות בכול מקרה אבל זה כנראה לא יעבוד."
+    campaign: "מסע"
+    for_beginners: "למתחילים"
+    multiplayer: "רב-משתתפים"
+    for_developers: "למומחים"

-#  play:
-#    choose_your_level: "Choose Your Level"
-#    adventurer_prefix: "You can jump to any level below, or discuss the levels on "
-#    adventurer_forum: "the Adventurer forum"
-#    adventurer_suffix: "."
-#    campaign_beginner: "Beginner Campaign"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
-#    campaign_player_created: "Player-Created"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
-#    play_as: "Play As "
-#    spectate: "Spectate"
+  play:
+    choose_your_level: "בחר את השלב"
+    adventurer_prefix: "אתה יכול לבחור איזה שלב שאתה רוצה למטה, או לדון על שלבים ב"
+    adventurer_forum: "פורום ההרפתקנים"
+    adventurer_suffix: "."
+    campaign_beginner: "מסע המתחילים"
+    campaign_beginner_description: "...שבו תלמד את קסם התכנות."
+    campaign_dev: "שלבים אקראים קשים יותר"
+    campaign_dev_description: "...שבהם תלמד על הממשק בזמן שתעשה משהו קצת קשה יותר."
+    campaign_multiplayer: "זירות רב-המשתתפים"
+    campaign_multiplayer_description: "..."
+    campaign_player_created: "תוצרי השחקנים"
+    campaign_player_created_description: "... שבהם תילחם נגד היצירתיות של <a href=\"/contribute#artisan\">בעלי-המלאכה</a>."
+    level_difficulty: "רמת קושי: "
+    play_as: "שחק בתור "
+    spectate: "צופה"

-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
-#    contribute_suffix: "!"
-#    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
-#    forum_suffix: " instead."
-#    send: "Send Feedback"
+  contact:
+    contact_us: "צור קשר"
+    welcome: "טוב לשמוע ממך! השתמש בטופס זה כדי לשלוח לנו אימייל. "
+    contribute_prefix: "אם אתה מעונין לתרום, אז תבדוק את "
+    contribute_page: "דף התרומות שלנו"
+    contribute_suffix: "!"
+    forum_prefix: "בשביל דברים ציבוריים, לך ל "
+    forum_page: "פורום שלנו"
+    forum_suffix: " במקום."
+    send: "שלח אימייל"

  diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
-    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Hebrew but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Hebrew."
-    missing_translations: "Until we can translate everything into Hebrew, you'll see English when Hebrew isn't available."
-#    learn_more: "Learn more about being a Diplomat"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    title: "עזור לתרגם את CodeCombat!"
+    sub_heading: "אנו צריכים את קישורי השפה שלך!"
+    pitch_body: "אנו פיתחנו את המשחק באנגלית, אבל יש הרבה שחקנים מכול העולם. חלק מהם רוצים לשחק בעברית והם לא מבינים אנגלית. אם אתה דובר את שני השפות, עברית ואנגלית, אז בבקשה עזור לנו לתרגם לעברית את האתר ואת השלבים."
+    missing_translations: "עד שנתרגם הכול לעברית, מה שלא תורגם יופיע באנגלית."
+    learn_more: "תלמד עות על תרומת דיפלומטיה"
+    subscribe_as_diplomat: "הירשם כדיפלומט"

-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
-#    clothes: "Clothes"
-#    trim: "Trim"
-#    cloud: "Cloud"
-#    spell: "Spell"
-#    boots: "Boots"
-#    hue: "Hue"
-#    saturation: "Saturation"
-#    lightness: "Lightness"
+  wizard_settings:
+    title: "הגדרות קוסם"
+    customize_avatar: "עצב את הדמות שלך"
+    clothes: "בגדים"
+    trim: "קישוט"
+    cloud: "ענן"
+    spell: "כישוף"
+    boots: "מגפיים"
+    hue: "Hue"
+    saturation: "גוון"
+    lightness: "בהירות"

-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
-#    me_tab: "Me"
-#    picture_tab: "Picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
-#    admin: "Admin"
-#    gravatar_select: "Select which Gravatar photo to use"
-#    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
-#    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
-#    email_notifications: "Notifications"
-#    email_notifications_description: "Get periodic notifications for your account."
-#    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
-#    contributor_emails: "Contributor Class Emails"
-#    contribute_prefix: "We're looking for people to join our party! Check out the "
-#    contribute_page: "contribute page"
-#    contribute_suffix: " to find out more."
-#    email_toggle: "Toggle All"
-#    error_saving: "Error Saving"
-#    saved: "Changes Saved"
-#    password_mismatch: "Password does not match."
+  account_settings:
+    title: "הגדרות חשבון"
+    not_logged_in: "היכנס או הירשם כדי לערוך את ההדרות שלך"
+    autosave: "שינויים נשמרו אוטומטית"
+    me_tab: "אני"
+    picture_tab: "תמונה"
+    wizard_tab: "קוסם"
+    password_tab: "סיסמה"
+    emails_tab: "אימיילים"
+    admin: "אדמין"
+    gravatar_select: "תבחר באיזו תמונת גרבטר אתה רוצה להישתמש"
+    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
+    gravatar_add_more_photos: "תוסיף עוד תמונות לחשבון הגרבטר שלך כדי להסיג אותם כאן."
+    wizard_color: "צבע הקוסם"
+    new_password: "סיסמה חדשה"
+    new_password_verify: "חזור על הסיסמה שנית"
+    email_subscriptions: "הרשמויות אימייל"
+    email_announcements: "הודעות"
+    email_notifications: "עדכונים"
+    email_notifications_description: "קבל עדכונים לחשבון שלך."
+    email_announcements_description: "קבל את החדשות ואת הפיתוחים הכי חדישים במשחק באימייל."
+    contributor_emails: "אימיילים של כיתות תורמים"
+    contribute_prefix: "אנו מחפשים אנשים שיצתרפו למסיבה! תראו את"
+    contribute_page: "דף התרימות"
+    contribute_suffix: " בשביל עוד מידע."
+    email_toggle: "עדכן"
+    error_saving: "בעיה בשמירה"
+    saved: "השינויים נשמרו"
+    password_mismatch: "סיסמאות לא זהות"

-#  account_profile:
-#    edit_settings: "Edit Settings"
-#    profile_for_prefix: "Profile for "
-#    profile_for_suffix: ""
-#    profile: "Profile"
-#    user_not_found: "No user found. Check the URL?"
-#    gravatar_not_found_mine: "We couldn't find your profile associated with:"
-#    gravatar_not_found_email_suffix: "."
-#    gravatar_signup_prefix: "Sign up at "
-#    gravatar_signup_suffix: " to get set up!"
+  account_profile:
+    edit_settings: "ערוך הגדרות"
+    profile_for_prefix: "פרופיל ל"
+    profile_for_suffix: ""
+    profile: "פרופיל"
+    user_not_found: "משתמש לא נמצא. בדקת את הURL?"
+    gravatar_not_found_mine: "לא הצלחנו למצא חשבון גרבטר המותאם עם: "
+    gravatar_not_found_email_suffix: "."
+    gravatar_signup_prefix: "הירשם ב"
+    gravatar_signup_suffix: "כדי לקבל תמונת חשבון"
 #    gravatar_not_found_other: "Alas, there's no profile associated with this person's email address."
 #    gravatar_contact: "Contact"
 #    gravatar_websites: "Websites"
@ -335,6 +335,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Questioni legali"
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@ -336,6 +336,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
    nick_description: "프로그래밍 마법사, 별난 자극의 마술사, 거꾸로 생각하는것을 좋아하는 실험가. Nick은 뭐든지 할수있는 남자입니다. 그 뭐든지 중에 코드 컴뱃을 선택했죠. "
    jeremy_description: "고객 지원 마법사, 사용성 테스터, 커뮤니티 오거나이저; 당신은 아마 이미 Jeremy랑 이야기 했을거에요."
    michael_description: "프로그래머, 시스템 관리자, 기술 신동(대학생이래요),Michael 은 우리 서버를 계속 무결점상태로 유지시켜주는 사람입니다."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/ms-BA.coffee
+++ b/app/locale/ms-BA.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/nl.coffee
+++ b/app/locale/nl.coffee
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/no.coffee
+++ b/app/locale/no.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
    nick_description: "Programistyczny czarownik, ekscentryczny magik i eksperymentator pełną gębą. Nich może robić cokolwiek, a decyduje się pracować przy CodeCombat."
    jeremy_description: "Magik od kontaktów z klientami, tester użyteczności i organizator społeczności; prawdopodobnie już rozmawiałeś z Jeremym."
    michael_description: "Programista, sys-admin, cudowne dziecko studiów technicznych, Michael to osoba utrzymująca nase serwery online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Nota prawna"
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:
    nick_description: "Mago da programação, feiticeiro da motivação excêntrica e experimentador doido. Nick pode fazer qualquer coisa e escolheu desenvolver o CodeCombat."
    jeremy_description: "Mago em suporte ao consumidor, testador de usabilidade, e organizador da comunidade; você provavelmente já falou com o Jeremy."
    michael_description: "Programador, administrador de sistemas, e um técnico prodígio não graduado, Michael é a pessoa que mantém os servidores funcionando."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Jurídico"
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/pt.coffee
+++ b/app/locale/pt.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@ -10,7 +10,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
    delay_5_sec: "5 secunde"
    manual: "Manual"
    fork: "Fork"
-    play: "Joaca"
+    play: "Joacă"

  modal:
    close: "Inchide"
@ -54,18 +54,18 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
  signup:
    create_account_title: "Crează cont pentru a salva progresul"
    description: "Este gratis. Doar un scurt formular inainte si poți continua:"
-    email_announcements: "Primește notificări prin emaill"
+    email_announcements: "Primește notificări prin email"
    coppa: "13+ sau non-USA "
    coppa_why: "(De ce?)"
-    creating: "Se crează contul..."
+    creating: "Se creează contul..."
    sign_up: "Înscrie-te"
    log_in: "loghează-te cu parola"

  home:
-    slogan: "Învață sa scri JavaScript jucându-te"
+    slogan: "Învață sa scrii JavaScript jucându-te"
    no_ie: "CodeCombat nu merge pe Internet Explorer 9 sau mai vechi. Scuze!"
-    no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile si s-ar putea sa nu meargâ!"
-    play: "Joacâ"
+    no_mobile: "CodeCombat nu a fost proiectat pentru dispozitive mobile si s-ar putea sa nu meargă!"
+    play: "Joacă"
 #    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
 #    old_browser_suffix: "You can try anyway, but it probably won't work."
 #    campaign: "Campaign"
@ -102,9 +102,9 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
    send: "Trimite Feedback"

  diplomat_suggestion:
-    title: "Ajută-ne  să traducem CodeCombat!"
+    title: "Ajută-ne să traducem CodeCombat!"
    sub_heading: "Avem nevoie de abilitățile tale lingvistice."
-    pitch_body: "CodeCombat este dezvoltat in limba engleza , dar deja avem jucatări din toate colțurile lumii.Mulți dintre ei vor să joace in română și nu vorbesc engleză.Dacă poți vorbi ambele te rugăm să te gândești dacă ai dori să devi un Diplomat și să ne ajuți sa traducem atât jocul cât și site-ul."
+    pitch_body: "CodeCombat este dezvoltat in limba engleza , dar deja avem jucatări din toate colțurile lumii. Mulți dintre ei vor să joace in română și nu vorbesc engleză. Dacă poți vorbi ambele te rugăm să te gândești dacă ai dori să devi un Diplomat și să ne ajuți sa traducem atât jocul cât și site-ul."
    missing_translations: "Until we can translate everything into Romanian, you'll see English when Romanian isn't available."
    learn_more: "Află mai multe despre cum să fi un Diplomat"
    subscribe_as_diplomat: "Înscrie-te ca Diplomat"
@ -179,7 +179,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
    goals: "Obiective"
    action_timeline: "Timeline-ul acțiunii"
    click_to_select: "Apasă pe o unitate pentru a o selecta."
-    reload_title: "Reîncarcă tot Codul?"
+    reload_title: "Reîncarcă tot codul?"
    reload_really: "Ești sigur că vrei să reîncarci nivelul de la început?"
    reload_confirm: "Reload All"
    victory_title_prefix: ""
@ -238,11 +238,11 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman

  editor:
    main_title: "Editori CodeCombat"
-    main_description: "Construiește propriile nivele,campanii,unități și conținut educațional.Noi îți furnizăm toate uneltele necesare!"
+    main_description: "Construiește propriile nivele, campanii, unități și conținut educațional. Noi îți furnizăm toate uneltele necesare!"
    article_title: "Editor Articol"
    article_description: "Scrie articole care oferă jucătorilor cunoștințe despre conceptele de programare care pot fi folosite pe o varietate de nivele și campanii."
    thang_title: "Editor Thang"
-    thang_description: "Construiește unități ,definește logica lor,grafica și sunetul.Momentan suportă numai importare de grafică vectorială exportată din Flash."
+    thang_description: "Construiește unități, definește logica lor, grafica și sunetul. Momentan suportă numai importare de grafică vectorială exportată din Flash."
    level_title: "Editor Nivele"
    level_description: "Include uneltele pentru scriptare, upload audio, și construcție de logică costum pentru toate tipurile de nivele.Tot ce folosim noi înșine!"
    security_notice: "Multe setări majore de securitate în aceste editoare nu sunt momentan disponibile.Pe măsură ce îmbunătățim securitatea acestor sisteme, ele vor deveni disponibile. Dacă doriți să folosiți aceste setări mai devrme, "
@ -335,6 +335,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick poate să facă orice si a ales să dezvolte CodeCombat."
    jeremy_description: "Customer support mage, usability tester, and community organizer; probabil ca ați vorbit deja cu Jeremy."
    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael este cel care ține serverele in picioare."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Aspecte Legale"
@ -357,7 +358,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
    cost_title: "Cost"
    cost_description: "Momentan, CodeCombat este 100% gratis! Unul dintre obiectele noastre principale este să îl menținem așa, astfel încât să poată juca cât mai mulți oameni. Dacă va fi nevoie , s-ar putea să percepem o plată pentru o pentru anumite servici,dar am prefera să nu o facem. Cu puțin noroc, vom putea susține compania cu:"
    recruitment_title: "Recrutare"
-    recruitment_description_prefix: "Aici la CodeCombat, vei deveni un vrăjitor puternic nu doar în joc , ci și în viața reală."
+    recruitment_description_prefix: "Aici la CodeCombat, vei deveni un vrăjitor puternic nu doar în joc, ci și în viața reală."
    url_hire_programmers: "Nimeni nu poate angaja programatori destul de rapid"
    recruitment_description_suffix: "așa că odată ce ți-ai dezvoltat abilitățile și esti de acord, noi vom trimite un demo cu cele mai bune realizări ale tale către miile de angajatori care se omoară să pună mâna pe tine. Pe noi ne plătesc puțin, pe tine te vor plăti"
    recruitment_description_italic: "mult"
@ -392,7 +393,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
    rights_description: "Descriere"
    rights_writings: "Scrieri"
    rights_media: "Media (sunete, muzică) și orice alt conținut creativ dezvoltat special pentru acel nivel care nu este valabil în mod normal pentru creat nivele."
-    rights_clarification: "Pentru a clarifica, orice este valabil in Editorul de Nivele pentru scopul de a crea nivele se află sub CC,pe când conținutul creat cu Editorul de Nivele sau încărcat pentru a face nivelul nu se află."
+    rights_clarification: "Pentru a clarifica, orice este valabil in Editorul de Nivele pentru scopul de a crea nivele se află sub CC, pe când conținutul creat cu Editorul de Nivele sau încărcat pentru a face nivelul nu se află."
    nutshell_title: "Pe scurt"
    nutshell_description: "Orice resurse vă punem la dispoziție în Editorul de Nivele puteți folosi liber cum vreți pentru a crea nivele. Dar ne rezervăm dreptul de a rezerva distribuția de nivele în sine (care sunt create pe codecombat.com) astfel încât să se poată percepe o taxă pentru ele pe vitor, dacă se va ajunge la așa ceva."
    canonical: "Versiunea in engleză a acestui document este cea definitivă, versiunea canonică. Dacă există orice discrepanțe între traduceri, documentul in engleză are prioritate."
@ -410,8 +411,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
    alert_account_message_pref: "Pentru a te abona la email-uri de clasă, va trebui să "
    alert_account_message_suf: "mai întâi."
    alert_account_message_create_url: "creați un cont"
-    archmage_summary: "Interesat să lucrezi la grafica jocului, interfața grafică cu utilizatorul, baze de date și organizare server , multiplayer networking, fizică, sunet, sau performanțe game engine ? Vrei să ajuți la construirea unui joc pentru a învăța pe alții ceea ce te pricepi? Avem o grămadă de făcut dacă ești un programator experimentat și vrei sa dezvolți pentru CodeCombat, această clasă este pentru tine. Ne-ar plăcea să ne ajuți să construim cel mai bun joc de programare făcut vreodată."
-    archmage_introduction: "Una dintre cele mai bune părți despre construirea unui joc este că sintetizează atât de multe lucruri diferite. Grafică, sunet, networking în timp real, social networking, și desigur multe dintre aspectele comune ale programării, de la gestiune low-level a bazelor de date , și administrare server până la construirea de interfețe. Este mult de muncă, și dacă ești un programator cu experiență, cu un dor de a se arunca cu capul înainte îm CodeCombat, această clasă ți se potrivește. Ne-ar plăcea să ne ajuți să construim cel mai bun joc de programare făcut vreodată."
+    archmage_summary: "Interesat să lucrezi la grafica jocului, interfața grafică cu utilizatorul, baze de date și organizare server, multiplayer networking, fizică, sunet, sau performanțe game engine? Vrei să ajuți la construirea unui joc pentru a învăța pe alții ceea ce te pricepi? Avem o grămadă de făcut dacă ești un programator experimentat și vrei sa dezvolți pentru CodeCombat, această clasă este pentru tine. Ne-ar plăcea să ne ajuți să construim cel mai bun joc de programare făcut vreodată."
+    archmage_introduction: "Una dintre cele mai bune părți despre construirea unui joc este că sintetizează atât de multe lucruri diferite. Grafică, sunet, networking în timp real, social networking, și desigur multe dintre aspectele comune ale programării, de la gestiune low-level a bazelor de date, și administrare server până la construirea de interfețe. Este mult de muncă, și dacă ești un programator cu experiență, cu un dor de a se arunca cu capul înainte îm CodeCombat, această clasă ți se potrivește. Ne-ar plăcea să ne ajuți să construim cel mai bun joc de programare făcut vreodată."
    class_attributes: "Atribute pe clase"
    archmage_attribute_1_pref: "Cunoștințe în "
    archmage_attribute_1_suf: ", sau o dorință de a învăța. Majoritatea codului este în acest limbaj. Dacă ești fan Ruby sau Python, te vei simți ca acasă. Este JavaScript, dar cu o sintaxă mai frumoasă."
@ -432,7 +433,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
    artisan_attribute_1: "Orice experiență în crearea de conținut ca acesta ar fi de preferat, precum folosirea editoarelor de nivele de la Blizzard. Dar nu este obligatoriu!"
    artisan_attribute_2: "Un chef de a face o mulțime de teste și iterări. Pentru a face nivele bune, trebuie să testați pe mai mulți oameni și să obțineți feedback, și să fiți pregăți să reparați o mulțime de lucruri."
    artisan_attribute_3: "Pentru moment trebui să ai nervi de oțel. Editorul nostru de nivele este abia la început și încă are multe probleme. Ai fost avertizat!"
-    artisan_join_desc: "Folosiți editorul de nivele urmărind acești pași , mai mult sau mai puțin:"
+    artisan_join_desc: "Folosiți editorul de nivele urmărind acești pași, mai mult sau mai puțin:"
    artisan_join_step1: "Citește documentația."
    artisan_join_step2: "Crează un nivel nou și explorează nivelele deja existente."
    artisan_join_step3: "Găsește-ne pe chatul nostru de Hipchat pentru ajutor."
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
    nick_description: "Маг программирования, эксцентрично мотивированный волшебник, и экспериментатор вверх ногами. Ник может делать всё и хочет построить CodeCombat."
    jeremy_description: "Маг клиентской поддержки, юзабилити-тестер, и организатор сообщества; вы наверняка уже говорили с Джереми."
    michael_description: "Программист, сисадмин и непризнанный технический гений, Михаэль является лицом, поддерживающим наши серверы онлайн."
+    glen_description: "Программист и страстный разработчик игр, с мотивацией сделать этот мир лучше путём разработки действительно значащих вещей. Слова \"невозможно\" нет в его словаре. Освоение новых навыков его развлечение!"

  legal:
    page_title: "Юридическая информация"
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
    nick_description: "Programlama sihirbazı, tuhaf motivasyon büyücü ve tersine mühendis. Nick her şeyden anlar ve şu anda CodeCombat'i inşa etmekle meşgul."
    jeremy_description: "Müşteri hizmetleri büyücüsü, kullanılabilirlik test edicisi ve topluluk örgütleyici; muhtemelen Jeremy ile konuşmuşluğunuz vardır."
    michael_description: "Programcı, sistem yöneticisi, halihazırda üniversite okuyan teknik-harika-çocuk. Michael sunucularımızı ayakta tutan adamın ta kendisi."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Hukuki"
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "Юридичні нотатки"
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@ -3,14 +3,14 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
    loading: "Tải..."
    saving: "Lưu..."
    sending: "Gởi..."
-#    cancel: "Cancel"
-#    save: "Save"
+    cancel: "Hủy"
+    save: "Lưu"
 #    delay_1_sec: "1 second"
 #    delay_3_sec: "3 seconds"
 #    delay_5_sec: "5 seconds"
 #    manual: "Manual"
 #    fork: "Fork"
-#    play: "Play"
+    play: "Các cấp độ"

  modal:
    close: "Đóng"
@ -19,53 +19,53 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
  not_found:
    page_not_found: "không tìm thấy trang"

-#  nav:
-#    play: "Levels"
-#    editor: "Editor"
+  nav:
+    play: "Các cấp độ"
+    editor: "Chỉnh sửa"
 #    blog: "Blog"
-#    forum: "Forum"
-#    admin: "Admin"
-#    home: "Home"
-#    contribute: "Contribute"
-#    legal: "Legal"
-#    about: "About"
-#    contact: "Contact"
-#    twitter_follow: "Follow"
-#    employers: "Employers"
+    forum: "Diễn đàn"
+    admin: "Quản trị viên"
+    home: "Nhà"
+    contribute: "Contribute"
+    legal: "Hợp pháp"
+    about: "Về"
+    contact: "Liên hệ"
+    twitter_follow: "Đi theo"
+    employers: "Người tuyển việc"

-#  versions:
-#    save_version_title: "Save New Version"
-#    new_major_version: "New Major Version"
-#    cla_prefix: "To save changes, first you must agree to our"
+  versions:
+    save_version_title: "Lưu Phiên bản Mới"
+    new_major_version: "Phiên bản chính mới"
+    cla_prefix: "Để lưu thay đổi, bạn phải chấp thuận với chúng tôi trước"
 #    cla_url: "CLA"
 #    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_agree: "TÔI ĐỒNG Ý"

  login:
    sign_up: "Tạo tài khoản"
    log_in: "Đăng nhập"
    log_out: "Đăng xuất"
-#    recover: "recover account"
+    recover: "Khôi phục tài khoản"

-#  recover:
-#    recover_account_title: "Recover Account"
-#    send_password: "Send Recovery Password"
+  recover:
+    recover_account_title: "Khôi phục tài khoản"
+    send_password: "Gởi mật mã khôi phục"

-#  signup:
-#    create_account_title: "Create Account to Save Progress"
-#    description: "It's free. Just need a couple things and you'll be good to go:"
-#    email_announcements: "Receive announcements by email"
-#    coppa: "13+ or non-USA "
-#    coppa_why: "(Why?)"
-#    creating: "Creating Account..."
-#    sign_up: "Sign Up"
-#    log_in: "log in with password"
+  signup:
+    create_account_title: "Tạo tài khoản để lưu tiến trình"
+    description: "Nó miễn phí. Chỉ cần một vài thứ và bạn có thể tiếp tục:"
+    email_announcements: "Nhận thông báo bằng email"
+    coppa: "13+ hoặc non-USA "
+    coppa_why: "(Tại sao?)"
+    creating: "Tạo tài khoản..."
+    sign_up: "Đăng ký"
+    log_in: "đăng nhập với mật khẩu"

-#  home:
-#    slogan: "Learn to Code JavaScript by Playing a Game"
-#    no_ie: "CodeCombat does not run in Internet Explorer 9 or older. Sorry!"
-#    no_mobile: "CodeCombat wasn't designed for mobile devices and may not work!"
-#    play: "Play"
+  home:
+    slogan: "Học mã Javascript bằng chơi Games"
+    no_ie: "Codecombat không chạy trong Internet Explorer 9 hoặc cũ hơn. Xin lỗi!"
+    no_mobile: "Codecombat không được thiết kế cho các thiết bị di động và có thể không hoạt động được!"
+    play: "Chơi"
 #    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"
 #    old_browser_suffix: "You can try anyway, but it probably won't work."
 #    campaign: "Campaign"
@ -73,45 +73,45 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    multiplayer: "Multiplayer"
 #    for_developers: "For Developers"

-#  play:
-#    choose_your_level: "Choose Your Level"
-#    adventurer_prefix: "You can jump to any level below, or discuss the levels on "
-#    adventurer_forum: "the Adventurer forum"
+  play:
+    choose_your_level: "Chọn Trình của bạn"
+    adventurer_prefix: "Bạn có thể nhảy đến bất kỳ cấp độ dưới đây, hoặc nâng dần cấp độ "
+    adventurer_forum: "diễn đàn Adventurer"
 #    adventurer_suffix: "."
-#    campaign_beginner: "Beginner Campaign"
+    campaign_beginner: "Bắt đầu chiến dịch"
 #    campaign_beginner_description: "... in which you learn the wizardry of programming."
-#    campaign_dev: "Random Harder Levels"
+    campaign_dev: "Các cấp độ khó hơn ngẫu nhiên"
 #    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
-#    campaign_multiplayer: "Multiplayer Arenas"
+    campaign_multiplayer: "Khu vực đa người chơi"
 #    campaign_multiplayer_description: "... in which you code head-to-head against other players."
-#    campaign_player_created: "Player-Created"
+    campaign_player_created: "Tạo người chơi"
 #    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute#artisan\">Artisan Wizards</a>."
-#    level_difficulty: "Difficulty: "
+    level_difficulty: "Khó: "
 #    play_as: "Play As "
 #    spectate: "Spectate"

-#  contact:
-#    contact_us: "Contact CodeCombat"
-#    welcome: "Good to hear from you! Use this form to send us email. "
-#    contribute_prefix: "If you're interested in contributing, check out our "
-#    contribute_page: "contribute page"
+  contact:
+    contact_us: "Liên hệ CodeCombat"
+    welcome: "Rất vui được nhận tin từ bạn! Hãy dùng đơn này để gởi mail cho chúng tôi. "
+    contribute_prefix: "Nếu bạn muốn đóng góp, hãy kiểm tra "
+    contribute_page: "trang đóng góp"
 #    contribute_suffix: "!"
 #    forum_prefix: "For anything public, please try "
-#    forum_page: "our forum"
+    forum_page: "Diễn đàn của chúng tôi"
 #    forum_suffix: " instead."
-#    send: "Send Feedback"
+    send: "Gởi phản hồi"

  diplomat_suggestion:
-#    title: "Help translate CodeCombat!"
-#    sub_heading: "We need your language skills."
+    title: "Hãy giúp dịch thuật cho  CodeCombat!"
+    sub_heading: "Chúng tôi cần kỹ năng ngoại ngữ của bạn."
    pitch_body: "We develop CodeCombat in English, but we already have players all over the world. Many of them want to play in Vietnamese but don't speak English, so if you can speak both, please consider signing up to be a Diplomat and help translate both the CodeCombat website and all the levels into Vietnamese."
    missing_translations: "Until we can translate everything into Vietnamese, you'll see English when Vietnamese isn't available."
 #    learn_more: "Learn more about being a Diplomat"
 #    subscribe_as_diplomat: "Subscribe as a Diplomat"

-#  wizard_settings:
-#    title: "Wizard Settings"
-#    customize_avatar: "Customize Your Avatar"
+  wizard_settings:
+    title: "Cài đặt Wizard"
+    customize_avatar: "Tùy chỉnh Avatar của bạn"
 #    clothes: "Clothes"
 #    trim: "Trim"
 #    cloud: "Cloud"
@ -121,65 +121,65 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    saturation: "Saturation"
 #    lightness: "Lightness"

-#  account_settings:
-#    title: "Account Settings"
-#    not_logged_in: "Log in or create an account to change your settings."
-#    autosave: "Changes Save Automatically"
+  account_settings:
+    title: "Cài đặt Tài khoản"
+    not_logged_in: "Đăng nhập hoặc tạo tài khoản để thay đổi cài đặt."
+    autosave: "Tự động lưu thay đổi"
 #    me_tab: "Me"
-#    picture_tab: "Picture"
-#    wizard_tab: "Wizard"
-#    password_tab: "Password"
-#    emails_tab: "Emails"
+    picture_tab: "Bức tranh"
+    wizard_tab: "Wizard"
+    password_tab: "Mật khẩu"
+    emails_tab: "Emails"
 #    admin: "Admin"
-#    gravatar_select: "Select which Gravatar photo to use"
+    gravatar_select: "Chọn hình Gravatar để sử dụng"
 #    gravatar_add_photos: "Add thumbnails and photos to a Gravatar account for your email to choose an image."
 #    gravatar_add_more_photos: "Add more photos to your Gravatar account to access them here."
-#    wizard_color: "Wizard Clothes Color"
-#    new_password: "New Password"
-#    new_password_verify: "Verify"
-#    email_subscriptions: "Email Subscriptions"
-#    email_announcements: "Announcements"
+    wizard_color: "Màu trang phục Wizard"
+    new_password: "Mật khẩu mới"
+    new_password_verify: "Xác nhận"
+    email_subscriptions: "Thuê bao Email"
+    email_announcements: "Thông báo"
 #    email_notifications: "Notifications"
 #    email_notifications_description: "Get periodic notifications for your account."
-#    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
+    email_announcements_description: "Nhận email về tin tức mới nhất và sự phát triển của Codecombat."
 #    contributor_emails: "Contributor Class Emails"
-#    contribute_prefix: "We're looking for people to join our party! Check out the "
-#    contribute_page: "contribute page"
-#    contribute_suffix: " to find out more."
+    contribute_prefix: "Chúng tôi đang tìm thêm người vào nhóm của chúng tôi! Hãy kiểm "
+    contribute_page: "trang đóng góp"
+    contribute_suffix: " để tìm hiểu thêm."
 #    email_toggle: "Toggle All"
-#    error_saving: "Error Saving"
-#    saved: "Changes Saved"
-#    password_mismatch: "Password does not match."
+    error_saving: "Lỗi lưu"
+    saved: "Thay đổi được lưu"
+    password_mismatch: "Mật khẩu không khớp."

-#  account_profile:
-#    edit_settings: "Edit Settings"
+  account_profile:
+    edit_settings: "Chỉnh sửa cài đặt"
 #    profile_for_prefix: "Profile for "
 #    profile_for_suffix: ""
-#    profile: "Profile"
-#    user_not_found: "No user found. Check the URL?"
-#    gravatar_not_found_mine: "We couldn't find your profile associated with:"
-#    gravatar_not_found_email_suffix: "."
-#    gravatar_signup_prefix: "Sign up at "
-#    gravatar_signup_suffix: " to get set up!"
+    profile: "Hồ sơ"
+    user_not_found: "Không có người sử dụng được tìm thấy. Kiểm tra URL?"
+    gravatar_not_found_mine: "Chúng tôi không thể tìm thấy hồ sơ của bạn được đính kèm theo:"
+    gravatar_not_found_email_suffix: "."
+    gravatar_signup_prefix: "Đăng ký tại "
+    gravatar_signup_suffix: " để thiết lập!"
 #    gravatar_not_found_other: "Alas, there's no profile associated with this person's email address."
 #    gravatar_contact: "Contact"
-#    gravatar_websites: "Websites"
+    gravatar_websites: "Địa chỉ trang Web"
 #    gravatar_accounts: "As Seen On"
 #    gravatar_profile_link: "Full Gravatar Profile"

 #  play_level:
 #    level_load_error: "Level could not be loaded: "
-#    done: "Done"
+    done: "Hoàn thành"
 #    grid: "Grid"
-#    customize_wizard: "Customize Wizard"
+    customize_wizard: "Tùy chỉnh Wizard"
 #    home: "Home"
-#    guide: "Guide"
-#    multiplayer: "Multiplayer"
-#    restart: "Restart"
-#    goals: "Goals"
+    guide: "Hướng dẫn"
+    multiplayer: "Nhiều người chơi"
+    restart: "Khởi động lại"
+    goals: "Mục đích"
 #    action_timeline: "Action Timeline"
-#    click_to_select: "Click on a unit to select it."
-#    reload_title: "Reload All Code?"
+    click_to_select: "Kích vào đơn vị để chọn nó."
+    reload_title: "Tải lại tất cả mã?"
 #    reload_really: "Are you sure you want to reload this level back to the beginning?"
 #    reload_confirm: "Reload All"
 #    victory_title_prefix: ""
@ -335,6 +335,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
@ -480,8 +481,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    counselor_introduction_1: "Do you have life experience? A different perspective on things that can help us decide how to shape CodeCombat? Of all these roles, this will probably take the least time, but individually you may make the most difference. We're on the lookout for wisened sages, particularly in areas like: teaching, game development, open source project management, technical recruiting, entrepreneurship, or design."
 #    counselor_introduction_2: "Or really anything that is relevant to the development of CodeCombat. If you have knowledge and want to share it to help grow this project, then this class might be for you."
 #    counselor_attribute_1: "Experience, in any of the areas above or something you think might be helpful."
-#    counselor_attribute_2: "A little bit of free time!"
-#    counselor_join_desc: "tell us a little about yourself, what you've done and what you'd be interested in doing. We'll put you in our contact list and be in touch when we could use advice (not too often)."
+    counselor_attribute_2: "Rảnh rỗi một chút!"
+    counselor_join_desc: "Nói cho chúng tôi điều gì đó về bạn, bạn đã làm cái gì và bạn hứng thú về cái gì. Chúng tôi sẽ đưa bạn vào danh sách liên lạc và chúng tôi sẽ liên hệ khi chúng tôi có thể(không thường xuyên)."
 #    more_about_counselor: "Learn More About Becoming a Counselor"
 #    changes_auto_save: "Changes are saved automatically when you toggle checkboxes."
 #    diligent_scribes: "Our Diligent Scribes:"
@ -501,11 +502,11 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    scribe_title: "Scribe"
 #    scribe_title_description: "(Article Editor)"
 #    diplomat_title: "Diplomat"
-#    diplomat_title_description: "(Translator)"
+    diplomat_title_description: "(Người phiên dịch)"
 #    ambassador_title: "Ambassador"
-#    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
+    ambassador_title_description: "(Hỗ trợ)"
+    counselor_title: "Người tư vấn"
+    counselor_title_description: "(Chuyên gia/ Giáo viên)"

 #  ladder:
 #    please_login: "Please log in first before playing a ladder game."
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

  legal:
    page_title: "法律"
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/locale/zh.coffee
+++ b/app/locale/zh.coffee
@ -335,6 +335,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra
 #    nick_description: "Programming wizard, eccentric motivation mage, and upside-down experimenter. Nick can do anything and chooses to build CodeCombat."
 #    jeremy_description: "Customer support mage, usability tester, and community organizer; you've probably already spoken with Jeremy."
 #    michael_description: "Programmer, sys-admin, and undergrad technical wunderkind, Michael is the person keeping our servers online."
+#    glen_description: "Programmer and passionate game developer, with the motivation to make this world a better place, by developing things that mather. The word impossible can't be found in his dictionary. Learning new skills is his joy!"

 #  legal:
 #    page_title: "Legal"
--- a/app/templates/about.jade
+++ b/app/templates/about.jade
@ -160,6 +160,9 @@ block content
            h3 Glen De Cauwsemaecker
    
            p(data-i18n="about.glen_description")
-              | Glen, describe thyself!
+              | Programmer and passionate game developer,
+              | with the motivation to make this world a better place,
+              | by developing things that mather. The word impossible can't
+              | be found in his dictionary. Learning new skills is his joy!


--- a/app/templates/contribute/diplomat.jade
+++ b/app/templates/contribute/diplomat.jade
@ -77,7 +77,7 @@ block content
          li Greek - Stergios
          li Latin American Spanish - Jesús Ruppel, Matthew Burt, Mariano Luzza
          li Spain Spanish - Matthew Burt, DanielRodriguezRivero, Anon
-          li French - Xeonarno, Elfisen, Armaldio, MartinDelille, pstweb, veritable, jaybi, xavismeh, Anon
+          li French - Xeonarno, Elfisen, Armaldio, MartinDelille, pstweb, veritable, jaybi, xavismeh, Anon, Feugy
          li Hungarian - ferpeter, csuvsaregal, atlantisguru, Anon
          li Japanese - g1itch, kengos
          li Chinese - Adam23, spacepope, yangxuan8282
--- a/app/templates/play/ladder/my_matches_tab.jade
+++ b/app/templates/play/ladder/my_matches_tab.jade
@ -53,8 +53,12 @@ div#columns.row
            td.name-cell= match.opponentName || "Anonymous"
            td.time-cell= match.when
            td.battle-cell
-              - var text = match.state === 'win' ? 'Watch your victory' : 'Defeat the ' + team.otherTeam
-              a(href="/play/level/#{levelID}?team=#{team.id}&opponent=#{match.sessionID}")= text
+              a(href="/play/level/#{levelID}?team=#{team.id}&opponent=#{match.sessionID}")
+                if (match.state === 'win')
+                  span(data-i18n="ladder.watch_victory") Watch your victory
+                else
+                  span(data-i18n="ladder.defeat_the") Defeat the
+                  | #{team.otherTeam}

        if !team.matches.length
          tr
@ -68,4 +72,3 @@ div#columns.row
                span(data-i18n="ladder.no_ranked_matches_pre") No ranked matches for the
                | #{team.name}
                span(data-i18n="ladder.no_ranked_matches_post") team! Play against some competitors and then come back here to get your game ranked.
-
--- a/app/views/play_view.coffee
+++ b/app/views/play_view.coffee
@ -12,72 +12,72 @@ module.exports = class PlayView extends View
    tutorials = [
      {
        name: 'Rescue Mission'
-        id: 'rescue-mission'
-        description: "Tharin has been captured!"
-        image: '/file/db/level/52740644904ac0411700067c/rescue_mission_icon.png'
        difficulty: 1
+        id: 'rescue-mission'
+        image: '/file/db/level/52740644904ac0411700067c/rescue_mission_icon.png'
+        description: "Tharin has been captured!"
      }
      {
        name: 'Grab the Mushroom'
        difficulty: 1
-        image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png'
        id: 'grab-the-mushroom'
+        image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png'
        description: "Grab a powerup and smash a big ogre."
      }
      {
        name: 'Drink Me'
        difficulty: 1
-        image: '/file/db/level/525dc5589a0765e496000006/drink_me_icon.png'
        id: 'drink-me'
+        image: '/file/db/level/525dc5589a0765e496000006/drink_me_icon.png'
        description: "Drink up and slay two munchkins."
      }
      {
        name: 'Taunt the Guards'
        difficulty: 1
-        image: '/file/db/level/5276c9bdcf83207a2801ff8f/taunt_icon.png'
        id: 'taunt-the-guards'
+        image: '/file/db/level/5276c9bdcf83207a2801ff8f/taunt_icon.png'
        description: "Tharin, if clever, can escape with Phoebe."
      }
      {
        name: "It's a Trap"
        difficulty: 1
-        image: '/file/db/level/528aea2d7f37fc4e0700016b/its_a_trap_icon.png'
        id: 'its-a-trap'
+        image: '/file/db/level/528aea2d7f37fc4e0700016b/its_a_trap_icon.png'
        description: "Organize a dungeon ambush with archers."
      }
      {
        name: 'Break the Prison'
        difficulty: 1
-        image: '/file/db/level/5275272c69abdcb12401216e/break_the_prison_icon.png'
        id: 'break-the-prison'
+        image: '/file/db/level/5275272c69abdcb12401216e/break_the_prison_icon.png'
        description: "More comrades are imprisoned!"
      }
      {
        name: 'Taunt'
        difficulty: 1
-        image: '/file/db/level/525f150306e1ab0962000018/taunt_icon.png'
        id: 'taunt'
+        image: '/file/db/level/525f150306e1ab0962000018/taunt_icon.png'
        description: "Taunt the ogre to claim victory."
      }
      {
        name: 'Cowardly Taunt'
        difficulty: 1
-        image: '/file/db/level/525abfd9b12777d78e000009/cowardly_taunt_icon.png'
        id: 'cowardly-taunt'
+        image: '/file/db/level/525abfd9b12777d78e000009/cowardly_taunt_icon.png'
        description: "Lure infuriated ogres to their doom."
      }
      {
        name: 'Commanding Followers'
        difficulty: 1
-        image: '/file/db/level/525ef8ef06e1ab0962000003/commanding_followers_icon.png'
        id: 'commanding-followers'
+        image: '/file/db/level/525ef8ef06e1ab0962000003/commanding_followers_icon.png'
        description: "Lead allied soldiers into battle."
      }
      {
        name: 'Mobile Artillery'
        difficulty: 1
-        image: '/file/db/level/525085419851b83f4b000001/mobile_artillery_icon.png'
        id: 'mobile-artillery'
+        image: '/file/db/level/525085419851b83f4b000001/mobile_artillery_icon.png'
        description: "Blow ogres up!"
      }
    ]
@ -85,38 +85,38 @@ module.exports = class PlayView extends View
    experienced = [
      {
        name: 'Hunter Triplets'
-        id: 'hunter-triplets'
-        description: "Three soldiers go ogre hunting."
-        image: '/file/db/level/526711d9add4f8965f000002/hunter_triplets_icon.png'
        difficulty: 2
+        id: 'hunter-triplets'
+        image: '/file/db/level/526711d9add4f8965f000002/hunter_triplets_icon.png'
+        description: "Three soldiers go ogre hunting."
      }
      {
        name: 'Emphasis on Aim'
        difficulty: 2
-        image: '/file/db/level/525f384d96cd77000000000f/munchkin_masher_icon.png'
        id: 'emphasis-on-aim'
+        image: '/file/db/level/525f384d96cd77000000000f/munchkin_masher_icon.png'
        description: "Chose your targets carefully."
      }
      {
        name: 'Zone of Danger'
-        id: 'zone-of-danger'
-        description: "Target the ogres swarming into arrow range."
-        image: '/file/db/level/526ae95c1e5cd30000000008/zone_of_danger_icon.png'
        difficulty: 3
+        id: 'zone-of-danger'
+        image: '/file/db/level/526ae95c1e5cd30000000008/zone_of_danger_icon.png'
+        description: "Target the ogres swarming into arrow range."
      }
      {
        name: 'Molotov Medic'
        difficulty: 2
-        image: '/file/db/level/52602ecb026e8481e7000001/generic_1.png'
        id: 'molotov-medic'
+        image: '/file/db/level/52602ecb026e8481e7000001/generic_1.png'
        description: "Tharin must play support in this dungeon battle."
      }
      {
        name: 'Gridmancer'
-        id: 'gridmancer'
-        description: "Challenge! Beat this level, get a job!"
-        image: '/file/db/level/52ae2460ef42c52f13000008/gridmancer_icon.png'
        difficulty: 5
+        id: 'gridmancer'
+        image: '/file/db/level/52ae2460ef42c52f13000008/gridmancer_icon.png'
+        description: "Challenge! Beat this level, get a job!"
      }
    ]

--- a/scripts/windows/coco-dev-setup/batch/config/downloads_32
+++ b/scripts/windows/coco-dev-setup/batch/config/downloads_32
@ -1,2 +1,3 @@
 http://nodejs.org/dist/v0.10.25/node-v0.10.25-x86.msi
-http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353.exe?direct 
+http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353.exe?direct
+http://www.python.org/ftp/python/2.7.6/python-2.7.6.msi
--- a/scripts/windows/coco-dev-setup/batch/config/downloads_64
+++ b/scripts/windows/coco-dev-setup/batch/config/downloads_64
@ -1,2 +1,3 @@
 http://nodejs.org/dist/v0.10.25/x64/node-v0.10.25-x64.msi
-http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353-x64.exe?direct 
+http://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.0.0-p353-x64.exe?direct
+http://www.python.org/ftp/python/2.7.6/python-2.7.6.amd64.msi
--- a/scripts/windows/coco-dev-setup/batch/config/header
+++ b/scripts/windows/coco-dev-setup/batch/config/header
@ -1,4 +1,4 @@
-
+ 
       _____           _        _____                 _           _   
      /  __ \         | |      /  __ \               | |         | |  
      | /  \/ ___   __| | ___  | /  \/ ___  _ __ ___ | |__   __ _| |_ 
--- a/scripts/windows/coco-dev-setup/batch/config/README.txt
+++ b/scripts/windows/coco-dev-setup/batch/config/README.txt
@ -7,4 +7,7 @@
   \____/\___/ \__,_|\___|  \____/\___/|_| |_| |_|_.__/ \__,_|\__|

 ======================================================================
- Readme: Hello World!
+
+The installation of your CodeCombat Development Environment was succesfull!
+You are now ready to start contributing and join our wonderfull community!
+But where and how do you start your journey?
--- a/scripts/windows/coco-dev-setup/batch/config/tips
+++ b/scripts/windows/coco-dev-setup/batch/config/tips
@ -0,0 +1,5 @@
+  1) This program is all about automating the setup of the CoCo environment
+  2) When there is a question, please answer carefull and correct
+  3) This setup is still in beta and may contain bugs
+  4) You can report bugs @ 'https://github.com/codecombat/codecombat/issues'
+  5) Having questions/suggestions? Talk with us on HipChat via CodeCombat.com
--- a/scripts/windows/coco-dev-setup/batch/dev-setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/dev-setup.bat
@ -1,6 +1,10 @@
@echo off
 setlocal EnableDelayedExpansion

+Color 0A 
+
+mode con: cols=78 lines=60
+
 :: Global Variables
 set "temp-dir=C:\Coco-Temp"
 set install-log=%temp-dir%\coco-dev-install-log.txt
@ -14,19 +18,25 @@ IF EXIST "%PROGRAMFILES(X86)%" (

 set "ZU-app=utilities\7za.exe"

+:: BUGS: 
+  ::  + DEBUG ALL STEPS UNTILL NOW DONE
+
+
 :: TODO:
-::  + Full Automatic Package bat file.
-::  + Write code to set environment variables...
 ::  + Write code to install vs if it's not yet installed on users pc
-::  + Write Git Checkout repository code:
-::      1) Let user specify destination
-::      2) do a git clone with the git application
+
 ::  + Configuraton and installation checklist:
-::      1) ... ?!
+::      1) cd codecombat
+::      2) npm install -g bower brunch nodemon sendwithus
+::      3) bower install
+::      4) gem install sass
+::      5) npm install
+::      6) brunch -w
+::      Extra... @ Fail run npm install
+
 ::  + Copy the automated dev batch file to root folder
 ::      => Let user define mongo-db directory
 ::  + Start the dev environment
-::  + Exit message and warn user that he can quit the window now
 	
 :: Create The Temporary Directory
 IF EXIST %temp-dir% rmdir %temp-dir% /s /q
@ -43,6 +53,31 @@ call:parse_file_new "config\config" cnfg n
 call:log "Welcome to the automated Installation of the CodeCombat Dev. Environment!"
 call:log_sse "v%%cnfg[1]%% authored by %%cnfg[2]%% and published by %%cnfg[3]%%."

+:: Language Agreement Stuff
+
+call:log "In order to continue the installation of the developers environment"
+call:log "you will have to read and agree with the following license:
+call:draw_dss
+echo.
+call:parse_aa_and_draw "license.txt"
+echo.
+call:draw_dss
+call:strict_user_yn_question "Have you read the license and do you agree with it?"  
+
+if "%res%"=="false" (
+  call:log "Sorry to hear that, have a good day..."
+  call:log_sse "Installation and Setup of the CodeCombat environment is cancelled."
+  GOTO:END
+)
+
+:: Tips
+call:log "Before we start the installation, here are some tips:"
+echo.
+
+call:parse_aa_and_draw "config\tips"
+
+call:draw_ss
+
 :: Read Language Index
 call:parse_file_new "localisation\languages" lang lang_c

@ -99,7 +134,7 @@ call:log_lw_sse 2

 :: downloads for all version...

-:: [TODO] The choice between Cygwin && Git ?! Is 
+:: [TODO] The choice between Cygwin && Git ?! Is  => HAVE EXTERNAL GIT APPLICATION LIST!!!

 call:log_lw_sse 3

@ -109,13 +144,25 @@ call:log_lw 8
 call:install_software_o "git" "%%downloads[1]%%" exe 9
 call:draw_dss
 call:get_lw word 11
-:: [TODO] Check if that application exists, if not ask again with warning that the path is invalid!!! (SAFETYYYY)
-set /p git_exe_path="%word%: "

 :: [TODO] Add downloads for windows visual studio ?!

-:: architecture specific downloads...
-IF EXIST "%PROGRAMFILES(X86)%" (GOTO 64BIT) ELSE (GOTO 32BIT)
+call:user_set_git_path
+
+:user_set_git_path_fail
+  if not exist "%git_exe_path%" (
+    call:log_lw 27
+    call:draw_dss
+    call:user_set_git_path
+  )
+  :: architecture specific downloads...
+  IF EXIST "%PROGRAMFILES(X86)%" (GOTO 64BIT) ELSE (GOTO 32BIT)
+goto:eof
+
+:user_set_git_path
+  set /p git_exe_path="%word%: "
+  call:user_set_git_path_fail
+goto:eof

 :go_to_platform
  call:log_ds "Windows %~1 detected..."
@ -127,7 +174,14 @@ goto:eof
  
  call:install_software_o "node-js" "%%downloads_64[1]%%" msi 12
  call:draw_dss
+  
+  call:get_path_from_user 41 42
+  set "node_js_path=%user_tmp_path%"
+  Call:draw_dss
+  
  call:install_software_o "ruby" "%%downloads_64[2]%%" exe 13
+  call:draw_dss
+  call:install_software_o "python" "%%downloads_64[3]%%" msi 26
  
  :: Some installations require specific windows versions
  for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
@ -144,7 +198,14 @@ GOTO END
  
  call:install_software_o "node-js" "%%downloads_32[1]%%" msi 12
  call:draw_dss
+  
+  call:get_path_from_user 41 42
+  set "node_js_path=%user_tmp_path%"
+  Call:draw_dss
+  
  call:install_software_o "ruby" "%%downloads_32[2]%%" exe 13
+  call:draw_dss
+  call:install_software_o "python" "%%downloads_32[3]%%" msi 26
  
  :: Some installations require specific windows versions
  for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
@ -187,6 +248,39 @@ goto END
 :git_rep_checkout
  call:log_lw_ss 16
  call:log_lw_sse 17
+  
+  set "PATH=%PATH%;%git_exe_path%\bin;%git_exe_path%\cmd" /M
+  
+  call:log_lw 36
+  call:log_lw 37
+  call:log_lw 38
+  
+  call:draw_dss
+  
+  call:get_lw word 39
+  set /p git_username="%word% "
+  
+  call:draw_dss
+    
+  call:get_empty_path_from_user 32
+  set "git_repository_path=%user_tmp_path%"
+  
+goto:git_rep_checkout_auto
+
+:git_rep_checkout_auto
+  git clone https://github.com/%git_username%/codecombat.git "%git_repository_path%"
+goto:git_repo_configuration
+
+:git_repo_configuration
+  call:log_lw_ss 35
+  call:log_lw_sse 36
+  
+  SET "PATH=%PATH%;%node_js_path%" /M
+  setx -m git "%git_exe_path%\bin"
+
+  call:log_lw 40
+  start cmd /k "npm install -g bower brunch nodemon sendwithus & exit"
+  
 goto report_ok

 :report_ok
@ -199,7 +293,7 @@ goto report_ok
 goto clean_up

 :open_readme
-  call:open_txt_file "config/README.txt"
+  call:open_txt_file "config/info"
 goto:eof

 :warn_and_exit
@ -214,7 +308,6 @@ goto END
 :clean_up
  call:log_lw_sse 23
  rmdir %temp-dir% /s /q
-  PAUSE
 goto END

 :: ============================ INSTALL SOFTWARE FUNCTIONS ======================
@ -234,11 +327,7 @@ goto:eof

 :install_software_o
  call:get_lw word %~4
-  set /p result="%word% [Y/N]: "
-  call:draw_dss
-  set res=false
-  if "%result%"=="N" set res=true
-  if "%result%"=="n" set res=true
+  call:user_yn_question "%word%"
  if "%res%"=="true" (
    call:install_software %~1 %~2 %~3
  ) else (
@ -271,13 +360,33 @@ goto:eof
  rmdir %packed_software_path%\%temp_dir%\ /s /q
 goto:eof

+:user_yn_question
+  set /p result="%~1 [Y/N]: "
+  call:draw_dss
+  set "res=false"
+  if "%result%"=="N" (set "res=true")
+  if "%result%"=="n" (set "res=true")
+goto:eof
+
+:strict_user_yn_question
+  set /p result="%~1 [Y/N]: "
+  call:draw_dss
+  set "res=unset"
+  if "%result%"=="N" (set "res=false")
+  if "%result%"=="n" (set "res=false")
+  if "%result%"=="Y" (set "res=true")
+  if "%result%"=="y" (set "res=true")
+  
+  if "%res%"=="unset" (
+    call:log "Please answer the question with either Y or N..."
+    call:draw_dss
+    call:strict_user_yn_question "%~1"
+  )
+goto:eof
+
 :install_packed_software_o
  call:get_lw word %~4
-  set /p result="%word% [Y/N]: "
-  call:draw_dss
-  set res=false
-  if "%result%"=="N" set res=true
-  if "%result%"=="n" set res=true
+  call:user_yn_question "%word%"
  if "%res%"=="true" (
    call:install_packed_software %~1 %~2 %~3
  ) else (
@ -285,6 +394,28 @@ goto:eof
  )
 goto:eof

+:: ===================== USER - INTERACTION - FUNCTIONS ========================
+
+:get_path_from_user
+  call:get_lw word %~1
+  set /p user_tmp_path="%word% "
+  if not exist "%user_tmp_path%" (
+    call:log_lw 43
+    call:draw_dss
+    call:get_path_from_user %~1 %~2
+  )
+goto:eof
+
+:get_empty_path_from_user
+  call:get_lw word %~1
+  set /p user_tmp_path="%word% "
+  if exist "%user_tmp_path%" (
+    call:log_lw 33
+    call:draw_dss
+    call:get_path_from_user %~1
+  )
+goto:eof
+
 :: ============================== FUNCTIONS ====================================

 :log
@ -293,11 +424,21 @@ goto:eof
 goto:eof

 :draw_ss
+  echo.
  call:log "-----------------------------------------------------------------------------"
+  echo.
 goto:eof

 :draw_dss
+  echo.
  call:log "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+  echo.
+goto:eof
+
+:draw_seperator
+  echo.
+  echo                            + + + + + + + +                           
+  echo.
 goto:eof

 :log_ss
@ -323,7 +464,7 @@ goto:eof

 :parse_aa_and_draw
  set "file=%~1"
-  for /F "usebackq delims=" %%a in ("%file%") do (
+  for /f "usebackq tokens=* delims=;" %%a in ("%file%") do (
    echo.%%a
  )
 goto:eof
@ -341,7 +482,7 @@ goto:eof
  call:parse_file %~1 %~2 %~3
 goto:eof

-:: ============================== LOCALISATION FUNCTIONS ===========================
+:: ============================== LOCALISATION FUNCTIONS ================

 :get_lw
  call:get_lw_id %~1 %lang_id% %~2
@ -357,6 +498,11 @@ goto:eof
  call:log "%str%"
 goto:eof

+:log_lw_prfx
+  call:get_lw str %~1
+  call:log "%~2%str%"
+goto:eof
+
 :log_lw_ss
  call:get_lw str %~1
  call:log_ss "%str%"
@ -372,7 +518,16 @@ goto:eof
  call:log_sse "%str%"
 goto:eof

+:: ============================== WINDOWS FUNCTIONS ======================
+
+:set_env_var
+  setx -m %~1 %~2
+goto:eof
+
 :: ============================== EOF ====================================

 :END
+  exit
+goto:eof
+
 endlocal
--- a/scripts/windows/coco-dev-setup/batch/git-test.bat
+++ b/scripts/windows/coco-dev-setup/batch/git-test.bat
@ -0,0 +1,50 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+::  + Configuraton and installation checklist:
+::      1) cd codecombat
+::      2) npm install -g bower brunch nodemon sendwithus
+::      3) bower install
+::      4) gem install sass
+::      5) npm install
+::      6) brunch -w
+::      Extra... @ Fail run npm install
+
+echo "Moving to your git repository..."
+C:
+cd C:\CodeCombat
+
+PAUSE
+
+SET "PATH=%PATH%;C:\Program Files\Nodejs" /M
+setx -m git "C:\Program Files (x86)\Git\bin"
+SET "PATH=%PATH%;C:\Program Files (x86)\Git\bin;C:\Program Files (x86)\Git\cmd" /M
+
+PAUSE
+
+echo "Installing bower, brunch, nodemon and sendwithus..."
+start cmd /k "npm install -g bower brunch nodemon sendwithus & exit"
+
+PAUSE
+
+echo "running npm install..."
+start cmd /k "npm install & exit"
+
+PAUSE
+
+echo "Activating bower install..."
+start cmd /k "bower install & PAUSE & exit"
+
+PAUSE
+
+echo "Installing sass via gem..."
+start cmd /k "install sass & PAUSE & exit"
+
+PAUSE
+
+echo "comping repository via brunch..."
+start cmd /k "brunch -w & exit"
+
+PAUSE
+
+endlocal
--- a/scripts/windows/coco-dev-setup/batch/license.txt
+++ b/scripts/windows/coco-dev-setup/batch/license.txt
@ -0,0 +1,11 @@
+
+The MIT License (MIT)
+ 
+Copyright (c) 2014 CodeCombat Inc. and other contributors
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation  the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell     copies of the Software, and to permit persons to whom the Software is         furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in allcopies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN sCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THESOFTWARE.
--- a/scripts/windows/coco-dev-setup/batch/localisation/en
+++ b/scripts/windows/coco-dev-setup/batch/localisation/en
@ -5,11 +5,11 @@ Don't close any windows please, unless specified explicitly.
 downloading:
 installing:
 CodeCombat is safely stored on a git repository.
-Therefore you need a git command-line application.
+Therefore you need a git command-line application (Git-bash).
 Examples: git-bash, CygWin, ...
-Do you already have a git command-line application?
+Do you already have git-bash?
 Download and Installation cancelled...
-Enter the path to your Git CL Exectutable
+Enter the path to where you installed Git-bash
 Do you already have the latest version of node-js installed?
 Do you already have the latest version of ruby installed?
 Do you already have the latest version of mongo-db installed?
@ -23,4 +23,21 @@ Report your OS to the developers @ CodeCombat.com...
 Installation has been stopped...
 ... Cleaning up has been disabled... Terminating Script!
 unpacking and moving:
-Enter the path where you would like to install MongoDB:
+Enter the path where you would like to install MongoDB:
+Do you already have the latest version of python installed?
+The path to your git application is incorrect, please try again...
+You'll need to execute the following steps to continue the installation:
+Type: git clone https://github.com/codecombat/codecombat.git aPath
+Note: replace aPath with the destination of your git repository
+Close the git application and go back to this CMD window
+Enter the full path where you want to clone your repository to:
+The path you entered already exists, please try again...
+Good Job, we're almost there...
+Started the configuration of your git repository...
+You need a fork of the official CodeCombat...
+Haven't you done that yet, really...?
+Go over to https://github.com/codecombat/codecombat and do it now!
+Now then... Please enter your github username:
+Installing bower, brunch, nodemon and sendwithus...
+Please enter the full path of the location you installed nodejs to:
+The path you intered is invalid, please try again...
--- a/scripts/windows/coco-dev-setup/batch/localisation/fr
+++ b/scripts/windows/coco-dev-setup/batch/localisation/fr
@ -5,11 +5,11 @@ Don't close any windows please, unless specified explicitly.
 downloading:
 installing:
 CodeCombat is safely stored on a git repository.
-Therefore you need a git command-line application.
+Therefore you need a git command-line application (Git-bash).
 Examples: git-bash, CygWin, ...
-Do you already have a git command-line application?
+Do you already have git-bash?
 Download and Installation cancelled...
-Enter the path to your Git CL Exectutable
+Enter the path to where you installed Git-bash
 Do you already have the latest version of node-js installed?
 Do you already have the latest version of ruby installed?
 Do you already have the latest version of mongo-db installed?
@ -23,4 +23,21 @@ Report your OS to the developers @ CodeCombat.com...
 Installation has been stopped...
 ... Cleaning up has been disabled... Terminating Script!
 unpacking and moving:
-Enter the path where you would like to install MongoDB:
+Enter the path where you would like to install MongoDB:
+Do you already have the latest version of python installed?
+The path to your git application is incorrect, please try again...
+You'll need to execute the following steps to continue the installation:
+Type: git clone https://github.com/codecombat/codecombat.git aPath
+Note: replace aPath with the destination of your git repository
+Close the git application and go back to this CMD window
+Enter the full path where you want to clone your repository to:
+The path you entered already exists, please try again...
+Good Job, we're almost there...
+Started the configuration of your git repository...
+You need a fork of the official CodeCombat...
+Haven't you done that yet, really...?
+Go over to https://github.com/codecombat/codecombat and do it now!
+Now then... Please enter your github username:
+Installing bower, brunch, nodemon and sendwithus...
+Please enter the full path of the location you installed nodejs to:
+The path you intered is invalid, please try again...
--- a/scripts/windows/coco-dev-setup/batch/localisation/nl
+++ b/scripts/windows/coco-dev-setup/batch/localisation/nl
@ -5,11 +5,11 @@ Don't close any windows please, unless specified explicitly.
 downloading:
 installing:
 CodeCombat is safely stored on a git repository.
-Therefore you need a git command-line application.
+Therefore you need a git command-line application (Git-bash).
 Examples: git-bash, CygWin, ...
-Do you already have a git command-line application?
+Do you already have git-bash?
 Download and Installation cancelled...
-Enter the path to your Git CL Exectutable
+Enter the path to where you installed Git-bash
 Do you already have the latest version of node-js installed?
 Do you already have the latest version of ruby installed?
 Do you already have the latest version of mongo-db installed?
@ -23,4 +23,21 @@ Report your OS to the developers @ CodeCombat.com...
 Installation has been stopped...
 ... Cleaning up has been disabled... Terminating Script!
 unpacking and moving:
-Enter the path where you would like to install MongoDB:
+Enter the path where you would like to install MongoDB:
+Do you already have the latest version of python installed?
+The path to your git application is incorrect, please try again...
+You'll need to execute the following steps to continue the installation:
+Type: git clone https://github.com/codecombat/codecombat.git aPath
+Note: replace aPath with the destination of your git repository
+Close the git application and go back to this CMD window
+Enter the full path where you want to clone your repository to:
+The path you entered already exists, please try again...
+Good Job, we're almost there...
+Started the configuration of your git repository...
+You need a fork of the official CodeCombat...
+Haven't you done that yet, really...?
+Go over to https://github.com/codecombat/codecombat and do it now!
+Now then... Please enter your github username:
+Installing bower, brunch, nodemon and sendwithus...
+Please enter the full path of the location you installed nodejs to:
+The path you intered is invalid, please try again...
--- a/server/queues/scoring.coffee
+++ b/server/queues/scoring.coffee
@ -225,6 +225,9 @@ findNearestBetterSessionID = (levelOriginalID, levelMajorVersion, sessionID, ses
      submittedCode:
        $exists: true
      team: opposingTeam
+      
+    if opponentSessionTotalScore < 30
+      queryParameters["totalScore"]["$gt"] = opponentSessionTotalScore + 1

    limitNumber = 1