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

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 12231610927baaa8cd9151c638dbf5496d31cffa..c3540ca65d39822ef67f064c5c7d249f6cc11b8f 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Macofe
+# Author: McDutchie
 # Author: Nemo bis
 # Author: Snævar
 # Author: Sveinki
@@ -508,7 +509,6 @@ is:
         title: OpenStreetMap bloggfærslur
         description: Nýjustu bloggfærslur frá notendum OpenStreetMap
     comments:
-      has_commented_on: '%{display_name} gerði athugasemdir við eftirfarandi bloggfærslur'
       post: Senda
       when: Þegar
       comment: Athugasemd
@@ -779,7 +779,6 @@ is:
           siren: Neyðarsírena
           suction_point: Soghani fyrir neyðartilfelli
           water_tank: Vatnstankur fyrir neyðartilfelli
-          "yes": Neyðartilfelli
         highway:
           abandoned: Ónotuð hraðbraut
           bridleway: Reiðstígur
@@ -1694,7 +1693,7 @@ is:
       email or username: 'Netfang eða notandanafn:'
       password: 'Lykilorð:'
       openid_html: '%{logo} OpenID:'
-      remember: 'Muna innskráninguna:'
+      remember: Muna innskráninguna
       lost password link: Gleymdirðu lykilorðinu þínu?
       login_button: Innskrá
       register now: Skrá þig núna