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

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 63e38513a3ec69fa6452532965e3a931b0c100e8..b9c3f1a68da3f0f1bc66fdd45a7ff28521cdddab 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -983,6 +983,7 @@ is:
           cape: Höfði
           cave_entrance: Hellisop
           cliff: Klettar
+          coastline: Strandlengjan
           crater: Gígur
           dune: Alda
           fell: Fell
@@ -1535,7 +1536,6 @@ is:
     inbox:
       title: Innhólf
       my_inbox: Innhólfið mitt
-      outbox: úthólf
       messages: Þú átt %{new_messages} og %{old_messages}
       new_messages:
         one: '%{count} ný skilaboð'
@@ -1570,9 +1570,6 @@ is:
       body: Því miður er ekkert skilaboð með þetta auðkenni.
     outbox:
       title: Úthólf
-      my_inbox_html: Mitt %{inbox_link}
-      inbox: innhólf
-      outbox: úthólf
       messages:
         one: Þú hefur sent %{count} skilaboð
         other: Þú hefur sent %{count} skilaboð
@@ -2128,7 +2125,6 @@ is:
       more: upplýsingar
       trace_details: Sýna upplýsingar um ferilinn
       view_map: Skoða kort
-      edit: breyta
       edit_map: Breyta korti
       public: OPIÐ ÖLLUM
       identifiable: AUÐKENNANLEGT
@@ -2136,7 +2132,6 @@ is:
       trackable: REKJANLEGT
       by: eftir
       in: í
-      map: kort
     index:
       public_traces: Allir ferlar
       my_traces: GPS-ferlarnir mínir