X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/dffde07308bded89e6a27ada0b2b811d0baecfdc..b6ebb18fce49232bc9b355771ccc36319a1e906b:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2663516f1..d9b0eea42 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)"
@@ -243,6 +243,7 @@ en:
       marker_text: Diary entry location
     view:
       title: "Users' diaries | {{user}}"
+      user_title: "{{user}}'s diary"
       leave_a_comment: "Leave a comment"
       save_button: "Save"
     no_such_entry:
@@ -361,6 +362,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"
@@ -374,15 +376,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"
@@ -393,6 +398,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"
@@ -403,6 +409,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"
@@ -507,6 +516,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"
@@ -514,6 +524,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?"
@@ -526,6 +538,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. '
@@ -574,6 +587,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:
@@ -601,7 +615,7 @@ en:
       button: Confirm
       success: "Confirmed your account, thanks for signing up!"
       failure: "A user account with this token has already been confirmed."
-    confirm email:
+    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
@@ -611,3 +625,10 @@ en:
       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."