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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ac41952c7a51ab540ea01b2e19c3530691c9a253..30721562a8098459436b18ab8cdb2b72de741fa3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2936,13 +2936,10 @@ en:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
-      back: "View all blocks"
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
-      show: "View this block"
-      back: "View all blocks"
     filter:
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
@@ -2950,6 +2947,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."
+      inactive_block_cannot_be_reactivated: "This block is inactive and cannot be reactivated."
       success: "Block updated."
     index:
       title: "User blocks"
@@ -3035,6 +3033,7 @@ en:
       blocks_by_me: "Blocks by Me"
       blocks_by_user: "Blocks by %{user}"
       block: "Block #%{id}"
+      new_block: "New Block"
   user_mutes:
     index:
       title: "Muted Users"