X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/671fc09bfc1a48e4e6d5722299a29ee6c06891e8..39cbc9d653d7ff685626ec7873d04fbd315b480b:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dee97ab91..9964dbccf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -83,10 +83,18 @@ en:
   browse:
     changeset:
       title: "Changeset"
-      changeset: "Changeset:"
+      changeset: "Changeset: {{id}}"
       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
+    changeset_navigation:
+      user:
+        name_tooltip: "View edits by {{user}}"
+        prev_tooltip: "Previous edit by {{user}}"
+        next_tooltip: "Next edit by {{user}}"
+      all:
+        prev_tooltip: "Previous changeset"
+        next_tooltip: "Next changeset"
     changeset_details:
       created_at: "Created at:"
       closed_at: "Closed at:"
@@ -95,9 +103,15 @@ en:
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "Show Area Box"
       box: "box"
-      has_nodes: "Has the following {{count}} nodes:"
-      has_ways: "Has the following {{count}} ways:"
-      has_relations: "Has the following {{count}} relations:"
+      has_nodes:
+        one: "Has the following {{count}} node:"
+        other: "Has the following {{count}} nodes:"
+      has_ways:
+        one:  "Has the following {{count}} way:"
+        other: "Has the following {{count}} ways:"
+      has_relations:
+        one:  "Has the following {{count}} relation:"
+        other: "Has the following {{count}} relations:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
@@ -145,6 +159,9 @@ en:
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"
+      download: "{{download_xml_link}} or {{view_details_link}}"
+      download_xml: "Download XML"
+      view_details: "view details"
     relation_member:
       entry: "{{type}} {{name}}"
       entry_role: "{{type}} {{name}} as {{role}}"
@@ -222,6 +239,7 @@ en:
       showing_page: "Showing page"
       of: "of"
     changeset:
+      id: "#{{id}}"
       still_editing: "(still editing)"
       anonymous: "Anonymous"
       no_comment: "(none)"
@@ -229,34 +247,27 @@ en:
       show_area_box: "show area box"
       big_area: "(big)"
       view_changeset_details: "View changeset details"
-      more: "more"
     changesets:
       id: "ID"
       saved_at: "Saved at"
       user: "User"
       comment: "Comment"
       area: "Area"
-    list_bbox:
-      history: "History"
-      changesets_within_the_area: "Changesets within the area:"
-      show_area_box: "show area box"
-      no_changesets: "No changesets"
-      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
-      no_area_specified: "No area specified"
-      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
-      view_the_map: "view the map"
-      view_tab: "view tab"
-      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
     list:
-      recent_changes: "Recent Changes"
-      recently_edited_changesets: "Recently edited changesets:"
-      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
-    list_user:
-      edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
+      title: "Changesets"
+      title_user: "Changesets by {{user}}"
+      title_bbox: "Changesets within {{bbox}}"
+      title_user_bbox: "Changesets by {{user}} within {{bbox}}"
+
+      heading: "Changesets"
+      heading_user: "Changesets"
+      heading_bbox: "Changesets"
+      heading_user_bbox: "Changesets"
+
+      description: "Recent changes"
+      description_user: "Changesets by {{user}}"
+      description_bbox: "Changesets within {{bbox}}"
+      description_user_bbox: "Changesets by {{user}} within {{bbox}}"
   diary_entry:
     new:
       title: New Diary Entry
@@ -522,14 +533,6 @@ en:
       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"
@@ -545,6 +548,7 @@ en:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
       reply_button: "Reply"
+      delete_button: "Delete"
     new:
       title: "Send message"
       send_message_to: "Send a new message to {{name}}"
@@ -580,9 +584,13 @@ en:
       reading_your_sent_messages: "Reading your sent messages"
       to: "To"
       back_to_outbox: "Back to outbox"
+    sent_message_summary:
+      delete_button: "Delete"
     mark:
       as_read: "Message marked as read"
       as_unread: "Message marked as unread"
+    delete:
+      deleted: "Message deleted"
   site:
     index:
       js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
@@ -604,7 +612,7 @@ en:
       anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
       flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
     sidebar:
       search_results: Search Results
       close: Close
@@ -698,6 +706,7 @@ en:
       owner: "Owner:"
       description: "Description:"
       tags: "Tags:"
+      tags_help: "comma delimited"
       save_button: "Save Changes"
     no_such_user:
       title: "No such user"
@@ -707,6 +716,7 @@ en:
       upload_gpx: "Upload GPX File"
       description: "Description"
       tags: "Tags"
+      tags_help: "comma delimited"
       public: "Public?"
       public_help: "what does this mean?"
       public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
@@ -778,15 +788,19 @@ en:
       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"
+      title: "Lost password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
-      new password button: "Send me a new password"
+      new password button: "Reset password"
       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Couldn't find that email address, sorry."
     reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
+      title: "Reset password"
+      heading: "Reset Password for {{user}}"
+      password: "Password: "
+      confirm password: "Confirm Password: "
+      reset: "Reset Password"
+      flash changed: "Your password has been changed."
       flash token bad: "Didn't find that token, check the URL maybe?"
     new:
       title: "Create account"
@@ -833,6 +847,7 @@ en:
       your friends: Your friends
       no friends: You have not added any friends yet.
       km away: "{{count}}km away"
+      m away: "{{count}}m away"
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings