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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d9b0eea42..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"
@@ -245,6 +249,8 @@ en:
       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}}"
@@ -304,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."
@@ -324,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"
@@ -360,6 +384,36 @@ 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"
@@ -630,5 +684,5 @@ en:
       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."
+      success: "{{name}} was removed from your friends."
       not_a_friend: "{{name}} is not one of your friends."