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

diff --combined config/locales/en.yml
index c01a66b2c03e39affefa386c283464950bc374d6,2464824c30a0a73eb58a8058e68a8070fff9af7c..c241f902079ef4d82d34e816d36507d7c642a7ec
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -747,7 -747,6 +747,7 @@@ en
            window_construction: "Window Construction"
            winery: "Winery"
            "yes": "Craft Shop"
 +        crossing: "Crossing"
          emergency:
            access_point: "Access Point"
            ambulance_station: "Ambulance Station"
@@@ -1003,7 -1002,6 +1003,7 @@@
            hill: "Hill"
            hot_spring: "Hot Spring"
            island: "Island"
 +          isthmus: "Isthmus"
            land: "Land"
            marsh: "Marsh"
            moor: "Moor"
@@@ -1018,13 -1016,10 +1018,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"
@@@ -1425,9 -1420,8 +1425,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"
@@@ -1875,10 -1869,10 +1875,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
@@@ -2066,7 -2060,7 +2066,7 @@@
      potlatch:
        removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
        desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
 -      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.
 +      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your preferences here</a>.
      sidebar:
        search_results: Search Results
        close: Close
@@@ -2310,11 -2304,6 +2310,11 @@@
        blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. 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 to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
 +    settings_menu:
 +      account_settings: Account Settings
 +      oauth1_settings: OAuth 1 settings
 +      oauth2_applications: OAuth 2 applications
 +      oauth2_authorizations: OAuth 2 authorizations
    oauth:
      authorize:
        title: "Authorize access to your account"
@@@ -2516,8 -2505,8 +2516,8 @@@
        spam score: "Spam Score:"
        description: Description
        user location: User location
 -      if_set_location_html: "Set your home location on the %{settings_link} page to see nearby users."
 -      settings_link_text: settings
 +      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"
@@@ -2581,6 -2570,10 +2581,6 @@@
          link text: "what is this?"
        save changes button: Save Changes
        make edits public button: Make all my edits public
 -      return to profile: Return to profile
 -      oauth1 settings: OAuth 1 settings
 -      oauth2 applications: OAuth 2 applications
 -      oauth2 authorizations: OAuth 2 authorizations
        flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
        flash update success: "User information updated successfully."
      set_home: