[18163] commited by me yesterday (and reverted in [18165]) was

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 270549b651f53da1cb4398f205e666bc40c3286f..84df13c9bd812f865dea9560e42ab9a0642323cd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -500,9 +500,7 @@ en:
         import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
       success:
         subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully: |
-          loaded successfully with {{trace_points}} out of a possible
-          {{possible_points}} points.
+        loaded_successfully: loaded successfully with {{trace_points}} out of a possible {{possible_points}} points.
     signup_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     signup_confirm_plain:
@@ -898,6 +896,7 @@ en:
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Reset password"
+      help_text: "Enter the email address you used to sign up, we'll send a link to it that you can use to reset your 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:
@@ -919,6 +918,7 @@ en:
       confirm email address: "Confirm Email Address:"
       not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
       display name: "Display Name:"
+      display name description: "Your publicly displayed username. You can change this later in the preferences."
       password: "Password:"
       confirm password: "Confirm Password:"
       signup: Signup