hopefully fix messed up en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c086f66f92a2c2635b34a9c1a31ce0f762470c74..42b5a9c53b9aa21b41db7405fe9c442684982402 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -32,7 +32,7 @@ en:
       loading: "Loading..."
       deleted: "Deleted"
       view_larger_map: "View Larger Map"
-    node_details: 
+    node_details:
       part_of: "Part of:"
     node_history:
       node_history: "Node History"
@@ -50,6 +50,12 @@ en:
     paging_nav:
       showing_page: "Showing page"
       of: "of"
+    relation_details:
+      members: "Members:"
+      part_of: "Part of:"
+    relation_history:
+      relation_history: "Relation History"
+      relation_history_title: "Relation History: {{relation_name}}"
   diary_entry:
     list:
       new: New Diary Entry
@@ -59,12 +65,12 @@ en:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:
-      subject: "Subject:"
-      body: "Body:"
-      language: "Language:"
-      location: "Location:"
-      latitude: "Latitude:"
-      longitude: "Longitude:"
+      subject: "Subject: "
+      body: "Body: "
+      language: "Language: "
+      location: "Location: "
+      latitude: "Latitude: "
+      longitude: "Longitude: "
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
@@ -143,9 +149,16 @@ en:
       lost password link: "Lost your password?"
       login_button: Login
     lost_password:
+      title: lost password
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Send me a new 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 :-)"
+      flash token bad: "Didn't find that token, check the URL maybe?"
     new:
       heading: Create a User Account
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
@@ -159,6 +172,7 @@ en:
       password: "Password: "
       confirm password: "Confirm Password: "
       signup: Signup
+      flash create success message: "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
     no_such_user:
       body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     view:
@@ -225,4 +239,3 @@ en:
       flash success: "Home location saved successfully"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
-