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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 97961d16736640dc692777e73c2f87044e377125..1c76d885451038bfea88628eaa551d37ebddb372 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1,6 +1,7 @@
 # Messages for Interlingua (interlingua)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for Interlingua (interlingua)
 # Exported from translatewiki.net
 # Export driver: phpyaml

+# Author: Abijeet Patro

 # Author: Carlosedepaula
 # Author: Fanjiayi
 # Author: Julian Mendez
 # Author: Carlosedepaula
 # Author: Fanjiayi
 # Author: Julian Mendez


@@ -12,7 +13,34 @@ ia:
   time:
     formats:
       friendly: '%e de %B %Y a %H:%M'
   time:
     formats:
       friendly: '%e de %B %Y a %H:%M'

+  helpers:
+    submit:
+      diary_comment:
+        create: Salveguardar
+      diary_entry:
+        create: Publicar
+        update: Actualisar
+      issue_comment:
+        create: Adder commento
+      message:
+        create: Inviar
+      client_application:
+        create: Registrar
+        update: Modificar
+      redaction:
+        create: Crear suppression
+        update: Salveguardar suppression
+      trace:
+        create: Incargar
+        update: Salveguardar modificationes
+      user_block:
+        create: Crear blocada
+        update: Actualisar blocada

   activerecord:
   activerecord:

+    errors:
+      messages:
+        invalid_email_address: non pare esser un adresse de e-mail valide
+        email_address_not_routable: non es attingibile

     models:
       acl: Lista de controlo de accesso
       changeset: Gruppo de modificationes
     models:
       acl: Lista de controlo de accesso
       changeset: Gruppo de modificationes


@@ -21,6 +49,7 @@ ia:
       diary_comment: Commento de diario
       diary_entry: Entrata del diario
       friend: Amico
       diary_comment: Commento de diario
       diary_entry: Entrata del diario
       friend: Amico

+      issue: Problema

       language: Lingua
       message: Message
       node: Nodo
       language: Lingua
       message: Message
       node: Nodo


@@ -37,13 +66,14 @@ ia:
       relation: Relation
       relation_member: Membro de relation
       relation_tag: Etiquetta de relation
       relation: Relation
       relation_member: Membro de relation
       relation_tag: Etiquetta de relation

+      report: Reporto

       session: Session
       trace: Tracia
       tracepoint: Puncto de tracia
       tracetag: Etiquetta de tracia
       user: Usator
       user_preference: Preferentias de usator
       session: Session
       trace: Tracia
       tracepoint: Puncto de tracia
       tracetag: Etiquetta de tracia
       user: Usator
       user_preference: Preferentias de usator

-      user_token: Indicio de usator
+      user_token: Token del usator

       way: Via
       way_node: Nodo de via
       way_tag: Etiquetta de via
       way: Via
       way_node: Nodo de via
       way_tag: Etiquetta de via


@@ -80,6 +110,45 @@ ia:
         description: Description
         languages: Linguas
         pass_crypt: Contrasigno
         description: Description
         languages: Linguas
         pass_crypt: Contrasigno

+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: circa 1 hora retro
+        other: circa %{count} horas retro
+      about_x_months:
+        one: circa 1 mense retro
+        other: circa %{count} menses retro
+      about_x_years:
+        one: circa 1 anno retro
+        other: circa %{count} annos retro
+      almost_x_years:
+        one: quasi 1 anno retro
+        other: quasi %{count} annos retro
+      half_a_minute: un medie minuta retro
+      less_than_x_seconds:
+        one: minus de 1 seconda retro
+        other: minus de %{count} secundas retro
+      less_than_x_minutes:
+        one: minus de un minuta retro
+        other: minus de %{count} minutas retro
+      over_x_years:
+        one: plus de 1 anno retro
+        other: plus de %{count} annos retro
+      x_seconds:
+        one: 1 secunda retro
+        other: '%{count} secundas retro'
+      x_minutes:
+        one: 1 minuta retro
+        other: '%{count} minutas retro'
+      x_days:
+        one: 1 die retro
+        other: '%{count} dies retro'
+      x_months:
+        one: 1 mense retro
+        other: '%{count} menses retro'
+      x_years:
+        one: 1 anno retro
+        other: '%{count} annos retro'

   editor:
     default: Predefinite (actualmente %{name})
     potlatch:
   editor:
     default: Predefinite (actualmente %{name})
     potlatch:


@@ -94,15 +163,47 @@ ia:
     remote:
       name: Controlo remote
       description: Controlo remote (JOSM o Merkaartor)
     remote:
       name: Controlo remote
       description: Controlo remote (JOSM o Merkaartor)

+  auth:
+    providers:
+      none: Necun
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
+  api:
+    notes:
+      comment:
+        opened_at_html: Create %{when}
+        opened_at_by_html: Create %{when} per %{user}
+        commented_at_html: Actualisate %{when}
+        commented_at_by_html: Actualisate %{when} per %{user}
+        closed_at_html: Resolvite %{when}
+        closed_at_by_html: Resolvite %{when} per %{user}
+        reopened_at_html: Reactivate %{when}
+        reopened_at_by_html: Reactivate %{when} per %{user}
+      rss:
+        title: Notas de OpenStreetMap
+        description_area: Un lista de notas reportate, commentate o claudite in tu
+          area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+        description_item: Syndication RSS pro le nota %{id}
+        opened: nove nota (a presso de %{place})
+        commented: nove commento (a presso de %{place})
+        closed: nota claudite (a presso de %{place})
+        reopened: nota reactivate (a presso de %{place})
+      entry:
+        comment: Commento
+        full: Nota complete

   browse:
     created: Create a
     closed: Claudite a
   browse:
     created: Create a
     closed: Claudite a

-    created_html: Create <abbr title='%{title}'>%{time} retro</abbr>
-    closed_html: Claudite <abbr title='%{title}'>%{time} retro</abbr>
-    created_by_html: Create <abbr title='%{title}'>%{time} retro</abbr> per %{user}
-    deleted_by_html: Delite <abbr title='%{title}'>%{time} retro</abbr> per %{user}
-    edited_by_html: Modificate <abbr title='%{title}'>%{time} retro</abbr> per %{user}
-    closed_by_html: Claudite <abbr title='%{title}'>%{time} retro</abbr> per %{user}
+    created_html: Create <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Claudite <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Create <abbr title='%{title}'>%{time}</abbr> per %{user}
+    deleted_by_html: Delite <abbr title='%{title}'>%{time}</abbr> per %{user}
+    edited_by_html: Modificate <abbr title='%{title}'>%{time}</abbr> per %{user}
+    closed_by_html: Claudite <abbr title='%{title}'>%{time}</abbr> per %{user}

     version: Version
     in_changeset: Gruppo de modificationes
     anonymous: anonyme
     version: Version
     in_changeset: Gruppo de modificationes
     anonymous: anonyme


@@ -122,9 +223,8 @@ ia:
       relation: Relationes (%{count})
       relation_paginated: Relationes (%{x}-%{y} de %{count})
       comment: Commentos (%{count})
       relation: Relationes (%{count})
       relation_paginated: Relationes (%{x}-%{y} de %{count})
       comment: Commentos (%{count})

-      hidden_commented_by: Commento celate de %{user} <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      commented_by: Commento de %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
+      hidden_commented_by: Commento celate de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       changesetxml: XML del gruppo de modificationes
       osmchangexml: XML osmChange
       feed:
       changesetxml: XML del gruppo de modificationes
       osmchangexml: XML osmChange
       feed:


@@ -135,28 +235,28 @@ ia:
       still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
         quando le gruppo de modificationes essera claudite.
     node:
       still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
         quando le gruppo de modificationes essera claudite.
     node:

-      title: 'Nodo: %{name}'
-      history_title: 'Historia del nodo: %{name}'
+      title_html: 'Nodo: %{name}'
+      history_title_html: 'Historia del nodo: %{name}'

     way:
     way:

-      title: 'Via: %{name}'
-      history_title: 'Historia del via: %{name}'
+      title_html: 'Via: %{name}'
+      history_title_html: 'Historia del via: %{name}'

       nodes: Nodos
       nodes: Nodos

-      also_part_of:
+      also_part_of_html:

         one: parte del via %{related_ways}
         other: parte del vias %{related_ways}
     relation:
         one: parte del via %{related_ways}
         other: parte del vias %{related_ways}
     relation:

-      title: 'Relation: %{name}'
-      history_title: 'Historia del relation: %{name}'
+      title_html: 'Relation: %{name}'
+      history_title_html: 'Historia del relation: %{name}'

       members: Membros
     relation_member:
       members: Membros
     relation_member:

-      entry_role: '%{type} %{name} como %{role}'
+      entry_role_html: '%{type} %{name} como %{role}'

       type:
         node: Nodo
         way: Via
         relation: Relation
     containing_relation:
       type:
         node: Nodo
         way: Via
         relation: Relation
     containing_relation:

-      entry: Relation %{relation_name}
-      entry_role: Relation %{relation_name} (como %{relation_role})
+      entry_html: Relation %{relation_name}
+      entry_role_html: Relation %{relation_name} (como %{relation_role})

     not_found:
       sorry: Le %{type} №%{id} non ha essite trovate.
       type:
     not_found:
       sorry: Le %{type} №%{id} non ha essite trovate.
       type:


@@ -175,9 +275,9 @@ ia:
         changeset: gruppo de modificationes
         note: nota
     redacted:
         changeset: gruppo de modificationes
         note: nota
     redacted:

-      redaction: Obscuration %{id}
+      redaction: Suppression %{id}

       message_html: Le version %{version} de iste %{type} non pote esser monstrate
       message_html: Le version %{version} de iste %{type} non pote esser monstrate

-        perque illo ha essite obscurate. Vide %{redaction_link} pro detalios.
+        perque illo ha essite supprimite. Vide %{redaction_link} pro detalios.

       type:
         node: nodo
         way: via
       type:
         node: nodo
         way: via


@@ -194,7 +294,9 @@ ia:
         tag: Le pagina wiki que describe le etiquetta %{key}=%{value}
       wikidata_link: Le elemento %{page} in Wikidata
       wikipedia_link: Le articulo %{page} in Wikipedia
         tag: Le pagina wiki que describe le etiquetta %{key}=%{value}
       wikidata_link: Le elemento %{page} in Wikidata
       wikipedia_link: Le articulo %{page} in Wikipedia

+      wikimedia_commons_link: Le objecto %{page} sur Wikimedia Commons

       telephone_link: Telephonar %{phone_number}
       telephone_link: Telephonar %{phone_number}

+      colour_preview: Previsualisation del color %{colour_value}

     note:
       title: 'Nota: %{id}'
       new_note: Nove nota
     note:
       title: 'Nota: %{id}'
       new_note: Nove nota


@@ -202,20 +304,15 @@ ia:
       open_title: Nota non resolvite №%{note_name}
       closed_title: Nota resolvite №%{note_name}
       hidden_title: Nota celate №%{note_name}
       open_title: Nota non resolvite №%{note_name}
       closed_title: Nota resolvite №%{note_name}
       hidden_title: Nota celate №%{note_name}

-      open_by: Create per %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
-      open_by_anonymous: Create per un anonymo <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      commented_by: Commento scribite per %{user} <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      commented_by_anonymous: Commento scribite per un anonymo <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      closed_by: Resolvite per %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
-      closed_by_anonymous: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      reopened_by: Reactivate per %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
-      reopened_by_anonymous: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}
-        retro</abbr>
-      hidden_by: Celate per %{user} <abbr title='%{exact_time}'>%{when} retro</abbr>
+      opened_by: Create per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous: Create per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous: Commento de un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by: Resolvite per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by: Reactivate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by: Celate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       report: Signalar iste nota
     query:
       title: Cercar objectos
       report: Signalar iste nota
     query:
       title: Cercar objectos


@@ -239,9 +336,9 @@ ia:
       area: Area
     index:
       title: Gruppos de modificationes
       area: Area
     index:
       title: Gruppos de modificationes

-      title_user: Gruppos de modificationes per %{user}
+      title_user: Gruppos de modificationes facite per %{user}

       title_friend: Gruppos de modificationes facite per mi amicos
       title_friend: Gruppos de modificationes facite per mi amicos

-      title_nearby: Gruppos de modificationes per usatores vicin
+      title_nearby: Gruppos de modificationes facite per usatores vicin

       empty: Nulle gruppo de modificationes trovate.
       empty_area: Nulle gruppo de modificationes in iste area.
       empty_user: Nulle gruppo de modificationes facite per iste usator.
       empty: Nulle gruppo de modificationes trovate.
       empty_area: Nulle gruppo de modificationes in iste area.
       empty_user: Nulle gruppo de modificationes facite per iste usator.


@@ -256,12 +353,12 @@ ia:
     comment:
       comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
         %{author}
     comment:
       comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
         %{author}

-      commented_at_by_html: Actualisate %{when} retro per %{user}
+      commented_at_by_html: Actualisate %{when} per %{user}

     comments:
       comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
         %{author}
     index:
     comments:
       comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
         %{author}
     index:

-      title_all: Discussion sur le gruppo de modificationes OpenStreetMap
+      title_all: Discussion sur un gruppo de modificationes in OpenStreetMap

       title_particular: Discussion sur le gruppo de modificationes OpenStreetMap №
         %{changeset_id}
     timeout:
       title_particular: Discussion sur le gruppo de modificationes OpenStreetMap №
         %{changeset_id}
     timeout:


@@ -270,7 +367,14 @@ ia:
   diary_entries:
     new:
       title: Nove entrata de diario
   diary_entries:
     new:
       title: Nove entrata de diario

-      publish_button: Publicar
+    form:
+      subject: 'Subjecto:'
+      body: 'Texto:'
+      language: 'Lingua:'
+      location: 'Loco:'
+      latitude: 'Latitude:'
+      longitude: 'Longitude:'
+      use_map_link: usar carta

     index:
       title: Diarios de usatores
       title_friends: Diarios de amicos
     index:
       title: Diarios de usatores
       title_friends: Diarios de amicos


@@ -285,29 +389,20 @@ ia:
       newer_entries: Entratas plus recente
     edit:
       title: Modificar entrata de diario
       newer_entries: Entratas plus recente
     edit:
       title: Modificar entrata de diario

-      subject: 'Subjecto:'
-      body: 'Texto:'
-      language: 'Lingua:'
-      location: 'Loco:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: usar carta
-      save_button: Salveguardar

       marker_text: Loco de entrata de diario
     show:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
       leave_a_comment: Lassar un commento
       marker_text: Loco de entrata de diario
     show:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
       leave_a_comment: Lassar un commento

-      login_to_leave_a_comment: '%{login_link} pro lassar un commento'
+      login_to_leave_a_comment_html: '%{login_link} pro lassar un commento'

       login: Aperir session
       login: Aperir session

-      save_button: Salveguardar

     no_such_entry:
       title: Nulle tal entrata de diario
       heading: 'Nulle entrata con le ID: %{id}'
       body: Pardono, il non ha un entrata de diario o commento con le ID %{id}. Verifica
         le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
     diary_entry:
     no_such_entry:
       title: Nulle tal entrata de diario
       heading: 'Nulle entrata con le ID: %{id}'
       body: Pardono, il non ha un entrata de diario o commento con le ID %{id}. Verifica
         le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
     diary_entry:

-      posted_by: Publicate per %{link_user} le %{created} in %{language_link}
+      posted_by_html: Publicate per %{link_user} le %{created} in %{language_link}

       comment_link: Commentar iste entrata
       reply_link: Responder a iste entrata
       comment_count:
       comment_link: Commentar iste entrata
       reply_link: Responder a iste entrata
       comment_count:


@@ -316,11 +411,13 @@ ia:
         other: '%{count} commentos'
       edit_link: Modificar iste entrata
       hide_link: Celar iste entrata
         other: '%{count} commentos'
       edit_link: Modificar iste entrata
       hide_link: Celar iste entrata

+      unhide_link: Non plus celar iste entrata

       confirm: Confirmar
       report: Signalar iste entrata
     diary_comment:
       confirm: Confirmar
       report: Signalar iste entrata
     diary_comment:

-      comment_from: Commento de %{link_user} a %{comment_created_at}
+      comment_from_html: Commento de %{link_user} a %{comment_created_at}

       hide_link: Celar iste commento
       hide_link: Celar iste commento

+      unhide_link: Non plus celar iste commento

       confirm: Confirmar
       report: Signalar iste commento
     location:
       confirm: Confirmar
       report: Signalar iste commento
     location:


@@ -336,26 +433,37 @@ ia:
         description: Entratas de diario recente de usatores de OpenStreetMap in %{language_name}
       all:
         title: Entratas de diario de OpenStreetMap
         description: Entratas de diario recente de usatores de OpenStreetMap in %{language_name}
       all:
         title: Entratas de diario de OpenStreetMap

-        description: Entratas recente de diario de ustores de OpenStreetMap
+        description: Entratas recente de diario de usatores de OpenStreetMap

     comments:
       has_commented_on: '%{display_name} ha commentate le sequente entratas de diario'
     comments:
       has_commented_on: '%{display_name} ha commentate le sequente entratas de diario'

-      post: Publicar
+      post: Articulo

       when: Quando
       comment: Commento
       when: Quando
       comment: Commento

-      ago: '%{ago} retro'

       newer_comments: Commentos plus recente
       older_comments: Commentos plus ancian
       newer_comments: Commentos plus recente
       older_comments: Commentos plus ancian

+  friendships:
+    make_friend:
+      heading: Adder %{user} como amico?
+      button: Adder como amico
+      success: '%{name} es ora tu amico!'
+      failed: Pardono, non poteva adder %{name} como amico.
+      already_a_friend: Tu es ja amico de %{name}.
+    remove_friend:
+      heading: Remover %{user} como amico?
+      button: Remover amico
+      success: '%{name} ha essite removite de tu amicos.'
+      not_a_friend: '%{name} non es un de tu amicos.'

   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Resultatos <a href="https://openstreetmap.org/">interne</a>
-        ca_postcode: Resultatos de <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon_html: Resultatos <a href="https://openstreetmap.org/">interne</a>
+        ca_postcode_html: Resultatos de <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim_html: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
           Nominatim</a>

-        geonames: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        geonames_html: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim_reverse_html: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
           Nominatim</a>

-        geonames_reverse: Resultatos ab <a href="http://www.geonames.org/">GeoNames</a>
+        geonames_reverse_html: Resultatos ab <a href="http://www.geonames.org/">GeoNames</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -374,6 +482,8 @@ ia:
           gate: Porta
           hangar: Hangar
           helipad: Heliporto
           gate: Porta
           hangar: Hangar
           helipad: Heliporto

+          holding_position: Puncto de attender
+          parking_position: Puncto de parcamento

           runway: Pista
           taxiway: Via de circulation pro aviones
           terminal: Terminal
           runway: Pista
           taxiway: Via de circulation pro aviones
           terminal: Terminal


@@ -419,6 +529,7 @@ ia:
           fuel: Carburante
           gambling: Joco de hasardo
           grave_yard: Cemeterio
           fuel: Carburante
           gambling: Joco de hasardo
           grave_yard: Cemeterio

+          grit_bin: Cassa de sal

           hospital: Hospital
           hunting_stand: Posto de chassa
           ice_cream: Gelato
           hospital: Hospital
           hunting_stand: Posto de chassa
           ice_cream: Gelato


@@ -432,6 +543,7 @@ ia:
           office: Officio
           parking: Parking
           parking_entrance: Entrata de autoparco
           office: Officio
           parking: Parking
           parking_entrance: Entrata de autoparco

+          parking_space: Spatio de parcamento

           pharmacy: Pharmacia
           place_of_worship: Loco de adoration
           police: Policia
           pharmacy: Pharmacia
           place_of_worship: Loco de adoration
           police: Policia


@@ -465,6 +577,7 @@ ia:
           village_hall: Casa communal
           waste_basket: Corbe a papiro
           waste_disposal: Tractamento de immunditias
           village_hall: Casa communal
           waste_basket: Corbe a papiro
           waste_disposal: Tractamento de immunditias

+          water_point: Puncto de aqua

           youth_centre: Centro pro le juventute
         boundary:
           administrative: Limite administrative
           youth_centre: Centro pro le juventute
         boundary:
           administrative: Limite administrative


@@ -473,6 +586,7 @@ ia:
           protected_area: Area protegite
         bridge:
           aqueduct: Aqueducto
           protected_area: Area protegite
         bridge:
           aqueduct: Aqueducto

+          boardwalk: Passarella

           suspension: Ponte suspendite
           swing: Ponte giratori
           viaduct: Viaducto
           suspension: Ponte suspendite
           swing: Ponte giratori
           viaduct: Viaducto


@@ -492,25 +606,31 @@ ia:
           "yes": Boteca de artisanato
         emergency:
           ambulance_station: Station de ambulantias
           "yes": Boteca de artisanato
         emergency:
           ambulance_station: Station de ambulantias

+          assembly_point: Puncto de incontro

           defibrillator: Defibrillator
           landing_site: Loco de atterrage de emergentia
           phone: Telephono de emergentia
           defibrillator: Defibrillator
           landing_site: Loco de atterrage de emergentia
           phone: Telephono de emergentia

+          water_tank: Cisterna de aqua de emergentia
+          "yes": Emergentia

         highway:
           abandoned: Via abandonate
           bridleway: Sentiero pro cavallos
           bus_guideway: Via guidate de autobus
           bus_stop: Halto de autobus
           construction: Strata in construction
         highway:
           abandoned: Via abandonate
           bridleway: Sentiero pro cavallos
           bus_guideway: Via guidate de autobus
           bus_stop: Halto de autobus
           construction: Strata in construction

+          corridor: Corridor

           cycleway: Pista cyclabile
           elevator: Ascensor
           emergency_access_point: Puncto de accesso de emergentia
           footway: Sentiero pro pedones
           ford: Vado
           cycleway: Pista cyclabile
           elevator: Ascensor
           emergency_access_point: Puncto de accesso de emergentia
           footway: Sentiero pro pedones
           ford: Vado

+          give_way: Signal de ceder le passage

           living_street: Strata residential
           milestone: Petra milliari
           motorway: Autostrata
           motorway_junction: Junction de autostrata
           motorway_link: Via de communication a autostrata
           living_street: Strata residential
           milestone: Petra milliari
           motorway: Autostrata
           motorway_junction: Junction de autostrata
           motorway_link: Via de communication a autostrata

+          passing_place: Loco de passage

           path: Sentiero
           pedestrian: Via pro pedones
           platform: Platteforma
           path: Sentiero
           pedestrian: Via pro pedones
           platform: Platteforma


@@ -527,6 +647,7 @@ ia:
           services: Servicios de autostrata
           speed_camera: Detector de velocitate
           steps: Scalones
           services: Servicios de autostrata
           speed_camera: Detector de velocitate
           steps: Scalones

+          stop: Signal de stop

           street_lamp: Lanterna de strata
           tertiary: Via tertiari
           tertiary_link: Via tertiari
           street_lamp: Lanterna de strata
           tertiary: Via tertiari
           tertiary_link: Via tertiari


@@ -535,6 +656,7 @@ ia:
           trail: Pista
           trunk: Via national
           trunk_link: Via national
           trail: Pista
           trunk: Via national
           trunk_link: Via national

+          turning_loop: Bucla de giro

           unclassified: Via non classificate
           "yes": Cammino
         historic:
           unclassified: Via non classificate
           "yes": Cammino
         historic:


@@ -554,6 +676,7 @@ ia:
           manor: Casa seniorial
           memorial: Memorial
           mine: Mina
           manor: Casa seniorial
           memorial: Memorial
           mine: Mina

+          mine_shaft: Puteo de mina

           monument: Monumento
           roman_road: Via roman
           ruins: Ruinas
           monument: Monumento
           roman_road: Via roman
           ruins: Ruinas


@@ -563,6 +686,7 @@ ia:
           wayside_cross: Cruce juxta le via
           wayside_shrine: Reliquario juxta le via
           wreck: Naufragio
           wayside_cross: Cruce juxta le via
           wayside_shrine: Reliquario juxta le via
           wreck: Naufragio

+          "yes": Sito historic

         junction:
           "yes": Intersection
         landuse:
         junction:
           "yes": Intersection
         landuse:


@@ -602,6 +726,7 @@ ia:
           bird_hide: Observatorio de aves
           common: Terreno commun
           dog_park: Parco pro canes
           bird_hide: Observatorio de aves
           common: Terreno commun
           dog_park: Parco pro canes

+          firepit: Focar

           fishing: Area de pisca
           fitness_centre: Centro de fitness
           fitness_station: Gymnasio
           fishing: Area de pisca
           fitness_centre: Centro de fitness
           fitness_station: Gymnasio


@@ -626,10 +751,39 @@ ia:
           water_park: Parco aquatic
           "yes": Tempore libere
         man_made:
           water_park: Parco aquatic
           "yes": Tempore libere
         man_made:

+          adit: Galeria de mina
+          beacon: Fanal
+          beehive: Apiculario
+          breakwater: Rumpe-undas
+          bridge: Ponte
+          bunker_silo: Bunker
+          chimney: Camino
+          crane: Grue
+          dolphin: Poste de ammarrage
+          dyke: Dica
+          embankment: Terrapleno
+          flagpole: Palo de baniera
+          gasometer: Gasometro
+          groyne: Rumpeundas
+          kiln: Furno

           lighthouse: Pharo
           lighthouse: Pharo

+          mast: Mast

           mine: Mina
           mine: Mina

