Merge branch 'pull/3146'

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index ec61e0d0cd9bb3f701244b03691d645762685182..84d47b3dc3729c3f4993bb136132e6e94624ea4d 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1,7 +1,6 @@
 # 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


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

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

   activerecord:
     errors:
       messages:
   activerecord:
     errors:
       messages:


@@ -26,6 +50,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


@@ -42,17 +67,30 @@ 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
     attributes:
       way: Via
       way_node: Nodo de via
       way_tag: Etiquetta de via
     attributes:

+      client_application:
+        name: Nomine (obligatori)
+        url: URL principal del application (obligatori)
+        callback_url: URL de retorno
+        support_url: URl de supporto
+        allow_read_prefs: leger su preferentias de usator
+        allow_write_prefs: modificar su preferentias de usator
+        allow_write_diary: crear entratas de diario, commentos e adder amicos
+        allow_write_api: modificar le carta
+        allow_read_gpx: leger su tracias GPS private
+        allow_write_gpx: incargar tracias GPS
+        allow_write_notes: modificar notas

       diary_comment:
         body: Texto
       diary_entry:
       diary_comment:
         body: Texto
       diary_entry:


@@ -67,49 +105,124 @@ ia:
       trace:
         user: Usator
         visible: Visibile
       trace:
         user: Usator
         visible: Visibile

-        name: Nomine
+        name: Nomine de file

         size: Dimension
         latitude: Latitude
         longitude: Longitude
         public: Public
         description: Description
         size: Dimension
         latitude: Latitude
         longitude: Longitude
         public: Public
         description: Description

+        gpx_file: Incargar file GPX
+        visibility: Visibilitate
+        tagstring: Etiquettas

       message:
         sender: Expeditor
         title: Subjecto
         body: Texto
         recipient: Destinatario
       message:
         sender: Expeditor
         title: Subjecto
         body: Texto
         recipient: Destinatario

+      redaction:
+        title: Titulo
+        description: Description
+      report:
+        category: Selige un motivo pro tu reporto
+        details: Per favor, forni plus detalios sur le problema (obligatori).

       user:
       user:

+        auth_provider: Fornitor de authentication
+        auth_uid: UID de authentication

         email: E-mail
         email: E-mail

+        email_confirmation: Confirmation del e-mail
+        new_email: Nove adresse de e-mail

         active: Active
         display_name: Nomine public
         active: Active
         display_name: Nomine public

-        description: Description
-        languages: Linguas
+        description: Description del profilo
+        home_lat: Latitude
+        home_lon: Longitude
+        languages: Linguas preferite
+        preferred_editor: Editor preferite

         pass_crypt: Contrasigno
         pass_crypt: Contrasigno

+        pass_crypt_confirmation: Confirmar contrasigno
+    help:
+      trace:
+        tagstring: separate per commas
+      user_block:
+        reason: Le motivo proque le usator es blocate. Per favor sia tanto calme e
+          rationabile como possibile, e da tante detalios sur 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; per favor tenta
+          usar terminos simple.
+        needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?
+      user:
+        email_confirmation: Tu adresse non es monstrate publicamente. Vide nostre
+          <a href="https://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.
+        new_email: (nunquam monstrate publicamente)
+  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})
   editor:
     default: Predefinite (actualmente %{name})

-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor in navigator del web)

     id:
       name: iD
       description: iD (editor in navigator)
     id:
       name: iD
       description: iD (editor in navigator)

-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor in navigator del web)

     remote:
       name: Controlo remote
     remote:
       name: Controlo remote

-      description: Controlo remote (JOSM o Merkaartor)
+      description: Controlo remote (JOSM, Potlatch, Merkaartor)
+  auth:
+    providers:
+      none: Necun
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia

   api:
     notes:
       comment:
   api:
     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}
+        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
       rss:
         title: Notas de OpenStreetMap
         description_area: Un lista de notas reportate, commentate o claudite in tu


@@ -125,17 +238,23 @@ ia:
   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
     no_comment: (sin commento)
     part_of: Parte de
     version: Version
     in_changeset: Gruppo de modificationes
     anonymous: anonyme
     no_comment: (sin commento)
     part_of: Parte de

+    part_of_relations:
+      one: 1 relation
+      other: '%{count} relationes'
+    part_of_ways:
+      one: 1 via
+      other: '%{count} vias'

     download_xml: Discargar XML
     view_history: Vider historia
     view_details: Vider detalios
     download_xml: Discargar XML
     view_history: Vider historia
     view_details: Vider detalios


@@ -150,9 +269,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_html: Commento celate de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: 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:


@@ -163,29 +281,36 @@ 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:
+      nodes_count:
+        one: 1 nodo
+        other: '%{count} nodos'
+      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
       members: Membros

+      members_count:
+        one: 1 membro
+        other: '%{count} membros'

     relation_member:
     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:
     not_found:

+      title: Non trovate

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


@@ -194,6 +319,7 @@ ia:
         changeset: gruppo de modificationes
         note: nota
     timeout:
         changeset: gruppo de modificationes
         note: nota
     timeout:

+      title: Tempore limite excedite

       sorry: Pardono, le datos pro le %{type} con le ID %{id} ha prendite troppo de
         tempore pro esser recuperate.
       type:
       sorry: Pardono, le datos pro le %{type} con le ID %{id} ha prendite troppo de
         tempore pro esser recuperate.
       type:


@@ -203,9 +329,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


@@ -222,7 +348,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


@@ -230,20 +358,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_html: Create per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Create per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Commento de un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolvite per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: 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


@@ -284,7 +407,7 @@ 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}
     comments:
       comment: Nove commento sur le gruppo de modificationes № %{changeset_id} per
         %{author}


@@ -298,7 +421,9 @@ ia:
   diary_entries:
     new:
       title: Nove entrata de diario
   diary_entries:
     new:
       title: Nove entrata de diario

-      publish_button: Publicar
+    form:
+      location: Loco
+      use_map_link: Usar le carta

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


@@ -307,48 +432,43 @@ ia:
       in_language_title: Entratas de diario in %{language}
       new: Nove entrata de diario
       new_title: Componer un nove entrata in mi diario
       in_language_title: Entratas de diario in %{language}
       new: Nove entrata de diario
       new_title: Componer un nove entrata in mi diario

+      my_diary: Mi diario

       no_entries: Nulle entrata in diario
       recent_entries: Entratas recente del diario
       older_entries: Entratas plus ancian
       newer_entries: Entratas plus recente
     edit:
       title: Modificar entrata de diario
       no_entries: Nulle entrata in diario
       recent_entries: Entratas recente del diario
       older_entries: Entratas plus ancian
       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}.
+      updated_at_html: Ultime actualisation le %{updated}.

       comment_link: Commentar iste entrata
       comment_link: Commentar iste entrata

-      reply_link: Responder a iste entrata
+      reply_link: Inviar un message al autor

       comment_count:
         one: 1 commento
         zero: Nulle commento
         other: '%{count} commentos'
       edit_link: Modificar iste entrata
       hide_link: Celar iste entrata
       comment_count:
         one: 1 commento
         zero: Nulle commento
         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:


@@ -370,20 +490,31 @@ ia:
       post: Articulo
       when: Quando
       comment: Commento
       post: Articulo
       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:


@@ -391,10 +522,12 @@ ia:
           chair_lift: Telesedia
           drag_lift: Teleski
           gondola: Telecabina
           chair_lift: Telesedia
           drag_lift: Teleski
           gondola: Telecabina

+          magic_carpet: Tapete rolante

           platter: Teleski a platto
           pylon: Pylon
           station: Station de telecabina
           t-bar: Teleski a barras T
           platter: Teleski a platto
           pylon: Pylon
           station: Station de telecabina
           t-bar: Teleski a barras T

+          "yes": Via aeree

         aeroway:
           aerodrome: Aerodromo
           airstrip: Pista de atterrage
         aeroway:
           aerodrome: Aerodromo
           airstrip: Pista de atterrage


@@ -403,11 +536,15 @@ ia:
           hangar: Hangar
           helipad: Heliporto
           holding_position: Puncto de attender
           hangar: Hangar
           helipad: Heliporto
           holding_position: Puncto de attender

+          navigationaid: Auxilio al navigation aeree

           parking_position: Puncto de parcamento
           runway: Pista
           parking_position: Puncto de parcamento
           runway: Pista

+          taxilane: Via de taxi

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

+          windsock: Manica a vento

         amenity:
         amenity:

+          animal_boarding: Pension pro animales

           animal_shelter: Refugio pro animales
           arts_centre: Centro artistic
           atm: Cassa automatic
           animal_shelter: Refugio pro animales
           arts_centre: Centro artistic
           atm: Cassa automatic


@@ -417,7 +554,9 @@ ia:
           bench: Banco
           bicycle_parking: Stationamento pro bicyclettas
           bicycle_rental: Location de bicyclettas
           bench: Banco
           bicycle_parking: Stationamento pro bicyclettas
           bicycle_rental: Location de bicyclettas

+          bicycle_repair_station: Station de reparation de bicyclettas

           biergarten: Terrassa
           biergarten: Terrassa

+          blood_bank: Banco de sanguine

           boat_rental: Location de barcas
           brothel: Bordello
           bureau_de_change: Officio de cambio
           boat_rental: Location de barcas
           brothel: Bordello
           bureau_de_change: Officio de cambio


@@ -434,6 +573,7 @@ ia:
           clock: Horologio
           college: Schola superior
           community_centre: Centro communitari
           clock: Horologio
           college: Schola superior
           community_centre: Centro communitari

+          conference_centre: Centro de conferentias

           courthouse: Tribunal
           crematorium: Crematorio
           dentist: Dentista
           courthouse: Tribunal
           crematorium: Crematorio
           dentist: Dentista


@@ -441,6 +581,7 @@ ia:
           drinking_water: Aqua potabile
           driving_school: Autoschola
           embassy: Ambassada
           drinking_water: Aqua potabile
           driving_school: Autoschola
           embassy: Ambassada

+          events_venue: Loco de eventos

           fast_food: Fast food
           ferry_terminal: Terminal de ferry
           fire_station: Caserna de pumperos
           fast_food: Fast food
           ferry_terminal: Terminal de ferry
           fire_station: Caserna de pumperos


@@ -453,36 +594,42 @@ ia:
           hospital: Hospital
           hunting_stand: Posto de chassa
           ice_cream: Gelato
           hospital: Hospital
           hunting_stand: Posto de chassa
           ice_cream: Gelato

+          internet_cafe: Café internet

           kindergarten: Schola pro juvene infantes
           kindergarten: Schola pro juvene infantes

+          language_school: Schola de linguas

           library: Bibliotheca
           library: Bibliotheca

+          loading_dock: Imbarcatorio
+          love_hotel: Hotel de amor

           marketplace: Mercato
           marketplace: Mercato

+          mobile_money_agent: Agente monetari mobile

           monastery: Monasterio
           monastery: Monasterio

+          money_transfer: Transferimento de moneta

           motorcycle_parking: Parking a motocyclo
           motorcycle_parking: Parking a motocyclo

+          music_school: Schola de musica

           nightclub: Club nocturne
           nursing_home: Casa de convalescentia
           nightclub: Club nocturne
           nursing_home: Casa de convalescentia

-          office: Officio

           parking: Parking
           parking_entrance: Entrata de autoparco
           parking_space: Spatio de parcamento
           parking: Parking
           parking_entrance: Entrata de autoparco
           parking_space: Spatio de parcamento

+          payment_terminal: Terminal de pagamento

           pharmacy: Pharmacia
           place_of_worship: Loco de adoration
           police: Policia
           post_box: Cassa postal
           post_office: Officio postal
           pharmacy: Pharmacia
           place_of_worship: Loco de adoration
           police: Policia
           post_box: Cassa postal
           post_office: Officio postal

-          preschool: Pre-schola

           prison: Prision
           pub: Taverna
           prison: Prision
           pub: Taverna

+          public_bath: Banio public
+          public_bookcase: Bibliotheca de strata

           public_building: Edificio public
           public_building: Edificio public

+          ranger_station: Posto de guarda forestal

           recycling: Puncto de recyclage
           restaurant: Restaurante
           recycling: Puncto de recyclage
           restaurant: Restaurante

-          retirement_home: Residentia pro vetere personas
-          sauna: Sauna
+          sanitary_dump_station: Station de discarga sanitari

           school: Schola
           shelter: Refugio
           school: Schola
           shelter: Refugio

-          shop: Boteca

           shower: Ducha
           social_centre: Centro social
           shower: Ducha
           social_centre: Centro social

-          social_club: Club social

           social_facility: Servicio social
           studio: Appartamento de un camera
           swimming_pool: Piscina
           social_facility: Servicio social
           studio: Appartamento de un camera
           swimming_pool: Piscina


@@ -491,59 +638,145 @@ ia:
           theatre: Theatro
           toilets: Toilettes
           townhall: Casa municipal
           theatre: Theatro
           toilets: Toilettes
           townhall: Casa municipal

+          training: Centro de training

           university: Universitate
           university: Universitate

+          vehicle_inspection: Inspection de vehiculos

           vending_machine: Distributor automatic
           veterinary: Clinica veterinari
           village_hall: Casa communal
           waste_basket: Corbe a papiro
           waste_disposal: Tractamento de immunditias
           vending_machine: Distributor automatic
           veterinary: Clinica veterinari
           village_hall: Casa communal
           waste_basket: Corbe a papiro
           waste_disposal: Tractamento de immunditias

+          waste_dump_site: Sito de discarga de immunditias
+          watering_place: Abiberatorio

           water_point: Puncto de aqua
           water_point: Puncto de aqua

-          youth_centre: Centro pro le juventute
+          weighbridge: Ponte bascula
+          "yes": Facilitate

         boundary:
         boundary:

