Update bundle

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 29940265560c5afecc54423b9471492a3a38963b..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:


@@ -1703,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: