Localisation updates from https://translatewiki.net.

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 99b48925ddba73c6b50ef9c5e4e5e13b06455509..b6c4656beb332834050165517ff68619c59eb063 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -1,7 +1,6 @@
 # Messages for Interlingua (interlingua)
 # Exported from translatewiki.net
 # Export driver: phpyaml
-# Author: Abijeet Patro
 # Author: Carlosedepaula
 # Author: Fanjiayi
 # Author: Julian Mendez
@@ -14,6 +13,8 @@ ia:
     formats:
       friendly: '%e de %B %Y a %H:%M'
   helpers:
+    file:
+      prompt: Selige file
     submit:
       diary_comment:
         create: Salveguardar
@@ -26,10 +27,10 @@ ia:
         create: Inviar
       client_application:
         create: Registrar
-        update: Modificar
+        update: Actualisar
       redaction:
-        create: Crear obscuration
-        update: Salveguardar obscuration
+        create: Crear suppression
+        update: Salveguardar suppression
       trace:
         create: Incargar
         update: Salveguardar modificationes
@@ -49,6 +50,7 @@ ia:
       diary_comment: Commento de diario
       diary_entry: Entrata del diario
       friend: Amico
+      issue: Problema
       language: Lingua
       message: Message
       node: Nodo
@@ -65,6 +67,7 @@ ia:
       relation: Relation
       relation_member: Membro de relation
       relation_tag: Etiquetta de relation
+      report: Reporto
       session: Session
       trace: Tracia
       tracepoint: Puncto de tracia
@@ -76,6 +79,18 @@ ia:
       way_node: Nodo de via
       way_tag: Etiquetta de via
     attributes:
+      client_application:
+        name: Nomine (obligatori)
+        url: URL principal del application (obligatori)
+        callback_url: URL de retorno
+        support_url: URl de supporto
+        allow_read_prefs: leger su preferentias de usator
+        allow_write_prefs: modificar su preferentias de usator
+        allow_write_diary: crear entratas de diario, commentos e adder amicos
+        allow_write_api: modificar le carta
+        allow_read_gpx: leger su tracias GPS private
+        allow_write_gpx: incargar tracias GPS
+        allow_write_notes: modificar notas
       diary_comment:
         body: Texto
       diary_entry:
@@ -90,24 +105,43 @@ ia:
       trace:
         user: Usator
         visible: Visibile
-        name: Nomine
+        name: Nomine de file
         size: Dimension
         latitude: Latitude
         longitude: Longitude
         public: Public
         description: Description
+        gpx_file: Incargar file GPX
+        visibility: Visibilitate
+        tagstring: Etiquettas
       message:
         sender: Expeditor
         title: Subjecto
         body: Texto
         recipient: Destinatario
+      redaction:
+        description: Description
+      report:
+        category: Selige un motivo pro tu reporto
+        details: Per favor, forni plus detalios sur le problema (obligatori).
       user:
         email: E-mail
+        new_email: 'Adresse de e-mail nove:'
         active: Active
         display_name: Nomine public
         description: Description
+        home_lat: 'Latitude:'
+        home_lon: 'Longitude:'
         languages: Linguas
         pass_crypt: Contrasigno
+        pass_crypt_confirmation: Confirmar contrasigno
+    help:
+      trace:
+        tagstring: separate per commas
+      user_block:
+        needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?
+      user:
+        new_email: (nunquam monstrate publicamente)
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -149,18 +183,21 @@ ia:
         other: '%{count} annos retro'
   editor:
     default: Predefinite (actualmente %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor in navigator del web)
     id:
       name: iD
       description: iD (editor in navigator)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor in navigator del web)
     remote:
       name: Controlo remote
-      description: Controlo remote (JOSM o Merkaartor)
+      description: Controlo remote (JOSM, Potlatch, Merkaartor)
+  auth:
+    providers:
+      none: Necun
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      windowslive: Windows Live
+      github: GitHub
+      wikipedia: Wikipedia
   api:
     notes:
       comment:
@@ -198,6 +235,12 @@ ia:
     anonymous: anonyme
     no_comment: (sin commento)
     part_of: Parte de
+    part_of_relations:
+      one: 1 relation
+      other: '%{count} relationes'
+    part_of_ways:
+      one: 1 via
+      other: '%{count} vias'
     download_xml: Discargar XML
     view_history: Vider historia
     view_details: Vider detalios
@@ -212,8 +255,8 @@ ia:
       relation: Relationes (%{count})
       relation_paginated: Relationes (%{x}-%{y} de %{count})
       comment: Commentos (%{count})
-      hidden_commented_by: Commento celate de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_commented_by_html: Commento celate de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       changesetxml: XML del gruppo de modificationes
       osmchangexml: XML osmChange
       feed:
@@ -224,29 +267,36 @@ ia:
       still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
         quando le gruppo de modificationes essera claudite.
     node:
-      title: 'Nodo: %{name}'
-      history_title: 'Historia del nodo: %{name}'
+      title_html: 'Nodo: %{name}'
+      history_title_html: 'Historia del nodo: %{name}'
     way:
-      title: 'Via: %{name}'
-      history_title: 'Historia del via: %{name}'
+      title_html: 'Via: %{name}'
+      history_title_html: 'Historia del via: %{name}'
       nodes: Nodos
-      also_part_of:
+      nodes_count:
+        one: 1 nodo
+        other: '%{count} nodos'
+      also_part_of_html:
         one: parte del via %{related_ways}
         other: parte del vias %{related_ways}
     relation:
-      title: 'Relation: %{name}'
-      history_title: 'Historia del relation: %{name}'
+      title_html: 'Relation: %{name}'
+      history_title_html: 'Historia del relation: %{name}'
       members: Membros
+      members_count:
+        one: 1 membro
+        other: '%{count} membros'
     relation_member:
-      entry_role: '%{type} %{name} como %{role}'
+      entry_role_html: '%{type} %{name} como %{role}'
       type:
         node: Nodo
         way: Via
         relation: Relation
     containing_relation:
-      entry: Relation %{relation_name}
-      entry_role: Relation %{relation_name} (como %{relation_role})
+      entry_html: Relation %{relation_name}
+      entry_role_html: Relation %{relation_name} (como %{relation_role})
     not_found:
+      title: Non trovate
       sorry: Le %{type} №%{id} non ha essite trovate.
       type:
         node: nodo
@@ -255,6 +305,7 @@ ia:
         changeset: gruppo de modificationes
         note: nota
     timeout:
+      title: Tempore limite excedite
       sorry: Pardono, le datos pro le %{type} con le ID %{id} ha prendite troppo de
         tempore pro esser recuperate.
       type:
@@ -264,9 +315,9 @@ ia:
         changeset: gruppo de modificationes
         note: nota
     redacted:
-      redaction: Obscuration %{id}
+      redaction: Suppression %{id}
       message_html: Le version %{version} de iste %{type} non pote esser monstrate
-        perque illo ha essite obscurate. Vide %{redaction_link} pro detalios.
+        perque illo ha essite supprimite. Vide %{redaction_link} pro detalios.
       type:
         node: nodo
         way: via
@@ -293,15 +344,15 @@ ia:
       open_title: Nota non resolvite №%{note_name}
       closed_title: Nota resolvite №%{note_name}
       hidden_title: Nota celate №%{note_name}
-      opened_by: Create per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous: Create per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous: Commento de un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by: Resolvite per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by: Reactivate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by: Celate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_html: Create per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      opened_by_anonymous_html: Create per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_html: Commento de %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      commented_by_anonymous_html: Commento de un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_html: Resolvite per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      closed_by_anonymous_html: Resolvite per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_html: Reactivate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
+      reopened_by_anonymous_html: Reactivate per un anonymo <abbr title='%{exact_time}'>%{when}</abbr>
+      hidden_by_html: Celate per %{user} <abbr title='%{exact_time}'>%{when}</abbr>
       report: Signalar iste nota
     query:
       title: Cercar objectos
@@ -357,13 +408,8 @@ ia:
     new:
       title: Nove entrata de diario
     form:
-      subject: 'Subjecto:'
-      body: 'Texto:'
-      language: 'Lingua:'
-      location: 'Loco:'
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
-      use_map_link: usar carta
+      location: Loco
+      use_map_link: Usar le carta
     index:
       title: Diarios de usatores
       title_friends: Diarios de amicos
@@ -372,6 +418,7 @@ ia:
       in_language_title: Entratas de diario in %{language}
       new: Nove entrata de diario
       new_title: Componer un nove entrata in mi diario
+      my_diary: Mi diario
       no_entries: Nulle entrata in diario
       recent_entries: Entratas recente del diario
       older_entries: Entratas plus ancian
@@ -383,7 +430,7 @@ ia:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
       leave_a_comment: Lassar un commento
-      login_to_leave_a_comment: '%{login_link} pro lassar un commento'
+      login_to_leave_a_comment_html: '%{login_link} pro lassar un commento'
       login: Aperir session
     no_such_entry:
       title: Nulle tal entrata de diario
@@ -391,9 +438,10 @@ ia:
       body: Pardono, il non ha un entrata de diario o commento con le ID %{id}. Verifica
         le orthographia, o pote esser que le ligamine que tu sequeva es incorrecte.
     diary_entry:
