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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7635c483dd94534f647a174f68b69fcb8ea6dca8..7b415f6b794b917231796ea916b20b58a1cd0284 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -212,7 +212,7 @@ en:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Microsoft
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1785,7 +1785,7 @@ en:
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account
-        windowslive:
+        microsoft:
           title: Login with Microsoft
           alt: Login with a Microsoft Account
         github: