Translate the new reset password procedure introduced in [16817] and

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 55e01ec34ec1439c90cf1f82170a643c853f8c46..9964dbccfb8ab1938a4943e39649db08dea80606 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -260,9 +260,9 @@ en:
       title_user_bbox: "Changesets by {{user}} within {{bbox}}"
 
       heading: "Changesets"
       title_user_bbox: "Changesets by {{user}} within {{bbox}}"
 
       heading: "Changesets"

-      heading_user: "Changesets by {{user}}"
-      heading_bbox: "Changesets within {{bbox}}"
-      heading_user_bbox: "Changesets by {{user}} within {{bbox}}"
+      heading_user: "Changesets"
+      heading_bbox: "Changesets"
+      heading_user_bbox: "Changesets"

 
       description: "Recent changes"
       description_user: "Changesets by {{user}}"
 
       description: "Recent changes"
       description_user: "Changesets by {{user}}"


@@ -533,14 +533,6 @@ en:
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."

-    reset_password:
-      subject: "[OpenStreetMap] Password reset"
-    reset_password_plain:
-      greeting: "Hi,"
-      reset: "Your password has been reset to {{new_password}}"
-    reset_password_html:
-      greeting: "Hi,"
-      reset: "Your password has been reset to {{new_password}}"

   message:
     inbox:
       title: "Inbox"
   message:
     inbox:
       title: "Inbox"


@@ -796,15 +788,19 @@ en:
       account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
       auth failure: "Sorry, couldn't log in with those details."
     lost_password:

-      title: "lost password"
+      title: "Lost password"

       heading: "Forgotten Password?"
       email address: "Email Address:"
       heading: "Forgotten Password?"
       email address: "Email Address:"

-      new password button: "Send me a new password"
+      new password button: "Reset password"

       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Couldn't find that email address, sorry."
     reset_password:
       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Couldn't find that email address, sorry."
     reset_password:

-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+      title: "Reset password"
+      heading: "Reset Password for {{user}}"
+      password: "Password: "
+      confirm password: "Confirm Password: "
+      reset: "Reset Password"
+      flash changed: "Your password has been changed."

       flash token bad: "Didn't find that token, check the URL maybe?"
     new:
       title: "Create account"
       flash token bad: "Didn't find that token, check the URL maybe?"
     new:
       title: "Create account"