-      posted_by: Publicate per %{link_user} le %{created} in %{language_link}
+      posted_by_html: Publicate per %{link_user} le %{created} in %{language_link}.
+      updated_at_html: Ultime actualisation le %{updated}.
       comment_link: Commentar iste entrata
-      reply_link: Responder a iste entrata
+      reply_link: Inviar un message al autor
       comment_count:
         one: 1 commento
         zero: Nulle commento
@@ -404,7 +452,7 @@ ia:
       confirm: Confirmar
       report: Signalar iste entrata
     diary_comment:
-      comment_from: Commento de %{link_user} a %{comment_created_at}
+      comment_from_html: Commento de %{link_user} a %{comment_created_at}
       hide_link: Celar iste commento
       unhide_link: Non plus celar iste commento
       confirm: Confirmar
@@ -430,17 +478,29 @@ ia:
       comment: Commento
       newer_comments: Commentos plus recente
       older_comments: Commentos plus ancian
+  friendships:
+    make_friend:
+      heading: Adder %{user} como amico?
+      button: Adder como amico
+      success: '%{name} es ora tu amico!'
+      failed: Pardono, non poteva adder %{name} como amico.
+      already_a_friend: Tu es ja amico de %{name}.
+    remove_friend:
+      heading: Remover %{user} como amico?
+      button: Remover amico
+      success: '%{name} ha essite removite de tu amicos.'
+      not_a_friend: '%{name} non es un de tu amicos.'
   geocoder:
     search:
       title:
-        latlon: Resultatos <a href="https://openstreetmap.org/">interne</a>
-        ca_postcode: Resultatos de <a href="https://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        latlon_html: Resultatos <a href="https://openstreetmap.org/">interne</a>
+        ca_postcode_html: Resultatos de <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim_html: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+        geonames_html: Resultatos de <a href="http://www.geonames.org/">GeoNames</a>
+        osm_nominatim_reverse_html: Resultatos de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
-        geonames_reverse: Resultatos ab <a href="http://www.geonames.org/">GeoNames</a>
+        geonames_reverse_html: Resultatos ab <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -448,10 +508,12 @@ ia:
           chair_lift: Telesedia
           drag_lift: Teleski
           gondola: Telecabina
+          magic_carpet: Tapete rolante
           platter: Teleski a platto
           pylon: Pylon
           station: Station de telecabina
           t-bar: Teleski a barras T
+          "yes": Via aeree
         aeroway:
           aerodrome: Aerodromo
           airstrip: Pista de atterrage
@@ -460,11 +522,15 @@ ia:
           hangar: Hangar
           helipad: Heliporto
           holding_position: Puncto de attender
+          navigationaid: Auxilio al navigation aeree
           parking_position: Puncto de parcamento
           runway: Pista
+          taxilane: Via de taxi
           taxiway: Via de circulation pro aviones
           terminal: Terminal
+          windsock: Manica a vento
         amenity:
+          animal_boarding: Pension pro animales
           animal_shelter: Refugio pro animales
           arts_centre: Centro artistic
           atm: Cassa automatic
@@ -474,7 +540,9 @@ ia:
           bench: Banco
           bicycle_parking: Stationamento pro bicyclettas
           bicycle_rental: Location de bicyclettas
+          bicycle_repair_station: Station de reparation de bicyclettas
           biergarten: Terrassa
+          blood_bank: Banco de sanguine
           boat_rental: Location de barcas
           brothel: Bordello
           bureau_de_change: Officio de cambio
@@ -491,6 +559,7 @@ ia:
           clock: Horologio
           college: Schola superior
           community_centre: Centro communitari
+          conference_centre: Centro de conferentias
           courthouse: Tribunal
           crematorium: Crematorio
           dentist: Dentista
@@ -498,6 +567,7 @@ ia:
           drinking_water: Aqua potabile
           driving_school: Autoschola
           embassy: Ambassada
+          events_venue: Loco de eventos
           fast_food: Fast food
           ferry_terminal: Terminal de ferry
           fire_station: Caserna de pumperos
@@ -510,36 +580,42 @@ ia:
           hospital: Hospital
           hunting_stand: Posto de chassa
           ice_cream: Gelato
+          internet_cafe: Café internet
           kindergarten: Schola pro juvene infantes
+          language_school: Schola de linguas
           library: Bibliotheca
+          loading_dock: Imbarcatorio
+          love_hotel: Hotel de amor
           marketplace: Mercato
+          mobile_money_agent: Agente monetari mobile
           monastery: Monasterio
+          money_transfer: Transferimento de moneta
           motorcycle_parking: Parking a motocyclo
+          music_school: Schola de musica
           nightclub: Club nocturne
           nursing_home: Casa de convalescentia
-          office: Officio
           parking: Parking
           parking_entrance: Entrata de autoparco
           parking_space: Spatio de parcamento
+          payment_terminal: Terminal de pagamento
           pharmacy: Pharmacia
           place_of_worship: Loco de adoration
           police: Policia
           post_box: Cassa postal
           post_office: Officio postal
-          preschool: Pre-schola
           prison: Prision
           pub: Taverna
+          public_bath: Banio public
+          public_bookcase: Bibliotheca de strata
           public_building: Edificio public
+          ranger_station: Posto de guarda forestal
           recycling: Puncto de recyclage
           restaurant: Restaurante
-          retirement_home: Residentia pro vetere personas
-          sauna: Sauna
+          sanitary_dump_station: Station de discarga sanitari
           school: Schola
           shelter: Refugio
-          shop: Boteca
           shower: Ducha
           social_centre: Centro social
-          social_club: Club social
           social_facility: Servicio social
           studio: Appartamento de un camera
           swimming_pool: Piscina
@@ -548,19 +624,27 @@ ia:
           theatre: Theatro
           toilets: Toilettes
           townhall: Casa municipal
+          training: Centro de training
           university: Universitate
+          vehicle_inspection: Inspection de vehiculos
           vending_machine: Distributor automatic
           veterinary: Clinica veterinari
           village_hall: Casa communal
           waste_basket: Corbe a papiro
           waste_disposal: Tractamento de immunditias
+          waste_dump_site: Sito de discarga de immunditias
+          watering_place: Abiberatorio
           water_point: Puncto de aqua
-          youth_centre: Centro pro le juventute
+          weighbridge: Ponte bascula
+          "yes": Facilitate
         boundary:
+          aboriginal_lands: Territorios aborigine
           administrative: Limite administrative
           census: Limite de censo
           national_park: Parco national
+          political: Circumscription electoral
           protected_area: Area protegite
+          "yes": Frontiera
         bridge:
           aqueduct: Aqueducto
           boardwalk: Passarella
@@ -569,24 +653,94 @@ ia:
           viaduct: Viaducto
           "yes": Ponte
         building:
+          apartment: Appartamento
+          apartments: Appartamentos
+          barn: Granario
+          bungalow: Bungalow
+          cabin: Cabana de ligno
+          chapel: Cappella
+          church: Edificio de ecclesia
+          civic: Edificio civic
+          college: Edificio de academia
+          commercial: Edificio commercial
+          construction: Edificio in construction
+          detached: Casa individual
+          dormitory: Dormitorio
+          duplex: Casa duple
+          farm: Casa de ferma
+          farm_auxiliary: Casa auxiliar de ferma
+          garage: Garage
+          garages: Garages
+          greenhouse: Estufa
+          hangar: Hangar
+          hospital: Edificio hospitalari
+          hotel: Edificio de hotel
+          house: Casa
+          houseboat: Casa flottante
+          hut: Cabana
+          industrial: Edificio industrial
+          kindergarten: Edificio de schola infantil
+          manufacture: Edificio de fabrica
+          office: Edificio de officio
+          public: Edificio public
+          residential: Edificio residential
+          retail: Magazin
+          roof: Tecto
+          ruins: Edificio in ruina
+          school: Edificio de schola
+          semidetached_house: Casa geminate
+          service: Edificio de servicio
+          shed: Remissa
+          stable: Stabulo
+          static_caravan: Caravana
+          temple: Edificio de templo
+          terrace: Casas in serie
+          train_station: Edificio de station ferroviari
+          university: Edificio de universitate
+          warehouse: Deposito
           "yes": Edificio
+        club:
+          scout: Base de gruppo de scout
+          sport: Club de sport
+          "yes": Club
         craft:
+          beekeper: Apicultor
+          blacksmith: Ferrero
           brewery: Fabrica de bira
           carpenter: Carpentero
+          caterer: Catering
+          confectionery: Confecteria
+          dressmaker: Modista
           electrician: Electricista
+          electronics_repair: Reparation de electronica
           gardener: Jardinero
+          glaziery: Vitreria
+          handicraft: Artisanato
+          hvac: Fabricante de climatisation
+          metal_construction: Constructor in metallo
           painter: Pictor
           photographer: Photographo
           plumber: Plumbero
+          roofer: Copertor de tectos
+          sawmill: Serreria
           shoemaker: Scarpero
+          stonemason: Taliator de petras
           tailor: Sartor
+          window_construction: Construction de fenestras
+          winery: Vinia
           "yes": Boteca de artisanato
         emergency:
+          access_point: Puncto de accesso
           ambulance_station: Station de ambulantias
           assembly_point: Puncto de incontro
           defibrillator: Defibrillator
+          fire_xtinguisher: Extinctor de incendios
+          fire_water_pond: Bassino de aqua contra incendios
           landing_site: Loco de atterrage de emergentia
+          life_ring: Boia de salvamento
           phone: Telephono de emergentia
+          siren: Sirena de emergentia
+          suction_point: Puncto de suction de emergentia
           water_tank: Cisterna de aqua de emergentia
           "yes": Emergentia
         highway:
@@ -599,6 +753,7 @@ ia:
           cycleway: Pista cyclabile
           elevator: Ascensor
           emergency_access_point: Puncto de accesso de emergentia
+          emergency_bay: Rampa de emergentia
           footway: Sentiero pro pedones
           ford: Vado
           give_way: Signal de ceder le passage
@@ -629,19 +784,23 @@ ia:
           tertiary: Via tertiari
           tertiary_link: Via tertiari
           track: Pista
+          traffic_mirror: Speculo de traffico
           traffic_signals: Lumines de traffico
-          trail: Pista
+          trailhead: Initio de sentiero
           trunk: Via national
           trunk_link: Via national
           turning_loop: Bucla de giro
           unclassified: Via non classificate
           "yes": Cammino
         historic:
+          aircraft: Avion historic
           archaeological_site: Sito archeologic
+          bomb_crater: Crater de bomba historic
           battlefield: Campo de battalia
           boundary_stone: Lapide de frontiera
           building: Edificio historic
           bunker: Bunker
+          cannon: Cannon historic
           castle: Castello
           church: Ecclesia
           city_gate: Porta de citate
@@ -649,7 +808,6 @@ ia:
           fort: Forte
           heritage: Sito de patrimonio
           house: Casa
-          icon: Icone
           manor: Casa seniorial
           memorial: Memorial
           mine: Mina
@@ -694,7 +852,6 @@ ia:
           reservoir_watershed: Bassino interfluvial
           residential: Area residential
           retail: Magazines
-          road: Area de cammino
           village_green: Parco de village
           vineyard: Vinia
           "yes": Uso de terreno
@@ -741,6 +898,7 @@ ia:
           embankment: Terrapleno
           flagpole: Palo de baniera
           gasometer: Gasometro
+          groyne: Rumpeundas
           kiln: Furno
           lighthouse: Pharo
           mast: Mast
@@ -775,6 +933,7 @@ ia:
           cape: Capo
           cave_entrance: Entrata de caverna
           cliff: Precipitio
+          coastline: Linea de costa
           crater: Crater
           dune: Duna
           fell: Montania
@@ -850,7 +1009,6 @@ ia:
           subdivision: Subdivision
           suburb: Suburbio
           town: Urbe
-          unincorporated_area: Area sin municipalitate
           village: Village
           "yes": Loco
         railway:
@@ -876,6 +1034,7 @@ ia:
           switch: Agulia
           tram: Tramvia
           tram_stop: Halto de tram
+          yard: Station de manovras
         shop:
           alcohol: Magazin de bibitas alcoholic
           antiques: Antiquitates
@@ -884,6 +1043,7 @@ ia:
           beauty: Salon de beltate
           beverages: Boteca de bibitas
           bicycle: Magazin de bicyclettas
+          bookmaker: Agente de sponsiones
           books: Libreria
           boutique: Boutique
           butcher: Macelleria
@@ -908,12 +1068,10 @@ ia:
           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
@@ -922,11 +1080,15 @@ ia:
           hairdresser: Perruccheria
           hardware: Quincalieria
           hifi: Hi-fi
+          houseware: Magazin de articulos domestic
+          interior_decoration: Decoration interior
           jewelry: Joieleria
           kiosk: Kiosque
+          kitchen: Magazin de cocina
           laundry: Lavanderia
+          lottery: Lotteria
           mall: Galeria mercante
-          market: Mercato
+          massage: Massage
           mobile_phone: Boteca de telephonos mobile
           motorcycle: Magazin de motocyclos
           music: Magazin de musica
@@ -934,17 +1096,24 @@ ia:
           optician: Optico
           organic: Boteca de alimentos organic
           outdoor: Magazin de sport al aere libere
+          paint: Magazin de colores
+          pawnbroker: Prestator sur pignore
           pet: Boteca de animales
-          pharmacy: Pharmacia
           photo: Magazin de photographia
+          seafood: Fructos de mar
           second_hand: Magazin de secunde mano
           shoes: Scarperia
           sports: Magazin de sport
           stationery: Papireria
           supermarket: Supermercato
           tailor: Sartor
+          ticket: Billeteria
+          tobacco: Tabacheria
           toys: Magazin de joculos
           travel_agency: Agentia de viages
+          tyres: Magazin de pneus
+          vacant: Magazin vacante
+          variety_store: Magazin a precio unic
           video: Magazin de video
           wine: Magazin de vinos
           "yes": Boteca
@@ -970,6 +1139,7 @@ ia:
           viewpoint: Puncto de vista
           zoo: Jardin zoologic
         tunnel:
+          building_passage: Passage sub edificio
           culvert: Tubo de aqua subterranee
           "yes": Tunnel
         waterway:
@@ -999,11 +1169,6 @@ ia:
         level8: Limite de citate
         level9: Limite de village
         level10: Limite de suburbio
-    description:
-      title:
-        osm_nominatim: Loco de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Position de <a href="http://www.geonames.org/">GeoNames</a>
       types:
         cities: Citates
         towns: Villages
@@ -1066,11 +1231,10 @@ ia:
     reopen:
       reopened: Le stato del problema ha essite cambiate a 'Aperte'
     comments:
-      created_at: Le %{datetime}
+      comment_from_html: Commento de %{user_link} del %{comment_created_at}
       reassign_param: Reassignar problema?
     reports:
-      updated_at: Le %{datetime}
-      reported_by_html: Reportate como %{category} per %{user}
+      reported_by_html: Reportate como %{category} per %{user} le %{updated_at}
     helper:
       reportable_title:
         diary_comment: '%{entry_title}, commento #%{comment_id}'
@@ -1082,8 +1246,6 @@ ia:
     new:
       title_html: Reportar %{link}
       missing_params: Impossibile crear un nove reporto
-      details: Per favor, forni plus detalios sur le problema (obligatori).
-      select: 'Selige un motivo pro tu reporto:'
       disclaimer:
         intro: 'Ante de inviar tu reporto al moderatores del sito, per favor assecura
           te que:'
@@ -1167,42 +1329,45 @@ ia:
       text: Facer un donation
     learn_more: Leger plus
     more: Plus
-  notifier:
+  user_mailer:
     diary_comment_notification:
       subject: '[OpenStreetMap] %{user} commentava un entrata de diario'
       hi: Salute %{to_user},
       header: '%{from_user} ha commentate le entrata recente de diario OpenStreetMap
         con le subjecto %{subject}:'
-      footer: Tu pote tamben leger le commento a %{readurl} e tu pote commentar a
-        %{commenturl} o responder a %{replyurl}
+      header_html: '%{from_user} ha commentate le entrata de diario OpenStreetMap
+        con le subjecto %{subject}:'
+      footer: Tu pote etiam leger le commento a %{readurl} e tu pote commentar a %{commenturl}
+        o inviar un message al autor a %{replyurl}
+      footer_html: Tu pote etiam leger le commento sur %{readurl} e tu pote commentar
+        sur %{commenturl} o inviar un message al autor sur %{replyurl}
     message_notification:
+      subject: '[OpenStreetMap] %{message_title}'
       hi: Salute %{to_user},
       header: '%{from_user} te ha inviate un message per OpenStreetMap con le subjecto
         %{subject}:'
-      footer_html: Tu pote anque leger le message a %{readurl} e tu pote responder
-        a %{replyurl}
-    friend_notification:
+      header_html: '%{from_user} te ha inviate un message per OpenStreetMap con le
+        subjecto %{subject}:'
+      footer: Tu pote etiam leger le message sur %{readurl} e tu pote inviar un message
+        al autor sur %{replyurl}
+      footer_html: Tu pote etiam leger le message a %{readurl} e tu pote inviar un
+        message al autor a %{replyurl}
+    friendship_notification:
       hi: Salute %{to_user},
       subject: '[OpenStreetMap] %{user} te ha addite como amico'
       had_added_you: '%{user} te ha addite como amico in OpenStreetMap.'
       see_their_profile: Tu pote vider su profilo a %{userurl}.
       befriend_them: Tu pote equalmente adder le/la como amico a %{befriendurl}.
