Use unobtrusive JS for routing related events

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 81fd00281366b0b44fbc0f2fd2ea9321b9821c25..aac456427485bcbd586026791944853f29b53e67 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1,12 +1,13 @@
-# Messages for Interlingua (Interlingua)
+# Messages for Interlingua (interlingua)

 # Exported from translatewiki.net
 # Exported from translatewiki.net

-# Export driver: syck
+# Export driver: syck-pecl

 # Author: McDutchie
 # Author: McDutchie

+# Author: Nemo bis

 ia: 
   activerecord: 
     attributes: 
       diary_comment: 
 ia: 
   activerecord: 
     attributes: 
       diary_comment: 

-        body: Corpore
+        body: Texto

       diary_entry: 
         language: Lingua
         latitude: Latitude
       diary_entry: 
         language: Lingua
         latitude: Latitude


@@ -17,7 +18,7 @@ ia:
         friend: Amico
         user: Usator
       message: 
         friend: Amico
         user: Usator
       message: 

-        body: Corpore
+        body: Texto

         recipient: Destinatario
         sender: Expeditor
         title: Titulo
         recipient: Destinatario
         sender: Expeditor
         title: Titulo


@@ -74,183 +75,71 @@ ia:
   application: 
     require_cookies: 
       cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies in tu navigator ante de continuar.
   application: 
     require_cookies: 
       cookies_needed: Tu pare haber disactivate le cookies. Per favor activa le cookies in tu navigator ante de continuar.

+    require_moderator: 
+      not_a_moderator: Tu debe esser moderator pro executar iste action.

     setup_user_auth: 
       blocked: Tu accesso al API ha essite blocate. Per favor aperi un session al interfacie web pro plus informationes.
     setup_user_auth: 
       blocked: Tu accesso al API ha essite blocate. Per favor aperi un session al interfacie web pro plus informationes.

+      need_to_see_terms: Vostre accesso al API ha essite temporarimente suspendite. Per favor aperi session in le interfacie web pro vider le Conditiones de contributor. Non es necessari declarar se de accordo, ma es obligatori haber legite los.

   browse: 
     changeset: 
   browse: 
     changeset: 

-      changeset: "Gruppo de modificationes: {{id}}"

       changesetxml: XML del gruppo de modificationes
       changesetxml: XML del gruppo de modificationes

-      download: Discargar {{changeset_xml_link}} o {{osmchange_xml_link}}

       feed: 
       feed: 

-        title: Gruppo de modificationes {{id}}
-        title_comment: Gruppo de modificationes {{id}} - {{comment}}
+        title: Gruppo de modificationes %{id}
+        title_comment: Gruppo de modificationes %{id} - %{comment}

       osmchangexml: XML osmChange
       title: Gruppo de modificationes
       osmchangexml: XML osmChange
       title: Gruppo de modificationes

-    changeset_details: 
-      belongs_to: "Pertine a:"
-      bounding_box: "Quadro de delimitation:"
-      box: quadro
-      closed_at: "Claudite le:"
-      created_at: "Create le:"
-      has_nodes: 
-        one: "Ha le sequente {{count}} nodo:"
-        other: "Ha le sequente {{count}} nodos:"
-      has_relations: 
-        one: "Ha le sequente {{count}} relation:"
-        other: "Ha le sequente {{count}} relationes:"
-      has_ways: 
-        one: "Ha le sequente {{count}} via:"
-        other: "Ha le sequente {{count}} vias:"
-      no_bounding_box: Nulle quadro de delimitation ha essite memorisate pro iste gruppo de modificationes.
-      show_area_box: Monstrar quadro del area
-    changeset_navigation: 
-      all: 
-        next_tooltip: Gruppo de modificationes sequente
-        prev_tooltip: Gruppo de modificationes precedente
-      user: 
-        name_tooltip: Vider modifications per {{user}}
-        next_tooltip: Modification sequente per {{user}}
-        prev_tooltip: Modification precedente per {{user}}
-    common_details: 
-      changeset_comment: "Commento:"
-      edited_at: "Modificate le:"
-      edited_by: "Modificate per:"
-      in_changeset: "In le gruppo de modificationes:"
-      version: "Version:"

     containing_relation: 
     containing_relation: 

-      entry: Relation {{relation_name}}
-      entry_role: Relation {{relation_name}} (como {{relation_role}})
-    map: 
-      deleted: Delite
-      larger: 
-        area: Vider le area in un carta plus grande
-        node: Vider le nodo in un carta plus grande
-        relation: Vider le relation in un carta plus grande
-        way: Vider le via in un carta plus grande
-      loading: Cargamento...
-    node: 
-      download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
-      download_xml: Discargar XML
-      edit: modificar
-      node: Nodo
-      node_title: "Nodo: {{node_name}}"
-      view_history: vider historia
-    node_details: 
-      coordinates: "Coordinatas:"
-      part_of: "Parte de:"
-    node_history: 
-      download: "{{download_xml_link}} o {{view_details_link}}"
-      download_xml: Discargar XML
-      node_history: Historia del nodo
-      node_history_title: "Historia del nodo: {{node_name}}"
-      view_details: vider detalios
+      entry: Relation %{relation_name}
+      entry_role: Relation %{relation_name} (como %{relation_role})

     not_found: 
     not_found: 

-      sorry: Pardono, le {{type}} con le ID {{id}} non ha essite trovate.
+      sorry: Pardono, le %{type} con le ID %{id} non ha essite trovate.

       type: 
         changeset: gruppo de modificationes
         node: nodo
         relation: relation
         way: via
       type: 
         changeset: gruppo de modificationes
         node: nodo
         relation: relation
         way: via

-    paging_nav: 
-      of: de
-      showing_page: Monstrante pagina
-    relation: 
-      download: "{{download_xml_link}} o {{view_history_link}}"
-      download_xml: Discargar XML
-      relation: Relation
-      relation_title: "Relation: {{relation_name}}"
-      view_history: vider historia
-    relation_details: 
-      members: "Membros:"
-      part_of: "Parte de:"
-    relation_history: 
-      download: "{{download_xml_link}} o {{view_details_link}}"
-      download_xml: Discargar XML
-      relation_history: Historia del relation
-      relation_history_title: "Historia del relation: {{relation_name}}"
-      view_details: vider detalios
+    note: 
+      closed_title: "Nota resolvite: %{note_name}"
+      open_title: "Nota non resolvite: %{note_name}"
+      title: Nota
+    redacted: 
+      message_html: Le version %{version} de iste %{type} non pote esser monstrate perque illo ha essite obscurate. Vide %{redaction_link} pro detalios.
+      redaction: Obscuration %{id}
+      type: 
+        node: nodo
+        relation: relation
+        way: via

     relation_member: 
     relation_member: 

-      entry_role: "{{type}} {{name}} como {{role}}"
+      entry_role: "%{type} %{name} como %{role}"

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

-    start: 
-      manually_select: Seliger manualmente un altere area
-      view_data: Vider datos pro le vista actual del carta

     start_rjs: 
     start_rjs: 

-      data_frame_title: Datos
-      data_layer_name: Datos
-      details: Detalios
-      drag_a_box: Designa un quadro super le carta pro seliger un area
-      edited_by_user_at_timestamp: Modificate per [[user]] le [[timestamp]]
-      history_for_feature: Historia de [[feature]]

       load_data: Cargar datos
       load_data: Cargar datos

-      loaded_an_area_with_num_features: Tu ha cargate un area que contine [[num_features]] elementos. In general, alcun navigatores del web pote haber problemas de presentar un tal quantitate de datos. Generalmente, un navigator functiona melio monstrante minus de 100 elementos a un vice; alteremente, illo pote devenir lente o non responder. Si tu es secur de voler visualisar iste datos, tu pote cliccar super le button ci infra.

       loading: Cargamento...
       loading: Cargamento...

-      manually_select: Seliger manualmente un altere area
-      object_list: 
-        api: Obtener iste area per medio del API
-        back: Monstrar lista de objectos
-        details: Detalios
-        heading: Lista de objectos
-        history: 
-          type: 
-            node: Nodo [[id]]
-            way: Via [[id]]
-        selected: 
-          type: 
-            node: Nodo [[id]]
-            way: Via [[id]]
-        type: 
-          node: Nodo
-          way: Via
-      private_user: usator private
-      show_history: Monstrar historia
-      unable_to_load_size: "Impossibile cargar: Le dimension del quadro de delimitation [[bbox_size]] es troppo grande (debe esser inferior a {{max_bbox_size}})"
-      wait: Un momento...
-      zoom_or_select: Face zoom avante o selige un area del carta a visualisar

     tag_details: 
       tags: "Etiquettas:"
     tag_details: 
       tags: "Etiquettas:"

+      wiki_link: 
+        key: Le pagina wiki que describe le etiquetta %{key}
+        tag: Le pagina wiki que describe le etiquetta %{key}=%{value}
+      wikipedia_link: Le articulo %{page} in Wikipedia

     timeout: 
     timeout: 

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

       type: 
         changeset: gruppo de modificationes
         node: nodo
         relation: relation
         way: via
       type: 
         changeset: gruppo de modificationes
         node: nodo
         relation: relation
         way: via

-    way: 
-      download: "{{download_xml_link}}, {{view_history_link}} o {{edit_link}}"
-      download_xml: Discargar XML
-      edit: modificar
-      view_history: vider historia
-      way: Via
-      way_title: "Via: {{way_name}}"
-    way_details: 
-      also_part_of: 
-        one: tamben parte del via {{related_ways}}
-        other: tamben parte del vias {{related_ways}}
-      nodes: "Nodos:"
-      part_of: "Parte de:"
-    way_history: 
-      download: "{{download_xml_link}} o {{view_details_link}}"
-      download_xml: Discargar XML
-      view_details: vider detalios
-      way_history: Historia del via
-      way_history_title: "Historia del via: {{way_name}}"

   changeset: 
     changeset: 
       anonymous: Anonyme
   changeset: 
     changeset: 
       anonymous: Anonyme

-      big_area: (grande)
-      no_comment: (nulle)

       no_edits: (nulle modification)
       no_edits: (nulle modification)

-      show_area_box: monstrar quadro del area
-      still_editing: (ancora in modification)

       view_changeset_details: Vider detalios del gruppo de modificationes
     changeset_paging_nav: 
       view_changeset_details: Vider detalios del gruppo de modificationes
     changeset_paging_nav: 

-      next: Sequente »
-      previous: "« Precedente"
-      showing_page: Pagina {{page}} monstrate
+      next: Sequente »
+      previous: « Precedente
+      showing_page: Pagina %{page}

     changesets: 
       area: Area
       comment: Commento
     changesets: 
       area: Area
       comment: Commento


@@ -258,35 +147,38 @@ ia:
       saved_at: Salveguardate le
       user: Usator
     list: 
       saved_at: Salveguardate le
       user: Usator
     list: 

-      description: Modificationes recente
-      description_bbox: Gruppos de modificationes intra {{bbox}}
-      description_user: Gruppos de modificationes per {{user}}
-      description_user_bbox: Gruppos de modificationes per {{user}} intra {{bbox}}
-      heading: Gruppos de modificationes
-      heading_bbox: Gruppos de modificationes
-      heading_user: Gruppos de modificationes
-      heading_user_bbox: Gruppos de modificationes

       title: Gruppos de modificationes
       title: Gruppos de modificationes

-      title_bbox: Gruppos de modificationes intra {{bbox}}
-      title_user: Gruppos de modificationes per {{user}}
-      title_user_bbox: Gruppos de modificationes per {{user}} intra {{bbox}}
+      title_friend: Gruppos de modificationes per tu amicos
+      title_nearby: Gruppos de modificationes per usatores vicin
+      title_user: Gruppos de modificationes per %{user}
+    timeout: 
+      sorry: Le lista de gruppos de modificationes que tu requestava tardava troppo de tempore pro esser recuperate.

   diary_entry: 
   diary_entry: 

+    comments: 
+      ago: "%{ago} retro"
+      comment: Commento
+      has_commented_on: "%{display_name} ha commentate le sequente entratas de diario"
+      newer_comments: Commentos plus recente
+      older_comments: Commentos plus ancian
+      post: Publicar
+      when: Quando

     diary_comment: 
     diary_comment: 

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

       confirm: Confirmar
       hide_link: Celar iste commento
     diary_entry: 
       comment_count: 
         one: 1 commento
       confirm: Confirmar
       hide_link: Celar iste commento
     diary_entry: 
       comment_count: 
         one: 1 commento

-        other: "{{count}} commentos"
+        other: "%{count} commentos"
+        zero: Nulle commento

       comment_link: Commentar iste entrata
       confirm: Confirmar
       edit_link: Modificar iste entrata
       hide_link: Celar iste entrata
       comment_link: Commentar iste entrata
       confirm: Confirmar
       edit_link: Modificar iste entrata
       hide_link: Celar iste entrata

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

       reply_link: Responder a iste entrata
     edit: 
       reply_link: Responder a iste entrata
     edit: 

-      body: "Corpore:"
+      body: "Texto:"

       language: "Lingua:"
       latitude: "Latitude:"
       location: "Loco:"
       language: "Lingua:"
       latitude: "Latitude:"
       location: "Loco:"


@@ -301,45 +193,61 @@ ia:
         description: Entratas recente de diario de ustores de OpenStreetMap
         title: Entratas de diario de OpenStreetMap
       language: 
         description: Entratas recente de diario de ustores de OpenStreetMap
         title: Entratas de diario de OpenStreetMap
       language: 

-        description: Entratas de diario recente de usatores de OpenStreetMap in {{language_name}}
-        title: Entratas de diario de OpenStreetMap in {{language_name}}
+        description: Entratas de diario recente de usatores de OpenStreetMap in %{language_name}
+        title: Entratas de diario de OpenStreetMap in %{language_name}

       user: 
       user: 

-        description: Entratas recente de diario de OpenStreetMap de {{user}}
-        title: Entratas de diario de OpenStreetMap de {{user}}
+        description: Entratas recente de diario de OpenStreetMap de %{user}
+        title: Entratas de diario de OpenStreetMap de %{user}

     list: 
     list: 

-      in_language_title: Entratas de diario in {{language}}
+      in_language_title: Entratas de diario in %{language}

       new: Nove entrata de diario
       new_title: Componer un nove entrata in tu diario
       newer_entries: Entratas plus recente
       no_entries: Nulle entrata in diario
       older_entries: Entratas plus ancian
       new: Nove entrata de diario
       new_title: Componer un nove entrata in tu diario
       newer_entries: Entratas plus recente
       no_entries: Nulle entrata in diario
       older_entries: Entratas plus ancian

-      recent_entries: "Entratas recente de diario:"
+      recent_entries: Entratas recente del diario

       title: Diarios de usatores
       title: Diarios de usatores

-      user_title: Diario de {{user}}
+      title_friends: Diarios de amicos
+      title_nearby: Diarios de usatores vicin
+      user_title: Diario de %{user}
+    location: 
+      edit: Modificar
+      location: "Loco:"
+      view: Vider

     new: 
       title: Nove entrata de diario
     no_such_entry: 
     new: 
       title: Nove entrata de diario
     no_such_entry: 

-      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.
-      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.
+      heading: "Nulle entrata con le ID: %{id}"

       title: Nulle tal entrata de diario
       title: Nulle tal entrata de diario

-    no_such_user: 
-      body: Pardono, il non ha un usator con le nomine {{user}}. Verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
-      heading: Le usator {{user}} non existe
-      title: Nulle tal usator

     view: 
       leave_a_comment: Lassar un commento
       login: Aperir session
     view: 
       leave_a_comment: Lassar un commento
       login: Aperir session

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

       save_button: Salveguardar
       save_button: Salveguardar

-      title: Diarios de usatores | {{user}}
-      user_title: Diario de {{user}}
+      title: Diario de %{user} | %{title}
+      user_title: Diario de %{user}
+  editor: 
+    default: Predefinite (actualmente %{name})
+    id: 
+      description: iD (editor in navigator)
+      name: iD
+    potlatch: 
+      description: Potlatch 1 (editor in navigator del web)
+      name: Potlatch 1
+    potlatch2: 
+      description: Potlatch 2 (editor in navigator del web)
+      name: Potlatch 2
+    remote: 
+      description: Controlo remote (JOSM o Merkaartor)
+      name: Controlo remote

   export: 
     start: 
       add_marker: Adder un marcator al carta
       area_to_export: Area a exportar
       embeddable_html: HTML incorporabile
       export_button: Exportar
   export: 
     start: 
       add_marker: Adder un marcator al carta
       area_to_export: Area a exportar
       embeddable_html: HTML incorporabile
       export_button: Exportar

-      export_details: Le datos de OpenStreetMap es licentiate sub le <a href="http://creativecommons.org/licenses/by-sa/2.0/">licentia Attribution-ShareAlike 2.0 de Creative Commons</a>.
+      export_details: Le datos de OpenStreetMap es licentiate sub le <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open Database License</a> (ODbL).

       format: "Formato:"
       format_to_export: Formato de exportation
       image_size: "Dimension del imagine:"
       format: "Formato:"
       format_to_export: Formato de exportation
       image_size: "Dimension del imagine:"


@@ -347,35 +255,37 @@ ia:
       licence: Licentia
       longitude: "Lon:"
       manually_select: Seliger manualmente un altere area
       licence: Licentia
       longitude: "Lon:"
       manually_select: Seliger manualmente un altere area

-      mapnik_image: Imagine Mapnik
+      map_image: Imagine de carta (monstra le strato standard)

       max: max
       options: Optiones
       osm_xml_data: Datos XML de OpenStreetMap
       max: max
       options: Optiones
       osm_xml_data: Datos XML de OpenStreetMap

-      osmarender_image: Imagine Osmarender

       output: Resultato
       paste_html: Colla HTML pro incorporar in sito web
       scale: Scala
       output: Resultato
       paste_html: Colla HTML pro incorporar in sito web
       scale: Scala

+      too_large: 
+        body: "Iste area es troppo grande pro esser exportate como datos XML de OpenStreetMap. Per favor face zoom avante, o selige un area minor, o usa un del sequente fontes pro discargamento de datos in massa:"
+        geofabrik: 
+          description: Extractos regularmente actualisate de continentes, paises, e citates seligite
+          title: Discargamentos de Geofabrik
+        metro: 
+          description: Extractos de metropoles e lor areas circumvicin
+          title: Extractos de Metro
+        other: 
+          description: Fontes additional listate in le wiki de OpenStreetMap
+          title: Altere fontes
+        planet: 
+          description: Copias regularmente actualisate del base de datos complete de OpenStreetMap
+          title: Planeta OSM

       zoom: Zoom
       zoom: Zoom

-    start_rjs: 
-      add_marker: Adder un marcator al carta
-      change_marker: Cambiar le position del marcator
-      click_add_marker: Clicca super le carta pro adder un marcator
-      drag_a_box: Designa un quadro super le carta pro seliger un area
-      export: Exportar
-      manually_select: Seliger manualmente un altere area
-      view_larger_map: Vider un carta plus grande

   geocoder: 
     description: 
       title: 
         geonames: Position de <a href="http://www.geonames.org/">GeoNames</a>
   geocoder: 
     description: 
       title: 
         geonames: Position de <a href="http://www.geonames.org/">GeoNames</a>

-        osm_namefinder: "{{types}} de <a href=\"http://gazetteer.openstreetmap.org/namefinder/\">OpenStreetMap Namefinder</a>"

         osm_nominatim: Loco de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Citates
         places: Locos
         towns: Villages
         osm_nominatim: Loco de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
       types: 
         cities: Citates
         places: Locos
         towns: Villages

-    description_osm_namefinder: 
-      prefix: "{{distance}} {{direction}} del {{type}}"

     direction: 
       east: est
       north: nord
     direction: 
       east: est
       north: nord


@@ -387,40 +297,160 @@ ia:
       west: west
     distance: 
       one: circa 1 km
       west: west
     distance: 
       one: circa 1 km

-      other: circa {{count}} km
+      other: circa %{count} km

       zero: minus de 1 km
     results: 
       zero: minus de 1 km
     results: 

+      more_results: Plus resultatos

       no_results: Nulle resultato trovate
     search: 
       title: 
         ca_postcode: Resultatos de <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>
       no_results: Nulle resultato trovate
     search: 
       title: 
         ca_postcode: Resultatos de <a href="http://geocoder.ca/">Geocoder.CA</a>
         geonames: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>

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

         latlon: Resultatos <a href="http://openstreetmap.org/">interne</a>
         latlon: Resultatos <a href="http://openstreetmap.org/">interne</a>

-        osm_namefinder: Resultatos de <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>

         osm_nominatim: Resultatos de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>
         osm_nominatim: Resultatos de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>

+        osm_nominatim_reverse: Resultatos ab <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>

         uk_postcode: Resultatos de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultatos de <a href="http://geocoder.us/">Geocoder.us</a>
         uk_postcode: Resultatos de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
         us_postcode: Resultatos de <a href="http://geocoder.us/">Geocoder.us</a>

-    search_osm_namefinder: 
-      suffix_parent: "{{suffix}} ({{parentdistance}} al {{parentdirection}} de {{parentname}})"
-      suffix_place: ", {{distance}} al {{direction}} de {{placename}}"

     search_osm_nominatim: 
     search_osm_nominatim: 

+      admin_levels: 
+        level10: Limite de suburbio
+        level2: Frontiera de pais
+        level4: Frontiera de stato
+        level5: Frontiera de region
+        level6: Frontiera de contato
+        level8: Limite de citate
+        level9: Limite de village

       prefix: 
       prefix: 

+        aerialway: 
+          chair_lift: Telesedia
+          drag_lift: Teleski
+          station: Station de telecabina
+        aeroway: 
+          aerodrome: Aerodromo
+          apron: Pista
+          gate: Porta
+          helipad: Heliporto
+          runway: Pista
+          taxiway: Via de circulation pro aviones
+          terminal: Terminal

         amenity: 
         amenity: 

+          WLAN: Accesso WiFi
+          airport: Aeroporto
+          arts_centre: Centro artistic
+          artwork: Obra de arte
+          atm: Cassa automatic
+          auditorium: Auditorio
+          bank: Banca

           bar: Bar
           bar: Bar

+          bbq: Barbecue
+          bench: Banco
+          bicycle_parking: Stationamento pro bicyclettas
+          bicycle_rental: Location de bicyclettas
+          biergarten: Terrassa

           brothel: Bordello
           brothel: Bordello

+          bureau_de_change: Officio de cambio
+          bus_station: Station de autobus

           cafe: Café
           cafe: Café

+          car_rental: Location de automobiles

           car_sharing: Repartition de autos
           car_sharing: Repartition de autos

+          car_wash: Lavage de automobiles
+          casino: Casino
+          charging_station: Station de cargamento
+          cinema: Cinema
+          clinic: Clinica

           club: Club
           club: Club

+          college: Schola superior
+          community_centre: Centro communitari
+          courthouse: Tribunal

           crematorium: Crematorio
           crematorium: Crematorio

+          dentist: Dentista
+          doctors: Medicos
+          dormitory: Dormitorio
+          drinking_water: Aqua potabile

           driving_school: Autoschola
           driving_school: Autoschola

+          embassy: Ambassada
+          emergency_phone: Telephono de emergentia
+          fast_food: Fast food
+          ferry_terminal: Terminal de ferry
+          fire_hydrant: Hydrante de incendio
+          fire_station: Caserna de pumperos
+          food_court: Zona de restaurantes
+          fountain: Fontana

           fuel: Carburante
           fuel: Carburante

+          grave_yard: Cemeterio
+          gym: Centro de fitness / Gymnasio
+          hall: Hall
+          health_centre: Centro de sanitate
+          hospital: Hospital
+          hotel: Hotel
+          hunting_stand: Posto de chassa
+          ice_cream: Gelato
+          kindergarten: Schola pro juvene infantes
+          library: Bibliotheca

           market: Mercato
           market: Mercato

+          marketplace: Mercato
+          mountain_rescue: Succurso de montania
+          nightclub: Club nocturne
+          nursery: Sala recreative pro parve infantes
+          nursing_home: Casa de convalescentia
+          office: Officio

           park: Parco
           parking: Parking
           park: Parco
           parking: Parking

+          pharmacy: Pharmacia

           place_of_worship: Loco de adoration
           place_of_worship: Loco de adoration

+          police: Policia
+          post_box: Cassa postal
+          post_office: Officio postal

           preschool: Pre-schola
           preschool: Pre-schola

+          prison: Prision
+          pub: Taverna
+          public_building: Edificio public
+          public_market: Mercato public
+          reception_area: Area de reception
+          recycling: Puncto de recyclage
+          restaurant: Restaurante
+          retirement_home: Residentia pro vetere personas
+          sauna: Sauna
+          school: Schola
+          shelter: Refugio
+          shop: Boteca
+          shopping: Compras
+          shower: Ducha
+          social_centre: Centro social
+          social_club: Club social
+          social_facility: Servicio social
+          studio: Appartamento de un camera

           supermarket: Supermercato
           supermarket: Supermercato

+          swimming_pool: Piscina
+          taxi: Taxi
+          telephone: Telephono public
+          theatre: Theatro
+          toilets: Toilettes
+          townhall: Casa municipal
+          university: Universitate
+          vending_machine: Distributor automatic
+          veterinary: Clinica veterinari
+          village_hall: Casa communal
+          waste_basket: Corbe a papiro

           wifi: Accesso WiFi
           wifi: Accesso WiFi

+          youth_centre: Centro pro le juventute
+        boundary: 
+          administrative: Limite administrative
+          census: Limite de censo
+          national_park: Parco national
+          protected_area: Area protegite
+        bridge: 
+          aqueduct: Aqueducto
+          suspension: Ponte suspendite
+          swing: Ponte giratori
+          viaduct: Viaducto
+          "yes": Ponte
+        building: 
+          "yes": Edificio
+        emergency: 
+          fire_hydrant: Hydrante de incendio
+          phone: Telephono de emergentia

         highway: 
           bridleway: Sentiero pro cavallos
           bus_guideway: Via guidate de autobus
         highway: 
           bridleway: Sentiero pro cavallos
           bus_guideway: Via guidate de autobus


@@ -428,12 +458,11 @@ ia:
           byway: Via minor
           construction: Strata in construction
           cycleway: Pista cyclabile
           byway: Via minor
           construction: Strata in construction
           cycleway: Pista cyclabile

-          distance_marker: Marcator de distantia

           emergency_access_point: Puncto de accesso de emergentia
           footway: Sentiero pro pedones
           ford: Vado
           emergency_access_point: Puncto de accesso de emergentia
           footway: Sentiero pro pedones
           ford: Vado

-          gate: Porta a cancello

           living_street: Strata residential
           living_street: Strata residential

+          milestone: Petra milliari

           minor: Via minor
           motorway: Autostrata
           motorway_junction: Junction de autostrata
           minor: Via minor
           motorway: Autostrata
           motorway_junction: Junction de autostrata


