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 2d5fd313cc6a117d13f0b76530c1b5c64fe67043..4be180898de9ba53dbf6eba3bc23e5b076f1fb1e 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1595,7 +1595,6 @@ en-GB:
     trace_header:
       upload_trace: Upload a trace
       see_all_traces: See all traces
     trace_header:
       upload_trace: Upload a trace
       see_all_traces: See all traces

-      see_your_traces: See your traces

       traces_waiting:
         one: You have %{count} trace waiting for upload. Please consider waiting for
           these to finish before uploading any more, so as not to block the queue
       traces_waiting:
         one: You have %{count} trace waiting for upload. Please consider waiting for
           these to finish before uploading any more, so as not to block the queue


@@ -1646,7 +1645,6 @@ en-GB:
       map: map
     list:
       public_traces: Public GPS traces
       map: map
     list:
       public_traces: Public GPS traces

-      your_traces: Your GPS traces

       public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       public_traces_from: Public GPS traces from %{user}
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'


@@ -1946,7 +1944,6 @@ en-GB:
       if set location: Set your home location on the %{settings_link} page to see
         nearby users.
       settings_link_text: settings
       if set location: Set your home location on the %{settings_link} page to see
         nearby users.
       settings_link_text: settings

-      your friends: Your friends

       no friends: You have not added any friends yet.
       km away: '%{count}km away'
       m away: '%{count}m away'
       no friends: You have not added any friends yet.
       km away: '%{count}km away'
       m away: '%{count}m away'


@@ -2206,20 +2203,6 @@ en-GB:
     period:
       one: 1 hour
       other: '%{count} hours'
     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.
     helper:
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.


@@ -2249,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.
       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
   note:
     description:
       opened_at_html: Created %{when} ago