-    gpx_notification:
-      greeting: Salute,
-      your_gpx_file: Il pare que tu file GPX
-      with_description: con le description
-      and_the_tags: 'e le sequente etiquettas:'
-      and_no_tags: e sin etiquettas.
-      failure:
-        subject: '[OpenStreetMap] Importation GPX fallite'
-        failed_to_import: 'ha fallite de importar. Ecce le error:'
-        more_info_1: Plus informationes super le fallimentos de importation GPX e
-          como evitar los
-        more_info_2: 'los se trova a:'
-      success:
-        subject: '[OpenStreetMap] Importation GPX succedite'
-        loaded_successfully: ha essite cargate con successo con %{trace_points} ex
-          un maximo de %{possible_points} punctos.
+    gpx_failure:
+      failed_to_import: 'ha fallite de importar. Ecce le error:'
+      subject: '[OpenStreetMap] Importation GPX fallite'
+    gpx_success:
+      loaded_successfully:
+        one: ha essite cargate con successo con %{trace_points} ex un maximo de 1
+          puncto.
+        other: ha essite cargate con successo con %{trace_points} ex un maximo de
+          %{possible_points} punctos.
+      subject: '[OpenStreetMap] Importation GPX succedite'
     signup_confirm:
       subject: '[OpenStreetMap] Benvenite a OpenStreetMap'
       greeting: Bon die!
@@ -1214,32 +1379,18 @@ ia:
         supplementari pro adjutar te a comenciar.
     email_confirm:
       subject: '[OpenStreetMap] Confirma tu adresse de e-mail'
-    email_confirm_plain:
       greeting: Salute,
       hopefully_you: Alcuno (probabilemente tu) vole cambiar su adresse de e-mail
         in %{server_url} a %{new_address}.
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
         confirmar le alteration.
-    email_confirm_html:
-      greeting: Salute,
-      hopefully_you: Alcuno (sperabilemente tu) vole cambiar su adresse de e-mail
-        in %{server_url} a %{new_address}.
-      click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
-        confirmar le alteration.
     lost_password:
       subject: '[OpenStreetMap] Requesta de reinitialisation del contrasigno'
-    lost_password_plain:
       greeting: Salute,
       hopefully_you: Alcuno (probabilemente tu) ha demandate que le contrasigno del
         conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate.
       click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
         reinitialisar tu contrasigno.
-    lost_password_html:
-      greeting: Salute,
-      hopefully_you: Alcuno (possibilemente tu) ha demandate que le contrasigno del
-        conto openstreetmap.org associate con iste adresse de e-mail sia reinitialisate.
-      click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro
-        reinitialisar tu contrasigno.
     note_comment_notification:
       anonymous: Un usator anonyme
       greeting: Salute,
@@ -1274,21 +1425,49 @@ ia:
           de modificationes'
         subject_other: '[OpenStreetMap] %{commenter} ha commentate un gruppo de modificationes
           que te interessa'
-        your_changeset: '%{commenter} ha commentate un de tu gruppos de modificationes
-          create le %{time}'
-        commented_changeset: '%{commenter} ha commentate un gruppo de modificationes
-          que tu observa, create per %{changeset_author} le %{time}'
+        your_changeset: '%{commenter} ha commentate a %{time} un de tu gruppos de
+          modificationes'
+        commented_changeset: '%{commenter} ha commentate a %{time} un gruppo de modificationes
+          que tu observa, create per %{changeset_author}'
         partial_changeset_with_comment: con commento '%{changeset_comment}'
         partial_changeset_without_comment: sin commento
       details: Plus detalios sur le gruppo de modificationes pote esser trovate a
         %{url}.
       unsubscribe: Pro disabonar te del actualisationes de iste gruppo de modificationes,
         visita %{url} e clicca sur "Disabonar".
+  confirmations:
+    confirm:
+      heading: Verifica tu e-mail!
+      introduction_1: Nos te ha inviate un message de confirmation.
+      introduction_2: Confirma tu conto con un clic sur le ligamine in le message
+        e tu potera comenciar a cartographiar.
+      press confirm button: Preme le button de confirmation ci infra pro activar tu
+        conto.
+      button: Confirmar
+      success: Tu conto ha essite confirmate, gratias pro inscriber te!
+      already active: Iste conto ha ja essite confirmate.
+      unknown token: Iste codice de confirmation ha expirate o non existe.
+      reconfirm_html: Pro reciper un altere message de confirmation, <a href="%{reconfirm}">clicca
+        hic</a>.
+    confirm_resend:
+      success_html: Nos ha inviate un nove message de confirmation a %{email} e si
+        tosto que tu confirma le conto, tu potera comenciar a cartographar.<br /><br
+        />Si tu usa un systema anti-spam que invia requestas de confirmation, alora
+        per favor assecura te de adder %{sender} al lista blanc, alteremente nos non
+        pote responder a requestas de confirmation.
+      failure: Usator %{name} non trovate.
+    confirm_email:
+      heading: Confirmar un cambio de adresse de e-mail
+      press confirm button: Preme le button Confirmar ci infra pro confirmar tu nove
+        adresse de e-mail.
+      button: Confirmar
+      success: Le cambio del adresse de e-mail ha essite confirmate.
+      failure: Un adresse de e-mail ha ja essite confirmate con iste token.
+      unknown_token: Iste codice de confirmation ha expirate o non existe.
   messages:
     inbox:
       title: Cassa de entrata
       my_inbox: Mi cassa de entrata
-      outbox: cassa de exito
       messages: Tu ha %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} nove message'
@@ -1299,7 +1478,8 @@ ia:
       from: De
       subject: Subjecto
       date: Data
-      no_messages_yet: Tu non ha ancora messages. Proque non contactar alcun %{people_mapping_nearby_link}?
+      no_messages_yet_html: Tu non ha ancora messages. Proque non contactar alcun
+        %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin
     message_summary:
       unread_button: Marcar como non legite
@@ -1308,7 +1488,7 @@ ia:
       destroy_button: Deler
     new:
       title: Inviar message
-      send_message_to: Inviar un nove message a %{name}
+      send_message_to_html: Inviar un nove message a %{name}
       subject: Subjecto
       body: Texto
       back_to_inbox: Retornar al cassa de entrata
@@ -1322,16 +1502,13 @@ ia:
       body: Non existe un message con iste ID.
     outbox:
       title: Cassa de exito
-      my_inbox: Mi %{inbox_link}
-      inbox: cassa de entrata
-      outbox: cassa de exito
       messages:
         one: Tu ha %{count} message inviate
         other: Tu ha %{count} messages inviate
       to: A
       subject: Subjecto
       date: Data
-      no_sent_messages: Tu non ha ancora inviate alcun message. Proque non contactar
+      no_sent_messages_html: Tu non ha ancora inviate alcun message. Proque non contactar
         alcun %{people_mapping_nearby_link}?
       people_mapping_nearby: cartographos vicin
     reply:
@@ -1358,11 +1535,87 @@ ia:
       as_unread: Message marcate como non legite
     destroy:
       destroyed: Message delite
