X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7b72e4f3c386c930352ad82b4459ef6ffdf9c4c6..f76aad01201ae3954edb517e1da3b3394d6ba17f:/config/locales/en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 254b39da2..677fafc62 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -43,8 +43,6 @@ en-GB:
     file:
       prompt: Choose file
     submit:
-      diary_comment:
-        create: Save
       diary_entry:
         create: Publish
         update: Update
@@ -55,9 +53,6 @@ en-GB:
       client_application:
         create: Register
         update: Update
-      doorkeeper_application:
-        create: Register
-        update: Update
       redaction:
         create: Create redaction
         update: Save redaction
@@ -128,9 +123,7 @@ en-GB:
         title: Subject
         latitude: Latitude
         longitude: Longitude
-        language: Language
-      doorkeeper/application:
-        name: Name
+        language_code: Language
       friend:
         user: User
         friend: Friend
@@ -561,13 +554,10 @@ en-GB:
     search:
       title:
         latlon_html: Results from <a href="https://openstreetmap.org/">Internal</a>
-        ca_postcode_html: Results from <a href="https://geocoder.ca/">Geocoder.CA</a>
         osm_nominatim_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames_html: Results from <a href="http://www.geonames.org/">GeoNames</a>
         osm_nominatim_reverse_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames_reverse_html: Results from <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -583,15 +573,12 @@ en-GB:
         aeroway:
           aerodrome: Aerodrome
           airstrip: Airstrip
-          apron: Airport Apron
-          gate: Airport Gate
           hangar: Hangar
           helipad: Helipad
           holding_position: Holding Position
           parking_position: Parking Position
           runway: Runway
           taxiway: Taxiway
-          terminal: Airport Terminal
         amenity:
           animal_shelter: Animal Shelter
           arts_centre: Arts Centre
@@ -635,7 +622,6 @@ en-GB:
           fire_station: Fire Station
           food_court: Food Court
           fountain: Fountain
-          fuel: Filling Station
           gambling: Gambling
           grave_yard: Graveyard
           grit_bin: Grit Bin
@@ -817,8 +803,6 @@ en-GB:
           brownfield: Brownfield Land
           cemetery: Cemetery
           commercial: Commercial Area
-          conservation: Conservation Area
-          construction: Construction Area
           farmland: Farmland
           farmyard: Farmyard
           forest: Forest
@@ -837,7 +821,6 @@ en-GB:
           reservoir: Reservoir
           reservoir_watershed: Reservoir Watershed
           residential: Residential Area
-          retail: Retail Area
           village_green: Village Green
           vineyard: Vineyard
           "yes": Landuse
@@ -1074,7 +1057,6 @@ en-GB:
           grocery: Grocery Shop
           hairdresser: Hairdresser
           hardware: Hardware Store
-          hifi: Hi-Fi Shop
           houseware: Houseware Shop
           interior_decoration: Interior Decoration
           jewelry: Jewellers
@@ -1115,7 +1097,6 @@ en-GB:
           artwork: Artwork
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
-          cabin: Tourist Cabin
           camp_site: Camp Site
           caravan_site: Caravan Site
           chalet: Chalet
@@ -1490,8 +1471,6 @@ en-GB:
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
-      used_by_html: '%{name} provides map data for thousands of websites, mobile apps,
-        and hardware devices'
       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.
@@ -1548,13 +1527,6 @@ en-GB:
         intro_3_1_html: "Our documentation is licensed under the \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
           Attribution-ShareAlike 2.0</a> licence (CC BY-SA 2.0)."
         credit_title_html: How to credit OpenStreetMap
-        credit_1_html: 'Where you use OpenStreetMap data, you are required to do the
-          following two things:'
-        credit_2_1_html: |-
-          <ul>
-            <li>Provide credit to OpenStreetMap by displaying our copyright notice.</li>
-            <li>Make clear that the data is available under the Open Database License.</li>
-          </ul>
         credit_4_html: |-
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
@@ -1622,11 +1594,6 @@ en-GB:
         infringement_1_html: OSM contributors are reminded never to add data from
           any copyrighted sources (e.g. Google Maps or printed maps) without explicit
           permission from the copyright holders.
-        infringement_2_html: If you believe that copyrighted material has been inappropriately
-          added to the OpenStreetMap database or this site, please refer to our <a
-          href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">takedown procedure</a>
-          or file directly at our <a href="https://dmca.openstreetmap.org/">on-line
-          filing page</a>.
         trademarks_title_html: <span id="trademarks"></span>Trademarks
         trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of
           the Map are registered trademarks of the OpenStreetMap Foundation. If you
@@ -1739,7 +1706,6 @@ en-GB:
         description: Ask a question or discuss interesting matters on a wide range
           of topical or regional mailing lists.
       forums:
-        title: Forums (Legacy)
         description: Questions and discussions for those that prefer a bulletin board
           style interface.
       irc:
@@ -1980,8 +1946,6 @@ en-GB:
       cookies_needed: You appear to have cookies disabled - please enable cookies
         in your browser before continuing.
     setup_user_auth:
-      blocked_zero_hour: You have an urgent message on the OpenStreetMap website.
-        You need to read the message before you will be able to save your edits.
       blocked: Your access to the API has been blocked. Please log-in to the web interface
         to find out more.
       need_to_see_terms: Your access to the API is temporarily suspended. Please log-in