+          mineshaft: Puteo de mina
+          monitoring_station: Station de surveliantia
+          petroleum_well: Puteo petrolifere
+          pier: Jectata

           pipeline: Tubulatura
           pipeline: Tubulatura

+          silo: Silo
+          storage_tank: Cisterna de immagazinage
+          surveillance: Surveliantia

           tower: Turre
           tower: Turre

+          wastewater_plant: Station de depuration de aquas usate
+          watermill: Molino de aqua
+          water_tower: Turre de aqua
+          water_well: Puteo
+          water_works: Tractamento de aqua
+          windmill: Molino de vento

           works: Fabrica
           "yes": Artificial
         military:
           works: Fabrica
           "yes": Artificial
         military:


@@ -682,12 +836,14 @@ ia:
           accountant: Contabile
           administrative: Administration
           architect: Architecto
           accountant: Contabile
           administrative: Administration
           architect: Architecto

-          association: Associatione
+          association: Association

           company: Compania
           company: Compania

+          educational_institution: Institution educative

           employment_agency: Agentia de empleo
           estate_agent: Agentia immobiliari
           government: Officio governamental
           insurance: Officio de assecurantia
           employment_agency: Agentia de empleo
           estate_agent: Agentia immobiliari
           government: Officio governamental
           insurance: Officio de assecurantia

+          it: Officio informatic

           lawyer: Advocato
           ngo: Officio de un ONG
           telecommunication: Officio de telecommunication
           lawyer: Advocato
           ngo: Officio de un ONG
           telecommunication: Officio de telecommunication


@@ -696,6 +852,7 @@ ia:
         place:
           allotments: Jardines familial
           city: Citate
         place:
           allotments: Jardines familial
           city: Citate

+          city_block: Bloco urban

           country: Pais
           county: Contato
           farm: Ferma
           country: Pais
           county: Contato
           farm: Ferma


@@ -709,9 +866,10 @@ ia:
           municipality: Municipalitate
           neighbourhood: Quartiero
           postcode: Codice postal
           municipality: Municipalitate
           neighbourhood: Quartiero
           postcode: Codice postal

+          quarter: Quartiero

           region: Region
           sea: Mar
           region: Region
           sea: Mar

-          square: Quadrate
+          square: Placia

           state: Stato
           subdivision: Subdivision
           suburb: Suburbio
           state: Stato
           subdivision: Subdivision
           suburb: Suburbio


@@ -750,6 +908,7 @@ ia:
           beauty: Salon de beltate
           beverages: Boteca de bibitas
           bicycle: Magazin de bicyclettas
           beauty: Salon de beltate
           beverages: Boteca de bibitas
           bicycle: Magazin de bicyclettas

+          bookmaker: Agente de sponsiones

           books: Libreria
           boutique: Boutique
           butcher: Macelleria
           books: Libreria
           boutique: Boutique
           butcher: Macelleria


@@ -788,11 +947,16 @@ ia:
           hairdresser: Perruccheria
           hardware: Quincalieria
           hifi: Hi-fi
           hairdresser: Perruccheria
           hardware: Quincalieria
           hifi: Hi-fi

+          houseware: Magazin de articulos domestic
+          interior_decoration: Decoration interior

           jewelry: Joieleria
           kiosk: Kiosque
           jewelry: Joieleria
           kiosk: Kiosque

+          kitchen: Magazin de cocina

           laundry: Lavanderia
           laundry: Lavanderia

+          lottery: Lotteria

           mall: Galeria mercante
           market: Mercato
           mall: Galeria mercante
           market: Mercato

+          massage: Massage

           mobile_phone: Boteca de telephonos mobile
           motorcycle: Magazin de motocyclos
           music: Magazin de musica
           mobile_phone: Boteca de telephonos mobile
           motorcycle: Magazin de motocyclos
           music: Magazin de musica


@@ -800,23 +964,31 @@ ia:
           optician: Optico
           organic: Boteca de alimentos organic
           outdoor: Magazin de sport al aere libere
           optician: Optico
           organic: Boteca de alimentos organic
           outdoor: Magazin de sport al aere libere

+          paint: Magazin de colores
+          pawnbroker: Prestator sur pignore

           pet: Boteca de animales
           pharmacy: Pharmacia
           photo: Magazin de photographia
           pet: Boteca de animales
           pharmacy: Pharmacia
           photo: Magazin de photographia

+          seafood: Fructos de mar

           second_hand: Magazin de secunde mano
           shoes: Scarperia
           sports: Magazin de sport
           stationery: Papireria
           supermarket: Supermercato
           tailor: Sartor
           second_hand: Magazin de secunde mano
           shoes: Scarperia
           sports: Magazin de sport
           stationery: Papireria
           supermarket: Supermercato
           tailor: Sartor

+          ticket: Billeteria
+          tobacco: Tabacheria

           toys: Magazin de joculos
           travel_agency: Agentia de viages
           toys: Magazin de joculos
           travel_agency: Agentia de viages

+          tyres: Magazin de pneus
+          vacant: Magazin vacante
+          variety_store: Magazin a precio unic

           video: Magazin de video
           wine: Magazin de vinos
           "yes": Boteca
         tourism:
           alpine_hut: Cabana alpin
           video: Magazin de video
           wine: Magazin de vinos
           "yes": Boteca
         tourism:
           alpine_hut: Cabana alpin

-          apartment: Appartamento
+          apartment: Appartamento de vacantias

           artwork: Obra de arte
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
           artwork: Obra de arte
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast


@@ -836,6 +1008,7 @@ ia:
           viewpoint: Puncto de vista
           zoo: Jardin zoologic
         tunnel:
           viewpoint: Puncto de vista
           zoo: Jardin zoologic
         tunnel:

+          building_passage: Passage sub edificio

           culvert: Tubo de aqua subterranee
           "yes": Tunnel
         waterway:
           culvert: Tubo de aqua subterranee
           "yes": Tunnel
         waterway:


@@ -877,6 +1050,111 @@ ia:
     results:
       no_results: Nulle resultato trovate
       more_results: Plus resultatos
     results:
       no_results: Nulle resultato trovate
       more_results: Plus resultatos

+  issues:
+    index:
+      title: Problemas
+      select_status: Selige stato
+      select_type: Selige typo
+      select_last_updated_by: Selige ultime actualisation per
+      reported_user: Usator reportate
+      not_updated: Non actualisate
+      search: Recerca
+      search_guidance: 'Cercar problemas:'
+      user_not_found: Usator non existe
+      issues_not_found: Nulle tal problema trovate
+      status: Stato
+      reports: Reportos
+      last_updated: Ultime actualisation
+      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
+      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> per %{user}
+      link_to_reports: Vider reportos
+      reports_count:
+        one: 1 reporto
+        other: '%{count} reportos'
+      reported_item: Objecto reportate
+      states:
+        ignored: Ignorate
+        open: Aperte
+        resolved: Resolvite
+    update:
+      new_report: Tu reporto ha essite registrate
+      successful_update: Tu reporto ha essite actualisate
+      provide_details: Per favor, forni le detalios necessari
+    show:
+      title: '%{status} Problema №%{issue_id}'
+      reports:
+        zero: Nulle reporto
+        one: 1 reporto
+        other: '%{count} reportos'
+      report_created_at: 'Prime reporto: %{datetime}'
+      last_resolved_at: 'Ultime resolution: %{datetime}'
+      last_updated_at: 'Ultime actualisation: %{datetime} per %{displayname}'
+      resolve: Resolver
+      ignore: Ignorar
+      reopen: Reaperir
+      reports_of_this_issue: Reportos de iste problema
+      read_reports: Leger reportos
+      new_reports: Nove reportos
+      other_issues_against_this_user: Altere problemas concernente iste usator
+      no_other_issues: Il non ha altere problemas concernente iste usator.
+      comments_on_this_issue: Commentos sur iste problema
+    resolve:
+      resolved: Le stato del problema ha essite cambiate a 'Resolvite'
+    ignore:
+      ignored: Le stato del problema ha essite cambiate a 'Ignorate'
+    reopen:
+      reopened: Le stato del problema ha essite cambiate a 'Aperte'
+    comments:
+      comment_from_html: Commento de %{user_link} del %{comment_created_at}
+      reassign_param: Reassignar problema?
+    reports:
+      reported_by_html: Reportate como %{category} per %{user} le %{updated_at}
+    helper:
+      reportable_title:
+        diary_comment: '%{entry_title}, commento #%{comment_id}'
+        note: 'Nota #%{note_id}'
+  issue_comments:
+    create:
+      comment_created: Tu commento ha essite create
+  reports:
+    new:
+      title_html: Reportar %{link}
+      missing_params: Impossibile crear un nove reporto
+      details: Per favor, forni plus detalios sur le problema (obligatori).
+      select: 'Selige un motivo pro tu reporto:'
+      disclaimer:
+        intro: 'Ante de inviar tu reporto al moderatores del sito, per favor assecura
+          te que:'
+        not_just_mistake: Tu es secur que le problema non es solmente un error
+        unable_to_fix: Tu non es capace de solver le problema tu mesme o con le adjuta
+          de altere membros del communitate
+        resolve_with_user: Tu ha jam essayate de resolver le problema con le usator
+          in question
+      categories:
+        diary_entry:
+          spam_label: Iste entrata de diario es/contine spam
+          offensive_label: Iste entrata de diario es obscen/offensive
+          threat_label: Iste entrata de diario contine un menacia
+          other_label: Altere
+        diary_comment:
+          spam_label: Iste commento de diario es/contine spam
+          offensive_label: Iste commento de diario es obscen/offensive
+          threat_label: Iste commento de diario contine un menacia
+          other_label: Altere
+        user:
+          spam_label: Iste profilo de usator es/contine spam
+          offensive_label: Iste profilo de usator es obscen/offensive
+          threat_label: Iste profilo de usator contine un menacia
+          vandal_label: Iste usator es un vandalo
+          other_label: Altere
+        note:
+          spam_label: Iste nota es spam
+          personal_label: Iste nota contine datos personal
+          abusive_label: Iste nota es injuriose
+          other_label: Altere
+    create:
+      successful_report: Tu reporto ha essite registrate
+      provide_details: Per favor, forni le detalios necessari

   layouts:
     logo:
       alt_text: Logo de OpenStreetMap
   layouts:
     logo:
       alt_text: Logo de OpenStreetMap


@@ -890,6 +1168,7 @@ ia:
     edit: Modificar
     history: Historia
     export: Exportar
     edit: Modificar
     history: Historia
     export: Exportar

+    issues: Problemas

     data: Datos
     export_data: Exportar datos
     gps_traces: Tracias GPS
     data: Datos
     export_data: Exportar datos
     gps_traces: Tracias GPS


@@ -902,9 +1181,12 @@ ia:
     intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere
       de usar sub un licentia aperte.
     intro_2_create_account: Crea un conto de usator
     intro_text: OpenStreetMap es un carta del mundo, create per gente como tu e libere
       de usar sub un licentia aperte.
     intro_2_create_account: Crea un conto de usator

+    hosting_partners_html: Le allogiamento web es supportate per %{ucl}, %{bytemark}
+      e altere %{partners}.

     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     partners_ucl: UCL
     partners_bytemark: Bytemark Hosting
     partners_partners: partners

+    tou: Conditiones de uso

     osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite
       a operationes de mantenentia essential.
     osm_read_only: Le base de datos de OpenStreetMap es al momento in modo de solmente
     osm_offline: Le base de datos de OpenStreetMap non es disponibile al momento debite
       a operationes de mantenentia essential.
     osm_read_only: Le base de datos de OpenStreetMap es al momento in modo de solmente


@@ -937,7 +1219,7 @@ ia:
         %{subject}:'
       footer_html: Tu pote anque leger le message a %{readurl} e tu pote responder
         a %{replyurl}
         %{subject}:'
       footer_html: Tu pote anque leger le message a %{readurl} e tu pote responder
         a %{replyurl}

-    friend_notification:
+    friendship_notification:

       hi: Salute %{to_user},
       subject: '[OpenStreetMap] %{user} te ha addite como amico'
       had_added_you: '%{user} te ha addite como amico in OpenStreetMap.'
       hi: Salute %{to_user},
       subject: '[OpenStreetMap] %{user} te ha addite como amico'
       had_added_you: '%{user} te ha addite como amico in OpenStreetMap.'


@@ -957,8 +1239,11 @@ ia:
         more_info_2: 'los se trova a:'
       success:
         subject: '[OpenStreetMap] Importation GPX succedite'
         more_info_2: 'los se trova a:'
       success:
         subject: '[OpenStreetMap] Importation GPX succedite'

-        loaded_successfully: ha essite cargate con successo con %{trace_points} ex
-          un maximo de %{possible_points} punctos.
+        loaded_successfully:
+          one: ha essite cargate con successo con %{trace_points} ex un maximo de
+            1 puncto.
+          other: ha essite cargate con successo con %{trace_points} ex un maximo de
+            %{possible_points} punctos.

     signup_confirm:
       subject: '[OpenStreetMap] Benvenite a OpenStreetMap'
       greeting: Bon die!
     signup_confirm:
       subject: '[OpenStreetMap] Benvenite a OpenStreetMap'
       greeting: Bon die!


@@ -1030,10 +1315,10 @@ ia:
           de modificationes'
         subject_other: '[OpenStreetMap] %{commenter} ha commentate un gruppo de modificationes
           que te interessa'
           de modificationes'
         subject_other: '[OpenStreetMap] %{commenter} ha commentate un gruppo de modificationes
           que te interessa'

-        your_changeset: '%{commenter} ha commentate un de tu gruppos de modificationes
-          create le %{time}'
-        commented_changeset: '%{commenter} ha commentate un gruppo de modificationes
-          que tu observa, create per %{changeset_author} le %{time}'
+        your_changeset: '%{commenter} ha commentate a %{time} un de tu gruppos de
+          modificationes'
+        commented_changeset: '%{commenter} ha commentate a %{time} un gruppo de modificationes
+          que tu observa, create per %{changeset_author}'

         partial_changeset_with_comment: con commento '%{changeset_comment}'
         partial_changeset_without_comment: sin commento
       details: Plus detalios sur le gruppo de modificationes pote esser trovate a
         partial_changeset_with_comment: con commento '%{changeset_comment}'
         partial_changeset_without_comment: sin commento
       details: Plus detalios sur le gruppo de modificationes pote esser trovate a


@@ -1055,7 +1340,8 @@ ia:
       from: De
       subject: Subjecto
       date: Data
       from: De
       subject: Subjecto
       date: Data

-      no_messages_yet: Tu non ha ancora messages. Proque non contactar alcun %{people_mapping_nearby_link}?
+      no_messages_yet_html: Tu non ha ancora messages. Proque non contactar alcun
+        %{people_mapping_nearby_link}?

       people_mapping_nearby: cartographos vicin
     message_summary:
       unread_button: Marcar como non legite
       people_mapping_nearby: cartographos vicin
     message_summary:
       unread_button: Marcar como non legite


@@ -1064,10 +1350,9 @@ ia:
       destroy_button: Deler
     new:
       title: Inviar message
       destroy_button: Deler
     new:
       title: Inviar message

-      send_message_to: Inviar un nove message a %{name}
+      send_message_to_html: Inviar un nove message a %{name}

       subject: Subjecto
       body: Texto
       subject: Subjecto
       body: Texto

-      send_button: Inviar

       back_to_inbox: Retornar al cassa de entrata
     create:
       message_sent: Message inviate
       back_to_inbox: Retornar al cassa de entrata
     create:
       message_sent: Message inviate


@@ -1079,7 +1364,7 @@ ia:
       body: Non existe un message con iste ID.
     outbox:
       title: Cassa de exito
       body: Non existe un message con iste ID.
     outbox:
       title: Cassa de exito

-      my_inbox: Mi %{inbox_link}
+      my_inbox_html: Mi %{inbox_link}

       inbox: cassa de entrata
       outbox: cassa de exito
       messages:
       inbox: cassa de entrata
       outbox: cassa de exito
       messages:


@@ -1088,7 +1373,7 @@ ia:
       to: A
       subject: Subjecto
       date: Data
       to: A
       subject: Subjecto
       date: Data

-      no_sent_messages: Tu non ha ancora inviate alcun message. Proque non contactar
+      no_sent_messages_html: Tu non ha ancora inviate alcun message. Proque non contactar

         alcun %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin
     reply:
         alcun %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin
     reply:


@@ -1119,7 +1404,7 @@ ia:
     about:
       next: Sequente
       copyright_html: <span>&copy;</span>Contributores de<br>OpenStreetMap
     about:
       next: Sequente
       copyright_html: <span>&copy;</span>Contributores de<br>OpenStreetMap

-      used_by: '%{name} forni datos cartographic a milles de sitos web, applicationes
+      used_by_html: '%{name} forni datos cartographic a milles de sitos web, applicationes

         mobile e dispositivos physic'
       lede_text: OpenStreetMap es construite per un communitate de cartographos que
         contribue e mantene datos sur stratas, sentieros, cafés, stationes ferroviari
         mobile e dispositivos physic'
       lede_text: OpenStreetMap es construite per un communitate de cartographos que
         contribue e mantene datos sur stratas, sentieros, cafés, stationes ferroviari


@@ -1142,24 +1427,27 @@ ia:
         OpenStreetMap es constituite per <i>datos aperte</i>: tu es libere de usar lo pro qualcunque scopo a condition que tu da credito a OpenStreetMap e su contributores. Si tu altera o extende le datos in certe manieras, tu pote distribuer le resultato solmente sub le mesme licentia. Vide le pagina <a href='%{copyright_path}'>Copyright e
         Licentia</a> pro detalios.
       legal_title: Juridic
         OpenStreetMap es constituite per <i>datos aperte</i>: tu es libere de usar lo pro qualcunque scopo a condition que tu da credito a OpenStreetMap e su contributores. Si tu altera o extende le datos in certe manieras, tu pote distribuer le resultato solmente sub le mesme licentia. Vide le pagina <a href='%{copyright_path}'>Copyright e
         Licentia</a> pro detalios.
       legal_title: Juridic

-      legal_html: "Iste sito e multe altere servicios associate es formalmente gerite
-        per le  \n<a href=\"http://osmfoundation.org/\">Fundation OpenStreetMap</a>
+      legal_1_html: "Iste sito e multe altere servicios associate es formalmente gerite
+        per le  \n<a href=\"https://osmfoundation.org/\">Fundation OpenStreetMap</a>

         (OSMF) \nin nomine del communitate. Le uso de tote le servicios gerite per
         (OSMF) \nin nomine del communitate. Le uso de tote le servicios gerite per

-        OSMF es subjecte a nostre <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\npoliticas
+        OSMF es subjecte a nostre <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">conditiones
+        de uso</a>, a nostre <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\npoliticas

         de uso acceptabile</a> e a nostre <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">politica
         de uso acceptabile</a> e a nostre <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">politica

-        de confidentialitate</a>\n<br> \n<a href=\"http://osmfoundation.org/Contact\">Contacta
-        OSMF</a> \nsi vos ha questiones sur licentias, derectos de autor o altere
-        themas juridic."
+        de confidentialitate</a>."
+      legal_2_html: "<a href=\"https://osmfoundation.org/Contact\">Contacta OSMF</a>
+        \nsi vos ha questiones sur licentias, derectos de autor o altere themas juridic.\n<br>\nOpenStreetMap,
+        le logotypo de lupa e \"State of the Map\" es <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">marcas
+        commercial registrate del OSMF</a>."

       partners_title: Partners
     copyright:
       foreign:
         title: A proposito de iste traduction
       partners_title: Partners
     copyright:
       foreign:
         title: A proposito de iste traduction

-        text: In caso de un conflicto inter iste pagina traducite e %{english_original_link},
+        html: In caso de un conflicto inter iste pagina traducite e %{english_original_link},

           le pagina in anglese prevalera.
         english_link: le original in anglese
       native:
         title: A proposito de iste pagina
           le pagina in anglese prevalera.
         english_link: le original in anglese
       native:
         title: A proposito de iste pagina

-        text: Tu vide nunc le version in anglese del pagina de copyright. Tu pote
+        html: Tu vide nunc le version in anglese del pagina de copyright. Tu pote

           retornar al %{native_link} de iste pagina o tu pote cessar de leger super
           copyright e %{mapping_link}.
         native_link: version in interlingua
           retornar al %{native_link} de iste pagina o tu pote cessar de leger super
           copyright e %{mapping_link}.
         native_link: version in interlingua


@@ -1171,33 +1459,30 @@ ia:
           href="https://opendatacommons.org/licenses/odbl/">Open Data
           Commons Open Database License</a> (ODbL) per le <a
           href="https://osmfoundation.org/">Fundation OpenStreetMap</a> (OSMF).
           href="https://opendatacommons.org/licenses/odbl/">Open Data
           Commons Open Database License</a> (ODbL) per le <a
           href="https://osmfoundation.org/">Fundation OpenStreetMap</a> (OSMF).

-        intro_2_html: |2-
-            Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas
-            e datos, a condition que vos da recognoscentia a OpenStreetMap e su
-            contributores. Si vos altera o extende nostre cartas e datos, vos
-            pote distribuer le resultato solmente sub le mesme licentia. Le
-            complete <a href="https://opendatacommons.org/licenses/odbl/1.0/">codice
-            legal</a> explica vostre derectos e responsabilitates.
-        intro_3_html: |-
-          Le cartographia in nostre tegulas de carta, e nostre documentation, son
-          publicate sub licentia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+        intro_2_html: Vos es libere de copiar, distribuer, transmitter e adaptar nostre
+          datos, a condition que vos da recognoscentia a OpenStreetMap e su contributores.
+          Si vos altera o extende nostre datos, vos pote distribuer le resultato solmente
+          sub le mesme licentia. Le <a href="https://opendatacommons.org/licenses/odbl/1.0/">codice
+          juridic</a> complete explica vostre derectos e responsabilitates.
+        intro_3_1_html: Le cartographia in nostre tegulas cartographic, e nostre documentation,
+          es publicate sub licentia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative

           Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
         credit_title_html: Como dar recognoscentia a OpenStreetMap
         credit_1_html: |-
           Nos require que vos usa le recognoscentia &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
           Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
         credit_title_html: Como dar recognoscentia a OpenStreetMap
         credit_1_html: |-
           Nos require que vos usa le recognoscentia &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.

-        credit_2_html: |-
-          Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="https://www.openstreetmap.org/copyright">iste pagina de copyright</a>.
+        credit_2_1_html: |-
+          Vos debe etiam indicar clarmente que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="https://www.openstreetmap.org/copyright">iste pagina de copyright</a>.

           Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a opendatacommons.org, e (si relevante) a creativecommons.org.
           Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a opendatacommons.org, e (si relevante) a creativecommons.org.

-        credit_3_html: 'Pro un carta electronic navigabile, le recognoscentia debe
+        credit_4_html: 'Pro un carta electronic navigabile, le recognoscentia debe

           apparer in le angulo del carta. Per exemplo:'
         attribution_example:
           alt: Exemplo de como recognoscer OpenStreetMap in un pagina web
           title: Exemplo de recognoscentia
         more_title_html: Pro saper plus
           apparer in le angulo del carta. Per exemplo:'
         attribution_example:
           alt: Exemplo de como recognoscer OpenStreetMap in un pagina web
           title: Exemplo de recognoscentia
         more_title_html: Pro saper plus

-        more_1_html: |-
-          Lege plus sur le uso de nostre datos, e como recognoscer nos, in le <a
-          href="https://osmfoundation.org/Licence">pagina de licentia OSMF</a>.
+        more_1_html: Lege plus sur le uso de nostre datos, e sur como citar correctemente
+          lor fonte, in le <a href="https://osmfoundation.org/Licence">pagina de licentia
+          OSMF</a>.

         more_2_html: |-
           Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro tertios. Vide nostre <a href="https://operations.osmfoundation.org/policies/api/">politica pro le uso del API</a>,
           <a href="https://operations.osmfoundation.org/policies/tiles">politica pro le uso de tegulas</a>
         more_2_html: |-
           Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro tertios. Vide nostre <a href="https://operations.osmfoundation.org/policies/api/">politica pro le uso del API</a>,
           <a href="https://operations.osmfoundation.org/policies/tiles">politica pro le uso de tegulas</a>


@@ -1206,37 +1491,44 @@ ia:
         contributors_intro_html: 'Nostre contributores es milles de personas. Nos
           include anque le datos sub licentia aperte de agentias cartographic national
           e de altere fontes, inter le quales:'
         contributors_intro_html: 'Nostre contributores es milles de personas. Nos
           include anque le datos sub licentia aperte de agentias cartographic national
           e de altere fontes, inter le quales:'

-        contributors_at_html: |-
-          <strong>Austria</strong>: Contine datos ab le
-             <a href="https://data.wien.gv.at/">Citate de Vienna</a> licentiate sub
-             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.
-        contributors_au_html: |-
-          <strong>Australia</strong>: Contine datos de suburbios a base
-             de datos del Australian Bureau of Statistics.
+        contributors_at_html: '<strong>Austria</strong>: Contine datos ab le <a href="https://data.wien.gv.at/">Citate
+          de Vienna</a> licentiate sub <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
+          BY</a>, <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
+          Vorarlberg</a> e Land Tirol (sub <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
+          BY AT con emendamentos</a>).'
+        contributors_au_html: '<strong>Australia</strong>: Contine datos obtenite
+          ab <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
+          Australia Limited</a> licentiate per le Commonwealth de Australia sub <a
+          href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.'

         contributors_ca_html: |-
           <strong>Canada</strong>: Contine datos ab
              GeoBase&reg;, GeoGratis (&copy; Department of Natural
              Resources Canada), CanVec (&copy; Department of Natural
              Resources Canada), e StatCan (Geography Division,
              Statistics Canada).
         contributors_ca_html: |-
           <strong>Canada</strong>: Contine datos ab
              GeoBase&reg;, GeoGratis (&copy; Department of Natural
              Resources Canada), CanVec (&copy; Department of Natural
              Resources Canada), e StatCan (Geography Division,
              Statistics Canada).

-        contributors_fi_html: "<strong>Finlandia</strong>: Contine datos ab le base
-          de datos topographic del Inspection \nNational del Territorio de Finlandia
-          e de altere insimules de datos, sub le\n<a href=\"https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">licentia
-          NLSFI</a>."
+        contributors_fi_html: '<strong>Finlandia</strong>: Contine datos ab le base
+          de datos topographic del Inspection National del Territorio de Finlandia
+          e de altere insimules de datos, sub le <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">licentia
+          NLSFI</a>.'

         contributors_fr_html: |-
           <strong>Francia</strong>: Contine datos fornite per le
              Direction Générale des Impôts.
         contributors_fr_html: |-
           <strong>Francia</strong>: Contine datos fornite per le
              Direction Générale des Impôts.

-        contributors_nl_html: |-
-          <strong>Nederlandia</strong>: Contine datos &copy; AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
-        contributors_nz_html: |-
-          <strong>Nove Zelandia</strong>: Contine datos proveniente de
-             Land Information New Zealand. Crown Copyright reservate.
+        contributors_nl_html: '<strong>Nederlandia</strong>: Contine datos &copy;
+          AND, 2007 (<a href="https://www.and.com">www.and.com</a>)'
+        contributors_nz_html: '<strong>Nove Zelandia</strong>: Contine datos proveniente
+          de <a href="https://data.linz.govt.nz/">LINZ Data Service</a> e licentiate
+          pro re-uso sub <a href="https://creativecommons.org/licenses/by/4.0/">CC
+          BY 4.0</a>.'

         contributors_si_html: |-
           <strong>Slovenia</strong>: Contine datos ab le
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> e del
           <a href="http://www.mkgp.gov.si/en/">Ministerio del Agricultura, Silvicultura e Alimento</a>
           (information public de Slovenia).
         contributors_si_html: |-
           <strong>Slovenia</strong>: Contine datos ab le
           <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> e del
           <a href="http://www.mkgp.gov.si/en/">Ministerio del Agricultura, Silvicultura e Alimento</a>
           (information public de Slovenia).

+        contributors_es_html: '<strong>Espania</strong>: Contine datos proveniente
+          del Instituto Geographic National (<a href="http://www.ign.es/">IGN</a>)
+          e del Systema Cartographic National (<a href="http://www.scne.es/">SCNE</a>),
+          licentiate pro su reutilisation sub <a href="https://creativecommons.org/licenses/by/4.0/">CC
+          BY 4.0</a>.'

         contributors_za_html: |-
           <strong>Africa del Sud</strong>: Contine datos proveniente del
              <a href="http://www.ngi.gov.za/">Chief Directorate:
         contributors_za_html: |-
           <strong>Africa del Sud</strong>: Contine datos proveniente del
              <a href="http://www.ngi.gov.za/">Chief Directorate:


@@ -1244,7 +1536,7 @@ ia:
         contributors_gb_html: |-
           <strong>Regno Unite</strong>: Contine datos de Ordnance
              Survey &copy; copyright del Corona e derecto de base de datos
         contributors_gb_html: |-
           <strong>Regno Unite</strong>: Contine datos de Ordnance
              Survey &copy; copyright del Corona e derecto de base de datos

-             2010-12.
+             2010-19.

         contributors_footer_1_html: |-
           Pro ulterior detalios de iste e altere fontes que ha essite usate
           pro adjutar a meliorar OpenStreetMap, vide le <a
         contributors_footer_1_html: |-
           Pro ulterior detalios de iste e altere fontes que ha essite usate
           pro adjutar a meliorar OpenStreetMap, vide le <a


@@ -1267,8 +1559,8 @@ ia:
         trademarks_title_html: <span id="trademarks"></span>Marcas commercial
         trademarks_1_html: OpenStreetMap, le logotypo con le lupa e "State of the
           Map" es marcas registrate del Fundation OpenStreetMap. Si vos ha questiones
         trademarks_title_html: <span id="trademarks"></span>Marcas commercial
         trademarks_1_html: OpenStreetMap, le logotypo con le lupa e "State of the
           Map" es marcas registrate del Fundation OpenStreetMap. Si vos ha questiones

-          sur le uso de iste marcas, invia los al <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
-          de labor sur licentias</a>.
+          sur le uso de iste marcas, vide nostre <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">politica
+          sur le marcas registrate</a>.

     index:
       js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate
         JavaScript.
     index:
       js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate
         JavaScript.


@@ -1282,19 +1574,19 @@ ia:
         e que le plug-in de controlo remote es activate
     edit:
       not_public: Tu non ha configurate tu modificationes pro esser public.
         e que le plug-in de controlo remote es activate
     edit:
       not_public: Tu non ha configurate tu modificationes pro esser public.

-      not_public_description: Tu non potera plus modificar le carta si tu non lo face.
-        Tu pote configurar tu modificationes como public a partir de tu %{user_page}.
+      not_public_description_html: Tu non potera plus modificar le carta si tu non
+        lo face. Tu pote configurar tu modificationes como public a partir de tu %{user_page}.

       user_page_link: pagina de usator
       anon_edits_link_text: Lege proque isto es le caso.
       user_page_link: pagina de usator
       anon_edits_link_text: Lege proque isto es le caso.

-      flash_player_required: Es necessari haber un reproductor Flash pro usar Potlatch,
-        le editor Flash de OpenStreetMap. Tu pote <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">discargar
-        Flash Player a Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Plure
+      flash_player_required_html: Es necessari haber un reproductor Flash pro usar
+        Potlatch, le editor Flash de OpenStreetMap. Tu pote <a href="https://get.adobe.com/flashplayer/">discargar
+        Flash Player a Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Plure

         altere optiones</a> es tamben disponibile pro modificar OpenStreetMap.
       potlatch_unsaved_changes: Tu ha modificationes non salveguardate. (Pro salveguardar
         in Potlatch, tu debe deseliger le via o puncto actual si tu modifica in modo
         directe, o cliccar super le button Salveguardar si presente.)
         altere optiones</a> es tamben disponibile pro modificar OpenStreetMap.
       potlatch_unsaved_changes: Tu ha modificationes non salveguardate. (Pro salveguardar
         in Potlatch, tu debe deseliger le via o puncto actual si tu modifica in modo
         directe, o cliccar super le button Salveguardar si presente.)

-      potlatch2_not_configured: Potlatch 2 non ha essite configurate. Per favor vide
-        http://wiki.openstreetmap.org/wiki/The_Rails_Port
+      potlatch2_not_configured: Potlatch 2 non ha essite configurate. Visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+        pro plus information

       potlatch2_unsaved_changes: Tu ha modificationes non salveguardate. (In Potlatch
         2, tu debe cliccar super Salveguardar.)
       id_not_configured: iD non ha essite configurate
       potlatch2_unsaved_changes: Tu ha modificationes non salveguardate. (In Potlatch
         2, tu debe cliccar super Salveguardar.)
       id_not_configured: iD non ha essite configurate


@@ -1309,7 +1601,7 @@ ia:
       map_image: Imagine de carta (monstra le strato standard)
       embeddable_html: HTML incorporabile
       licence: Licentia
       map_image: Imagine de carta (monstra le strato standard)
       embeddable_html: HTML incorporabile
       licence: Licentia

-      export_details: Le datos de OpenStreetMap es licentiate sub le <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details_html: Le datos de OpenStreetMap es licentiate sub le <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open

         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Si iste exportation falle, considera usar un del fontes listate hic
         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Si iste exportation falle, considera usar un del fontes listate hic


@@ -1374,16 +1666,17 @@ ia:
         subjectos de cartographia in collaboration con alteres.
       welcome:
         url: /welcome
         subjectos de cartographia in collaboration con alteres.
       welcome:
         url: /welcome

-        title: Benvenite a OSM
+        title: Benvenite a OpenStreetMap

         description: Comencia con iste guida rapide sur le fundamentos de OpenStreetMap.
       beginners_guide:
         description: Comencia con iste guida rapide sur le fundamentos de OpenStreetMap.
       beginners_guide:

+        url: https://wiki.openstreetmap.org/wiki/Ia:Beginners%27_guide

         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.
       help:
         url: https://help.openstreetmap.org/
         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.
       help:
         url: https://help.openstreetmap.org/

-        title: help.openstreetmap.org
+        title: Foro de adjuta

         description: Pone un question o cerca responsas sur le sito de questiones
         description: Pone un question o cerca responsas sur le sito de questiones

-          e responsas de OSM.
+          e responsas de OpenStreetMap.

       mailing_lists:
         title: Listas de diffusion
         description: Pone un question o discute cosas interessante sur un varietate
       mailing_lists:
         title: Listas de diffusion
         description: Pone un question o discute cosas interessante sur un varietate


@@ -1397,12 +1690,17 @@ ia:
         description: Conversation interactive in multe linguas differente e sur multe
           themas.
       switch2osm:
         description: Conversation interactive in multe linguas differente e sur multe
           themas.
       switch2osm:

+        title: switch2osm

         description: Adjuta pro companias e organisationes qui vole migrar a cartas
           e altere servicios a base de OpenStreetMap.
         description: Adjuta pro companias e organisationes qui vole migrar a cartas
           e altere servicios a base de OpenStreetMap.

+      welcomemat:
+        title: Pro organisationes
+        description: Es tu con un organisation que face planos pro OpenStreetMap?
+          Trova lo que tu debe saper sur le Matta de Benvenita.

       wiki:
         url: http://wiki.openstreetmap.org/
       wiki:
         url: http://wiki.openstreetmap.org/

-        title: wiki.openstreetmap.org
-        description: Percurre le wiki pro le documentation in detalio de OSM.
+        title: Wiki OpenStreetMap
+        description: Percurre le wiki pro le documentation in detalio de OpenStreetMap.

     sidebar:
       search_results: Resultatos del recerca
       close: Clauder
     sidebar:
       search_results: Resultatos del recerca
       close: Clauder


@@ -1415,6 +1713,7 @@ ia:
       where_am_i: Ubi es isto?
       where_am_i_title: Describer le position actual per medio del motor de recerca
       submit_text: Va
       where_am_i: Ubi es isto?
       where_am_i_title: Describer le position actual per medio del motor de recerca
       submit_text: Va

+      reverse_directions_text: Inverter le itinerario

     key:
       table:
         entry:
     key:
       table:
         entry:


@@ -1489,7 +1788,7 @@ ia:
       edit: Modificar
       preview: Previsualisation
     markdown_help:
       edit: Modificar
       preview: Previsualisation
     markdown_help:

-      title_html: Processate con <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Processate con <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>

       headings: Titulos
       heading: Titulo
       subheading: Subtitulo
       headings: Titulos
       heading: Titulo
       subheading: Subtitulo


@@ -1560,19 +1859,21 @@ ia:
       identifiable: Identificabile (monstrate in le lista de tracias e como identificabile,
         punctos ordinate con datas e horas)
     new:
       identifiable: Identificabile (monstrate in le lista de tracias e como identificabile,
         punctos ordinate con datas e horas)
     new:

+      upload_trace: Incargar tracia GPS

       upload_gpx: 'Incargar file GPX:'
       description: 'Description:'
       tags: 'Etiquettas:'
       tags_help: separate per commas
       visibility: 'Visibilitate:'
       visibility_help: que significa isto?
       upload_gpx: 'Incargar file GPX:'
       description: 'Description:'
       tags: 'Etiquettas:'
       tags_help: separate per commas
       visibility: 'Visibilitate:'
       visibility_help: que significa isto?

-      upload_button: Incargar

       help: Adjuta
     create:
       upload_trace: Incargar tracia GPS
       trace_uploaded: Tu file GPX ha essite incargate e attende insertion in le base
         de datos. Isto prende generalmente minus de un medie hora, e un e-mail te
         essera inviate al completion.
       help: Adjuta
     create:
       upload_trace: Incargar tracia GPS
       trace_uploaded: Tu file GPX ha essite incargate e attende insertion in le base
         de datos. Isto prende generalmente minus de un medie hora, e un e-mail te
         essera inviate al completion.

+      upload_failed: Le incargamento GPX ha fallite. Un administrator ha essite advertite
+        del error. Per favor, proba lo de novo.

       traces_waiting:
         one: Tu ha %{count} tracia attendente incargamento. Per favor considera attender
           le completion de iste ante de incargar alteres, pro non blocar le cauda
       traces_waiting:
         one: Tu ha %{count} tracia attendente incargamento. Per favor considera attender
           le completion de iste ante de incargar alteres, pro non blocar le cauda


