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

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 93e2b6e0a7592b55822b1683f59b243a018775fc..f168ef2379959d9bd807bd9cf31bbfd816ad4c98 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -17,6 +17,10 @@ is:
       friendly: '%e. %B %Y kl. %H:%M'
       blog: '%e. %B %Y'
   activerecord:
+    errors:
+      messages:
+        invalid_email_address: lítur ekki út fyrir að vera gilt tölvupóstfang
+        email_address_not_routable: er ekki nothæft
     models:
       acl: Aðgangslisti
       changeset: Breytingasett
@@ -889,7 +893,7 @@ is:
           "yes": Verslun
         tourism:
           alpine_hut: Fjallaskáli
-          apartment: Íbúð
+          apartment: Frístundaíbúð
           artwork: Listaverk
           attraction: Aðdráttarafl
           bed_and_breakfast: BB-gisting og veitingar
@@ -1711,7 +1715,7 @@ is:
       edit: Breyta
       preview: Forskoðun
     markdown_help:
-      title_html: Þáttað með <a href="https://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Þáttað með <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
       headings: Fyrirsagnir
       heading: Fyrirsögn
       subheading: Undirfyrirsögn
@@ -2599,7 +2603,9 @@ is:
     directions:
       ascend: Fara upp
       engines:
+        fossgis_osrm_bike: Hjólreiðar (OSRM)
         fossgis_osrm_car: Bíll (OSRM)
+        fossgis_osrm_foot: Fótgangandi (OSRM)
         graphhopper_bicycle: Reiðhjól (GraphHopper)
         graphhopper_car: Bíll (GraphHopper)
         graphhopper_foot: Fótgangandi (GraphHopper)