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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 97ddaac4b27eb5bf7576f192de964cbaddab7766..730ab9b14d2e41b3f31dfbb1a5478d53d72b60dd 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1427,9 +1427,6 @@ en-GB:
         wikipedia:
           title: Login with Wikipedia
           alt: Login with a Wikipedia Account
         wikipedia:
           title: Login with Wikipedia
           alt: Login with a Wikipedia Account

-        yahoo:
-          title: Login with Yahoo
-          alt: Login with a Yahoo OpenID

         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID
         wordpress:
           title: Login with Wordpress
           alt: Login with a Wordpress OpenID


@@ -1926,7 +1923,6 @@ en-GB:
         or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         page</a>.
       upload_trace: Upload a trace
         or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki
         page</a>.
       upload_trace: Upload a trace

-      see_all_traces: See all traces

     destroy:
       scheduled_for_deletion: Trace scheduled for deletion
     make_public:
     destroy:
       scheduled_for_deletion: Trace scheduled for deletion
     make_public: