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

diff --combined config/locales/en.yml
index 034a717d6cd6e6d20e6e822e9c0fea0ecfe4b0d4,d0ee7165d948723d4cb5fe73ec8c99a8104c96a2..14df2ae4fba6ac4d962f6ac7f427cd348bb46628
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2604,6 -2604,12 +2604,6 @@@ en
        wikipedia:
          title: Log in with Wikipedia
          alt: Log in with a Wikipedia Account
 -      wordpress:
 -        title: Log in with Wordpress
 -        alt: Log in with a Wordpress OpenID
 -      aol:
 -        title: Log in with AOL
 -        alt: Log in with an AOL OpenID
    oauth:
      authorize:
        title: "Authorize access to your account"
@@@ -2746,17 -2752,22 +2746,22 @@@
          welcome: "Welcome to OpenStreetMap"
        duplicate_social_email: "If you already have an OpenStreetMap account and wish to use a 3rd party identity provider, please log in using your password and modify the settings of your account."
        display name description: "Your publicly displayed username. You can change this later in the preferences."
-       by_signing_up_html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
+       by_signing_up:
+         html: "By signing up, you agree to our %{tou_link}, %{privacy_policy_link} and %{contributor_terms_link}."
+         privacy_policy: privacy policy
+         privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+         privacy_policy_title: OSMF privacy policy including section on email addresses
+         contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
+         contributor_terms: "contributor terms"
        tou: "terms of use"
-       contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
-       contributor_terms: "contributor terms"
        external auth: "Third Party Authentication:"
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
-       email_help_html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
-       privacy_policy: privacy policy
-       privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
-       privacy_policy_title: OSMF privacy policy including section on email addresses
+       email_help:
+         privacy_policy: privacy policy
+         privacy_policy_url: https://wiki.osmfoundation.org/wiki/Privacy_Policy
+         privacy_policy_title: OSMF privacy policy including section on email addresses
+         html: 'Your address is not displayed publicly, see our %{privacy_policy_link} for more information.'
        consider_pd_html: "I consider my contributions to be in the %{consider_pd_link}."
        consider_pd: "public domain"
        consider_pd_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain