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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 213127d454ee3e0bb5255c7bd42c8ae78777a864..c4e0b619961b9a25d673591c18d5c4c6f932300d 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:
       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},
       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:
         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
         credit_title_html: How to credit OpenStreetMap
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage


@@ -1716,12 +1716,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

-      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
   oauth:
     authorize:
       title: Authorise access to your account