X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7f611b295f39b8c42219a5ce6c84582db74ce8f7..402d7b9c10f64c334ded4886ed805071a41932ce:/config/locales/en-GB.yml

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index b478474b2..0bf3f3796 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -296,7 +296,6 @@ en-GB:
         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
@@ -1196,27 +1195,6 @@ en-GB:
       failure: An e-mail address has already been confirmed with this token.
       unknown_token: That confirmation code has expired or does not exist.
   messages:
-    inbox:
-      title: Inbox
-      messages: You have %{new_messages} and %{old_messages}
-      new_messages:
-        one: '%{count} new message'
-        other: '%{count} new messages'
-      old_messages:
-        one: '%{count} old message'
-        other: '%{count} old messages'
-      no_messages_yet_html: You have no messages yet. Why not get in touch with some
-        of the %{people_mapping_nearby_link}?
-      people_mapping_nearby: people mapping nearby
-    messages_table:
-      from: From
-      to: To
-      subject: Subject
-      date: Date
-    message_summary:
-      unread_button: Mark as unread
-      read_button: Mark as read
-      destroy_button: Delete
     new:
       title: Send message
       send_message_to_html: Send a new message to %{name}
@@ -1229,29 +1207,53 @@ en-GB:
       title: No such message
       heading: No such message
       body: Sorry, there is no message with that id.
-    outbox:
-      title: Outbox
-      messages:
-        one: You have %{count} sent message
-        other: You have %{count} sent messages
-      no_sent_messages_html: You have no sent messages yet. Why not get in touch with
-        some of the %{people_mapping_nearby_link}?
-      people_mapping_nearby: people mapping nearby
     show:
       title: Read message
       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back
-    sent_message_summary:
-      destroy_button: Delete
-    heading:
-      my_inbox: My Inbox
     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted
+    mailboxes:
+      heading:
+        my_inbox: My Inbox
+      messages_table:
+        from: From
+        to: To
+        subject: Subject
+        date: Date
+      message:
+        unread_button: Mark as unread
+        read_button: Mark as read
+        destroy_button: Delete
+    inboxes:
+      show:
+        title: Inbox
+        messages: You have %{new_messages} and %{old_messages}
+        new_messages:
+          one: '%{count} new message'
+          other: '%{count} new messages'
+        old_messages:
+          one: '%{count} old message'
+          other: '%{count} old messages'
+        no_messages_yet_html: You have no messages yet. Why not get in touch with
+          some of the %{people_mapping_nearby_link}?
+        people_mapping_nearby: people mapping nearby
+    outboxes:
+      show:
+        title: Outbox
+        messages:
+          one: You have %{count} sent message
+          other: You have %{count} sent messages
+        no_sent_messages_html: You have no sent messages yet. Why not get in touch
+          with some of the %{people_mapping_nearby_link}?
+        people_mapping_nearby: people mapping nearby
+      message:
+        destroy_button: Delete
   passwords:
     new:
       title: Lost password
@@ -1689,15 +1691,25 @@ en-GB:
       confirm: Confirm
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
-    index:
-      title: Users
-      heading: Users
-      summary_html: '%{name} created from %{ip_address} on %{date}'
-      summary_no_ip_html: '%{name} created on %{date}'
-      empty: No matching users found
-    page:
-      confirm: Confirm Selected Users
-      hide: Hide Selected Users
+    issued_blocks:
+      show:
+        title: Blocks by %{name}
+        empty: '%{name} has not made any blocks yet.'
+    received_blocks:
+      show:
+        title: Blocks on %{name}
+        empty: '%{name} has not been blocked yet.'
+    lists:
+      show:
+        title: Users
+        heading: Users
+        empty: No matching users found
+      page:
+        confirm: Confirm Selected Users
+        hide: Hide Selected Users
+      user:
+        summary_html: '%{name} created from %{ip_address} on %{date}'
+        summary_no_ip_html: '%{name} created on %{date}'
     suspended:
       title: Account Suspended
       heading: Account Suspended
@@ -1753,12 +1765,6 @@ en-GB:
         hours:
           one: '%{count} hour'
           other: '%{count} hours'
-    blocks_on:
-      title: Blocks on %{name}
-      empty: '%{name} has not been blocked yet.'
-    blocks_by:
-      title: Blocks by %{name}
-      empty: '%{name} has not made any blocks yet.'
     show:
       title: '%{block_on} blocked by %{block_by}'
       heading_html: '%{block_on} blocked by %{block_by}'
@@ -1768,7 +1774,6 @@ en-GB:
       reason: 'Reason for block:'
       revoker: 'Revoker:'
     block:
-      not_revoked: (not revoked)
       show: Show
       edit: Edit
     page:
@@ -1776,7 +1781,6 @@ en-GB:
       creator_name: Creator
       reason: Reason for block
       status: Status
-      revoker_name: Revoked by
   notes:
     index:
       title: Notes submitted or commented on by %{user}