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

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

diff --git a/config/locales/da.yml b/config/locales/da.yml
index e454a6fbf6b1a77748c6ea87496df85c2412c01b..502577aff03d5e24968495bd71fe894ac0b412fd 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -246,7 +246,6 @@ da:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -1276,7 +1275,7 @@ da:
           coffee: Kaffeforhandler
           computer: Computerforretning
           confectionery: Slikbutik
-          convenience: Kiosk
+          convenience: Minimarked
           copyshop: Kopibutik
           cosmetics: Kosmetikforretning
           craft: Hobbyforhandler
@@ -2471,7 +2470,6 @@ da:
       visibility: 'Synlighed:'
       confirm_delete: Slet dette spor?
     trace_paging_nav:
-      showing_page: Side %{page}
       older: Ældre spor
       newer: Nyere spor
     trace: