diff --git a/app/locale/es.coffee b/app/locale/es.coffee
index 796762a23..ae1744d8d 100644
--- a/app/locale/es.coffee
+++ b/app/locale/es.coffee
@@ -1,8 +1,16 @@
 module.exports = nativeDescription: "español", englishDescription: "Spanish", translation:
   common:
     loading: "Cargando..."
-#    saving: "Saving..."
-#    sending: "Sending..."
+    saving: "Guardando..."
+    sending: "Enviando..."
+    cancel: "Cancelar"
+#    save: "Save"
+    delay_1_sec: "1 segundo"
+    delay_3_sec: "3 segundos"
+    delay_5_sec: "5 segundos"
+    manual: "Manual"
+#    fork: "Fork"
+    play: "Jugar"
 
   modal:
     close: "Cerrar"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     page_not_found: "Pagina no encontrada"
 
   nav:
-    sign_up: "Crear Cuenta"
-    log_in: "Iniciar Sesión"
-    log_out: "Cerrar Sesión"
     play: "Jugar"
     editor: "Editor"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     twitter_follow: "Seguir"
 #    employers: "Employers"
 
-  forms:
-    name: "Nombre"
-    email: "Email"
-    message: "Mensaje"
-    cancel: "Cancelar"
-#    save: "Save"
-
 #  versions:
 #    save_version_title: "Save New Version"
-#    commit_message: "Commit Message"
 #    new_major_version: "New Major Version"
 #    cla_prefix: "To save changes, first you must agree to our"
 #    cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    cla_agree: "I AGREE"
 
   login:
-#    login_modal_title: "Log In"
-    log_in: "Iniciar sesión"
-    sign_up: "crear nueva cuenta"
-    or: ", o "
+    sign_up: "Crear Cuenta"
+    log_in: "Iniciar Sesión"
+    log_out: "Cerrar Sesión"
     recover: "recuperar cuenta"
 
 #  recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     coppa_why: "¿Por qué?"
     creating: "Creando Cuenta..."
     sign_up: "Registrarse"
-    or: "o "
     log_in: "Inicia sesión con tu contraseña"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     forum_prefix: "Para cualquier cosa pública, por favor prueba "
     forum_page: "nuestro foro"
     forum_suffix: " en su lugar."
-    sending: "Enviando..."
     send: "Enviar Comentario"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     new_password_verify: "Verificar"
     email_subscriptions: "Suscripciones de Email"
     email_announcements: "Noticias"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Recibe correos electrónicos con las últimas noticias y desarrollos de CodeCombat."
     contributor_emails: "Correos Para Colaboradores"
     contribute_prefix: "¡Buscamos gente que se una a nuestro comunidad! Comprueba la "
     contribute_page: "página de colaboraciones"
     contribute_suffix: " para saber más."
     email_toggle: "Activar todo"
-    saving: "Guardando..."
     error_saving: "Error al guardar"
     saved: "Cambios guardados"
     password_mismatch: "El password no coincide"
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
     tome_cast_button_casting: "Invocando"
     tome_cast_button_cast: "Invocar"
     tome_autocast_delay: "Demora de Autolanzamiento"
-    tome_autocast_1: "1 segundo"
-    tome_autocast_3: "3 segundos"
-    tome_autocast_5: "5 segundos"
-    tome_autocast_manual: "Manual"
     tome_select_spell: "Selecciona un Hechizo"
     tome_select_a_thang: "Selecciona Alguien para "
     tome_available_spells: "Hechizos Disponibles"
     hud_continue: "Continuar (presionar shift+space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,29 +236,25 @@ module.exports = nativeDescription: "español", englishDescription: "Spanish", t
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
 
 #  article:
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
-#    name: "Name"
+    or: "o"
+    name: "Nombre"
 #    body: "Body"
 #    version: "Version"
 #    commit_msg: "Commit Message"
 #    version_history_for: "Version History for: "
 #    results: "Results"
 #    description: "Description"
+    email: "Email"
+    message: "Mensaje"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee
index 76d3e05ca..af4d97351 100644
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@@ -3,6 +3,14 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     loading: "...در حال بارگذاری"
     saving: "...در حال ذخیره سازی"
     sending: "...در حال ارسال"
+    cancel: "لغو"
+    save: "ذخیره "
+#    delay_1_sec: "1 second"
+#    delay_3_sec: "3 seconds"
+#    delay_5_sec: "5 seconds"
+#    manual: "Manual"
+#    fork: "Fork"
+    play: "سطوح"
 
   modal:
     close: "بستن"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     page_not_found: "صفحه پیدا نشد"
 
   nav:
