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

diff --combined config/locales/en.yml
index c0dcb0c5b8411754f09b0b357d143da3a8329c82,b2d3065cb62716972287eedfba37e4bc2f6e18f2..8a0651609751adf805bd55098d47a9b18b87063d
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -405,6 -405,7 +405,7 @@@ en
        wikimedia_commons_link: "The %{page} item on Wikimedia Commons"
        telephone_link: "Call %{phone_number}"
        colour_preview: "Colour %{colour_value} preview"
+       email_link: "Email %{email}"
      note:
        title: "Note: %{id}"
        new_note: "New Note"
@@@ -446,7 -447,6 +447,7 @@@
      index:
        title: "Changesets"
        title_user: "Changesets by %{user}"
 +      title_user_link_html: "Changesets by %{user_link}"
        title_friend: "Changesets by my friends"
        title_nearby: "Changesets by nearby users"
        empty: "No changesets found."
@@@ -1783,6 -1783,7 +1784,6 @@@
        create account minute: Create an account. It only takes a minute.
        no account: Don't have an account?
        account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
 -      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact <a href="%{webmaster}">support</a> if you wish to discuss this.
        auth failure: "Sorry, could not log in with those details."
        openid_logo_alt: "Log in with an OpenID"
        auth_providers:
@@@ -1814,10 -1815,6 +1815,10 @@@
        title: "Logout"
        heading: "Logout from OpenStreetMap"
        logout_button: "Logout"
 +    suspended_flash:
 +      suspended: Sorry, your account has been suspended due to suspicious activity.
 +      contact_support_html: Please contact %{support_link} if you wish to discuss this.
 +      support: support
    shared:
      markdown_help:
        title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>