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

diff --combined config/locales/en.yml
index 926189809802bbc74224c7a61de6a1df09946edf,8d66ef6e5ae1851969bad94ed00be2d910537d4f..9da502c7c7b6b719b3c438b09eecb706b1a22d5c
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -2833,15 -2833,9 +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."
@@@ -2927,7 -2921,7 +2921,7 @@@
        not_revoked: "(not revoked)"
        show: "Show"
        edit: "Edit"
 -    blocks:
 +    page:
        display_name: "Blocked User"
        creator_name: "Creator"
        reason: "Reason for block"