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

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index ce4bc3adef735484fb42b45e8946f2cf6ece4601..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'
-  count:
-    at_least_pattern: '%{count}+'
   helpers:
     file:
       prompt: Veldu skrá
@@ -232,7 +230,6 @@ is:
   auth:
     providers:
       none: Ekkert
-      openid: OpenID
       google: Google
       facebook: Facebook
       microsoft: Microsoft
@@ -395,7 +392,6 @@ is:
         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
@@ -1520,7 +1516,6 @@ is:
         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'
@@ -2149,7 +2144,6 @@ is:
         contributors_at_land_vorarlberg: Land Vorarlberg
         contributors_at_land_vorarlberg_url: https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm
         contributors_at_cc_by_at_with_amendments: CC BY AT með viðaukum
-        contributors_at_cc_by_at_with_amendments_url: https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/
         contributors_au_credit_html: |-
           %{australia}: Inniheldur gögn eða er þróað með Administrative Boundaries © %{geoscape_australia_link}
           sem gert er aðgengilegt af Commonwealth of Australia með %{cc_licence_link}.
@@ -2655,7 +2649,7 @@ is:
       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
@@ -2843,7 +2837,6 @@ is:
       consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög
         mín verði í almenningseigu (Public Domain)
       consider_pd_why: hvað þýðir þetta?
-      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       guidance_info_html: 'Upplýsingar sem hjálpa til við að skilja þessi hugtök:
         %{readable_summary_link} á mannamáli og nokkrar %{informal_translations_link}'
       readable_summary: læsilegt yfirlit
@@ -3057,7 +3050,6 @@ is:
       reason: 'Ástæða banns:'
       revoker: 'Eytt af:'
     block:
-      not_revoked: (ekki eytt)
       show: Sýna
       edit: Breyta
     page:
@@ -3065,13 +3057,12 @@ is:
       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
-      blocks_on_user: Bönn gegn %{user}
+      blocks_on_user_html: Bönn gegn %{user}
       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: