Merge branch 'master' into feature/loading-views

2024-11-27 17:45:40 -05:00 · 2014-04-28 10:10:57 -07:00 · 2014-04-28 10:10:57 -07:00 · 17a0bf54c6
commit 17a0bf54c6
parent fed5d681f2 0de5e715c7
68 changed files with 597 additions and 588 deletions
--- a/app/lib/simulator/Simulator.coffee
+++ b/app/lib/simulator/Simulator.coffee
@ -257,7 +257,7 @@ class SimulationTask
    @spellKeyToTeamMap = {}

  getLevelName: ->
-    levelName =  @rawData.sessions?[0]?.levelID
+    levelName = @rawData.sessions?[0]?.levelID
    return levelName if levelName?
    @throwMalformedTaskError "The level name couldn't be deduced from the task."

--- a/app/lib/surface/CocoSprite.coffee
+++ b/app/lib/surface/CocoSprite.coffee
@ -596,9 +596,11 @@ module.exports = CocoSprite = class CocoSprite extends CocoClass
    # rather than an each-thang-that-shows-gold-per-team thing.
    return if @thang.gold is @lastGold
    gold = Math.floor @thang.gold
+    if @thang.world.age is 0
+      gold = @thang.world.initialTeamGold[@thang.team].gold
    return if gold is @lastGold
    @lastGold = gold
-    Backbone.Mediator.publish 'surface:gold-changed', {team: @thang.team, gold: gold}
+    Backbone.Mediator.publish 'surface:gold-changed', {team: @thang.team, gold: gold, goldEarned: Math.floor(@thang.goldEarned)}

  playSounds: (withDelay=true, volume=1.0) ->
    for event in @thang.currentEvents ? []
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "български език", englishDescri

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/de-AT.coffee
+++ b/app/locale/de-AT.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/de-CH.coffee
+++ b/app/locale/de-CH.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Deutsch (Schweiz)", englishDescription: "Ge

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/de-DE.coffee
+++ b/app/locale/de-DE.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/de.coffee
+++ b/app/locale/de.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Deutsch", englishDescription: "German", tra

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "ελληνικά", englishDescription: "Gre

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/en-AU.coffee
+++ b/app/locale/en-AU.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "English (AU)", englishDescription: "English

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@ -193,7 +193,7 @@

  employers:
    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-    contact_george: "Contact George to see our candidates"
+    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "We currently have "
    candidates_count_many: "many"
    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@ -3,18 +3,18 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    loading: "Cargando..."
    saving: "Guardando..."
    sending: "Enviando..."
-#    send: "Send"
+    send: "Enviar"
    cancel: "Cancelar"
    save: "Guardar"
-#    publish: "Publish"
+    publish: "Publicar"
    create: "Crear"
    delay_1_sec: "1 segundo"
    delay_3_sec: "3 segundos"
    delay_5_sec: "5 segundos"
    manual: "Manual"
-#    fork: "Fork"
-#    play: "Play"
-#    retry: "Retry"
+    fork: "Bifurcar"
+    play: "Jugar"
+    retry: "Reintentar"
 #    watch: "Watch"
 #    unwatch: "Unwatch"
 #    submit_patch: "Submit Patch"
@ -52,10 +52,10 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
  versions:
    save_version_title: "Guardar nueva versión"
    new_major_version: "Nueva Gran Versión"
-#    cla_prefix: "To save changes, first you must agree to our"
-#    cla_url: "CLA"
-#    cla_suffix: "."
-#    cla_agree: "I AGREE"
+    cla_prefix: "Para guardar los cambios, primero debes estar de acuerdo con nuestro"
+    cla_url: "CLA"
+    cla_suffix: "."
+    cla_agree: "ACEPTO"

  login:
    sign_up: "Crear Cuenta"
@ -77,7 +77,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    creating: "Creando Cuenta..."
    sign_up: "Registrarse"
    log_in: "Inicia sesión con tu contraseña"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
+    social_signup: "O, puedes conectarte a través de Facebook o G+:"

  home:
    slogan: "Aprende a programar en JavaScript jugando"
@ -85,11 +85,11 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    no_mobile: "¡CodeCombat no fue diseñado para dispositivos móviles y quizás no funcione!"
    play: "Jugar"
    old_browser: "¡Oh! ¡Oh! Tu navegador es muy antiguo para correr CodeCombat. ¡Lo Sentimos!"
-#    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"
+    old_browser_suffix: "Puedes probar de todas formas, pero probablemente no funcione."
+    campaign: "Campaña"
+    for_beginners: "Para Principiantes"
+    multiplayer: "Multijugador"
+    for_developers: "Para Desarrolladores"

  play:
    choose_your_level: "Elige tu nivel"
@ -115,11 +115,11 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    contribute_page: "página de contribución"
    contribute_suffix: "!"
    forum_prefix: "Para cualquier cosa pública, por favor prueba "
-    forum_page: "nuestro foro"
+    forum_page: "nuestro foro "
    forum_suffix: "en su lugar."
    send: "Enviar Comentario"
-#    contact_candidate: "Contact Candidate"
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 18% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns."
+    contact_candidate: "Contacta un Candidato"
+    recruitment_reminder: "Usa este formulario para llegar a los candidadtos que estés interesado en entrevistar. Recuerda que CodeCombat cobra 18% del primer año de salario. Este honorario se debe a la contratación del empleado y reembolsable por 90 days si el empleado no permanece contratado. Tiempo partcial, remoto, y empleados por contrato son gratiso, como así también internos."

  diplomat_suggestion:
    title: "¡Ayuda a traducir CodeCombat!"
@ -132,16 +132,16 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
  wizard_settings:
    title: "Configuración del mago"
    customize_avatar: "Personaliza tu avatar"
-#    active: "Active"
-#    color: "Color"
-#    group: "Group"
+    active: "Activo"
+    color: "Color"
+    group: "Grupo"
    clothes: "Ropa"
-#    trim: "Trim"
+    trim: "Recortar"
    cloud: "Nube"
-#    team: "Team"
-#    spell: "Spell"
+    team: "Equipo"
+    spell: "Hechizo"
    boots: "Botas"
-#    hue: "Hue"
+    hue: "Matiz"
    saturation: "Saturación"
    lightness: "Brillo"

@ -154,7 +154,7 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    wizard_tab: "Hechicero"
    password_tab: "Contraseña"
    emails_tab: "Correos"
-#    admin: "Admin"
+    admin: "Admin"
    wizard_color: "Color de Ropas del Hechicero"
    new_password: "Nueva Contraseña"
    new_password_verify: "Verificar"
@ -171,9 +171,9 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    error_saving: "Error al Guardar"
    saved: "Cambios Guardados"
    password_mismatch: "La contraseña no coincide."
-#    job_profile: "Job Profile"
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
+    job_profile: "Perfil de Trabajo"
+    job_profile_approved: "Tu perfil de trabajo ha sido aprobado por CodeCombat. Los empleadores podrán verlo hasta que lo marques como inactivo o permanezca sin cambios por cuatro semanas."
+    job_profile_explanation: "¡Hola! Llena esto, y te contactaremos acerca de encontrar un trabajo como desarrollador de software."
 #    sample_profile: "See a sample profile"
 #    view_profile: "View Your Profile"

@ -181,29 +181,29 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    edit_settings: "Editar Configuración"
    profile_for_prefix: "Perfil para "
    profile_for_suffix: ""
-#    approved: "Approved"
-#    not_approved: "Not Approved"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    work_experience: "Work Experience"
-#    education: "Education"
-#    our_notes: "Our Notes"
-#    projects: "Projects"
+    approved: "Aprobado"
+    not_approved: "No Aprobado"
+    looking_for: "Buscando:"
+    last_updated: "Última Actualización:"
+    contact: "Contacto"
+    work_experience: "Experiencia de Trabajo"
+    education: "Educación"
+    our_notes: "Nuestras Notas"
+    projects: "Proyectos"

-#  employers:
-#    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
-#    candidates_count_prefix: "We currently have "
-#    candidates_count_many: "many"
-#    candidates_count_suffix: "highly skilled and vetted developers looking for work."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
+  employers:
+    want_to_hire_our_players: "¿Quiere contratar a nuestros jugadores expertos de CodeCombat?"
+#    see_candidates: "Click here to see our candidates"
+    candidates_count_prefix: "Actualmente tenemos "
+    candidates_count_many: "muchos"
+    candidates_count_suffix: "desarrolladores altamente cualificados y examinados en busca de trabajo."
+    candidate_name: "Nombre"
+    candidate_location: "Ubicación"
+    candidate_looking_for: "Buscando"
+    candidate_role: "Rol"
+    candidate_top_skills: "Mejores Habilidades"
+    candidate_years_experience: "Años de Exp"
+    candidate_last_updated: "Última Actualización"
 #    candidate_approved: "Us?"
 #    candidate_active: "Them?"

@ -227,9 +227,9 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    victory_sign_up: "Registrate para recibir actualizaciones"
    victory_sign_up_poke: "¿Quieres recibir las ultimas noticias por correo? ¡Crea una cuenta gratuita y te mantendremos informado!"
    victory_rate_the_level: "Valora el nivel: "
-#    victory_rank_my_game: "Rank My Game"
-#    victory_ranking_game: "Submitting..."
-#    victory_return_to_ladder: "Return to Ladder"
+    victory_rank_my_game: "Clasifique Mi Juego"
+    victory_ranking_game: "Enviando..."
+    victory_return_to_ladder: "Volver a la escalera"
    victory_play_next_level: "Jugar Próximo Nivel"
    victory_go_home: "Ir al Inicio"
    victory_review: "¡Cuéntanos más!"
@ -252,67 +252,67 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
    tome_select_a_thang: "Selecciona Alguien para "
    tome_available_spells: "Hechizos Disponibles"
    hud_continue: "Continuar (presionar shift+space)"
