Merge 16216:16355 from trunk.

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

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 6f0fa15212a1a9cf15f4bc44405868ca8601b151..c6484ad8ddb9be54715f98d41d3a9d3a3025615d 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -72,6 +72,10 @@ is:
         description: "Lýsing"
         languages: "Tungumál"
         pass_crypt: "Lykilorð"
+  printable_name:
+    with_id: "{{id}}"
+    with_version: "{{id}}, útgáfa {{version}}"
+    with_name: "{{name}} ({{id}})"
   map:
     view: "Kort"
     edit: "Breyta"
@@ -83,6 +87,14 @@ is:
       download: "Niðurhala breytingunni á {{changeset_xml_link}} eða á {{osmchange_xml_link}}"
       changesetxml: "Breytingarsetts XML sniði"
       osmchangexml: "osmChange XML sniði"
+    changeset_navigation:
+      user:
+        name_tooltip: "Skoða breytingarsett eftir {{user}}"
+        prev_tooltip: "Fyrri breytingarsett eftir {{user}}"
+        next_tooltip: "Næsta breytingarsett eftir {{user}}"
+      all:
+        prev_tooltip: "Fyrra breytingarsett"
+        next_tooltip: "Næsta breytingarsett"
     changeset_details:
       created_at: "Búið til:"
       closed_at: "Lokað:"
@@ -104,12 +116,16 @@ is:
       version: "Útgáfa:"
       in_changeset: "Í breytingarsetti:"
     containing_relation:
-      relation: "Venslunum „{{relation_name}}“"
-      relation_as: "(sem {{relation_role}})"
+      entry: "Venslunum {{relation_name}}"
+      entry_role: "Venslunum {{relation_name}} (sem „{{relation_role}}“)"
     map:
       loading: "Hleð..."
       deleted: "Eytt"
-      view_larger_map: "Skoða á stærra korti"
+      larger:
+        area: "Skoða þetta svæði á stærra korti"
+        node: "Skoða þennan hnút á stærra korti"
+        way: "Skoða þennan veg á stærra korti"
+        relation: "Skoða þessi vensl á stærra korti"
     node_details:
       coordinates: "Hnit: "
       part_of: "Hluti af:"
@@ -142,7 +158,12 @@ is:
       relation_history: "Breytingarskrá vensla "
       relation_history_title: "Breytingarskrá vensla: {{relation_name}}"
     relation_member:
-      as: "sem"
+      entry: "{{type}} {{name}}"
+      entry_role: "{{type}} {{name}} sem „{{role}}“"
+      type:
+        node: "Hnúturinn"
+        way: "Vegurinn"
+        relation: "Venslin"
     relation:
       relation: "Vensl"
       relation_title: "Vensl: {{relation_name}}"
@@ -328,10 +349,34 @@ is:
       add_marker: "Bæta við punkt á kortið"
       view_larger_map: "Skoða á stærra korti"
   geocoder:
+    search:
+      title:
+        latlon: 'Niðurstöður frá <a href="http://openstreetmap.org/">Internal</a>'
+        us_postcode: 'Niðurstöður frá <a href="http://geocoder.us/">Geocoder.us</a>'
+        uk_postcode: 'Niðurstöður frá <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
+        ca_postcode: 'Niðurstöður frá <a href="http://geocoder.ca/">Geocoder.CA</a>'
+        osm_namefinder: 'Niðurstöður frá <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
+        geonames: 'Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>'
     results:
-      results: "Niðurstöður"
-      type_from_source: "{{type}} frá {{source_link}}"
       no_results: "Ekkert fannst"
+      namefinder:
+        prefix: "{{type}} "
+        suffix_place: ", {{distance}} {{direction}} af {{placename}}"
+        suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} af {{parentname}})"
+        suffix_suburb: "{{suffix}}, {{parentname}}"
+      distance:
+        zero: "minna en 1km"
+        one: "u.þ.b. 1km"
+        other: "u.þ.b. {{count}}km"
+      direction:
+        south_west: "suðvestur"
+        south: "suður"
+        south_east: "suðaustur"
+        east: "austur"
+        north_east: "norðaustur"
+        north: "norður"
+        north_west: "norðvestur"
+        west: "vestur"
   layouts:
     project_name:
       # in <title>
@@ -566,7 +611,6 @@ is:
       search: "Leita"
       where_am_i: "Hvar er ég?"
       submit_text: "Ok"
-      searching: "Leita..."
       search_help: "dæmi: „Akureyri“, „Laugavegur, Reykjavík“ eða „post offices near Lünen“. Sjá einnig <a href='http://wiki.openstreetmap.org/index.php?uselang=is&title=Search'>leitarhjálpina</a>."
     key:
       map_key: "Kortaskýringar"
@@ -791,6 +835,7 @@ is:
       your friends: Vinir þínir
       no friends: Þú átt enga vini
       km away: "í {{count}} km fjarlægð"
+      m away: "í {{count}} m fjarlægð"
       nearby users: "Nálægir notendur:"
       no nearby users: "Engir notendur hafa stillt staðsetningu sína nálægt þér."
       change your settings: "breyttu stillingunum þínum"