Merge branch 'master' into moderation

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2d5fd313cc6a117d13f0b76530c1b5c64fe67043..5183e5f4910ab6b44999a7ff4c9bd45be75160b6 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'