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

diff --combined config/locales/en.yml
index 546bf669c1a8ae353076efee24fa290f77a2ad85,f98a78a3156796c34d9bebb0d564628a847d2c8a..8b0745118b4adfa2fb06f9e16efbe5414bf17e0e
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -256,7 -256,6 +256,7 @@@ en
          retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
          retain_changeset_discussions: Your changeset discussions, if any, will be retained.
          retain_email: Your email address will be retained.
 +        recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."
          confirm_delete: Are you sure?
          cancel: Cancel
    accounts:
@@@ -2383,6 -2382,7 +2383,7 @@@
          automated_edits: Automated Edits
          automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
        start_mapping: Start Mapping
+       continue_authorization: Continue Authorization
        add_a_note:
          title: No Time To Edit? Add a Note!
          para_1: |
@@@ -3034,7 -3034,6 +3035,7 @@@
        map_data_zoom_in_tooltip: Zoom in to see map data
        queryfeature_tooltip: Query features
        queryfeature_disabled_tooltip: Zoom in to query features
 +      embed_html_disabled: HTML embedding is not available for this map layer
      changesets:
        show:
          comment: "Comment"