@@ -443,28 +472,91 @@ ia:
           platform: Platteforma
           primary: Via principal
           primary_link: Via principal
           platform: Platteforma
           primary: Via principal
           primary_link: Via principal

+          proposed: Strata proponite

           raceway: Circuito
           residential: Residential
           raceway: Circuito
           residential: Residential

+          rest_area: Area de reposo

           road: Via
           secondary: Via secundari
           secondary_link: Via secundari
           service: Via de servicio
           services: Servicios de autostrata
           road: Via
           secondary: Via secundari
           secondary_link: Via secundari
           service: Via de servicio
           services: Servicios de autostrata

+          speed_camera: Detector de velocitate

           steps: Scalones
           stile: Scalon o apertura de passage
           steps: Scalones
           stile: Scalon o apertura de passage

+          street_lamp: Lanterna de strata

           tertiary: Via tertiari
           tertiary: Via tertiari

+          tertiary_link: Via tertiari

           track: Pista
           trail: Pista
           trunk: Via national
           trunk_link: Via national
           unclassified: Via non classificate
           unsurfaced: Cammino de terra
           track: Pista
           trail: Pista
           trunk: Via national
           trunk_link: Via national
           unclassified: Via non classificate
           unsurfaced: Cammino de terra

+        historic: 
+          archaeological_site: Sito archeologic
+          battlefield: Campo de battalia
+          boundary_stone: Lapide de frontiera
+          building: Edificio
+          castle: Castello
+          church: Ecclesia
+          citywalls: Muro del citate
+          fort: Forte
+          house: Casa
+          icon: Icone
+          manor: Casa seniorial
+          memorial: Memorial
+          mine: Mina
+          monument: Monumento
+          museum: Museo
+          ruins: Ruinas
+          tomb: Tumba
+          tower: Turre
+          wayside_cross: Cruce juxta le via
+          wayside_shrine: Reliquario juxta le via
+          wreck: Naufragio

         landuse: 
         landuse: 

+          allotments: Jardines familial
+          basin: Bassino
+          brownfield: Terreno industrial subutilisate
+          cemetery: Cemeterio
+          commercial: Area commercial
+          conservation: Conservation
+          construction: Construction
+          farm: Ferma
+          farmland: Terra arabile
+          farmyard: Corte de ferma
+          forest: Foreste
+          garages: Garages
+          grass: Herba
+          greenfield: Terreno sin edificios
+          industrial: Area industrial
+          landfill: Discargatorio
+          meadow: Pastura
+          military: Area militar
+          mine: Mina

           nature_reserve: Reserva natural
           nature_reserve: Reserva natural

+          orchard: Verdiero
+          park: Parco
+          piste: Pista de ski
+          quarry: Petreria
+          railway: Ferrovia
+          recreation_ground: Area recreative
+          reservoir: Reservoir
+          reservoir_watershed: Bassino interfluvial
+          residential: Area residential
+          retail: Magazines
+          road: Area de cammino
+          village_green: Parco de village
+          vineyard: Vinia
+          wetland: Terra humide
+          wood: Bosco

         leisure: 
           beach_resort: Loco de vacantias al plagia
         leisure: 
           beach_resort: Loco de vacantias al plagia

+          bird_hide: Observatorio de aves

           common: Terreno commun
           fishing: Area de pisca
           common: Terreno commun
           fishing: Area de pisca

+          fitness_station: Gymnasio

           garden: Jardin
           golf_course: Campo de golf
           ice_rink: Patinatorio
           garden: Jardin
           golf_course: Campo de golf
           ice_rink: Patinatorio


@@ -475,12 +567,19 @@ ia:
           pitch: Campo sportive
           playground: Area de jocos
           recreation_ground: Terreno de recreation
           pitch: Campo sportive
           playground: Area de jocos
           recreation_ground: Terreno de recreation

-          slipway: Slip
+          sauna: Sauna
+          slipway: Rampa de barca

           sports_centre: Centro sportive
           stadium: Stadio
           swimming_pool: Piscina
           track: Pista de athletismo
           water_park: Parco aquatic
           sports_centre: Centro sportive
           stadium: Stadio
           swimming_pool: Piscina
           track: Pista de athletismo
           water_park: Parco aquatic

+        military: 
+          airfield: Aerodromo militar
+          barracks: Barracas
+          bunker: Bunker
+        mountain_pass: 
+          "yes": Passo de montania

         natural: 
           bay: Baia
           beach: Plagia
         natural: 
           bay: Baia
           beach: Plagia


@@ -488,11 +587,12 @@ ia:
           cave_entrance: Entrata de caverna
           channel: Canal
           cliff: Precipitio
           cave_entrance: Entrata de caverna
           channel: Canal
           cliff: Precipitio

-          coastline: Linea de costa

           crater: Crater
           crater: Crater

+          dune: Duna

           feature: Attraction
           fell: Montania
           fjord: Fiord
           feature: Attraction
           fell: Montania
           fjord: Fiord

+          forest: Foreste

           geyser: Geyser
           glacier: Glaciero
           heath: Landa
           geyser: Geyser
           glacier: Glaciero
           heath: Landa


@@ -508,10 +608,11 @@ ia:
           ridge: Cresta
           river: Fluvio/Riviera
           rock: Rocca
           ridge: Cresta
           river: Fluvio/Riviera
           rock: Rocca

-          scree: Talus
+          scree: Detrito cadite

           scrub: Arbusto
           shoal: Banco de sablo
           spring: Fontana
           scrub: Arbusto
           shoal: Banco de sablo
           spring: Fontana

+          stone: Petra

           strait: Stricto
           tree: Arbore
           valley: Vallea
           strait: Stricto
           tree: Arbore
           valley: Vallea


@@ -520,6 +621,19 @@ ia:
           wetland: Terra humide
           wetlands: Terreno paludose
           wood: Bosco
           wetland: Terra humide
           wetlands: Terreno paludose
           wood: Bosco

+        office: 
+          accountant: Contabile
+          architect: Architecto
+          company: Compania
+          employment_agency: Agentia de empleo
+          estate_agent: Agentia immobiliari
+          government: Officio governamental
+          insurance: Officio de assecurantia
+          lawyer: Advocato
+          ngo: Officio de un ONG
+          telecommunication: Officio de telecommunication
+          travel_agent: Agentia de viages
+          "yes": Officio

         place: 
           airport: Aeroporto
           city: Citate
         place: 
           airport: Aeroporto
           city: Citate


@@ -531,9 +645,11 @@ ia:
           houses: Casas
           island: Insula
           islet: Insuletta
           houses: Casas
           island: Insula
           islet: Insuletta

+          isolated_dwelling: Habitation isolate

           locality: Localitate
           moor: Landa
           municipality: Municipalitate
           locality: Localitate
           moor: Landa
           municipality: Municipalitate

+          neighbourhood: Quartiero

           postcode: Codice postal
           region: Region
           sea: Mar
           postcode: Codice postal
           region: Region
           sea: Mar


@@ -543,13 +659,114 @@ ia:
           town: Urbe
           unincorporated_area: Area sin municipalitate
           village: Village
           town: Urbe
           unincorporated_area: Area sin municipalitate
           village: Village

+        railway: 
+          abandoned: Ferrovia abandonate
+          construction: Ferrovia in construction
+          disused: Ferrovia in disuso
+          disused_station: Station ferroviari in disuso
+          funicular: Ferrovia funicular
+          halt: Halto de traino
+          historic_station: Station ferroviari historic
+          junction: Junction ferroviari
+          level_crossing: Passage a nivello
+          light_rail: Metro legier
+          miniature: Ferrovia in miniatura
+          monorail: Monorail
+          narrow_gauge: Ferrovia stricte
+          platform: Platteforma ferroviari
+          preserved: Ferrovia preservate
+          proposed: Ferrovia proponite
+          spur: Ramification de ferrovia
+          station: Station ferroviari
+          stop: Halto ferroviari
+          subway: Station de metro
+          subway_entrance: Entrata al metro
+          switch: Agulia
+          tram: Tramvia
+          tram_stop: Halto de tram
+          yard: Station de manovras
+        shop: 
+          alcohol: Magazin de bibitas alcoholic
+          antiques: Antiquitates
+          art: Magazin de arte
+          bakery: Paneteria
+          beauty: Salon de beltate
+          beverages: Boteca de bibitas
+          bicycle: Magazin de bicyclettas
+          books: Libreria
+          boutique: Boutique
+          butcher: Macelleria
+          car: Magazin de automobiles
+          car_parts: Partes de automobiles
+          car_repair: Reparation de automobiles
+          carpet: Magazin de tapetes
+          charity: Magazin de beneficentia
+          chemist: Pharmacia
+          clothes: Magazin de vestimentos
+          computer: Magazin de computatores
+          confectionery: Confecteria
+          convenience: Magazin de quartiero
+          copyshop: Centro de photocopias
+          cosmetics: Boteca de cosmetica
+          deli: Boteca de delicatessas fin
+          department_store: Grande magazin
+          discount: Boteca de disconto
+          doityourself: Magazin de bricolage
+          dry_cleaning: Lavanderia a sic
+          electronics: Boteca de electronica
+          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
+          gallery: Galeria
+          garden_centre: Jardineria
+          general: Magazin general
+          gift: Boteca de donos
+          greengrocer: Verdurero
+          grocery: Specieria
+          hairdresser: Perruccheria
+          hardware: Quincalieria
+          hifi: Hi-fi
+          insurance: Assecurantia
+          jewelry: Joieleria
+          kiosk: Kiosque
+          laundry: Lavanderia
+          mall: Galeria mercante
+          market: Mercato
+          mobile_phone: Boteca de telephonos mobile
+          motorcycle: Magazin de motocyclos
+          music: Magazin de musica
+          newsagent: Venditor de jornales
+          optician: Optico
+          organic: Boteca de alimentos organic
+          outdoor: Magazin de sport al aere libere
+          pet: Boteca de animales
+          pharmacy: Pharmacia
+          photo: Magazin de photographia
+          salon: Salon
+          second_hand: Magazin de secunde mano
+          shoes: Scarperia
+          shopping_centre: Centro commercial
+          sports: Magazin de sport
+          stationery: Papireria
+          supermarket: Supermercato
+          tailor: Sartor
+          toys: Magazin de joculos
+          travel_agency: Agentia de viages
+          video: Magazin de video
+          wine: Magazin de vinos
+          "yes": Boteca

         tourism: 
           alpine_hut: Cabana alpin
           artwork: Obra de arte
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
           cabin: Cabana
         tourism: 
           alpine_hut: Cabana alpin
           artwork: Obra de arte
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
           cabin: Cabana

-          camp_site: Camping
+          camp_site: Terreno de camping

           caravan_site: Terreno pro caravanas
           chalet: Chalet
           guest_house: Albergo
           caravan_site: Terreno pro caravanas
           chalet: Chalet
           guest_house: Albergo


@@ -563,82 +780,153 @@ ia:
           theme_park: Parco de attractiones
           valley: Valle
           viewpoint: Puncto de vista
           theme_park: Parco de attractiones
           valley: Valle
           viewpoint: Puncto de vista

-          zoo: Zoo
+          zoo: Jardin zoologic
+        tunnel: 
+          culvert: Tubo de aqua subterranee
+          "yes": Tunnel
+        waterway: 
+          artificial: Via aquatic artificial
+          boatyard: Cantier naval
+          canal: Canal
+          connector: Connexion aquatic
+          dam: Dica
+          derelict_canal: Canal abandonate
+          ditch: Fossato
+          dock: Dock
+          drain: Aquiero
+          lock: Esclusa
+          lock_gate: Porta de esclusa
+          mineral_spring: Fonte de aqua mineral
+          mooring: Ammarrage
+          rapids: Rapidos
+          river: Fluvio/Riviera
+          riverbank: Ripa de fluvio/riviera
+          stream: Rivo
+          wadi: Wadi
+          water_point: Puncto de aqua
+          waterfall: Cascada
+          weir: Barrage

   javascripts: 
     map: 
       base: 
         cycle_map: Carta cyclista
   javascripts: 
     map: 
       base: 
         cycle_map: Carta cyclista

-        noname: Sin nomine
+        mapquest: MapQuest Open
+        standard: Standard
+        transport_map: Carta de transporto
+    notes: 
+      new: 
+        add: Adder nota
+        intro: Pro meliorar le carta, le information que tu scribe es monstrate a altere cartographos. Dunque, per favor sia tanto descriptive e precise como possibile quando tu positiona le marcator e scribe tu nota hic infra.
+      show: 
+        anonymous_warning: Iste nota include commentos de usatores anonyme que debe esser verificate independentemente.
+        comment: Commento
+        comment_and_resolve: Commentar e resolver
+        hide: Celar
+        reactivate: Reactivar
+        resolve: Resolver

     site: 
     site: 

-      edit_zoom_alert: Tu debe facer zoom avante pro modificar le carta
-      history_zoom_alert: Tu debe facer zoom avante pro vider le historia de modification
+      createnote_disabled_tooltip: Face zoom avante pro adder un nota al carta
+      createnote_tooltip: Adder un nota al carta
+      edit_disabled_tooltip: Face zoom avante pro modificar le carta
+      edit_tooltip: Modificar le carta

   layouts: 
   layouts: 

-    donate: Supporta OpenStreetMap per {{link}} al Fundo de Actualisation de Hardware.
-    donate_link_text: donation
+    community: Communitate
+    community_blogs: Blogs del communitate
+    community_blogs_title: Blogs de membros del communitate de OpenStreetMap
+    copyright: Copyright & Licentia
+    data: Datos
+    donate: Supporta OpenStreetMap per %{link} al Fundo de Actualisation de Hardware.

     edit: Modificar
     edit: Modificar

