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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ac41952c7a51ab540ea01b2e19c3530691c9a253..c4cae4b221b79bfbba7559635ef4f145f053451b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2950,6 +2950,7 @@ en:
     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."
     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."

+      inactive_block_cannot_be_reactivated: "This block is inactive and cannot be reactivated."

       success: "Block updated."
     index:
       title: "User blocks"
       success: "Block updated."
     index:
       title: "User blocks"