@@ -1594,9 +1895,10 @@ ia:
       description: 'Description:'
       tags: 'Etiquettas:'
       tags_help: separate per commas
       description: 'Description:'
       tags: 'Etiquettas:'
       tags_help: separate per commas

-      save_button: Salveguardar modificationes

       visibility: 'Visibilitate:'
       visibility_help: que significa isto?
       visibility: 'Visibilitate:'
       visibility_help: que significa isto?

+    update:
+      updated: Tracia actualisate

     trace_optionals:
       tags: Etiquettas
     show:
     trace_optionals:
       tags: Etiquettas
     show:


@@ -1618,14 +1920,16 @@ ia:
       delete_trace: Deler iste tracia
       trace_not_found: Tracia non trovate!
       visibility: 'Visibilitate:'
       delete_trace: Deler iste tracia
       trace_not_found: Tracia non trovate!
       visibility: 'Visibilitate:'

+      confirm_delete: Deler iste tracia?

     trace_paging_nav:
       showing_page: Pagina %{page}
       older: Tracias plus ancian
       newer: Tracias plus nove
     trace:
       pending: PENDENTE
     trace_paging_nav:
       showing_page: Pagina %{page}
       older: Tracias plus ancian
       newer: Tracias plus nove
     trace:
       pending: PENDENTE

-      count_points: '%{count} punctos'
-      ago: '%{time_in_words_ago} retro'
+      count_points:
+        one: 1 puncto
+        other: '%{count} punctos'

       more: plus
       trace_details: Vider detalios del tracia
       view_map: Vider carta
       more: plus
       trace_details: Vider detalios del tracia
       view_map: Vider carta


@@ -1640,6 +1944,7 @@ ia:
       map: carta
     index:
       public_traces: Tracias GPS public
       map: carta
     index:
       public_traces: Tracias GPS public

+      my_traces: Mi tracias GPS

       public_traces_from: Tracias GPS public de %{user}
       description: Percurrer le tracias GPS incargate recentemente
       tagged_with: '  etiquettate con %{tags}'
       public_traces_from: Tracias GPS public de %{user}
       description: Percurrer le tracias GPS incargate recentemente
       tagged_with: '  etiquettate con %{tags}'


@@ -1648,7 +1953,8 @@ ia:
         wiki</a>.
       upload_trace: Incargar un tracia
       see_all_traces: Vider tote le tracias
         wiki</a>.
       upload_trace: Incargar un tracia
       see_all_traces: Vider tote le tracias

-    delete:
+      see_my_traces: Vider mi tracias
+    destroy:

       scheduled_for_deletion: Tracia programmate pro deletion
     make_public:
       made_public: Tracia rendite public
       scheduled_for_deletion: Tracia programmate pro deletion
     make_public:
       made_public: Tracia rendite public


@@ -1665,9 +1971,12 @@ ia:
         other: File GPX con %{count} punctos de %{user}
       description_without_count: File GPX de %{user}
   application:
         other: File GPX con %{count} punctos de %{user}
       description_without_count: File GPX de %{user}
   application:

+    permission_denied: Tu non ha le permission de acceder a iste action

     require_cookies:
       cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies
         in tu navigator ante de continuar.
     require_cookies:
       cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies
         in tu navigator ante de continuar.

+    require_admin:
+      not_an_admin: Tu debe esser administrator pro exequer iste action.

     setup_user_auth:
       blocked_zero_hour: Tu ha un message urgente sur le sito web de OpenStreetMap.
         Tu debe leger le message ante de poter salveguardar tu modificationes.
     setup_user_auth:
       blocked_zero_hour: Tu ha un message urgente sur le sito web de OpenStreetMap.
         Tu debe leger le message ante de poter salveguardar tu modificationes.


@@ -1679,9 +1988,9 @@ ia:
   oauth:
     authorize:
       title: Autorisar accesso a tu conto
   oauth:
     authorize:
       title: Autorisar accesso a tu conto

-      request_access: Le application %{app_name} requesta accesso a tu conto "%{user}".
-        Per favor verifica si tu vole que le application ha le sequente possibilitates.
-        Tu pote seliger tantes o si poches como tu vole.
+      request_access_html: Le application %{app_name} requesta accesso a tu conto
+        "%{user}". Per favor verifica si tu vole que le application ha le sequente
+        possibilitates. Tu pote seliger tantes o si poches como tu vole.

       allow_to: 'Permitter al application cliente:'
       allow_read_prefs: leger tu preferentias de usator.
       allow_write_prefs: modificar tu preferentias de usator.
       allow_to: 'Permitter al application cliente:'
       allow_read_prefs: leger tu preferentias de usator.
       allow_write_prefs: modificar tu preferentias de usator.


@@ -1693,29 +2002,27 @@ ia:
       grant_access: Conceder accesso
     authorize_success:
       title: Requesta de autorisation acceptate
       grant_access: Conceder accesso
     authorize_success:
       title: Requesta de autorisation acceptate

-      allowed: Tu ha concedite al application %{app_name} le accesso a tu conto.
+      allowed_html: Tu ha concedite al application %{app_name} le accesso a tu conto.

       verification: Le codice de verification es %{code}.
     authorize_failure:
       title: Requesta de autorisation fallite
       denied: Tu ha refusate al application %{app_name} le accesso a tu conto.
       verification: Le codice de verification es %{code}.
     authorize_failure:
       title: Requesta de autorisation fallite
       denied: Tu ha refusate al application %{app_name} le accesso a tu conto.

-      invalid: Le indicio de autorisation non es valide.
+      invalid: Le token de autorisation non es valide.

     revoke:
     revoke:

-      flash: Tu ha revocate le indicio pro %{application}
+      flash: Tu ha revocate le token pro %{application}

     permissions:
       missing: Tu non ha permittite al application le accesso a iste facilitate
   oauth_clients:
     new:
       title: Registrar un nove application
     permissions:
       missing: Tu non ha permittite al application le accesso a iste facilitate
   oauth_clients:
     new:
       title: Registrar un nove application

-      submit: Registrar

     edit:
       title: Modificar tu application
     edit:
       title: Modificar tu application

-      submit: Modificar

     show:
       title: Detalios OAuth pro %{app_name}
       key: 'Clave de consumitor:'
       secret: 'Secreto de consumitor:'
     show:
       title: Detalios OAuth pro %{app_name}
       key: 'Clave de consumitor:'
       secret: 'Secreto de consumitor:'

-      url: 'URL del indicio de requesta:'
-      access_url: 'URL del indicio de accesso:'
+      url: 'URL del token de requesta:'
+      access_url: 'URL del token de accesso:'

       authorize_url: 'URL de autorisation:'
       support_notice: Nos supporta le signaturas HMAC-SHA1 (recommendate) e RSA-SHA1.
       edit: Modificar detalios
       authorize_url: 'URL de autorisation:'
       support_notice: Nos supporta le signaturas HMAC-SHA1 (recommendate) e RSA-SHA1.
       edit: Modificar detalios


@@ -1732,15 +2039,15 @@ ia:
     index:
       title: Mi detalios OAuth
       my_tokens: Mi applicationes autorisate
     index:
       title: Mi detalios OAuth
       my_tokens: Mi applicationes autorisate

-      list_tokens: 'Le sequente indicios ha essite emittite a applicationes in tu
-        nomine:'
+      list_tokens: 'Le sequente tokens ha essite emittite a applicationes in tu nomine:'

       application: Nomine del application
       issued_at: Emittite le
       revoke: Revocar!
       my_apps: Mi applicationes cliente
       application: Nomine del application
       issued_at: Emittite le
       revoke: Revocar!
       my_apps: Mi applicationes cliente

-      no_apps: Ha tu un aplication que tu vole registrar pro uso con nos per medio
-        del standard %{oauth}? Tu debe registrar tu application web ante que illo
-        pote facer requestas OAuth a iste servicio.
+      no_apps_html: Ha tu un aplication que tu vole registrar pro uso con nos per
+        medio del standard %{oauth}? Tu debe registrar tu application web ante que
+        illo pote facer requestas OAuth a iste servicio.
+      oauth: OAuth

       registered_apps: 'Tu ha le sequente applicationes cliente registrate:'
       register_new: Registrar tu application
     form:
       registered_apps: 'Tu ha le sequente applicationes cliente registrate:'
       register_new: Registrar tu application
     form:


@@ -1771,7 +2078,7 @@ ia:
       heading: Aperir session
       email or username: 'Adresse de e-mail o nomine de usator:'
       password: 'Contrasigno:'
       heading: Aperir session
       email or username: 'Adresse de e-mail o nomine de usator:'
       password: 'Contrasigno:'

-      openid: 'OpenID de %{logo}:'
+      openid_html: 'OpenID de %{logo}:'

       remember: 'Memorar me:'
       lost password link: Contrasigno perdite?
       login_button: Aperir session
       remember: 'Memorar me:'
       lost password link: Contrasigno perdite?
       login_button: Aperir session


@@ -1841,12 +2148,12 @@ ia:
       confirm password: 'Confirma contrasigno:'
       reset: Reinitialisar contrasigno
       flash changed: Tu contrasigno ha essite cambiate.
       confirm password: 'Confirma contrasigno:'
       reset: Reinitialisar contrasigno
       flash changed: Tu contrasigno ha essite cambiate.

-      flash token bad: Indicio non trovate. Verifica le URL.
+      flash token bad: Token non trovate. Verifica le URL.

     new:
       title: Crear conto
       no_auto_account_create: Infortunatemente in iste momento non es possibile crear
         un conto pro te automaticamente.
     new:
       title: Crear conto
       no_auto_account_create: Infortunatemente in iste momento non es possibile crear
         un conto pro te automaticamente.

-      contact_webmaster: Per favor contacta le <a href="%{webmaster}">webmaster</a>
+      contact_webmaster_html: Per favor contacta le <a href="%{webmaster}">webmaster</a>

         pro arrangiar le creation de un conto. Nos tentara tractar vostre requesta
         le plus rapidemente possibile.
       about:
         pro arrangiar le creation de un conto. Nos tentara tractar vostre requesta
         le plus rapidemente possibile.
       about:


@@ -1859,8 +2166,8 @@ ia:
         de contributor</a>.
       email address: 'Adresse de e-mail:'
       confirm email address: 'Confirmar adresse de e-mail:'
         de contributor</a>.
       email address: 'Adresse de e-mail:'
       confirm email address: 'Confirmar adresse de e-mail:'

-      not displayed publicly: Tu adresse non es monstrate publicamente. Vide nostre
-        <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="Politica
+      not_displayed_publicly_html: Tu adresse non es monstrate publicamente. Vide
+        nostre <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="Politica

         de confidentialitate de OSMF includente un section sur adresses de e-mail">politica
         de confidentialitate</a> pro plus information.
       display name: 'Nomine public:'
         de confidentialitate de OSMF includente un section sur adresses de e-mail">politica
         de confidentialitate</a> pro plus information.
       display name: 'Nomine public:'


@@ -1878,18 +2185,25 @@ ia:
         de contributor. Pro plus informationes, per favor vide <a href="%{url}">iste
         pagina wiki</a>.
     terms:
         de contributor. Pro plus informationes, per favor vide <a href="%{url}">iste
         pagina wiki</a>.
     terms:

-      title: Conditiones de contributor
-      heading: Conditiones de contributor
-      read and accept: Per favor lege le contracto hic infra e preme le button de
-        acceptation pro confirmar que tu accepta le terminos de iste contracto pro
-        tu existente e futur contributiones.
-      consider_pd: In addition al contracto hic supra, io considera mi contributiones
-        como essente in le dominio public
+      title: Conditiones
+      heading: Conditiones
+      heading_ct: Conditiones de contributor
+      read and accept with tou: Per favor, lege le accordo de contributor e le conditiones
+        de uso, marca ambe quadratos quando tu es finite e pois preme le button Continuar.
+      contributor_terms_explain: Iste accordo regula le conditiones de tu contributiones
+        existente e futur.
+      read_ct: Io ha legite e io accepta le precedente terminos de contributor
+      tou_explain_html: Iste %{tou_link} governa le uso del sito web e altere infrastructura
+        fornite per OSMF. Per favor, clicca sur le ligamine, lege le texto, e declara
+        te de accordo.
+      read_tou: Io ha legite e io accepta le Conditiones de uso
+      consider_pd: In addition a lo que precede, io considera mi contributiones como
+        essente in le dominio public

       consider_pd_why: que es isto?
       consider_pd_why: que es isto?

-      guidance: 'Informationes pro adjutar a comprender iste terminos: a <a href="%{summary}">summario
+      guidance_html: 'Informationes pro adjutar a comprender iste terminos: a <a href="%{summary}">summario

         facile a comprender</a> e alcun <a href="%{translations}">traductiones non
         official</a>'
         facile a comprender</a> e alcun <a href="%{translations}">traductiones non
         official</a>'

-      agree: Acceptar
+      continue: Continuar

       decline: Declinar
       you need to accept or decline: Per favor lege e postea accepta o declina le
         nove Conditiones del Contributor pro continuar.
       decline: Declinar
       you need to accept or decline: Per favor lege e postea accepta o declina le
         nove Conditiones del Contributor pro continuar.


@@ -1925,21 +2239,20 @@ ia:
       remove as friend: Remover amico
       add as friend: Adder amico
       mapper since: 'Cartographo depost:'
       remove as friend: Remover amico
       add as friend: Adder amico
       mapper since: 'Cartographo depost:'

-      ago: (%{time_in_words_ago} retro)

       ct status: 'Conditiones de contributor:'
       ct undecided: Indecise
       ct declined: Declinate
       ct status: 'Conditiones de contributor:'
       ct undecided: Indecise
       ct declined: Declinate

-      ct accepted: Acceptate %{ago} retro
-      latest edit: 'Ultime modification %{ago}:'
+      latest edit: 'Ultime modification (%{ago}):'

       email address: 'Adresse de e-mail:'
       created from: 'Create ex:'
       status: 'Stato:'
       email address: 'Adresse de e-mail:'
       created from: 'Create ex:'
       status: 'Stato:'

-      spam score: 'Punctuation de spam:'
+      spam score: 'Punctos de spam:'

       description: Description
       user location: Position del usator
       description: Description
       user location: Position del usator

-      if set location: Defini tu position de origine in le %{settings_link} pro vider
-        le usatores a proximitate.
+      if_set_location_html: Defini tu position de origine in le %{settings_link} pro
+        vider le usatores a proximitate.

       settings_link_text: configurationes
       settings_link_text: configurationes

+      my friends: Mi amicos

       no friends: Tu non ha ancora addite alcun amico.
       km away: a %{count} km de distantia
       m away: a %{count} m de distantia
       no friends: Tu non ha ancora addite alcun amico.
       km away: a %{count} km de distantia
       m away: a %{count} m de distantia


@@ -1969,6 +2282,7 @@ ia:
       friends_diaries: articulos de diario de tu amicos
       nearby_changesets: gruppos de modificationes de usatores a proximitate
       nearby_diaries: articulos de diario per usatores a proximitate
       friends_diaries: articulos de diario de tu amicos
       nearby_changesets: gruppos de modificationes de usatores a proximitate
       nearby_diaries: articulos de diario per usatores a proximitate

+      report: Signalar iste usator

     popup:
       your location: Tu position
       nearby mapper: Cartographo vicin
     popup:
       your location: Tu position
       nearby mapper: Cartographo vicin


@@ -1993,7 +2307,7 @@ ia:
         disabled link text: proque non pote io modificar?
       public editing note:
         heading: Modification public
         disabled link text: proque non pote io modificar?
       public editing note:
         heading: Modification public

-        text: A iste momento tu modificationes es anonyme, e le gente non pote inviar
+        html: A iste momento tu modificationes es anonyme, e le gente non pote inviar

           te messages ni vider tu position. Pro poter monstrar tu contributiones e
           pro permitter al gente de contactar te per le sito web, clicca le button
           ci infra. <b>Post le cambio al API 0.6, solo le usatores public pote modificar
           te messages ni vider tu position. Pro poter monstrar tu contributiones e
           pro permitter al gente de contactar te per le sito web, clicca le button
           ci infra. <b>Post le cambio al API 0.6, solo le usatores public pote modificar


@@ -2062,32 +2376,21 @@ ia:
         adresse de e-mail.
       button: Confirmar
       success: Le cambio del adresse de e-mail ha essite confirmate.
         adresse de e-mail.
       button: Confirmar
       success: Le cambio del adresse de e-mail ha essite confirmate.

-      failure: Un adresse de e-mail ha ja essite confirmate con iste indicio.
+      failure: Un adresse de e-mail ha ja essite confirmate con iste token.

       unknown_token: Iste codice de confirmation ha expirate o non existe.
     set_home:
       flash success: Position de origine confirmate con successo
     go_public:
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission
         de modificar.
       unknown_token: Iste codice de confirmation ha expirate o non existe.
     set_home:
       flash success: Position de origine confirmate con successo
     go_public:
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission
         de modificar.

-    make_friend:
-      heading: Adder %{user} como amico?
-      button: Adder como amico
-      success: '%{name} es ora tu amico!'
-      failed: Pardono, non poteva adder %{name} como amico.
-      already_a_friend: Tu es ja amico de %{name}.
-    remove_friend:
-      heading: Remover %{user} como amico?
-      button: Remover amico
-      success: '%{name} ha essite removite de tu amicos.'
-      not_a_friend: '%{name} non es un de tu amicos.'

     index:
       title: Usatores
       heading: Usatores
       showing:
         one: Pagina %{page} (%{first_item} de %{items})
         other: Pagina %{page} (%{first_item}-%{last_item} de %{items})
     index:
       title: Usatores
       heading: Usatores
       showing:
         one: Pagina %{page} (%{first_item} de %{items})
         other: Pagina %{page} (%{first_item}-%{last_item} de %{items})

-      summary: '%{name} create ab %{ip_address} le %{date}'
-      summary_no_ip: '%{name} create le %{date}'
+      summary_html: '%{name} create ab %{ip_address} le %{date}'
+      summary_no_ip_html: '%{name} create le %{date}'

       confirm: Confirmar usatores seligite
       hide: Celar usatores seligite
       empty: Nulle usator correspondente trovate
       confirm: Confirmar usatores seligite
       hide: Celar usatores seligite
       empty: Nulle usator correspondente trovate


@@ -2095,7 +2398,7 @@ ia:
       title: Conto suspendite
       heading: Conto suspendite
       webmaster: webmaster
       title: Conto suspendite
       heading: Conto suspendite
       webmaster: webmaster

-      body: |-
+      body_html: |-

         <p>
           Pardono, tu conto ha essite automaticamente disactivate debite a
           activitate suspecte.
         <p>
           Pardono, tu conto ha essite automaticamente disactivate debite a
           activitate suspecte.


@@ -2146,13 +2449,12 @@ ia:
       back: Retornar al indice
     new:
       title: Crea blocada de %{name}
       back: Retornar al indice
     new:
       title: Crea blocada de %{name}

-      heading: Crea blocada de %{name}
-      reason: Le motivo proque %{name} es blocate. Per favor sia si calme e rationabile
+      heading_html: Crea blocada de %{name}
+      reason: Le motivo proque %{name} es blocate. Per favor sia tanto calme e rationabile

         como possibile, e da tante detalios super le situation como tu pote. Non oblida
         que le message essera publicamente visibile. Nota ben que non tote le usatores
         como possibile, e da tante detalios super le situation como tu pote. Non oblida
         que le message essera publicamente visibile. Nota ben que non tote le usatores

-        comprende le jargon del communitate, alora usa terminos simple e precise.
+        comprende le jargon del communitate, dunque usa terminos simple e precise.

       period: Quante tempore, a partir de ora, essera le usator blocate del API?
       period: Quante tempore, a partir de ora, essera le usator blocate del API?

-      submit: Crear blocada

       tried_contacting: Io ha contactate le usator pro demandar le/la de cessar.
       tried_waiting: Io ha date sufficiente tempore al usator pro responder a iste
         communicationes.
       tried_contacting: Io ha contactate le usator pro demandar le/la de cessar.
       tried_waiting: Io ha date sufficiente tempore al usator pro responder a iste
         communicationes.


@@ -2160,13 +2462,12 @@ ia:
       back: Vider tote le blocadas
     edit:
       title: Modification de un blocada super %{name}
       back: Vider tote le blocadas
     edit:
       title: Modification de un blocada super %{name}

-      heading: Modification de un blocada super %{name}
-      reason: Le motivo proque %{name} es blocate. Per favor resta si calme e rationabile
-        como possibile, e da tante detalios como tu pote super le situation. Nota
-        ben que non tote le usatores comprende le jargon del communitate, alora usa
+      heading_html: Modification de un blocada super %{name}
+      reason: Le motivo proque %{name} es blocate. Per favor sia tanto calme e rationabile
+        como possibile, e da tante detalios super le situation como tu pote. Nota
+        ben que non tote le usatores comprende le jargon del communitate, dunque usa

         terminos simple e precise.
       period: Quante tempore, a partir de ora, essera le usator blocate del API?
         terminos simple e precise.
       period: Quante tempore, a partir de ora, essera le usator blocate del API?

-      submit: Actualisar blocada

       show: Examinar iste blocada
       back: Examinar tote le blocadas
       needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?
       show: Examinar iste blocada
       back: Examinar tote le blocadas
       needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?


@@ -2190,36 +2491,46 @@ ia:
       empty: Nulle blocada ha ancora essite effectuate.
     revoke:
       title: Revoca blocada de %{block_on}
       empty: Nulle blocada ha ancora essite effectuate.
     revoke:
       title: Revoca blocada de %{block_on}

-      heading: Revoca blocada de %{block_on} per %{block_by}
+      heading_html: Revoca blocada de %{block_on} per %{block_by}

       time_future: Iste blocada expirara in %{time}.
       time_future: Iste blocada expirara in %{time}.

-      past: Iste blocada expirava %{time} retro e non pote esser revocate ora.
+      past: Iste blocada expirava %{time} e non pote esser revocate ora.

       confirm: Es tu secur de voler revocar iste blocada?
       revoke: Revocar!
       flash: Iste blocada ha essite revocate.
       confirm: Es tu secur de voler revocar iste blocada?
       revoke: Revocar!
       flash: Iste blocada ha essite revocate.

-    period:
-      one: 1 hora
-      other: '%{count} horas'

     helper:
       time_future: Expira in %{time}.
       until_login: Active usque le usator aperi un session.
       time_future_and_until_login: Termina in %{time} e post que le usator ha aperite
         session.
     helper:
       time_future: Expira in %{time}.
       until_login: Active usque le usator aperi un session.
       time_future_and_until_login: Termina in %{time} e post que le usator ha aperite
         session.

-      time_past: Expirava %{time} retro.
+      time_past: Expirava %{time}.
+      block_duration:
+        hours:
+          one: 1 hora
+          other: '%{count} horas'
+        days:
+          one: 1 die
+          other: '%{count} dies'
+        weeks:
+          one: 1 septimana
+          other: '%{count} septimanas'
+        months:
+          one: 1 mense
+          other: '%{count} menses'
+        years:
+          one: 1 anno
+          other: '%{count} annos'

     blocks_on:
       title: Blocadas de %{name}
     blocks_on:
       title: Blocadas de %{name}

-      heading: Lista de blocadas de %{name}
+      heading_html: Lista de blocadas de %{name}

       empty: '%{name} non ha ancora essite blocate.'
     blocks_by:
       title: Blocadas per %{name}
       empty: '%{name} non ha ancora essite blocate.'
     blocks_by:
       title: Blocadas per %{name}

-      heading: Lista de blocadas per %{name}
+      heading_html: Lista de blocadas per %{name}

       empty: '%{name} non ha ancora facite alcun blocada.'
     show:
       title: '%{block_on} blocate per %{block_by}'
       empty: '%{name} non ha ancora facite alcun blocada.'
     show:
       title: '%{block_on} blocate per %{block_by}'

-      heading: '%{block_on} blocate per %{block_by}'
-      time_future: Expira in %{time}
-      time_past: Expirava %{time} retro
+      heading_html: '%{block_on} blocate per %{block_by}'

       created: Create
       created: Create

-      ago: '%{time} retro'

       status: Stato
       show: Monstrar
       edit: Modificar
       status: Stato
       show: Monstrar
       edit: Modificar


@@ -2244,37 +2555,15 @@ ia:
       next: Sequente »
       previous: « Precedente
   notes:
       next: Sequente »
       previous: « Precedente
   notes:

-    comment:
-      opened_at_html: Create %{when} retro
-      opened_at_by_html: Create %{when} retro per %{user}
-      commented_at_html: Actualisate %{when} retro
-      commented_at_by_html: Actualisate %{when} retro per %{user}
-      closed_at_html: Resolvite %{when} retro
-      closed_at_by_html: Resolvite %{when} retro per %{user}
-      reopened_at_html: Reactivate %{when} retro
-      reopened_at_by_html: Reactivate %{when} retro per %{user}
-    rss:
-      title: Notas de OpenStreetMap
-      description_area: Un lista de notas reportate, commentate o claudite in tu area
-        [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
-      description_item: Syndication RSS pro le nota %{id}
-      opened: nove nota (a presso de %{place})
-      commented: nove commento (a presso de %{place})
-      closed: nota claudite (a presso de %{place})
-      reopened: nota reactivate (a presso de %{place})
-    entry:
-      comment: Commento
-      full: Nota complete
-    mine:
+    index:

       title: Notas submittite o commentate per %{user}
       heading: Notas de %{user}
       title: Notas submittite o commentate per %{user}
       heading: Notas de %{user}

-      subheading: Notas submittite o commentate per %{user}
+      subheading_html: Notas submittite o commentate per %{user}

       id: ID
       creator: Creator
       description: Description
       created_at: Create a
       last_changed: Ultime modification
       id: ID
       creator: Creator
       description: Description
       created_at: Create a
       last_changed: Ultime modification

-      ago_html: '%{when} retro'

   javascripts:
     close: Clauder
     share:
   javascripts:
     close: Clauder
     share:


@@ -2309,7 +2598,12 @@ ia:
         out: Zoom retro
       locate:
         title: Monstrar mi position
         out: Zoom retro
       locate:
         title: Monstrar mi position

-        popup: Tu es intra {distance} {unit} de iste puncto
+        metersPopup:
+          one: Tu es minus de un metro distante de iste puncto
+          other: Tu es minus de %{count} metros distante de iste puncto
+        feetPopup:
+          one: Tu es minus de un pede distante de iste puncto
+          other: Tu es minus de %{count} pedes distante de iste puncto

       base:
         standard: Standard
         cycle_map: Carta cyclista
       base:
         standard: Standard
         cycle_map: Carta cyclista


@@ -2324,6 +2618,13 @@ ia:
         title: Stratos
       copyright: © <a href='%{copyright_url}'>contributores de OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Facer un donation</a>
         title: Stratos
       copyright: © <a href='%{copyright_url}'>contributores de OpenStreetMap</a>
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Facer un donation</a>

+      terms: <a href='%{terms_url}' target='_blank'>Conditiones del sito web e del
+        API</a>
+      thunderforest: Tegulas fornite per <a href='%{thunderforest_url}' target='_blank'>Andy
+        Allan</a>
+      hotosm: Stilo de tegulas concipite per <a href='%{hotosm_url}' target='_blank'>le
+        equipa humanitari de OpenStreetMap</a> e albergate per <a href='%{osmfrance_url}'
+        target='_blank'>OpenStreetMap France</a>

     site:
       edit_tooltip: Modificar le carta
       edit_disabled_tooltip: Face zoom avante pro modificar le carta
     site:
       edit_tooltip: Modificar le carta
       edit_disabled_tooltip: Face zoom avante pro modificar le carta


@@ -2344,8 +2645,10 @@ ia:
       new:
         intro: Tu ha trovate un error? Qualcosa manca? Face lo saper al altere cartographos
           a fin que nos pote corriger lo. Displacia le marcator al position correcte
       new:
         intro: Tu ha trovate un error? Qualcosa manca? Face lo saper al altere cartographos
           a fin que nos pote corriger lo. Displacia le marcator al position correcte

-          e scribe un nota pro explicar le problema. (Non entra informationes personal
-          o proveniente de cartas o catalogos sub derecto de autor.)
+          e scribe un nota pro explicar le problema.
+        advice: Tu nota es public e pote esser usate pro actualisar le carta. Dunque,
+          non insere alcun information personal, ni datos ab cartas o catalogos protegite
+          per derectos de autor.

         add: Adder nota
       show:
         anonymous_warning: Iste nota include commentos de usatores anonyme que debe
         add: Adder nota
       show:
         anonymous_warning: Iste nota include commentos de usatores anonyme que debe


@@ -2360,7 +2663,9 @@ ia:
     directions:
       ascend: Ascender
       engines:
     directions:
       ascend: Ascender
       engines:

+        fossgis_osrm_bike: Bicycletta (OSRM)

         fossgis_osrm_car: Auto (OSRM)
         fossgis_osrm_car: Auto (OSRM)

+        fossgis_osrm_foot: A pede (OSRM)

         graphhopper_bicycle: Bicycletta (GraphHopper)
         graphhopper_car: Auto (GraphHopper)
         graphhopper_foot: Pedestre (GraphHopper)
         graphhopper_bicycle: Bicycletta (GraphHopper)
         graphhopper_car: Auto (GraphHopper)
         graphhopper_foot: Pedestre (GraphHopper)


@@ -2369,12 +2674,27 @@ ia:
       distance: Distantia
       errors:
         no_route: Nulle route ha essite trovate inter iste duo locos.
       distance: Distantia
       errors:
         no_route: Nulle route ha essite trovate inter iste duo locos.

-        no_place: Iste loco non ha essite trovate.
+        no_place: '''%{place}'' non poteva esser trovate.'

       instructions:
         continue_without_exit: Continuar sur %{name}
         slight_right_without_exit: Girar legiermente a dextra verso %{name}
       instructions:
         continue_without_exit: Continuar sur %{name}
         slight_right_without_exit: Girar legiermente a dextra verso %{name}

+        offramp_right: Prende le rampa a dextra
+        offramp_right_with_exit: Prende le exito %{exit} a dextra
+        offramp_right_with_exit_name: Prende le exito %{exit} a dextra verso %{name}
+        offramp_right_with_exit_directions: Prende le exito %{exit} a dextra in direction
+          %{directions}
+        offramp_right_with_exit_name_directions: Prende le exito %{exit} a dextra
+          verso %{name}, in direction %{directions}

         offramp_right_with_name: Prende le rampa a dextra verso %{name}
         offramp_right_with_name: Prende le rampa a dextra verso %{name}

+        offramp_right_with_directions: Prende le rampa a dextra in direction %{directions}
+        offramp_right_with_name_directions: Prende le rampa a dextra verso %{name},
+          in direction %{directions}

         onramp_right_without_exit: Girar a dextra sur le rampa verso %{name}
         onramp_right_without_exit: Girar a dextra sur le rampa verso %{name}

+        onramp_right_with_directions: Gira a dextra sur le rampa in direction %{directions}
+        onramp_right_with_name_directions: Gira a dextra sur le rampa verso %{name},
+          in direction %{directions}
+        onramp_right_without_directions: Gira a dextra sur le rampa
+        onramp_right: Gira a dextra sur le rampa

         endofroad_right_without_exit: Al fin del strata, girar a dextra verso %{name}
         merge_right_without_exit: Junger a dextra verso %{name}
         fork_right_without_exit: Al bifurcation, girar a dextra verso %{name}
         endofroad_right_without_exit: Al fin del strata, girar a dextra verso %{name}
         merge_right_without_exit: Junger a dextra verso %{name}
         fork_right_without_exit: Al bifurcation, girar a dextra verso %{name}


@@ -2383,24 +2703,52 @@ ia:
         uturn_without_exit: Retornar preter %{name}
         sharp_left_without_exit: Curva acute a sinistra verso %{name}
         turn_left_without_exit: Girar a sinistra verso %{name}
         uturn_without_exit: Retornar preter %{name}
         sharp_left_without_exit: Curva acute a sinistra verso %{name}
         turn_left_without_exit: Girar a sinistra verso %{name}

+        offramp_left: Prende le rampa a sinistra
+        offramp_left_with_exit: Prende le exito %{exit} a sinistra
+        offramp_left_with_exit_name: Prende le exito %{exit} a sinistra verso %{name}
+        offramp_left_with_exit_directions: Prende le exito %{exit} a sinistra in direction
+          %{directions}
+        offramp_left_with_exit_name_directions: Prende le exito %{exit} a sinistra
+          verso %{name}, in direction %{directions}

         offramp_left_with_name: Prende le rampa al sinistra verso %{name}
         offramp_left_with_name: Prende le rampa al sinistra verso %{name}

+        offramp_left_with_directions: Prende le rampa a sinistra in direction %{directions}
+        offramp_left_with_name_directions: Prende le rampa a sinistra verso %{name},
+          in direction %{directions}

         onramp_left_without_exit: Girar a sinistra sur le rampa verso %{name}
         onramp_left_without_exit: Girar a sinistra sur le rampa verso %{name}

+        onramp_left_with_directions: Gira a sinistra sur le rampa in direction %{directions}
+        onramp_left_with_name_directions: Gira a sinistra sur le rampa verso %{name},
+          in direction %{directions}
+        onramp_left_without_directions: Gira a sinistra sur le rampa
+        onramp_left: Gira a sinistra sur le rampa

         endofroad_left_without_exit: Al fin del strata, girar a sinistra verso %{name}
         merge_left_without_exit: Junger a sinistra verso %{name}
         fork_left_without_exit: Al bifurcation, girar a sinistra verso %{name}
         slight_left_without_exit: Girar legiermente a sinistra verso %{name}
         via_point_without_exit: (puncto intermedie)
         follow_without_exit: Sequer %{name}
         endofroad_left_without_exit: Al fin del strata, girar a sinistra verso %{name}
         merge_left_without_exit: Junger a sinistra verso %{name}
         fork_left_without_exit: Al bifurcation, girar a sinistra verso %{name}
         slight_left_without_exit: Girar legiermente a sinistra verso %{name}
         via_point_without_exit: (puncto intermedie)
         follow_without_exit: Sequer %{name}

-        roundabout_without_exit: Al rotunda prender %{name}
+        roundabout_without_exit: Al rotunda, prender le exito verso %{name}

         leave_roundabout_without_exit: Quitar rotunda - %{name}
         stay_roundabout_without_exit: Remaner sur rotunda - %{name}
         leave_roundabout_without_exit: Quitar rotunda - %{name}
         stay_roundabout_without_exit: Remaner sur rotunda - %{name}

-        start_without_exit: Comenciar al fin de %{name}
+        start_without_exit: Comenciar a %{name}

         destination_without_exit: Attinger destination
         against_oneway_without_exit: Ir contra direction obligatori sur %{name}
         end_oneway_without_exit: Fin del direction obligatori sur %{name}
         roundabout_with_exit: Al rotunda prende le exito %{exit} sur %{name}
         destination_without_exit: Attinger destination
         against_oneway_without_exit: Ir contra direction obligatori sur %{name}
         end_oneway_without_exit: Fin del direction obligatori sur %{name}
         roundabout_with_exit: Al rotunda prende le exito %{exit} sur %{name}

+        roundabout_with_exit_ordinal: Al rotunda prende le exito %{exit} verso %{name}
+        exit_roundabout: Exi del rotunda verso %{name}

         unnamed: cammino sin nomine
         courtesy: Itinerario fornite per %{link}
         unnamed: cammino sin nomine
         courtesy: Itinerario fornite per %{link}

+        exit_counts:
+          first: 1me
+          second: 2nde
+          third: 3tie
+          fourth: 4te
+          fifth: 5te
+          sixth: 6te
+          seventh: 7me
+          eighth: 8ve
+          ninth: 9ne
+          tenth: 10me

       time: Tempore
     query:
       node: Nodo
       time: Tempore
     query:
       node: Nodo


@@ -2419,33 +2767,36 @@ ia:
   redactions:
     edit:
       description: Description
   redactions:
     edit:
       description: Description

-      heading: Modificar obscuration
-      submit: Salveguardar obscuration
+      heading: Modificar suppression

       title: Modificar obscuration
     index:
       title: Modificar obscuration
     index:

-      empty: Il non ha obscurationes a monstrar.
+      empty: Il non ha suppressiones a monstrar.

       heading: Lista de obscurationes
       heading: Lista de obscurationes

-      title: Lista de obscurationes
+      title: Lista de suppressiones

     new:
       description: Description
     new:
       description: Description

-      heading: Specifica information pro nove obscuration
-      submit: Crear obscuration
+      heading: Specifica information pro nove suppression

       title: Creation de nove obscuration
     show:
       description: 'Description:'
       title: Creation de nove obscuration
     show:
       description: 'Description:'

-      heading: Es monstrate le obscuration "%{title}"
+      heading: Es monstrate le suppression "%{title}"

       title: Presentation de obscuration
       user: 'Creator:'
       title: Presentation de obscuration
       user: 'Creator:'

-      edit: Modificar iste obscuration
+      edit: Modificar iste suppression

       destroy: Remover iste obscuration
       confirm: Es tu secur?
     create:
       destroy: Remover iste obscuration
       confirm: Es tu secur?
     create:

-      flash: Obscuration create.
+      flash: Suppression create.

     update:
       flash: Cambios salveguardate.
     destroy:
     update:
       flash: Cambios salveguardate.
     destroy:

-      not_empty: Le obscuration non es vacue. Per favor disobscura tote le versiones
-        pertinente a iste obscuration ante de destruer lo.
+      not_empty: Le suppression non es vacue. Per favor dis-supprime tote le versiones
+        pertinente a iste suppression ante de destruer lo.

       flash: Obscuration destruite.
       flash: Obscuration destruite.

-      error: Un error occurreva durante le destruction de iste obscuration.
+      error: Un error occurreva durante le destruction de iste suppression.
+  validations:
+    leading_whitespace: ha spatios al initio
+    trailing_whitespace: ha spatios al fin
+    invalid_characters: contine characteres invalide
+    url_characters: contine characteres special de adresse URL (%{characters})

 ...
 ...