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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 831944229..2663516f1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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}}"
@@ -217,8 +219,11 @@ en:
       for_all_changes: "For changes by all users see {{recent_changes_link}}"
       recent_changes: "Recent Changes"
   diary_entry:
+    new:
+      title: New Diary Entry
     list:
       title: "Users' diaries"
+      user_title: "{{user}}'s diary"
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
@@ -236,19 +241,25 @@ en:
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
+    view:
+      title: "Users' diaries | {{user}}"
+      leave_a_comment: "Leave a comment"
+      save_button: "Save"
     no_such_entry:
       heading: "No entry with the id: {{id}}"
       body: "Sorry, there is no diary entry or comment with the id {{id}}. Please check your spelling, or maybe the link you clicked is wrong."
     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."
-    posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
-    comment_link: Comment on this entry
-    reply_link: Reply to this entry
-    comment_count:
-      one: 1 comment
-      other: "{{count}} comments"
-    edit_link: Edit this entry
-    comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
+    diary_entry:
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+      comment_link: Comment on this entry
+      reply_link: Reply to this entry
+      comment_count:
+        one: 1 comment
+        other: "{{count}} comments"
+      edit_link: Edit this entry
+    diary_comment:
+      comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
   export:
     start:
       area_to_export: "Area to Export"
@@ -311,7 +322,7 @@ en:
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:
-    diary:
+    diary_comment_notification:
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"
@@ -394,6 +405,7 @@ en:
       back_to_outbox: "Back to outbox"
   site:
     index:
+      home: "home"
       js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
       js_2: "OpenStreetMap uses javascript for its slippy map."
       js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
@@ -472,6 +484,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"
@@ -524,7 +538,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:
@@ -585,10 +599,14 @@ en:
       heading: Confirm a user account
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
+      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: