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

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

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