X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/6254853c5c6a76417aed186798a0292c07d30ff4..a8bfe7c32ed654b0474b894f44da49c3f136266b:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 75a10defd..bac5e7444 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -146,7 +146,7 @@ en:
       drag_a_box: "Drag a box on the map to select an area"
       manually_select: "Manually select a different area"
       loaded_an_area: "You have loaded an area which contains"
-      browsers: "features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      browsers: "features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
       load_data: "Load Data"
       unable_to_load: "Unable to load: Bounding box size of"
       must_be_smaller: "is too large (must be smaller than 0.25)"
@@ -163,7 +163,9 @@ en:
     way_details:
       nodes: "Nodes:"
       part_of: "Part of:"
-      also_part_of: "also part of {{related_ways}}"
+      also_part_of:
+        one: "also part of way {{related_ways}}"
+        other: "also part of ways {{related_ways}}"
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: {{way_name}}"
@@ -359,6 +361,7 @@ en:
       current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
   message:
     inbox:
+      title: "Inbox"
       my_inbox: "My inbox"
       outbox: "outbox"
       you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
@@ -372,15 +375,18 @@ en:
       read_button: "Mark as read"
       reply_button: "Reply"
     new:
+      title: "Send message"
       send_message_to: "Send a new message to {{name}}"
       subject: "Subject"
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"
+      message_sent: "Message sent"
     no_such_user:
       no_such_user: "No such user or message"
       sorry: "Sorry there is no user or message with that name or id"
     outbox: 
+      title: "Outbox"
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
       outbox: "outbox"
@@ -391,6 +397,7 @@ en:
       no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
       people_mapping_nearby: "people mapping nearby"
     read:
+      title: "Read message"
       reading_your_messages: "Reading your messages"
       from: "From"
       subject: "Subject"
@@ -401,6 +408,9 @@ en:
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"
+    mark:
+      as_read: "Message marked as read"
+      as_unread: "Message marked as unread"
   site:
     index:
       home: "home"
@@ -482,6 +492,8 @@ en:
       of: "of"
     trace:
       pending: "PENDING"
+      count_points: "{{count}} points"
+      ago: "{{time_in_words_ago}} ago"
       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"
@@ -503,6 +515,7 @@ en:
       made_public: "Track made public"
   user:
     login:
+      title: "Login"
       heading: "Login"
       please login: "Please login or {{create_user_link}}."
       create_account: "create an account"
@@ -510,6 +523,8 @@ en:
       password: "Password: "
       lost password link: "Lost your password?"
       login_button: "Login"
+      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"
       heading: "Forgotten Password?"
@@ -522,6 +537,7 @@ en:
       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:
+      title: "Create account"
       heading: "Create a User Account"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
@@ -534,7 +550,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."
+      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:
@@ -570,6 +586,7 @@ en:
       your location: Your location
       nearby mapper: "Nearby mapper: "
     account:
+      title: "Edit account"
       my settings: My settings
       email never displayed publicly: "(never displayed publicly)"
       public editing:
@@ -595,11 +612,22 @@ en:
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
-    confirm email:
+      success: "Confirmed your account, thanks for signing up!"
+      failure: "A user account with this token has already been confirmed."
+    confirm_email:
       heading: Confirm a change of email address
       press confirm button: "Press the confirm button below to confirm your new email address."
       button: Confirm
+      success: "Confirmed your email address, thanks for signing up!"
+      failure: "An email address has already been confirmed with this token."
     set_home:
       flash success: "Home location saved successfully"
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
+    make_friend:
+      success: "{{name}} is now your friend."
+      failed: "Sorry, failed to add {{name}} as a friend."
+      already_a_friend: "You are already friends with {{name}}."
+    remove_friend:
+      success: "{{name} was removed from your friends."
+      not_a_friend: "{{name}} is not one of your friends."