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

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 69322f026d664c23cf339ed62af44d9243e48862..44c4f3ebf06f94e022cc783f9264c27005bce5b0 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2557,8 +2557,6 @@ is:
       identifiable: AUÐKENNANLEGT
       private: EINKA
       trackable: REKJANLEGT
-      by: frá
-      in: í
     index:
       public_traces: Allir ferlar
       my_gps_traces: GPS ferlarnir mínir
@@ -2873,9 +2871,6 @@ is:
     index:
       title: Notendur
       heading: Notendur
-      showing:
-        one: Síða %{page} (%{first_item} af %{items})
-        other: Síða %{page} (%{first_item}-%{last_item} af %{items})
       summary_html: '%{name} var útbúinn frá %{ip_address} þann %{date}'
       summary_no_ip_html: '%{name} útbúinn þann %{date}'
       confirm: Staðfesta valda notendur