diff --git a/app/locale/ar.coffee b/app/locale/ar.coffee
index 718386713..546e98e74 100644
--- a/app/locale/ar.coffee
+++ b/app/locale/ar.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "العربية", englishDescription: "Arabi
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/bg.coffee b/app/locale/bg.coffee
index 84743619a..c35ea31e2 100644
--- a/app/locale/bg.coffee
+++ b/app/locale/bg.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "български език", englishDescri
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "български език", englishDescri
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "български език", englishDescri
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "български език", englishDescri
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/ca.coffee b/app/locale/ca.coffee
index 10ecb6bc8..50fbf8b8d 100644
--- a/app/locale/ca.coffee
+++ b/app/locale/ca.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    retrostyle_blurb: "RetroStyle Games"
 
   teachers:
-    title: "CodeCombat per a professors" # {change}
+    title: "CodeCombat per a professors"
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     picture_tab: "Foto"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Carrega una foto"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     admin: "Administrador"
     new_password: "Contrasenya nova"
     new_password_verify: "Verifica"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Subscripcions via correu electrònic"
     email_subscriptions_none: "Sense subsrcipcions de correu electrònic."
     email_announcements: "Notícies"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Català", englishDescription: "Catalan", tr
     keyboard_shortcuts: "Dreceres del teclat"
     space: "Espai"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/cs.coffee b/app/locale/cs.coffee
index 616ff15ef..33eae2e21 100644
--- a/app/locale/cs.coffee
+++ b/app/locale/cs.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    retrostyle_blurb: "RetroStyle Games"
 
   teachers:
-    title: "CodeCombat pro učitele" # {change}
+    title: "CodeCombat pro učitele"
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     picture_tab: "Obrázek"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Nahrát obrázek"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     admin: "Admin"
     new_password: "Nové heslo"
     new_password_verify: "Potvrdit"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Odebírat emailem"
     email_subscriptions_none: "Žádné odebírání emailem."
     email_announcements: "Oznámení"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "čeština", englishDescription: "Czech", tr
     keyboard_shortcuts: "Klávesové zkratky"
     space: "Mezerník"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: "Spustit současný kód."
diff --git a/app/locale/da.coffee b/app/locale/da.coffee
index f15a5f3a2..286b04c5e 100644
--- a/app/locale/da.coffee
+++ b/app/locale/da.coffee
@@ -155,7 +155,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     info: "Info"
     help: "Hjælp"
     watch: "Hold øje"
-    unwatch: "Stop med at holde øje" # alternately "Ignorer", but not really perfect either
+    unwatch: "Stop med at holde øje"
     submit_patch: "Indsend patch"
     submit_changes: "Indsend ændringer"
     save_changes: "Gem ændringer"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
     picture_tab: "Billede"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    admin: "Admin"
     new_password: "Nyt Password"
     new_password_verify: "Bekræft"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Emailtilmeldinger"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Nyheder"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "dansk", englishDescription: "Danish", trans
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/de-AT.coffee b/app/locale/de-AT.coffee
index 13678a31f..ff71c3f7a 100644
--- a/app/locale/de-AT.coffee
+++ b/app/locale/de-AT.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     picture_tab: "Bild"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Ein Bild hochladen"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     admin: "Admin"
     new_password: "Neues Passwort"
     new_password_verify: "Passwort verifizieren"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Email Abonnements"
     email_subscriptions_none: "Keine Email Abonnements."
     email_announcements: "Ankündigungen"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Deutsch (Österreich)", englishDescription:
     keyboard_shortcuts: "Tastaturkürzel"
     space: "Leertaste"
     enter: "Eingabetaste"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Umschalttaste"
 #    run_code: "Run current code."
diff --git a/app/locale/de-CH.coffee b/app/locale/de-CH.coffee
index 5b03c9bf1..cf88d26ff 100644
--- a/app/locale/de-CH.coffee
+++ b/app/locale/de-CH.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     picture_tab: "Bild"
     delete_account_tab: "Din Account lösche"
     wrong_email: "Falschi Email Adrässe"
+#    wrong_password: "Wrong Password"
     upload_picture: "Es Bild ufelade"
     delete_this_account: "Dä Account für immer Lösche"
     god_mode: "Gott Modus"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     admin: "Admin"
     new_password: "Neus Passwort"
     new_password_verify: "Bestätige"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "E-Mail Abos"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Akündigunge"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Dütsch (Schwiiz)", englishDescription: "Ge
     keyboard_shortcuts: "Shortcuts uf de Tastatur"
     space: "Space"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: "De jetzig Code laufe laa."
diff --git a/app/locale/de-DE.coffee b/app/locale/de-DE.coffee
index 89852bd83..505329a0f 100644
--- a/app/locale/de-DE.coffee
+++ b/app/locale/de-DE.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     retrostyle_blurb: "RetroStyle Games"
 
   teachers:
-    title: "CodeCombat für Lehrer" # {change}
+    title: "CodeCombat für Lehrer"
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     picture_tab: "Bild"
     delete_account_tab: "Account löschen"
     wrong_email: "Falsche Email Adresse"
+#    wrong_password: "Wrong Password"
     upload_picture: "Ein Bild hochladen"
     delete_this_account: "Das Löschen deines Accounts kann nicht rückgängig gemacht werden!"
     god_mode: "Gottmodus"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     new_password: "Neues Passwort"
     new_password_verify: "Passwort verifizieren"
     type_in_email: "Email eingeben, um Löschung zu bestätigen"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Email Abonnements"
     email_subscriptions_none: "Keine Email Abonnements."
     email_announcements: "Ankündigungen"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Deutsch (Deutschland)", englishDescription:
     keyboard_shortcuts: "Tastaturkürzel"
     space: "Leertaste"
     enter: "Eingabetaste"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Umschalttaste"
     run_code: "Starte aktuellen Code."
diff --git a/app/locale/el.coffee b/app/locale/el.coffee
index 8aed7638f..a1795a684 100644
--- a/app/locale/el.coffee
+++ b/app/locale/el.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     picture_tab: "Φωτογραφία"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Ανέβασμα φωτογραφίας"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
     admin: "Διαχειριστής"
     new_password: "Καινούργιος Κωδικός"
     new_password_verify: " Επαλήθευση  Κωδικού"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Συνδρομές Email"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Ανακοινώσεις"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Ελληνικά", englishDescription: "Gre
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/en-GB.coffee b/app/locale/en-GB.coffee
index 37b880edf..558bff3cf 100644
--- a/app/locale/en-GB.coffee
+++ b/app/locale/en-GB.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "English (UK)", englishDescription: "English
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/en-US.coffee b/app/locale/en-US.coffee
index cb5f6a342..57ac0b138 100644
--- a/app/locale/en-US.coffee
+++ b/app/locale/en-US.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "English (US)", englishDescription: "English
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/en.coffee b/app/locale/en.coffee
index bd266dc04..0f2dbe426 100644
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@@ -647,12 +647,12 @@
     must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
     retrieving: "Retrieving information..."
     being_reviewed_1: "Your application for a free trial subscription is being"
-    being_reviewed_2: "reviewed." # {change}
+    being_reviewed_2: "reviewed."
     approved_1: "Your application for a free trial subscription was"
-    approved_2: "approved." # {change}
+    approved_2: "approved."
     approved_3: "Further instructions have been sent to"
     denied_1: "Your application for a free trial subscription has been"
-    denied_2: "denied." # {change}
+    denied_2: "denied."
     contact_1: "Please contact"
     contact_2: "if you have further questions."
     description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -714,8 +714,8 @@
     admin: "Admin"
     new_password: "New Password"
     new_password_verify: "Verify"
-    type_in_email: "Type in your email to confirm the deletion"
-    type_in_password: "Type in your password also"
+    type_in_email: "Type in your email to confirm account deletion."
+    type_in_password: "Also, type in your password."
     email_subscriptions: "Email Subscriptions"
     email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Announcements"
diff --git a/app/locale/eo.coffee b/app/locale/eo.coffee
index 3cec1d64b..60fc113cd 100644
--- a/app/locale/eo.coffee
+++ b/app/locale/eo.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Esperanto", englishDescription: "Esperanto"
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/es-419.coffee b/app/locale/es-419.coffee
index 20330e441..03b7ca979 100644
--- a/app/locale/es-419.coffee
+++ b/app/locale/es-419.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     retrostyle_blurb: "Juegos con estilo Retro"
 
   teachers:
-    title: "CodeCombat para Profesores" # {change}
+    title: "CodeCombat para Profesores"
     intro_1: "CodeCombat es un juego online que enseña a programar.Los estudiantes escriben código en idiomas de programación real."
     intro_2: "No se necesita experiencia previa!"
     free_title: "¿Cuanto cuesta?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     picture_tab: "Imagen"
     delete_account_tab: "Borra tu cuenta"
     wrong_email: "Mail Incorrecto"
+#    wrong_password: "Wrong Password"
     upload_picture: "Sube una imagen"
     delete_this_account: "Borrar esta cuenta permanentemente"
     god_mode: "Modo Dios"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     new_password: "Nueva Contraseña"
     new_password_verify: "Verificar"
     type_in_email: "Ingrese su correo electrónico para confirmar la eliminación"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Suscripciones de Email"
     email_subscriptions_none: "No tienes suscripciones."
     email_announcements: "Noticias"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Español (América Latina)", englishDescrip
     keyboard_shortcuts: "Atajos de teclado"
     space: "Barra espaciadora"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: "Ejecutar el código."
diff --git a/app/locale/es-ES.coffee b/app/locale/es-ES.coffee
index b66aab1a1..73cc09694 100644
--- a/app/locale/es-ES.coffee
+++ b/app/locale/es-ES.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     picture_tab: "Foto"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Sube una imagen"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     admin: "Admin"
     new_password: "Nueva contraseña"
     new_password_verify: "Verificar"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Suscripciones de correo electrónico"
     email_subscriptions_none: "Sin suscripciones de correo electrónico."
     email_announcements: "Noticias"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "español (ES)", englishDescription: "Spanis
     keyboard_shortcuts: "Atajos de teclado"
     space: "Barra espaciadora (Espacio)"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: "Ejecutar código actual."
diff --git a/app/locale/fa.coffee b/app/locale/fa.coffee
index fe6cb9b4c..6260074b2 100644
--- a/app/locale/fa.coffee
+++ b/app/locale/fa.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
     picture_tab: "تصاویر"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "فارسی", englishDescription: "Persian",
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/fi.coffee b/app/locale/fi.coffee
index 0e439f03a..30a9d5bdb 100644
--- a/app/locale/fi.coffee
+++ b/app/locale/fi.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     picture_tab: "Kuva"
     delete_account_tab: "Poista Tili"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Lataa kuva"
     delete_this_account: "Poista tili lopullisesti"
 #    god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     new_password: "Uusi Salasana"
     new_password_verify: "Varmista"
     type_in_email: "Anna sähköpostiosoitteesi varmistukseksi"
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Tiedotteet"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "suomi", englishDescription: "Finnish", tran
     keyboard_shortcuts: "Pikanäppäimet"
     space: "Välilyönti"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
     run_code: "Suorita koodi."
diff --git a/app/locale/fr.coffee b/app/locale/fr.coffee
index 6b7a7d64d..0a6a4e2dd 100644
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    retrostyle_blurb: "RetroStyle Games"
 
   teachers:
-    title: "CodeCombat pour les enseignants" # {change}
+    title: "CodeCombat pour les enseignants"
     intro_1: "CodeCombat est un jeu en ligne qui enseigne la programmation. Les élèves écrivent du code dans de vrais langages de programmation."
     intro_2: "Aucune expérience requise !"
     free_title: "Combien cela coûte-t-il ?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     picture_tab: "Photos"
     delete_account_tab: "Supprimer votre compte"
     wrong_email: "Mauvaise adresse e-mail"
+#    wrong_password: "Wrong Password"
     upload_picture: "Télécharger une image"
     delete_this_account: "Supprimer votre compte définitivement"
     god_mode: "Puissance Divine"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     new_password: "Nouveau mot de passe"
     new_password_verify: "Vérifier"
     type_in_email: "Entrez votre adresse e-mail pour confirmer la supression de votre compte"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Abonnements"
     email_subscriptions_none: "Aucun e-mail d'abonnement."
     email_announcements: "Annonces"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
     keyboard_shortcuts: "Raccourcis Clavier"
     space: "Espace"
     enter: "Entrer"
+#    press_enter: "press enter"
     escape: "Echap"
     shift: "Shift"
     run_code: "Exécuter le code actuel."
diff --git a/app/locale/gl.coffee b/app/locale/gl.coffee
index 1dc4ffa7a..4cb67fa60 100644
--- a/app/locale/gl.coffee
+++ b/app/locale/gl.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     picture_tab: "Foto"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Sube unha imaxe"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     admin: "Admin"
     new_password: "Novo contrasinal"
     new_password_verify: "Verificar"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Suscripcións de correo electrónico"
     email_subscriptions_none: "Sen suscripcións de correo electrónico."
     email_announcements: "Novas"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Galego", englishDescription: "Galician", tr
     keyboard_shortcuts: "Atallos de teclado"
     space: "Barra espaciadora (Espazo)"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/he.coffee b/app/locale/he.coffee
index 2b3a8f306..f366c6c02 100644
--- a/app/locale/he.coffee
+++ b/app/locale/he.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     picture_tab: "תמונה"
     delete_account_tab: "מחק את חשבונך"
     wrong_email: "כתובת מייל שגויה."
+#    wrong_password: "Wrong Password"
     upload_picture: "העלה תמונה"
     delete_this_account: "מחק את חשבון זה לתמיד"
     god_mode: "מצב אל"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     new_password: "סיסמה חדשה"
     new_password_verify: "חזור על הסיסמה שנית"
     type_in_email: "הזן את כתובת המייל שלך על מנת לבצע את המחיקה"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "הרשמויות אימייל"
     email_subscriptions_none: ".אין מנויי מייל"
     email_announcements: "הודעות"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "עברית", englishDescription: "Hebrew",
     keyboard_shortcuts: "קיצורי מקשים"
     space: "Space"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: ".הרץ קוד נוכחי"
diff --git a/app/locale/hi.coffee b/app/locale/hi.coffee
index 0e4f9b8ba..297ebcc77 100644
--- a/app/locale/hi.coffee
+++ b/app/locale/hi.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "मानक हिन्दी", englishDe
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/hu.coffee b/app/locale/hu.coffee
index e74113b6f..224ad4e6b 100644
--- a/app/locale/hu.coffee
+++ b/app/locale/hu.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     picture_tab: "Kép"
     delete_account_tab: "Fiók törlése"
     wrong_email: "Rossz email-cím"
+#    wrong_password: "Wrong Password"
     upload_picture: "Tölts föl egy képet"
     delete_this_account: "Fiók végleges törlése"
 #    god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     new_password: "Új jelszó"
     new_password_verify: "Új jelszó megismétlése"
     type_in_email: "Írd be az email-címed a törlés megerősítéséhez"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Hírlevél feliratkozások"
     email_subscriptions_none: "Nem kérek email értesítéseket."
     email_announcements: "Bejelentések"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "magyar", englishDescription: "Hungarian", t
     keyboard_shortcuts: "Billentyűparancsok"
     space: "Szünet"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Kilépés"
 #    shift: "Shift"
     run_code: "Aktuális kód futtatása."
diff --git a/app/locale/id.coffee b/app/locale/id.coffee
index a34620738..2c324e1ed 100644
--- a/app/locale/id.coffee
+++ b/app/locale/id.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Bahasa Indonesia", englishDescription: "Ind
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/it.coffee b/app/locale/it.coffee
index 2631fc4b3..62db971c9 100644
--- a/app/locale/it.coffee
+++ b/app/locale/it.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     picture_tab: "Immagine"
     delete_account_tab: "Cancella il tuo account"
     wrong_email: "Indirizzo email sbagliato"
+#    wrong_password: "Wrong Password"
     upload_picture: "Carica immagine"
     delete_this_account: "Cancella questo account per sempre"
 #    god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     new_password: "Nuova password"
     new_password_verify: "Verifica"
     type_in_email: "Scrivi il tuo indirizzo email per confermare la cancellazione"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Iscrizioni alle email"
     email_subscriptions_none: "Nessuna iscrizione."
     email_announcements: "Annunci email"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Italiano", englishDescription: "Italian", t
     keyboard_shortcuts: "Scorciatoie da tastiera"
     space: "Spazio"
     enter: "Invio"
+#    press_enter: "press enter"
     escape: "Esc"
     shift: "Maiusc"
     run_code: "Esegui codice attuale."
diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index 97d4836dc..2869927b8 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     picture_tab: "画像"
     delete_account_tab: "アカウントの削除"
     wrong_email: "間違ったメールアドレス"
+#    wrong_password: "Wrong Password"
     upload_picture: "画像をアップロード"
     delete_this_account: "アカウントを完全削除する"
     god_mode: "ゴッドモード"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     new_password: "新パスワード"
     new_password_verify: "新パスワードを再入力"
     type_in_email: "削除を確認するため、メールを入力して下さい"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "ニュースレターの購読"
     email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "お知らせ"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     keyboard_shortcuts: "キーボードショートカット"
     space: "スペース"
     enter: "エンター"
+#    press_enter: "press enter"
     escape: "エスケープ"
     shift: "シフト"
     run_code: "現在のコードを実行"
diff --git a/app/locale/ko.coffee b/app/locale/ko.coffee
index f4b7fd349..c4d4d6c24 100644
--- a/app/locale/ko.coffee
+++ b/app/locale/ko.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     picture_tab: "사진"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "사진 업로드"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     admin: "관리자"
     new_password: "새 비밀번호"
     new_password_verify: "확인(다시한번 입력해주세요)"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "이메일 구독"
     email_subscriptions_none: "이메일 구독 안 함"
     email_announcements: "공지사항"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "한국어", englishDescription: "Korean", t
     keyboard_shortcuts: "단축키"
     space: "스페이스"
     enter: "엔터"
+#    press_enter: "press enter"
     escape: "Esc"
     shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/lt.coffee b/app/locale/lt.coffee
index 51f0c7eee..490ff548d 100644
--- a/app/locale/lt.coffee
+++ b/app/locale/lt.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "lietuvių kalba", englishDescription: "Lith
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/mk-MK.coffee b/app/locale/mk-MK.coffee
index ddd5ffdac..84dc15ef6 100644
--- a/app/locale/mk-MK.coffee
+++ b/app/locale/mk-MK.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Македонски", englishDescription:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/ms.coffee b/app/locale/ms.coffee
index 868b7e182..eb5d924f5 100644
--- a/app/locale/ms.coffee
+++ b/app/locale/ms.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
     picture_tab: "Gambar"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    admin: "Admin"
     new_password: "Kata-laluan baru"
     new_password_verify: "Verifikasi"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Pengumuman"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Bahasa Melayu", englishDescription: "Bahasa
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/nb.coffee b/app/locale/nb.coffee
index e88a23406..525d14c38 100644
--- a/app/locale/nb.coffee
+++ b/app/locale/nb.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     picture_tab: "Bilde"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Last opp bilde"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     admin: "Administrator"
     new_password: "Nytt Passord"
     new_password_verify: "Bekreft passord"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Epost Abonnement"
     email_subscriptions_none: "Ingen Epost Abonnement."
     email_announcements: "Kunngjøringer"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Norsk Bokmål", englishDescription: "Norweg
     keyboard_shortcuts: "Hurtigtaster"
     space: "Mellomrom"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: "Kjør koden."
diff --git a/app/locale/nl-BE.coffee b/app/locale/nl-BE.coffee
index d4b2572bc..29967f2e5 100644
--- a/app/locale/nl-BE.coffee
+++ b/app/locale/nl-BE.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     picture_tab: "Afbeelding"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
     admin: "Administrator"
     new_password: "Nieuw Wachtwoord"
     new_password_verify: "Verifieer"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "E-mail Abonnementen"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Aankondigingen"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Nederlands (België)", englishDescription:
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/nl-NL.coffee b/app/locale/nl-NL.coffee
index 3d454ae41..8a919e3a5 100644
--- a/app/locale/nl-NL.coffee
+++ b/app/locale/nl-NL.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     picture_tab: "Afbeelding"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Je afbeelding opsturen"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
     admin: "Administrator"
     new_password: "Nieuw Wachtwoord"
     new_password_verify: "Verifieer"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Email Abonnementen"
     email_subscriptions_none: "Geen Email Abonnementen."
     email_announcements: "Aankondigingen"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Nederlands (Nederland)", englishDescription
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/nn.coffee b/app/locale/nn.coffee
index 78a063d00..b39ef66fb 100644
--- a/app/locale/nn.coffee
+++ b/app/locale/nn.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Norsk Nynorsk", englishDescription: "Norweg
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/pl.coffee b/app/locale/pl.coffee
index 32d21040a..783b6a25a 100644
--- a/app/locale/pl.coffee
+++ b/app/locale/pl.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     picture_tab: "Zdjęcie"
     delete_account_tab: "Usuń swoje konto"
     wrong_email: "Błędny e-mail"
