Merge pull request #4107 from tomhughes/diary-visibility

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index c561c763fea4e7de056aab9ebafda13603855c0c..297191f9d1cb974cabcdc4b38d0e02c812bbf079 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -230,7 +230,6 @@ is:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      windowslive: Microsoft

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -387,7 +386,7 @@ is:
       history_title_html: 'Saga leiðar: %{name}'
       nodes: Liðir
       nodes_count:
       history_title_html: 'Saga leiðar: %{name}'
       nodes: Liðir
       nodes_count:

-        one: liður
+        one: '%{count} liður'

         other: '%{count} liðir'
       also_part_of_html:
         one: hluti leiðar %{related_ways}
         other: '%{count} liðir'
       also_part_of_html:
         one: hluti leiðar %{related_ways}


@@ -562,9 +561,9 @@ is:
       comment_link: Bæta athugasemd við þessa færslu
       reply_link: Senda skilaboð til höfundar
       comment_count:
       comment_link: Bæta athugasemd við þessa færslu
       reply_link: Senda skilaboð til höfundar
       comment_count:

-        zero: Engar athugasemdir

         one: '%{count} athugasemd'
         other: '%{count} athugasemdir'
         one: '%{count} athugasemd'
         other: '%{count} athugasemdir'

+      no_comments: Engar athugasemdir

       edit_link: Breyta þessari færslu
       hide_link: Fela þessa færslu
       unhide_link: Af-fela þessa færslu
       edit_link: Breyta þessari færslu
       hide_link: Fela þessa færslu
       unhide_link: Af-fela þessa færslu


@@ -1456,9 +1455,9 @@ is:
     show:
       title: '%{status} vandamál #%{issue_id}'
       reports:
     show:
       title: '%{status} vandamál #%{issue_id}'
       reports:

-        zero: Engar skýrslur

         one: '%{count} skýrsla'
         other: '%{count} skýrslur'
         one: '%{count} skýrsla'
         other: '%{count} skýrslur'

+      no_reports: Engar skýrslur

       report_created_at: Fyrst tilkynnt %{datetime}
       last_resolved_at: Síðast leyst %{datetime}
       last_updated_at: Síðast uppfært %{datetime} af %{displayname}
       report_created_at: Fyrst tilkynnt %{datetime}
       last_resolved_at: Síðast leyst %{datetime}
       last_updated_at: Síðast uppfært %{datetime} af %{displayname}


@@ -2553,7 +2552,6 @@ is:
       visibility: 'Sýnileiki:'
       confirm_delete: Eyða þessum ferli?
     trace_paging_nav:
       visibility: 'Sýnileiki:'
       confirm_delete: Eyða þessum ferli?
     trace_paging_nav:

-      showing_page: Síða %{page}

       older: Eldri ferlar
       newer: Nýrri ferlar
     trace:
       older: Eldri ferlar
       newer: Nýrri ferlar
     trace: