diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index 6344629f7..35e022051 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -79,7 +79,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
   recover:
     recover_account_title: "Recuperar Cuenta"
     send_password: "Enviar recuperación de contraseña"
-#    recovery_sent: "Recovery email sent."
+    recovery_sent: "Email de recuperación de contraseña enviado."
 
   signup:
     create_account_title: "Crea una cuenta para guardar tu progreso"
@@ -188,7 +188,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     email_announcements: "Noticias"
     email_announcements_description: "Recibe correos electrónicos con las últimas noticias y desarrollos de CodeCombat."
     email_notifications: "Notificationes"
-#    email_notifications_summary: "Controls for personalized, automatic email notifications related to your CodeCombat activity."
+    email_notifications_summary: "Controles para personalizar las notificaciones por email automaticas, relacionadas con tu actividad en CodeCombat."
     email_any_notes: "Cualquier Notificacion"
     email_any_notes_description: "Deshabilitar todas las notificaciones por mail."
     email_news: "Noticias"
@@ -216,7 +216,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     profile_for_prefix: "Perfil de "
     profile_for_suffix: ""
     featured: "Destacado"
-#    not_featured: "Not Featured"
+    not_featured: "Sin Destacar"
     looking_for: "Buscando:"
     last_updated: "Última actualización:"
     contact: "Contacto"
@@ -234,8 +234,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    next_education: "recount your educational ordeals."
     next_projects: "Muestranos tres proyectos en los que hayas trabajado."
     next_links: "añade links personales o de redes sociales."
-#    next_photo: "add an optional professional photo."
-#    next_active: "mark yourself open to offers to show up in searches."
+    next_photo: "añadir una foto para el perfil profesional."
+    next_active: "mostrarte abierto a ofertas en las busquedas."
     example_blog: "Blog"
     example_personal_site: "Web personal"
     links_header: "Enlaces Personales"
@@ -244,38 +244,38 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     links_name_help: "¿Qué estás enlazando?"
     links_link_blurb: "URL del enlace"
     basics_header: "Actualizar información básica"
-#    basics_active: "Open to Offers"
-#    basics_active_help: "Want interview offers right now?"
+    basics_active: "Abierto a ofertas"
+    basics_active_help: "Buscas entrevistas de trabajo ahora?"
 #    basics_job_title: "Desired Job Title"
-#    basics_job_title_help: "What role are you looking for?"
+    basics_job_title_help: "Que tipo de rol estas buscando?"
     basics_city: "Ciudad"
     basics_city_help: "Ciudad en la que quieres trabajar (o en la que vives actualmente)."
     basics_country: "País"
     basics_country_help: "País en la que quieres trabajar (o en la que vives actualmente)."
-#    basics_visa: "US Work Status"
-#    basics_visa_help: "Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)"
-#    basics_looking_for: "Looking For"
+    basics_visa: "Estatus de Trabajo en EEUU"
+    basics_visa_help: "Estas autorizado a trabajar en EEUU, o necesitas una visa patrocinada? (Si vives en Canada o Australia, marca autorizado.)"
+    basics_looking_for: "Estoy Buscando"
     basics_looking_for_full_time: "Full-time (tiempo completo)"
-#    basics_looking_for_part_time: "Part-time"
-#    basics_looking_for_remote: "Remote"
-#    basics_looking_for_contracting: "Contracting"
-#    basics_looking_for_internship: "Internship"
-#    basics_looking_for_help: "What kind of developer position do you want?"
+    basics_looking_for_part_time: "Tiempo Partido"
+    basics_looking_for_remote: "Desde Casa"
+    basics_looking_for_contracting: "Contractual"
+    basics_looking_for_internship: "Interino"
+    basics_looking_for_help: "Que tipo de puesto de desarrollo te gustaria?"
     name_header: "Escriba su nombre"
     name_anonymous: "Desarrollador Anónimo"
-#    name_help: "Name you want employers to see, like 'Nick Winter'."
+    name_help: "Esto es lo que quieres que vean las empresas, algo como 'Nick Winter'."
     short_description_header: "Escriba una breve descripción sobre usted."
-#    short_description_blurb: "Add a tagline to help an employer quickly learn more about you."
+    short_description_blurb: "Añade una frase que ayude a las empresas a hacerse una idea de ti."
 #    short_description: "Tagline"
     short_description_help: "¿Quién eres, y qué estás buscando? 140 caracteres como máximo."
-#    skills_header: "Skills"
+    skills_header: "Habilidades"
 #    skills_help: "Tag relevant developer skills in order of proficiency."
-#    long_description_header: "Describe your desired position"
-#    long_description_blurb: "Tell employers how awesome you are and what role you want."
+    long_description_header: "Describenos tu trabajo soñado"
+    long_description_blurb: "Cuenta a tus empleadores lo impresionante que eres y que trabajo estas buscando."
     long_description: "Descripción Personal"
 #    long_description_help: "Describe yourself to potential employers. Keep it short and to the point. We recommend outlining the position that would most interest you. Tasteful markdown okay; 600 characters max."
     work_experience: "Experiencia laboral"
-#    work_header: "Chronicle your work history"
+    work_header: "Cuentanos un poco de tu historial laboral"
     work_years: "Años de experiencia"
 #    work_years_help: "How many years of professional experience (getting paid) developing software do you have?"
 #    work_blurb: "List your relevant work experience, most recent first."
@@ -301,51 +301,51 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     our_notes: "Nuestras notas"
 #    remarks: "Remarks"
     projects: "Proyectos"
-#    projects_header: "Add 3 projects"
-#    projects_header_2: "Projects (Top 3)"
+    projects_header: "Añade 3 proyectos"
+    projects_header_2: "Proyectos (Top 3)"
 #    projects_blurb: "Highlight your projects to amaze employers."
-#    project_name: "Project Name"
-#    project_name_help: "What was the project called?"
+    project_name: "Nombre del proyecto"
+    project_name_help: "Como se llamaba el proyecto?"
     project_description: "Descripción"
-#    project_description_help: "Briefly describe the project."
-#    project_picture: "Picture"
-#    project_picture_help: "Upload a 230x115px or larger image showing off the project."
-#    project_link: "Link"
-#    project_link_help: "Link to the project."
-#    player_code: "Player Code"
+    project_description_help: "Describe el proyecto brevemente."
+    project_picture: "Foto"
+    project_picture_help: "Sube una imagen de 230x115px o mas grande enseñandonos el proyecto."
+    project_link: "Enlace"
+    project_link_help: "Enlace al proyecto."
+    player_code: "Codigo de Jugador"
 
   employers:
-#    hire_developers_not_credentials: "Hire developers, not credentials."
-#    get_started: "Get Started"
+    hire_developers_not_credentials: "Contrata desarrolladores, no credenciales."
+    get_started: "Empezar"
 #    already_screened: "We've already technically screened all our candidates"
 #    filter_further: ", but you can also filter further:"
-#    filter_visa: "Visa"
-#    filter_visa_yes: "US Authorized"
-#    filter_visa_no: "Not Authorized"
+    filter_visa: "Visa"
+    filter_visa_yes: "Autorizado en EEUU"
+    filter_visa_no: "No Autorizado"
 #    filter_education_top: "Top School"
 #    filter_education_other: "Other"
-#    filter_role_web_developer: "Web Developer"
-#    filter_role_software_developer: "Software Developer"
-#    filter_role_mobile_developer: "Mobile Developer"
-#    filter_experience: "Experience"
-#    filter_experience_senior: "Senior"
-#    filter_experience_junior: "Junior"
-#    filter_experience_recent_grad: "Recent Grad"
-#    filter_experience_student: "College Student"
-#    filter_results: "results"
-#    start_hiring: "Start hiring."
-#    reasons: "Three reasons you should hire through us:"
-#    everyone_looking: "Everyone here is looking for their next opportunity."
+    filter_role_web_developer: "Desarrollador Web"
+    filter_role_software_developer: "Desarrollador de Software"
+    filter_role_mobile_developer: "Desarrollador de Mobiles"
+    filter_experience: "Experiencia"
+    filter_experience_senior: "Senior"
+    filter_experience_junior: "Junior"
+    filter_experience_recent_grad: "Recien Graduado"
+    filter_experience_student: "Estudiante Universitario"
+    filter_results: "notas"
+    start_hiring: "Comenzar a contratar."
+    reasons: "Tres razones por las que deberias contratar a traves de nosotros:"
+    everyone_looking: "Todo el mundo aqui esta buscando su proxima oportunidad."
 #    everyone_looking_blurb: "Forget about 20% LinkedIn InMail response rates. Everyone that we list on this site wants to find their next position and will respond to your request for an introduction."
-#    weeding: "Sit back; we've done the weeding for you."
-#    weeding_blurb: "Every player that we list has been screened for technical ability. We also perform phone screens for select candidates and make notes on their profiles to save you time."
+    weeding: "Sientate; nosotros hemos hecho el trabajo por ti."
+    weeding_blurb: "Todos los jugadores que ponemos en la lista ha sido seguido por sus habilidades tecnicas. Tambien hacemos llamadas de telefono para los candidatos seleccionados y haz notas en sus perfiles para ahorrar tiempo."
 #    pass_screen: "They will pass your technical screen."
 #    pass_screen_blurb: "Review each candidate's code before reaching out. One employer found that 5x as many of our devs passed their technical screen than hiring from Hacker News."
-#    make_hiring_easier: "Make my hiring easier, please."
+    make_hiring_easier: "Hacer mi contratacion mas facil, por favor."
     what: "¿Qué es CodeCombat?"
 #    what_blurb: "CodeCombat is a multiplayer browser programming game. Players write code to control their forces in battle against other developers. Our players have experience with all major tech stacks."
-#    cost: "How much do we charge?"
-#    cost_blurb: "We charge 15% of first year's salary and offer a 100% money back guarantee for 90 days. We don't charge for candidates who are already actively being interviewed at your company."
+    cost: "Cuanto cobramos?"
+    cost_blurb: "Cobramos el 15% del salario del primer año y ofrecemos reembolso del 100% del dinero durante 90 dias. No cobramos a los candidatos que ya estan siendo entrevistados en tu compañia."
     candidate_name: "Nombre"
     candidate_location: "Ubicación"
     candidate_looking_for: "Buscando"
@@ -353,10 +353,10 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     candidate_top_skills: "Mejores Habilidades"
     candidate_years_experience: "Años Exp"
     candidate_last_updated: "Última actualización"
-#    candidate_who: "Who"
-#    featured_developers: "Featured Developers"
-#    other_developers: "Other Developers"
-#    inactive_developers: "Inactive Developers"
+    candidate_who: "Quien"
+    featured_developers: "Desarrolladores Destacados"
+    other_developers: "Otros Desarrolladores"
+    inactive_developers: "Desarrolladores Inactivos"
 
   play_level:
     done: "Hecho"
@@ -446,7 +446,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     multiplayer_tab: "Multijugador"
     inventory_caption: "Equipa a tu heroe"
     choose_hero_caption: "Elige la lengua del heroe"
-#    save_load_caption: "... and view history"
+    save_load_caption: "... y ver la historia"
     options_caption: "Ajustes de configuracion"
     guide_caption: "Documentos y pistas"
     multiplayer_caption: "Juega con amigos!"
@@ -467,7 +467,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     music_label: "Musica"
     music_description: "Musica de fondo on/off."
 #    autorun_label: "Autorun"
-#    autorun_description: "Control automatic code execution."
+    autorun_description: "Control automatico de codigo en ejecucion."
     editor_config: "Conf. editor"
     editor_config_title: "Configuración del editor"
     editor_config_level_language_label: "Lenguaje para este nivel"