Merge branch 'master' into production

CONTRIBUTING.md

@@ -2,12 +2,12 @@
 
 There are many ways in which to contribute to CodeCombat, these include becoming a(n):
 
- - **[Archmage](http://codecombat.com/contribute/archmage)** (Coder)
+ - **[Archmage](https://codecombat.com/contribute/archmage)** (Coder)
- - **[Artisan](http://codecombat.com/contribute/artisan)** (Level Builder) 
+ - **[Artisan](https://codecombat.com/contribute/artisan)** (Level Builder) 
- - **[Adventurer](http://codecombat.com/contribute/adventurer)** (Level Playtester)
+ - **[Adventurer](https://codecombat.com/contribute/adventurer)** (Level Playtester)
- - **[Scribe](http://codecombat.com/contribute/scribe)** (Article Editor)
+ - **[Scribe](https://codecombat.com/contribute/scribe)** (Article Editor)
- - **[Diplomat](http://codecombat.com/contribute/diplomat)** (Translator)
+ - **[Diplomat](https://codecombat.com/contribute/diplomat)** (Translator)
- - **[Ambassador](http://codecombat.com/contribute/ambassador)** (Support)
+ - **[Ambassador](https://codecombat.com/contribute/ambassador)** (Support)
 
 ###The CLA
 

app/lib/world/names.coffee

@@ -39,6 +39,7 @@ module.exports.thangNames = thangNames =
     'Duke'
     'Earl'
     'Edward'
+    'Edwin'
     'Eric'
     'Ernest'
     'Eugene'
@@ -150,6 +151,7 @@ module.exports.thangNames = thangNames =
     'Thomas'
     'Timothy'
     'Todd'
+    'Tryndamere'
     'Tyrone'
     'Victor'
     'Walter'
@@ -159,6 +161,7 @@ module.exports.thangNames = thangNames =
     'Zachary'
   ]
   'Soldier F': [
+    'Ahri'
     'Alana'
     'Alexandra'
     'Alice'
@@ -218,6 +221,7 @@ module.exports.thangNames = thangNames =
     'Jennifer'
     'Jessica'
     'Joan'
+    'Jordan'
     'Joyce'
     'Judith'
     'Judy'
@@ -641,6 +645,7 @@ module.exports.thangNames = thangNames =
     'Hank'
     'Hunfray'
     'Jeph'
+    'Lancelot'
     'Mace'
     'Neville'
     'Shug'
@@ -669,9 +674,11 @@ module.exports.thangNames = thangNames =
     'Sun Tzu'
   ]
   'Ninja': [
+    'Akali'
     'Amara'
     'Goemon'
     'Itachi'
+    'Kennen'
     'Kosaraju'
     'Madara'
     'Minato'
@@ -679,8 +686,10 @@ module.exports.thangNames = thangNames =
     'Obito'
     'Sakura'
     'Sasuke'
+    'Shen'
     'Shigeru'
     'Takashi'
+    'Zed'
   ]
   'Sorcerer': [
     'Beazer'
@@ -697,6 +706,8 @@ module.exports.thangNames = thangNames =
     'Izotokogawa'
     'Keitaro'
     'Nobunaga'
+    'Yasuo'
+    'Yi'
   ]
   'Sand Yak': [
     'Arngotho'
@@ -821,19 +832,25 @@ module.exports.thangNames = thangNames =
     'Zana'
   ]
   'Assassin': [
+    'Kha\'Zix'
     'Ritic'
+    'Rengar'
     'Shade'
+    'Talon'
     'BlackJack'
+    'Zed'
   ]
   'Necromancer': [
     'Nalfar'
   ]
   'Dark Wizard': [
     'Usara'
+    'Veigar'
   ]
   'Paladin': [
     # TODO: paladin names (female)
     'Celadia'
+    'Taric'
   ]
   'Ogre Witch': [
     # TODO: ogre witch names

app/locale/ar.coffee

@@ -6,12 +6,12 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     play: "إلعب" # The big play button that opens up the campaign view.
     old_browser: "اه أوه، متصفحك قديم جدا لتشغيل CodeCombat. آسف!" # Warning that shows up on really old Firefox/Chrome/Safari
     old_browser_suffix: "يمكنك محاولة على أي حال، لكنه ربما لن يعمل."
-#    ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval."
+    ipad_browser: "الخبر السيئ: لا يمكنك تشغيل اللعبة في المتصفح على الآيباد ، الخبر الجيد: تطبيق اللعبة للآيباد جاهز و في إنتظار موافقة آبل."
     campaign: "حملة"
     for_beginners: "للمبتدئين"
     multiplayer: "متعدد اللاعبين" # Not currently shown on home page
     for_developers: "للمطوّرين" # Not currently shown on home page.
-#    or_ipad: "Or download for iPad"
+    or_ipad: "أو حمِّل من أجل الآيباد"
 
   nav:
     play: "إلعب" # The top nav bar entry where players choose which levels to play
@@ -53,35 +53,40 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
     players: "لاعبين" # Hover over a level on /play
     hours_played: "ساعات اللّعب" # Hover over a level on /play
 #    items: "Items" # Tooltip on item shop button from /play
-#    unlock: "Unlock" # For purchasing items and heroes
+    unlock: "فتح" # For purchasing items and heroes
-#    confirm: "Confirm"
+    confirm: "تأكيد"
-#    owned: "Owned" # For items you own
+    owned: "ممتَلَك" # For items you own
-#    locked: "Locked"
+    locked: "مقفل"
-#    purchasable: "Purchasable" # For a hero you unlocked but haven't purchased
+    purchasable: "للشراء" # For a hero you unlocked but haven't purchased
-#    available: "Available"
+    available: "متوفر"
 #    skills_granted: "Skills Granted" # Property documentation details
 #    heroes: "Heroes" # Tooltip on hero shop button from /play
 #    achievements: "Achievements" # Tooltip on achievement list button from /play
-#    account: "Account" # Tooltip on account button from /play
+    account: "حساب" # Tooltip on account button from /play
-#    settings: "Settings" # Tooltip on settings button from /play
+    settings: "الإعدادات" # Tooltip on settings button from /play
-#    next: "Next" # Go from choose hero to choose inventory before playing a level
+    next: "التالي" # Go from choose hero to choose inventory before playing a level
 #    change_hero: "Change Hero" # Go back from choose inventory to choose hero
 #    choose_inventory: "Equip Items"
 #    buy_gems: "Buy Gems"
-#    subscription_required: "Subscription Required"
+    campaign_desert: "حملة في الصحراء"
-#    older_campaigns: "Older Campaigns"
+    campaign_forest: "حملة في الغابة"
-#    anonymous: "Anonymous Player"
+    campaign_dungeon: "حملة في البرج"
+    subscription_required: "الإشتراك إلزامي"
+    free: "مجاني"
+    subscribed: "مسجَّل"
+    older_campaigns: "حملات أقدم"
+    anonymous: "لاعب مجهول"
     level_difficulty: "الصعوبة:"
     campaign_beginner: "حملة المبتدئين"
 #    awaiting_levels_adventurer_prefix: "We release five levels per week."
 #    awaiting_levels_adventurer: "Sign up as an Adventurer"
 #    awaiting_levels_adventurer_suffix: "to be the first to play new levels."
-#    adjust_volume: "Adjust volume"
+    adjust_volume: "تعديل الصوت"
     choose_your_level: "اختر مستواك" # The rest of this section is the old play view at /play-old and isn't very important.
     adventurer_prefix: "يمكنك القفز إلى أي مستوى أدناه، أو مناقشة المستويات على "
     adventurer_forum: "منتدى المغامر"
     adventurer_suffix: "."
-#    campaign_old_beginner: "Old Beginner Campaign"
+    campaign_old_beginner: "حملات أقدم من أجل المبتدئين"
     campaign_old_beginner_description: "... فيها تتعلم سحر البرمجة."
     campaign_dev: "مستويات أصعب عشوائية"
     campaign_dev_description: "... فيها تتعلم واجهة بينما  تفعل شيئا أصعب قليلا."
@@ -335,6 +340,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/bg.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Инвентар"

app/locale/ca.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventari"

app/locale/cs.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     tip_google: "Máš problém, který nemůžeš vyřešit? Vygoogluj to!"
     tip_adding_evil: "Přidávání špetky zla."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventář"

app/locale/da.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
 #    inventory_tab: "Inventory"

app/locale/de-AT.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventar"

app/locale/de-CH.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
 #    inventory_tab: "Inventory"

app/locale/de-DE.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventar"

app/locale/el.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
 #    inventory_tab: "Inventory"

app/locale/en-GB.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/en-US.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/en.coffee

@@ -335,6 +335,7 @@
     tip_google: "Have a problem you can't solve? Google it!"
     tip_adding_evil: "Adding a pinch of evil."
     tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventory"

app/locale/es-419.coffee

@@ -334,7 +334,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     tip_move_forward: "Hagas lo que hagas, siempre sigue hacia delante. - Martin Luther King Jr."
     tip_google: "¿Tienes un problema que no puedes resolver? ¡Googléalo!"
     tip_adding_evil: "Agregando una pizca de maldad."
-#    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+    tip_hate_computers: "Esa es la razón por la cual la gente piensa que odia las computadoras. Lo que ellos odian de verdad, es los pesimos programadores. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventario"
@@ -357,7 +358,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     leaderboard: "Tabla de Posiciones"
     view_other_solutions: "Ver Otras Soluciones"
     scores: "Puntajes"
-#    top_players: "Top Players by"
+    top_players: "Mejores jugadores"
     day: "Hoy"
     week: "Esta Semana"
     all: "Siempre"
@@ -391,7 +392,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     prompt_body: "¿Quieres obtener más?"
     prompt_button: "Entrar al mercado"
     recovered: "Se recuperaron las anteriores compras de gemas. Por favor recarga la página"
-#    price: "x3500 / mo"
+    price: "x3500 / mes"
 
   subscribe:
     comparison_blurb: "Agudiza tus habilidades con la suscripción a CodeCombat!"
@@ -442,7 +443,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     lua_blurb: "Lenguaje para Juegos."
     io_blurb: "Simple pero oscuro."
     status: "Estado"
-#    hero_type: "Type"
+    hero_type: "Tipo"
     weapons: "Armas"
     weapons_warrior: "Espada - Corto Alcance, Sin Magia"
     weapons_ranger: "Ballestas, Armas - Largo Alcance, Sin Magia"
@@ -455,14 +456,14 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     blocks: "Bloqueo" # As in "this shield blocks this much damage"
     backstab: "Apuñala" # As in "this dagger does this much backstab damage"
     skills: "Habilidades"
-#    attack_1: "Deals"
+    attack_1: "Ofertas"
-#    attack_2: "of listed"
+    attack_2: "de la lista"
-#    attack_3: "weapon damage."
+    attack_3: "daño de arma."
-#    health_1: "Gains"
+    health_1: "Gana"
-#    health_2: "of listed"
+    health_2: "de la lista"
-#    health_3: "armor health."
+    health_3: "salud de la armadura."
-#    speed_1: "Moves at"
+    speed_1: "Se mueve a"
-#    speed_2: "meters per second."
+    speed_2: "metros por segundo."
     available_for_purchase: "Disponible para Comprar" # Shows up when you have unlocked, but not purchased, a hero in the hero store
     level_to_unlock: "Nivel para desbloquear:" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
     restricted_to_certain_heroes: "Sólo ciertos héroes pueden jugar este nivel."
@@ -538,14 +539,14 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     michael_blurb: "Sys Admin"
     matt_title: "Programador"
     matt_blurb: "Bicicletero"
-#    cat_title: "Chief Artisan"
+    cat_title: "Jefe Artesano"
-#    cat_blurb: "Airbender"
+    cat_blurb: "Maestro del Aire"
-#    josh_title: "Game Designer"
+    josh_title: "Diseñador de Juegos"
-#    josh_blurb: "Floor Is Lava"
+    josh_blurb: "El piso es Lava"
-#    jose_title: "Music"
+    jose_title: "Música"
-#    jose_blurb: "Taking Off"
+    jose_blurb: "Despegar"
-#    retrostyle_title: "Illustration"
+    retrostyle_title: "Ilustracin"
-#    retrostyle_blurb: "RetroStyle Games"
+    retrostyle_blurb: "Juegos con estilo Retro"
 
   teachers:
     title: "CodeCombat para Profesores"
@@ -559,8 +560,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     violent_2: "Si te sientes cómodo cuanto tus estudiantes juegan Angry Bird, entonces estaras cómodo con CodeCombat."
     for_girls_title: "¿Es para chicas?"
     for_girls_1: "Existen tres modos de juego en CodeCombat: Edificación, rompecabezas, y combate. Hemos diseñado intencionalmente cada uno para atraer tanto a los niños como a las niñas, y creemos en que los niveles de construcción y rompecabezas diferencia el juego de los títulos triple A ultra violentos que repelen a las jugadoras."
-#    age_recommended_title: "What age is it recommended at?"
+    age_recommended_title: "¿Cuál es la edad recomendada?"
-#    age_recommended_1: "The recommended minimum age is 9, however children as young as 7 can play the first stages with the assistance of an adult."
+    age_recommended_1: "La edad minima recomendada es 9, aunque niños de 7 años pueden jugar los primeros niveles con la asistencia de un adulto"
     what_cover_title: "¿Qué es lo que cubrimos?"
     what_cover_1: "Hay 20 niveles en nuestro tutorial Hora del Código que enseña y refuerza 6 conceptos especifico de las ciencias computacionales:"
     what_cover_notation_1: "Notación Formal"
@@ -580,8 +581,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     what_cover_logic_2: "- cuándo y cómo utilizar if / else para controlar los resultados del juego."
     what_cover_input_1: "Manipulación de eventos de entrada"
     what_cover_input_2: "- responder a eventos de entrada para crear una interfaz de usuario."
-#    what_cover_array_1: "Arrays"
+    what_cover_array_1: "Arrays" #se puede traducir matrices, pero la idea es usar la palabra "Arrays"
-#    what_cover_array_2: "- allows the player to create and loop through arrays."
+    what_cover_array_2: "- Permitir al jugador crear y usar bucles a través de arrays."
     sys_requirements_title: "Requerimientos del sistema"
     sys_requirements_1: "Debido que CodeCombat es un juego, es más difícil para las computadoras correrlo en relación a un tutorial escrito o un video. Para que todos puedan jugar, hemos optimizado la web para correr rápidamente en todos los navegadores modernos y en maquinas antiguas. Dicho esto, aquí están nuestras sugerencias para sacar el máximo provecho de su experiencia en la Hora del Código:"
     sys_requirements_2: "Usar una versión actualizada del navegador Chrome o Firefox."
@@ -594,7 +595,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
   versions:
     save_version_title: "Guardar nueva versión"
     new_major_version: "Nueva Gran Versión"
-#    submitting_patch: "Submitting Patch..."
+    submitting_patch: "Publicando Parche..."
     cla_prefix: "Para guardar los cambios, primero debes estar de acuerdo con nuestro"
     cla_url: "CLA"
     cla_suffix: "."
@@ -624,17 +625,17 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     autosave: "Cambios Guardados Automáticamente"
     me_tab: "Yo"
     picture_tab: "Imagen"
-#    delete_account_tab: "Delete Your Account"
+    delete_account_tab: "Borra tu cuenta"
-#    wrong_email: "Wrong Email"
+    wrong_email: "Mail Incorrecto"
     upload_picture: "Sube una imagen"
-#    delete_this_account: "Delete this account permanently"
+    delete_this_account: "Borrar esta cuenta permanentemente"
-#    god_mode: "God Mode"
+    god_mode: "Modo Dios"
     password_tab: "Contraseña"
     emails_tab: "Correos"
     admin: "Admin"
     new_password: "Nueva Contraseña"
     new_password_verify: "Verificar"
-#    type_in_email: "Type in your email to confirm the deletion"
+    type_in_email: "Ingrese su correo electrónico para confirmar la eliminación"
     email_subscriptions: "Suscripciones de Email"
     email_subscriptions_none: "No tienes suscripciones."
     email_announcements: "Noticias"
@@ -794,9 +795,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    achievement_query_misc: "Key achievement off of miscellanea"
 #    achievement_query_goals: "Key achievement off of level goals"
 #    level_completion: "Level Completion"
-#    pop_i18n: "Populate I18N"
+    pop_i18n: "Poblar I18N"
     tasks: "Tareas"
-#    clear_storage: "Clear your local changes"
+    clear_storage: "Borrar tus cambios locales"
 
   article:
     edit_btn_preview: "Vista previa"
@@ -894,8 +895,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     rank_submitted: "Enviado para Clasificación"
     rank_failed: "Fallo al Clasificar"
     rank_being_ranked: "Juego Siendo Clasificado"
-#    rank_last_submitted: "submitted "
+    rank_last_submitted: "Presentado"
-#    help_simulate: "Help simulate games?"
+    help_simulate: "Ayudar simulando juego?"
     code_being_simulated: "Tu nuevo código está siendo simulado por otros jugadores para clasificación. Esto se refrescará a medida que vengan nuevas partidas."
     no_ranked_matches_pre: "Sin partidas clasificadas para el "
     no_ranked_matches_post: " equipo! Juega en contra de algunos competidores y luego vuelve aquí para ver tu juego clasificado."
@@ -1024,7 +1025,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     top_simulators: "Mejores simuladores"
     source_document: "Documento fuente"
     document: "Documento"
-#    sprite_sheet: "Sprite Sheet"
+    sprite_sheet: "Hoja de Sprite"
     employers: "Empleadores"
     candidates: "Candidatos"
     candidate_sessions: "Sesión de candidato"
@@ -1044,9 +1045,9 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     added: "Agregado"
     modified: "Modificado"
     deleted: "Borrado"
-#    moved_index: "Moved Index"
+    moved_index: "Índice movido"
-#    text_diff: "Text Diff"
+    text_diff: "Diferir Texto"
-#    merge_conflict_with: "MERGE CONFLICT WITH"
+    merge_conflict_with: "UNIR CONFLICTO CON"
     no_changes: "Sin cambios"
 
   guide:
@@ -1085,8 +1086,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     copyrights_title: "Derechos y Licencias"
     contributor_title: "Contributor License Agreement"
     contributor_description_prefix: "Todas las Contribuciones, tanto en el website como en nuestro Repositorio GitHub, estan sujetos a nuestra aprobación."
-#    cla_url: "CLA"
+    cla_url: "CLA"
-#    contributor_description_suffix: "to which you should agree before contributing."
+    contributor_description_suffix: "A lo que debes de estar de acuerdo antes de contribuir."
     code_title: "Código - MIT"
     code_description_prefix: "Todo el código pertenece a CodeCombat u hospedado en codecombat.com, sea en el repositorio GitHub o en la base de datos en codecombat.com, está bajo licencia"
     mit_license_url: "Licencia MIT"
@@ -1098,7 +1099,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     art_music: "Música"
     art_sound: "Sonido"
     art_artwork: "Trabajo Artístico"
-#    art_sprites: "Sprites"
+    art_sprites: "Sprites"  # A esta palabra se la llama igual en Español que en Ingles
     art_other: "Cualquier otro trabajo creativo (no necesariamente código) que están disponibles cuando se crean niveles."
 #    art_access: "Currently there is no universal, easy system for fetching these assets. In general, fetch them from the URLs as used by the site, contact us for assistance, or help us in extending the site to make these assets more easily accessible."
 #    art_paragraph_1: "For attribution, please name and link to codecombat.com near where the source is used or where appropriate for the medium. For example:"
@@ -1106,16 +1107,16 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    use_list_2: "If used on a website, include a link near the usage, for example underneath an image, or in a general attributions page where you might also mention other Creative Commons works and open source software being used on the site. Something that's already clearly referencing CodeCombat, such as a blog post mentioning CodeCombat, does not need some separate attribution."
 #    art_paragraph_2: "If the content being used is created not by CodeCombat but instead by a user of codecombat.com, attribute them instead, and follow attribution directions provided in that resource's description if there are any."
     rights_title: "Derechos Reservados"
-#    rights_desc: "All rights are reserved for Levels themselves. This includes"
+    rights_desc: "Todos los derechos estan reservados para los niveles mismos. Esto incluye."
-#    rights_scripts: "Scripts"
+    rights_scripts: "Scripts"  # A esta palabra se la llama igual en Español que en Ingles
-#    rights_unit: "Unit configuration"
+    rights_unit: "Configuración de la unidad"
-#    rights_description: "Description"
+    rights_description: "Descripción"
-#    rights_writings: "Writings"
+    rights_writings: "Escritos"
 #    rights_media: "Media (sounds, music) and any other creative content made specifically for that Level and not made generally available when creating Levels."
 #    rights_clarification: "To clarify, anything that is made available in the Level Editor for the purpose of making levels is under CC, whereas the content created with the Level Editor or uploaded in the course of creation of Levels is not."
-#    nutshell_title: "In a Nutshell"
+    nutshell_title: "En una palabra" # no se traduce literalmente, si no que es un dicho
 #    nutshell_description: "Any resources we provide in the Level Editor are free to use as you like for creating Levels. But we reserve the right to restrict distribution of the Levels themselves (that are created on codecombat.com) so that they may be charged for in the future, if that's what ends up happening."
-#    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
+    canonical: "La versión en ingles de este documento es la definitiva, versión canónica. Si hay alguna discrepancia entre las traducciones, la versión en ingles toma presedencia."
 
   ladder_prizes:
     title: "Premios de Torneos" # This section was for an old tournament and doesn't need new translations now.
@@ -1128,14 +1129,14 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     prizes: "Premios"
     total_value: "Valor Total"
     in_cash: "en dinero"
-    custom_wizard: "CodeCombat Mago Modificado"
+    custom_wizard: "CodeCombat Mago Personalizado"
-#    custom_avatar: "Custom CodeCombat avatar"
+    custom_avatar: " CodeCombat Avatar Personalizado"
-#    heap: "for six months of \"Startup\" access"
+    heap: "Por seis meses acceso \"Startup\"."
     credits: "creditos"
     one_month_coupon: "Cupón: elegí entre Rails o HTML."
     one_month_discount: "descuento del 30%: elegí entre Rails o HTML"
     license: "licencia"
-#    oreilly: "ebook of your choice"
+    oreilly: "ebook de su elección"
 
   account_profile:
     settings: "Configuración" # We are not actively recruiting right now, so there's no need to add new translations for this section.

app/locale/es-ES.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventario"

app/locale/fa.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/fi.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/fr.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    tip_google: "Have a problem you can't solve? Google it!"
     tip_adding_evil: "Ajout d'une pincée de méchanceté"
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventaire"

app/locale/gl.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventario"

app/locale/he.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     tip_google: "!יש בעיה שאתה לא מצליח לפתור? תגגל אותה"
     tip_adding_evil: ".מוסיף קמצוץ של רשע"
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "תיק"
@@ -671,7 +672,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     run_real_time: ".הרץ קוד בזמן אמת"
     continue_script: ".המשך בתסריט זה"
     skip_scripts: ".דלג על כל התסריטים שניתן לדלג עליהם"
-    toggle_playback: ".הפעל\השהה"
+    toggle_playback: ".הפעלהשהה"
     scrub_playback: ".התקדם אחורה וקדימה בזמן"
     single_scrub_playback: ".התקדם אחורה וקדימה בזמן בפריים אחד"
 #    scrub_execution: "Scrub through current spell execution."

app/locale/hi.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/hu.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Raktár"

app/locale/id.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/it.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventario"

app/locale/ja.coffee

@@ -50,7 +50,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
   play:
     play_as: "としてプレー" # Ladder page
     spectate: "観戦" # Ladder page
-    players: "プレーヤー" # Hover over a level on /play
+    players: "プレイヤー" # Hover over a level on /play
     hours_played: "プレイ時間" # Hover over a level on /play
     items: "アイテム" # Tooltip on item shop button from /play
     unlock: "アンロック" # For purchasing items and heroes
@@ -335,6 +335,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     tip_google: "解決できない問題がありますか？ググっちゃえ！"
     tip_adding_evil: "悪を少々加える。"
     tip_hate_computers: "コンピュータを憎むと思う人についての事だ。彼らが本当に嫌いなのは下手なプログラマーだ。- ラリー・ニーヴン"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "インベントリー"
@@ -391,7 +392,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     prompt_body: "もっと購入しますか？"
     prompt_button: "ショップに入る"
     recovered: "前のジェム購入をリカバリーしました。ページを更新してください。"
-#    price: "x3500 / mo"
+    price: "x3500 / 月"
 
 #  subscribe:
 #    comparison_blurb: "Sharpen your skills with a CodeCombat subscription!"
@@ -430,7 +431,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    unlock_help_videos: "Subscribe to unlock all video tutorials."
 
   choose_hero:
-    choose_hero: "ヒーローの選択"
+    choose_hero: "ヒーロー選択"
     programming_language: "プログラミング言語"
     programming_language_description: "どのプログラミング言語を使いますか？"
     default: "デフォルト"
@@ -442,7 +443,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     lua_blurb: "ゲーム専用のスクリプト言語。"
     io_blurb: "シンプルだがあいまい。"
     status: "ステータス"
-#    hero_type: "Type"
+    hero_type: "タイプ"
     weapons: "武器"
     weapons_warrior: "剣 - 攻撃範囲:短い- 魔法使用不可"
     weapons_ranger: "クロスボウ, 銃 - 攻撃範囲:長い- 魔法使用不可"
@@ -514,38 +515,38 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    editor_config_behaviors_label: "Smart Behaviors"
 #    editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes."
 
-#  about:
+  about:
-#    why_codecombat: "Why CodeCombat?"
+    why_codecombat: "なぜCodeCombat?"
-#    why_paragraph_1: "If you want to learn to program, you don't need lessons. You need to write a lot of code and have a great time doing it."
+    why_paragraph_1: "プログラミングを勉強したい場合は、レッスンは必要はありません。多くのコードを書きながら素晴らしい時間を過ごす事だ。"
-#    why_paragraph_2_prefix: "That's what programming is about. It's gotta be fun. Not fun like"
+    why_paragraph_2_prefix: "つまり、プログラミングは楽しくなければならない。中途半端な楽しさでは駄目だ。"
-#    why_paragraph_2_italic: "yay a badge"
+    why_paragraph_2_italic: "やった！バッジ獲得！"
-#    why_paragraph_2_center: "but fun like"
+    why_paragraph_2_center: "見たいな楽しさではなく、次のような楽しさ："
-#    why_paragraph_2_italic_caps: "NO MOM I HAVE TO FINISH THE LEVEL!"
+    why_paragraph_2_italic_caps: "ママ待って、このレベルを終わらせるまで！"
-#    why_paragraph_2_suffix: "That's why CodeCombat is a multiplayer game, not a gamified lesson course. We won't stop until you can't stop--but this time, that's a good thing."
+    why_paragraph_2_suffix: "だからCodeCombatはマルチプレイゲームであり、単なるレッスンコースではありません。私達は貴方が辞めるまで辞めません。-- でも今回は、それは良いことだ。"
-#    why_paragraph_3: "If you're going to get addicted to some game, get addicted to this one and become one of the wizards of the tech age."
+    why_paragraph_3: "ゲームにハマってしまうなら、このゲームに熱中してハイテク時代のウィザードになれ！"
-#    press_title: "Bloggers/Press"
+    press_title: "ブロガー/プレス"
-#    press_paragraph_1_prefix: "Want to write about us? Feel free to download and use all of the resources included in our"
+    press_paragraph_1_prefix: "私達について書きたい？お気軽にダウンロードして、中に含まれた全てのリソースを使用して下さい："
-#    press_paragraph_1_link: "press packet"
+    press_paragraph_1_link: "プレスパケット"
-#    press_paragraph_1_suffix: ". All logos and images may be used without contacting us directly."
+    press_paragraph_1_suffix: "。全てのロゴやイメージは、直接私達に連絡することなく使用することができます。"
-#    team: "Team"
+    team: "開発チーム"
-#    george_title: "Cofounder"
+    george_title: "共同創設者"
-#    george_blurb: "Businesser"
+    george_blurb: "ビジネスの達人"
-#    scott_title: "Cofounder"
+    scott_title: "共同創設者"
-#    scott_blurb: "Reasonable One"
+    scott_blurb: "リーズナブルな奴"
-#    nick_title: "Cofounder"
+    nick_title: "共同創設者"
-#    nick_blurb: "Motivation Guru"
+    nick_blurb: "モチベーションの達人"
-#    michael_title: "Programmer"
+    michael_title: "プログラマー"
-#    michael_blurb: "Sys Admin"
+    michael_blurb: "システム管理者"
-#    matt_title: "Programmer"
+    matt_title: "プログラマー"
-#    matt_blurb: "Bicyclist"
+    matt_blurb: "サイクリスト"
-#    cat_title: "Chief Artisan"
+    cat_title: "チーフアルティザン"
-#    cat_blurb: "Airbender"
+    cat_blurb: "エアベンダー"
-#    josh_title: "Game Designer"
+    josh_title: "ゲームデザイナー"
-#    josh_blurb: "Floor Is Lava"
+    josh_blurb: "床は溶岩"
-#    jose_title: "Music"
+    jose_title: "ミュージック"
-#    jose_blurb: "Taking Off"
+    jose_blurb: "テークオフ"
-#    retrostyle_title: "Illustration"
+    retrostyle_title: "イラスト"
-#    retrostyle_blurb: "RetroStyle Games"
+    retrostyle_blurb: "レトロスタイルのゲーム"
 
 #  teachers:
 #    title: "CodeCombat for Teachers"
@@ -620,23 +621,23 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 
   account_settings:
     title: "アカウント設定"
-    not_logged_in: "設定を変更するにはログインまたはアカウント登録してください。"
+    not_logged_in: "設定を変更するにはログインまたはアカウント登録してください"
     autosave: "変更は自動的にセーブします"
     me_tab: "自分"
     picture_tab: "画像"
-#    delete_account_tab: "Delete Your Account"
+    delete_account_tab: "アカウントの削除"
-#    wrong_email: "Wrong Email"
+    wrong_email: "間違ったメールアドレス"
     upload_picture: "画像をアップロード"
-#    delete_this_account: "Delete this account permanently"
+    delete_this_account: "アカウントを完全削除する"
-#    god_mode: "God Mode"
+    god_mode: "ゴッドモード"
     password_tab: "パスワード"
     emails_tab: "メール"
     admin: "管理者"
     new_password: "新パスワード"
     new_password_verify: "新パスワードを再入力"
-#    type_in_email: "Type in your email to confirm the deletion"
+    type_in_email: "削除を確認するため、メールを入力して下さい"
     email_subscriptions: "ニュースレターの購読"
-#    email_subscriptions_none: "No Email Subscriptions."
+    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "お知らせ"
     email_announcements_description: "CodeCombatの最新のニュースや進展をメールで受け取る"
     email_notifications: "通知"
@@ -667,11 +668,11 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     enter: "エンター"
     escape: "エスケープ"
     shift: "シフト"
-#    run_code: "Run current code."
+    run_code: "現在のコードを実行"
-#    run_real_time: "Run in real time."
+    run_real_time: "リアルタイムで実行"
 #    continue_script: "Continue past current script."
 #    skip_scripts: "Skip past all skippable scripts."
-#    toggle_playback: "Toggle play/pause."
+    toggle_playback: "トグル プレイ/ポーズ"
 #    scrub_playback: "Scrub back and forward through time."
 #    single_scrub_playback: "Scrub back and forward through time by a single frame."
 #    scrub_execution: "Scrub through current spell execution."

app/locale/ko.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     tip_google: "문제가 너무 어렵다구요? 구글로 검색해보세요!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "인벤토리"

app/locale/lt.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/mk-MK.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
 #    inventory_tab: "Inventory"

app/locale/ms.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/nb.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     tip_google: "Har du et problem du ikke kan løse? Google det!"
     tip_adding_evil: "Legger til en klype ondskap!"
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Utstyr"

app/locale/nl-BE.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventaris"

app/locale/nl-NL.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventaris"

app/locale/nn.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/pl.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Ekwipunek"

app/locale/pt-BR.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     tip_google: "Tem um problema que você não pode solucionar? Google!"
     tip_adding_evil: "Adicionando uma pitada de maldade."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventário"

app/locale/pt-PT.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     tip_google: "Tens um problema que não consegues resolver? Vai ao Google!"
     tip_adding_evil: "A acrescentar uma pitada de mal."
     tip_hate_computers: "É o problema das pessoas que acham que odeiam coputadores. O que elas odeiam mesmo são maus programadores. - Larry Niven"
+    tip_open_source_contribute: "Podes ajudar a melhorar o CodeCombat!"
 
   game_menu:
     inventory_tab: "Inventário"
@@ -516,15 +517,15 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 
   about:
     why_codecombat: "Porquê o CodeCombat?"
-    why_paragraph_1: "Se queres aprender a programar, não precisas de aulas. Precisas sim de escrever muito código e passar um bom bocado enquanto o fazes."
+    why_paragraph_1: "Se queres aprender a programar, não precisas de aulas. Precisas é de escrever muito código e divertires-te enquanto o fazes."
-    why_paragraph_2_prefix: "Afinal, é sobre isso que é a programação. Tem de ser divertida. Não divertida do género"
+    why_paragraph_2_prefix: "É sobre isso que é a programação. Tem de ser divertida. Não divertida do género"
-    why_paragraph_2_italic: "yay uma medalha"
+    why_paragraph_2_italic: "'yay, uma medalha'"
-    why_paragraph_2_center: "mas sim divertida do género"
+    why_paragraph_2_center: "mas divertida do género"
-    why_paragraph_2_italic_caps: "NÃO MÃE, TENHO DE ACABAR O NÍVEL!"
+    why_paragraph_2_italic_caps: "'NÃO MÃE, TENHO DE ACABAR O NÍVEL!'"
-    why_paragraph_2_suffix: "É por isso que o CodeCombat é um jogo multijogador, e não um jogo que não passa de um curso com lições. Nós não vamos parar enquanto não puderes parar--mas desta vez, isso é uma coisa boa."
+    why_paragraph_2_suffix: "É por isso que o CodeCombat é um jogo multijogador e não um jogo que não passa de um curso com lições. Nós não vamos parar enquanto não puderes parar--mas desta vez, isso é uma coisa boa."
     why_paragraph_3: "Se vais ficar viciado em algum jogo, vicia-te neste e torna-te num dos feiticeiros da idade da tecnologia."
     press_title: "Bloggers/Imprensa"
-    press_paragraph_1_prefix: "Queres escrever sobre nós? Sente-te à vontade para descarregar e usar todos os recursos incluídos no nosso"
+    press_paragraph_1_prefix: "Queres escrever sobre nós? Sente-te à vontade para descarregares e usares todos os recursos incluídos no nosso"
     press_paragraph_1_link: "pacote de imprensa"
     press_paragraph_1_suffix: ". Todos os logótipos e imagens podem ser usados sem sermos contactados diretamente."
     team: "Equipa"
@@ -543,7 +544,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     josh_title: "Designer de Jogos"
     josh_blurb: "O Chão é Lava"
     jose_title: "Música"
-    jose_blurb: "A Começar"
+    jose_blurb: "Taking Off"
     retrostyle_title: "Ilustração"
     retrostyle_blurb: "RetroStyle Games"
 
@@ -683,12 +684,12 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
 
   community:
     main_title: "Comunidade do CodeCombat"
-    introduction: "Confere abaixo as formas de te envolveres e decide o que te parece melhor. Estamos ansiosos por trabalhar contigo!"
+    introduction: "Confere abaixo as formas de te envolveres e escolhe a que te parece mais divertida. Estamos ansiosos por trabalhar contigo!"
     level_editor_prefix: "Usa o"
-    level_editor_suffix: "do CodeCombat para criares e editares níveis. Os utilizadores já criaram níveis para aulas, amigos, maratonas hacker, estudantes e familiares. Se criar um nível parece intimidante, podes começar por bifurcar um dos nossos!"
+    level_editor_suffix: "do CodeCombat para criares e editares níveis. Os utilizadores já criaram níveis para aulas, amigos, maratonas hacker, estudantes e familiares. Se criar um nível novo parece intimidante, podes começar por bifurcar um dos nossos!"
     thang_editor_prefix: "Chamamos 'thangs' às unidades do jogo. Usa o"
-    thang_editor_suffix: "para modificares a arte do CodeCombat. Dá permição às unidades para lançarem projéteis, altera a direção de uma animação, altera os pontos de vida de uma unidade ou anexa as tuas próprias unidades."
+    thang_editor_suffix: "para modificares a arte do CodeCombat. Faz as unidades lançarem projéteis, altera a direção de uma animação, altera os pontos de vida de uma unidade ou anexa as tuas próprias unidades."
-    article_editor_prefix: "Vês um erro em alguns dos nossos documentos? Queres escrever algumas instruções para as tuas criações? Confere o"
+    article_editor_prefix: "Vês um erro em alguns dos nossos documentos? Queres escrever algumas instruções para as tuas próprias criações? Confere o"
     article_editor_suffix: "e ajuda os jogadores do CodeCombat a obter o máximo do tempo de jogo deles."
     find_us: "Encontra-nos nestes sítios"
     social_blog: "Lê o blog do CodeCombat no Sett"

app/locale/ro.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
 #    inventory_tab: "Inventory"

app/locale/ru.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tip_google: "У вас проблема, которую вы не можете решить? Гуглите!"
     tip_adding_evil: "Добавим щепотку зла."
     tip_hate_computers: "Есть одна вещь в людях, которые думают, что они ненавидят компьютеры. Что они на самом деле ненавидят, так это плохих программистов. - Larry Niven"
+    tip_open_source_contribute: "Вы можете помочь сделать CodeCombat лучше!"
 
   game_menu:
     inventory_tab: "Инвентарь"
@@ -363,7 +364,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     all: "За все время"
     time: "Время"
     damage_taken: "Получено повреждений"
-    damage_dealt: "Насесено повреждений"
+    damage_dealt: "Нанесено повреждений"
     difficulty: "Сложность"
     gold_collected: "Собрано золота"
 
@@ -796,7 +797,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     level_completion: "Выполнение уровня"
     pop_i18n: "Популяризируйте I18N"
     tasks: "Задачи"
-#    clear_storage: "Clear your local changes"
+    clear_storage: "Очистить ваши локальные изменения"
 
   article:
     edit_btn_preview: "Предпросмотр"

app/locale/sk.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Inventár"

app/locale/sl.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/sr.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
 #    inventory_tab: "Inventory"

app/locale/sv.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Utrustning"

app/locale/th.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
 #    inventory_tab: "Inventory"

app/locale/tr.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Envanter"

app/locale/uk.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     tip_google: "Не можеш вирішити задачу? Загугли її!"
     tip_adding_evil: "Додамо дрібку зла."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
     inventory_tab: "Інвентар"

app/locale/ur.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/vi.coffee

@@ -42,37 +42,37 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
   diplomat_suggestion:
     title: "Hãy giúp dịch thuật cho  CodeCombat!" # This shows up when a player switches to a non-English language using the language selector.
     sub_heading: "Chúng tôi cần kỹ năng ngoại ngữ của bạ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."
+    pitch_body: "Chúng tôi ban đầu thiết kế Codecombat dựa trên ngôn ngữ Tiếng Anh, tuy nhiên có rất nhiều bạn trẻ trên toàn thế giới đã tham gia vào trò chơi này. Rất nhiều các bạn rất muốn chơi và có giao diện Tiếng Việt, vì vậy nếu như bạn có thể đọc và viết cả 2 ngôn ngữ xin hãy đăng kí làm thông dịch viên cho chúng tôi."
-    missing_translations: "Until we can translate everything into Vietnamese, you'll see English when Vietnamese isn't available."
+    missing_translations: "Bạn sẽ tiếp tục thấy tiếng Anh cho đến khi chúng tôi kiếm được người dịch tất cả những từ này qua Tiếng Việt."
-    learn_more: "Học làm người thông dịch"
+    learn_more: "Để biết thêm chi tiết làm thông dịch viên"
-#    subscribe_as_diplomat: "Subscribe as a Diplomat"
+    subscribe_as_diplomat: "Tham gia phiên dịch"
 
   play:
     play_as: "Chơi là" # Ladder page
-    spectate: "Nhìn xem" # Ladder page
+    spectate: "Quan sát" # Ladder page
     players: "Những người chơi" # Hover over a level on /play
-    hours_played: "Bao nhiêu tiếng chơi" # Hover over a level on /play
+    hours_played: "Thời gian chơi" # Hover over a level on /play
-#    items: "Items" # Tooltip on item shop button from /play
+    items: "Trang bị" # Tooltip on item shop button from /play
     unlock: "Mua" # For purchasing items and heroes
     confirm: "Xác nhận"
     owned: "Đã có" # For items you own
     locked: "Đã khóa"
     purchasable: "Có thể mua" # For a hero you unlocked but haven't purchased
-#    available: "Available"
+    available: "Có thể dùng"
 #    skills_granted: "Skills Granted" # Property documentation details
     heroes: "Những nhân vật" # Tooltip on hero shop button from /play
     achievements: "Những thành tích" # Tooltip on achievement list button from /play
     account: "Tài khoản" # Tooltip on account button from /play
     settings: "Những tùy chỉnh" # Tooltip on settings button from /play
-#    next: "Next" # Go from choose hero to choose inventory before playing a level
+    next: "Tiếp" # Go from choose hero to choose inventory before playing a level
     change_hero: "Thay đổi nhân vật" # Go back from choose inventory to choose hero
-#    choose_inventory: "Equip Items"
+    choose_inventory: "Đeo Thiết Bị"
     buy_gems: "Mua ngọc"
-#    subscription_required: "Subscription Required"
+    subscription_required: "Cần đăng kí"
     older_campaigns: "Các chiến dịch cũ hơn"
     anonymous: "Người chơi vô danh"
     level_difficulty: "Khó: "
-    campaign_beginner: "Bắt đầu chiến dịch"
+    campaign_beginner: "Chiến dịch chế độ đơn giản"
     awaiting_levels_adventurer_prefix: "Chúng tôi cho ra 5 bàn mới mỗi tuần."
     awaiting_levels_adventurer: "Đăng kí với tư cách là nhà thám hiểm"
     awaiting_levels_adventurer_suffix: "để trở thành những người đầu tiên chơi những bàn mới."
@@ -81,21 +81,21 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     adventurer_prefix: "Bạn có thể nhảy đến bất kỳ cấp độ dưới đây, hoặc nâng dần cấp độ "
     adventurer_forum: "diễn đàn Adventurer"
     adventurer_suffix: "."
-#    campaign_old_beginner: "Old Beginner Campaign"
+    campaign_old_beginner: "Chiến dịch cũ chế độ đơn giản"
-#    campaign_old_beginner_description: "... in which you learn the wizardry of programming."
+    campaign_old_beginner_description: "... nơi bạn học được phép màu của lập trình"
     campaign_dev: "Các cấp độ khó hơn ngẫu nhiên"
-#    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
+    campaign_dev_description: "... nơi vừa giúp bạn làm quen với giao diện trong lúc bạn làm 1 công việc khó hơn ."
     campaign_multiplayer: "Khu vực đa người chơi"
-#    campaign_multiplayer_description: "... in which you code head-to-head against other players."
+    campaign_multiplayer_description: "... nơi mà bạn thử thách với một người chơi khác."
     campaign_player_created: "Những bàn do các người chơi tạo ra"
-#    campaign_player_created_description: "... in which you battle against the creativity of your fellow <a href=\"/contribute/artisan\">Artisan Wizards</a>."
+    campaign_player_created_description: "... nơi bạn thử thách trí sáng tạo đối với <a href=\"/contribute/artisan\">Pháp Sư Tối Cao</a>."
     campaign_classic_algorithms: "Các thuật toán kinh điển"
     campaign_classic_algorithms_description: "... Nơi mà bạn có thể học được những thuật toán phổ biến trong ngành khoa học máy tính ."
 
   share_progress_modal:
     blurb: "Bạn đang tiến bộ rõ rệt đấy! Hãy kể cho ai đó xem bạn đã học được nhiều chừng nào với CodeCombat."
     email_invalid: "Địa chỉ email không hợp lệ."
-#    form_blurb: "Enter their email below and we’ll show them!"
+    form_blurb: "Nhập địa chỉ email của người bạn muốn tìm và chúng tôi sẽ cho bạn thấy!"
     form_label: "Địa chỉ email"
     placeholder: "địa chỉ email"
     title: "Làm tốt lắm, thực tập viên"
@@ -108,9 +108,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     logging_in: "Đang đăng nhập"
     log_out: "Đăng xuất"
     forgot_password: "Quên mật khẩu?"
-#    authenticate_gplus: "Authenticate G+"
+    authenticate_gplus: "Cho phép G+"
-#    load_profile: "Load G+ Profile"
+    load_profile: "Đọc tài khoản G+"
-    finishing: "Đang xong"
+    finishing: "Sắp hoàn tất"
     sign_in_with_facebook: "Đăng nhập với Facebook"
     sign_in_with_gplus: "Đăng nhập với G+"
     signup_switch: "Bạn có muốn tạo tài khoản mới?"
@@ -121,7 +121,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     sign_up: "Đăng ký"
     log_in: "đăng nhập với mật khẩu"
     social_signup: "Hoặc bạn có thể đăng kí qua Facebook hoặc G+:"
-#    required: "You need to log in before you can go that way."
+    required: "Bạn cần phải đăng nhập trước khi đi bạn có thể đi hướng đó."
     login_switch: "Bạn đã có tài khoản rồi ?"
 
   recover:
@@ -146,60 +146,60 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     send: "Gởi đi"
     cancel: "Hủy"
     save: "Lưu"
-#    publish: "Publish"
+    publish: "Chia sẻ"
     create: "Làm mới"
-#    manual: "Manual"
+    manual: "Cẩm nang"
-#    fork: "Fork"
+    fork: "Nĩa"
     play: "Các cấp độ" # When used as an action verb, like "Play next level"
     retry: "Chơi lại"
-#    actions: "Actions"
+    actions: "Các Hành Động"
     info: "Thông tin"
     help: "Giúp đỡ"
-#    watch: "Watch"
+    watch: "Quan Sát"
-#    unwatch: "Unwatch"
+    unwatch: "Ngừng Quan Sát"
-#    submit_patch: "Submit Patch"
+    submit_patch: "Gửi Bản Cập Nhật"
-#    submit_changes: "Submit Changes"
+    submit_changes: "Gửi Những Thay Đổi"
 
   general:
     and: "và"
     name: "Tên"
     date: "Ngày"
-#    body: "Body"
+    body: "Thân"
     version: "Phiên bản"
     pending: "Trong quá trình quyết định"
     accepted: "Đã được chấp nhận"
     rejected: "Không được chấp nhận"
-#    withdrawn: "Withdrawn"
+    withdrawn: "Thu Hồi"
     submitter: "Người gửi"
     submitted: "Đã gửi"
-#    commit_msg: "Commit Message"
+    commit_msg: "Tin nhắn sự thay đổi"
-#    review: "Review"
+    review: "Kiểm Tra"
-#    version_history: "Version History"
+    version_history: "Các phiên bản trong quá khứ"
-#    version_history_for: "Version History for: "
+    version_history_for: "Các phiên bản trong quá khứ cho: "
-#    select_changes: "Select two changes below to see the difference."
+    select_changes: "Chọn 2 sự thay đổi dưới đây để thấy sự khác biệt."
-#    undo_prefix: "Undo"
+    undo_prefix: "Hủy bỏ"
     undo_shortcut: "(Ctrl+Z)"
-#    redo_prefix: "Redo"
+    redo_prefix: "Làm lại"
     redo_shortcut: "(Ctrl+Shift+Z)"
-#    play_preview: "Play preview of current level"
+    play_preview: "Xem trước cách chơi cho màn này"
     result: "Kết quả"
     results: "Những kết quả"
-#    description: "Description"
+    description: "Mô tả"
     or: "hay là"
     subject: "Chủ đề"
     email: "Email"
     password: "Mật khẩu"
     message: "Tin nhắn"
     code: "Code"
-#    ladder: "Ladder"
+    ladder: "Thang Điểm"
     when: "Khi nào"
     opponent: "Đối thủ"
-#    rank: "Rank"
+    rank: "Hạng"
     score: "Điểm"
     win: "Thắng"
     loss: "Thua"
     tie: "Hòa"
-    easy: "Dể"
+    easy: "Dễ̉"
     medium: "Vừa"
     hard: "Khó"
     player: "Người chơi"
@@ -240,9 +240,9 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     timed_out: "Hết giờ"
     failing: "Đang thua"
 #    action_timeline: "Action Timeline"
-    click_to_select: "Kích vào đơn vị để chọn nó."
+    click_to_select: "Kích vào mục tiêu để chọn nó."
-    control_bar_multiplayer: "Đa người chơi"
+    control_bar_multiplayer: "Nhiều người chơi"
-#    control_bar_join_game: "Join Game"
+    control_bar_join_game: "Tham gia"
     reload: "Tải lại"
     reload_title: "Tải lại tất cả mã?"
     reload_really: "Bạn có chắc bạn muốn tải lại bàn này về lúc ban đầu?"
@@ -252,59 +252,59 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     victory_title_suffix: " Xong"
     victory_sign_up: "Đăng kí để lưu tiến trình của bạn"
     victory_sign_up_poke: "Bạn có muốn lưu code của mình lại không ? Hãy tạo một tài khoản miễn phí!"
-#    victory_rate_the_level: "Rate the level: " # Only in old-style levels.
+    victory_rate_the_level: "Đánh giá màn chơi: " # Only in old-style levels.
-#    victory_return_to_ladder: "Return to Ladder"
+    victory_return_to_ladder: "Quay lại bảng điểm"
     victory_play_continue: "Tiếp tục"
     victory_saving_progress: "Đang lưu tiến trình"
-#    victory_go_home: "Go Home" # Only in old-style levels.
+    victory_go_home: "Quay về màn hình chính" # Only in old-style levels.
-#    victory_review: "Tell us more!" # Only in old-style levels.
+    victory_review: "Hãy cho chúng tôi biết thêm" # Only in old-style levels.
-#    victory_hour_of_code_done: "Are You Done?"
+    victory_hour_of_code_done: "Bạn xong chưa?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
+    victory_hour_of_code_done_yes: "Đúng vậy, tôi đã hoàn tất thời gian lập trình!"
-#    victory_experience_gained: "XP Gained"
+    victory_experience_gained: "XP nhận được"
-#    victory_gems_gained: "Gems Gained"
+    victory_gems_gained: "Ngọc nhận được"
-#    guide_title: "Guide"
+    guide_title: "Hướng dẫn"
-#    tome_minion_spells: "Your Minions' Spells" # Only in old-style levels.
+    tome_minion_spells: "Phép của lính của bạn" # Only in old-style levels.
 #    tome_read_only_spells: "Read-Only Spells" # Only in old-style levels.
-#    tome_other_units: "Other Units" # Only in old-style levels.
+    tome_other_units: "Các thứ khác" # Only in old-style levels.
-#    tome_cast_button_run: "Run"
+    tome_cast_button_run: "Chạy"
     tome_cast_button_running: "Đang chạy"
     tome_cast_button_ran: "Đã chạy"
-#    tome_submit_button: "Submit"
+    tome_submit_button: "Gửi"
 #    tome_reload_method: "Reload original code for this method" # Title text for individual method reload button.
 #    tome_select_method: "Select a Method"
 #    tome_see_all_methods: "See all methods you can edit" # Title text for method list selector (shown when there are multiple programmable methdos).
-#    tome_select_a_thang: "Select Someone for "
+    tome_select_a_thang: "Chọn một người để "
-#    tome_available_spells: "Available Spells"
+    tome_available_spells: "Phép có thể dùng"
-#    tome_your_skills: "Your Skills"
+    tome_your_skills: "Những kĩ năng của bạn"
-#    tome_help: "Help"
+    tome_help: "Giúp đỡ"
 #    tome_current_method: "Current Method"
     hud_continue_short: "Tiếp tục"
     code_saved: "Code đã được lưu"
     skip_tutorial: "Bỏ qua (esc)"
     keyboard_shortcuts: "Các phím tắt"
-#    loading_ready: "Ready!"
+    loading_ready: "Sẵn sàng!"
     loading_start: "Bắt đầu bàn này"
     problem_alert_title: "Hãy sửa code của bạn"
-#    problem_alert_help: "Help"
+    problem_alert_help: "Giúp đỡ"
     time_current: "Bây giờ:"
-#    time_total: "Max:"
+    time_total: "Tối đa: "
     time_goto: "Đi đến:"
     infinite_loop_try_again: "Chơi Lại"
     infinite_loop_reset_level: "Chơi Lại"
 #    infinite_loop_comment_out: "Comment Out My Code"
-#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
+    tip_toggle_play: "Bật/tắt chơi/dừng với Ctrl+P."
-#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
+    tip_scrub_shortcut: "Ctrl+[ và Ctrl+] quay lại và chạy nhanh."
-#    tip_guide_exists: "Click the guide, inside game menu (at the top of the page), for useful info."
+    tip_guide_exists: "Chọn bảng hướng dẫn, bên trong game menu (Trên cùng của trang), cho những thông tin hữu ích."
     tip_open_source: "CodeCombat là một sản phẩm mã nguồn mở 100% !"
     tip_beta_launch: "Bản thử nghiệm của CodeCombat được ra mắt vào tháng 10 năm 2013."
-#    tip_think_solution: "Think of the solution, not the problem."
+    tip_think_solution: "Nghĩ về cách giải, chứ không phải câu hỏi."
 #    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
+    tip_error_free: "Có 2 cách để thiết kế 1 phần mềm ko có lỗi; tuy nhiên chỉ có cách thứ 3 là đúng. - Alan Perlis"
 #    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
-#    tip_forums: "Head over to the forums and tell us what you think!"
+    tip_forums: "Hãy đi qua diễn đàn và kể cho chúng tôi nghe về những suy nghĩ của bạn!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
+    tip_baby_coders: "Trong tương lai, ngay cả em bé cũng sẽ trở thành 'Archmages'"
 #    tip_morale_improves: "Loading will continue until morale improves."
-#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
+    tip_all_species: "Chúng tôi tin rằng mọi loài đều xứng đáng có được cơ hội để học lập trình."
 #    tip_reticulating: "Reticulating spines."
 #    tip_harry: "Yer a Wizard, "
 #    tip_great_responsibility: "With great coding skill comes great debug responsibility."
@@ -335,18 +335,19 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     tip_google: "Có vấn đề mà bạn không thể giải quyết ? Hãy sử dụng Google để tìm ra phương án!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
-#    inventory_tab: "Inventory"
+    inventory_tab: "Hành Trang"
-#    save_load_tab: "Save/Load"
+    save_load_tab: "Lưu/đọc"
     options_tab: "Những lựa chọn"
-#    guide_tab: "Guide"
+    guide_tab: "Bảng hướng dẫn"
-#    guide_video_tutorial: "Video Tutorial"
+    guide_video_tutorial: "Video hướng dẫn"
     guide_tips: "Một số mẹo"
     multiplayer_tab: "Đa người chơi"
     auth_tab: "Đăng kí"
     inventory_caption: "Trang bị cho nhân vật của bạn"
-#    choose_hero_caption: "Choose hero, language"
+    choose_hero_caption: "Chọn nhân vật, ngôn ngữ"
 #    save_load_caption: "... and view history"
 #    options_caption: "Configure settings"
 #    guide_caption: "Docs and tips"
@@ -360,15 +361,15 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    top_players: "Top Players by"
     day: "Hôm nay"
     week: "Tuần này"
-#    all: "All-Time"
+    all: "Mọi thời đại"
-#    time: "Time"
+    time: "Thời gian"
 #    damage_taken: "Damage Taken"
 #    damage_dealt: "Damage Dealt"
     difficulty: "Độ khó"
     gold_collected: "Lượng vàng đã thu thập"
 
   inventory:
-#    choose_inventory: "Equip Items"
+    choose_inventory: "Các Thiết Bị Đang Mặc"
     equipped_item: "Đã trang bị"
     required_purchase_title: "Yêu cầu"
 #    available_item: "Available"
@@ -433,8 +434,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     choose_hero: "Hãy chọn một nhân vật"
     programming_language: "Ngôn ngữ lập trình"
     programming_language_description: "Bạn muốn sử dụng ngôn ngữ lập trình nào ?"
-#    default: "Default"
+    default: "Mặc Định"
-#    experimental: "Experimental"
+    experimental: "Thử"
     python_blurb: "Đơn giản nhưng mạnh mẽ, tốt cho những người mới bắt đầu và cả những chuyên gia."
     javascript_blurb: "Ngôn ngữ của thế giới web. (Không giống với Java đâu nhé.)"
     coffeescript_blurb: "Thực ra là JavaScript nhưng với cú pháp tốt hơn."
@@ -442,7 +443,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     lua_blurb: "Ngôn ngữ hay dùng trong làm game."
 #    io_blurb: "Simple but obscure."
     status: "Tình trạng"
-#    hero_type: "Type"
+    hero_type: "Loại"
     weapons: "Vũ khí"
     weapons_warrior: "Kiếm - Tầm ngắn, Không có phép thuật"
     weapons_ranger: "Nỏ, Súng - Tầm xa, Không có phép thuật"
@@ -549,7 +550,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 
   teachers:
     title: "Thông tin về CodeCombat dành cho giáo viên"
-#    preparation_title: "Preparation"
+    preparation_title: "Chuẩn bị"
 #    preparation_1: "CodeCombat is free to play for the core level progression and does not require students to sign up. We encourage teachers to"
 #    preparation_play_campaign: "play through the campaign"
 #    preparation_2: "to try it out, but the only thing you absolutely need to do to be ready is ensure students have access to a computer."
@@ -1118,16 +1119,16 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    canonical: "The English version of this document is the definitive, canonical version. If there are any discrepencies between translations, the English document takes precedence."
 
 #  ladder_prizes:
-#    title: "Tournament Prizes" # This section was for an old tournament and doesn't need new translations now.
+    title: "Các giải thưởng của cuộc thi" # This section was for an old tournament and doesn't need new translations now.
 #    blurb_1: "These prizes will be awarded according to"
-#    blurb_2: "the tournament rules"
+    blurb_2: "Luật của cuộc thi"
 #    blurb_3: "to the top human and ogre players."
 #    blurb_4: "Two teams means double the prizes!"
 #    blurb_5: "(There will be two first place winners, two second-place winners, etc.)"
-#    rank: "Rank"
+    rank: "Hạng"
-#    prizes: "Prizes"
+    prizes: "Giải thưởng"
 #    total_value: "Total Value"
-#    in_cash: "in cash"
+    in_cash: "tiền mặt"
 #    custom_wizard: "Custom CodeCombat Wizard"
 #    custom_avatar: "Custom CodeCombat avatar"
 #    heap: "for six months of \"Startup\" access"
@@ -1147,12 +1148,12 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    not_featured: "Not Featured"
 #    looking_for: "Looking for:"
 #    last_updated: "Last updated:"
-#    contact: "Contact"
+    contact: "Liên lạc"
 #    active: "Looking for interview offers now"
 #    inactive: "Not looking for offers right now"
-#    complete: "complete"
+    complete: "Hoàn tất"
-#    next: "Next"
+    next: "Tiếp"
-#    next_city: "city?"
+    next_city: "Thành phố?"
 #    next_country: "pick your country."
 #    next_name: "name?"
 #    next_short_description: "write a short description."
@@ -1165,10 +1166,10 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    next_photo: "add an optional professional photo."
 #    next_active: "mark yourself open to offers to show up in searches."
 #    example_blog: "Blog"
-#    example_personal_site: "Personal Site"
+    example_personal_site: "Trang cá nhân"
-#    links_header: "Personal Links"
+    links_header: "Đường truyền cá nhân"
 #    links_blurb: "Link any other sites or profiles you want to highlight, like your GitHub, your LinkedIn, or your blog."
-#    links_name: "Link Name"
+    links_name: "Tên đường truyền"
 #    links_name_help: "What are you linking to?"
 #    links_link_blurb: "Link URL"
 #    basics_header: "Update basic info"
@@ -1189,41 +1190,41 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    basics_looking_for_contracting: "Contracting"
 #    basics_looking_for_internship: "Internship"
 #    basics_looking_for_help: "What kind of developer position do you want?"
-#    name_header: "Fill in your name"
+    name_header: "Điền tên của bạn"
 #    name_anonymous: "Anonymous Developer"
 #    name_help: "Name you want employers to see, like 'Nick Winter'."
 #    short_description_header: "Write a short description of yourself"
 #    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
 #    short_description: "Tagline"
 #    short_description_help: "Who are you, and what are you looking for? 140 characters max."
-#    skills_header: "Skills"
+    skills_header: "Những kĩ năng"
 #    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
+    long_description_header: "Mô tả công việc mà bạn muốn làm"
 #    long_description_blurb: "Tell employers how awesome you are and what role you want."
 #    long_description: "Self Description"
 #    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
-#    work_experience: "Work Experience"
+    work_experience: "Kinh Nghiệm làm việc"
 #    work_header: "Chronicle your work history"
 #    work_years: "Years of Experience"
 #    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
 #    work_blurb: "List your relevant work experience, most recent first."
 #    work_employer: "Employer"
 #    work_employer_help: "Name of your employer."
-#    work_role: "Job Title"
+    work_role: "Nghề nghiệp"
 #    work_role_help: "What was your job title or role?"
 #    work_duration: "Duration"
 #    work_duration_help: "When did you hold this gig?"
 #    work_description: "Description"
 #    work_description_help: "What did you do there? (140 chars; optional)"
-#    education: "Education"
+    education: "Trình độ học vấn"
 #    education_header: "Recount your academic ordeals"
 #    education_blurb: "List your academic ordeals."
-#    education_school: "School"
+    education_school: "Trường"
 #    education_school_help: "Name of your school."
-#    education_degree: "Degree"
+    education_degree: "Bằng cấp"
 #    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
+    education_duration: "Ngày"
-#    education_duration_help: "When?"
+    education_duration_help: "Khi nào?"
 #    education_description: "Description"
 #    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
 #    our_notes: "CodeCombat's Notes"
@@ -1234,11 +1235,11 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    projects_blurb: "Highlight your projects to amaze employers."
 #    project_name: "Project Name"
 #    project_name_help: "What was the project called?"
-#    project_description: "Description"
+    project_description: "Mô tả"
 #    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
+    project_picture: "Hình Ảnh"
 #    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
+    project_link: "Link"
 #    project_link_help: "Link to the project."
 #    player_code: "Player Code"
 
@@ -1246,18 +1247,18 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    deprecation_warning_title: "Sorry, CodeCombat is not recruiting right now."
 #    deprecation_warning: "We are focusing on beginner levels instead of finding expert developers for the time being."
 #    hire_developers_not_credentials: "Hire developers, not credentials." # We are not actively recruiting right now, so there's no need to add new translations for the rest of this section.
-#    get_started: "Get Started"
+    get_started: "Bắt Đầu"
 #    already_screened: "We've already technically screened all our candidates"
 #    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
+    filter_visa: "Visa"
 #    filter_visa_yes: "US Authorized"
 #    filter_visa_no: "Not Authorized"
 #    filter_education_top: "Top School"
-#    filter_education_other: "Other"
+    filter_education_other: "Khác"
 #    filter_role_web_developer: "Web Developer"
 #    filter_role_software_developer: "Software Developer"
 #    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
+    filter_experience: "Kinh Nghiệm"
 #    filter_experience_senior: "Senior"
 #    filter_experience_junior: "Junior"
 #    filter_experience_recent_grad: "Recent Grad"
@@ -1272,18 +1273,18 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    pass_screen: "They will pass your technical screen."
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
 #    make_hiring_easier: "Make my hiring easier, please."
-#    what: "What is CodeCombat?"
+    what: "CodeCombat là gì?"
 #    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
 #    cost: "How much do we charge?"
 #    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
-#    candidate_name: "Name"
+    candidate_name: "Tên"
-#    candidate_location: "Location"
+    candidate_location: "Địa điểm"
-#    candidate_looking_for: "Looking For"
+    candidate_looking_for: "Đang tìm kiếm"
-#    candidate_role: "Role"
+    candidate_role: "Vai trò"
 #    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
+    candidate_years_experience: "Năm kinh nghiệm"
-#    candidate_last_updated: "Last Updated"
+    candidate_last_updated: "Lần cuối cập nhật"
-#    candidate_who: "Who"
+    candidate_who: "Người nào"
 #    featured_developers: "Featured Developers"
 #    other_developers: "Other Developers"
 #    inactive_developers: "Inactive Developers"

app/locale/zh-HANS.coffee

@@ -295,7 +295,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_toggle_play: "用 Ctrl+P 来暂停或继续"
     tip_scrub_shortcut: "用 Ctrl+[ 和 Ctrl+] 来倒退和快进。"
     tip_guide_exists: "点击页面上方的指南, 可以获得更多有用信息。"
-    tip_open_source: "CodeCombat是100%开源的！"
+    tip_open_source: "「CodeCombat」是100%开源的！"
     tip_beta_launch: "CodeCombat开始于2013的10月份。"
     tip_think_solution: "思考如何解决, 而不是思考问题。"
     tip_theory_practice: "在理论上，理论和实践之间是没有区别的。但在实践上，它们是有区别的。 - Yogi Berra"
@@ -335,6 +335,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     tip_google: "有问题又不能解决？谷歌搜下就行了！"
     tip_adding_evil: "加入万恶的压力。"
     tip_hate_computers: "那些认为他们讨厌电脑的人，其实他们讨厌的是垃圾程序编写员。- Larry Niven"
+    tip_open_source_contribute: "你可以帮助「CodeCombat」提高！"
 
   game_menu:
     inventory_tab: "道具箱"

app/locale/zh-HANT.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     tip_google: "擁有一個您不能解決的問題? Google 它!"
     tip_adding_evil: "增加一個邪惡之捏."
     tip_hate_computers: "關於自我覺得恨透電腦的那群人. 其實他們真正應該恨的事情是糟糕的程序員. - Larry Niven"
+    tip_open_source_contribute: "你可以幫助「CodeCombat」提高！"
 
   game_menu:
     inventory_tab: "倉庫"

app/locale/zh-WUU-HANS.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
 #  game_menu:
 #    inventory_tab: "Inventory"

app/locale/zh-WUU-HANT.coffee

@@ -335,6 +335,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    tip_google: "Have a problem you can't solve? Google it!"
 #    tip_adding_evil: "Adding a pinch of evil."
 #    tip_hate_computers: "That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven"
+#    tip_open_source_contribute: "You can help CodeCombat improve!"
 
   game_menu:
 #    inventory_tab: "Inventory"

app/styles/play/campaign-view.sass

@@ -575,3 +575,6 @@ body.ipad #campaign-view
   // iPad only supports up to Kithgard Gates for now.
   .campaign-switch
     display: none
+
+body[lang='ru'] .portals h2
+  font-size: 26px

app/styles/play/modal/leaderboard-modal.sass

@@ -106,3 +106,7 @@
     // Wish we could easily do this for Firefox.
     display: none
 
+// Font size tweak for languages that don't fit 
+body[lang='ru']
+  #leaderboard-modal #leaderboard-nav a
+    font-size: 13px

app/templates/community-view.jade

@@ -72,24 +72,23 @@ block content
 
       .logo-row.contribute-classes
 
-        a(href="/contribute/adventurer")
-          img(src="/images/pages/community/adventurer.png")
-
-        a(href="/contribute/ambassador")
-          img(src="/images/pages/community/ambassador.png")
-
         a(href="/contribute/archmage")
           img(src="/images/pages/community/archmage.png")
 
+        a(href="/contribute/artisan")
+          img(src="/images/pages/community/artisan.png")
+
+        a(href="/contribute/adventurer")
+          img(src="/images/pages/community/adventurer.png")
+
         a(href="/contribute/scribe")
           img(src="/images/pages/community/scribe.png")
 
         a(href="/contribute/diplomat")
           img(src="/images/pages/community/diplomat.png")
 
-        a(href="/contribute/artisan")
+        a(href="/contribute/ambassador")
-          img(src="/images/pages/community/artisan.png")
+          img(src="/images/pages/community/ambassador.png")
 
 
   .clearfix
-

app/templates/play/level/level_loading.jade

@@ -71,3 +71,5 @@
     strong.tip.rare(data-i18n='play_level.tip_lines_of_code') Measuring programming progress by lines of code is like measuring aircraft building progress by weight. — Bill Gates
     strong.tip.rare(data-i18n='play_level.tip_adding_evil') Adding a pinch of evil.
     strong.tip.rare(data-i18n='play_level.tip_hate_computers') That's the thing about people who think they hate computers. What they really hate is lousy programmers. - Larry Niven
+    strong.tip.rare
+      a(href="https://github.com/codecombat/codecombat/wiki", data-i18n='play_level.tip_open_source_contribute') You can help CodeCombat improve!

app/views/i18n/I18NEditComponentView.coffee

@@ -22,7 +22,7 @@ module.exports = class I18NEditComponentView extends I18NEditModelView
           @wrapRow "#{propDoc.name} description", ['description'], propDoc.description, i18n[lang]?.description, path, 'markdown'
         if context = propDoc.context
           for key, value of context
-            @wrapRow "#{propDoc.name} context value", ['context', key], value, i18n[lang]?.context[key], path
+            @wrapRow "#{propDoc.name} context value", ['context', key], value, i18n[lang]?.context?[key], path
 
       #- Component return value descriptions
       if i18n = propDoc.returns?.i18n

app/views/i18n/I18NEditLevelView.coffee

@@ -57,4 +57,4 @@ module.exports = class I18NEditLevelView extends I18NEditModelView
           if (i18n = method.i18n) and (context = method.context)
             for key, value of context
               path = ['thangs', thangIndex, 'components', componentIndex, 'config', 'programmableMethods', methodName]
-              @wrapRow 'Code comment', ['context', key], value, i18n[lang]?.context[key], path
+              @wrapRow 'Code comment', ['context', key], value, i18n[lang]?.context?[key], path

server/levels/components/level_component_handler.coffee

@@ -23,6 +23,9 @@ LevelComponentHandler = class LevelComponentHandler extends Handler
     props.push('official') if req.user?.isAdmin()
     props
 
+  hasAccessToDocument: (req, document, method) ->
+    if req.user?.isArtisan() then true else super req, document, method
+
   get: (req, res) ->
     if req.query.view is 'prop-doc-lookup'
       projection = {}

server/queues/scoring.coffee

@@ -115,7 +115,7 @@ findRandomSession = (queryParams, callback) ->
     return callback err, null unless startDate
     now = new Date()
     interval = now - startDate
-    cutoff = new Date now - Math.pow(Math.random(), 3) * interval
+    cutoff = new Date now - Math.pow(Math.random(), 2) * interval
     queryParams.submitDate = $gte: startDate, $lt: cutoff
     selection = 'team totalScore transpiledCode submittedCodeLanguage teamSpells levelID creatorName creator submitDate'
     LevelSession.findOne(queryParams).sort(submitDate: -1).select(selection).lean().exec (err, session) ->