From: Tom Hughes <tom@compton.nu>
Date: Wed, 11 Sep 2024 16:12:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5186'
X-Git-Tag: live~614
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b34e71f1d9f215cb685d992e1c8950abb4daeea8?hp=-c

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

b34e71f1d9f215cb685d992e1c8950abb4daeea8
diff --combined config/locales/en.yml
index 9da502c7c,395cb3bf7..16015d92c
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2833,9 -2833,15 +2833,9 @@@ en
        doesnt_have_role: "The user does not have role %{role}."
        not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
      grant:
 -      title: Confirm role granting
 -      heading: Confirm role granting
        are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
 -      confirm: "Confirm"
      revoke:
 -      title: Confirm role revoking
 -      heading: Confirm role revoking
        are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
 -      confirm: "Confirm"
    user_blocks:
      model:
        non_moderator_update: "Must be a moderator to create or update a block."
@@@ -2921,7 -2927,7 +2921,7 @@@
        not_revoked: "(not revoked)"
        show: "Show"
        edit: "Edit"
 -    blocks:
 +    page:
        display_name: "Blocked User"
        creator_name: "Creator"
        reason: "Reason for block"
@@@ -3198,6 -3204,7 +3198,7 @@@
        empty: "No redactions to show."
        heading: "List of Redactions"
        title: "List of Redactions"
+       new: "New Redaction"
      new:
        heading: "Enter Information for New Redaction"
        title: "Creating New Redaction"