X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/11f457e84238cf4e53b0d5f7ee8bad4d5d50a14e..f7985046696958688b8a220a91c4b96ce16d4b65:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0cabeaec0..b0bcebd80 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -120,6 +120,10 @@ en:
       view_history: "view history"
     not_found:
       sorry: "Sorry, the {{type}} with the id {{id}}, could not be found."
+      type:
+        node: node
+        way: way
+        relation: relation
     paging_nav:
       showing_page: "Showing page"
       of: "of"
@@ -146,7 +150,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,7 +247,10 @@ en:
       marker_text: Diary entry location
     view:
       title: "Users' diaries | {{user}}"
+      user_title: "{{user}}'s diary"
       leave_a_comment: "Leave a comment"
+      login_to_leave_a_comment: "{{login_link}} to leave a comment"
+      login: "Login"
       save_button: "Save"
     no_such_entry:
       heading: "No entry with the id: {{id}}"
@@ -303,11 +310,17 @@ en:
     log_in: log in
     sign_up: sign up
     view: View
+    view_tooltip: View maps
     edit: Edit
+    edit_tooltip: Edit maps
     history: History
+    history_tooltip: Changeset history
     export: Export
+    export_tooltip: Export map data
     gps_traces: GPS Traces
+    gps_traces_tooltip: Manage traces
     user_diaries: User Diaries
+    user_diaries_tooltip: View user diaries
     tag_line: The Free Wiki World Map
     intro_1: "OpenStreetMap is a free editable map of the whole world. It is made by people like you."
     intro_2: "OpenStreetMap allows you to view, edit and use geographical data in a collaborative way from anywhere on Earth."
@@ -323,14 +336,26 @@ en:
     alt_donation: Make a Donation
   notifier:
     diary_comment_notification:
+      subject: "[OpenStreetMap] {{user}} commented on your diary entry"
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
+    message_notification:
+      subject: "[OpenStreetMap] {{user}} sent you a new message"
+      banner1: "*                   Please do not reply to this email.                    *"
+      banner2: "*                Use the OpenStreetMap web site to reply.                 *"
+      hi: "Hi {{to_user}},"
+      header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
+      footer1: "You can also read the message at {{readurl}}"
+      footer2: "and you can reply at {{replyurl}}"
     friend_notification:
+      subject: "[OpenStreetMap] {{user}} added you as a friend"
       had_added_you: "{{user}} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at {{userurl}} and add them as a friend too if you wish."
+    signup_confirm:
+      subject: "[OpenStreetMap] Confirm your email address"
     signup_confirm_plain:
       greeting: "Hi there!"
       hopefully_you: "Someone (hopefully you) would like to create an account over at"
@@ -359,8 +384,39 @@ en:
       wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
       user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
       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>.'
+    email_confirm:
+      subject: "[OpenStreetMap] Confirm your email address"
+    email_confirm_plain:
+      greeting: "Hi,"
+      hopefully_you_1: "Someone (hopefully you) would like to change their email address over at"
+      hopefully_you_2: "{{server_url}} to {{new_address}}."
+      click_the_link: "If this is you, please click the link below to confirm the change."
+    email_confirm_html:
+      greeting: "Hi,"
+      hopefully_you: "Someone (hopefully you) would like to change their email address over at {{server_url}} to {{new_address}}."
+      click_the_link: "If this is you, please click the link below to confirm the change."
+    lost_password:
+      subject: "[OpenStreetMap] Password reset request"
+    lost_password_plain:
+      greeting: "Hi,"
+      hopefully_you_1: "Someone (possibly you) has asked for the password to be reset on this"
+      hopefully_you_2: "email addresses openstreetmap.org account."
+      click_the_link: "If this is you, please click the link below to reset your password."
+    lost_password_html:
+      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"
       my_inbox: "My inbox"
       outbox: "outbox"
       you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
@@ -374,15 +430,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 +452,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 +463,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 +570,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"
@@ -528,6 +592,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. '
@@ -576,6 +641,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:
@@ -613,3 +679,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."