diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index 4476822dc..1d73ddfd0 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -277,27 +277,27 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     work_experience: "Experiencia laboral"
     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."
-#    work_employer: "Employer"
-#    work_employer_help: "Name of your employer."
+    work_years_help: "Cuantos años de experiencia profesional(remunerada) como desarrollador de sofware tienes?"
+    work_blurb: "Haz un listado con la experiencia laboral relevante, los mas recientes primero."
+    work_employer: "Empresa/Empleador"
+    work_employer_help: "Nombre de la empresa /el empleador."
 #    work_role: "Job Title"
 #    work_role_help: "What was your job title or role?"
     work_duration: "Duración"
 #    work_duration_help: "When did you hold this gig?"
     work_description: "Descripción"
-#    work_description_help: "What did you do there? (140 chars; optional)"
+    work_description_help: "Que has hecho alli? (140 caracteres maximo; opcional)"
     education: "Educación"
 #    education_header: "Recount your academic ordeals"
 #    education_blurb: "List your academic ordeals."
-#    education_school: "School"
-#    education_school_help: "Name of your school."
-#    education_degree: "Degree"
-#    education_degree_help: "What was your degree and field of study?"
-#    education_duration: "Dates"
+    education_school: "Universidad"
+    education_school_help: "Nombre de la Universidad."
+    education_degree: "Titulo"
+    education_degree_help: "Cual era tu carrera y tu campo de estudio?"
+    education_duration: "Duracion"
     education_duration_help: "¿Cuándo?"
     education_description: "Descripción"
-#    education_description_help: "Highlight anything about this educational experience. (140 chars; optional)"
+    education_description_help: "Resalta algo de tu experiencia educacional. (140 caracteres maximo; optional)"
     our_notes: "Nuestras notas"
 #    remarks: "Remarks"
     projects: "Proyectos"
@@ -318,12 +318,12 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     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_further: ", Pero puedes filtrar mas alla:"
     filter_visa: "Visa"
     filter_visa_yes: "Autorizado en EEUU"
     filter_visa_no: "No Autorizado"
 #    filter_education_top: "Top School"
-#    filter_education_other: "Other"
+    filter_education_other: "Otros"
     filter_role_web_developer: "Desarrollador Web"
     filter_role_software_developer: "Desarrollador de Software"
     filter_role_mobile_developer: "Desarrollador de Mobiles"
@@ -473,7 +473,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     editor_config_level_language_label: "Lenguaje para este nivel"
     editor_config_level_language_description: "Escoge lenguaje de programacion para este nivel en concreto."
     editor_config_default_language_label: "Lenguaje de programación por defecto"
-#    editor_config_default_language_description: "Define the programming language you want to code in when starting new levels."
+    editor_config_default_language_description: "Define el lenguaje de programacion en el que quieres programar cuando empieces un nuevo nivel."
     editor_config_keybindings_label: "Atajos de teclado"
     editor_config_keybindings_default: "Actual (Ace)"
     editor_config_keybindings_description: "Permite el uso de atajos de teclado de algunos editores conocidos."
@@ -521,17 +521,17 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     move_wizard: "Mover a tu hechicero por el nivel."
 
   admin:
-#    av_espionage: "Espionage"
-#    av_espionage_placeholder: "Email or username"
-#    av_usersearch: "User Search"
-#    av_usersearch_placeholder: "Email, username, name, whatever"
-#    av_usersearch_search: "Search"
+    av_espionage: "Espionage"
+    av_espionage_placeholder: "Email o Nombre de usuario"
+    av_usersearch: "Buscar Usuarios"
+    av_usersearch_placeholder: "Email, nombre de usuario, nombre, lo que sea"
+    av_usersearch_search: "Buscar"
     av_title: "Vista de administrador"
     av_entities_sub_title: "Entidades"
     av_entities_users_url: "Usuarios"
     av_entities_active_instances_url: "Instancias Activas"
     av_entities_employer_list_url: "Lista de empleados"
-#    av_entities_candidates_list_url: "Candidate List"
+    av_entities_candidates_list_url: "Lista de Candidatos"
     av_other_sub_title: "Otros"
     av_other_debug_base_url: "Base (para debugging base.jade)"
     u_title: "Lista de Usuarios"
@@ -548,12 +548,12 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    article_editor_prefix: "See a mistake in some of our docs? Want to make some instructions for your own creations? Check out the"
 #    article_editor_suffix: "and help CodeCombat players get the most out of their playtime."
     find_us: "Encuentranos en estos sitios"
-#    social_blog: "Read the CodeCombat blog on Sett"
-#    social_discource: "Join the discussion on our Discourse forum"
-#    social_facebook: "Like CodeCombat on Facebook"
-#    social_twitter: "Follow CodeCombat on Twitter"
-#    social_gplus: "Join CodeCombat on Google+"
-#    social_hipchat: "Chat with us in the public CodeCombat HipChat room"
+    social_blog: "Lee el blog de CodeCombat en Sett"
+    social_discource: "Unete a la discusion en nuestro foro"
+    social_facebook: "Dale a Me Gusta a CodeCombat en Facebook"
+    social_twitter: "Sigue a CodeCombat en Twitter"
+    social_gplus: "Unete a CodeCombat en Google+"
+    social_hipchat: "Habla con nosotros en el chat publico de CodeCombat HipChat room"
     contribute_to_the_project: "Contribuye al proyecto"
 
   editor:
@@ -618,7 +618,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     no_achievements: "No se han añadido logros a este nivel."
 #    achievement_query_misc: "Key achievement off of miscellanea"
 #    achievement_query_goals: "Key achievement off of level goals"
-#    level_completion: "Level Completion"
+    level_completion: "Porcentaje de Nivel Completado"
 
   article:
     edit_btn_preview: "Vista preliminar"
@@ -959,7 +959,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     top_simulators: "Top simuladores"
     source_document: "Documento fuente"
     document: "Documento"
-#    sprite_sheet: "Sprite Sheet"
+    sprite_sheet: "Hoja de Duende"
     employers: "Empleados"
     candidates: "Candidatos"
     candidate_sessions: "Sesiones de Candidato"