From: Tom Hughes <tom@compton.nu>
Date: Tue, 28 Nov 2023 22:21:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4329'
X-Git-Tag: live~909
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/45f0589e624f111ffe85cf9c17bf43be8b839f2c?hp=-c

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

45f0589e624f111ffe85cf9c17bf43be8b839f2c
diff --combined config/locales/en.yml
index 546bf669c,f98a78a31..8b0745118
--- a/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"