-    sign_up: "ایجاد حساب کاربری"
-    log_in: "ورود"
-    log_out: "خروج"
     play: "سطوح"
     editor: "ویرایشگر"
     blog: "بلاگ"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     twitter_follow: "دنبال کردن"
     employers: "Employers"
 
-  forms:
-    name: "نام"
-    email: "ایمیل"
-    message: "پیام"
-    cancel: "لغو"
-    save: "ذخیره "
-
   versions:
     save_version_title: "ذخیره کردن نسخه جدید"
-    commit_message: "Commit Message"
     new_major_version: "New Major Version"
     cla_prefix: "To save changes, first you must agree to our"
     cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     cla_agree: "موافقم"
 
   login:
-    login_modal_title: "ورود"
-    log_in: "ورود"
     sign_up: "ایجاد حساب کاربری"
-    or: ", یا "
+    log_in: "ورود"
+    log_out: "خروج"
     recover: "بازیابی حساب کاربری"
 
   recover:
@@ -63,7 +59,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     coppa_why: "(چرا؟)"
     creating: "...در حال ایجاد حساب کاربری"
     sign_up: "ثبت نام"
-    or: " یا"
     log_in: "ورود به وسیله رمز عبور"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    forum_prefix: "For anything public, please try "
 #    forum_page: "our forum"
 #    forum_suffix: " instead."
-#    sending: "Sending..."
 #    send: "Send Feedback"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    new_password_verify: "Verify"
 #    email_subscriptions: "Email Subscriptions"
 #    email_announcements: "Announcements"
+#    email_notifications_description: "Get periodic notifications for your account."
 #    email_announcements_description: "Get emails on the latest news and developments at CodeCombat."
 #    contributor_emails: "Contributor Class Emails"
 #    contribute_prefix: "We're looking for people to join our party! Check out the "
 #    contribute_page: "contribute page"
 #    contribute_suffix: " to find out more."
 #    email_toggle: "Toggle All"
-#    saving: "Saving..."
 #    error_saving: "Error Saving"
 #    saved: "Changes Saved"
 #    password_mismatch: "Password does not match."
@@ -193,14 +187,11 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
 #    tome_autocast_delay: "Autocast Delay"
-#    tome_autocast_1: "1 second"
-#    tome_autocast_3: "3 seconds"
-#    tome_autocast_5: "5 seconds"
-#    tome_autocast_manual: "Manual"
 #    tome_select_spell: "Select a Spell"
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -225,14 +216,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -252,29 +236,25 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
 
 #  article:
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
-#    name: "Name"
+    or: "یا"
+    name: "نام"
 #    body: "Body"
 #    version: "Version"
 #    commit_msg: "Commit Message"
 #    version_history_for: "Version History for: "
 #    results: "Results"
 #    description: "Description"
+    email: "ایمیل"
+    message: "پیام"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"
diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee
index 9fed69194..a40025c55 100644
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@@ -3,6 +3,14 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     loading: "Töltés..."
     saving: "Mentés..."
     sending: "Küldés..."
+    cancel: "Mégse"
+    save: "Mentés"
+    delay_1_sec: "1 másodperc"
+    delay_3_sec: "2 másodperc"
+    delay_5_sec: "3 másodperc"
+    manual: "Kézi"
+#    fork: "Fork"
+    play: "Játék"
 
   modal:
     close: "Mégse"
@@ -12,9 +20,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     page_not_found: "Az oldal nem található"
 
   nav:
-    sign_up: "Regisztráció"
-    log_in: "Bejelentkezés"
-    log_out: "Kijelentkezés"
     play: "Játék"
     editor: "Szerkesztő"
     blog: "Blog"
@@ -28,16 +33,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     twitter_follow: "Követés"
 #    employers: "Employers"
 
-  forms:
-    name: "Név"
-    email: "Email cím"
-    message: "Üzenet"
-    cancel: "Mégse"
-    save: "Mentés"
-
   versions:
     save_version_title: "Új verzió mentése"
-    commit_message: "Megjegyzés"
     new_major_version: "Új főverzió"
     cla_prefix: "A módosítások elmentéséhez el kell fogadnod a "
     cla_url: "CLA"
@@ -45,10 +42,9 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     cla_agree: "ELFOGADOM"
 
   login:
-    login_modal_title: "Bejelentkezés"
+    sign_up: "Regisztráció"
     log_in: "Bejelentkezés"
-    sign_up: "Új fiók létrehozása"
-    or: ", vagy "
+    log_out: "Kijelentkezés"
     recover: "meglévő fiók visszaállítása"
 
   recover:
@@ -62,7 +58,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     coppa_why: "(Miért?)"
     creating: "Fiók létrehozása"
     sign_up: "Regisztráció"
-    or: "vagy "
     log_in: "belépés meglévő fiókkal"
 
   home:
@@ -96,7 +91,6 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     forum_prefix: "Ha publikus dologról van szó, megpróbálhatod a "
     forum_page: "fórumban"
     forum_suffix: " is."
-    sending: "Küldés..."
     send: "Visszajelzés küldése"
 
   diplomat_suggestion:
@@ -128,13 +122,13 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     new_password_verify: "Mégegyszer"
     email_subscriptions: "Hírlevél feliratkozások"
     email_announcements: "Bejelentések"
+#    email_notifications_description: "Get periodic notifications for your account."
     email_announcements_description: "Szeretnél levelet kapni a legújabb fejlesztéseinkről?"
     contributor_emails: "Hozzájárulóknak szóló levelek"
     contribute_prefix: "Folyamatosan keresünk embereket, hogy csatlakozzanak hozzánk. Nézz rá a "
     contribute_page: "segítők oldalára"
     contribute_suffix: " információkért."
     email_toggle: "Az összes megjelölése"
-    saving: "Mentés..."
     error_saving: "Hiba a mentés során"
     saved: "Változtatások elmentve"
     password_mismatch: "A jelszavak nem egyeznek."
@@ -165,9 +159,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     multiplayer: "Többjátékos"
     restart: "Előről"
     goals: "Célok"
-#   "Tettvonal" sounds like "line of a crime" or something. "Akció idővonal" a little better but even not the best. I'll think about it later (csuvasregal - Sárosi Gergely)
-    action_timeline: "Akció - Idővonal"
-#   action_timeline: "Tettvonal"
+    action_timeline: "Akció - Idővonal" # or "Tettvonal" #   "Tettvonal" sounds like "line of a crime" or something. "Akció idővonal" a little better but even not the best. I'll think about it later (csuvasregal - Sárosi Gergely)
     click_to_select: "Kattints egy egységre, hogy kijelöld!"
     reload_title: "Újra kezded mindet?"
     reload_really: "Biztos vagy benne, hogy előről szeretnéd kezdeni az egész pályát?"
@@ -195,14 +187,11 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    tome_cast_button_casting: "Casting"
 #    tome_cast_button_cast: "Spell Cast"
     tome_autocast_delay: "Auto varázslás késleltetés"
-    tome_autocast_1: "1 másodperc"
-    tome_autocast_3: "2 másodperc"
-    tome_autocast_5: "3 másodperc"
-    tome_autocast_manual: "Kézi"
     tome_select_spell: "Válassz egy varázslatot"
     tome_select_a_thang: "Válassz ki valakit "
     tome_available_spells: "Elérhető varázslatok"
     hud_continue: "Folytatás (shift+space)"
+#    spell_saved: "Spell Saved"
 
 #  admin:
 #    av_title: "Admin Views"
@@ -227,14 +216,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    contact_us: "contact us!"
 #    hipchat_prefix: "You can also find us in our"
 #    hipchat_url: "HipChat room."
-#    level_btn_save: "Save"
-#    level_btn_fork: "Fork"
-#    level_btn_play: "Play"
 #    level_some_options: "Some Options?"
-#    level_options_1_second: "1 second"
-#    level_options_3_seconds: "3 seconds"
-#    level_options_5_seconds: "5 seconds"
-#    level_options_manual: "Manual"
 #    level_tab_thangs: "Thangs"
 #    level_tab_scripts: "Scripts"
 #    level_tab_settings: "Settings"
@@ -254,29 +236,25 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    level_component_edit_title: "Edit Component"
 #    level_system_edit_title: "Edit System"
 #    create_system_title: "Create New System"
-#    create_system_field_name: "Name"
-#    create_system_btn_cancel: "Cancel"
-#    create_system_btn_create: "Create"
 #    new_component_title: "Create New Component"
 #    new_component_field_system: "System"
-#    new_component_field_name: "Name"
-#    new_component_btn_cancel: "Cancel"
-#    new_component_btn_create: "Create"
 
 #  article:
 #    edit_btn_preview: "Preview"
-#    edit_btn_save: "Save"
 #    edit_article_title: "Edit Article"
 
-#  general:
+  general:
 #    and: "and"
-#    name: "Name"
+    or: "vagy "
+    name: "Név"
 #    body: "Body"
 #    version: "Version"
-#    commit_msg: "Commit Message"
+    commit_msg: "Megjegyzés"
 #    version_history_for: "Version History for: "
 #    results: "Results"
 #    description: "Description"
+    email: "Email cím"
+    message: "Üzenet"
 
 #  about:
 #    who_is_codecombat: "Who is CodeCombat?"