-    edit_tooltip: Modificar cartas
+    edit_with: Modificar con %{editor}

     export: Exportar
     export: Exportar

-    export_tooltip: Exportar datos cartographic
+    export_data: Exportar datos
+    foundation: Fundation
+    foundation_title: Le fundation OpenStreetMap

     gps_traces: Tracias GPS
     gps_traces: Tracias GPS

-    gps_traces_tooltip: Gerer tracias
-    help_wiki: Adjuta &amp; Wiki
-    help_wiki_tooltip: Adjuta &amp; sito Wiki pro le projecto
+    gps_traces_tooltip: Gerer tracias GPS
+    help: Adjuta

     history: Historia
     history: Historia

-    history_tooltip: Historia del gruppo de modificationes
-    home: initio
-    home_tooltip: Ir al position de origine
-    inbox: cassa de entrata ({{count}})
-    inbox_tooltip: 
-      one: Tu cassa de entrata contine 1 message non legite
-      other: Tu cassa de entrata contine {{count}} messages non legite
-      zero: Tu cassa de entrata non contine messages non legite
-    intro_1: OpenStreetMap es un carta libere e modificabile del mundo integre. Illo es facite per gente como te.
-    intro_2: OpenStreetMap permitte vider, modificar e usar datos geographic de modo collaborative desde ubique in le mundo.
-    intro_3: Le albergamento de OpenStreetMap es gratiosemente supportate per le {{ucl}} e {{bytemark}}.
-    license: 
-      title: Le datos de OpenStreetMap es disponibile sub le licentia Attribution-Share Alike 2.0 Generic de Creative Commons
+    home: Vader al position de initio
+    intro_2_create_account: Crea un conto de usator

     log_in: aperir session
     log_in_tooltip: Aperir un session con un conto existente
     logo: 
       alt_text: Logo de OpenStreetMap
     log_in: aperir session
     log_in_tooltip: Aperir un session con un conto existente
     logo: 
       alt_text: Logo de OpenStreetMap

-    logout: clauder session
-    logout_tooltip: Clauder session
+    logout: Clauder session

     make_a_donation: 
       text: Facer un donation
       title: Supporta OpenStreetMap con un donation monetari
     make_a_donation: 
       text: Facer un donation
       title: Supporta OpenStreetMap con un donation monetari

-    news_blog: Blog de novas
-    news_blog_tooltip: Blog de novas super OpenStreetMap, datos geographic libere, etc.

     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 lectura durante le execution de mantenentia essential.
     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 lectura durante le execution de mantenentia essential.

-    shop: Boteca
-    shop_tooltip: Boteca con mercantias de OpenStreetMap
+    partners_bytemark: Bytemark Hosting
+    partners_html: Le allogiamento web es supportate per %{ucl}, %{ic} e %{bytemark}, e altere %{partners}.
+    partners_ic: Imperial College London
+    partners_partners: partners
+    partners_ucl: le Centro de Realitate Virtual del UCL
+    partners_url: http://wiki.openstreetmap.org/wiki/Partners

     sign_up: inscriber se
     sign_up_tooltip: Crear un conto pro modification
     sign_up: inscriber se
     sign_up_tooltip: Crear un conto pro modification

-    sotm: Veni al conferentia OpenStreetMap 2009, The State of the Map, del 10 al 12 de julio in Amsterdam!

     tag_line: Le wiki-carta libere del mundo
     user_diaries: Diarios de usatores
     user_diaries_tooltip: Leger diarios de usatores
     tag_line: Le wiki-carta libere del mundo
     user_diaries: Diarios de usatores
     user_diaries_tooltip: Leger diarios de usatores

-    view: Vider
-    view_tooltip: Vider cartas
-    welcome_user: Benvenite, {{user_link}}
-    welcome_user_link_tooltip: Tu pagina de usator
-  map: 
-    coordinates: "Coordinatas:"
-    edit: Modificar
-    view: Vider
+  license_page: 
+    foreign: 
+      english_link: le original in anglese
+      text: In caso de un conflicto inter iste pagina traducite e %{english_original_link}, le pagina in anglese prevalera.
+      title: A proposito de iste traduction
+    legal_babble: 
+      attribution_example: 
+        alt: Exemplo de como recognoscer OpenStreetMap in un pagina web
+        title: Exemplo de recognoscentia
+      contributors_at_html: "<strong>Austria</strong>: Contine datos ab le\n   <a href=\"http://data.wien.gv.at/\">Citate de Vienna</a> licentiate sub\n   <a href=\"http://creativecommons.org/licenses/by/3.0/at/deed.de\">CC BY</a>."
+      contributors_ca_html: "<strong>Canada</strong>: Contine datos ab\n   GeoBase&reg;, GeoGratis (&copy; Department of Natural\n   Resources Canada), CanVec (&copy; Department of Natural\n   Resources Canada), e StatCan (Geography Division,\n   Statistics Canada)."
+      contributors_footer_1_html: "Pro ulterior detalios de iste e altere fontes que ha essite usate\npro adjutar a meliorar OpenStreetMap, vide le <a\nhref=\"\"http://wiki.openstreetmap.org/wiki/Contributors\">pagina\nde contributores</a> in le wiki de OpenStreetMap."
+      contributors_footer_2_html: "  Le inclusion de datos in OpenStreetMap non implica que le fornitor\n  original del datos indorsa OpenStreetMap, forni alcun garantia, o\n  accepta alcun responsabilitate."
+      contributors_fr_html: "<strong>Francia</strong>: Contine datos fornite per le\n   Direction Générale des Impôts."
+      contributors_gb_html: "<strong>Regno Unite</strong>: Contine datos de Ordnance\n   Survey &copy; copyright del Corona e derecto de base de datos\n   2010-12."
+      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_nl_html: "<strong>Nederlandia</strong>: Contine datos &copy; AND, 2007\n(<a href=\"http://www.and.com\">www.and.com</a>)"
+      contributors_nz_html: "<strong>Nove Zelandia</strong>: Contine datos proveniente de\n   Land Information New Zealand. Crown Copyright reservate."
+      contributors_title_html: Nostre contributores
+      contributors_za_html: "<strong>Africa del Sud</strong>: Contine datos proveniente del\n   <a href=\"http://www.ngi.gov.za/\">Chief Directorate:\n   National Geo-Spatial Information</a>, copyright del Stato reservate."
+      credit_1_html: "Nos require que vos usa le recognoscentia &ldquo;&copy; OpenStreetMap\ncontributors&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="http://www.openstreetmap.org/copyright">iste pagina de copyright</a>. Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote nominar e ligar directemente al licentia(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 www.openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a www.opendatacommosn.org, e (si relevante) a www.creativecommons.org.
+      credit_3_html: "Pro un carta electronic navigabile, le recognoscentia debe apparer in le angulo del carta. Per exemplo:"
+      credit_title_html: Como dar recognoscentia a OpenStreetMap
+      infringement_1_html: "  Nos rememora al contributores de OSM de nunquam adder datos de alcun\n  fonte sub derecto de autor (p.ex. Google Maps o cartas imprimite)\n  sin explicite permission del titulares del derecto de autor."
+      infringement_2_html: Si vos crede que material sub copyright ha essite inserite inappropriatemente in le base de datos de OpenStreetMap o in iste sito, per favor consulta nostre <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura de remotion</a> o submitte un plancto immediate usante nostre <a href="http://dmca.openstreetmap.org/">formulario in linea</a>.
+      infringement_title_html: Violation de copyright
+      intro_1_html: "OpenStreetMap es <i>datos aperte</i>, licentiate sub le <a\nhref=\"http://opendatacommons.org/licenses/odbl/\">Open Data\nCommons Open Database License</a> (ODbL)."
+      intro_2_html: "  Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas\n  e datos, a condition que vos da recognoscentia a OpenStreetMap e su\n  contributores. Si vos altera o extende nostre cartas e datos, vos\n  pote distribuer le resultato solmente sub le mesme licentia. Le\n  complete <a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">codice\n  legal</a> explica vostre derectos e responsabilitates."
+      intro_3_html: "Le cartographia in nostre tegulas de carta, e nostre documentation, son\npublicate sub licentia <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons Attribution-ShareAlike 2.0</a> (CC-BY-SA)."
+      more_1_html: "  Lege plus super le uso de nostre datos, e como recognoscer nos, al <a\n  href=\"http://wiki.openstreetmap.org/wiki/Legal_FAQ\">FAQ\n  Legal</a>."
+      more_2_html: "Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro disveloppatores tertie. Vide nostre <a href=\"http://wiki.openstreetmap.org/wiki/API_usage_policy\">politica pro le uso del API</a>,\n<a href=\"http://wiki.openstreetmap.org/wiki/Tile_usage_policy\">politica pro le uso de tegulas</a>\ne <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy\">politica pro le uso de Nominatim</a>."
+      more_title_html: Pro saper plus
+      title_html: Copyright e Licentia
+    native: 
+      mapping_link: comenciar le cartographia
+      native_link: version in interlingua
+      text: 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}.
+      title: A proposito de iste pagina

   message: 
     delete: 
       deleted: Message delite
     inbox: 
       date: Data
       from: De
   message: 
     delete: 
       deleted: Message delite
     inbox: 
       date: Data
       from: De

+      messages: Tu ha %{new_messages} e %{old_messages}

       my_inbox: Mi cassa de entrata
       my_inbox: Mi cassa de entrata

-      no_messages_yet: Tu non ha ancora messages. Proque non contactar alcun {{people_mapping_nearby_link}}?
+      new_messages: 
+        one: "%{count} nove message"
+        other: "%{count} nove messages"
+      no_messages_yet: Tu non ha ancora messages. Proque non contactar alcun %{people_mapping_nearby_link}?
+      old_messages: 
+        one: "%{count} ancian message"
+        other: "%{count} ancian messages"

       outbox: cassa de exito
       people_mapping_nearby: cartographos vicin
       subject: Subjecto
       title: Cassa de entrata
       outbox: cassa de exito
       people_mapping_nearby: cartographos vicin
       subject: Subjecto
       title: Cassa de entrata

-      you_have: Tu ha {{new_count}} nove messages e {{old_count}} vetule messages

     mark: 
       as_read: Message marcate como legite
       as_unread: Message marcate como non legite
     mark: 
       as_read: Message marcate como legite
       as_unread: Message marcate como non legite


@@ -649,63 +937,93 @@ ia:
       unread_button: Marcar como non legite
     new: 
       back_to_inbox: Retornar al cassa de entrata
       unread_button: Marcar como non legite
     new: 
       back_to_inbox: Retornar al cassa de entrata

-      body: Corpore
+      body: Texto

       limit_exceeded: Tu ha inviate multe messages recentemente. Per favor attende un momento ante de tentar inviar alteres.
       message_sent: Message inviate
       send_button: Inviar
       limit_exceeded: Tu ha inviate multe messages recentemente. Per favor attende un momento ante de tentar inviar alteres.
       message_sent: Message inviate
       send_button: Inviar

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

       subject: Subjecto
       title: Inviar message
       subject: Subjecto
       title: Inviar message

-    no_such_user: 
-      body: Pardono, il non ha un usator o message con iste nomine o ID.
-      heading: Nulle tal usator o message
-      title: Nulle tal usator o message
+    no_such_message: 
+      body: Non existe un message con iste ID.
+      heading: Message non existe
+      title: Message non existe

     outbox: 
       date: Data
       inbox: cassa de entrata
     outbox: 
       date: Data
       inbox: cassa de entrata

-      my_inbox: Mi {{inbox_link}}
-      no_sent_messages: Tu non ha ancora inviate alcun message. Proque non contactar alcun {{people_mapping_nearby_link}}?
+      messages: 
+        one: Tu ha %{count} message inviate
+        other: Tu ha %{count} messages inviate
+      my_inbox: Mi %{inbox_link}
+      no_sent_messages: Tu non ha ancora inviate alcun message. Proque non contactar alcun %{people_mapping_nearby_link}?

       outbox: cassa de exito
       people_mapping_nearby: cartographos vicin
       subject: Subjecto
       title: Cassa de exito
       to: A
       outbox: cassa de exito
       people_mapping_nearby: cartographos vicin
       subject: Subjecto
       title: Cassa de exito
       to: A

-      you_have_sent_messages: Tu ha {{count}} messages inviate

     read: 
     read: 

-      back_to_inbox: Retornar al cassa de entrata
-      back_to_outbox: Retornar al cassa de exito
+      back: Retornar

       date: Data
       from: De
       date: Data
       from: De

-      reading_your_messages: Lectura de tu messages
-      reading_your_sent_messages: Lectura de tu messages inviate

       reply_button: Responder
       subject: Subjecto
       title: Leger message
       to: A
       unread_button: Marcar como non legite
       reply_button: Responder
       subject: Subjecto
       title: Leger message
       to: A
       unread_button: Marcar como non legite

+      wrong_user: Tu es authenticate como "%{user}", ma le message que tu vole leger non ha essite inviate per o a iste usator. Per favor aperi un session como le usator correcte pro poter leger lo.
+    reply: 
+      wrong_user: Tu es authenticate como "%{user}", ma le message al qual tu vole responder non ha essite inviate a iste usator. Per favor aperi un session como le usator correcte pro poter responder.

     sent_message_summary: 
       delete_button: Deler
     sent_message_summary: 
       delete_button: Deler

+  note: 
+    description: 
+      closed_at_by_html: Resolvite %{when} retro per %{user}
+      closed_at_html: Resolvite %{when} retro
+      commented_at_by_html: Actualisate %{when} retro per %{user}
+      commented_at_html: Actualisate %{when} retro
+      opened_at_by_html: Create %{when} retro per %{user}
+      opened_at_html: Create %{when} retro
+      reopened_at_by_html: Reactivate %{when} retro per %{user}
+      reopened_at_html: Reactivate %{when} retro
+    entry: 
+      comment: Commento
+      full: Nota complete
+    mine: 
+      ago_html: "%{when} retro"
+      created_at: Create a
+      creator: Creator
+      description: Description
+      heading: Notas de %{user}
+      id: ID
+      last_changed: Ultime modification
+      subheading: Notas submittite o commentate per %{user}
+      title: Notas submittite o commentate per %{user}
+    rss: 
+      closed: nota claudite (a presso de %{place})
+      description_area: Un lista de notas reportate, commentate o claudite in tu area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
+      description_item: Syndication RSS pro le nota %{id}
+      title: Notas de OpenStreetMap

   notifier: 
     diary_comment_notification: 
   notifier: 
     diary_comment_notification: 

-      footer: Tu pote tamben leger le commento a {{readurl}} e tu pote commentar a {{commenturl}} o responder a {{replyurl}}
-      header: "{{from_user}} ha commentate le entrata recente de tu diario de OpenStreetMap con le subjecto {{subject}}:"
-      hi: Salute {{to_user}},
-      subject: "[OpenStreetMap] {{user}} commentava un entrata de tu diario"
+      footer: Tu pote tamben leger le commento a %{readurl} e tu pote commentar a %{commenturl} o responder a %{replyurl}
+      header: "%{from_user} ha commentate le entrata recente de tu diario de OpenStreetMap con le subjecto %{subject}:"
+      hi: Salute %{to_user},
+      subject: "[OpenStreetMap] %{user} commentava un entrata de tu diario"

     email_confirm: 
       subject: "[OpenStreetMap] Confirma tu adresse de e-mail"
     email_confirm_html: 
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro confirmar le alteration.
       greeting: Salute,
     email_confirm: 
       subject: "[OpenStreetMap] Confirma tu adresse de e-mail"
     email_confirm_html: 
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro confirmar le alteration.
       greeting: Salute,

-      hopefully_you: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail in {{server_url}} a {{new_address}}.
+      hopefully_you: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail in %{server_url} a %{new_address}.

     email_confirm_plain: 
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro confirmar le alteration.
       greeting: Salute,
     email_confirm_plain: 
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro confirmar le alteration.
       greeting: Salute,

-      hopefully_you_1: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail a
-      hopefully_you_2: "{{server_url}} a {{new_address}}."
+      hopefully_you: Alcuno (probabilemente tu) vole cambiar su adresse de e-mail in %{server_url} a %{new_address}.

     friend_notification: 
     friend_notification: 

-      had_added_you: "{{user}} te ha addite como amico in OpenStreetMap."
-      see_their_profile: Tu pote vider su profilo a {{userurl}} e adder le/la tamben como amico si tu lo vole.
-      subject: "[OpenStreetMap] {{user}} te ha addite como amico"
+      befriend_them: Tu pote equalmente adder le/la como amico a %{befriendurl}.
+      had_added_you: "%{user} te ha addite como amico in OpenStreetMap."
+      see_their_profile: Tu pote vider su profilo a %{userurl}.
+      subject: "[OpenStreetMap] %{user} te ha addite como amico"

     gpx_notification: 
       and_no_tags: e sin etiquettas.
       and_the_tags: "e le sequente etiquettas:"
     gpx_notification: 
       and_no_tags: e sin etiquettas.
       and_the_tags: "e le sequente etiquettas:"


@@ -716,7 +1034,7 @@ ia:
         subject: "[OpenStreetMap] Importation GPX fallite"
       greeting: Salute,
       success: 
         subject: "[OpenStreetMap] Importation GPX fallite"
       greeting: Salute,
       success: 

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

         subject: "[OpenStreetMap] Importation GPX succedite"
       with_description: con le description
       your_gpx_file: Il pare que tu file GPX
         subject: "[OpenStreetMap] Importation GPX succedite"
       with_description: con le description
       your_gpx_file: Il pare que tu file GPX


@@ -729,43 +1047,35 @@ ia:
     lost_password_plain: 
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro reinitialisar tu contrasigno.
       greeting: Salute,
     lost_password_plain: 
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro reinitialisar tu contrasigno.
       greeting: Salute,

-      hopefully_you_1: Alcuno (possibilemente tu) ha demandate de reinitialisar le contrasigno del
-      hopefully_you_2: conto openstreetmap.org con iste adresse de e-mail.
+      hopefully_you: Alcuno (probabilemente tu) ha demandate que le contrasigno del conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate.

     message_notification: 
     message_notification: 

-      footer1: Tu pote tamben leger le message at {{readurl}}
-      footer2: e tu pote responder a {{replyurl}}
-      header: "{{from_user}} te ha inviate un message per OpenStreetMap con le subjecto {{subject}}:"
-      hi: Salute {{to_user}},
-      subject: "[OpenStreetMap] {{user}} te ha inviate un nove message"
+      footer_html: Tu pote anque leger le message a %{readurl} e tu pote responder a %{replyurl}
+      header: "%{from_user} te ha inviate un message per OpenStreetMap con le subjecto %{subject}:"
+      hi: Salute %{to_user},
+    note_comment_notification: 
+      anonymous: Un usator anonyme
+      closed: 
+        commented_note: "%{commenter} ha resolvite un nota de carta que tu ha commentate. Le nota es in le vicinitate de %{place}."
+        subject_other: "[OpenStreetMap] %{commenter} ha resolvite un nota que te interessa"
+        subject_own: "[OpenStreetMap] %{commenter} ha resolvite un de tu notas"
+        your_note: "%{commenter} ha resolvite un de tu notas de carta in le vicinitate de %{place}."
+      commented: 
+        commented_note: "%{commenter} ha lassate un commento sur un nota de carta que tu ha commentate. Le nota es in le vicinitate de %{place}."
+        subject_other: "[OpenStreetMap] %{commenter} ha commentate un nota que te interessa"
+        subject_own: "[OpenStreetMap] %{commenter} ha commentate un de tu notas"
+        your_note: "%{commenter} ha lassate un commento sur un de tu notas de carta in le vicinitate de %{place}."
+      details: Plus detalios sur le nota pote esser trovate a %{url}.
+      greeting: Salute,
+      reopened: 
+        subject_other: "[OpenStreetMap] %{commenter} ha reactivate un nota de tu interesse"
+        subject_own: "[OpenStreetMap] %{commenter} ha reactivate un de tu notas"
+        your_note: "%{commenter} ha reactivate un de tu notas de carta in le vicinitate de %{place}."

     signup_confirm: 
     signup_confirm: 

-      subject: "[OpenStreetMap] Confirma tu adresse de e-mail"
-    signup_confirm_html: 
-      click_the_link: Si isto es tu, benvenite! Per favor clicca super le ligamine ci infra pro confirmar iste conto e continua a leger pro ulterior informationes super OpenStreetMap
-      current_user: Un lista de usatores actual in categorias, a base de lor position geographic, es disponibile de <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.
-      get_reading: Informa te super OpenStreetMap per <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">leger le wiki</a>, tene te al currente con le ultime novas via le <a href="http://blog.openstreetmap.org/">blog de OpenStreetMap</a> o con <a href="http://twitter.com/openstreetmap">Twitter</a>, o percurre le <a href="http://www.opengeodata.org/">blog OpenGeoData</a> del fundator de OpenStreetMap Steve Coast pro le historia compendiose del projecto, le qual include tamben <a href="http://www.opengeodata.org/?cat=13">podcasts a ascoltar</a>!
-      greeting: Salute!
-      hopefully_you: Alcuno (sperabilemente tu) vole crear un conto in
-      introductory_video: Tu pote reguardar un {{introductory_video_link}}.
-      more_videos: Il ha {{more_videos_link}}.
-      more_videos_here: plus videos hic
-      user_wiki_page: Es recommendate que tu crea un pagina wiki de usator, que include etiquettas de categoria indicante ubi tu es, como <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.
-      video_to_openstreetmap: video de introduction a OpenStreetMap
-      wiki_signup: Considera tamben <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">inscriber te al wiki de OpenStreetMap</a>.
-    signup_confirm_plain: 
-      blog_and_twitter: "Tene te al currente con le ultime novas al blog de OpenStreetMap o con Twitter:"
-      click_the_link_1: Si isto es tu, benvenite! Per favor clicca super le ligamine ci infra pro confirmar tu
-      click_the_link_2: conto. Continua a leger pro plus informationes a proposito de OpenStreetMap.
-      current_user_1: Un lista actual de usatores in categorias, a base de lor localisation in le mundo,
-      current_user_2: "es disponibile de:"
-      greeting: Salute!
-      hopefully_you: Alcuno (sperabilemente tu) vole crear un conto a
-      introductory_video: "Tu pote reguardar un video de introduction a OpenStreetMap hic:"
-      more_videos: "Il ha plus videos hic:"
-      opengeodata: "OpenGeoData.org es le blog del fundator de OpenStreetMap, Steve Coast, e illo include tamben podcasts:"
-      the_wiki: "Informa te super OpenStreetMap al wiki:"
-      user_wiki_1: Es recommendate crear un pagina wiki de usator, que include
-      user_wiki_2: etiquettas de categoria que indica tu localisation, como [[Category:Users_in_London]].
-      wiki_signup: "Considera tamben crear un conto al wiki de OpenStreetMap a:"
+      confirm: "Ante de facer altere cosa, nos debe confirmar que iste requesta proveniva de te. Dunque, si tu lo faceva, per favor clicca sur le ligamine sequente pro confirmar tu conto:"
+      created: Un persona (probabilemente tu) ha justo create un conto a %{site_url}.
+      greeting: Bon die!
+      subject: "[OpenStreetMap] Benvenite a OpenStreetMap"
+      welcome: Benvenite! Ecce alcun information supplementari pro adjutar te a comenciar.

   oauth: 
     oauthorize: 
       allow_read_gpx: leger tu tracias GPS private.
   oauth: 
     oauthorize: 
       allow_read_gpx: leger tu tracias GPS private.


@@ -773,11 +1083,12 @@ ia:
       allow_to: "Permitter al application cliente:"
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
       allow_to: "Permitter al application cliente:"
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.

-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.
+      allow_write_notes: modificar notas.

       allow_write_prefs: modificar tu preferentias de usator.
       allow_write_prefs: modificar tu preferentias de usator.

-      request_access: Le application {{app_name}} requesta accesso a tu conto. Per favor verifica si tu vole que le application ha le sequente capabilitates. Tu pote seliger tantes o si poches como tu vole.
+      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.

     revoke: 
     revoke: 

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

   oauth_clients: 
     create: 
       flash: Informationes registrate con successo
   oauth_clients: 
     create: 
       flash: Informationes registrate con successo


@@ -791,9 +1102,10 @@ ia:
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.

-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.
+      allow_write_notes: modificar notas.

       allow_write_prefs: modificar su preferentias de usator.
       allow_write_prefs: modificar su preferentias de usator.

-      callback_url: URL de reappello
+      callback_url: URL de retorno

       name: Nomine
       requests: "Requestar le sequente permissiones del usator:"
       required: Requirite
       name: Nomine
       requests: "Requestar le sequente permissiones del usator:"
       required: Requirite


@@ -805,7 +1117,7 @@ ia:
       list_tokens: "Le sequente indicios ha essite emittite a applicationes in tu nomine:"
       my_apps: Mi applicationes cliente
       my_tokens: Mi applicationes autorisate
       list_tokens: "Le sequente indicios ha essite emittite a applicationes in tu nomine:"
       my_apps: Mi applicationes cliente
       my_tokens: Mi applicationes autorisate

-      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: 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.

       register_new: Registrar tu application
       registered_apps: "Tu ha le sequente applicationes cliente registrate:"
       revoke: Revocar!
       register_new: Registrar tu application
       registered_apps: "Tu ha le sequente applicationes cliente registrate:"
       revoke: Revocar!


@@ -814,46 +1126,81 @@ ia:
       submit: Registrar
       title: Registrar un nove application
     not_found: 
       submit: Registrar
       title: Registrar un nove application
     not_found: 

-      sorry: Pardono, iste {{type}} non poteva esser trovate.
+      sorry: Pardono, iste %{type} non poteva esser trovate.

     show: 
       access_url: "URL del indicio de accesso:"
       allow_read_gpx: leger su tracias GPS private.
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.
     show: 
       access_url: "URL del indicio de accesso:"
       allow_read_gpx: leger su tracias GPS private.
       allow_read_prefs: leger su preferentias de usator.
       allow_write_api: modificar le carta.
       allow_write_diary: crear entratas de diario, commentos e adder amicos.

-      allow_write_gpx: cargar tracias GPS.
+      allow_write_gpx: incargar tracias GPS.
+      allow_write_notes: modificar notas.

       allow_write_prefs: modificar su preferentias de usator.
       authorize_url: "URL de autorisation:"
       allow_write_prefs: modificar su preferentias de usator.
       authorize_url: "URL de autorisation:"

+      confirm: Es tu secur?
+      delete: Deler cliente

       edit: Modificar detalios
       key: "Clave de consumitor:"
       requests: "Le sequente permissiones es requestate del usator:"
       secret: "Secreto de consumitor:"
       edit: Modificar detalios
       key: "Clave de consumitor:"
       requests: "Le sequente permissiones es requestate del usator:"
       secret: "Secreto de consumitor:"

