]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/en-GB.yml
Merge remote-tracking branch 'upstream/pull/4413'
[rails.git] / config / locales / en-GB.yml
index 4cec17f7778e0e3ff429b88cbc0b8496c9c52440..cf783e60b76c2bc8954bb3999719343afca05c9d 100644 (file)
@@ -5,6 +5,7 @@
 # Author: Alefar
 # Author: Andibing
 # Author: BEANS
+# Author: Back ache
 # Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89
@@ -220,7 +221,6 @@ en-GB:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -280,12 +280,6 @@ en-GB:
   browse:
     created: Created
     closed: Closed
-    created_html: Created <abbr title='%{title}'>%{time}</abbr>
-    closed_html: Closed <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: Created <abbr title='%{title}'>%{time}</abbr> by %{user}
-    deleted_by_html: Deleted <abbr title='%{title}'>%{time}</abbr> by %{user}
-    edited_by_html: Edited <abbr title='%{title}'>%{time}</abbr> by %{user}
-    closed_by_html: Closed <abbr title='%{title}'>%{time}</abbr> by %{user}
     version: Version
     in_changeset: Changeset
     anonymous: anonymous
@@ -305,8 +299,6 @@ en-GB:
       relation: Relations (%{count})
       relation_paginated: Relations (%{x}-%{y} of %{count})
       comment: Comments (%{count})
-      hidden_commented_by_html: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
       feed:
@@ -430,6 +422,7 @@ en-GB:
     contact:
       km away: '%{count}km away'
       m away: '%{count}m away'
+      latest_edit_html: 'Latest edit (%{ago}):'
     popup:
       your location: Your location
       nearby mapper: Nearby mapper
@@ -515,6 +508,14 @@ en-GB:
       comment: Comment
       newer_comments: Newer Comments
       older_comments: Older Comments
+  doorkeeper:
+    errors:
+      messages:
+        account_selection_required: The authorisation server requires end-user account
+          selection
+        consent_required: The authorisation server requires end-user consent
+        interaction_required: The authorisation server requires end-user interaction
+        login_required: The authorisation server requires end-user authentication
   friendships:
     make_friend:
       heading: Add %{user} as a friend?
@@ -528,13 +529,6 @@ en-GB:
       success: '%{name} was removed from your friends.'
       not_a_friend: '%{name} is not one of your friends.'
   geocoder:
-    search:
-      title:
-        latlon_html: Results from <a href="https://openstreetmap.org/">Internal</a>
-        osm_nominatim_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        osm_nominatim_reverse_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -1343,28 +1337,29 @@ en-GB:
     destroy:
       destroyed: Message deleted
   passwords:
-    lost_password:
+    new:
       title: Lost password
       heading: Forgotten Password?
       email address: E-mail address
       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.
+    create:
       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: Could not find that email address, sorry.
-    reset_password:
+    edit:
       title: Reset password
       heading: Reset Password for %{user}
       reset: Reset Password
-      flash changed: Your password has been changed.
       flash token bad: Did not find that token, check the URL maybe?
+    update:
+      flash changed: Your password has been changed.
   profiles:
     edit:
       image: Image
       gravatar:
         gravatar: Use Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
       new image: Add an image
@@ -1400,7 +1395,7 @@ en-GB:
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account
-        windowslive:
+        microsoft:
           title: Login with Windows Live
           alt: Login with a Windows Live Account
         github:
@@ -1422,7 +1417,6 @@ en-GB:
   site:
     about:
       next: Next
-      copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
       lede_text: OpenStreetMap is built by a community of mappers that contribute
         and maintain data about roads, trails, cafés, railway stations, and much more,
         all over the world.
@@ -1432,24 +1426,8 @@ en-GB:
         aerial imagery, GPS devices, and low-tech field maps to verify that OSM
         is accurate and up to date.
       community_driven_title: Community Driven
-      community_driven_html: |-
-        OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more.
-        To learn more about the community, see the <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>, <a href='%{diary_path}'>user diaries</a>, <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.
       open_data_title: Open Data
-      open_data_html: |-
-        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
-        as long as you credit OpenStreetMap and its contributors. If you alter or
-        build upon the data in certain ways, you may distribute the result only
-        under the same licence. See the <a href='%{copyright_path}'>Copyright and
-        Licence page</a> for details.
       legal_title: Legal
-      legal_1_html: "This site and many other related services are formally operated
-        by the  \n<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a>
-        (OSMF) \non behalf of the community. Use of all OSMF operated services is
-        subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
-        of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
-        Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
-        Policy</a>."
       partners_title: Partners
     copyright:
       foreign:
@@ -1552,11 +1530,6 @@ en-GB:
           explanation_html: If you have noticed a problem with our map data, for example
             a road is missing or your address, the best way to proceed is to join
             the OpenStreetMap community and add or repair the data yourself.
-        add_a_note:
-          instructions_html: Just click <a class='icon note'></a> or the same icon
-            on the map display. 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.
       other_concerns:
         title: Other concerns
     help:
@@ -1622,9 +1595,6 @@ en-GB:
           footway: Footway
           rail: Railway
           subway: Subway
-          tram:
-          - Light rail
-          - tram
           cable:
           - Cable car
           - chairlift
@@ -1635,14 +1605,15 @@ en-GB:
           - Airport apron
           - terminal
           admin: Administrative boundary
-          forest: Forest
-          wood: Wood
+          forest:
+          - Forest
+          - Wood
           golf: Golf course
           park: Park
-          resident: Residential area
           common:
           - Common
           - meadow
+          resident: Residential area
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
@@ -1741,7 +1712,6 @@ en-GB:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:
-      showing_page: Page %{page}
       older: Older Traces
       newer: Newer Traces
     trace:
@@ -1923,7 +1893,6 @@ en-GB:
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined
-      latest edit: 'Latest edit (%{ago}):'
       email address: 'Email address:'
       created from: 'Created from:'
       status: 'Status:'
@@ -2033,8 +2002,8 @@ en-GB:
     revoke:
       title: Revoking block on %{block_on}
       heading_html: Revoking block on %{block_on} by %{block_by}
-      time_future: This block will end in %{time}.
-      past: This block ended %{time} and cannot be revoked now.
+      time_future_html: This block will end in %{time}.
+      past_html: This block ended %{time} and cannot be revoked now.
       confirm: Are you sure you wish to revoke this block?
       revoke: Revoke!
       flash: This block has been revoked.
@@ -2099,15 +2068,6 @@ en-GB:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
-      opened_by_html: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       anonymous_warning: This note includes comments from anonymous users which should
         be independently verified.
       hide: Hide
@@ -2168,8 +2128,6 @@ en-GB:
         gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: Layers
-      copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>
-      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Make a Donation</a>
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map