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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b478474b2ae4dd8c2e47c7e9b8f5dd7d65f5efdc..5dbdabe23fdc420b3694dc4b9c1a50714fbaad8c 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -296,7 +296,6 @@ en-GB:
         way: Way
         relation: Relation
     containing_relation:
         way: Way
         relation: Relation
     containing_relation:

-      entry_html: Relation %{relation_name}

       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       title: Not Found
       entry_role_html: Relation %{relation_name} (as %{relation_role})
     not_found:
       title: Not Found


@@ -1768,7 +1767,6 @@ en-GB:
       reason: 'Reason for block:'
       revoker: 'Revoker:'
     block:
       reason: 'Reason for block:'
       revoker: 'Revoker:'
     block:

-      not_revoked: (not revoked)

       show: Show
       edit: Edit
     page:
       show: Show
       edit: Edit
     page:


@@ -1776,7 +1774,6 @@ en-GB:
       creator_name: Creator
       reason: Reason for block
       status: Status
       creator_name: Creator
       reason: Reason for block
       status: Status

-      revoker_name: Revoked by

   notes:
     index:
       title: Notes submitted or commented on by %{user}
   notes:
     index:
       title: Notes submitted or commented on by %{user}