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

diff --combined config/locales/en.yml
index c9f319dda4544d4ecbcac86ac3d6e58b47b87859,4420baa591e66fd0d8c532255ee992f3d3a55889..3026bb3aa462a0821180f72800b9d79d52128ced
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -1590,6 -1590,7 +1590,7 @@@ en
        loaded:
          one: "loaded successfully with %{trace_points} out of a possible %{count} point."
          other: "loaded successfully with %{trace_points} out of a possible %{count} points."
+       all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}."
        subject: "[OpenStreetMap] GPX Import success"
      signup_confirm:
        subject: "[OpenStreetMap] Welcome to OpenStreetMap"
@@@ -2313,29 -2314,29 +2314,29 @@@
            subway: "Subway"
            ferry: "Ferry"
            light_rail: "Light rail"
 -          tram_only: "Tram"
 +          tram: "Tram"
            trolleybus: "Trolleybus"
            bus: "Bus"
            cable_car: "Cable car"
            chair_lift: "Chair lift"
 -          runway_only: "Airport Runway"
 +          runway: "Airport Runway"
            taxiway: "Taxiway"
 -          apron_only: "Airport apron"
 +          apron: "Airport apron"
            admin: "Administrative boundary"
            capital: "Capital"
            city: "City"
 -          orchard_only: "Orchard"
 +          orchard: "Orchard"
            vineyard: "Vineyard"
 -          forest_only: "Forest"
 +          forest: "Forest"
            wood: "Wood"
            farmland: "Farmland"
 -          grass_only: "Grass"
 +          grass: "Grass"
            meadow: "Meadow"
            bare_rock: "Bare rock"
            sand: "Sand"
            golf: "Golf course"
            park: "Park"
 -          common_only: "Common"
 +          common: "Common"
            built_up: "Built-up area"
            resident: "Residential area"
            retail: "Retail area"
@@@ -2343,7 -2344,7 +2344,7 @@@
            commercial: "Commercial area"
            heathland: "Heathland"
            scrubland: "Scrubland"
 -          lake_only: "Lake"
 +          lake: "Lake"
            reservoir: "Reservoir"
            intermittent_water: "Intermittent waterbody"
            glacier: "Glacier"
@@@ -2357,12 -2358,12 +2358,12 @@@
            centre: "Sports centre"
            reserve: "Nature reserve"
            military: "Military area"
 -          school_only: "School"
 +          school: "School"
            university: "University"
            hospital: "Hospital"
            building: "Significant building"
            station: "Railway station"
 -          summit_only: "Summit"
 +          summit: "Summit"
            peak: "Peak"
            tunnel: "Dashed casing = tunnel"
            bridge: "Black casing = bridge"