Merge branch 'master' into notes

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index ea3aa08a5276f56a3233b2f46be585005b2cc12d..4c4de00630ba9d460e0ee2c81fd0d77051bdae57 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -616,7 +616,6 @@ is:
     user_diaries_tooltip: Sjá blogg notenda
     view: Kort
     view_tooltip: Kortasýn
     user_diaries_tooltip: Sjá blogg notenda
     view: Kort
     view_tooltip: Kortasýn

-    welcome_user: Hæ %{user_link}

     welcome_user_link_tooltip: Notandasíðan þín
   license_page: 
     foreign: 
     welcome_user_link_tooltip: Notandasíðan þín
   license_page: 
     foreign: 


@@ -683,8 +682,6 @@ is:
       back_to_outbox: Aftur í úthólf
       date: Dags
       from: Frá
       back_to_outbox: Aftur í úthólf
       date: Dags
       from: Frá

-      reading_your_messages: Les móttekin skilaboð
-      reading_your_sent_messages: Les send skilaboð

       reply_button: Svara
       subject: Titill
       title: Les skilaboð
       reply_button: Svara
       subject: Titill
       title: Les skilaboð