-      support_notice: Nos supporta HMAC-SHA1 (recommendate) e texto simple in modo SSL.
-      title: Detalios OAuth pro {{app_name}}
+      support_notice: Nos supporta le signaturas HMAC-SHA1 (recommendate) e RSA-SHA1.
+      title: Detalios OAuth pro %{app_name}

       url: "URL del indicio de requesta:"
     update: 
       flash: Le information del cliente ha essite actualisate con successo
       url: "URL del indicio de requesta:"
     update: 
       flash: Le information del cliente ha essite actualisate con successo

+  redaction: 
+    create: 
+      flash: Obscuration create.
+    destroy: 
+      error: Un error occurreva durante le destruction de iste obscuration.
+      flash: Obscuration destruite.
+      not_empty: Le obscuration non es vacue. Per favor disobscura tote le versiones pertinente a iste obscuration ante de destruer lo.
+    edit: 
+      description: Description
+      heading: Modificar obscuration
+      submit: Salveguardar obscuration
+      title: Modificar obscuration
+    index: 
+      empty: Il non ha obscurationes a monstrar.
+      heading: Lista de obscurationes
+      title: Lista de obscurationes
+    new: 
+      description: Description
+      heading: Specifica information pro nove obscuration
+      submit: Crear obscuration
+      title: Creation de nove obscuration
+    show: 
+      confirm: Es tu secur?
+      description: "Description:"
+      destroy: Remover iste obscuration
+      edit: Modificar iste obscuration
+      heading: Es monstrate le obscuration "%{title}"
+      title: Presentation de obscuration
+      user: "Creator:"
+    update: 
+      flash: Cambios salveguardate.

   site: 
     edit: 
       anon_edits_link_text: Lege proque isto es le caso.
       flash_player_required: Es necessari haber un reproductor Flash pro usar Potlatch, le editor Flash de OpenStreetMap. Tu pote <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">discargar Flash Player a Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Plure altere optiones</a> es tamben disponibile pro modificar OpenStreetMap.
   site: 
     edit: 
       anon_edits_link_text: Lege proque isto es le caso.
       flash_player_required: Es necessari haber un reproductor Flash pro usar Potlatch, le editor Flash de OpenStreetMap. Tu pote <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">discargar Flash Player a Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Plure altere optiones</a> es tamben disponibile pro modificar OpenStreetMap.

+      id_not_configured: iD non ha essite configurate
+      no_iframe_support: Tu navigator non supporta le iframes in HTML, necessari pro iste functionalitate.

       not_public: Tu non ha configurate tu modificationes pro esser public.
       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: 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}.
+      potlatch2_not_configured: Potlatch 2 non ha essite configurate. Per favor vide http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 pro plus informationes.
+      potlatch2_unsaved_changes: Tu ha modificationes non salveguardate. (In Potlatch 2, tu debe cliccar super Salveguardar.)

       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.)
       user_page_link: pagina de usator
     index: 
       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.)
       user_page_link: pagina de usator
     index: 

+      createnote: Adder un nota

       js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate JavaScript.
       js_2: OpenStreetMap usa JavaScript pro su carta glissante.
       js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate JavaScript.
       js_2: OpenStreetMap usa JavaScript pro su carta glissante.

-      js_3: Tu pote probar le <a href="http://tah.openstreetmap.org/Browse/">navigator de tegulas static Tiles@Home</a> si tu non succede a activar JavaScript.

       license: 
       license: 

-        license_name: Creative Commons Attribution-Share Alike 2.0
-        notice: Publicate sub licentia {{license_name}} per le {{project_name}} e su contributores.
-        project_name: Projecto OpenStreetMap
+        copyright: Copyright OpenStreetMap e contributores, sub licentia aperte

       permalink: Permaligamine
       permalink: Permaligamine

+      remote_failed: Modification fallite - assecura te que JOSM o Merkaartor es cargate e que le plug-in de controlo remote es activate

       shortlink: Ligamine curte
     key: 
       shortlink: Ligamine curte
     key: 

-      map_key: Legenda
-      map_key_tooltip: Legenda pro le rendition Mapnik a iste nivello de zoom

       table: 
         entry: 
           admin: Limite administrative
       table: 
         entry: 
           admin: Limite administrative


@@ -920,20 +1267,38 @@ ia:
           unclassified: Via non classificate
           unsurfaced: Cammino de terra
           wood: Bosco
           unclassified: Via non classificate
           unsurfaced: Cammino de terra
           wood: Bosco

-        heading: Legenda pro z{{zoom_level}}
+    markdown_help: 
+      alt: Texto alternative
+      first: Prime elemento
+      heading: Titulo
+      headings: Titulos
+      image: Imagine
+      link: Ligamine
+      ordered: Lista ordinate
+      second: Secunde elemento
+      subheading: Subtitulo
+      text: Texto
+      title_html: Processate con <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      unordered: Lista non ordinate
+      url: URL
+    richtext_area: 
+      edit: Modificar
+      preview: Previsualisation

     search: 
       search: Cercar
     search: 
       search: Cercar

-      search_help: "exemplos: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', o 'post offices near Lünen' <a href='http://wiki.openstreetmap.org/wiki/Search'>altere exemplos...</a>"
-      submit_text: Ir
+      submit_text: Va

       where_am_i: Ubi es io?
       where_am_i_title: Describer le position actual per medio del motor de recerca
     sidebar: 
       close: Clauder
       search_results: Resultatos del recerca
       where_am_i: Ubi es io?
       where_am_i_title: Describer le position actual per medio del motor de recerca
     sidebar: 
       close: Clauder
       search_results: Resultatos del recerca

+  time: 
+    formats: 
+      friendly: "%e de %B %Y a %H:%M"

   trace: 
     create: 
   trace: 
     create: 

-      trace_uploaded: Tu file GPX ha essite cargate 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_trace: Cargar 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_trace: Incargar tracia GPS

     delete: 
       scheduled_for_deletion: Tracia programmate pro deletion
     edit: 
     delete: 
       scheduled_for_deletion: Tracia programmate pro deletion
     edit: 


@@ -941,38 +1306,36 @@ ia:
       download: discargar
       edit: modificar
       filename: "Nomine de file:"
       download: discargar
       edit: modificar
       filename: "Nomine de file:"

-      heading: Modificar le tracia {{name}}
+      heading: Modificar le tracia %{name}

       map: carta
       owner: "Proprietario:"
       points: "Punctos:"
       map: carta
       owner: "Proprietario:"
       points: "Punctos:"

-      save_button: Immagazinar modificationes
+      save_button: Salveguardar modificationes

       start_coord: "Coordinata initial:"
       tags: "Etiquettas:"
       tags_help: separate per commas
       start_coord: "Coordinata initial:"
       tags: "Etiquettas:"
       tags_help: separate per commas

-      title: Modification del tracia {{name}}
-      uploaded_at: "Cargate le:"
+      title: Modification del tracia %{name}
+      uploaded_at: "Incargate le:"

       visibility: "Visibilitate:"
       visibility_help: que significa isto?
     list: 
       visibility: "Visibilitate:"
       visibility_help: que significa isto?
     list: 

+      description: Percurrer le tracias GPS incargate recentemente
+      empty_html: Ancora nihil a vider hic. <a href='%{upload_link}'>Incarga un nove tracia</a> o lege plus sur le traciamento GPS in le <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina wiki</a>.

       public_traces: Tracias GPS public
       public_traces: Tracias GPS public

-      public_traces_from: Tracias GPS public de {{user}}
-      tagged_with: "  etiquettate con {{tags}}"
+      public_traces_from: Tracias GPS public de %{user}
+      tagged_with: "  etiquettate con %{tags}"

       your_traces: Tu tracias GPS
     make_public: 
       made_public: Tracia rendite public
       your_traces: Tu tracias GPS
     make_public: 
       made_public: Tracia rendite public

-    no_such_user: 
-      body: Pardono, il non ha un usator con le nomine {{user}}. Verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
-      heading: Le usator {{user}} non existe
-      title: Nulle tal usator

     offline: 
       heading: Immagazinage GPX foras de linea
     offline: 
       heading: Immagazinage GPX foras de linea

-      message: Le systema pro immagazinar e cargar files GPX es actualmente indisponibile.
+      message: Le systema pro immagazinar e incargar files GPX es actualmente indisponibile.

     offline_warning: 
     offline_warning: 

-      message: Le systema pro cargar files GPX es actualmente indisponibile
+      message: Le systema pro incargar files GPX es actualmente indisponibile

     trace: 
     trace: 

-      ago: "{{time_in_words_ago}} retro"
+      ago: "%{time_in_words_ago} retro"

       by: per
       by: per

-      count_points: "{{count}} punctos"
+      count_points: "%{count} punctos"

       edit: modificar
       edit_map: Modificar carta
       identifiable: IDENTIFICABILE
       edit: modificar
       edit_map: Modificar carta
       identifiable: IDENTIFICABILE


@@ -986,25 +1349,27 @@ ia:
       trackable: TRACIABILE
       view_map: Vider carta
     trace_form: 
       trackable: TRACIABILE
       view_map: Vider carta
     trace_form: 

-      description: Description
+      description: "Description:"

       help: Adjuta
       help: Adjuta

-      tags: Etiquettas
+      tags: "Etiquettas:"

       tags_help: separate per commas
       tags_help: separate per commas

-      upload_button: Cargar
-      upload_gpx: Cargar file GPX
-      visibility: Visibilitate
+      upload_button: Incargar
+      upload_gpx: "Incargar file GPX:"
+      visibility: "Visibilitate:"

       visibility_help: que significa isto?
     trace_header: 
       see_all_traces: Vider tote le tracias
       visibility_help: que significa isto?
     trace_header: 
       see_all_traces: Vider tote le tracias

-      see_just_your_traces: Vider solo tu tracias, o cargar un tracia

       see_your_traces: Vider tote tu tracias
       see_your_traces: Vider tote tu tracias

-      traces_waiting: Tu ha {{count}} tracias attendente cargamento. Per favor considera attender le completion de istes ante de cargar alteres, pro non blocar le cauda pro altere usatores.
+      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 pro altere usatores.
+        other: Tu ha %{count} tracias attendente incargamento. Per favor considera attender le completion de istes ante de incargar alteres, pro non blocar le cauda pro altere usatores.
+      upload_trace: Incargar un tracia

     trace_optionals: 
       tags: Etiquettas
     trace_paging_nav: 
     trace_optionals: 
       tags: Etiquettas
     trace_paging_nav: 

-      next: Sequente &raquo;
-      previous: "&laquo; Precedente"
-      showing_page: Pagina {{page}} monstrate
+      newer: Tracias plus nove
+      older: Tracias plus ancian
+      showing_page: Pagina %{page}

     view: 
       delete_track: Deler iste tracia
       description: "Description:"
     view: 
       delete_track: Deler iste tracia
       description: "Description:"


@@ -1012,7 +1377,7 @@ ia:
       edit: modificar
       edit_track: Modificar iste tracia
       filename: "Nomine de file:"
       edit: modificar
       edit_track: Modificar iste tracia
       filename: "Nomine de file:"

-      heading: Visualisation del tracia {{name}}
+      heading: Visualisation del tracia %{name}

       map: carta
       none: Nulle
       owner: "Proprietario:"
       map: carta
       none: Nulle
       owner: "Proprietario:"


@@ -1020,9 +1385,9 @@ ia:
       points: "Punctos:"
       start_coordinates: "Coordinata de initio:"
       tags: "Etiquettas:"
       points: "Punctos:"
       start_coordinates: "Coordinata de initio:"
       tags: "Etiquettas:"

-      title: Visualisation del tracia {{name}}
+      title: Visualisation del tracia %{name}

       trace_not_found: Tracia non trovate!
       trace_not_found: Tracia non trovate!

-      uploaded: "Cargate le:"
+      uploaded: "Incargate le:"

       visibility: "Visibilitate:"
     visibility: 
       identifiable: Identificabile (monstrate in le lista de tracias e como identificabile, punctos ordinate con datas e horas)
       visibility: "Visibilitate:"
     visibility: 
       identifiable: Identificabile (monstrate in le lista de tracias e como identificabile, punctos ordinate con datas e horas)


@@ -1031,17 +1396,37 @@ ia:
       trackable: Traciabile (solmente condividite como anonymo, punctos ordinate con datas e horas)
   user: 
     account: 
       trackable: Traciabile (solmente condividite como anonymo, punctos ordinate con datas e horas)
   user: 
     account: 

+      contributor terms: 
+        agreed: Tu ha acceptate le nove Conditiones de Contributor.
+        agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como liberate al Dominio Public.
+        heading: "Conditiones de contributor:"
+        link text: que es isto?
+        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 e acceptar le nove Conditiones de Contributor.

       current email address: "Adresse de e-mail actual:"
       current email address: "Adresse de e-mail actual:"

+      delete image: Remover le imagine actual

       email never displayed publicly: (nunquam monstrate publicamente)
       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.
       email never displayed publicly: (nunquam monstrate publicamente)
       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.

+      gravatar: 
+        gravatar: Usar Gravatar
+        link text: que es isto?

       home location: "Position de origine:"
       home location: "Position de origine:"

+      image: "Imagine:"
+      image size hint: (imagines quadrate de al minus 100×100 functiona melio)
+      keep image: Retener le imagine actual

       latitude: "Latitude:"
       longitude: "Longitude:"
       make edits public button: Render tote mi modificationes public
       my settings: Mi configurationes
       new email address: "Adresse de e-mail nove:"
       latitude: "Latitude:"
       longitude: "Longitude:"
       make edits public button: Render tote mi modificationes public
       my settings: Mi configurationes
       new email address: "Adresse de e-mail nove:"

+      new image: Adder un imagine

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

+      openid: 
+        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link text: que es isto?
+        openid: "OpenID:"
+      preferred editor: "Editor preferite:"

       preferred languages: "Linguas preferite:"
       profile description: "Description del profilo:"
       public editing: 
       preferred languages: "Linguas preferite:"
       profile description: "Description del profilo:"
       public editing: 


@@ -1054,40 +1439,86 @@ ia:
       public editing note: 
         heading: Modification public
         text: 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 datos cartographic</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">lege proque</a>).<ul><li>Tu adresse de e-mail non essera revelate si tu deveni public.</li><li>Iste action non pote esser revertite e tote le nove usatores es ora public per predefinition.</li></ul>
       public editing note: 
         heading: Modification public
         text: 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 datos cartographic</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">lege proque</a>).<ul><li>Tu adresse de e-mail non essera revelate si tu deveni public.</li><li>Iste action non pote esser revertite e tote le nove usatores es ora public per predefinition.</li></ul>

+      replace image: Reimplaciar le imagine actual

       return to profile: Retornar al profilo
       return to profile: Retornar al profilo

-      save changes button: Immagazinar modificationes
+      save changes button: Salveguardar modificationes

       title: Modificar conto
       update home location on click: Actualisar le position de origine quando io clicca super le carta?
     confirm: 
       title: Modificar conto
       update home location on click: Actualisar le position de origine quando io clicca super le carta?
     confirm: 

+      already active: Iste conto ha ja essite confirmate.

       button: Confirmar
       button: Confirmar

-      failure: Un conto de usator con iste indicio ha ja essite confirmate.

       heading: Confirmar un conto de usator
       press confirm button: Preme le button de confirmation ci infra pro activar tu conto.
       heading: Confirmar un conto de usator
       press confirm button: Preme le button de confirmation ci infra pro activar tu conto.

-      success: Tu conto ha essite confirmate, gratias pro inscriber te!
+      unknown token: Iste indicio non pare exister.

     confirm_email: 
       button: Confirmar
       failure: Un adresse de e-mail ha ja essite confirmate con iste indicio.
       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.
       success: Tu adresse de e-mail ha essite confirmate, gratias pro inscriber te!
     confirm_email: 
       button: Confirmar
       failure: Un adresse de e-mail ha ja essite confirmate con iste indicio.
       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.
       success: Tu adresse de e-mail ha essite confirmate, gratias pro inscriber te!

+    confirm_resend: 
+      failure: Usator %{name} non trovate.
+      success: Nos ha inviate un nove message de confirmation a %{email} e si tosto que tu confirma le conto, tu potera comenciar a cartographiar.<br /><br />Si tu usa un systema anti-spam que invia requestas de confirmation, alora per favor assecura te de adder webmaster@openstreetmap.org al lista blanc, post que nos non pote responder a requestas de confirmation.

     filter: 
       not_an_administrator: Tu debe esser administrator pro executar iste action.
     filter: 
       not_an_administrator: Tu debe esser administrator pro executar iste action.

-    friend_map: 
-      nearby mapper: "Cartographo vicin: [[nearby_user]]"
-      your location: Tu position

     go_public: 
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission de modificar.
     go_public: 
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission de modificar.

+    list: 
+      confirm: Confirmar usatores seligite
+      empty: Nulle usator correspondente trovate
+      heading: Usatores
+      hide: Celar usatores seligite
+      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}"
+      title: Usatores

     login: 
     login: 

-      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.
+      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.
+      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>.

       auth failure: Pardono, non poteva aperir un session con iste detalios.
       auth failure: Pardono, non poteva aperir un session con iste detalios.

-      create_account: crea un conto
+      create account minute: Crea un conto. Isto dura solmente un minuta.

       email or username: "Adresse de e-mail o nomine de usator:"
       heading: Aperir session
       login_button: Aperir session
       lost password link: Tu perdeva le contrasigno?
       email or username: "Adresse de e-mail o nomine de usator:"
       heading: Aperir session
       login_button: Aperir session
       lost password link: Tu perdeva le contrasigno?

+      new to osm: Nove a OpenStreetMap?
+      no account: Non ha un conto?
+      openid: "OpenID de %{logo}:"
+      openid invalid: Infortunatemente tu OpenID pare esser mal formate.
+      openid missing provider: Infortunatemente nos non poteva contactar tu providitor de OpenID.
+      openid_logo_alt: Aperir session con OpenID
+      openid_providers: 
+        aol: 
+          alt: Aperir session con un OpenID de AOL
+          title: Aperir session con AOL
+        google: 
+          alt: Aperir session con un OpenID de Google
+          title: Aperir session con Google
+        myopenid: 
+          alt: Aperir session con un OpenID de myOpenID
+          title: Aperir session con myOpenID
+        openid: 
+          alt: Aperir session con un URL de OpenID
+          title: Aperir session con OpenID
+        wordpress: 
+          alt: Aperir session con un OpenID de Wordpress
+          title: Aperir session con Wordpress
+        yahoo: 
+          alt: Aperir session con un OpenID de Yahoo
+          title: Aperir session con Yahoo

       password: "Contrasigno:"
       password: "Contrasigno:"

-      please login: Per favor aperi un session o {{create_user_link}}.
+      register now: Registrar ora
+      remember: "Memorar me:"

       title: Aperir session
       title: Aperir session

+      to make changes: Pro facer modificationes in le datos de OpenStreetMap, es necessari haber un conto.
+      with openid: "Es anque possibile aperir session con tu OpenID:"
+      with username: "Ha tu jam un conto de OpenStreetMap? Per favor aperi session con tu nomine de usator e contrasigno:"
+    logout: 
+      heading: Clauder le session de OpenStreetMap
+      logout_button: Clauder session
+      title: Clauder session

     lost_password: 
       email address: "Adresse de e-mail:"
       heading: Contrasigno oblidate?
     lost_password: 
       email address: "Adresse de e-mail:"
       heading: Contrasigno oblidate?