-#    spell_saved: "Spell Saved"
-#    skip_tutorial: "Skip (esc)"
-#    editor_config: "Editor Config"
-#    editor_config_title: "Editor Configuration"
-#    editor_config_language_label: "Programming Language"
-#    editor_config_language_description: "Define the programming language you want to code in."
-#    editor_config_keybindings_label: "Key Bindings"
-#    editor_config_keybindings_default: "Default (Ace)"
-#    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
-#    editor_config_invisibles_label: "Show Invisibles"
-#    editor_config_invisibles_description: "Displays invisibles such as spaces or tabs."
-#    editor_config_indentguides_label: "Show Indent Guides"
-#    editor_config_indentguides_description: "Displays vertical lines to see indentation better."
-#    editor_config_behaviors_label: "Smart Behaviors"
-#    editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes."
-#    loading_ready: "Ready!"
-#    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
-#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
-#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
-#    tip_guide_exists: "Click the guide at the top of the page for useful info."
-#    tip_open_source: "CodeCombat is 100% open source!"
-#    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
-#    tip_js_beginning: "JavaScript is just the beginning."
-#    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
-#    think_solution: "Think of the solution, not the problem."
-#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
-#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
-#    tip_forums: "Head over to the forums and tell us what you think!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
-#    tip_morale_improves: "Loading will continue until morale improves."
-#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
-#    tip_reticulating: "Reticulating spines."
-#    tip_harry: "Yer a Wizard, "
-#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
-#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
-#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
-#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
-#    tip_talk_is_cheap: "Talk is cheap. Show me the code. - Linus Torvalds"
-#    tip_first_language: "The most disastrous thing that you can ever learn is your first programming language. - Alan Kay"
-#    time_current: "Now:"
-#    time_total: "Max:"
-#    time_goto: "Go to:"
-#    infinite_loop_try_again: "Try Again"
-#    infinite_loop_reset_level: "Reset Level"
-#    infinite_loop_comment_out: "Comment Out My Code"
+    spell_saved: "Hechizo Guardado"
+    skip_tutorial: "Saltar (esc)"
+    editor_config: "Config. de Editor"
+    editor_config_title: "Configuración del Editor"
+    editor_config_language_label: "Lenguaje de Programación"
+    editor_config_language_description: "Define el lenguaje de programación en el que desees hacer código."
+    editor_config_keybindings_label: "Atajos de Teclado"
+    editor_config_keybindings_default: "Default (As)"
+    editor_config_keybindings_description: "Añade atajos adicionales conocidos de los editores comunes."
+    editor_config_invisibles_label: "Mostrar Invisibles"
+    editor_config_invisibles_description: "Visualiza invisibles tales como espacios o tabulaciones."
+    editor_config_indentguides_label: "Mostrar guías de indentación"
+    editor_config_indentguides_description: "Visualiza líneas verticales para ver mejor la indentación."
+    editor_config_behaviors_label: "Comportamientos Inteligentes"
+    editor_config_behaviors_description: "Autocompleta corchetes, llaves y comillas."
+    loading_ready: "¡Listo!"
+    tip_insert_positions: "Shift+Clic un punto en el mapa para insertarlo en el editor de hechizos."
+    tip_toggle_play: "Activa jugar/pausa con Ctrl+P."
+    tip_scrub_shortcut: "Ctrl+[ y Ctrl+] rebobina y avance rápido."
+    tip_guide_exists: "Clique la guía en la parte superior de la página para obtener información útil"
+    tip_open_source: "¡CodeCombat es 100% código abierto!"
+    tip_beta_launch: "CodeCombat lanzó su beta en Octubre del 2013."
+    tip_js_beginning: "JavaScript es sólo el principio."
+    tip_autocast_setting: "Ajusta la configuración de autoinvocación cliqueando el engranaje en el botón de invocación."
+    think_solution: "Piensa en la solución, no en el problema."
+    tip_theory_practice: "En teoría, no hay diferencia entre la teoría y la práctica. Pero en la práctica, si la hay. - Yogi Berra"
+    tip_error_free: "Hay dos formas de escribir programas libres de errores; sólo la tercera funciona. - Alan Perlis"
+    tip_debugging_program: "Si depurar es el proceso de remover errores, entonces programar debe ser el proceso de colocarlos. - Edsger W. Dijkstra"
+    tip_forums: "¡Dirígite a los foros y dinos lo que piensas!"
+    tip_baby_coders: "En el futuro, incluso los bebés serán Archimagos."
+    tip_morale_improves: "La carga continuará hasta que la moral mejore."
+    tip_all_species: "Creemos en la igualdad de oportunidades para aprender a programar para todas las especies."
+    tip_reticulating: "Espinas reticulantes."
+    tip_harry: "Eres un Hechicero, "
+    tip_great_responsibility: "Con una gran habilidad de hacer código viene una gran responsabilidad de depuración."
+    tip_munchkin: "Si no comes tus verduras, un enano vendrá por ti mientras estés dormido."
+    tip_binary: "Sólo hay 10 tipos de personas en el mundo: aquellas que entienden binario y las que no."
+    tip_commitment_yoda: "Un programador debe tener el compromiso más profundo, la mente más seria. ~ Yoda"
+    tip_no_try: "Haz. O no hagas. No hay intento. - Yoda"
+    tip_patience: "Paciencia debes tener, joven Padawan. - Yoda"
+    tip_documented_bug: "Un error documentad no es un error; es una característica."
+    tip_impossible: "Siempre parece imposible hasta que se hace. - Nelson Mandela"
+    tip_talk_is_cheap: "Hablar es barato. Muestrame el código. - Linus Torvalds"
+    tip_first_language: "La cosa más desastroza que puedes aprender es tu primer lenguaje de programación. - Alan Kay"
+    time_current: "Ahora:"
+    time_total: "Max:"
+    time_goto: "Ir a:"
+    infinite_loop_try_again: "Intentar nuevamente"
+    infinite_loop_reset_level: "Reiniciar Nivel"
+    infinite_loop_comment_out: "Comente Mi Código"

-#  admin:
-#    av_title: "Admin Views"
-#    av_entities_sub_title: "Entities"
-#    av_entities_users_url: "Users"
-#    av_entities_active_instances_url: "Active Instances"
-#    av_other_sub_title: "Other"
-#    av_other_debug_base_url: "Base (for debugging base.jade)"
-#    u_title: "User List"
-#    lg_title: "Latest Games"
-#    clas: "CLAs"
+  admin:
+    av_title: "Vistas de Admin"
+    av_entities_sub_title: "Entidades"
+    av_entities_users_url: "Usuarios"
+    av_entities_active_instances_url: "Instancias Activas"
+    av_other_sub_title: "Otro"
+    av_other_debug_base_url: "Base (para depurar base.jade)"
+    u_title: "Lista de Usuarios"
+    lg_title: "Últimos Juegos"
+    clas: "CLAs"

 #  community:
 #    level_editor: "Level Editor"
@ -380,39 +380,39 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    level_search_title: "Search Levels Here"
 #    read_only_warning2: "Note: you can't save any edits here, because you're not logged in."

-#  article:
-#    edit_btn_preview: "Preview"
-#    edit_article_title: "Edit Article"
+  article:
+    edit_btn_preview: "Vista previa"
+    edit_article_title: "Editar Artículo"

-#  general:
-#    and: "and"
-#    name: "Name"
-#    body: "Body"
-#    version: "Version"
-#    commit_msg: "Commit Message"
-#    version_history: "Version History"
-#    version_history_for: "Version History for: "
-#    result: "Result"
-#    results: "Results"
-#    description: "Description"
-#    or: "or"
-#    subject: "Subject"
-#    email: "Email"
-#    password: "Password"
-#    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"
-#    player: "Player"
+  general:
+    and: "y"
+    name: "Nombre"
+    body: "Cuerpo"
+    version: "Versión"
+    commit_msg: "Enviar mensaje"
+    version_history: "Historial de Versiones"
+    version_history_for: "Historial de Versiones para: "
+    result: "Resultado"
+    results: "Resultados"
+    description: "Descripción"
+    or: "o"
+    subject: "Asunto"
+    email: "Email"
+    password: "Contraseña"
+    message: "Mensaje"
+    code: "Código"
+    ladder: "Escalera"
+    when: "Cuando"
+    opponent: "Oponente"
+    rank: "Posición"
+    score: "Puntuación"
+    win: "Ganada"
+    loss: "Perdida"
+    tie: "Empate"
+    easy: "Fácil"
+    medium: "Medio"
+    hard: "Difícil"
+    player: "Jugador"

 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
@ -592,97 +592,97 @@ module.exports = nativeDescription: "español (América Latina)", englishDescrip
 #    translating_diplomats: "Our Translating Diplomats:"
 #    helpful_ambassadors: "Our Helpful Ambassadors:"

-#  classes:
-#    archmage_title: "Archmage"
-#    archmage_title_description: "(Coder)"
-#    artisan_title: "Artisan"
-#    artisan_title_description: "(Level Builder)"
-#    adventurer_title: "Adventurer"
-#    adventurer_title_description: "(Level Playtester)"
-#    scribe_title: "Scribe"
-#    scribe_title_description: "(Article Editor)"
-#    diplomat_title: "Diplomat"
-#    diplomat_title_description: "(Translator)"
-#    ambassador_title: "Ambassador"
-#    ambassador_title_description: "(Support)"
-#    counselor_title: "Counselor"
-#    counselor_title_description: "(Expert/Teacher)"
+  classes:
+    archmage_title: "Archimago"
+    archmage_title_description: "(Desarrollador)"
+    artisan_title: "Artesano"
+    artisan_title_description: "(Constructor de Niveles)"
+    adventurer_title: "Aventurero"
+    adventurer_title_description: "(Probador de Niveles)"
+    scribe_title: "Escriba"
+    scribe_title_description: "(Editor de Artículos)"
+    diplomat_title: "Diplomado"
+    diplomat_title_description: "(Traductor)"
+    ambassador_title: "Embajador"
+    ambassador_title_description: "(Soporte)"
+    counselor_title: "Consejero"
+    counselor_title_description: "(Experto/Maestro)"

-#  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"
-#    games_simulated_by: "Games simulated by you:"
-#    games_simulated_for: "Games simulated for you:"
-#    games_simulated: "Games simulated"
-#    games_played: "Games played"
-#    ratio: "Ratio"
-#    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: "Por favor inicia sesión antes de jugar una partida de escalera."
+    my_matches: "Mis Partidas"
+    simulate: "Simular"
+    simulation_explanation: "¡Simulando tus juegos puedes mejorar tu posición más rápido!"
+    simulate_games: "¡Simular Juegos!"
+    simulate_all: "REINICIAR Y SIMULAR JUEGOS"
+    games_simulated_by: "Juegos simulados por ti:"
+    games_simulated_for: "Juegos simulados para ti:"
+    games_simulated: "Juegos simulados"
+    games_played: "Juegos jugados"
+    ratio: "Proporción"
+    leaderboard: "Posiciones"
+    battle_as: "Combate como "
+    summary_your: "Tus "
+    summary_matches: "Partidas - "
+    summary_wins: " Ganadas, "
+    summary_losses: " Perdidas"
+    rank_no_code: "Sin Código Nuevo para Clasificar"
+    rank_my_game: "¡Clasifica Mi Juego!"
+    rank_submitting: "Enviando..."
+    rank_submitted: "Enviado para Clasificación"
+    rank_failed: "Fallo al Clasificar"
+    rank_being_ranked: "Juego Siendo Clasificado"
+    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."
+    choose_opponent: "Escoge un Oponente"
+    tutorial_play: "Juega el Tutorial"
+    tutorial_recommended: "Recomendado si nunca has jugado antes"
+    tutorial_skip: "Saltar Tutorial"
+    tutorial_not_sure: "¿No estás seguro de que sucede?"
+    tutorial_play_first: "Juega el Tutorial primero."
+    simple_ai: "IA Simple"
+    warmup: "Calentamiento"
+    vs: "VS"

-#  multiplayer_launch:
-#    introducing_dungeon_arena: "Introducing Dungeon Arena"
-#    new_way: "The new way to compete with code."
-#    to_battle: "To Battle, Developers!"
-#    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
-#    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."
-#    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"
+  multiplayer_launch:
+    introducing_dungeon_arena: "Introduciendo la Arena de Calabozo"
+    new_way: "La nueva forma de competir con código."
+    to_battle: "¡A la batalla, desarrolladores!"
+    modern_day_sorcerer: "¿Sabes cómo escribir código? Eso es rudo. ¡Eres un hechicero moderno! ¿No es tiempo ya de que uses tus poderes mágicos de código para comandar a tus secuaces en combate épico? Y no estamos hablando de robots aquí."
+    arenas_are_here: "Las arenas cara-a-cara de CodeCombat están aquí."
+    ladder_explanation: "Elige tus héroes, encanta tus ejercitos humanos u ogros, y escala tu camino sobre compañeros Hechiceros derrotados para alcanzar la cima de la escalera–luego reta a tus amigos en nuestras gloriosas, asincrónicas arenas de código multijugador. Si te sientes creativo, incluso puedes"
+    fork_our_arenas: "bifurcar nuestras arenas"
+    create_worlds: "y crear tus propios mundos."
+    javascript_rusty: "¿Un poco oxidado tu JavaScript? No te preocupes; hay un"
+    tutorial: "tutorial"
+    new_to_programming: ". ¿Nuevo en la programación? Empieza nuestra campaña de principiantes para mejorar tu habilidad."
+    so_ready: "Estoy Listo para Esto"

-#  loading_error:
-#    could_not_load: "Error loading from server"
-#    connection_failure: "Connection failed."
-#    unauthorized: "You need to be signed in. Do you have cookies disabled?"
-#    forbidden: "You do not have the permissions."
-#    not_found: "Not found."
-#    not_allowed: "Method not allowed."
-#    timeout: "Server timeout."
-#    conflict: "Resource conflict."
-#    bad_input: "Bad input."
-#    server_error: "Server error."
-#    unknown: "Unknown error."
+  loading_error:
+    could_not_load: "Error cargando del servidor"
+    connection_failure: "Fallo de conexión."
+    unauthorized: "Necesitas acceder. ¿Tienes desabilitadas las cookies?"
+    forbidden: "No tienes los permisos."
+    not_found: "No encontrado."
+    not_allowed: "Método no permitido."
+    timeout: "Expiró el tiempo del servidor."
+    conflict: "Conflicto de recurso."
+    bad_input: "Mala entrada."
+    server_error: "Error de servidor."
+    unknown: "Error desconocido."

-#  resources:
-#    your_sessions: "Your Sessions"
-#    level: "Level"
-#    social_network_apis: "Social Network APIs"
-#    facebook_status: "Facebook Status"
-#    facebook_friends: "Facebook Friends"
-#    facebook_friend_sessions: "Facebook Friend Sessions"
-#    gplus_friends: "G+ Friends"
-#    gplus_friend_sessions: "G+ Friend Sessions"
-#    leaderboard: "Leaderboard"
-#    user_schema: "User Schema"
-#    user_profile: "User Profile"
-#    patches: "Patches"
-#    model: "Model"
+  resources:
+    your_sessions: "Tus sesiones"
+    level: "Nivel"
+    social_network_apis: "APIs de Redes Sociales"
+    facebook_status: "Estado de Facebook"
+    facebook_friends: "Amigos de Facebook"
+    facebook_friend_sessions: "Sesiones de Amigos de Facebook"
+    gplus_friends: "Amigos de G+"
+    gplus_friend_sessions: "Sesiones de Amigos de G+"
+    leaderboard: "Clasificación"
+    user_schema: "Esquema de Usuario"
+    user_profile: "Perfil de Usuario"
+    patches: "Parches"
+    model: "Modelo"
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis

  employers:
    want_to_hire_our_players: "¿Quieres contratar jugadores expertos de CodeCombat?"
-    contact_george: "Contacta con George para ver a nuestros candidatos"
+#    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "Actualmente tenemos "
    candidates_count_many: "muchos"
    candidates_count_suffix: "desarrolladores altamente cualificados, y examinados atentamente, buscando trabajo."
--- a/app/locale/es.coffee
+++ b/app/locale/es.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@ -3,29 +3,29 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    loading: "Chargement..."
    saving: "Sauvegarde..."
    sending: "Envoi..."
-#    send: "Send"
+    send: "Envoyer"
    cancel: "Annuler"
    save: "Sauvegarder"
-#    publish: "Publish"
-#    create: "Create"
+    publish: "Publier"
+    create: "Creer"
    delay_1_sec: "1 seconde"
    delay_3_sec: "3 secondes"
    delay_5_sec: "5 secondes"
    manual: "Manuel"
    fork: "Fork"
    play: "Jouer"
-#    retry: "Retry"
-#    watch: "Watch"
+    retry: "Reessayer"
+    watch: "Regarder"
 #    unwatch: "Unwatch"
 #    submit_patch: "Submit Patch"

-#  units:
-#    second: "second"
-#    seconds: "seconds"
-#    minute: "minute"
-#    minutes: "minutes"
-#    hour: "hour"
-#    hours: "hours"
+  units:
+    second: "seconde"
+    seconds: "secondes"
+    minute: "minute"
+    minutes: "minutes"
+    hour: "heure"
+    hours: "heures"

  modal:
    close: "Fermer"
@ -39,7 +39,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    editor: "Éditeur"
    blog: "Blog"
    forum: "Forum"
-#    account: "Account"
+    account: "Compte"
    admin: "Admin"
    home: "Accueil"
    contribute: "Contribuer"
@ -60,7 +60,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
  login:
    sign_up: "Créer un compte"
    log_in: "Connexion"
-#    logging_in: "Logging In"
+    logging_in: "Connecter"
    log_out: "Déconnexion"
    recover: "récupérer son compte"

@ -77,7 +77,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    creating: "Création du compte en cours..."
    sign_up: "S'abonner"
    log_in: "se connecter avec votre mot de passe"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
+    social_signup: "Ou, vous pouvez vous identifier avec Facecook ou G+:"

  home:
    slogan: "Apprenez à coder en JavaScript tout en jouant"
@ -133,12 +133,12 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    title: "Paramètres du Magicien"
    customize_avatar: "Personnaliser votre avatar"
 #    active: "Active"
-#    color: "Color"
-#    group: "Group"
+    color: "Couleur"
+    group: "Groupe"
    clothes: "Vêtements"
    trim: "Tailleur"
    cloud: "Nuage"
-#    team: "Team"
+    team: "Equipe"
    spell: "Sort"
    boots: "Bottes"
    hue: "Teinte"
@ -175,7 +175,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
 #    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
+    view_profile: "Voir votre profile"

  account_profile:
    edit_settings: "Éditer les préférences"
@ -183,17 +183,17 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    profile_for_suffix: ""
 #    approved: "Approved"
 #    not_approved: "Not Approved"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
+    looking_for: "à la recherche de:"
+    last_updated: "Last Mise à jour:"
 #    contact: "Contact"
-#    work_experience: "Work Experience"
+    work_experience: "Experience de travail"
 #    education: "Education"
 #    our_notes: "Our Notes"
 #    projects: "Projects"

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
@ -256,8 +256,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    skip_tutorial: "Passer (esc)"
    editor_config: "Config de l'éditeur"
    editor_config_title: "Configuration de l'éditeur"
-#    editor_config_language_label: "Programming Language"
-#    editor_config_language_description: "Define the programming language you want to code in."
+    editor_config_language_label: "Langage de programmation"
+    editor_config_language_description: "Définissez le langage de programmation avec lequel vous voulez coder."
    editor_config_keybindings_label: "Raccourcis clavier"
    editor_config_keybindings_default: "Par défault (Ace)"
    editor_config_keybindings_description: "Ajouter de nouveaux raccourcis connus depuis l'éditeur commun."
@ -267,21 +267,21 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    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."
-#    loading_ready: "Ready!"
+    loading_ready: "Pret!"
 #    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
-#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
+    tip_toggle_play: "Jouer/Pause avec Ctrl+P."
 #    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
 #    tip_guide_exists: "Click the guide at the top of the page for useful info."
-#    tip_open_source: "CodeCombat is 100% open source!"
+    tip_open_source: "CodeCombat est 100% open source!"
 #    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
-#    tip_js_beginning: "JavaScript is just the beginning."
+    tip_js_beginning: "JavaScript n'est que le commencement."
 #    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
-#    think_solution: "Think of the solution, not the problem."
-#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
+    think_solution: "Reflechissez a propos de la solution et non du problème."
+    tip_theory_practice: "En théorie, il n'y a pas de différence entre la théorie et la pratique. Mais en pratique il y en a. - Yogi Berra"
 #    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
-#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
+    tip_debugging_program: "Si débugger est l'art de corriger les bugs, alors programmer est l'art d'en créer. . - Edsger W. Dijkstra"
 #    tip_forums: "Head over to the forums and tell us what you think!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
+    tip_baby_coders: "Dans le futur, même les bébés seront des archimages."
 #    tip_morale_improves: "Loading will continue until morale improves."
 #    tip_all_species: "We believe in equal opportunities to learn programming for all species."
 #    tip_reticulating: "Reticulating spines."
@ -296,12 +296,12 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
 #    tip_talk_is_cheap: "Talk is cheap. Show me the code. - Linus Torvalds"
 #    tip_first_language: "The most disastrous thing that you can ever learn is your first programming language. - Alan Kay"
-#    time_current: "Now:"
+    time_current: "Maintenant:"
 #    time_total: "Max:"
 #    time_goto: "Go to:"
-#    infinite_loop_try_again: "Try Again"
-#    infinite_loop_reset_level: "Reset Level"
-#    infinite_loop_comment_out: "Comment Out My Code"
+    infinite_loop_try_again: "Reessayer"
+    infinite_loop_reset_level: "Redemarrer le niveau"
+    infinite_loop_comment_out: "Supprimez les commentaire de mon code"

  admin:
    av_title: "Vues d'administrateurs"
@ -339,7 +339,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    revert_models: "Annuler les modèles"
 #    fork_title: "Fork New Version"
 #    fork_creating: "Creating Fork..."
-#    more: "More"
+    more: "Plus"
 #    wiki: "Wiki"
 #    live_chat: "Live Chat"
    level_some_options: "Quelques options?"
@ -349,11 +349,11 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    level_tab_components: "Composants"
    level_tab_systems: "Systèmes"
    level_tab_thangs_title: "Thangs actuels"
-#    level_tab_thangs_all: "All"
+    level_tab_thangs_all: "Tout"
    level_tab_thangs_conditions: "Conditions de départ"
    level_tab_thangs_add: "ajouter des Thangs"
-#    delete: "Delete"
-#    duplicate: "Duplicate"
+    delete: "Supprimer"
+    duplicate: "Dupliquer"
    level_settings_title: "Paramètres"
    level_component_tab_title: "Composants actuels"
    level_component_btn_new: "Créer un nouveau composant"
@ -372,13 +372,13 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
    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"
-#    new_article_title_signup: "Sign Up to Create a New Article"
+    new_article_title_signup: "Identifiez vous pour creer un nouvel article"
 #    new_thang_title_signup: "Sign Up to Create a New Thang Type"
