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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 213127d454ee3e0bb5255c7bd42c8ae78777a864..9850467f2f26cea4250ef0aef13e6814c25df25f 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1400,6 +1400,7 @@ en-GB:
       legal_title: Legal
       partners_title: Partners
     copyright:
+      title: Copyright and Licence
       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link},
@@ -1413,7 +1414,6 @@ en-GB:
         native_link: British English version
         mapping_link: start mapping
       legal_babble:
-        title_html: Copyright and Licence
         credit_title_html: How to credit OpenStreetMap
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
@@ -1697,7 +1697,6 @@ en-GB:
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
     auth_providers:
-      openid_logo_alt: Log in with an OpenID
       openid:
         title: Login with OpenID
         alt: Login with an OpenID URL
@@ -1716,12 +1715,6 @@ en-GB:
       wikipedia:
         title: Login with Wikipedia
         alt: Login with a Wikipedia Account
-      wordpress:
-        title: Login with Wordpress
-        alt: Login with a Wordpress OpenID
-      aol:
-        title: Login with AOL
-        alt: Login with an AOL OpenID
   oauth:
     authorize:
       title: Authorise access to your account