Merge pull request #5303 from tomhughes/remember-me

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index fc0211a78da48c050949b54ffadb509d3345adb0..821c795520a419b914eaa9a9db846e7b3969e081 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -21,8 +21,6 @@ is:
     formats:
       friendly: '%e. %B %Y kl. %H:%M'
       blog: '%e. %B %Y'
     formats:
       friendly: '%e. %B %Y kl. %H:%M'
       blog: '%e. %B %Y'

-  count:
-    at_least_pattern: '%{count}+'

   helpers:
     file:
       prompt: Veldu skrá
   helpers:
     file:
       prompt: Veldu skrá


@@ -232,7 +230,6 @@ is:
   auth:
     providers:
       none: Ekkert
   auth:
     providers:
       none: Ekkert

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft