Added new parallel test job for docker-compose

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 21426931685f357231cd2a56cd72d48174bff466..a54403e54561352f7f6bffd881541b9bb7bfa152 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -161,6 +161,8 @@ en-GB:
     help:
       trace:
         tagstring: comma delimited
+      user_block:
+        needs_view: Does the user need to log in before this block will be cleared?
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -2291,27 +2293,17 @@ en-GB:
     new:
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
-      reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
-        as possible, giving as much detail as you can about the situation, remembering
-        that the message will be publicly visible. Bear in mind that not all users
-        understand the community jargon, so please try to use laymans terms.
       period: How long, starting now, the user will be blocked from the API for.
       tried_contacting: I have contacted the user and asked them to stop.
       tried_waiting: I have given a reasonable amount of time for the user to respond
         to those communications.
-      needs_view: User needs to log in before this block will be cleared
       back: View all blocks
     edit:
       title: Editing block on %{name}
       heading_html: Editing block on %{name}
-      reason: The reason why %{name} is being blocked. Please be as calm and as reasonable
-        as possible, giving as much detail as you can about the situation. Bear in
-        mind that not all users understand the community jargon, so please try to
-        use laymans terms.
       period: How long, starting now, the user will be blocked from the API for.
       show: View this block
       back: View all blocks
-      needs_view: Does the user need to log in before this block will be cleared?
     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
@@ -2406,7 +2398,6 @@ en-GB:
       custom_dimensions: Set custom dimensions
       format: 'Format:'
       scale: 'Scale:'
-      image_size: Image will show standard layer at
       download: Download
       short_url: Short URL
       include_marker: Include marker