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

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

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 461a31467aa736a73936199cc86916e5747fb870..69501f68c772d48a00d45083f630f06e41806867 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -249,7 +249,6 @@ id:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1889,7 +1888,7 @@ id:
         facebook:
           title: Masuk dengan Facebook
           alt: Masuk dengan akun Facebook
-        windowslive:
+        microsoft:
           title: Masuk dengan Windows Live
           alt: Masuk dengan akun Windows Live
         github:
@@ -2474,7 +2473,6 @@ id:
       visibility: Visibilitas
       confirm_delete: Hapus jejak ini?
     trace_paging_nav:
-      showing_page: Halaman %{page}
       older: Jejak-jejak Lama
       newer: Trek-trek terbaru
     trace: