Merge remote-tracking branch 'upstream/pull/4387'

diff --combined config/locales/en.yml
index b157e8cbc61d466d762e106e04436737c8d6854c,7ed296695ac9a50413347d2d830a74f0c9d1462e..fa10f018f8de2283a1e212cc09123a936eda738b
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2314,24 -2314,32 +2314,24 @@@ en
            tram_only: "Tram"
            trolleybus: "Trolleybus"
            bus: "Bus"
 -          cable:
 -            - Cable car
 -            - chair lift
 -          runway:
 -            - Airport Runway
 -            - taxiway
 +          cable_car: "Cable car"
 +          chair_lift: "Chair lift"
 +          runway_only: "Airport Runway"
 +          taxiway: "Taxiway"
            apron_only: "Airport apron"
            admin: "Administrative boundary"
 -          orchard:
 -            - Orchard
 -            - vineyard
 -          forest:
 -            - Forest
 -            - wood
 +          orchard_only: "Orchard"
 +          vineyard: "Vineyard"
 +          forest_only: "Forest"
 +          wood: "Wood"
            farmland: "Farmland"
 -          grass:
 -            - Grass
 -            - meadow
 +          grass_only: "Grass"
 +          meadow: "Meadow"
            bare_rock: "Bare rock"
            sand: "Sand"
            golf: "Golf course"
            park: "Park"
 -          common:
 -            - Common
 -            - meadow
 -            - garden
 +          common_only: "Common"
            built_up: "Built-up area"
            resident: "Residential area"
            retail: "Retail area"
@@@ -2339,8 -2347,9 +2339,8 @@@
            commercial: "Commercial area"
            heathland: "Heathland"
            scrubland: "Scrubland"
 -          lake:
 -            - Lake
 -            - reservoir
 +          lake_only: "Lake"
 +          reservoir: "Reservoir"
            intermittent_water: "Intermittent waterbody"
            glacier: "Glacier"
            reef: "Reef"
@@@ -2353,13 -2362,15 +2353,13 @@@
            centre: "Sports centre"
            reserve: "Nature reserve"
            military: "Military area"
 -          school:
 -            - School
 -            - university
 -            - hospital
 +          school_only: "School"
 +          university: "University"
 +          hospital: "Hospital"
            building: "Significant building"
            station: "Railway station"
 -          summit:
 -            - Summit
 -            - peak
 +          summit_only: "Summit"
 +          peak: "Peak"
            tunnel: "Dashed casing = tunnel"
            bridge: "Black casing = bridge"
            private: "Private access"
@@@ -2598,6 -2609,7 +2598,7 @@@
        read_gpx: Read private GPS traces
        write_gpx: Upload GPS traces
        write_notes: Modify notes
+       write_redactions: Redact map data
        read_email: Read user email address
        skip_authorization: Auto approve application
    oauth_clients: