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

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1def0f3eb9aaff088b76029fdfa1907bd22401f7..dc7f1a1c0e76206f329668cac9f6363533210023 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2935,12 +2935,12 @@ en:
       show: "View this block"
       back: "View all blocks"
     filter:
-      block_expired: "The block has already expired and cannot be edited."
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
       flash: "Created a block on user %{name}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
+      only_creator_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."
       success: "Block updated."
     index:
       title: "User blocks"