-#    new_level_title_signup: "Sign Up to Create a New Level"
+    new_level_title_signup: "Identifiez vous pour 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"
-#    read_only_warning2: "Note: you can't save any edits here, because you're not logged in."
+    read_only_warning2: "Note: vous ne pouvez sauvegarder aucune édition, car vous n'êtes pas identifié."

  article:
    edit_btn_preview: "Prévisualiser"
@ -500,7 +500,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t

  contribute:
    page_title: "Contribution"
-#    character_classes_title: "Character Classes"
+    character_classes_title: "Classes du personnage"
    introduction_desc_intro: "Nous avons beaucoup d'espoir pour CodeCombat."
    introduction_desc_pref: "Nous voulons être l'endroit où les développeurs de tous horizons viennent pour apprendre et jouer ensemble, présenter les autres au monde du développement, et refléter le meilleur de la communauté. Nous ne pouvons et ne voulons pas faire ça seuls ; ce qui rend super les projets comme GitHub, Stack Overflow et Linux, est que les gens qui l'utilisent le construisent. Dans ce but, "
    introduction_desc_github_url: "CodeCombat est totalement open source"
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t

  employers:
    want_to_hire_our_players: "Akarsz szakértő CodeCombat játékosokat alkalmazni?"
-    contact_george: "Vedd fel a kapcsolatot George-dzsal, hogy megtekinthesd jelöltjeinket"
+#    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "Pillanatnyilag van"
    candidates_count_many: "sok"
    candidates_count_suffix: "magasan képzett és ellenőrzött fejlesztő, aki munkát keres."
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@ -97,7 +97,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
    adventurer_forum: "冒険者の掲示板"
 #    adventurer_suffix: "."
    campaign_beginner: "初心者のキャンペーン"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
+    campaign_beginner_description: "プログラミングの魔法を学びましょう"
    campaign_dev: "いろんな難しいレベル"
 #    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
    campaign_multiplayer: "マルチプレイ・アリーナ"
@ -171,8 +171,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
    error_saving: "セーブ中にエラーが発生しました"
    saved: "変更しました"
    password_mismatch: "パスワードが違います"
-#    job_profile: "Job Profile"
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
+    job_profile: "求職情報"
+    job_profile_approved: "CodeCombatは、あなたの求職情報を承りました。無効にする、もしくは4週間の間変更をしなければ雇用者はあなたの求職情報を見ることができなくなります。"
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
 #    sample_profile: "See a sample profile"
 #    view_profile: "View Your Profile"
@ -181,19 +181,19 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
    edit_settings: "設定"
 #    profile_for_prefix: "Profile for "
    profile_for_suffix: "のプロフィール"
-#    approved: "Approved"
-#    not_approved: "Not Approved"
+    approved: "承認"
+    not_approved: "非承認"
    looking_for: "検索:"
    last_updated: "最終更新:"
 #    contact: "Contact"
-#    work_experience: "Work Experience"
-#    education: "Education"
+    work_experience: "職務経験"
+    education: "学歴"
 #    our_notes: "Our Notes"
 #    projects: "Projects"

  employers:
    want_to_hire_our_players: "CodeCombatのエキスパートプレイヤーをお探しですか?"
-    contact_george: "候補者に会うためにGeorgeに連絡してください"
+#    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "現在、仕事を探している優秀で審査済みの開発者が"
    candidates_count_many: "多数"
    candidates_count_suffix: "います"
@ -234,7 +234,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
    victory_go_home: "ホームに戻る"
    victory_review: "フィードバック"
    victory_hour_of_code_done: "完了してよろしいですか?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
+    victory_hour_of_code_done_yes: "はい、構いません"
    multiplayer_title: "マルチプレイ設定"
    multiplayer_link_description: "このURLを一緒にプレイしたい人に教えてください。"
    multiplayer_hint_label: "ヒント:"
@ -249,14 +249,14 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
    tome_cast_button_cast: "呪文をキャスト"
    tome_autocast_delay: "自動実行待機時間"
    tome_select_spell: "呪文を選択"
-#    tome_select_a_thang: "Select Someone for "
+    tome_select_a_thang: "誰かを選択: "
    tome_available_spells: "利用できる呪文"
    hud_continue: "続く　（Shift+Spaceキー）"
-#    spell_saved: "Spell Saved"
-#    skip_tutorial: "Skip (esc)"
-#    editor_config: "Editor Config"
-#    editor_config_title: "Editor Configuration"
-#    editor_config_language_label: "Programming Language"
+    spell_saved: "呪文を保存しました"
+    skip_tutorial: "スキップ (esc)"
+    editor_config: "エディター設定"
+    editor_config_title: "エディターの設定"
+    editor_config_language_label: "プログラミング言語"
 #    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/ms.coffee
+++ b/app/locale/ms.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/nl-BE.coffee
+++ b/app/locale/nl-BE.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:

  employers:
    want_to_hire_our_players: "Wil je expert CodeCombat spelers aanwerven? "
-    contact_george: "Contacteer George om onze kandidaten te zien"
+#    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "Momenteel hebben we "
    candidates_count_many: "veel"
    candidates_count_suffix: "zeer getalenteerde en ervaren ontwikkelaars die werk zoeken."
--- a/app/locale/nl-NL.coffee
+++ b/app/locale/nl-NL.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription

  employers:
    want_to_hire_our_players: "Wil je expert CodeCombat spelers aanwerven? "
-    contact_george: "Contacteer George om onze kandidaten te zien"
+#    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "Momenteel hebben we "
    candidates_count_many: "veel"
    candidates_count_suffix: "zeer getalenteerde en ervaren ontwikkelaars die werk zoeken."
--- a/app/locale/nl.coffee
+++ b/app/locale/nl.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Nederlands", englishDescription: "Dutch", t

  employers:
    want_to_hire_our_players: "Wil je expert CodeCombat spelers aanwerven? "
-    contact_george: "Contacteer George om onze kandidaten te zien"
+#    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "Momenteel hebben we "
    candidates_count_many: "veel"
    candidates_count_suffix: "zeer getalenteerde en ervaren ontwikkelaars die werk zoeken."
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Norwegian Nynorsk", englishDescription: "No

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/no.coffee
+++ b/app/locale/no.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Norsk", englishDescription: "Norwegian", tr

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "język polski", englishDescription: "Polish

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "português do Brasil", englishDescription:

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Português europeu", englishDescription: "P

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/pt.coffee
+++ b/app/locale/pt.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "português", englishDescription: "Portugues

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi

  employers:
    want_to_hire_our_players: "Хотите нанимать игроков-экспертов CodeCombat?"
-    contact_george: "Свяжитесь с Джорджем, чтобы посмотреть наших кандидатов"
+#    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "Сейчас у нас есть "
    candidates_count_many: "много"
    candidates_count_suffix: "высококвалифицированных и проверенных разработчиков, ищущих работу."
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@ -3,10 +3,10 @@ module.exports = nativeDescription: "українська мова", englishDesc
    loading: "Завантаження..."
    saving: "Збереження..."
    sending: "Надсилання..."
-#    send: "Send"
+    send: "Надіслано"
    cancel: "Відміна"
    save: "Зберегти"
-#    publish: "Publish"
+    publish: "Опублікувати"
    create: "Створити"
    delay_1_sec: "1 секунда"
    delay_3_sec: "3 секунди"
@ -15,8 +15,8 @@ module.exports = nativeDescription: "українська мова", englishDesc
    fork: "Форк"
    play: "Грати"
    retry: "Повтор"
-#    watch: "Watch"
-#    unwatch: "Unwatch"
+    watch: "Стежити"
+    unwatch: "Нестежити"
 #    submit_patch: "Submit Patch"

  units:
@ -39,7 +39,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
    editor: "Редактор"
    blog: "Блог"
    forum: "Форум"
-#    account: "Account"
+    account: "Акаунт"
    admin: "Адміністратор"
    home: "На головну"
    contribute: "Співпраця"
@ -60,7 +60,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
  login:
    sign_up: "створити акаунт"
    log_in: "Увійти"
-#    logging_in: "Logging In"
+    logging_in: "Вхід в акаунт"
    log_out: "Вийти"
    recover: "відновити акаунт"

@ -77,7 +77,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
    creating: "Створення акаунта..."
    sign_up: "Реєстрація"
    log_in: "вхід з паролем"
-#    social_signup: "Or, you can sign up through Facebook or G+:"
+    social_signup: "Або Ви можете створити акаунт через Facebook або G+:"

  home:
    slogan: "Навчіться програмувати на JavaScript, граючи у гру"
@ -118,8 +118,8 @@ module.exports = nativeDescription: "українська мова", englishDesc
    forum_page: "наш форум"
    forum_suffix: "."
    send: "Надіслати фідбек"
-#    contact_candidate: "Contact Candidate"
-#    recruitment_reminder: "Use this form to reach out to candidates you are interested in interviewing. Remember that CodeCombat charges 18% of first-year salary. The fee is due upon hiring the employee and is refundable for 90 days if the employee does not remain employed. Part time, remote, and contract employees are free, as are interns."
+    contact_candidate: "Сконтактуватись з кандидатом"
+    recruitment_reminder: "Використовуйте цю форму щоб перейти до кандидатів з котрими Ви б хотіли провести співбесіду. Пам‘ятайте, що CodeCombat знімає 18% ЗП за перший рік. Плата проводиться за наймом співробітника і підлягає відшкодуванню протягом 90 днів якщо,працівник не залишить роботу. Часткова зайнятість,дистанційна робота, та наймані працівники не оплачуються, так само як інтерни."

  diplomat_suggestion:
    title: "Допоможіть перекласти CodeCombat!"
@ -132,18 +132,18 @@ module.exports = nativeDescription: "українська мова", englishDesc
  wizard_settings:
    title: "Налаштування"
    customize_avatar: "Налаштувати аватар"
-#    active: "Active"
-#    color: "Color"
-#    group: "Group"
+    active: "Діючий"
+    color: "Колір"
+    group: "Група"
    clothes: "Одяг"
    trim: "Оздоблення"
    cloud: "Хмаринка"
-#    team: "Team"
+    team: "Команда"
    spell: "Закляття"
    boots: "Черевики"
    hue: "Відтінок"
    saturation: "Насиченість"
-#    lightness: "Lightness"
+    lightness: "Яскравість"

  account_settings:
    title: "Налаштування акаунта"
@ -171,39 +171,39 @@ module.exports = nativeDescription: "українська мова", englishDesc
    error_saving: "Помилка при збереженні"
    saved: "Зміни збережено"
    password_mismatch: "Паролі не збігаються."
-#    job_profile: "Job Profile"
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
-#    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
-#    sample_profile: "See a sample profile"
-#    view_profile: "View Your Profile"
+    job_profile: "Профіль роботи"
+    job_profile_approved: "Ваш робочий пофіль буде затверджений CodeCombat. Роботодавці зможуть бачити його якщо він буде відмічений як активний, або він не зазнає змін протягом 4 тижнів."
+    job_profile_explanation: "Привіт! Заповніть це і ми з Вами зв‘яжемось знайшовши для Вас роботу розробника ПЗ."
+    sample_profile: "Дивитись зразок профілю"
+    view_profile: "Переглянути Ваш профіль"

  account_profile:
    edit_settings: "Змінити налаштування"
    profile_for_prefix: "Профіль для "
    profile_for_suffix: ""
-#    approved: "Approved"
-#    not_approved: "Not Approved"
-#    looking_for: "Looking for:"
-#    last_updated: "Last updated:"
-#    contact: "Contact"
-#    work_experience: "Work Experience"
-#    education: "Education"
-#    our_notes: "Our Notes"
-#    projects: "Projects"
+    approved: "Затверджений"
+    not_approved: "Не затверджений"
+    looking_for: "Шукає:"
+    last_updated: "Останнє оновлення:"
+    contact: "Сконтактуватись"
+    work_experience: "Досвід роботи"
+    education: "Освіта"
+    our_notes: "Наші примітки"
+    projects: "Роботи"

-#  employers:
-#    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
-#    candidates_count_prefix: "We currently have "
-#    candidates_count_many: "many"
-#    candidates_count_suffix: "highly skilled and vetted developers looking for work."
-#    candidate_name: "Name"
-#    candidate_location: "Location"
-#    candidate_looking_for: "Looking For"
-#    candidate_role: "Role"
-#    candidate_top_skills: "Top Skills"
-#    candidate_years_experience: "Yrs Exp"
-#    candidate_last_updated: "Last Updated"
+  employers:
+    want_to_hire_our_players: "Бажаєш найняти досвідчених гравців CodeCombat?"
+#    see_candidates: "Click here to see our candidates"
+    candidates_count_prefix: "В даний час ми маємо "
+    candidates_count_many: "багато"
+    candidates_count_suffix: "висококваліфікованих і перевірених розробників котрі шукають роботу."
+    candidate_name: "Ім‘я"
+    candidate_location: "Розташування"
+    candidate_looking_for: "Шукає"
+    candidate_role: "Роль"
+    candidate_top_skills: "Найкращі навички"
+    candidate_years_experience: "років досвіду"
+    candidate_last_updated: "Останнє оновлення"
 #    candidate_approved: "Us?"
 #    candidate_active: "Them?"

@ -229,7 +229,7 @@ module.exports = nativeDescription: "українська мова", englishDesc
    victory_rate_the_level: "Оцінити рівень: "
    victory_rank_my_game: "Оцінити мою гру"
    victory_ranking_game: "Надсилання..."
-#    victory_return_to_ladder: "Return to Ladder"
+    victory_return_to_ladder: "Повернутись до таблиці рівнів"
    victory_play_next_level: "Наступний рівень"
    victory_go_home: "На головну"
    victory_review: "Розкажіть нам більше!"
@ -254,72 +254,72 @@ module.exports = nativeDescription: "українська мова", englishDesc
    hud_continue: "Продовжити (натисніть shift-space)"
    spell_saved: "Закляття збережено"
    skip_tutorial: "Пропустити (esc)"
-#    editor_config: "Editor Config"
-#    editor_config_title: "Editor Configuration"
-#    editor_config_language_label: "Programming Language"
-#    editor_config_language_description: "Define the programming language you want to code in."
-#    editor_config_keybindings_label: "Key Bindings"
+    editor_config: "Редактор налашт."
+    editor_config_title: "Редактор налаштувань"
+    editor_config_language_label: "Мова програмування"
+    editor_config_language_description: "Визначте мову програмування, котрою Ви бажаєте кодити."
+    editor_config_keybindings_label: "Комбінаційї клавіш"
    editor_config_keybindings_default: "За замовчуванням (Ace)"
-#    editor_config_keybindings_description: "Adds additional shortcuts known from the common editors."
-#    editor_config_invisibles_label: "Show Invisibles"
-#    editor_config_invisibles_description: "Displays invisibles such as spaces or tabs."
-#    editor_config_indentguides_label: "Show Indent Guides"
-#    editor_config_indentguides_description: "Displays vertical lines to see indentation better."
-#    editor_config_behaviors_label: "Smart Behaviors"
-#    editor_config_behaviors_description: "Autocompletes brackets, braces, and quotes."
-#    loading_ready: "Ready!"
-#    tip_insert_positions: "Shift+Click a point on the map to insert it into the spell editor."
-#    tip_toggle_play: "Toggle play/paused with Ctrl+P."
-#    tip_scrub_shortcut: "Ctrl+[ and Ctrl+] rewind and fast-forward."
-#    tip_guide_exists: "Click the guide at the top of the page for useful info."
-#    tip_open_source: "CodeCombat is 100% open source!"
-#    tip_beta_launch: "CodeCombat launched its beta in October, 2013."
-#    tip_js_beginning: "JavaScript is just the beginning."
-#    tip_autocast_setting: "Adjust autocast settings by clicking the gear on the cast button."
-#    think_solution: "Think of the solution, not the problem."
-#    tip_theory_practice: "In theory, there is no difference between theory and practice. But in practice, there is. - Yogi Berra"
-#    tip_error_free: "There are two ways to write error-free programs; only the third one works. - Alan Perlis"
-#    tip_debugging_program: "If debugging is the process of removing bugs, then programming must be the process of putting them in. - Edsger W. Dijkstra"
-#    tip_forums: "Head over to the forums and tell us what you think!"
-#    tip_baby_coders: "In the future, even babies will be Archmages."
-#    tip_morale_improves: "Loading will continue until morale improves."
-#    tip_all_species: "We believe in equal opportunities to learn programming for all species."
-#    tip_reticulating: "Reticulating spines."
-#    tip_harry: "Yer a Wizard, "
-#    tip_great_responsibility: "With great coding skill comes great debug responsibility."
-#    tip_munchkin: "If you don't eat your vegetables, a munchkin will come after you while you're asleep."
-#    tip_binary: "There are only 10 types of people in the world: those who understand binary, and those who don't."
-#    tip_commitment_yoda: "A programmer must have the deepest commitment, the most serious mind. ~ Yoda"
-#    tip_no_try: "Do. Or do not. There is no try. - Yoda"
-#    tip_patience: "Patience you must have, young Padawan. - Yoda"
-#    tip_documented_bug: "A documented bug is not a bug; it is a feature."
-#    tip_impossible: "It always seems impossible until it's done. - Nelson Mandela"
-#    tip_talk_is_cheap: "Talk is cheap. Show me the code. - Linus Torvalds"
-#    tip_first_language: "The most disastrous thing that you can ever learn is your first programming language. - Alan Kay"
-#    time_current: "Now:"
-#    time_total: "Max:"
-#    time_goto: "Go to:"
-#    infinite_loop_try_again: "Try Again"
-#    infinite_loop_reset_level: "Reset Level"
-#    infinite_loop_comment_out: "Comment Out My Code"
+    editor_config_keybindings_description: "Додайте додаткові скорочення відомі Вам із загальних редакторів."
+    editor_config_invisibles_label: "Показати приховане"
+    editor_config_invisibles_description: "Відображення прихованого, такого як відступи та знаки табуляції."
+    editor_config_indentguides_label: "Показати відступи провідників"
+    editor_config_indentguides_description: "Відображення вертикальних ліній, щоб краще бачити відстань."
+    editor_config_behaviors_label: "Розумні привички"
+    editor_config_behaviors_description: "Автозаповнення дужок, фігурних дужок, та лапок."
+    loading_ready: "Готово!"
+    tip_insert_positions: "Shift+Натиснути точку на карті, щоб вставити його у редактор заклинань."
+    tip_toggle_play: "Перемикач грати/пауза командою Ctrl+P."
+    tip_scrub_shortcut: "Ctrl+[ і Ctrl+] для перемотування та швидкого перемотування вперед."
+    tip_guide_exists: "Натисніть інструкцію вгорі сторінки для корисної інформації."
+    tip_open_source: "CodeCombat є 100% відкритим кодом!"
+    tip_beta_launch: "CodeCombat запустив бета версію в жовтні 2013."
+    tip_js_beginning: "JavaScript є лише початком."
+    tip_autocast_setting: "Регулюйте параметри автозастосування перемикачем на кнопці скидання."
+    think_solution: "Думайте про вирішення, а не за поблему."
+    tip_theory_practice: "В теорії між теорією і практикою немає ніякої різниці. На практиці - є. - Йогі Берра"
+    tip_error_free: "Є два шляхи написання програм без помилок; але лише третій працює. - Алан Перліс"
+    tip_debugging_program: "Якщо налагодження є процесом усунення помилок, то програмування повинно бути процесом їх вставляння. - Едсгер В. Дейкстра"
+    tip_forums: "Заходіть на форум і скажіть нам що Ви думаєте!"
+    tip_baby_coders: "В майбутньому, навіть малюки будуть Архімагами."
+    tip_morale_improves: "Завантеження буде продовжуватись, поки мораль не покращиться."
+    tip_all_species: "Ми віримо у рівні можливості для вивчення пограмування усіх видів."
+    tip_reticulating: "Сітчасті голки."
+    tip_harry: "Так Чарівник, "
+    tip_great_responsibility: "З хорошими навичками кодування приходить відповідальність хорошого усунення помилок."
+    tip_munchkin: "Якщо ти не будеш їсти овощі, гном прийде до тебе поки ти спатимеш."
+    tip_binary: "Є лише 10 типів людей у світі: ті хто розуміють двійкову систему, і ті хто ні."
+    tip_commitment_yoda: "Програміст повинен мати глибоку прихильність, найсерйозніший розум. - Йода"
+    tip_no_try: "Робити. Чи не робити. .Це не спроба - Йода"
+    tip_patience: "Терпіння необхідно мати, юний падаван. - Йода"
+    tip_documented_bug: "Задокументована помилка не є помилко; це особливість."
+    tip_impossible: "Багато речей здаються нездійсненними до тих пір, поки їх не зробиш. - Нельсон Мандела"
+    tip_talk_is_cheap: "Розмови нічого не варті. Покажи мені код. - Лінус Торвальдс"
+    tip_first_language: "Найбільш катастрофічною річчю яку ви коли-небудь вчили є Ваша перша мова програмування. - Алан Кей"
+    time_current: "Зараз:"
+    time_total: "Найбільше:"
+    time_goto: "Перейти до:"
+    infinite_loop_try_again: "Спробувати щераз"
+    infinite_loop_reset_level: "Почати рівень спочатку"
+    infinite_loop_comment_out: "Залишити коментарі до мого коду"

  admin:
-#    av_title: "Admin Views"
-#    av_entities_sub_title: "Entities"
-    av_entities_users_url: "користувачі"
-#    av_entities_active_instances_url: "Active Instances"
-    av_other_sub_title: "Інше"
-#    av_other_debug_base_url: "Base (for debugging base.jade)"
-    u_title: "Список користувачів"
+    av_title: "Види для адміна"
+    av_entities_sub_title: "Організації"
+    av_entities_users_url: "Учасники"
+    av_entities_active_instances_url: "Активні вимоги"
+    av_other_sub_title: "Інші"
+    av_other_debug_base_url: "Основне (для налагодження base.jade)"
+    u_title: "Список учасників"
    lg_title: "Останні ігри"