@@ -1097,78 +1528,119 @@ ia:
       notice email on way: Es infortunate que tu lo perdeva :-( ma un e-mail es in via que te permittera de reinitalisar lo tosto.
       title: Contrasigno perdite
     make_friend: 
       notice email on way: Es infortunate que tu lo perdeva :-( ma un e-mail es in via que te permittera de reinitalisar lo tosto.
       title: Contrasigno perdite
     make_friend: 

-      already_a_friend: Tu es ja amico de {{name}}.
-      failed: Pardono, non poteva adder {{name}} como amico.
-      success: "{{name}} es ora tu amico."
+      already_a_friend: Tu es ja amico de %{name}.
+      button: Adder como amico
+      failed: Pardono, non poteva adder %{name} como amico.
+      heading: Adder %{user} como amico?
+      success: "%{name} es ora tu amico!"

     new: 
       confirm email address: "Confirmar adresse de e-mail:"
       confirm password: "Confirmar contrasigno:"
       contact_webmaster: Per favor contacta le <a href="mailto:webmaster@openstreetmap.org">webmaster</a> pro arrangiar le creation de un conto. Nos tentara tractar vostre requesta le plus rapidemente possibile.
     new: 
       confirm email address: "Confirmar adresse de e-mail:"
       confirm password: "Confirmar contrasigno:"
       contact_webmaster: Per favor contacta le <a href="mailto:webmaster@openstreetmap.org">webmaster</a> pro arrangiar le creation de un conto. Nos tentara tractar vostre requesta le plus rapidemente possibile.

+      continue: Continuar

       display name: "Nomine public:"
       display name description: Tu nomine de usator monstrate publicamente. Tu pote cambiar lo plus tarde in le preferentias.
       email address: "Adresse de e-mail:"
       display name: "Nomine public:"
       display name description: Tu nomine de usator monstrate publicamente. Tu pote cambiar lo plus tarde in le preferentias.
       email address: "Adresse de e-mail:"

-      fill_form: Completa le formulario e nos te inviara promptemente un e-mail pro activar tu conto.
-      flash create success message: Le usator ha essite create con successo. Recipe tu e-mail pro un nota de confirmation, e tu devenira tosto un cartographo. :-)<br /><br />Nota ben que tu non potera aperir un session usque tu ha recipite e confirmate tu adresse de e-mail.<br /><br />Si tu usa un systema anti-spam que invia requestas de confirmation, alora per favor assecura te de adder webmaster@openstreetmap.org al lista blanc, post que nos non pote responder a requestas de confirmation.
-      heading: Crear un conto de usator
-      license_agreement: Con le creation de un conto, tu accepta que tote le datos que tu submitte al projecto Openstreetmap sia licentiate (non exclusivemente) sub <a href="http://creativecommons.org/licenses/by-sa/2.0/">iste licentia Creative Commons (by-sa)</a>.
+      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>.

       no_auto_account_create: Infortunatemente in iste momento non es possibile crear un conto pro te automaticamente.
       not displayed publicly: Non monstrate publicamente (vide le <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="politica de confidentialitate del wiki includente un section super adresses de e-mail">politica de confidentialitate</a>)
       no_auto_account_create: Infortunatemente in iste momento non es possibile crear un conto pro te automaticamente.
       not displayed publicly: Non monstrate publicamente (vide le <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="politica de confidentialitate del wiki includente un section super adresses de e-mail">politica de confidentialitate</a>)

+      openid: "OpenID de %{logo}:"
+      openid association: "<p>Iste OpenID non es ancora associate a un conto de OpenStreetMap.</p>\n<ul>\n  <li>Si tu es nove a OpenStreetMap, per favor crea un conto usante le formulario sequente.</li>\n  <li>\n    Si tu ha jam un conto, tu pote aperir session usante\n    tu nomine de usator e contrasigno, e postea associar le\n    conto a tu OpenID in tu configurationes de usator.\n  </li>\n</ul>"
+      openid no password: Con un OpenID, un contrasigno non es necessari, ma certe additional instrumentos o servitores pote totevia requirer un contrasigno.

       password: "Contrasigno:"
       password: "Contrasigno:"

-      signup: Inscriber
+      terms accepted: Gratias pro acceptar le nove conditiones de contributor!
+      terms declined: Nos regretta que tu ha decidite de non acceptar le nove Conditiones de contributor. Pro plus informationes, per favor vide <a href="%{url}">iste pagina wiki</a>.

       title: Crear conto
       title: Crear conto

+      use openid: Alternativemente, usa un OpenID de %{logo} pro aperir session

     no_such_user: 
     no_such_user: 

-      body: Non existe un usator con le nomine {{user}}. Per favor verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
-      heading: Le usator {{user}} non existe
-      title: Nulle tal usator
+      body: Non existe un usator con le nomine %{user}. Per favor verifica le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
+      heading: Le usator %{user} non existe
+      title: Iste usator non existe
+    popup: 
+      friend: Amico
+      nearby mapper: Cartographo vicin
+      your location: Tu position

     remove_friend: 
     remove_friend: 

-      not_a_friend: "{{name}} non es un de tu amicos."
-      success: "{{name}} ha essite removite de tu amicos."
+      button: Remover amico
+      heading: Remover %{user} como amico?
+      not_a_friend: "%{name} non es un de tu amicos."
+      success: "%{name} ha essite removite de tu amicos."

     reset_password: 
       confirm password: "Confirma contrasigno:"
       flash changed: Tu contrasigno ha essite cambiate.
       flash token bad: Indicio non trovate. Verifica le URL.
     reset_password: 
       confirm password: "Confirma contrasigno:"
       flash changed: Tu contrasigno ha essite cambiate.
       flash token bad: Indicio non trovate. Verifica le URL.

-      heading: Reinitialisar le contrasigno de {{user}}
+      heading: Reinitialisar le contrasigno de %{user}

       password: "Contrasigno:"
       reset: Reinitialisar contrasigno
       title: Reinitialisar contrasigno
     set_home: 
       flash success: Position de origine confirmate con successo
       password: "Contrasigno:"
       reset: Reinitialisar contrasigno
       title: Reinitialisar contrasigno
     set_home: 
       flash success: Position de origine confirmate con successo

+    suspended: 
+      body: "<p>\n  Pardono, tu conto ha essite automaticamente disactivate debite a\n  activitate suspecte.\n</p>\n<p>\n  Iste decision essera revidite per un administrator tosto, o\n  tu pote contactar le %{webmaster} si tu desira discuter isto.\n</p>"
+      heading: Conto suspendite
+      title: Conto suspendite
+      webmaster: webmaster
+    terms: 
+      agree: Acceptar
+      consider_pd: In addition al contracto hic supra, io considera mi contributiones como essente in le dominio public
+      consider_pd_why: que es isto?
+      decline: Declinar
+      guidance: "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>"
+      heading: Conditiones de contributor
+      legale_names: 
+        france: Francia
+        italy: Italia
+        rest_of_world: Resto del mundo
+      legale_select: "Per favor selige tu pais de residentia:"
+      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.
+      title: Conditiones de contributor
+      you need to accept or decline: Per favor lege e postea accepta o declina le nove Conditiones del Contributor pro continuar.

     view: 
       activate_user: activar iste usator
     view: 
       activate_user: activar iste usator

-      add as friend: adder como amico
-      add image: Adder imagine
-      ago: ({{time_in_words_ago}} retro)
-      block_history: vider blocadas recipite
+      add as friend: adder amico
+      ago: (%{time_in_words_ago} retro)
+      block_history: blocadas recipite

       blocks by me: blocadas per me
       blocks on me: blocadas super me
       blocks by me: blocadas per me
       blocks on me: blocadas super me

-      change your settings: cambiar tu configurationes
+      comments: commentos

       confirm: Confirmar
       confirm: Confirmar

+      confirm_user: confirmar iste usator

       create_block: blocar iste usator
       created from: "Create ex:"
       create_block: blocar iste usator
       created from: "Create ex:"

+      ct accepted: Acceptate %{ago} retro
+      ct declined: Declinate
+      ct status: "Conditiones de contributor:"
+      ct undecided: Indecise

       deactivate_user: disactivar iste usator
       deactivate_user: disactivar iste usator

-      delete image: Deler imagine

       delete_user: deler iste usator
       description: Description
       diary: diario
       edits: modificationes
       email address: "Adresse de e-mail:"
       delete_user: deler iste usator
       description: Description
       diary: diario
       edits: modificationes
       email address: "Adresse de e-mail:"

+      friends_changesets: gruppos de modificationes de tu amicos
+      friends_diaries: articulos de diario de tu amicos

       hide_user: celar iste usator
       hide_user: celar iste usator

-      if set location: Si tu ha definite tu position, il apparera ci infra un elegante carta e altere cosas. Tu pote definir tu position de origine in tu pagina de {{settings_link}}.
-      km away: a {{count}} km de distantia
-      m away: a {{count}} m de distantia
+      if set location: Defini tu position de origine in le %{settings_link} pro vider le usatores a proximitate.
+      km away: a %{count} km de distantia
+      latest edit: "Ultime modification %{ago}:"
+      m away: a %{count} m de distantia

       mapper since: "Cartographo depost:"
       mapper since: "Cartographo depost:"

-      moderator_history: vider blocadas date
+      moderator_history: blocadas date
+      my comments: mi commentos

       my diary: mi diario
       my edits: mi modificationes
       my diary: mi diario
       my edits: mi modificationes

+      my notes: mi notas de carta

       my settings: mi configurationes
       my traces: mi tracias
       my settings: mi configurationes
       my traces: mi tracias

-      my_oauth_details: Vider mi detalios OAuth
-      nearby users: "Usatores vicin:"
+      nearby users: Altere usatores vicin
+      nearby_changesets: gruppos de modificationes de usatores a proximitate
+      nearby_diaries: articulos de diario per usatores a proximitate

       new diary entry: nove entrata de diario
       no friends: Tu non ha ancora addite alcun amico.
       new diary entry: nove entrata de diario
       no friends: Tu non ha ancora addite alcun amico.

-      no home location: Nulle position de origine ha essite definite.
-      no nearby users: Il non ha ancora cartographos in le vicinitate.
-      remove as friend: remover como amico
+      no nearby users: Il non ha ancora altere cartographos in le vicinitate.
+      notes: notas de carta
+      oauth settings: configuration oauth
+      remove as friend: remover amico

       role: 
         administrator: Iste usator es un administrator
         grant: 
       role: 
         administrator: Iste usator es un administrator
         grant: 


@@ -1180,41 +1652,40 @@ ia:
           moderator: Revocar accesso de moderator
       send message: inviar message
       settings_link_text: configurationes
           moderator: Revocar accesso de moderator
       send message: inviar message
       settings_link_text: configurationes

+      spam score: "Punctuation de spam:"
+      status: "Stato:"

       traces: tracias
       unhide_user: revelar iste usator
       traces: tracias
       unhide_user: revelar iste usator

-      upload an image: Cargar un imagine
-      user image heading: Imagine del usator

       user location: Position del usator
       your friends: Tu amicos
   user_block: 
     blocks_by: 
       user location: Position del usator
       your friends: Tu amicos
   user_block: 
     blocks_by: 

-      empty: "{{name}} non ha ancora facite alcun blocada."
-      heading: Lista de blocadas per {{name}}
-      title: Blocadas per {{name}}
+      empty: "%{name} non ha ancora facite alcun blocada."
+      heading: Lista de blocadas per %{name}
+      title: Blocadas per %{name}

     blocks_on: 
     blocks_on: 

-      empty: "{{name}} non ha ancora essite blocate."
-      heading: Lista de blocadas de {{name}}
-      title: Blocadas de {{name}}
+      empty: "%{name} non ha ancora essite blocate."
+      heading: Lista de blocadas de %{name}
+      title: Blocadas de %{name}

     create: 
     create: 

-      flash: Creava un blocada del usator {{name}}.
+      flash: Creava un blocada del usator %{name}.

       try_contacting: Per favor contacta le usator ante de blocar le o la, permittente un tempore rationabile pro responder.
       try_waiting: Per favor da le usator le tempore pro responder ante de blocar le o la.
     edit: 
       back: Examinar tote le blocadas
       try_contacting: Per favor contacta le usator ante de blocar le o la, permittente un tempore rationabile pro responder.
       try_waiting: Per favor da le usator le tempore pro responder ante de blocar le o la.
     edit: 
       back: Examinar tote le blocadas

-      heading: Modification de un blocada super {{name}}
+      heading: Modification de un blocada super %{name}

       needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?
       period: Quante tempore, a partir de ora, essera le usator blocate del API?
       needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?
       period: Quante tempore, a partir de ora, essera le usator blocate del API?

-      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.
+      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.

       show: Examinar iste blocada
       submit: Actualisar blocada
       show: Examinar iste blocada
       submit: Actualisar blocada

-      title: Modification de un blocada super {{name}}
+      title: Modification de un blocada super %{name}

     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 le lista disrolante.
     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 le lista disrolante.

-      not_a_moderator: Tu debe esser moderator pro executar iste action.

     helper: 
     helper: 

-      time_future: Expira in {{time}}.
-      time_past: Expirava {{time}} retro.
+      time_future: Expira in %{time}.
+      time_past: Expirava %{time} retro.

       until_login: Active usque le usator aperi un session.
     index: 
       empty: Nulle blocada ha ancora essite effectuate.
       until_login: Active usque le usator aperi un session.
     index: 
       empty: Nulle blocada ha ancora essite effectuate.


@@ -1225,71 +1696,91 @@ ia:
       non_moderator_update: Debe esser moderator pro crear o actualisar un blocada.
     new: 
       back: Vider tote le blocadas
       non_moderator_update: Debe esser moderator pro crear o actualisar un blocada.
     new: 
       back: Vider tote le blocadas

-      heading: Crea blocada de {{name}}
+      heading: Crea blocada de %{name}

       needs_view: Le usator debe aperir un session ante que iste blocada essera cancellate
       period: Quante tempore, a partir de ora, essera le usator blocate del API?
       needs_view: Le usator debe aperir un session ante que iste blocada essera cancellate
       period: Quante tempore, a partir de ora, essera le usator blocate del API?

-      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.
+      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.

       submit: Crear blocada
       submit: Crear blocada

-      title: Crea blocada de {{name}}
+      title: Crea blocada de %{name}

       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.
     not_found: 
       back: Retornar al indice
       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.
     not_found: 
       back: Retornar al indice

-      sorry: Le blocada de usator con ID {{id}} non ha essite trovate.
+      sorry: Le blocada de usator con ID %{id} non ha essite trovate.

     partial: 
       confirm: Es tu secur?
       creator_name: Creator
       display_name: Usator blocate
       edit: Modificar
     partial: 
       confirm: Es tu secur?
       creator_name: Creator
       display_name: Usator blocate
       edit: Modificar

+      next: Sequente »

       not_revoked: (non revocate)
       not_revoked: (non revocate)

+      previous: « Precedente

       reason: Motivo del blocada
       revoke: Revocar!
       revoker_name: Revocate per
       show: Monstrar
       reason: Motivo del blocada
       revoke: Revocar!
       revoker_name: Revocate per
       show: Monstrar

+      showing_page: Pagina %{page}

       status: Stato
     period: 
       one: 1 hora
       status: Stato
     period: 
       one: 1 hora

-      other: "{{count}} horas"
+      other: "%{count} horas"

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

-      heading: Revoca blocada de {{block_on}} per {{block_by}}
-      past: Iste blocada expirava {{time}} retro e non pote esser revocate ora.
+      heading: Revoca blocada de %{block_on} per %{block_by}
+      past: Iste blocada expirava %{time} retro e non pote esser revocate ora.

       revoke: Revocar!
       revoke: Revocar!

-      time_future: Iste blocada expirara in {{time}}.
-      title: Revoca blocada de {{block_on}}
+      time_future: Iste blocada expirara in %{time}.
+      title: Revoca blocada de %{block_on}

     show: 
       back: Vider tote le blocadas
       confirm: Es tu secur?
       edit: Modificar
     show: 
       back: Vider tote le blocadas
       confirm: Es tu secur?
       edit: Modificar

-      heading: "{{block_on}} blocate per {{block_by}}"
+      heading: "%{block_on} blocate per %{block_by}"

       needs_view: Le usator debe aperir un session ante que iste blocada es cancellate.
       reason: "Motivo del blocada:"
       revoke: Revocar!
       revoker: "Revocator:"
       show: Monstrar
       status: Stato
       needs_view: Le usator debe aperir un session ante que iste blocada es cancellate.
       reason: "Motivo del blocada:"
       revoke: Revocar!
       revoker: "Revocator:"
       show: Monstrar
       status: Stato

-      time_future: Expira in {{time}}
-      time_past: Expirava {{time}} retro
-      title: "{{block_on}} blocate per {{block_by}}"
+      time_future: Expira in %{time}
+      time_past: Expirava %{time} retro
+      title: "%{block_on} blocate per %{block_by}"

     update: 
       only_creator_can_edit: Solmente le moderator qui creava iste blocada pote modificar lo.
       success: Blocada actualisate.
   user_role: 
     filter: 
     update: 
       only_creator_can_edit: Solmente le moderator qui creava iste blocada pote modificar lo.
       success: Blocada actualisate.
   user_role: 
     filter: 

-      already_has_role: Le usator ha ja le rolo {{role}}.
-      doesnt_have_role: Le usator non ha le rolo {{role}}.
-      not_a_role: Le catena `{{role}}' non es un rolo valide.
+      already_has_role: Le usator ha ja le rolo %{role}.
+      doesnt_have_role: Le usator non ha le rolo %{role}.
+      not_a_role: Le catena `%{role}' non es un rolo valide.

       not_an_administrator: Solmente administratores pote gerer le rolos de usator, e tu non es administrator.
     grant: 
       not_an_administrator: Solmente administratores pote gerer le rolos de usator, e tu non es administrator.
     grant: 

-      are_you_sure: Es tu secur de voler conceder le rolo `{{role}}' al usator `{{name}}'?
+      are_you_sure: Es tu secur de voler conceder le rolo `%{role}' al usator `%{name}'?

       confirm: Confirmar
       confirm: Confirmar

-      fail: Impossibile conceder le rolo `{{role}}' al usator `{{name}}'. Verifica que e le usator e le rolo es valide.
+      fail: Impossibile conceder le rolo `%{role}' al usator `%{name}'. Verifica que e le usator e le rolo es valide.

       heading: Confirmar le concession del rolo
       title: Confirmar le concession del rolo
     revoke: 
       heading: Confirmar le concession del rolo
       title: Confirmar le concession del rolo
     revoke: 

-      are_you_sure: Es tu secur de voler revocar le rolo `{{role}}' del usator `{{name}}'?
+      are_you_sure: Es tu secur de voler revocar le rolo `%{role}' del usator `%{name}'?

       confirm: Confirmar
       confirm: Confirmar

-      fail: Impossibile revocar le rolo `{{role}}' del usator `{{name}}'. Verifica que e le usator e le rolo es valide.
+      fail: Impossibile revocar le rolo `%{role}' del usator `%{name}'. Verifica que e le usator e le rolo es valide.

       heading: Confirmar le revocation del rolo
       title: Confirmar le revocation del rolo
       heading: Confirmar le revocation del rolo
       title: Confirmar le revocation del rolo

+  welcome_page: 
+    basic_terms: 
+      editor_html: Un <strong>editor</strong> es un programma o sito web que tu pote usar pro modificar le carta.
+      node_html: Un <strong>nodo</strong> es un puncto sur le carta, como un restaurante o un arbore individual.
+      paragraph_1_html: OpenStreetMap ha un jargon proprie. Ecce alcun parolas clave que te essera utile.
+      tag_html: Un <strong>etiquetta</strong> es un unitate de information sur un nodo o via, como le nomine de un restaurante o le limite de velocitate de un strata.
+      title: Vocabulario de base pro le cartographia
+      way_html: Un <strong>via</strong> es un linea o area, como un strata, fluxo, laco o edificio.
+    introduction_html: Bevenite a OpenStreetMap, le carta libere e modificabile del mundo. Ora que tu te ha inscribite, tu es preste a comenciar a cartographiar. Ecce un guida curte con le cosas le plus importante a saper.
+    questions: 
+      title: Questiones?
+    start_mapping: comenciar le cartographia
+    title: Benvenite!
+    whats_on_the_map: 
+      off_html: Illo <em>non</em> include datos subjective como punctos de appreciation, elementos historic o hypothetic. Le datos ab fontes sub copyright es equalmente excludite; non copia cosas ab cartas in linea o de papiro sin permission special!
+      on_html: OpenStreetMap es un loco pro cartographiar cosas <em>real e actual</em>; illo include milliones de edificios, stratas e altere detalios sur locos. Tu pote cartographiar qualcunque elemento del mundo real que te interessa.
+      title: Que es sur le carta?