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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 31e956c2a066b9bc1737c5a63e3be5f45a33abd7..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
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1349,7 +1348,6 @@ en-GB:
       image: Image
       gravatar:
         gravatar: Use Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
         disabled: Gravatar has been disabled.
         enabled: Display of your Gravatar has been enabled.
       new image: Add an image
@@ -1385,7 +1383,7 @@ en-GB:
         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:
@@ -1704,7 +1702,6 @@ en-GB:
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
     trace_paging_nav:
-      showing_page: Page %{page}
       older: Older Traces
       newer: Newer Traces
     trace: