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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 5183e5f4910ab6b44999a7ff4c9bd45be75160b6..4be180898de9ba53dbf6eba3bc23e5b076f1fb1e 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -2203,20 +2203,6 @@ en-GB:
     period:
       one: 1 hour
       other: '%{count} hours'
-    partial:
-      show: Show
-      edit: Edit
-      revoke: Revoke!
-      confirm: Are you sure?
-      display_name: Blocked User
-      creator_name: Creator
-      reason: Reason for block
-      status: Status
-      revoker_name: Revoked by
-      not_revoked: (not revoked)
-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous
     helper:
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.
@@ -2246,6 +2232,21 @@ en-GB:
       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
+      edit: Edit
+      revoke: Revoke!
+    blocks:
+      display_name: Blocked User
+      creator_name: Creator
+      reason: Reason for block
+      status: Status
+      revoker_name: Revoked by
+      showing_page: Page %{page}
+      next: Next »
+      previous: « Previous
   note:
     description:
       opened_at_html: Created %{when} ago