+#    wrong_password: "Wrong Password"
     upload_picture: "Wgraj zdjęcie"
     delete_this_account: "Usuń to konto całkowicie"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     admin: "Administrator"
     new_password: "Nowe hasło"
     new_password_verify: "Zweryfikuj"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Powiadomienia email"
     email_subscriptions_none: "Brak powiadomień e-mail."
     email_announcements: "Ogłoszenia"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "polski", englishDescription: "Polish", tran
     keyboard_shortcuts: "Skróty klawiszowe"
     space: "Spacja"
     enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
     shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/pt-BR.coffee b/app/locale/pt-BR.coffee
index 8a06b5748..374b17a02 100644
--- a/app/locale/pt-BR.coffee
+++ b/app/locale/pt-BR.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     retrostyle_blurb: "Games estilo Retrô"
 
   teachers:
-    title: "CodeCombat para Professores" # {change}
+    title: "CodeCombat para Professores"
     intro_1: "CodeCombat é um jogo online que ensina programação. Estudantes criam código em linguagens de programação usadas na vida real."
     intro_2: "Não é necessário ter experiência!"
     free_title: "Quanto custa?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     picture_tab: "Foto"
     delete_account_tab: "Excluir sua conta"
     wrong_email: "E-mail incorreto"
+#    wrong_password: "Wrong Password"
     upload_picture: "Enviar uma foto"
     delete_this_account: "Excluir essa conta definitivamente"
     god_mode: "Modo Deus"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     new_password: "Nova Senha"
     new_password_verify: "Confirmação"
     type_in_email: "Digite seu e-mail para confirmar a exclusão"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Assinaturas para Notícias por Email"
     email_subscriptions_none: "Sem Assinaturas de Email"
     email_announcements: "Notícias"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Português do Brasil", englishDescription:
     keyboard_shortcuts: "Atalhos do Teclado"
     space: "Espaço"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Esc"
     shift: "Shift"
     run_code: "Rodar código atual."
diff --git a/app/locale/pt-PT.coffee b/app/locale/pt-PT.coffee
index 8d953feaa..0f834d08d 100644
--- a/app/locale/pt-PT.coffee
+++ b/app/locale/pt-PT.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     must_be_logged: "Primeiro tens de ter sessão iniciada. Por favor, cria uma conta ou inicia sessão a partir do menu acima."
     retrieving: "A recolher informações..."
     being_reviewed_1: "A tua aplicação para uma subscrição de avaliação gratuita está a ser"
-    being_reviewed_2: "revista"
+    being_reviewed_2: "revista" # {change}
     approved_1: "A tua aplicação para uma subscrição de avaliação gratuita foi"
-    approved_2: "aprovada"
+    approved_2: "aprovada" # {change}
     approved_3: "Mais instruções foram enviadas para"
     denied_1: "A tua aplicação para uma subscrição de avaliação gratuita foi"
-    denied_2: "recusada"
+    denied_2: "recusada" # {change}
     contact_1: "Por favor, contacta"
     contact_2: "se tiveres mais questões."
     description_1: "Oferecemos subscrições gratuitas a professores para efeitos de avaliação. Na nossa página para"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     description_3: "podes encontar muitas mais informações."
     description_4: "Por favor, preenche este pequeno inquérito e nós enviar-te-emos, por e-mail, as instruções de configuração."
     email: "Endereço de E-mail"
-    school_city: "Nome da Escola, Cidade"
+#    school: "Name of School"
+#    location: "Name of City"
     age_students: "Que idade têm os teus alunos?"
     under: "Menos de"
     other: "Outra:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     picture_tab: "Fotografia"
     delete_account_tab: "Elimina a Tua Conta"
     wrong_email: "E-mail Errado"
+#    wrong_password: "Wrong Password"
     upload_picture: "Anexar uma fotografia"
     delete_this_account: "Elimina esta conta permanentemente"
     god_mode: "Modo Deus"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     new_password: "Nova Palavra-passe"
     new_password_verify: "Verificar"
     type_in_email: "Escreve o teu e-mail para confirmares a eliminação"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Subscrições de E-mail"
     email_subscriptions_none: "Sem Subscições de E-mail."
     email_announcements: "Anúncios"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Português (Portugal)", englishDescription:
     keyboard_shortcuts: "Atalhos de Teclado"
     space: "Espaço"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Esc"
     shift: "Shift"
     run_code: "Executar código atual."
diff --git a/app/locale/ro.coffee b/app/locale/ro.coffee
index 9f1e6e5a3..d2417fb4a 100644
--- a/app/locale/ro.coffee
+++ b/app/locale/ro.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     must_be_logged: "Mai întâi trebuie să fi logat. Te rugăm să faci un cont sau să te loghezi în meniul de mai sus."
     retrieving: "Se preiau informațiile..."
     being_reviewed_1: "Cererea pentru un abonament trial gratis este în curs de"
-    being_reviewed_2: "examinare"
+    being_reviewed_2: "examinare" # {change}
     approved_1: "Cererea pentru un abonament trial gratis a fost"
-    approved_2: "aprobată."
+    approved_2: "aprobată." # {change}
     approved_3: "Mai multe instrucțiuni au fost timiste la"
     denied_1: "Cererea pentru un abonament trial gratis a fost"
-    denied_2: "refuzată"
+    denied_2: "refuzată" # {change}
     contact_1: "Contactează-ne"
     contact_2: "dacă ai alte întrebări."
     description_1: "Oferim abonamente gratis Educatorilor pentru evaluare. Poți găsi mai multe informați pe"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     description_3: "educatorilor."
     description_4: "Te rugăm să completezi acest formular rapid si îți vom trimite un email cu instrucțiuni."
     email: "Adresă Email"
-    school_city: "Numele Școlii, Orașul"
+#    school: "Name of School"
+#    location: "Name of City"
     age_students: "Ce vârstă au studenții tăi?"
     under: "Sub"
     other: "Altele:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     picture_tab: "Poză"
     delete_account_tab: "Șterge Contul"
     wrong_email: "Email Greșit"
+#    wrong_password: "Wrong Password"
     upload_picture: "Uploadează o imagine"
     delete_this_account: "Ștergere permanetă a acestui cont"
 #    god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     new_password: "Parolă nouă"
     new_password_verify: "Verifică"
     type_in_email: "Scrie adresa de email ca să confirmi ștergerea"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Subscripție Email"
     email_subscriptions_none: "Nu ai subscripții Email."
     email_announcements: "Anunțuri"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "limba română", englishDescription: "Roman
     keyboard_shortcuts: "Scurtături Keyboard"
     space: "Space"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: "Rulează codul."
diff --git a/app/locale/ru.coffee b/app/locale/ru.coffee
index 0227b0e25..347d618e7 100644
--- a/app/locale/ru.coffee
+++ b/app/locale/ru.coffee
@@ -567,10 +567,6 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     why_paragraph_2_suffix: "Вот, почему CodeCombat - мультиплеерная игра, а не курс уроков в игровой форме. Мы не остановимся, пока вы не потеряете голову - в данном случае, это хорошо."
     why_paragraph_3: "Если вы собираетесь увлечься какой-нибудь игрой, увлекитесь этой и станьте одним из волшебников века информационных технологий."
     press_title: "Блогерам/Прессе"
-    contact_title: "Связаться"
-    codecombat_inc: "CodeCombat, Inc."
-    address_part_1: "188 King St #507"
-    address_part_2: "San Francisco, CA 94107"
     press_paragraph_1_prefix: "Хотите написать о нас? Скачивайте и используйте все ресурсы, включенный в наш"
     press_paragraph_1_link: "пресс-пакет"
     press_paragraph_1_suffix: ". Все изображения могут быть использованы без предварительного уведомления."
@@ -650,12 +646,12 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     must_be_logged: "Сначала необходимо войти в аккаунт. Пожалуйста, создайте аккаунт или войдите через меню вверху."
     retrieving: "Получение информации..."
     being_reviewed_1: "Ваша заявка на бесплатную пробную подписку сейчас"
-    being_reviewed_2: "на рассмотрении."
+    being_reviewed_2: "на рассмотрении." # {change}
     approved_1: "Ваша заявка на бесплатную пробную подписку была"
-    approved_2: "утверждена."
+    approved_2: "утверждена." # {change}
     approved_3: "Дальнейшие инструкции были высланы на"
     denied_1: "Ваша заявка на бесплатную пробную подписку была"
-    denied_2: "отклонена."
+    denied_2: "отклонена." # {change}
     contact_1: "Пожалуйста, свяжитесь с"
     contact_2: ", если у вас остались вопросы."
     description_1: "Мы предлагаем бесплатные подписки учителям в целях ознакомления. Вы можете найти больше информации на нашей странице"
diff --git a/app/locale/sk.coffee b/app/locale/sk.coffee
index 74e54b9e5..7dfb14e98 100644
--- a/app/locale/sk.coffee
+++ b/app/locale/sk.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     picture_tab: "Obrázok"
     delete_account_tab: "Zruš svoj účet"
     wrong_email: "Nesprávny email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Nahraj obrázok"
     delete_this_account: "Vymaž natrvalo tento účet"
     god_mode: "Božský mód"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
     new_password: "Nové heslo"
     new_password_verify: "Overenie"
     type_in_email: "Zadaj email na potvrdenie zrušenia účtu"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Odoberať emailom"
     email_subscriptions_none: "Žiadne odoberanie emailom."
     email_announcements: "Oznámenia"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "slovenčina", englishDescription: "Slovak",
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/sl.coffee b/app/locale/sl.coffee
index 050bc953e..2e26bf97a 100644
--- a/app/locale/sl.coffee
+++ b/app/locale/sl.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "slovenščina", englishDescription: "Sloven
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/sr.coffee b/app/locale/sr.coffee
index 7863a43e2..4e9a24907 100644
--- a/app/locale/sr.coffee
+++ b/app/locale/sr.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
     picture_tab: "Фотографија"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    admin: "Admin"
     new_password: "Нова Шифра"
     new_password_verify: "Потврди"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Мејл претплате"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Обавештења"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "српски", englishDescription: "Serbian
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/sv.coffee b/app/locale/sv.coffee
index ae7f9f260..eae6aa444 100644
--- a/app/locale/sv.coffee
+++ b/app/locale/sv.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     picture_tab: "Profilbild"
     delete_account_tab: "Ta bort ditt konto"
     wrong_email: "Fel mejladress"
+#    wrong_password: "Wrong Password"
     upload_picture: "Ladda upp en bild"
     delete_this_account: "Ta bort det här kontot för alltid"
 #    god_mode: "God Mode"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     new_password: "Nytt lösenord"
     new_password_verify: "Verifiera"
     type_in_email: "Skriv in din mejladress för att bekräfta borttagandet"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Mejlprenumerationer"
     email_subscriptions_none: "Inga mejlprenumerationer."
     email_announcements: "Meddelanden"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Svenska", englishDescription: "Swedish", tr
     keyboard_shortcuts: "Kortkommandon"
     space: "Mellanslag"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: "Kör nuvarande kod."
diff --git a/app/locale/th.coffee b/app/locale/th.coffee
index 3d8cf41c7..ccc6161e6 100644
--- a/app/locale/th.coffee
+++ b/app/locale/th.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
     picture_tab: "รูปภาพ"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    admin: "Admin"
     new_password: "รหัสผ่านใหม่"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "ประกาศ"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "ไทย", englishDescription: "Thai", tra
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/tr.coffee b/app/locale/tr.coffee
index da4641f27..159944cd7 100644
--- a/app/locale/tr.coffee
+++ b/app/locale/tr.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     picture_tab: "Resim"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Bir Resim Yükle"
 #    delete_this_account: "Delete this account permanently"
     god_mode: "Tanrı Kipi"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     admin: "Yönetici"
     new_password: "Yeni Şifre"
     new_password_verify: "Teyit Et"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "E-posta Abonelikleri"
     email_subscriptions_none: "E-posta aboneliği yok."
     email_announcements: "Duyurular"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Türkçe", englishDescription: "Turkish", t
     keyboard_shortcuts: "Klavye Kısayolları"
     space: "Boşluk"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "ÜstKarakter"
     run_code: "Geçerli kodu çalıştır."
diff --git a/app/locale/uk.coffee b/app/locale/uk.coffee
index 6afe623db..922877db6 100644
--- a/app/locale/uk.coffee
+++ b/app/locale/uk.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     retrostyle_blurb: "Ігри в стилі ретро"
 
   teachers:
-    title: "CodeCombat для вчителів" # {change}
+    title: "CodeCombat для вчителів"
     intro_1: "CodeCombat - це онлайн гра, що вчить програмуванню. Студенти пишуть код на реальних мовах програмування."
     intro_2: "Досвід не потрібен!"
     free_title: "Скільки це коштує?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Українська", englishDescription:
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     picture_tab: "Аватар"
     delete_account_tab: "Вилучити свій акаунт"
     wrong_email: "Неправильний email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Відвантажити зображення"
     delete_this_account: "Вилучити цей акаунт назовсім"
     god_mode: "Режим Бога"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     new_password: "Новий пароль"
     new_password_verify: "Підтвердження паролю"
     type_in_email: "Введіть свій email, щоб підтвердити вилучення"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Email-підписки"
     email_subscriptions_none: "Жодних підписок."
     email_announcements: "Оголошення"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     keyboard_shortcuts: "Клавіатурні скорочення"
     space: "Пробіл"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Escape"
     shift: "Shift"
     run_code: "Виконати поточний код."
diff --git a/app/locale/ur.coffee b/app/locale/ur.coffee
index 884d4582a..509cda2d8 100644
--- a/app/locale/ur.coffee
+++ b/app/locale/ur.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "اُردُو", englishDescription: "Urdu",
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/uz.coffee b/app/locale/uz.coffee
index 939e9d25e..ace19ea29 100644
--- a/app/locale/uz.coffee
+++ b/app/locale/uz.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "O'zbekcha", englishDescription: "Uzbek", tr
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/vi.coffee b/app/locale/vi.coffee
index 7b6397cb3..aab7a3875 100644
--- a/app/locale/vi.coffee
+++ b/app/locale/vi.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    retrostyle_blurb: "RetroStyle Games"
 
   teachers:
-    title: "Thông tin về CodeCombat dành cho giáo viên" # {change}
+    title: "Thông tin về CodeCombat dành cho giáo viên"
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     picture_tab: "Bức tranh"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "Tải ảnh lên"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     admin: "Admin"
     new_password: "Mật khẩu mới"
     new_password_verify: "Xác nhận"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "Thuê bao Email"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "Thông báo"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "Tiếng Việt", englishDescription: "Vietn
     keyboard_shortcuts: "Các phím tắt"
     space: "Phím Space"
     enter: "Phím Enter"
+#    press_enter: "press enter"
     escape: "Phím Escape"
     shift: "Phím Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/zh-HANS.coffee b/app/locale/zh-HANS.coffee
index 14c84736d..40efc645d 100644
--- a/app/locale/zh-HANS.coffee
+++ b/app/locale/zh-HANS.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    retrostyle_blurb: "RetroStyle Games"
 
   teachers:
-    title: "CodeCombat给教师的说明" # {change}
+    title: "CodeCombat给教师的说明"
     intro_1: "CodeCombat 是一个教编程的网上游戏。学生会用编程语言写代码。"
     intro_2: "无需经验!"
     free_title: "要多少钱?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     picture_tab: "图片"
     delete_account_tab: "删除账户"
     wrong_email: "错误的邮箱地址"
+#    wrong_password: "Wrong Password"
     upload_picture: "上传一张图片"
     delete_this_account: "永久删除账户"
     god_mode: "上帝模式"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     new_password: "新密码"
     new_password_verify: "核实"
     type_in_email: "输入你的邮箱地址来确认删除"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "邮箱订阅"
     email_subscriptions_none: "取消订阅"
     email_announcements: "通知"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "简体中文", englishDescription: "Chinese
     keyboard_shortcuts: "快捷键"
     space: "空格"
     enter: "回车"
+#    press_enter: "press enter"
     escape: "Esc"
     shift: "Shift"
     run_code: "运行当前代码"
diff --git a/app/locale/zh-HANT.coffee b/app/locale/zh-HANT.coffee
index 928fe2c21..0b50442df 100644
--- a/app/locale/zh-HANT.coffee
+++ b/app/locale/zh-HANT.coffee
@@ -591,7 +591,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    retrostyle_blurb: "RetroStyle Games"
 
   teachers:
-    title: "CodeCombat致教師的說明" # {change}
+    title: "CodeCombat致教師的說明"
 #    intro_1: "CodeCombat is an online game that teaches programming. Students write code in real programming languages."
 #    intro_2: "No experience required!"
 #    free_title: "How much does it cost?"
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     picture_tab: "頭像"
     delete_account_tab: "刪除您的帳戶"
     wrong_email: "錯誤的Email"
+#    wrong_password: "Wrong Password"
     upload_picture: "上傳圖片"
     delete_this_account: "永久性的刪除帳戶"
     god_mode: "上帝模式"
@@ -712,6 +714,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     new_password: "新密碼"
     new_password_verify: "確認密碼"
     type_in_email: "輸入您的Email來確認刪除"
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "訂閱"
     email_subscriptions_none: "無Email訂閱"
     email_announcements: "通知"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "繁体中文", englishDescription: "Chinese
     keyboard_shortcuts: "鍵盤快捷鍵"
     space: "Space"
     enter: "Enter"
+#    press_enter: "press enter"
     escape: "Esc"
     shift: "Shift"
     run_code: "執行當前腳本"
diff --git a/app/locale/zh-WUU-HANS.coffee b/app/locale/zh-WUU-HANS.coffee
index a455159e8..2108959cf 100644
--- a/app/locale/zh-WUU-HANS.coffee
+++ b/app/locale/zh-WUU-HANS.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    picture_tab: "Picture"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    admin: "Admin"
 #    new_password: "New Password"
 #    new_password_verify: "Verify"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
 #    email_subscriptions: "Email Subscriptions"
 #    email_subscriptions_none: "No Email Subscriptions."
 #    email_announcements: "Announcements"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "吴语", englishDescription: "Wuu (Simplifi
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/locale/zh-WUU-HANT.coffee b/app/locale/zh-WUU-HANT.coffee
index 5f4fda86e..7e3a92fdc 100644
--- a/app/locale/zh-WUU-HANT.coffee
+++ b/app/locale/zh-WUU-HANT.coffee
@@ -646,12 +646,12 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    must_be_logged: "You must be logged in first. Please create an account or log in from the menu above."
 #    retrieving: "Retrieving information..."
 #    being_reviewed_1: "Your application for a free trial subscription is being"
-#    being_reviewed_2: "reviewed"
+#    being_reviewed_2: "reviewed."
 #    approved_1: "Your application for a free trial subscription was"
 #    approved_2: "approved."
 #    approved_3: "Further instructions have been sent to"
 #    denied_1: "Your application for a free trial subscription has been"
-#    denied_2: "denied"
+#    denied_2: "denied."
 #    contact_1: "Please contact"
 #    contact_2: "if you have further questions."
 #    description_1: "We offer free subscriptions to teachers for evaluation purposes. You can find more information on our"
@@ -659,7 +659,8 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    description_3: "page."
 #    description_4: "Please fill out this quick survey and we’ll email you setup instructions."
 #    email: "Email Address"
-#    school_city: "Name of School, City"
+#    school: "Name of School"
+#    location: "Name of City"
 #    age_students: "How old are your students?"
 #    under: "Under"
 #    other: "Other:"
@@ -703,6 +704,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     picture_tab: "圖片"
 #    delete_account_tab: "Delete Your Account"
 #    wrong_email: "Wrong Email"
+#    wrong_password: "Wrong Password"
 #    upload_picture: "Upload a picture"
 #    delete_this_account: "Delete this account permanently"
 #    god_mode: "God Mode"
@@ -711,7 +713,8 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
     admin: "管理"
     new_password: "新密碼"
     new_password_verify: "覈實"
-#    type_in_email: "Type in your email to confirm the deletion"
+#    type_in_email: "Type in your email to confirm account deletion."
+#    type_in_password: "Also, type in your password."
     email_subscriptions: "郵箱校對"
 #    email_subscriptions_none: "No Email Subscriptions."
     email_announcements: "通知"
@@ -742,6 +745,7 @@ module.exports = nativeDescription: "吳語", englishDescription: "Wuu (Traditio
 #    keyboard_shortcuts: "Keyboard Shortcuts"
 #    space: "Space"
 #    enter: "Enter"
+#    press_enter: "press enter"
 #    escape: "Escape"
 #    shift: "Shift"
 #    run_code: "Run current code."
diff --git a/app/templates/account/account-settings-view.jade b/app/templates/account/account-settings-view.jade
index 831df6a7c..ca871ef2a 100644
--- a/app/templates/account/account-settings-view.jade
+++ b/app/templates/account/account-settings-view.jade
@@ -54,10 +54,10 @@ else
         .panel-body
           .form
             .form-group
-              label.control-label(for="email1", data-i18n="account_settings.type_in_email") Type in your email to confirm the deletion
+              label.control-label(for="email1", data-i18n="account_settings.type_in_email")
               input#email1.form-control(name="email1", type="text")
             .form-group  
-              label.control-label(for="password1", data-i18n="account_settings.type_in_password") Type in your password also
+              label.control-label(for="password1", data-i18n="account_settings.type_in_password")
               input#password1.form-control(name="password1", type="password")  
           button#delete-account-button.btn.form-control.btn-primary(data-i18n="account_settings.delete_this_account")