+  passwords:
+    lost_password:
+      title: Contrasigno perdite
+      heading: Contrasigno oblidate?
+      email address: 'Adresse de e-mail:'
+      new password button: Reinitialisar contrasigno
+      help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
+        inviara un ligamine a iste adresse que tu pote usar pro reinitialisar tu contrasigno.
+      notice email on way: Es infortunate que tu lo perdeva :-( ma un e-mail es in
+        via que te permittera de reinitalisar lo tosto.
+      notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.
+    reset_password:
+      title: Reinitialisar contrasigno
+      heading: Reinitialisar le contrasigno de %{user}
+      reset: Reinitialisar contrasigno
+      flash changed: Tu contrasigno ha essite cambiate.
+      flash token bad: Token non trovate. Verifica le URL.
+  sessions:
+    new:
+      title: Aperir session
+      heading: Aperir session
+      email or username: 'Adresse de e-mail o nomine de usator:'
+      password: 'Contrasigno:'
+      openid_html: 'OpenID de %{logo}:'
+      remember: 'Memorar me:'
+      lost password link: Contrasigno perdite?
+      login_button: Aperir session
+      register now: Registrar ora
+      with username: 'Ha tu jam un conto de OpenStreetMap? Per favor aperi session
+        con tu nomine de usator e contrasigno:'
+      with external: 'Alternativemente, usa un tertio pro aperir session:'
+      new to osm: Nove a OpenStreetMap?
+      to make changes: Pro facer modificationes in le datos de OpenStreetMap, es necessari
+        haber un conto.
+      create account minute: Crea un conto. Isto dura solmente un minuta.
+      no account: Non ha un conto?
+      account not active: Pardono, tu conto non es ancora active.<br />Per favor clicca
+        super le ligamine in le e-mail de confirmation pro activar tu conto, o <a
+        href="%{reconfirm}">requesta un nove message de confirmation.</a>.
+      account is suspended: Le tue conto ha essite suspendite a causa de activitate
+        suspecte.<br />Per favor contacta le <a href="%{webmaster}">webmaster</a>
+        si tu vole discuter isto.
+      auth failure: Pardono, non poteva aperir un session con iste detalios.
+      openid_logo_alt: Aperir session con OpenID
+      auth_providers:
+        openid:
+          title: Aperir session con OpenID
+          alt: Aperir session con un URL de OpenID
+        google:
+          title: Aperir session con Google
+          alt: Aperir session con un OpenID de Google
+        facebook:
+          title: Aperir session con Facebook
+          alt: Aperir session con un conto de Facebook
+        windowslive:
+          title: Aperir session con Windows Live
+          alt: Aperir session con un conto de Windows Live
+        github:
+          title: Aperir session con GitHub
+          alt: Aperir session con un conto de GitHub
+        wikipedia:
+          title: Aperir session con Wikipedia
+          alt: Aperir session con un conto de Wikipedia
+        yahoo:
+          title: Aperir session con Yahoo
+          alt: Aperir session con un OpenID de Yahoo
+        wordpress:
+          title: Aperir session con WordPress
+          alt: Aperir session con un OpenID de WordPress
+        aol:
+          title: Aperir session con AOL
+          alt: Aperir session con un OpenID de AOL
+    destroy:
+      title: Clauder session
+      heading: Clauder le session de OpenStreetMap
+      logout_button: Clauder session
   site:
     about:
       next: Sequente
       copyright_html: <span>&copy;</span>Contributores de<br>OpenStreetMap
-      used_by: '%{name} forni datos cartographic a milles de sitos web, applicationes
+      used_by_html: '%{name} forni datos cartographic a milles de sitos web, applicationes
         mobile e dispositivos physic'
       lede_text: OpenStreetMap es construite per un communitate de cartographos que
         contribue e mantene datos sur stratas, sentieros, cafés, stationes ferroviari
@@ -1385,27 +1638,27 @@ ia:
         OpenStreetMap es constituite per <i>datos aperte</i>: tu es libere de usar lo pro qualcunque scopo a condition que tu da credito a OpenStreetMap e su contributores. Si tu altera o extende le datos in certe manieras, tu pote distribuer le resultato solmente sub le mesme licentia. Vide le pagina <a href='%{copyright_path}'>Copyright e
         Licentia</a> pro detalios.
       legal_title: Juridic
-      legal_html: "Iste sito e multe altere servicios associate es formalmente gerite
+      legal_1_html: "Iste sito e multe altere servicios associate es formalmente gerite
         per le  \n<a href=\"https://osmfoundation.org/\">Fundation OpenStreetMap</a>
         (OSMF) \nin nomine del communitate. Le uso de tote le servicios gerite per
         OSMF es subjecte a nostre <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">conditiones
         de uso</a>, a nostre <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\npoliticas
         de uso acceptabile</a> e a nostre <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">politica
-        de confidentialitate</a>.\n<br> \n<a href=\"https://osmfoundation.org/Contact\">Contacta
-        OSMF</a> \nsi vos ha questiones sur licentias, derectos de autor o altere
-        themas juridic.\n<br>\nOpenStreetMap, le logotypo de lupa e \"State of the
-        Map\" es <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">marcas
+        de confidentialitate</a>."
+      legal_2_html: "<a href=\"https://osmfoundation.org/Contact\">Contacta OSMF</a>
+        \nsi vos ha questiones sur licentias, derectos de autor o altere themas juridic.\n<br>\nOpenStreetMap,
+        le logotypo de lupa e \"State of the Map\" es <a href=\"https://wiki.osmfoundation.org/wiki/Trademark_Policy\">marcas
         commercial registrate del OSMF</a>."
       partners_title: Partners
     copyright:
       foreign:
         title: A proposito de iste traduction
-        text: In caso de un conflicto inter iste pagina traducite e %{english_original_link},
+        html: In caso de un conflicto inter iste pagina traducite e %{english_original_link},
           le pagina in anglese prevalera.
         english_link: le original in anglese
       native:
         title: A proposito de iste pagina
-        text: Tu vide nunc le version in anglese del pagina de copyright. Tu pote
+        html: Tu vide nunc le version in anglese del pagina de copyright. Tu pote
           retornar al %{native_link} de iste pagina o tu pote cessar de leger super
           copyright e %{mapping_link}.
         native_link: version in interlingua
@@ -1417,33 +1670,29 @@ ia:
           href="https://opendatacommons.org/licenses/odbl/">Open Data
           Commons Open Database License</a> (ODbL) per le <a
           href="https://osmfoundation.org/">Fundation OpenStreetMap</a> (OSMF).
-        intro_2_html: |2-
-            Vos es libere de copiar, distribuer, transmitter e adaptar nostre cartas
-            e datos, a condition que vos da recognoscentia a OpenStreetMap e su
-            contributores. Si vos altera o extende nostre cartas e datos, vos
-            pote distribuer le resultato solmente sub le mesme licentia. Le
-            complete <a href="https://opendatacommons.org/licenses/odbl/1.0/">codice
-            legal</a> explica vostre derectos e responsabilitates.
-        intro_3_html: |-
-          Le cartographia in nostre tegulas de carta, e nostre documentation, son
-          publicate sub licentia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
+        intro_2_html: Vos es libere de copiar, distribuer, transmitter e adaptar nostre
+          datos, a condition que vos da recognoscentia a OpenStreetMap e su contributores.
+          Si vos altera o extende nostre datos, vos pote distribuer le resultato solmente
+          sub le mesme licentia. Le <a href="https://opendatacommons.org/licenses/odbl/1.0/">codice
+          juridic</a> complete explica vostre derectos e responsabilitates.
+        intro_3_1_html: Nostre documentation es publicate sub licentia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA 2.0).
         credit_title_html: Como dar recognoscentia a OpenStreetMap
         credit_1_html: |-
           Nos require que vos usa le recognoscentia &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
-        credit_2_html: |-
-          Vos debe anque clarificar que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="https://www.openstreetmap.org/copyright">iste pagina de copyright</a>.
-          Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a opendatacommons.org, e (si relevante) a creativecommons.org.
-        credit_3_html: 'Pro un carta electronic navigabile, le recognoscentia debe
+        credit_2_1_html: |-
+          Vos debe etiam indicar clarmente que le datos es disponibile sub Open Database License. Vos pote facer isto con un ligamine a <a href="https://www.openstreetmap.org/copyright">iste pagina de copyright</a>.
+          Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;) e a opendatacommons.org.
+        credit_4_html: 'Pro un carta electronic navigabile, le recognoscentia debe
           apparer in le angulo del carta. Per exemplo:'
         attribution_example:
           alt: Exemplo de como recognoscer OpenStreetMap in un pagina web
           title: Exemplo de recognoscentia
         more_title_html: Pro saper plus
-        more_1_html: |-
-          Lege plus sur le uso de nostre datos, e como recognoscer nos, in le <a
-          href="https://osmfoundation.org/Licence">pagina de licentia OSMF</a>.
+        more_1_html: Lege plus sur le uso de nostre datos, e sur como citar correctemente
+          lor fonte, in le <a href="https://osmfoundation.org/Licence">pagina de licentia
+          OSMF</a>.
         more_2_html: |-
           Ben que OpenStreetMap es datos aperte, nos non pote fornir un API cartographic gratuite pro tertios. Vide nostre <a href="https://operations.osmfoundation.org/policies/api/">politica pro le uso del API</a>,
           <a href="https://operations.osmfoundation.org/policies/tiles">politica pro le uso de tegulas</a>
@@ -1452,29 +1701,30 @@ ia:
         contributors_intro_html: 'Nostre contributores es milles de personas. Nos
           include anque le datos sub licentia aperte de agentias cartographic national
           e de altere fontes, inter le quales:'
-        contributors_at_html: |-
-          <strong>Austria</strong>: Contine datos ab le
-             <a href="https://data.wien.gv.at/">Citate de Vienna</a> licentiate sub
-             <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>.
-        contributors_au_html: |-
-          <strong>Australia</strong>: Contine datos de suburbios a base
-             de datos del Australian Bureau of Statistics.
+        contributors_at_html: '<strong>Austria</strong>: Contine datos ab le <a href="https://data.wien.gv.at/">Citate
+          de Vienna</a> licentiate sub <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
+          BY</a>, <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
+          Vorarlberg</a> e Land Tirol (sub <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC
+          BY AT con emendamentos</a>).'
+        contributors_au_html: '<strong>Australia</strong>: Contine datos obtenite
+          ab <a href="https://www.psma.com.au/psma-data-copyright-and-disclaimer">PSMA
+          Australia Limited</a> licentiate per le Commonwealth de Australia sub <a
+          href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.'
         contributors_ca_html: |-
           <strong>Canada</strong>: Contine datos ab
              GeoBase&reg;, GeoGratis (&copy; Department of Natural
              Resources Canada), CanVec (&copy; Department of Natural
              Resources Canada), e StatCan (Geography Division,
              Statistics Canada).
-        contributors_fi_html: "<strong>Finlandia</strong>: Contine datos ab le base
-          de datos topographic del Inspection \nNational del Territorio de Finlandia
-          e de altere insimules de datos, sub le\n<a href=\"https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">licentia
-          NLSFI</a>."
+        contributors_fi_html: '<strong>Finlandia</strong>: Contine datos ab le base
+          de datos topographic del Inspection National del Territorio de Finlandia
+          e de altere insimules de datos, sub le <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">licentia
+          NLSFI</a>.'
         contributors_fr_html: |-
           <strong>Francia</strong>: Contine datos fornite per le
              Direction Générale des Impôts.
-        contributors_nl_html: |-
-          <strong>Nederlandia</strong>: Contine datos &copy; AND, 2007
-          (<a href="https://www.and.com">www.and.com</a>)
+        contributors_nl_html: '<strong>Nederlandia</strong>: Contine datos &copy;
+          AND, 2007 (<a href="https://www.and.com">www.and.com</a>)'
         contributors_nz_html: '<strong>Nove Zelandia</strong>: Contine datos proveniente
           de <a href="https://data.linz.govt.nz/">LINZ Data Service</a> e licentiate
           pro re-uso sub <a href="https://creativecommons.org/licenses/by/4.0/">CC
@@ -1519,8 +1769,8 @@ ia:
         trademarks_title_html: <span id="trademarks"></span>Marcas commercial
         trademarks_1_html: OpenStreetMap, le logotypo con le lupa e "State of the
           Map" es marcas registrate del Fundation OpenStreetMap. Si vos ha questiones
-          sur le uso de iste marcas, invia los al <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
-          de labor sur licentias</a>.
+          sur le uso de iste marcas, vide nostre <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">politica
+          sur le marcas registrate</a>.
     index:
       js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate
         JavaScript.
@@ -1534,21 +1784,10 @@ ia:
         e que le plug-in de controlo remote es activate
     edit:
       not_public: Tu non ha configurate tu modificationes pro esser public.
-      not_public_description: Tu non potera plus modificar le carta si tu non lo face.
-        Tu pote configurar tu modificationes como public a partir de tu %{user_page}.
+      not_public_description_html: Tu non potera plus modificar le carta si tu non
+        lo face. Tu pote configurar tu modificationes como public a partir de tu %{user_page}.
       user_page_link: pagina de usator
       anon_edits_link_text: Lege proque isto es le caso.
-      flash_player_required: Es necessari haber un reproductor Flash pro usar Potlatch,
-        le editor Flash de OpenStreetMap. Tu pote <a href="https://get.adobe.com/flashplayer/">discargar
-        Flash Player a Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Plure
-        altere optiones</a> es tamben disponibile pro modificar OpenStreetMap.
-      potlatch_unsaved_changes: Tu ha modificationes non salveguardate. (Pro salveguardar
-        in Potlatch, tu debe deseliger le via o puncto actual si tu modifica in modo
-        directe, o cliccar super le button Salveguardar si presente.)
-      potlatch2_not_configured: Potlatch 2 non ha essite configurate. Visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        pro plus information
-      potlatch2_unsaved_changes: Tu ha modificationes non salveguardate. (In Potlatch
-        2, tu debe cliccar super Salveguardar.)
       id_not_configured: iD non ha essite configurate
       no_iframe_support: Tu navigator non supporta le iframes in HTML, necessari pro
         iste functionalitate.
@@ -1561,7 +1800,7 @@ ia:
       map_image: Imagine de carta (monstra le strato standard)
       embeddable_html: HTML incorporabile
       licence: Licentia
-      export_details: Le datos de OpenStreetMap es licentiate sub le <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details_html: Le datos de OpenStreetMap es licentiate sub le <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open
         Data Commons Open Database License</a> (ODbL).
       too_large:
         advice: 'Si iste exportation falle, considera usar un del fontes listate hic
@@ -1629,6 +1868,7 @@ ia:
         title: Benvenite a OpenStreetMap
         description: Comencia con iste guida rapide sur le fundamentos de OpenStreetMap.
       beginners_guide:
+        url: https://wiki.openstreetmap.org/wiki/Ia:Beginners%27_guide
         title: Guida pro comenciantes
         description: Guida pro comenciantes, mantenite per le communitate.
       help:
@@ -1649,6 +1889,7 @@ ia:
         description: Conversation interactive in multe linguas differente e sur multe
           themas.
       switch2osm:
+        title: switch2osm
         description: Adjuta pro companias e organisationes qui vole migrar a cartas
           e altere servicios a base de OpenStreetMap.
       welcomemat:
@@ -1742,23 +1983,6 @@ ia:
           bicycle_shop: Magazin de bicyclettas
           bicycle_parking: Parcamento de bicyclettas
           toilets: Toilettes
-    richtext_area:
-      edit: Modificar
-      preview: Previsualisation
-    markdown_help:
-      title_html: Processate con <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: Titulos
-      heading: Titulo
-      subheading: Subtitulo
-      unordered: Lista non ordinate
-      ordered: Lista ordinate
-      first: Prime elemento
-      second: Secunde elemento
-      link: Ligamine
-      text: Texto
-      image: Imagine
-      alt: Texto alternative
-      url: URL
     welcome:
       title: Benvenite!
       introduction_html: Bevenite a OpenStreetMap, le carta libere e modificabile
@@ -1818,11 +2042,6 @@ ia:
         punctos ordinate con datas e horas)
     new:
       upload_trace: Incargar tracia GPS
-      upload_gpx: 'Incargar file GPX:'
-      description: 'Description:'
-      tags: 'Etiquettas:'
-      tags_help: separate per commas
-      visibility: 'Visibilitate:'
       visibility_help: que significa isto?
       help: Adjuta
     create:
@@ -1842,18 +2061,6 @@ ia:
     edit:
       title: Modification del tracia %{name}
       heading: Modificar le tracia %{name}
-      filename: 'Nomine de file:'
-      download: discargar
-      uploaded_at: 'Incargate le:'
-      points: 'Punctos:'
-      start_coord: 'Coordinata initial:'
-      map: carta
-      edit: modificar
-      owner: 'Proprietario:'
-      description: 'Description:'
-      tags: 'Etiquettas:'
-      tags_help: separate per commas
-      visibility: 'Visibilitate:'
       visibility_help: que significa isto?
     update:
       updated: Tracia actualisate
@@ -1891,7 +2098,6 @@ ia:
       more: plus
       trace_details: Vider detalios del tracia
       view_map: Vider carta
-      edit: modificar
       edit_map: Modificar carta
       public: PUBLIC
       identifiable: IDENTIFICABILE
@@ -1899,7 +2105,6 @@ ia:
       trackable: TRACIABILE
       by: per
       in: in
-      map: carta
     index:
       public_traces: Tracias GPS public
       my_traces: Mi tracias GPS
@@ -1946,9 +2151,9 @@ ia:
   oauth:
     authorize:
       title: Autorisar accesso a tu conto
-      request_access: Le application %{app_name} requesta accesso a tu conto "%{user}".
-        Per favor verifica si tu vole que le application ha le sequente possibilitates.
-        Tu pote seliger tantes o si poches como tu vole.
+      request_access_html: Le application %{app_name} requesta accesso a tu conto
+        "%{user}". Per favor verifica si tu vole que le application ha le sequente
+        possibilitates. Tu pote seliger tantes o si poches como tu vole.
       allow_to: 'Permitter al application cliente:'
       allow_read_prefs: leger tu preferentias de usator.
       allow_write_prefs: modificar tu preferentias de usator.
@@ -1960,7 +2165,7 @@ ia:
       grant_access: Conceder accesso
     authorize_success:
       title: Requesta de autorisation acceptate
-      allowed: Tu ha concedite al application %{app_name} le accesso a tu conto.
+      allowed_html: Tu ha concedite al application %{app_name} le accesso a tu conto.
       verification: Le codice de verification es %{code}.
     authorize_failure:
       title: Requesta de autorisation fallite
@@ -1987,13 +2192,6 @@ ia:
       delete: Deler cliente
       confirm: Es tu secur?
       requests: 'Le sequente permissiones es requestate del usator:'
-      allow_read_prefs: leger su preferentias de usator.
-      allow_write_prefs: modificar su preferentias de usator.
-      allow_write_diary: crear entratas de diario, commentos e adder amicos.
-      allow_write_api: modificar le carta.
-      allow_read_gpx: leger su tracias GPS private.
-      allow_write_gpx: incargar tracias GPS.
-      allow_write_notes: modificar notas.
     index:
       title: Mi detalios OAuth
       my_tokens: Mi applicationes autorisate
@@ -2002,25 +2200,14 @@ ia:
       issued_at: Emittite le
       revoke: Revocar!
       my_apps: Mi applicationes cliente
-      no_apps: Ha tu un aplication que tu vole registrar pro uso con nos per medio
-        del standard %{oauth}? Tu debe registrar tu application web ante que illo
-        pote facer requestas OAuth a iste servicio.
+      no_apps_html: Ha tu un aplication que tu vole registrar pro uso con nos per
+        medio del standard %{oauth}? Tu debe registrar tu application web ante que
+        illo pote facer requestas OAuth a iste servicio.
+      oauth: OAuth
       registered_apps: 'Tu ha le sequente applicationes cliente registrate:'
       register_new: Registrar tu application
     form:
-      name: Nomine
-      required: Requirite
-      url: URl principal del application
-      callback_url: URL de retorno
-      support_url: URl de supporto
       requests: 'Requestar le sequente permissiones del usator:'
-      allow_read_prefs: leger su preferentias de usator.
-      allow_write_prefs: modificar su preferentias de usator.
-      allow_write_diary: crear entratas de diario, commentos e adder amicos.
-      allow_write_api: modificar le carta.
-      allow_read_gpx: leger su tracias GPS private.
-      allow_write_gpx: incargar tracias GPS.
-      allow_write_notes: modificar notas.
     not_found:
       sorry: Pardono, iste %{type} non poteva esser trovate.
     create:
@@ -2030,87 +2217,11 @@ ia:
     destroy:
       flash: Le registration del application cliente ha essite destruite
   users:
-    login:
-      title: Aperir session
-      heading: Aperir session
-      email or username: 'Adresse de e-mail o nomine de usator:'
-      password: 'Contrasigno:'
-      openid: 'OpenID de %{logo}:'
-      remember: 'Memorar me:'
-      lost password link: Contrasigno perdite?
-      login_button: Aperir session
-      register now: Registrar ora
-      with username: 'Ha tu jam un conto de OpenStreetMap? Per favor aperi session
-        con tu nomine de usator e contrasigno:'
-      with external: 'Alternativemente, usa un tertio pro aperir session:'
-      new to osm: Nove a OpenStreetMap?
-      to make changes: Pro facer modificationes in le datos de OpenStreetMap, es necessari
-        haber un conto.
-      create account minute: Crea un conto. Isto dura solmente un minuta.
-      no account: Non ha un conto?
-      account not active: Pardono, tu conto non es ancora active.<br />Per favor clicca
-        super le ligamine in le e-mail de confirmation pro activar tu conto, o <a
-        href="%{reconfirm}">requesta un nove message de confirmation.</a>.
-      account is suspended: Le tue conto ha essite suspendite a causa de activitate
-        suspecte.<br />Per favor contacta le <a href="%{webmaster}">webmaster</a>
-        si tu vole discuter isto.
-      auth failure: Pardono, non poteva aperir un session con iste detalios.
-      openid_logo_alt: Aperir session con OpenID
-      auth_providers:
-        openid:
-          title: Aperir session con OpenID
-          alt: Aperir session con un URL de OpenID
-        google:
-          title: Aperir session con Google
-          alt: Aperir session con un OpenID de Google
-        facebook:
-          title: Aperir session con Facebook
-          alt: Aperir session con un conto de Facebook
-        windowslive:
-          title: Aperir session con Windows Live
-          alt: Aperir session con un conto de Windows Live
-        github:
-          title: Aperir session con GitHub
-          alt: Aperir session con un conto de GitHub
-        wikipedia:
-          title: Aperir session con Wikipedia
-          alt: Aperir session con un conto de Wikipedia
-        yahoo:
-          title: Aperir session con Yahoo
-          alt: Aperir session con un OpenID de Yahoo
-        wordpress:
-          title: Aperir session con WordPress
-          alt: Aperir session con un OpenID de WordPress
-        aol:
-          title: Aperir session con AOL
-          alt: Aperir session con un OpenID de AOL
-    logout:
-      title: Clauder session
-      heading: Clauder le session de OpenStreetMap
-      logout_button: Clauder session
-    lost_password:
-      title: Contrasigno perdite
-      heading: Contrasigno oblidate?
-      email address: 'Adresse de e-mail:'
-      new password button: Reinitialisar contrasigno
-      help_text: Entra le adresse de e-mail que tu usava pro inscriber te, e nos te
-        inviara un ligamine a iste adresse que tu pote usar pro reinitialisar tu contrasigno.
-      notice email on way: Es infortunate que tu lo perdeva :-( ma un e-mail es in
-        via que te permittera de reinitalisar lo tosto.
-      notice email cannot find: Non poteva trovar iste adresse de e-mail, pardono.
-    reset_password:
-      title: Reinitialisar contrasigno
-      heading: Reinitialisar le contrasigno de %{user}
-      password: 'Contrasigno:'
-      confirm password: 'Confirma contrasigno:'
-      reset: Reinitialisar contrasigno
-      flash changed: Tu contrasigno ha essite cambiate.
-      flash token bad: Token non trovate. Verifica le URL.
     new:
       title: Crear conto
       no_auto_account_create: Infortunatemente in iste momento non es possibile crear
         un conto pro te automaticamente.
-      contact_webmaster: Per favor contacta le <a href="%{webmaster}">webmaster</a>
+      contact_webmaster_html: Per favor contacta le <a href="%{webmaster}">webmaster</a>
         pro arrangiar le creation de un conto. Nos tentara tractar vostre requesta
         le plus rapidemente possibile.
       about:
@@ -2119,20 +2230,12 @@ ia:
           <p>A differentia de altere cartas, OpenStreetMap es completemente create per gente como tu,
           e cata uno es libere de modificar, actualisar, discargar e usar lo.</p>
           <p>Crea un conto pro comenciar a contribuer. Nos te inviara un e-mail pro confirmar tu conto.</p>
-      license_agreement: Quando tu confirma tu conto, tu debera acceptar le <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">conditiones
-        de contributor</a>.
       email address: 'Adresse de e-mail:'
       confirm email address: 'Confirmar adresse de e-mail:'
-      not displayed publicly: Tu adresse non es monstrate publicamente. Vide nostre
-        <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="Politica
-        de confidentialitate de OSMF includente un section sur adresses de e-mail">politica
-        de confidentialitate</a> pro plus information.
       display name: 'Nomine public:'
       display name description: Tu nomine de usator monstrate publicamente. Tu pote
         cambiar lo plus tarde in le preferentias.
       external auth: 'Authentication per tertios:'
-      password: 'Contrasigno:'
-      confirm password: 'Confirmar contrasigno:'
       use external auth: Alternativemente, usa un tertio pro aperir session
       auth no password: Con authentication per tertio, un contrasigno non es necessari,
         ma alcun instrumentos o servitores supplementari pote totevia necessitar un.
@@ -2157,7 +2260,7 @@ ia:
       consider_pd: In addition a lo que precede, io considera mi contributiones como
         essente in le dominio public
       consider_pd_why: que es isto?
-      guidance: 'Informationes pro adjutar a comprender iste terminos: a <a href="%{summary}">summario
+      guidance_html: 'Informationes pro adjutar a comprender iste terminos: a <a href="%{summary}">summario
         facile a comprender</a> e alcun <a href="%{translations}">traductiones non
         official</a>'
       continue: Continuar
@@ -2203,11 +2306,11 @@ ia:
       email address: 'Adresse de e-mail:'
       created from: 'Create ex:'
       status: 'Stato:'
-      spam score: 'Punctuation de spam:'
+      spam score: 'Punctos de spam:'
       description: Description
       user location: Position del usator
-      if set location: Defini tu position de origine in le %{settings_link} pro vider
-        le usatores a proximitate.
+      if_set_location_html: Defini tu position de origine in le %{settings_link} pro
+        vider le usatores a proximitate.
       settings_link_text: configurationes
       my friends: Mi amicos
       no friends: Tu non ha ancora addite alcun amico.
@@ -2248,8 +2351,6 @@ ia:
       title: Modificar conto
       my settings: Mi configurationes
       current email address: 'Adresse de e-mail actual:'
-      new email address: 'Adresse de e-mail nove:'
-      email never displayed publicly: (nunquam monstrate publicamente)
       external auth: 'Authentication externe:'
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
@@ -2264,7 +2365,7 @@ ia:
         disabled link text: proque non pote io modificar?
       public editing note:
         heading: Modification public
-        text: A iste momento tu modificationes es anonyme, e le gente non pote inviar
+        html: A iste momento tu modificationes es anonyme, e le gente non pote inviar
           te messages ni vider tu position. Pro poter monstrar tu contributiones e
           pro permitter al gente de contactar te per le sito web, clicca le button
           ci infra. <b>Post le cambio al API 0.6, solo le usatores public pote modificar
@@ -2281,13 +2382,9 @@ ia:
         agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
           liberate al Dominio Public.
         link text: que es isto?
-      profile description: 'Description del profilo:'
-      preferred languages: 'Linguas preferite:'
-      preferred editor: 'Editor preferite:'
       image: 'Imagine:'
       gravatar:
         gravatar: Usar Gravatar
-        link text: que es isto?
         disabled: Gravatar ha essite disactivate.
         enabled: Tu Gravatar ha essite activate e essera monstrate desde ora.
       new image: Adder un imagine
@@ -2297,8 +2394,6 @@ ia:
       image size hint: (imagines quadrate de al minus 100×100 functiona melio)
       home location: 'Position de origine:'
       no home location: Tu non ha entrate tu position de origine.
-      latitude: 'Latitude:'
-      longitude: 'Longitude:'
       update home location on click: Actualisar le position de origine quando io clicca
         super le carta?
       save changes button: Salveguardar modificationes
@@ -2307,58 +2402,19 @@ ia:
       flash update success confirm needed: Informationes del usator actualisate con
         successo. Tu recipera in e-mail un nota pro confirmar tu nove adresse de e-mail.
       flash update success: Informationes del usator actualisate con successo.
-    confirm:
-      heading: Verifica tu e-mail!
-      introduction_1: Nos te ha inviate un message de confirmation.
-      introduction_2: Confirma tu conto con un clic sur le ligamine in le message
-        e tu potera comenciar a cartographiar.
-      press confirm button: Preme le button de confirmation ci infra pro activar tu
-        conto.
-      button: Confirmar
-      success: Tu conto ha essite confirmate, gratias pro inscriber te!
-      already active: Iste conto ha ja essite confirmate.
-      unknown token: Iste codice de confirmation ha expirate o non existe.
-      reconfirm_html: Pro reciper un altere message de confirmation, <a href="%{reconfirm}">clicca
-        hic</a>.
-    confirm_resend:
-      success: Nos ha inviate un nove message de confirmation a %{email} e si tosto
-        que tu confirma le conto, tu potera comenciar a cartographar.<br /><br />Si
-        tu usa un systema anti-spam que invia requestas de confirmation, alora per
-        favor assecura te de adder %{sender} al lista blanc, alteremente nos non pote
-        responder a requestas de confirmation.
-      failure: Usator %{name} non trovate.
-    confirm_email:
-      heading: Confirmar un cambio de adresse de e-mail
-      press confirm button: Preme le button Confirmar ci infra pro confirmar tu nove
-        adresse de e-mail.
-      button: Confirmar
-      success: Le cambio del adresse de e-mail ha essite confirmate.
-      failure: Un adresse de e-mail ha ja essite confirmate con iste token.
-      unknown_token: Iste codice de confirmation ha expirate o non existe.
     set_home:
       flash success: Position de origine confirmate con successo
     go_public:
       flash success: Tote tu modificationes es ora public, e tu ha ora le permission
         de modificar.
-    make_friend:
-      heading: Adder %{user} como amico?
-      button: Adder como amico
-      success: '%{name} es ora tu amico!'
-      failed: Pardono, non poteva adder %{name} como amico.
-      already_a_friend: Tu es ja amico de %{name}.
-    remove_friend:
-      heading: Remover %{user} como amico?
-      button: Remover amico
-      success: '%{name} ha essite removite de tu amicos.'
-      not_a_friend: '%{name} non es un de tu amicos.'
     index:
       title: Usatores
       heading: Usatores
       showing:
         one: Pagina %{page} (%{first_item} de %{items})
         other: Pagina %{page} (%{first_item}-%{last_item} de %{items})
-      summary: '%{name} create ab %{ip_address} le %{date}'
-      summary_no_ip: '%{name} create le %{date}'
+      summary_html: '%{name} create ab %{ip_address} le %{date}'
+      summary_no_ip_html: '%{name} create le %{date}'
       confirm: Confirmar usatores seligite
       hide: Celar usatores seligite
       empty: Nulle usator correspondente trovate
@@ -2366,7 +2422,7 @@ ia:
       title: Conto suspendite
       heading: Conto suspendite
       webmaster: webmaster
-      body: |-
+      body_html: |-
         <p>
           Pardono, tu conto ha essite automaticamente disactivate debite a
           activitate suspecte.
@@ -2417,28 +2473,18 @@ ia:
       back: Retornar al indice
     new:
       title: Crea blocada de %{name}
-      heading: Crea blocada de %{name}
-      reason: Le motivo proque %{name} es blocate. Per favor sia si calme e rationabile
-        como possibile, e da tante detalios super le situation como tu pote. Non oblida
-        que le message essera publicamente visibile. Nota ben que non tote le usatores
-        comprende le jargon del communitate, alora usa terminos simple e precise.
+      heading_html: Crea blocada de %{name}
       period: Quante tempore, a partir de ora, essera le usator blocate del API?
       tried_contacting: Io ha contactate le usator pro demandar le/la de cessar.
       tried_waiting: Io ha date sufficiente tempore al usator pro responder a iste
         communicationes.
-      needs_view: Le usator debe aperir un session ante que iste blocada essera cancellate
       back: Vider tote le blocadas
     edit:
       title: Modification de un blocada super %{name}
-      heading: Modification de un blocada super %{name}
-      reason: Le motivo proque %{name} es blocate. Per favor resta si calme e rationabile
-        como possibile, e da tante detalios como tu pote super le situation. Nota
-        ben que non tote le usatores comprende le jargon del communitate, alora usa
-        terminos simple e precise.
+      heading_html: Modification de un blocada super %{name}
       period: Quante tempore, a partir de ora, essera le usator blocate del API?
       show: Examinar iste blocada
       back: Examinar tote le blocadas
-      needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?
     filter:
       block_expired: Le blocada ha ja expirate e non pote esser modificate.
       block_period: Le periodo de blocada debe esser un del valores seligibile in
@@ -2459,18 +2505,18 @@ ia:
       empty: Nulle blocada ha ancora essite effectuate.
     revoke:
       title: Revoca blocada de %{block_on}
-      heading: Revoca blocada de %{block_on} per %{block_by}
+      heading_html: Revoca blocada de %{block_on} per %{block_by}
       time_future: Iste blocada expirara in %{time}.
       past: Iste blocada expirava %{time} e non pote esser revocate ora.
       confirm: Es tu secur de voler revocar iste blocada?
       revoke: Revocar!
       flash: Iste blocada ha essite revocate.
     helper:
-      time_future: Expira in %{time}.
+      time_future_html: Expira in %{time}.
       until_login: Active usque le usator aperi un session.
-      time_future_and_until_login: Termina in %{time} e post que le usator ha aperite
-        session.
-      time_past: Expirava %{time}.
+      time_future_and_until_login_html: Termina in %{time} e post que le usator ha
+        aperite session.
+      time_past_html: Expirava %{time}.
       block_duration:
         hours:
           one: 1 hora
@@ -2489,15 +2535,15 @@ ia:
           other: '%{count} annos'
     blocks_on:
       title: Blocadas de %{name}
-      heading: Lista de blocadas de %{name}
+      heading_html: Lista de blocadas de %{name}
       empty: '%{name} non ha ancora essite blocate.'
     blocks_by:
       title: Blocadas per %{name}
-      heading: Lista de blocadas per %{name}
+      heading_html: Lista de blocadas per %{name}
       empty: '%{name} non ha ancora facite alcun blocada.'
     show:
       title: '%{block_on} blocate per %{block_by}'
-      heading: '%{block_on} blocate per %{block_by}'
+      heading_html: '%{block_on} blocate per %{block_by}'
       created: Create
       status: Stato
       show: Monstrar
@@ -2523,7 +2569,7 @@ ia:
       next: Sequente »
       previous: « Precedente
   notes:
-    mine:
+    index:
       title: Notas submittite o commentate per %{user}
       heading: Notas de %{user}
       subheading_html: Notas submittite o commentate per %{user}
@@ -2546,7 +2592,6 @@ ia:
       custom_dimensions: Personalisar dimensiones
       format: 'Formato:'
       scale: 'Scala:'
-      image_size: Le imagine monstrara le strato standard in
       download: Discargar
       short_url: URL curte
       include_marker: Includer marcator
@@ -2566,7 +2611,12 @@ ia:
         out: Zoom retro
       locate:
         title: Monstrar mi position
-        popup: Tu es intra {distance} {unit} de iste puncto
+        metersPopup:
+          one: Tu es minus de un metro distante de iste puncto
+          other: Tu es minus de %{count} metros distante de iste puncto
+        feetPopup:
+          one: Tu es minus de un pede distante de iste puncto
+          other: Tu es minus de %{count} pedes distante de iste puncto
       base:
         standard: Standard
         cycle_map: Carta cyclista
@@ -2583,6 +2633,11 @@ ia:
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Facer un donation</a>
       terms: <a href='%{terms_url}' target='_blank'>Conditiones del sito web e del
         API</a>
+      thunderforest: Tegulas fornite per <a href='%{thunderforest_url}' target='_blank'>Andy
+        Allan</a>
+      hotosm: Stilo de tegulas concipite per <a href='%{hotosm_url}' target='_blank'>le
+        equipa humanitari de OpenStreetMap</a> e albergate per <a href='%{osmfrance_url}'
+        target='_blank'>OpenStreetMap France</a>
     site:
       edit_tooltip: Modificar le carta
       edit_disabled_tooltip: Face zoom avante pro modificar le carta
@@ -2724,34 +2779,32 @@ ia:
       centre_map: Centrar le carta hic
   redactions:
     edit:
-      description: Description
-      heading: Modificar obscuration
+      heading: Modificar suppression
       title: Modificar obscuration
     index:
-      empty: Il non ha obscurationes a monstrar.
+      empty: Il non ha suppressiones a monstrar.
       heading: Lista de obscurationes
-      title: Lista de obscurationes
+      title: Lista de suppressiones
     new:
-      description: Description
-      heading: Specifica information pro nove obscuration
+      heading: Specifica information pro nove suppression
       title: Creation de nove obscuration
     show:
       description: 'Description:'
-      heading: Es monstrate le obscuration "%{title}"
+      heading: Es monstrate le suppression "%{title}"
       title: Presentation de obscuration
       user: 'Creator:'
-      edit: Modificar iste obscuration
+      edit: Modificar iste suppression
       destroy: Remover iste obscuration
       confirm: Es tu secur?
     create:
-      flash: Obscuration create.
+      flash: Suppression create.
     update:
       flash: Cambios salveguardate.
     destroy:
-      not_empty: Le obscuration non es vacue. Per favor disobscura tote le versiones
-        pertinente a iste obscuration ante de destruer lo.
+      not_empty: Le suppression non es vacue. Per favor dis-supprime tote le versiones
+        pertinente a iste suppression ante de destruer lo.
       flash: Obscuration destruite.
-      error: Un error occurreva durante le destruction de iste obscuration.
+      error: Un error occurreva durante le destruction de iste suppression.
   validations:
     leading_whitespace: ha spatios al initio
     trailing_whitespace: ha spatios al fin