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

diff --combined config/locales/en.yml
index 263663ce07488ebb3aac3776b16ceb7b76f9b9aa,f5a13ef8521b327c7a3bf8e20b21a29ae514d34b..3900f9fba97449b64e36d55073f07450a7641167
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2108,7 -2108,7 +2108,7 @@@ en
        are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
        confirm: "Confirm"
        fail: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid."
 -  user_block:
 +  user_blocks:
      model:
        non_moderator_update: "Must be a moderator to create or update a block."
        non_moderator_revoke: "Must be a moderator to revoke a block."
@@@ -2188,6 -2188,7 +2188,6 @@@
        back: "View all blocks"
        revoker: "Revoker:"
        needs_view: "The user needs to log in before this block will be cleared."
 -  user_blocks:
      block:
        not_revoked: "(not revoked)"
        show: "Show"
@@@ -2400,7 -2401,7 +2400,7 @@@
        show_address: Show address
        query_features: Query features
        centre_map: Centre map here
-   redaction:
+   redactions:
      edit:
        description: "Description"
        heading: "Edit redaction"