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

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index fc0211a78da48c050949b54ffadb509d3345adb0..561954e8af840f7259d17489d36bc4d97ab982cd 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -21,8 +21,6 @@ is:
     formats:
       friendly: '%e. %B %Y kl. %H:%M'
       blog: '%e. %B %Y'
     formats:
       friendly: '%e. %B %Y kl. %H:%M'
       blog: '%e. %B %Y'

-  count:
-    at_least_pattern: '%{count}+'

   helpers:
     file:
       prompt: Veldu skrá
   helpers:
     file:
       prompt: Veldu skrá


@@ -232,7 +230,6 @@ is:
   auth:
     providers:
       none: Ekkert
   auth:
     providers:
       none: Ekkert

-      openid: OpenID

       google: Google
       facebook: Facebook
       microsoft: Microsoft
       google: Google
       facebook: Facebook
       microsoft: Microsoft


@@ -395,7 +392,6 @@ is:
         way: Leið
         relation: Vensl
     containing_relation:
         way: Leið
         relation: Vensl
     containing_relation:

-      entry_html: Venslin %{relation_name}

       entry_role_html: Venslin %{relation_name} (sem „%{relation_role}“)
     not_found:
       title: Fannst ekki
       entry_role_html: Venslin %{relation_name} (sem „%{relation_role}“)
     not_found:
       title: Fannst ekki


@@ -1520,7 +1516,6 @@ is:
         other: '%{count} skýrslur'
       reported_item: Tilkynnt atriði
     show:
         other: '%{count} skýrslur'
       reported_item: Tilkynnt atriði
     show:

-      title: '%{status} vandamál #%{issue_id}'

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


@@ -2654,7 +2649,7 @@ is:
       upload_trace: Senda inn feril
       all_traces: Allar ferlar
       my_traces: Ferlarnir mínir
       upload_trace: Senda inn feril
       all_traces: Allar ferlar
       my_traces: Ferlarnir mínir

-      traces_from: Opinberir ferlar frá %{user}
+      traces_from_html: Opinberir ferlar frá %{user}

       remove_tag_filter: Fjarlægja merkjasíu
     destroy:
       scheduled_for_deletion: Þessum feril verður eitt
       remove_tag_filter: Fjarlægja merkjasíu
     destroy:
       scheduled_for_deletion: Þessum feril verður eitt


@@ -3055,7 +3050,6 @@ is:
       reason: 'Ástæða banns:'
       revoker: 'Eytt af:'
     block:
       reason: 'Ástæða banns:'
       revoker: 'Eytt af:'
     block:

-      not_revoked: (ekki eytt)

       show: Sýna
       edit: Breyta
     page:
       show: Sýna
       edit: Breyta
     page:


@@ -3063,13 +3057,12 @@ is:
       creator_name: Búið til af
       reason: Ástæða banns
       status: Staða
       creator_name: Búið til af
       reason: Ástæða banns
       status: Staða

-      revoker_name: Eytt af

     navigation:
       all_blocks: Öll bönn
       blocks_on_me: Bönn gegn mér
     navigation:
       all_blocks: Öll bönn
       blocks_on_me: Bönn gegn mér

-      blocks_on_user: Bönn gegn %{user}
+      blocks_on_user_html: Bönn gegn %{user}

       blocks_by_me: Bönn eftir mig
       blocks_by_me: Bönn eftir mig

-      blocks_by_user: Bönn eftir %{user}
+      blocks_by_user_html: Bönn eftir %{user}

       block: 'Bann #%{id}'
   user_mutes:
     index:
       block: 'Bann #%{id}'
   user_mutes:
     index: