Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c048c41b14d611ef74ed7d8647f955d031e085b9..3fbb69c26d3ddad7a9b6f5a95d2efe1c60210345 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -220,7 +220,6 @@ en-GB:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -1384,7 +1383,7 @@ en-GB:
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account

-        windowslive:
+        microsoft:

           title: Login with Windows Live
           alt: Login with a Windows Live Account
         github:
           title: Login with Windows Live
           alt: Login with a Windows Live Account
         github:


@@ -1415,18 +1414,8 @@ en-GB:
         aerial imagery, GPS devices, and low-tech field maps to verify that OSM
         is accurate and up to date.
       community_driven_title: Community Driven
         aerial imagery, GPS devices, and low-tech field maps to verify that OSM
         is accurate and up to date.
       community_driven_title: Community Driven

-      community_driven_1_html: |-
-        OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more.
-        To learn more about the community, see the <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>, <a href='%{diary_path}'>user diaries</a>, <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.

       open_data_title: Open Data
       legal_title: Legal
       open_data_title: Open Data
       legal_title: Legal

-      legal_1_1_html: "This site and many other related services are formally operated
-        by the  \n<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a>
-        (OSMF) \non behalf of the community. Use of all OSMF operated services is
-        subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
-        of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
-        Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
-        Policy</a>."

       partners_title: Partners
     copyright:
       foreign:
       partners_title: Partners
     copyright:
       foreign:


@@ -1713,7 +1702,6 @@ en-GB:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:

-      showing_page: Page %{page}

       older: Older Traces
       newer: Newer Traces
     trace:
       older: Older Traces
       newer: Newer Traces
     trace: