X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/76bc5eba0617e36ebb853d24212543d0e1d4904d..c7ed8a9e8604b207e24e0899a811ff3cdb2e7c3f:/config/locales/en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2ec5e27dd..ae70009ab 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,6 +1,7 @@
 # Messages for British English (British English)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: Abijeet Patro
 # Author: Andibing
 # Author: Bpfhjquevaps
 # Author: Bruce89
@@ -113,6 +114,29 @@ en-GB:
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
+  api:
+    notes:
+      comment:
+        opened_at_html: Created %{when} ago
+        opened_at_by_html: Created %{when} ago by %{user}
+        commented_at_html: Updated %{when} ago
+        commented_at_by_html: Updated %{when} ago by %{user}
+        closed_at_html: Resolved %{when} ago
+        closed_at_by_html: Resolved %{when} ago by %{user}
+        reopened_at_html: Reactivated %{when} ago
+        reopened_at_by_html: Reactivated %{when} ago by %{user}
+      rss:
+        title: OpenStreetMap Notes
+        description_area: A list of notes, reported, commented on or closed in your
+          area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+        description_item: An rss feed for note %{id}
+        opened: new note (near %{place})
+        commented: new comment (near %{place})
+        closed: closed note (near %{place})
+        reopened: reactivated note (near %{place})
+      entry:
+        comment: Comment
+        full: Full note
   browse:
     created: Created
     closed: Closed
@@ -232,12 +256,13 @@ en-GB:
       reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
       hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
+      report: Report this note
     query:
       title: Query Features
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
       next: Next »
@@ -252,7 +277,7 @@ en-GB:
       user: User
       comment: Comment
       area: Area
-    list:
+    index:
       title: Changesets
       title_user: Changesets by %{user}
       title_friend: Changesets by your friends
@@ -266,18 +291,18 @@ en-GB:
       load_more: Load more
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
-    rss:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
+  changeset_comments:
+    comment:
       comment: 'New comment on changeset #%{changeset_id} by %{author}'
-      commented_at_html: Updated %{when} ago
       commented_at_by_html: Updated %{when} ago by %{user}
-      full: Full discussion
-  diary_entry:
+    index:
+      title_all: OpenStreetMap changeset discussion
+      title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
+  diary_entries:
     new:
       title: New Diary Entry
       publish_button: Publish
-    list:
+    index:
       title: Users' diaries
       title_friends: Friends' diaries
       title_nearby: Nearby Users' diaries
@@ -300,7 +325,7 @@ en-GB:
       use_map_link: use map
       save_button: Save
       marker_text: Diary entry location
-    view:
+    show:
       title: '%{user}''s diary | %{title}'
       user_title: '%{user}''s diary'
       leave_a_comment: Leave a comment
@@ -903,10 +928,7 @@ en-GB:
     intro_text: OpenStreetMap is a map of the world, created by people like you and
       free to use under an open licence.
     intro_2_create_account: Create a user account
-    partners_html: Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other
-      %{partners}.
     partners_ucl: UCL
-    partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
@@ -1038,7 +1060,7 @@ en-GB:
       details: More details about the changeset can be found at %{url}.
       unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
         click "Unsubscribe".
-  message:
+  messages:
     inbox:
       title: Inbox
       my_inbox: My Inbox
@@ -1060,7 +1082,7 @@ en-GB:
       unread_button: Mark as unread
       read_button: Mark as read
       reply_button: Reply
-      delete_button: Delete
+      destroy_button: Delete
     new:
       title: Send message
       send_message_to: Send a new message to %{name}
@@ -1068,6 +1090,7 @@ en-GB:
       body: Body
       send_button: Send
       back_to_inbox: Back to inbox
+    create:
       message_sent: Message sent
       limit_exceeded: You have sent a lot of messages recently. Please wait a while
         before trying to send any more.
@@ -1093,26 +1116,26 @@ en-GB:
       wrong_user: You are logged in as `%{user}' but the message you have asked to
         reply to was not sent to that user. Please login as the correct user in order
         to reply.
-    read:
+    show:
       title: Read message
       from: From
       subject: Subject
       date: Date
       reply_button: Reply
       unread_button: Mark as unread
-      delete_button: Delete
+      destroy_button: Delete
       back: Back
       to: To
       wrong_user: You are logged in as `%{user}' but the message you have asked to
         read was not sent by or to that user. Please login as the correct user in
         order to read it.
     sent_message_summary:
-      delete_button: Delete
+      destroy_button: Delete
     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
-    delete:
-      deleted: Message deleted
+    destroy:
+      destroyed: Message deleted
   site:
     about:
       next: Next
@@ -1552,18 +1575,36 @@ en-GB:
           the note icon: <span class=''icon note''></span>. This will add a marker
           to the map, which you can move by dragging. Add your message, then click
           save, and other mappers will investigate.'
-  trace:
+  traces:
     visibility:
       private: Private (only shared as anonymous, unordered points)
       public: Public (shown in trace list and as anonymous, unordered points)
       trackable: Trackable (only shared as anonymous, ordered points with timestamps)
       identifiable: Identifiable (shown in trace list and as identifiable, ordered
         points with timestamps)
+    new:
+      upload_gpx: 'Upload GPX File:'
+      description: 'Description:'
+      tags: 'Tags:'
+      tags_help: comma delimited
+      visibility: 'Visibility:'
+      visibility_help: what does this mean?
+      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      upload_button: Upload
+      help: Help
+      help_url: http://wiki.openstreetmap.org/wiki/Upload
     create:
       upload_trace: Upload GPS Trace
       trace_uploaded: Your GPX file has been uploaded and is awaiting insertion in
         to the database. This will usually happen within half an hour, and an email
         will be sent to you on completion.
+      traces_waiting:
+        one: You have %{count} trace waiting for upload. Please consider waiting for
+          these to finish before uploading any more, so as not to block the queue
+          for other users.
+        other: You have %{count} traces waiting for upload. Please consider waiting
+          for these to finish before uploading any more, so as not to block the queue
+          for other users.
     edit:
       title: Editing trace %{name}
       heading: Editing trace %{name}
@@ -1582,30 +1623,9 @@ en-GB:
       visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-    trace_form:
-      upload_gpx: 'Upload GPX File:'
-      description: 'Description:'
-      tags: 'Tags:'
-      tags_help: comma delimited
-      visibility: 'Visibility:'
-      visibility_help: what does this mean?
-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
-      upload_button: Upload
-      help: Help
-      help_url: http://wiki.openstreetmap.org/wiki/Upload
-    trace_header:
-      upload_trace: Upload a trace
-      see_all_traces: See all traces
-      traces_waiting:
-        one: You have %{count} trace waiting for upload. Please consider waiting for
-          these to finish before uploading any more, so as not to block the queue
-          for other users.
-        other: You have %{count} traces waiting for upload. Please consider waiting
-          for these to finish before uploading any more, so as not to block the queue
-          for other users.
     trace_optionals:
       tags: Tags
-    view:
+    show:
       title: Viewing trace %{name}
       heading: Viewing trace %{name}
       pending: PENDING
@@ -1620,8 +1640,8 @@ en-GB:
       description: 'Description:'
       tags: 'Tags:'
       none: None
-      edit_track: Edit this trace
-      delete_track: Delete this trace
+      edit_trace: Edit this trace
+      delete_trace: Delete this trace
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:
@@ -1644,7 +1664,7 @@ en-GB:
       by: by
       in: in
       map: map
-    list:
+    index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track uploads
@@ -1652,6 +1672,8 @@ en-GB:
       empty_html: Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a>
         or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         page</a>.
+      upload_trace: Upload a trace
+      see_all_traces: See all traces
     delete:
       scheduled_for_deletion: Trace scheduled for deletion
     make_public:
@@ -1672,8 +1694,6 @@ en-GB:
     require_cookies:
       cookies_needed: You appear to have cookies disabled - please enable cookies
         in your browser before continuing.
-    require_moderator:
-      not_a_moderator: You need to be a moderator to perform that action.
     setup_user_auth:
       blocked_zero_hour: You have an urgent message on the OpenStreetMap web site.
         You need to read the message before you will be able to save your edits.
@@ -1771,7 +1791,7 @@ en-GB:
       flash: Updated the client information successfully
     destroy:
       flash: Destroyed the client application registration
-  user:
+  users:
     login:
       title: Login
       heading: Login
@@ -1885,15 +1905,12 @@ en-GB:
     terms:
       title: Contributor terms
       heading: Contributor terms
-      read and accept: Please read the agreement and press the agree button to confirm
-        that you accept the terms of this agreement for your existing and future contributions.
       consider_pd: In addition to the above agreement, I consider my contributions
         to be in the Public Domain
       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       guidance: 'Information to help understand these terms: a <a href="%{summary}">human
         readable summary</a> and some <a href="%{translations}">informal translations</a>'
-      agree: Agree
       declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
       decline: Decline
       you need to accept or decline: Please read and then either accept or decline
@@ -1909,7 +1926,7 @@ en-GB:
       body: Sorry, there is no user with the name %{user}. Please check your spelling,
         or maybe the link you clicked is wrong.
       deleted: deleted
-    view:
+    show:
       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits
@@ -2081,9 +2098,7 @@ en-GB:
       button: Unfriend
       success: '%{name} was removed from your friends.'
       not_a_friend: '%{name} is not one of your friends.'
-    filter:
-      not_an_administrator: You need to be an administrator to perform that action.
-    list:
+    index:
       title: Users
       heading: Users
       showing:
@@ -2122,8 +2137,6 @@ en-GB:
         with your ID in your user settings.
   user_role:
     filter:
-      not_an_administrator: Only administrators can perform user role management,
-        and you are not an administrator.
       not_a_role: The string `%{role}' is not a valid role.
       already_has_role: The user already has role %{role}.
       doesnt_have_role: The user does not have role %{role}.
@@ -2248,31 +2261,10 @@ en-GB:
       next: Next »
       previous: « Previous
   notes:
-    comment:
-      opened_at_html: Created %{when} ago
-      opened_at_by_html: Created %{when} ago by %{user}
-      commented_at_html: Updated %{when} ago
-      commented_at_by_html: Updated %{when} ago by %{user}
-      closed_at_html: Resolved %{when} ago
-      closed_at_by_html: Resolved %{when} ago by %{user}
-      reopened_at_html: Reactivated %{when} ago
-      reopened_at_by_html: Reactivated %{when} ago by %{user}
-    rss:
-      title: OpenStreetMap Notes
-      description_area: A list of notes, reported, commented on or closed in your
-        area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
-      description_item: An rss feed for note %{id}
-      opened: new note (near %{place})
-      commented: new comment (near %{place})
-      closed: closed note (near %{place})
-      reopened: reactivated note (near %{place})
-    entry:
-      comment: Comment
-      full: Full note
     mine:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
-      subheading: Notes submitted or commented on by %{user}
+      subheading_html: Notes submitted or commented on by %{user}
       id: Id
       creator: Creator
       description: Description
@@ -2366,13 +2358,10 @@ en-GB:
     directions:
       ascend: Ascend
       engines:
+        fossgis_osrm_car: Car (OSRM)
         graphhopper_bicycle: Bicycle (GraphHopper)
         graphhopper_car: Car (GraphHopper)
         graphhopper_foot: Foot (GraphHopper)
-        mapquest_bicycle: Bicycle (MapQuest)
-        mapquest_car: Car (MapQuest)
-        mapquest_foot: Foot (MapQuest)
-        osrm_car: Car (OSRM)
       descend: Descend
       directions: Directions
       distance: Distance
@@ -2424,11 +2413,6 @@ en-GB:
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
-        turn_left_with_exit: At roundabout turn left onto %{name}
-        slight_left_with_exit: At roundabout slight left onto %{name}
-        turn_right_with_exit: At roundabout turn right onto %{name}
-        slight_right_with_exit: At roundabout slight right onto %{name}
-        continue_with_exit: At roundabout continue straight onto %{name}
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
       time: Time