+          aboriginal_lands: Territorios aborigine

           administrative: Limite administrative
           census: Limite de censo
           national_park: Parco national
           administrative: Limite administrative
           census: Limite de censo
           national_park: Parco national

+          political: Circumscription electoral

           protected_area: Area protegite
           protected_area: Area protegite

+          "yes": Frontiera

         bridge:
           aqueduct: Aqueducto
         bridge:
           aqueduct: Aqueducto

+          boardwalk: Passarella

           suspension: Ponte suspendite
           swing: Ponte giratori
           viaduct: Viaducto
           "yes": Ponte
         building:
           suspension: Ponte suspendite
           swing: Ponte giratori
           viaduct: Viaducto
           "yes": Ponte
         building:

+          apartment: Appartamento
+          apartments: Appartamentos
+          barn: Granario
+          bungalow: Bungalow
+          cabin: Cabana de ligno
+          chapel: Cappella
+          church: Edificio de ecclesia
+          civic: Edificio civic
+          college: Edificio de academia
+          commercial: Edificio commercial
+          construction: Edificio in construction
+          detached: Casa individual
+          dormitory: Dormitorio
+          duplex: Casa duple
+          farm: Casa de ferma
+          farm_auxiliary: Casa auxiliar de ferma
+          garage: Garage
+          garages: Garages
+          greenhouse: Estufa
+          hangar: Hangar
+          hospital: Edificio hospitalari
+          hotel: Edificio de hotel
+          house: Casa
+          houseboat: Casa flottante
+          hut: Cabana
+          industrial: Edificio industrial
+          kindergarten: Edificio de schola infantil
+          manufacture: Edificio de fabrica
+          office: Edificio de officio
+          public: Edificio public
+          residential: Edificio residential
+          retail: Magazin
+          roof: Tecto
+          ruins: Edificio in ruina
+          school: Edificio de schola
+          semidetached_house: Casa geminate
+          service: Edificio de servicio
+          shed: Remissa
+          stable: Stabulo
+          static_caravan: Caravana
+          temple: Edificio de templo
+          terrace: Casas in serie
+          train_station: Edificio de station ferroviari
+          university: Edificio de universitate
+          warehouse: Deposito

           "yes": Edificio
           "yes": Edificio

+        club:
+          scout: Base de gruppo de scout
+          sport: Club de sport
+          "yes": Club

         craft:
         craft:

+          beekeper: Apicultor
+          blacksmith: Ferrero

           brewery: Fabrica de bira
           carpenter: Carpentero
           brewery: Fabrica de bira
           carpenter: Carpentero

+          caterer: Catering
+          confectionery: Confecteria
+          dressmaker: Modista

           electrician: Electricista
           electrician: Electricista

+          electronics_repair: Reparation de electronica

           gardener: Jardinero
           gardener: Jardinero

+          glaziery: Vitreria
+          handicraft: Artisanato
+          hvac: Fabricante de climatisation
+          metal_construction: Constructor in metallo

           painter: Pictor
           photographer: Photographo
           plumber: Plumbero
           painter: Pictor
           photographer: Photographo
           plumber: Plumbero

+          roofer: Copertor de tectos
+          sawmill: Serreria

           shoemaker: Scarpero
           shoemaker: Scarpero

+          stonemason: Taliator de petras

           tailor: Sartor
           tailor: Sartor

+          window_construction: Construction de fenestras
+          winery: Vinia

           "yes": Boteca de artisanato
         emergency:
           "yes": Boteca de artisanato
         emergency:

+          access_point: Puncto de accesso

           ambulance_station: Station de ambulantias
           ambulance_station: Station de ambulantias

+          assembly_point: Puncto de incontro

           defibrillator: Defibrillator
           defibrillator: Defibrillator

+          fire_xtinguisher: Extinctor de incendios
+          fire_water_pond: Bassino de aqua contra incendios

           landing_site: Loco de atterrage de emergentia
           landing_site: Loco de atterrage de emergentia

+          life_ring: Boia de salvamento

           phone: Telephono de emergentia
           phone: Telephono de emergentia

+          siren: Sirena de emergentia
+          suction_point: Puncto de suction 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
           cycleway: Pista cyclabile
           elevator: Ascensor
           emergency_access_point: Puncto de accesso de emergentia

+          emergency_bay: Rampa de emergentia

           footway: Sentiero pro pedones
           ford: Vado
           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


@@ -560,46 +793,59 @@ 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
           track: Pista
           street_lamp: Lanterna de strata
           tertiary: Via tertiari
           tertiary_link: Via tertiari
           track: Pista

+          traffic_mirror: Speculo de traffico

           traffic_signals: Lumines de traffico
           traffic_signals: Lumines de traffico

-          trail: Pista
+          trailhead: Initio de sentiero

           trunk: Via national
           trunk_link: Via national
           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:

+          aircraft: Avion historic

           archaeological_site: Sito archeologic
           archaeological_site: Sito archeologic

+          bomb_crater: Crater de bomba historic

           battlefield: Campo de battalia
           boundary_stone: Lapide de frontiera
           building: Edificio historic
           bunker: Bunker
           battlefield: Campo de battalia
           boundary_stone: Lapide de frontiera
           building: Edificio historic
           bunker: Bunker

+          cannon: Cannon historic

           castle: Castello
           castle: Castello

+          charcoal_pile: Pila de carbon historic

           church: Ecclesia
           city_gate: Porta de citate
           citywalls: Muro del citate
           fort: Forte
           heritage: Sito de patrimonio
           church: Ecclesia
           city_gate: Porta de citate
           citywalls: Muro del citate
           fort: Forte
           heritage: Sito de patrimonio

+          hollow_way: Cammino cave

           house: Casa
           house: Casa

-          icon: Icone

           manor: Casa seniorial
           memorial: Memorial
           manor: Casa seniorial
           memorial: Memorial

+          milestone: Petra milliari historic

           mine: Mina
           mine: Mina

+          mine_shaft: Puteo de mina

           monument: Monumento
           monument: Monumento

+          railway: Ferrovia historic

           roman_road: Via roman
           ruins: Ruinas
           stone: Petra
           tomb: Tumba
           tower: Turre
           roman_road: Via roman
           ruins: Ruinas
           stone: Petra
           tomb: Tumba
           tower: Turre

+          wayside_chapel: Cappella al bordo del cammino

           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:
           allotments: Jardines familial
         junction:
           "yes": Intersection
         landuse:
           allotments: Jardines familial

+          aquaculture: Aquacultura

           basin: Bassino
           brownfield: Terreno industrial subutilisate
           cemetery: Cemeterio
           basin: Bassino
           brownfield: Terreno industrial subutilisate
           cemetery: Cemeterio


@@ -626,7 +872,6 @@ ia:
           reservoir_watershed: Bassino interfluvial
           residential: Area residential
           retail: Magazines
           reservoir_watershed: Bassino interfluvial
           residential: Area residential
           retail: Magazines

-          road: Area de cammino

           village_green: Parco de village
           vineyard: Vinia
           "yes": Uso de terreno
           village_green: Parco de village
           vineyard: Vinia
           "yes": Uso de terreno


@@ -635,6 +880,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


@@ -659,10 +905,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:


@@ -678,6 +953,7 @@ ia:
           cape: Capo
           cave_entrance: Entrata de caverna
           cliff: Precipitio
           cape: Capo
           cave_entrance: Entrata de caverna
           cliff: Precipitio

+          coastline: Litoral

           crater: Crater
           dune: Duna
           fell: Montania
           crater: Crater
           dune: Duna
           fell: Montania


@@ -717,10 +993,12 @@ ia:
           architect: Architecto
           association: Association
           company: Compania
           architect: Architecto
           association: Association
           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


@@ -729,6 +1007,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


@@ -742,6 +1021,7 @@ ia:
           municipality: Municipalitate
           neighbourhood: Quartiero
           postcode: Codice postal
           municipality: Municipalitate
           neighbourhood: Quartiero
           postcode: Codice postal

+          quarter: Quartiero

           region: Region
           sea: Mar
           square: Placia
           region: Region
           sea: Mar
           square: Placia


@@ -749,7 +1029,6 @@ ia:
           subdivision: Subdivision
           suburb: Suburbio
           town: Urbe
           subdivision: Subdivision
           suburb: Suburbio
           town: Urbe

-          unincorporated_area: Area sin municipalitate

           village: Village
           "yes": Loco
         railway:
           village: Village
           "yes": Loco
         railway:


@@ -775,6 +1054,7 @@ ia:
           switch: Agulia
           tram: Tramvia
           tram_stop: Halto de tram
           switch: Agulia
           tram: Tramvia
           tram_stop: Halto de tram

+          yard: Station de manovras

         shop:
           alcohol: Magazin de bibitas alcoholic
           antiques: Antiquitates
         shop:
           alcohol: Magazin de bibitas alcoholic
           antiques: Antiquitates


@@ -783,6 +1063,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


@@ -807,12 +1088,10 @@ ia:
           estate_agent: Agentia immobiliari
           farm: Magazin agricole
           fashion: Boteca de moda
           estate_agent: Agentia immobiliari
           farm: Magazin agricole
           fashion: Boteca de moda

-          fish: Pischeria

           florist: Florista
           food: Magazin de alimentation
           funeral_directors: Directores de pompas funebre
           furniture: Magazin de mobiles
           florist: Florista
           food: Magazin de alimentation
           funeral_directors: Directores de pompas funebre
           furniture: Magazin de mobiles

-          gallery: Galeria

           garden_centre: Jardineria
           general: Magazin general
           gift: Boteca de donos
           garden_centre: Jardineria
           general: Magazin general
           gift: Boteca de donos


@@ -821,11 +1100,15 @@ 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
           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


@@ -833,17 +1116,24 @@ 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
           pet: Boteca de animales

-          pharmacy: Pharmacia

           photo: Magazin de photographia
           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
           video: Magazin de video
           wine: Magazin de vinos
           "yes": Boteca


@@ -869,6 +1159,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:


@@ -898,11 +1189,6 @@ ia:
         level8: Limite de citate
         level9: Limite de village
         level10: Limite de suburbio
         level8: Limite de citate
         level9: Limite de village
         level10: Limite de suburbio

-    description:
-      title:
-        osm_nominatim: Loco de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Position de <a href="http://www.geonames.org/">GeoNames</a>

       types:
         cities: Citates
         towns: Villages
       types:
         cities: Citates
         towns: Villages


@@ -925,9 +1211,8 @@ ia:
       status: Stato
       reports: Reportos
       last_updated: Ultime actualisation
       status: Stato
       reports: Reportos
       last_updated: Ultime actualisation

-      last_updated_time_html: <abbr title='%{title}'>%{time} retro</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time} retro</abbr> per
-        %{user}
+      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
       link_to_reports: Vider reportos
       reports_count:
         one: 1 reporto


@@ -966,10 +1251,54 @@ ia:
     reopen:
       reopened: Le stato del problema ha essite cambiate a 'Aperte'
     comments:
     reopen:
       reopened: Le stato del problema ha essite cambiate a 'Aperte'
     comments:

-      created_at: Le %{datetime}
+      comment_from_html: Commento de %{user_link} del %{comment_created_at}

       reassign_param: Reassignar problema?
     reports:
       reassign_param: Reassignar problema?
     reports:

-      updated_at: Le %{datetime}
+      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
+      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


@@ -983,6 +1312,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


@@ -995,9 +1325,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


@@ -1016,42 +1349,45 @@ ia:
       text: Facer un donation
     learn_more: Leger plus
     more: Plus
       text: Facer un donation
     learn_more: Leger plus
     more: Plus

-  notifier:
+  user_mailer:

     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commentava un entrata de diario'
       hi: Salute %{to_user},
       header: '%{from_user} ha commentate le entrata recente de diario OpenStreetMap
         con le subjecto %{subject}:'
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commentava un entrata de diario'
       hi: Salute %{to_user},
       header: '%{from_user} ha commentate le entrata recente de diario OpenStreetMap
         con le subjecto %{subject}:'

-      footer: Tu pote tamben leger le commento a %{readurl} e tu pote commentar a
-        %{commenturl} o responder a %{replyurl}
+      header_html: '%{from_user} ha commentate le entrata de diario OpenStreetMap
+        con le subjecto %{subject}:'
+      footer: Tu pote etiam leger le commento a %{readurl} e tu pote commentar a %{commenturl}
+        o inviar un message al autor a %{replyurl}
+      footer_html: Tu pote etiam leger le commento sur %{readurl} e tu pote commentar
+        sur %{commenturl} o inviar un message al autor sur %{replyurl}

     message_notification:
     message_notification:

+      subject: '[OpenStreetMap] %{message_title}'

       hi: Salute %{to_user},
       header: '%{from_user} te ha inviate un message per OpenStreetMap con le subjecto
         %{subject}:'
       hi: Salute %{to_user},
       header: '%{from_user} te ha inviate un message per OpenStreetMap con le subjecto
         %{subject}:'

-      footer_html: Tu pote anque leger le message a %{readurl} e tu pote responder
-        a %{replyurl}
-    friend_notification:
+      header_html: '%{from_user} te ha inviate un message per OpenStreetMap con le
+        subjecto %{subject}:'
+      footer: Tu pote etiam leger le message sur %{readurl} e tu pote inviar un message
+        al autor sur %{replyurl}
+      footer_html: Tu pote etiam leger le message a %{readurl} e tu pote inviar un
+        message al autor a %{replyurl}
+    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.'
       see_their_profile: Tu pote vider su profilo a %{userurl}.
       befriend_them: Tu pote equalmente adder le/la como amico a %{befriendurl}.
       hi: Salute %{to_user},
       subject: '[OpenStreetMap] %{user} te ha addite como amico'
       had_added_you: '%{user} te ha addite como amico in OpenStreetMap.'
       see_their_profile: Tu pote vider su profilo a %{userurl}.
       befriend_them: Tu pote equalmente adder le/la como amico a %{befriendurl}.

-    gpx_notification:
-      greeting: Salute,
-      your_gpx_file: Il pare que tu file GPX
-      with_description: con le description
-      and_the_tags: 'e le sequente etiquettas:'
-      and_no_tags: e sin etiquettas.
-      failure:
-        subject: '[OpenStreetMap] Importation GPX fallite'
-        failed_to_import: 'ha fallite de importar. Ecce le error:'
-        more_info_1: Plus informationes super le fallimentos de importation GPX e
-          como evitar los
-        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.
+    gpx_failure:
+      failed_to_import: 'ha fallite de importar. Ecce le error:'
+      subject: '[OpenStreetMap] Importation GPX fallite'
+    gpx_success:
+      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.
+      subject: '[OpenStreetMap] Importation GPX succedite'

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


@@ -1063,32 +1399,18 @@ ia:
         supplementari pro adjutar te a comenciar.
     email_confirm:
       subject: '[OpenStreetMap] Confirma tu adresse de e-mail'
         supplementari pro adjutar te a comenciar.
     email_confirm:
       subject: '[OpenStreetMap] Confirma tu adresse de e-mail'

-    email_confirm_plain:

       greeting: Salute,
       hopefully_you: Alcuno (probabilemente tu) vole cambiar su adresse de e-mail
         in %{server_url} a %{new_address}.
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
         confirmar le alteration.
       greeting: Salute,
       hopefully_you: Alcuno (probabilemente tu) vole cambiar su adresse de e-mail
         in %{server_url} a %{new_address}.
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
         confirmar le alteration.

-    email_confirm_html:
-      greeting: Salute,
-      hopefully_you: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail
-        in %{server_url} a %{new_address}.
-      click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
-        confirmar le alteration.

     lost_password:
       subject: '[OpenStreetMap] Requesta de reinitialisation del contrasigno'
     lost_password:
       subject: '[OpenStreetMap] Requesta de reinitialisation del contrasigno'

-    lost_password_plain:

       greeting: Salute,
       hopefully_you: Alcuno (probabilemente tu) ha demandate que le contrasigno del
         conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate.
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
         reinitialisar tu contrasigno.
       greeting: Salute,
       hopefully_you: Alcuno (probabilemente tu) ha demandate que le contrasigno del
         conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate.
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
         reinitialisar tu contrasigno.

-    lost_password_html:
-      greeting: Salute,
-      hopefully_you: Alcuno (possibilemente tu) ha demandate que le contrasigno del
-        conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate.
-      click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
-        reinitialisar tu contrasigno.

     note_comment_notification:
       anonymous: Un usator anonyme
       greeting: Salute,
     note_comment_notification:
       anonymous: Un usator anonyme
       greeting: Salute,


@@ -1123,21 +1445,49 @@ 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
         %{url}.
       unsubscribe: Pro disabonar te del actualisationes de iste gruppo de modificationes,
         visita %{url} e clicca sur "Disabonar".
         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
         %{url}.
       unsubscribe: Pro disabonar te del actualisationes de iste gruppo de modificationes,
         visita %{url} e clicca sur "Disabonar".

+  confirmations:
+    confirm:
+      heading: Verifica tu e-mail!
+      introduction_1: Nos te ha inviate un message de confirmation.
+      introduction_2: Confirma tu conto con un clic sur le ligamine in le message
+        e tu potera comenciar a cartographiar.
+      press confirm button: Preme le button de confirmation ci infra pro activar tu
+        conto.
+      button: Confirmar
+      success: Tu conto ha essite confirmate, gratias pro inscriber te!
+      already active: Iste conto ha ja essite confirmate.
+      unknown token: Iste codice de confirmation ha expirate o non existe.
+      reconfirm_html: Pro reciper un altere message de confirmation, <a href="%{reconfirm}">clicca
+        hic</a>.
+    confirm_resend:
+      success_html: Nos ha inviate un nove message de confirmation a %{email} e si
+        tosto que tu confirma le conto, tu potera comenciar a cartographar.<br /><br
+        />Si tu usa un systema anti-spam que invia requestas de confirmation, alora
+        per favor assecura te de adder %{sender} al lista blanc, alteremente nos non
+        pote responder a requestas de confirmation.
+      failure: Usator %{name} non trovate.
+    confirm_email:
+      heading: Confirmar un cambio de adresse de e-mail
+      press confirm button: Preme le button Confirmar ci infra pro confirmar tu nove
+        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 token.
+      unknown_token: Iste codice de confirmation ha expirate o non existe.

   messages:
     inbox:
       title: Cassa de entrata
       my_inbox: Mi cassa de entrata
   messages:
     inbox:
       title: Cassa de entrata
       my_inbox: Mi cassa de entrata

-      outbox: cassa de exito

       messages: Tu ha %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} nove message'
       messages: Tu ha %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} nove message'


@@ -1148,7 +1498,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


@@ -1157,10 +1508,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


@@ -1172,16 +1522,13 @@ 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}
-      inbox: cassa de entrata
-      outbox: cassa de exito

       messages:
         one: Tu ha %{count} message inviate
         other: Tu ha %{count} messages inviate
       to: A
       subject: Subjecto
       date: Data
       messages:
         one: Tu ha %{count} message inviate
         other: Tu ha %{count} messages inviate
       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:


@@ -1208,11 +1555,87 @@ ia:
       as_unread: Message marcate como non legite
     destroy:
       destroyed: Message delite
       as_unread: Message marcate como non legite
     destroy:
       destroyed: Message delite

+  passwords:
+    lost_password:
+      title: Contrasigno perdite
+      heading: Contrasigno oblidate?
+      email address: 'Adresse de e-mail:'
+      new password button: Reinitialisar contrasigno
+      help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
+        inviara un ligamine a iste adresse que tu pote usar pro reinitialisar tu contrasigno.
+      notice email on way: Es infortunate que tu lo perdeva :-( ma un e-mail es in
+        via que te permittera de reinitalisar lo tosto.
+      notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.
+    reset_password:
+      title: Reinitialisar contrasigno
+      heading: Reinitialisar le contrasigno de %{user}
+      reset: Reinitialisar contrasigno
+      flash changed: Tu contrasigno ha essite cambiate.
+      flash token bad: Token non trovate. Verifica le URL.
+  sessions:
+    new:
+      title: Aperir session
+      heading: Aperir session
+      email or username: 'Adresse de e-mail o nomine de usator:'
+      password: 'Contrasigno:'
+      openid_html: 'OpenID de %{logo}:'
+      remember: 'Memorar me:'
+      lost password link: Contrasigno perdite?
+      login_button: Aperir session
+      register now: Registrar ora
+      with username: 'Ha tu jam un conto de OpenStreetMap? Per favor aperi session
+        con tu nomine de usator e contrasigno:'
+      with external: 'Alternativemente, usa un tertio pro aperir session:'
+      new to osm: Nove a OpenStreetMap?
+      to make changes: Pro facer modificationes in le datos de OpenStreetMap, es necessari
+        haber un conto.
+      create account minute: Crea un conto. Isto dura solmente un minuta.
+      no account: Non ha un conto?
+      account not active: Pardono, tu conto non es ancora active.<br />Per favor clicca
+        super le ligamine in le e-mail de confirmation pro activar tu conto, o <a
+        href="%{reconfirm}">requesta un nove message de confirmation.</a>.
+      account is suspended: Le tue conto ha essite suspendite a causa de activitate
+        suspecte.<br />Per favor contacta le <a href="%{webmaster}">webmaster</a>
+        si tu vole discuter isto.
+      auth failure: Pardono, non poteva aperir un session con iste detalios.
+      openid_logo_alt: Aperir session con OpenID
+      auth_providers:
+        openid:
+          title: Aperir session con OpenID
+          alt: Aperir session con un URL de OpenID
+        google:
+          title: Aperir session con Google
+          alt: Aperir session con un OpenID de Google
+        facebook:
+          title: Aperir session con Facebook
+          alt: Aperir session con un conto de Facebook
+        windowslive:
+          title: Aperir session con Windows Live
+          alt: Aperir session con un conto de Windows Live
+        github:
+          title: Aperir session con GitHub
+          alt: Aperir session con un conto de GitHub
+        wikipedia:
+          title: Aperir session con Wikipedia
+          alt: Aperir session con un conto de Wikipedia
+        yahoo:
+          title: Aperir session con Yahoo
+          alt: Aperir session con un OpenID de Yahoo
+        wordpress:
+          title: Aperir session con WordPress
+          alt: Aperir session con un OpenID de WordPress
+        aol:
+          title: Aperir session con AOL
+          alt: Aperir session con un OpenID de AOL
+    destroy:
+      title: Clauder session
+      heading: Clauder le session de OpenStreetMap
+      logout_button: Clauder session

   site:
     about:
       next: Sequente
       copyright_html: <span>&copy;</span>Contributores de<br>OpenStreetMap
   site:
     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


@@ -1235,24 +1658,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


@@ -1264,33 +1690,29 @@ 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
-          Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
+        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: 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 2.0).

         credit_title_html: Como dar recognoscentia a OpenStreetMap
         credit_1_html: |-
           Nos require que vos usa le recognoscentia &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
         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>.
-          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_2_1_html: |-
+          Vos debe etiam indicar clarmente que le datos es disponibile sub Open Database License. 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;) e a opendatacommons.org.
+        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>


@@ -1299,38 +1721,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_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
         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 href="https://creativecommons.org/licenses/by/4.0/">CC BY
-          4.0</a>.'
+          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:


@@ -1338,7 +1766,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


@@ -1361,8 +1789,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.


@@ -1376,21 +1804,10 @@ 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="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.)
-      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
       no_iframe_support: Tu navigator non supporta le iframes in HTML, necessari pro
         iste functionalitate.
       id_not_configured: iD non ha essite configurate
       no_iframe_support: Tu navigator non supporta le iframes in HTML, necessari pro
         iste functionalitate.


@@ -1403,7 +1820,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


@@ -1468,16 +1885,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


@@ -1491,12 +1909,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


@@ -1509,6 +1932,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:


@@ -1579,23 +2003,6 @@ ia:
           bicycle_shop: Magazin de bicyclettas
           bicycle_parking: Parcamento de bicyclettas
           toilets: Toilettes
           bicycle_shop: Magazin de bicyclettas
           bicycle_parking: Parcamento de bicyclettas
           toilets: Toilettes

-    richtext_area:
-      edit: Modificar
-      preview: Previsualisation
-    markdown_help:
-      title_html: Processate con <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: Titulos
-      heading: Titulo
-      subheading: Subtitulo
-      unordered: Lista non ordinate
-      ordered: Lista ordinate
-      first: Prime elemento
-      second: Secunde elemento
-      link: Ligamine
-      text: Texto
-      image: Imagine
-      alt: Texto alternative
-      url: URL

     welcome:
       title: Benvenite!
       introduction_html: Bevenite a OpenStreetMap, le carta libere e modificabile
     welcome:
       title: Benvenite!
       introduction_html: Bevenite a OpenStreetMap, le carta libere e modificabile


@@ -1654,19 +2061,16 @@ 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_gpx: 'Incargar file GPX:'
-      description: 'Description:'
-      tags: 'Etiquettas:'
-      tags_help: separate per commas
-      visibility: 'Visibilitate:'
+      upload_trace: Incargar tracia GPS

       visibility_help: que significa isto?
       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


@@ -1677,20 +2081,9 @@ ia:
     edit:
       title: Modification del tracia %{name}
       heading: Modificar le tracia %{name}
     edit:
       title: Modification del tracia %{name}
       heading: Modificar le tracia %{name}

-      filename: 'Nomine de file:'
-      download: discargar
-      uploaded_at: 'Incargate le:'
-      points: 'Punctos:'
-      start_coord: 'Coordinata initial:'
-      map: carta
-      edit: modificar
-      owner: 'Proprietario:'
-      description: 'Description:'
-      tags: 'Etiquettas:'
-      tags_help: separate per commas
-      save_button: Salveguardar modificationes
-      visibility: 'Visibilitate:'

       visibility_help: que significa isto?
       visibility_help: que significa isto?

+    update:
+      updated: Tracia actualisate

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


@@ -1712,18 +2105,19 @@ 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

-      edit: modificar

       edit_map: Modificar carta
       public: PUBLIC
       identifiable: IDENTIFICABILE
       edit_map: Modificar carta
       public: PUBLIC
       identifiable: IDENTIFICABILE


@@ -1731,9 +2125,9 @@ ia:
       trackable: TRACIABILE
       by: per
       in: in
       trackable: TRACIABILE
       by: per
       in: in

-      map: carta

     index:
       public_traces: Tracias GPS public
     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}'


@@ -1742,7 +2136,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


@@ -1759,9 +2154,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.


@@ -1773,9 +2171,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.


@@ -1787,70 +2185,49 @@ 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
       delete: Deler cliente
       confirm: Es tu secur?
       requests: 'Le sequente permissiones es requestate del usator:'
       authorize_url: 'URL de autorisation:'
       support_notice: Nos supporta le signaturas HMAC-SHA1 (recommendate) e RSA-SHA1.
       edit: Modificar detalios
       delete: Deler cliente
       confirm: Es tu secur?
       requests: 'Le sequente permissiones es requestate del usator:'

-      allow_read_prefs: leger su preferentias de usator.
-      allow_write_prefs: modificar su preferentias de usator.
-      allow_write_diary: crear entratas de diario, commentos e adder amicos.
-      allow_write_api: modificar le carta.
-      allow_read_gpx: leger su tracias GPS private.
-      allow_write_gpx: incargar tracias GPS.
-      allow_write_notes: modificar notas.

     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:

-      name: Nomine
-      required: Requirite
-      url: URl principal del application
-      callback_url: URL de retorno
-      support_url: URl de supporto

       requests: 'Requestar le sequente permissiones del usator:'
       requests: 'Requestar le sequente permissiones del usator:'

-      allow_read_prefs: leger su preferentias de usator.
-      allow_write_prefs: modificar su preferentias de usator.
-      allow_write_diary: crear entratas de diario, commentos e adder amicos.
-      allow_write_api: modificar le carta.
-      allow_read_gpx: leger su tracias GPS private.
-      allow_write_gpx: incargar tracias GPS.
-      allow_write_notes: modificar notas.

     not_found:
       sorry: Pardono, iste %{type} non poteva esser trovate.
     create:
     not_found:
       sorry: Pardono, iste %{type} non poteva esser trovate.
     create:


@@ -1860,87 +2237,11 @@ ia:
     destroy:
       flash: Le registration del application cliente ha essite destruite
   users:
     destroy:
       flash: Le registration del application cliente ha essite destruite
   users:

-    login:
-      title: Aperir session
-      heading: Aperir session
-      email or username: 'Adresse de e-mail o nomine de usator:'
-      password: 'Contrasigno:'
-      openid: 'OpenID de %{logo}:'
-      remember: 'Memorar me:'
-      lost password link: Contrasigno perdite?
-      login_button: Aperir session
-      register now: Registrar ora
-      with username: 'Ha tu jam un conto de OpenStreetMap? Per favor aperi session
-        con tu nomine de usator e contrasigno:'
-      with external: 'Alternativemente, usa un tertio pro aperir session:'
-      new to osm: Nove a OpenStreetMap?
-      to make changes: Pro facer modificationes in le datos de OpenStreetMap, es necessari
-        haber un conto.
-      create account minute: Crea un conto. Isto dura solmente un minuta.
-      no account: Non ha un conto?
-      account not active: Pardono, tu conto non es ancora active.<br />Per favor clicca
-        super le ligamine in le e-mail de confirmation pro activar tu conto, o <a
-        href="%{reconfirm}">requesta un nove message de confirmation.</a>.
-      account is suspended: Le tue conto ha essite suspendite a causa de activitate
-        suspecte.<br />Per favor contacta le <a href="%{webmaster}">webmaster</a>
-        si tu vole discuter isto.
-      auth failure: Pardono, non poteva aperir un session con iste detalios.
-      openid_logo_alt: Aperir session con OpenID
-      auth_providers:
-        openid:
-          title: Aperir session con OpenID
-          alt: Aperir session con un URL de OpenID
-        google:
-          title: Aperir session con Google
-          alt: Aperir session con un OpenID de Google
-        facebook:
-          title: Aperir session con Facebook
-          alt: Aperir session con un conto de Facebook
-        windowslive:
-          title: Aperir session con Windows Live
-          alt: Aperir session con un conto de Windows Live
-        github:
-          title: Aperir session con GitHub
-          alt: Aperir session con un conto de GitHub
-        wikipedia:
-          title: Aperir session con Wikipedia
-          alt: Aperir session con un conto de Wikipedia
-        yahoo:
-          title: Aperir session con Yahoo
-          alt: Aperir session con un OpenID de Yahoo
-        wordpress:
-          title: Aperir session con WordPress
-          alt: Aperir session con un OpenID de WordPress
-        aol:
-          title: Aperir session con AOL
-          alt: Aperir session con un OpenID de AOL
-    logout:
-      title: Clauder session
-      heading: Clauder le session de OpenStreetMap
-      logout_button: Clauder session
-    lost_password:
-      title: Contrasigno perdite
-      heading: Contrasigno oblidate?
-      email address: 'Adresse de e-mail:'
-      new password button: Reinitialisar contrasigno
-      help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
-        inviara un ligamine a iste adresse que tu pote usar pro reinitialisar tu contrasigno.
-      notice email on way: Es infortunate que tu lo perdeva :-( ma un e-mail es in
-        via que te permittera de reinitalisar lo tosto.
-      notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.
-    reset_password:
-      title: Reinitialisar contrasigno
-      heading: Reinitialisar le contrasigno de %{user}
-      password: 'Contrasigno:'
-      confirm password: 'Confirma contrasigno:'
-      reset: Reinitialisar contrasigno
-      flash changed: Tu contrasigno ha essite cambiate.
-      flash token bad: Indicio 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:


@@ -1949,20 +2250,12 @@ ia:
           <p>A differentia de altere cartas, OpenStreetMap es completemente create per gente como tu,
           e cata uno es libere de modificar, actualisar, discargar e usar lo.</p>
           <p>Crea un conto pro comenciar a contribuer. Nos te inviara un e-mail pro confirmar tu conto.</p>
           <p>A differentia de altere cartas, OpenStreetMap es completemente create per gente como tu,
           e cata uno es libere de modificar, actualisar, discargar e usar lo.</p>
           <p>Crea un conto pro comenciar a contribuer. Nos te inviara un e-mail pro confirmar tu conto.</p>

-      license_agreement: Quando tu confirma tu conto, tu debera acceptar le <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">conditiones
-        de contributor</a>.

       email address: 'Adresse de e-mail:'
       confirm email address: 'Confirmar adresse de e-mail:'
       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
-        de confidentialitate de OSMF includente un section sur adresses de e-mail">politica
-        de confidentialitate</a> pro plus information.

       display name: 'Nomine public:'
       display name description: Tu nomine de usator monstrate publicamente. Tu pote
         cambiar lo plus tarde in le preferentias.
       external auth: 'Authentication per tertios:'
       display name: 'Nomine public:'
       display name description: Tu nomine de usator monstrate publicamente. Tu pote
         cambiar lo plus tarde in le preferentias.
       external auth: 'Authentication per tertios:'

-      password: 'Contrasigno:'
-      confirm password: 'Confirmar contrasigno:'

       use external auth: Alternativemente, usa un tertio pro aperir session
       auth no password: Con authentication per tertio, un contrasigno non es necessari,
         ma alcun instrumentos o servitores supplementari pote totevia necessitar un.
       use external auth: Alternativemente, usa un tertio pro aperir session
       auth no password: Con authentication per tertio, un contrasigno non es necessari,
         ma alcun instrumentos o servitores supplementari pote totevia necessitar un.


@@ -1972,18 +2265,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.


@@ -2019,21 +2319,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


@@ -2063,6 +2362,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


@@ -2070,15 +2370,13 @@ ia:
     account:
       title: Modificar conto
       my settings: Mi configurationes
     account:
       title: Modificar conto
       my settings: Mi configurationes

-      current email address: 'Adresse de e-mail actual:'
-      new email address: 'Adresse de e-mail nove:'
-      email never displayed publicly: (nunquam monstrate publicamente)
-      external auth: 'Authentication externe:'
+      current email address: Adresse de e-mail actual
+      external auth: Authentication externe

       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: que es isto?
       public editing:
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: que es isto?
       public editing:

-        heading: 'Modification public:'
+        heading: Modification public

         enabled: Activate. Non anonyme e pote modificar datos.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: que es isto?
         enabled: Activate. Non anonyme e pote modificar datos.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: que es isto?


@@ -2087,7 +2385,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


@@ -2096,7 +2394,7 @@ ia:
           public.</li><li>Iste action non pote esser revertite e tote le nove usatores
           es ora public per predefinition.</li></ul>
       contributor terms:
           public.</li><li>Iste action non pote esser revertite e tote le nove usatores
           es ora public per predefinition.</li></ul>
       contributor terms:

-        heading: 'Conditiones de contributor:'
+        heading: Conditiones de contributor

         agreed: Tu ha acceptate le nove Conditiones de Contributor.
         not yet agreed: Tu non ha ancora acceptate le nove Conditiones de Contributor.
         review link text: Per favor seque iste ligamine a tu convenientia pro revider
         agreed: Tu ha acceptate le nove Conditiones de Contributor.
         not yet agreed: Tu non ha ancora acceptate le nove Conditiones de Contributor.
         review link text: Per favor seque iste ligamine a tu convenientia pro revider


@@ -2104,13 +2402,9 @@ ia:
         agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
           liberate al Dominio Public.
         link text: que es isto?
         agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
           liberate al Dominio Public.
         link text: que es isto?

-      profile description: 'Description del profilo:'
-      preferred languages: 'Linguas preferite:'
-      preferred editor: 'Editor preferite:'
-      image: 'Imagine:'
+      image: Imagine

       gravatar:
         gravatar: Usar Gravatar
       gravatar:
         gravatar: Usar Gravatar

-        link text: que es isto?

         disabled: Gravatar ha essite disactivate.
         enabled: Tu Gravatar ha essite activate e essera monstrate desde ora.
       new image: Adder un imagine
         disabled: Gravatar ha essite disactivate.
         enabled: Tu Gravatar ha essite activate e essera monstrate desde ora.
       new image: Adder un imagine


@@ -2118,10 +2412,8 @@ ia:
       delete image: Remover le imagine actual
       replace image: Reimplaciar le imagine actual
       image size hint: (imagines quadrate de al minus 100×100 functiona melio)
       delete image: Remover le imagine actual
       replace image: Reimplaciar le imagine actual
       image size hint: (imagines quadrate de al minus 100×100 functiona melio)

-      home location: 'Position de origine:'
+      home location: Position de origine

       no home location: Tu non ha entrate tu position de origine.
       no home location: Tu non ha entrate tu position de origine.

-      latitude: 'Latitude:'
-      longitude: 'Longitude:'

       update home location on click: Actualisar le position de origine quando io clicca
         super le carta?
       save changes button: Salveguardar modificationes
       update home location on click: Actualisar le position de origine quando io clicca
         super le carta?
       save changes button: Salveguardar modificationes


@@ -2130,58 +2422,19 @@ ia:
       flash update success confirm needed: Informationes del usator actualisate con
         successo. Tu recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
       flash update success: Informationes del usator actualisate con successo.
       flash update success confirm needed: Informationes del usator actualisate con
         successo. Tu recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
       flash update success: Informationes del usator actualisate con successo.

-    confirm:
-      heading: Verifica tu e-mail!
-      introduction_1: Nos te ha inviate un message de confirmation.
-      introduction_2: Confirma tu conto con un clic sur le ligamine in le message
-        e tu potera comenciar a cartographiar.
-      press confirm button: Preme le button de confirmation ci infra pro activar tu
-        conto.
-      button: Confirmar
-      success: Tu conto ha essite confirmate, gratias pro inscriber te!
-      already active: Iste conto ha ja essite confirmate.
-      unknown token: Iste codice de confirmation ha expirate o non existe.
-      reconfirm_html: Pro reciper un altere message de confirmation, <a href="%{reconfirm}">clicca
-        hic</a>.
-    confirm_resend:
-      success: Nos ha inviate un nove message de confirmation a %{email} e si tosto
-        que tu confirma le conto, tu potera comenciar a cartographar.<br /><br />Si
-        tu usa un systema anti-spam que invia requestas de confirmation, alora per
-        favor assecura te de adder %{sender} al lista blanc, alteremente nos non pote
-        responder a requestas de confirmation.
-      failure: Usator %{name} non trovate.
-    confirm_email:
-      heading: Confirmar un cambio de adresse de e-mail
-      press confirm button: Preme le button Confirmar ci infra pro confirmar tu nove
-        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.
-      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.
     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


@@ -2189,7 +2442,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.


@@ -2240,30 +2493,18 @@ 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
-        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.
+      heading_html: Crea blocada de %{name}

       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.

-      needs_view: Le usator debe aperir un session ante que iste blocada essera cancellate

       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
-        terminos simple e precise.
+      heading_html: Modification de un blocada super %{name}

       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: Actualisar blocada

       show: Examinar iste blocada
       back: Examinar tote le blocadas
       show: Examinar iste blocada
       back: Examinar tote le blocadas

-      needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?

     filter:
       block_expired: Le blocada ha ja expirate e non pote esser modificate.
       block_period: Le periodo de blocada debe esser un del valores seligibile in
     filter:
       block_expired: Le blocada ha ja expirate e non pote esser modificate.
       block_period: Le periodo de blocada debe esser un del valores seligibile in


@@ -2284,36 +2525,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:
     helper:

-      time_future: Expira in %{time}.
+      time_future_html: Expira in %{time}.

       until_login: Active usque le usator aperi un session.
       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_future_and_until_login_html: Termina in %{time} e post que le usator ha
+        aperite session.
+      time_past_html: 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


@@ -2338,7 +2589,7 @@ ia:
       next: Sequente »
       previous: « Precedente
   notes:
       next: Sequente »
       previous: « Precedente
   notes:

-    mine:
+    index:

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


@@ -2347,7 +2598,6 @@ ia:
       description: Description
       created_at: Create a
       last_changed: Ultime modification
       description: Description
       created_at: Create a
       last_changed: Ultime modification

-      ago_html: '%{when} retro'

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


@@ -2362,7 +2612,6 @@ ia:
       custom_dimensions: Personalisar dimensiones
       format: 'Formato:'
       scale: 'Scala:'
       custom_dimensions: Personalisar dimensiones
       format: 'Formato:'
       scale: 'Scala:'

-      image_size: Le imagine monstrara le strato standard in

       download: Discargar
       short_url: URL curte
       include_marker: Includer marcator
       download: Discargar
       short_url: URL curte
       include_marker: Includer marcator


@@ -2382,7 +2631,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


@@ -2397,6 +2651,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


@@ -2418,6 +2679,9 @@ ia:
         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.
         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.

+        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


@@ -2432,7 +2696,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)


@@ -2445,8 +2711,23 @@ ia:
       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}


@@ -2455,8 +2736,23 @@ 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}
         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}


@@ -2471,6 +2767,8 @@ ia:
         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}
         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}
         exit_counts:
         unnamed: cammino sin nomine
         courtesy: Itinerario fornite per %{link}
         exit_counts:


@@ -2501,34 +2799,35 @@ ia:
       centre_map: Centrar le carta hic
   redactions:
     edit:
       centre_map: Centrar le carta hic
   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:
     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})

 ...
 ...