-#    clas: "CLAs"
+    clas: "CLAs"

-#  community:
-#    level_editor: "Level Editor"
-#    main_title: "CodeCombat Community"
-#    facebook: "Facebook"
-#    twitter: "Twitter"
-#    gplus: "Google+"
+  community:
+    level_editor: "Редактор рівнів"
+    main_title: "Спільноти CodeCombat"
+    facebook: "Facebook"
+    twitter: "Twitter"
+    gplus: "Google+"

  editor:
    main_title: "Редактори CodeCombat"
@ -330,89 +330,89 @@ module.exports = nativeDescription: "українська мова", englishDesc
    thang_description: "Створюйте юнітів, візначайте їхню логіку, графіку та аудіо. Наразі підтримується тільки імпорт векторної flash-графіки."
    level_title: "Редактор рівнів"
    level_description: "Включає інструменти для створення сценаріїв, аудіо й конструювання логіки задля створення усіх типів рівнив. Усе, що ми самі використовуємо! "
-#    got_questions: "Questions about using the CodeCombat editors?"
+    got_questions: "Є питання з використання редакторів CodeCombat?"
    contact_us: "зв’яжіться з нами!"
    hipchat_prefix: "Ви можете також знайти нас в нашій"
    hipchat_url: "кімнаті HipChat."
-#    back: "Back"
-#    revert: "Revert"
-#    revert_models: "Revert Models"
-#    fork_title: "Fork New Version"
-#    fork_creating: "Creating Fork..."
-#    more: "More"
-#    wiki: "Wiki"
-#    live_chat: "Live Chat"
-#    level_some_options: "Some Options?"
+    back: "Назад"
+    revert: "Повернутись"
+    revert_models: "Моделі повернення"
+    fork_title: "Нова версія Форк"
+    fork_creating: "Створення Форк..."
+    more: "Більше"
+    wiki: "Wiki"
+    live_chat: "Online чат"
+    level_some_options: "Деякі опції?"
    level_tab_thangs: "Об'єкти"
    level_tab_scripts: "Скрипти"
    level_tab_settings: "Налаштування"
    level_tab_components: "Компоненти"
    level_tab_systems: "Системи"
    level_tab_thangs_title: "Поточні об'єкти"
-#    level_tab_thangs_all: "All"
+    level_tab_thangs_all: "Усі"
    level_tab_thangs_conditions: "Початковий статус"
    level_tab_thangs_add: "Додати об'єкти"
-#    delete: "Delete"
-#    duplicate: "Duplicate"
+    delete: "Видалити"
+    duplicate: "Копіювати"
    level_settings_title: "Налаштування"
-#    level_component_tab_title: "Current Components"
-#    level_component_btn_new: "Create New Component"
-#    level_systems_tab_title: "Current Systems"
-#    level_systems_btn_new: "Create New System"
-#    level_systems_btn_add: "Add System"
-#    level_components_title: "Back to All Thangs"
-#    level_components_type: "Type"
-#    level_component_edit_title: "Edit Component"
-#    level_component_config_schema: "Config Schema"
-#    level_component_settings: "Settings"
-#    level_system_edit_title: "Edit System"
-#    create_system_title: "Create New System"
-#    new_component_title: "Create New Component"
-#    new_component_field_system: "System"
-#    new_article_title: "Create a New Article"
-#    new_thang_title: "Create a New Thang Type"
-#    new_level_title: "Create a New Level"
+    level_component_tab_title: "Поточні компоненти"
+    level_component_btn_new: "Створити новий компонент"
+    level_systems_tab_title: "Поточна система"
+    level_systems_btn_new: "Створити нову систему"
+    level_systems_btn_add: "Додати систему"
+    level_components_title: "Повернутись до всіх об‘єктів"
+    level_components_type: "Тип"
+    level_component_edit_title: "Редагувати компонент"
+    level_component_config_schema: "Config Schema"
+    level_component_settings: "Налаштування"
+    level_system_edit_title: "Редагувати систему"
+    create_system_title: "Створити нову систему"
+    new_component_title: "Створити новий компонент"
+    new_component_field_system: "Система"
+    new_article_title: "Створити нову статтю"
+    new_thang_title: "Створити новий тип об‘єкта"
+    new_level_title: "Створити новий рівень"
 #    new_article_title_signup: "Sign Up to Create a New Article"
 #    new_thang_title_signup: "Sign Up to Create a New Thang Type"
 #    new_level_title_signup: "Sign Up to Create a New Level"
-#    article_search_title: "Search Articles Here"
-#    thang_search_title: "Search Thang Types Here"
-#    level_search_title: "Search Levels Here"
-#    read_only_warning2: "Note: you can't save any edits here, because you're not logged in."
+    article_search_title: "Шукати статті тут"
+    thang_search_title: "Шукати типи об‘єктів тут"
+    level_search_title: "Шукати рівні тут"
+    read_only_warning2: "Примітка: Ви не можете зберегти ніякі зміни, оскільки Ви не зареєструвались."

-#  article:
-#    edit_btn_preview: "Preview"
-#    edit_article_title: "Edit Article"
+  article:
+    edit_btn_preview: "Анонс"
+    edit_article_title: "Редагувати статтю"

  general:
    and: "та"
    name: "Ім’я"
    body: "Тіло"
    version: "Версія"
-#    commit_msg: "Commit Message"
+    commit_msg: "Доручити повідомлення"
    version_history: "Історія"
-#    version_history_for: "Version History for: "
+    version_history_for: "Версія історії для: "
    result: "Результат"
    results: "Результати"
    description: "Опис"
    or: "чи"
-#    subject: "Subject"
+    subject: "Предмет"
    email: "Email"
    password: "Пароль"
    message: "Повідомлення"
-#    code: "Code"
-#    ladder: "Ladder"
+    code: "Код"
+    ladder: "Драбина"
    when: "Коли"
    opponent: "Противник"
-#    rank: "Rank"
-#    score: "Score"
+    rank: "Звання"
+    score: "Рахунок"
    win: "Перемога"
    loss: "Поразка"
-#    tie: "Tie"
+    tie: "Нічия"
    easy: "Легкий"
    medium: "Середній"
    hard: "Важкий"
-#    player: "Player"
+    player: "Гравець"

  about:
    who_is_codecombat: "Хто є CodeCombat?"
@ -447,56 +447,56 @@ module.exports = nativeDescription: "українська мова", englishDesc
    opensource_description_suffix: "щоб побачити списки ПЗ, яке робить цю гру можливою."
    practices_title: "Шановні найкращі гравці"
 #    practices_description: "These are our promises to you, the player, in slightly less legalese."
-#    privacy_title: "Privacy"
-#    privacy_description: "We will not sell any of your personal information. We intend to make money through recruitment eventually, but rest assured we will not distribute your personal information to interested companies without your explicit consent."
-#    security_title: "Security"
-#    security_description: "We strive to keep your personal information safe. As an open source project, our site is freely open to anyone to review and improve our security systems."
-#    email_title: "Email"
-#    email_description_prefix: "We will not inundate you with spam. Through"
-#    email_settings_url: "your email settings"
-#    email_description_suffix: "or through links in the emails we send, you can change your preferences and easily unsubscribe at any time."
-#    cost_title: "Cost"
-#    cost_description: "Currently, CodeCombat is 100% free! One of our main goals is to keep it that way, so that as many people can play as possible, regardless of place in life. If the sky darkens, we might have to charge subscriptions or for some content, but we'd rather not. With any luck, we'll be able to sustain the company with:"
-#    recruitment_title: "Recruitment"
-#    recruitment_description_prefix: "Here on CodeCombat, you're going to become a powerful wizard–not just in the game, but also in real life."
-#    url_hire_programmers: "No one can hire programmers fast enough"
-#    recruitment_description_suffix: "so once you've sharpened your skills and if you agree, we will demo your best coding accomplishments to the thousands of employers who are drooling for the chance to hire you. They pay us a little, they pay you"
-#    recruitment_description_italic: "a lot"
-#    recruitment_description_ending: "the site remains free and everybody's happy. That's the plan."
-#    copyrights_title: "Copyrights and Licenses"
-#    contributor_title: "Contributor License Agreement"
-#    contributor_description_prefix: "All contributions, both on the site and on our GitHub repository, are subject to our"
-#    cla_url: "CLA"
-#    contributor_description_suffix: "to which you should agree before contributing."
-#    code_title: "Code - MIT"
-#    code_description_prefix: "All code owned by CodeCombat or hosted on codecombat.com, both in the GitHub repository or in the codecombat.com database, is licensed under the"
-#    mit_license_url: "MIT license"
-#    code_description_suffix: "This includes all code in Systems and Components that are made available by CodeCombat for the purpose of creating levels."
-#    art_title: "Art/Music - Creative Commons "
-#    art_description_prefix: "All common content is available under the"
-#    cc_license_url: "Creative Commons Attribution 4.0 International License"
-#    art_description_suffix: "Common content is anything made generally available by CodeCombat for the purpose of creating Levels. This includes:"
-#    art_music: "Music"
-#    art_sound: "Sound"
-#    art_artwork: "Artwork"
-#    art_sprites: "Sprites"
-#    art_other: "Any and all other non-code creative works that are made available when creating Levels."
-#    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:"
-#    use_list_1: "If used in a movie or another game, include codecombat.com in the credits."
-#    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: "Rights Reserved"
-#    rights_desc: "All rights are reserved for Levels themselves. This includes"
-#    rights_scripts: "Scripts"
-#    rights_unit: "Unit configuration"
-#    rights_description: "Description"
-#    rights_writings: "Writings"
-#    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_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."
+    privacy_title: "Конфіденційність"
+    privacy_description: "Ми не продаватимемо ніяку вашу особисту інформацію. Ми маємо намір заробити гроші за допомогою кінцевого результату, але будьте впевнені, ми не будемо поширювати Вашу особисту інформацію для зацікавлених компаній без вашої явної згоди."
+    security_title: "Безпека"
+    security_description: "Ми прагнемо зберегти вашу особисту інформацію в безпеці. Як проект з відкритим кодом, наш сайт є вільно відкритим для всіх, щоб переглянути та удосконалити наші системи безпеки."
+    email_title: "Email"
+    email_description_prefix: "Ми не будем завалювати вас спамом. Через"
+    email_settings_url: "налаштування вашого email"
+    email_description_suffix: "або через посилання в повідомленням котрі ми присилаємо, ви можете змінити ваші уподобання і легко відмовитись від підписки в будь-який час."
+    cost_title: "Вартість"
+    cost_description: "На даний час, CodeCombat є безкоштовним на усі 100%! Однією з наших цілей є рухатись у цьому ж напрямку, так що у цю гру можуть грати стільки людей, наскільки це можливо, незалежно від місця проживання. Якщо настануть важкі часи, ми будем змушені стягувати плату за певний контент, але ми б не хотіли цього. Якщо пощастить, ми зможемо підтримувати компанію разом з:"
+    recruitment_title: "Доповнення"
+    recruitment_description_prefix: "Тут у CodeCombat, ви станете могутнім чарівником не лише у грі, але також і у реальному житті."
+    url_hire_programmers: "Ніхто не може найняти програмістів одразу"
+    recruitment_description_suffix: "отже як тільки ви заточите свої навики, і якщо ви погодитесь, ми продемонструєм ваші найкращі досягнення у кодуванні тисячам роботодавців котрі пускають слюні щоб не впустити можливості найняти вас. Вони платять нам не багато, вони платять вам"
+    recruitment_description_italic: "багато"
+    recruitment_description_ending: "сайт залишиться безкоштовним і кожен буде задоволеним. Такий план."
+    copyrights_title: "Авторські права та ліцензії"
+    contributor_title: "Авторська ліцензійна згода"
+    contributor_description_prefix: "Усі права, як на сайті так і у нашому сховищі GitHub, є у відповідності з нашими"
+    cla_url: "CLA"
+    contributor_description_suffix: "з котрими ви маєте погодитись перед співпрацею."
+    code_title: "Код - MIT"
+    code_description_prefix: "Весь код що належить CodeCombat або розміщений на codecombat.com, як у сховищі GitHub так і у базі даних codecombat.com, є ліцензованим"
+    mit_license_url: "ліцензією MIT"
+    code_description_suffix: "Це включає весь код у системах та компонентах, котрі є доступними через CodeCombat з метою створення рівнів."
+    art_title: "Мистецтво/Музика - творчі спільноти "
+    art_description_prefix: "Увесь контент спільнот є доступним завдяки"
+    cc_license_url: "міжнародній ліцензії Creative Commons із зазначенням авторства 4.0"
+    art_description_suffix: "Контентом спільнот є будь-що зроблене загальнодоступним через CodeCombat з метою створення рівнів. Це включає:"
+    art_music: "Музику"
+    art_sound: "Звук"
+    art_artwork: "Творчі роботи"
+    art_sprites: "Спрайти"
+    art_other: "Будь-які і всі інші творчі роботи, котрі не є кодом, котрі є доступними для створення рівнів."
+    art_access: "На даний час немає універсальної, зручної системи для вибору цих активів. В загальному, вибирайте їх з URL котрі використовуються сайтом, зверніться до нас за допомогою, або допоможіть нам в розширенні цього сайту, щоб зробити ці активи більш доступними."
+    art_paragraph_1: "Щодо авторських прав, будь-ласка, назвіть і дайте лінк на codecombat.com де саме ресурс використовується або де призначатиметься у середовищі. Для прикладу:"
+    use_list_1: "Якщо використовується в ролику або іншій грі, додайте codecombat.com в the credits."
+    use_list_2: "Якщо використовується на веб-сайті, додайте лінк біля статистики, на приклад під зображенням, або в загальному описі сторінки де ви зможете також згадати інші роботи Creative Commons і програмне забезпечення з відкритим кодом, що використовується на сайті. Дещо, що вже має чисті посилання на CodeCombat, так як повідомлення у блозі у котрих згадується CodeCombat, не потребують окремих посилань."
+    art_paragraph_2: "Якщо використаний контент не був створений CodeCombat але внесений користувачем codecombat.com, роблячи посилання на нього, дотримуйтесь інструкції посилання передбачених в описі цього ресурсу, якщо такі інструкції є."
+    rights_title: "Права захищені"
+    rights_desc: "Усі права захищені для самих рівнів. Це включає"
+    rights_scripts: "Скрипти"
+    rights_unit: "Конфігурації блоку"
+    rights_description: "Опис"
+    rights_writings: "Листи"
+    rights_media: "Медіа (звуки, музику) і будь-який інший творчий контент зроблений конкретно для того рівня і не зроблений загальнодостурним для створенні рівнів."
+    rights_clarification: "Для уточнення, будь-що що є доступним у редакторі рівнів, для створення нових рівнів, належить CC, тоді як контент створений редактором рівнів або завантажений в ході створення рівнів, не належить."
+    nutshell_title: "Коротко"
+    nutshell_description: "Будь-які ресурси котрі ми надаємо в редакторі рівнів є безкоштовними для використання за вашим бажанням для створення рівнів. Але ми залишаємо за собою право обмежувати розповсюдження самих рівнів(котрі були створені на codecombat.com), тому вони зможуть заплатити в майбутньому, якщо в кінцевому результаті таке станеться."
+    canonical: "Англійська версія цього документа є остаточною та канонічною версією. Якщо тут є будь-які невідповідності в перекладі, англійська версія документа є пріоритетною."

  contribute:
    page_title: "Співпраця"
@ -512,11 +512,11 @@ module.exports = nativeDescription: "українська мова", englishDesc
    alert_account_message_suf: "спершу."
    alert_account_message_create_url: "створити акаунт"
    archmage_summary: "Зацікавлений у роботі над ігровою графікою, дизайном інтерфейсу, організацією баз даних та серверу, мультиплеєром, фізокю, звуком або продукційністю ігрового движка? Мрієш допомогти у створенні гри, яка навчить інших того, у чому ви профі? У нас багато роботи, і якщо ти досвідчений програміст і хочеш розробляти CodeCombat, цей клас для тебе. Ми будемо щасливі бачити, як ти створюєш найкращу в світі гру для програмістів. "
-#    archmage_introduction: "One of the best parts about building games is they synthesize so many different things. Graphics, sound, real-time networking, social networking, and of course many of the more common aspects of programming, from low-level database management, and server administration to user facing design and interface building. There's a lot to do, and if you're an experienced programmer with a hankering to really dive into the nitty-gritty of CodeCombat, this class might be for you. We would love to have your help building the best programming game ever."
+    archmage_introduction: "Однією з найкращих частин створення ігор є те, що вони синтезують так багато різноманітних речей. Графіка, звук, з‘єднання з мережею у реальному часі, соціальні мережі, і ,звичайно, багато з найбільш поширених аспектів програмування, від управління низькорівневими базами даних, і адміністративної підтримки сервера до користувацького зовнішнього вигляду та побудови інтерфейсу. Тут є ще багато до виконання, і якщо ти досвідчений програміст з пристрастним бажанням зануритись у закаулки CodeCombat, цей розділ скоріше за все для Вас. Ми з радістю приймем Вашу допомогу у побудові найкращої з усіх гри для програмування."
    class_attributes: "Ознаки класу"
-#    archmage_attribute_1_pref: "Knowledge in "
-#    archmage_attribute_1_suf: ", or a desire to learn. Most of our code is in this language. If you're a fan of Ruby or Python, you'll feel right at home. It's JavaScript, but with a nicer syntax."
-#    archmage_attribute_2: "Some experience in programming and personal initiative. We'll help you get oriented, but we can't spend much time training you."
+    archmage_attribute_1_pref: "Навики у "
+    archmage_attribute_1_suf: ", або бажання навчитись. Більшість нашого коду написана написана на цій мові. Якщо Ви фанат Ruby або Python, Ви будете почуватись як у дома. Це JavaScript, але з приємнішим синтаксисом."
+    archmage_attribute_2: "Деякий досвід програмування та власна ініціатива. Ми допоможемо Вам зорієнтуватись, але ми не можемо витрачати багато часу для Вашого навчання."
    how_to_join: "Як приєднатися"
    join_desc_1: "Кожен може допомогти! Заходь на наш "
    join_desc_2: ", щоб почати та постав позначку в чек-боксі нижче, щоб оголосити себе відважним архімагом та отримувати останні новини по е-мейл. Хочеш поспілкуватися про те, що саме робити й як включитися в роботу найглибше?"
@ -526,12 +526,12 @@ module.exports = nativeDescription: "українська мова", englishDesc
    join_url_hipchat: "публічній HipChat кімнаті"
    more_about_archmage: "Дізнатися, як стати Архімагом"
    archmage_subscribe_desc: "Отримувати листи з анонсами та новими можливостями для розробки."
-#    artisan_summary_pref: "Want to design levels and expand CodeCombat's arsenal? People are playing through our content at a pace faster than we can build! Right now, our level editor is barebone, so be wary. Making levels will be a little challenging and buggy. If you have visions of campaigns spanning for-loops to"
+    artisan_summary_pref: "Хочеш розробляти дизайн рівнів та розширювати арсенал CodeCombat? Люди проходять наші рівні в швидчому темпі ніж ми встигаємо їх створювати! На даний час, наш редактор рівнів є скелетом, тому будь обережним. Створення рівнів буде захоплюват і тягнути за собою. Якщо ти маєш уявлення про кампанії охоплюючі for-loops до"
    artisan_summary_suf: "тоді цей клас для тебе."
-#    artisan_introduction_pref: "We must construct additional levels! People be clamoring for more content, and we can only build so many ourselves. Right now your workstation is level one; our level editor is barely usable even by its creators, so be wary. If you have visions of campaigns spanning for-loops to"
-#    artisan_introduction_suf: ", then this class might be for you."
-#    artisan_attribute_1: "Any experience in building content like this would be nice, such as using Blizzard's level editors. But not required!"
-#    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
+    artisan_introduction_pref: "Ми повинні будувати додаткові рівні! Люди вимагатимуть більше контенту, і ми можемо лише будувати скільки самі зможемо. Саме зараз, Вашою робочою зоною є рівень один; наш редактор рівнів ледве використовується навіть його творцями, тож будьте обережними. Якщо ти маєш уявлення про кампанії охоплюючі for-loops до"
+    artisan_introduction_suf: ", тоді цей клас для тебе."
+    artisan_attribute_1: "Будь-який досвід у створені контенту такого як цей буде добрим, так як і використання редакторів рівнів Blizzard. Але не вимається!"
+    artisan_attribute_2: "A hankering to do a whole lot of testing and iteration. To make good levels, you need to take it to others and watch them play it, and be prepared to find a lot of things to fix."
 #    artisan_attribute_3: "For the time being, endurance en par with an Adventurer. Our Level Editor is super preliminary and frustrating to use. You have been warned!"
 #    artisan_join_desc: "Use the Level Editor in these steps, give or take:"
 #    artisan_join_step1: "Read the documentation."
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese

  employers:
    want_to_hire_our_players: "想要雇用CodeCombat上的专业玩家？"
-    contact_george: "联系George查看”为我们义务工作的人"
+#    see_candidates: "Click here to see our candidates"
    candidates_count_prefix: "我们当前有 "
    candidates_count_many: "很多"
    candidates_count_suffix: "经过我们认证的高手们正在找工作。"
@ -649,14 +649,14 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
    introducing_dungeon_arena: "介绍地下城竞技场"
    new_way: "用代码竞技的新方式."
    to_battle: "去战斗, 开发者们!"
-#    modern_day_sorcerer: "You know how to code? That's badass. You're a modern-day sorcerer! Isn't about time that you used your magic coding powers to command your minions in epic combat? And we're not talking robots here."
-#    arenas_are_here: "CodeCombat head-to-head multiplayer arenas are here."
+    modern_day_sorcerer: "你能编程? 这太牛了。 在这个时代你就是巫师! 还不快用你编码的魔力指挥你的手下投入壮烈的战斗中么? 我们说的可不是和机器战斗哦。"
+    arenas_are_here: "CodeCombat一个多人对抗的头脑竞技场."
 #    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: "派生我的竞技场"
    create_worlds: "以及创造我自己的世界."
-#    javascript_rusty: "JavaScript a bit rusty? Don't worry; there's a"
+    javascript_rusty: "对JavaScript有点生疏? 没关系，这里有一个"
    tutorial: "教程"
-#    new_to_programming: ". New to programming? Hit our beginner campaign to skill up."
+    new_to_programming: ". 编程新手? 参加我们的新手训练营来提高技能吧."
    so_ready: "我准备好了!"

  loading_error:
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/locale/zh.coffee
+++ b/app/locale/zh.coffee
@ -193,7 +193,7 @@ module.exports = nativeDescription: "中文", englishDescription: "Chinese", tra

 #  employers:
 #    want_to_hire_our_players: "Want to hire expert CodeCombat players?"
-#    contact_george: "Contact George to see our candidates"
+#    see_candidates: "Click here to see our candidates"
 #    candidates_count_prefix: "We currently have "
 #    candidates_count_many: "many"
 #    candidates_count_suffix: "highly skilled and vetted developers looking for work."
--- a/app/styles/play/level.sass
+++ b/app/styles/play/level.sass
@ -60,12 +60,6 @@ body.is-playing
  #multiplayer-join-link
    font-size: 12px
      
-  #level-done-button
-    position: absolute
-    right: 46%
-    top: 43px
-    @include box-shadow(4px 4px 15px black)
-
  // Custom Buttons
  .btn.banner
    @include banner-button(#FFF, #333)
--- a/app/styles/play/level/control_bar.sass
+++ b/app/styles/play/level/control_bar.sass
@ -39,3 +39,4 @@
    top: -7px
    font-size: 13px
    height: 24px
+
--- a/app/styles/play/level/gold.sass
+++ b/app/styles/play/level/gold.sass
@ -1,4 +1,5 @@
@import "app/styles/mixins"
+@import "app/styles/bootstrap/mixins"

 #gold-view
  position: absolute
@ -6,8 +7,14 @@
  top: 42px
  user-select: none
  -webkit-user-select: none
+  @include transition(background-color .2s linear)
+  padding: 4px
+  border-radius: 4px

-  h3
+  &:hover
+    background-color: rgba(255, 255, 255, 0.75)
+
+  .team-gold
    font-size: 16px
    margin: 0
    line-height: 20px
@ -27,7 +34,8 @@
      width: 16px
      height: 16px
      border-radius: 2px
-      padding: 2px
+      padding: 1px
+      margin-top: -1px
      @include gradient-radial-custom-stops(hsla(205,0%,74%,1), 20%, hsla(205,0%,31%,1), 70%)
  
    &.team-humans img
@ -41,4 +49,4 @@

    .gold-amount
      display: inline-block
-      width: 20px
+      min-width: 20px
--- a/app/templates/contribute/diplomat.jade
+++ b/app/templates/contribute/diplomat.jade
@ -65,7 +65,7 @@ block content
        li Spain Spanish - Matthew Burt, DanielRodriguezRivero, Anon, Pouyio
        li French - Xeonarno, Elfisen, Armaldio, MartinDelille, pstweb, veritable, jaybi, xavismeh, Anon, Feugy
        li Hungarian - ferpeter, csuvsaregal, atlantisguru, Anon
-        li Japanese - g1itch, kengos
+        li Japanese - g1itch, kengos, treby
        li Chinese - Adam23, spacepope, yangxuan8282, Cheng Zheng
        li Polish - Anon, Kacper Ciepielewski
        li Danish - Einar Rasmussen, sorsjen, Randi Hillerøe, Anon
--- a/app/templates/editor/level/component/edit.jade
+++ b/app/templates/editor/level/component/edit.jade
@ -30,9 +30,9 @@ nav.navbar.navbar-default(role='navigation')
  
        li#patch-component-button
          a(data-i18n="common.submit_patch") Submit Patch
-  
-        li#create-new-component-button
-          a(data-i18n="editor.level_component_btn_new") Create New Component
+        if me.isAdmin()
+          li#create-new-component-button
+            a(data-i18n="editor.level_component_b_new") Create New Component
        
        li.divider
        li.dropdown-header Info
--- a/app/templates/editor/level/system/edit.jade
+++ b/app/templates/editor/level/system/edit.jade
@ -26,8 +26,9 @@ nav.navbar.navbar-default(role='navigation')
              span.spl Unwatch
        li#patch-system-button
          a(data-i18n="common.submit_patch") Submit Patch
-        li#create-new-system
-          a(data-i18n="editor.level_system_btn_new") Create New System
+        if me.isAdmin()
+          li#create-new-system
+            a(data-i18n="editor.level_system_btn_new") Create New System
        li.divider
        li.dropdown-header Info
        li#system-history-button
--- a/app/templates/employers.jade
+++ b/app/templates/employers.jade
@ -15,7 +15,7 @@ block content
  if !isEmployer
    
    h3
-      a#see-candidates(title='Contact', tabindex=-1, data-toggle="coco-modal", data-target="modal/employer_signup") Click here to see candidates
+      a#see-candidates(title='Contact', tabindex=-1, data-toggle="coco-modal", data-target="modal/employer_signup", data-i18n="employers.see_candidates") Click here to see our candidates
      
  if candidates.length
    table.table.table-condensed.table-hover.table-responsive.tablesorter
--- a/app/templates/play/level.jade
+++ b/app/templates/play/level.jade
@ -12,8 +12,6 @@
    #canvas-left-gradient.gradient
    #canvas-top-gradient.gradient
  
-  a.btn.btn-primary.banner.secret#level-done-button(data-i18n="play_level.done") Done
-  
  #goals-view.secret
  
  #gold-view.secret.expanded
--- a/app/templates/play/level/control_bar.jade
+++ b/app/templates/play/level/control_bar.jade
@ -15,4 +15,6 @@ else
 if spectateGame
  button.btn.btn-xs.btn-inverse.banner#next-game-button(title="Next Game", data-i18n="play_level.next-game") Next game!

-button.btn.btn-xs.btn-inverse.banner#restart-button(title="Reload all custom code to reset level", data-i18n="play_level.restart") Restart
+button.btn.btn-xs.btn-inverse.banner#restart-button(title="Reload all custom code to reset level", data-i18n="play_level.restart") Restart
+
+button.btn.btn-xs.btn-primary.banner.secret#level-done-button(data-i18n="play_level.done") Done
--- a/app/views/play/level/gold_view.coffee
+++ b/app/views/play/level/gold_view.coffee
@ -13,10 +13,13 @@ module.exports = class GoldView extends View
    @$el.show()
    goldEl = @$el.find('.gold-amount.team-' + e.team)
    unless goldEl.length
-      teamEl = $("<h3 class='team-#{e.team}' title='Gold: #{e.team}'><img src='/images/level/prop_gold.png'> <div class='gold-amount team-#{e.team}'></div>")
+      teamEl = $("<div class='team-gold team-#{e.team}' title='Gold: #{e.team}'><img src='/images/level/prop_gold.png'> <div class='gold-amount team-#{e.team}'></div></div>")
      @$el.append(teamEl)
      goldEl = teamEl.find('.gold-amount.team-' + e.team)
-    goldEl.text(e.gold)
+    text = '' + e.gold
+    if e.goldEarned and e.goldEarned > e.gold
+      text += " (#{e.goldEarned})"
+    goldEl.text text

  onSetLetterbox: (e) ->
    @$el.toggle not e.on
--- a/app/views/play/level/tome/spell.coffee
+++ b/app/views/play/level/tome/spell.coffee
@ -18,10 +18,11 @@ module.exports = class Spell
    p = options.programmableMethod

    @name = p.name
-    @source = @session.getSourceFor(@spellKey) ? p.source
-    @originalSource = p.source
-    @parameters = p.parameters
    @permissions = read: p.permissions?.read ? [], readwrite: p.permissions?.readwrite ? []  # teams
+    @source = @originalSource = p.source
+    @parameters = p.parameters
+    if @permissions.readwrite.length and sessionSource = @session.getSourceFor(@spellKey)
+      @source = sessionSource
    @thangs = {}
    @view = new SpellView {spell: @, session: @session, worker: @worker}
    @view.render()  # Get it ready and code loaded in advance
@ -30,7 +31,6 @@ module.exports = class Spell
    @team = @permissions.readwrite[0] ? "common"
    Backbone.Mediator.publish 'tome:spell-created', spell: @

-
  destroy: ->
    @view.destroy()
    @tabView.destroy()
@ -95,7 +95,7 @@ module.exports = class Spell
        @worker.removeEventListener("message",arguments.callee, false)
        cb(workerData.hasChanged)
    @worker.postMessage JSON.stringify(workerMessage)
-  
+
  createAether: (thang) ->
    aceConfig = me.get('aceConfig') ? {}
    aetherOptions =
@ -136,7 +136,7 @@ module.exports = class Spell
    for thangId, spellThang of @thangs
      spellThang.aether?.setLanguage newLanguage
      spellThang.castAether = null
-    workerMessage = 
+    workerMessage =
      function: "updateLanguageAether"
      newLanguage: newLanguage
    @worker.postMessage JSON.stringify workerMessage
--- a/app/views/play/level/tome/tome_view.coffee
+++ b/app/views/play/level/tome/tome_view.coffee
@ -119,7 +119,7 @@ module.exports = class TomeView extends View
        spellKey = pathComponents.join '/'
        @thangSpells[thang.id].push spellKey
        unless method.cloneOf
-          skipProtectAPI = @getQueryVariable "skip_protect_api", not @options.ladderGame
+          skipProtectAPI = @getQueryVariable "skip_protect_api", not @options.ladderGame and not (@options.levelID in ['find-the-spy'])
          skipFlow = @getQueryVariable "skip_flow", (@options.levelID in ['brawlwood', 'greed', 'gold-rush'])
          spell = @spells[spellKey] = new Spell programmableMethod: method, spellKey: spellKey, pathComponents: pathPrefixComponents.concat(pathComponents), session: @options.session, supermodel: @supermodel, skipFlow: skipFlow, skipProtectAPI: skipProtectAPI, worker: @worker
    for thangID, spellKeys of @thangSpells
--- a/server/users/User.coffee
+++ b/server/users/User.coffee
@ -18,7 +18,6 @@ UserSchema.pre('init', (next) ->
  for prop, sch of jsonschema.properties
    continue if prop is 'emails' # defaults may change, so don't carry them over just yet
    @set(prop, sch.default) if sch.default?
-  @set('permissions', ['admin']) if not isProduction
  next()
 )

@ -108,6 +107,7 @@ UserSchema.pre('save', (next) ->
    @set('password', undefined)
  if @get('email') and @get('anonymous')
    @set('anonymous', false)
+    @set('permissions', ['admin']) if not isProduction
    data =
      email_id: sendwithus.templates.welcome_email
      recipient: