X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/efd50cd529990069dc1ca95f66ec6f61471fe29d..74af87d9d1006a5c664398de19da31ad9c29776c:/config/locales/en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 434b88c13..2feac5deb 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
@@ -28,6 +29,26 @@ en-GB:
     formats:
       friendly: '%e %B %Y at %H:%M'
       blog: '%e %B %Y'
+  helpers:
+    submit:
+      diary_comment:
+        create: Save
+      diary_entry:
+        create: Publish
+      message:
+        create: Send
+      client_application:
+        create: Register
+        update: Edit
+      redaction:
+        create: Create redaction
+        update: Save redaction
+      trace:
+        create: Upload
+        update: Save Changes
+      user_block:
+        create: Create block
+        update: Update block
   activerecord:
     models:
       acl: Access Control List
@@ -113,6 +134,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 +276,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 »
@@ -266,17 +311,24 @@ 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
+    form:
+      subject: 'Subject:'
+      body: 'Body:'
+      language: 'Language:'
+      location: 'Location:'
+      latitude: 'Latitude:'
+      longitude: 'Longitude:'
+      use_map_link: use map
     index:
       title: Users' diaries
       title_friends: Friends' diaries
@@ -291,14 +343,6 @@ en-GB:
       newer_entries: Newer Entries
     edit:
       title: Edit diary entry
-      subject: 'Subject:'
-      body: 'Body:'
-      language: 'Language:'
-      location: 'Location:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: use map
-      save_button: Save
       marker_text: Diary entry location
     show:
       title: '%{user}''s diary | %{title}'
@@ -306,7 +350,6 @@ en-GB:
       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:
       title: No such diary entry
       heading: 'No entry with the id: %{id}'
@@ -1063,7 +1106,6 @@ en-GB:
       send_message_to: Send a new message to %{name}
       subject: Subject
       body: Body
-      send_button: Send
       back_to_inbox: Back to inbox
     create:
       message_sent: Message sent
@@ -1565,7 +1607,6 @@ en-GB:
       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:
@@ -1594,7 +1635,6 @@ en-GB:
       description: 'Description:'
       tags: 'Tags:'
       tags_help: comma delimited
-      save_button: Save Changes
       visibility: 'Visibility:'
       visibility_help: what does this mean?
       visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
@@ -1669,8 +1709,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.
@@ -1709,10 +1747,8 @@ en-GB:
   oauth_clients:
     new:
       title: Register a new application
-      submit: Register
     edit:
       title: Edit your application
-      submit: Edit
     show:
       title: OAuth details for %{app_name}
       key: 'Consumer Key:'
@@ -1882,15 +1918,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
@@ -2078,8 +2111,6 @@ 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.
     index:
       title: Users
       heading: Users
@@ -2119,8 +2150,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}.
@@ -2155,7 +2184,6 @@ en-GB:
         that the message will be publicly visible. Bear in mind that not all users
         understand the community jargon, so please try to use laymans terms.
       period: How long, starting now, the user will be blocked from the API for.
-      submit: Create block
       tried_contacting: I have contacted the user and asked them to stop.
       tried_waiting: I have given a reasonable amount of time for the user to respond
         to those communications.
@@ -2169,7 +2197,6 @@ en-GB:
         mind that not all users understand the community jargon, so please try to
         use laymans terms.
       period: How long, starting now, the user will be blocked from the API for.
-      submit: Update block
       show: View this block
       back: View all blocks
       needs_view: Does the user need to log in before this block will be cleared?
@@ -2198,14 +2225,15 @@ en-GB:
       confirm: Are you sure you wish to revoke this block?
       revoke: Revoke!
       flash: This block has been revoked.
-    period:
-      one: 1 hour
-      other: '%{count} hours'
     helper:
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.
       time_future_and_until_login: Ends in %{time} and after the user has logged in.
       time_past: Ended %{time} ago.
+      block_duration:
+        hours:
+          one: 1 hour
+          other: '%{count} hours'
     blocks_on:
       title: Blocks on %{name}
       heading: List of blocks on %{name}
@@ -2245,31 +2273,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
@@ -2363,13 +2370,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
@@ -2442,7 +2446,6 @@ en-GB:
     edit:
       description: Description
       heading: Edit redaction
-      submit: Save redaction
       title: Edit redaction
     index:
       empty: No redactions to show.
@@ -2451,7 +2454,6 @@ en-GB:
     new:
       description: Description
       heading: Enter information for new redaction
-      submit: Create redaction
       title: Creating new redaction
     show:
       description: 'Description:'