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

diff --combined config/locales/en.yml
index c8392231e2f2bfcadbbd09c8a631ce4ccb13a644,9d280bf023eae12c41dc9238e5c90969fbd9dbc6..7a2aba1aa055e0da4352a3e6c2145ac56969eb67
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -416,26 -416,6 +416,26 @@@ en
        title_particular: "OpenStreetMap changeset #%{changeset_id} discussion"
      timeout:
        sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
 +  dashboards:
 +    contact:
 +      km away: "%{count}km away"
 +      m away: "%{count}m away"
 +    popup:
 +      your location: "Your location"
 +      nearby mapper: "Nearby mapper"
 +      friend: "Friend"
 +    show:
 +      title: My Dashboard
 +      no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
 +      edit_your_profile: Edit your profile
 +      my friends: My friends
 +      no friends: You have not added any friends yet.
 +      nearby users: "Other nearby users"
 +      no nearby users: "There are no other users who admit to mapping nearby yet."
 +      friends_changesets: "friends' changesets"
 +      friends_diaries: "friends' diary entries"
 +      nearby_changesets: "nearby user changesets"
 +      nearby_diaries: "nearby user diary entries"
    diary_entries:
      new:
        title: New Diary Entry
@@@ -767,7 -747,6 +767,7 @@@
            window_construction: "Window Construction"
            winery: "Winery"
            "yes": "Craft Shop"
 +        crossing: "Crossing"
          emergency:
            access_point: "Access Point"
            ambulance_station: "Ambulance Station"
@@@ -1023,7 -1002,6 +1023,7 @@@
            hill: "Hill"
            hot_spring: "Hot Spring"
            island: "Island"
 +          isthmus: "Isthmus"
            land: "Land"
            marsh: "Marsh"
            moor: "Moor"
@@@ -1038,13 -1016,10 +1038,13 @@@
            sand: "Sand"
            scree: "Scree"
            scrub: "Scrub"
 +          shingle: "Shingle"
            spring: "Spring"
            stone: "Stone"
            strait: "Strait"
            tree: "Tree"
 +          tree_row: "Tree Row"
 +          tundra: "Tundra"
            valley: "Valley"
            volcano: "Volcano"
            water: "Water"
@@@ -1445,9 -1420,8 +1445,9 @@@
      intro_header: Welcome to OpenStreetMap!
      intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
      intro_2_create_account: "Create a user account"
 -    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."
 +    hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}."
      partners_ucl: "UCL"
 +    partners_fastly: "Fastly"
      partners_bytemark: "Bytemark Hosting"
      partners_partners: "partners"
      tou: "Terms of Use"
@@@ -1864,8 -1838,9 +1864,8 @@@
          credit_3_1_html: |
            The map tiles in the “standard style” at www.openstreetmap.org are a
            Produced Work by the OpenStreetMap Foundation using OpenStreetMap data
 -          under the Open Database License. If you are using these tiles please use
 -          the following attribution:
 -          “Base map and data from OpenStreetMap and OpenStreetMap Foundation”.
 +          under the Open Database License. When using this map style, the same attribution is
 +          required as for the map data.
          credit_4_html: |
            For a browsable electronic map, the credit should appear in the corner of the map.
            For example:
@@@ -1894,10 -1869,10 +1894,10 @@@
            <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
            Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
          contributors_au_html: |
 -          <strong>Australia</strong>: Contains data sourced from
 -          <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA Australia Limited</a>
 +          <strong>Australia</strong>: Incorporates or developed using Administrative Boundaries &copy;
 +          <a href="https://geoscape.com.au/legal/data-copyright-and-disclaimer/">Geoscape Australia</a>
            licensed by the Commonwealth of Australia under
 -          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
 +          <a href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International licence (CC BY 4.0)</a>.
          contributors_ca_html: |
            <strong>Canada</strong>: Contains data from
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
@@@ -2367,6 -2342,8 +2367,8 @@@
        read_gpx: Read private GPS traces
        write_gpx: Upload GPS traces
        write_notes: Modify notes
+       read_email: Read user email address
+       skip_authorization: Auto approve application
    oauth_clients:
      new:
        title: "Register a new application"
@@@ -2514,7 -2491,6 +2516,7 @@@
        my settings: My Settings
        my comments: My Comments
        my_preferences: My Preferences
 +      my_dashboard: My Dashboard
        blocks on me: Blocks on Me
        blocks by me: Blocks by Me
        edit_profile: Edit Profile
@@@ -2536,6 -2512,14 +2538,6 @@@
        spam score: "Spam Score:"
        description: Description
        user location: User location
 -      no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users."
 -      edit_your_profile: Edit your profile
 -      my friends: My friends
 -      no friends: You have not added any friends yet.
 -      km away: "%{count}km away"
 -      m away: "%{count}m away"
 -      nearby users: "Other nearby users"
 -      no nearby users: "There are no other users who admit to mapping nearby yet."
        role:
          administrator: "This user is an administrator"
          moderator: "This user is a moderator"
@@@ -2556,7 -2540,15 +2558,7 @@@
        unhide_user: "Unhide this User"
        delete_user: "Delete this User"
        confirm: "Confirm"
 -      friends_changesets: "friends' changesets"
 -      friends_diaries: "friends' diary entries"
 -      nearby_changesets: "nearby user changesets"
 -      nearby_diaries: "nearby user diary entries"
        report: Report this User
 -    popup:
 -      your location: "Your location"
 -      nearby mapper: "Nearby mapper"
 -      friend: "Friend"
      account:
        title: "Edit account"
        my settings: My Settings