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

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

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c4fcf7c1788ebeb688a8d4c2737ace77453fc3bf..d384ccb5288cd5724d005ced8f5c461659cabcb5 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,7 +27,10 @@ ia:
         create: Inviar
       client_application:
         create: Registrar
-        update: Modificar
+        update: Actualisar
+      doorkeeper_application:
+        create: Registrar
+        update: Actualisar
       redaction:
         create: Crear suppression
         update: Salveguardar suppression
@@ -78,6 +82,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:
@@ -86,30 +102,73 @@ ia:
         latitude: Latitude
         longitude: Longitude
         language: Lingua
+      doorkeeper/application:
+        name: Nomine
+        redirect_uri: URIs de redirection
+        confidential: Application confidential?
+        scopes: Permissiones
       friend:
         user: Usator
         friend: Amico
       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:
+        title: Titulo
+        description: Description
+      report:
+        category: Selige un motivo pro tu reporto
+        details: Per favor, forni plus detalios sur le problema (obligatori).
       user:
+        auth_provider: Fornitor de authentication
+        auth_uid: UID de authentication
         email: E-mail
+        email_confirmation: Confirmation del e-mail
+        new_email: Nove adresse de e-mail
         active: Active
         display_name: Nomine public
-        description: Description
-        languages: Linguas
+        description: Description del profilo
+        home_lat: Latitude
+        home_lon: Longitude
+        languages: Linguas preferite
+        preferred_editor: Editor preferite
         pass_crypt: Contrasigno
+        pass_crypt_confirmation: Confirmar contrasigno
+    help:
+      doorkeeper/application:
+        confidential: Le application essera usate ubi le secreto del cliente pote
+          esser mantenite confidential (applicationes mobile native e applicationes
+          a pagina unic non es confidential)
+        redirect_uri: Usa un linea per URI
+      trace:
+        tagstring: separate per commas
+      user_block:
+        reason: Le motivo proque le usator es blocate. Per favor sia tanto calme e
+          rationabile como possibile, e da tante detalios sur le situation como tu
+          pote. Non oblida que le message essera publicamente visibile. Nota ben que
+          non tote le usatores comprende le jargon del communitate; per favor tenta
+          usar terminos simple.
+        needs_view: Debe le usator aperir un session ante que iste blocada es cancellate?
+      user:
+        email_confirmation: Tu adresse non es monstrate publicamente. Vide nostre
+          <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="Politica
+          de confidentialitate de OSMF includente un section sur adresses de e-mail">politica
+          de confidentialitate</a> pro plus information.
+        new_email: (nunquam monstrate publicamente)
   datetime:
     distance_in_words_ago:
       about_x_hours:
@@ -151,18 +210,12 @@ 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
@@ -209,6 +262,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
@@ -223,8 +282,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:
@@ -241,6 +300,9 @@ ia:
       title_html: 'Via: %{name}'
       history_title_html: 'Historia del via: %{name}'
       nodes: Nodos
+      nodes_count:
+        one: 1 nodo
+        other: '%{count} nodos'
       also_part_of_html:
         one: parte del via %{related_ways}
         other: parte del vias %{related_ways}
@@ -248,6 +310,9 @@ ia:
       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_html: '%{type} %{name} como %{role}'
       type:
@@ -258,6 +323,7 @@ ia:
       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
@@ -266,6 +332,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:
@@ -304,15 +371,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
@@ -368,13 +435,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
@@ -383,6 +445,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
@@ -402,9 +465,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_html: 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
@@ -436,11 +500,31 @@ ia:
         description: Entratas recente de diario de usatores de OpenStreetMap
     comments:
       has_commented_on: '%{display_name} ha commentate le sequente entratas de diario'
+      no_comments: Nulle commento de diario
       post: Articulo
       when: Quando
       comment: Commento
       newer_comments: Commentos plus recente
       older_comments: Commentos plus ancian
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Application registrate.
+  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}.
+      limit_exceeded: Tu ha addite multe personas al lista de amicos recentemente.
+        Per favor attende un momento ante de tentar adder alteres.
+    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:
@@ -459,10 +543,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
@@ -471,11 +557,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
@@ -485,7 +575,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
@@ -502,6 +594,7 @@ ia:
           clock: Horologio
           college: Schola superior
           community_centre: Centro communitari
+          conference_centre: Centro de conferentias
           courthouse: Tribunal
           crematorium: Crematorio
           dentist: Dentista
@@ -509,6 +602,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
@@ -521,36 +615,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
@@ -559,19 +659,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
@@ -580,24 +688,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:
+          beekeeper: 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_extinguisher: 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:
@@ -610,6 +788,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
@@ -640,37 +819,45 @@ 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
+          charcoal_pile: Pila de carbon historic
           church: Ecclesia
           city_gate: Porta de citate
           citywalls: Muro del citate
           fort: Forte
           heritage: Sito de patrimonio
+          hollow_way: Cammino cave
           house: Casa
-          icon: Icone
           manor: Casa seniorial
           memorial: Memorial
+          milestone: Petra milliari historic
           mine: Mina
           mine_shaft: Puteo de mina
           monument: Monumento
+          railway: Ferrovia historic
           roman_road: Via roman
           ruins: Ruinas
           stone: Petra
           tomb: Tumba
           tower: Turre
+          wayside_chapel: Cappella al bordo del cammino
           wayside_cross: Cruce juxta le via
           wayside_shrine: Reliquario juxta le via
           wreck: Naufragio
@@ -679,6 +866,7 @@ ia:
           "yes": Intersection
         landuse:
           allotments: Jardines familial
+          aquaculture: Aquacultura
           basin: Bassino
           brownfield: Terreno industrial subutilisate
           cemetery: Cemeterio
@@ -698,21 +886,28 @@ ia:
           military: Area militar
           mine: Mina
           orchard: Verdiero
+          plant_nursery: Seminario de plantas
           quarry: Petreria
           railway: Ferrovia
           recreation_ground: Area recreative
+          religious: Terreno religiose
           reservoir: Reservoir
           reservoir_watershed: Bassino interfluvial
           residential: Area residential
           retail: Magazines
-          road: Area de cammino
           village_green: Parco de village
           vineyard: Vinia
           "yes": Uso de terreno
         leisure:
+          adult_gaming_centre: Centro de jocos pro adultos
+          amusement_arcade: Sala de jocos video
+          bandstand: Kiosque de musica
           beach_resort: Loco de vacantias al plagia
           bird_hide: Observatorio de aves
+          bleachers: Tribuna
+          bowling_alley: Pista de bowling
           common: Terreno commun
+          dance: Sala de dansa
           dog_park: Parco pro canes
           firepit: Focar
           fishing: Area de pisca
@@ -725,7 +920,9 @@ ia:
           marina: Porto de yachts
           miniature_golf: Minigolf
           nature_reserve: Reserva natural
+          outdoor_seating: Sedias al aere libere
           park: Parco
+          picnic_table: Tabula de picnic
           pitch: Campo sportive
           playground: Area de jocos
           recreation_ground: Terreno de recreation
@@ -740,13 +937,21 @@ ia:
           "yes": Tempore libere
         man_made:
           adit: Galeria de mina
+          advertising: Publicitate
+          antenna: Antenna
+          avalanche_protection: Protection contra avalanches
           beacon: Fanal
+          beam: Trabe
           beehive: Apiculario
           breakwater: Rumpe-undas
           bridge: Ponte
           bunker_silo: Bunker
+          cairn: Cairn (cumulo de petras)
           chimney: Camino
+          clearcut: Area deforestate
+          communications_tower: Turre de communication
           crane: Grue
+          cross: Cruce
           dolphin: Poste de ammarrage
           dyke: Dica
           embankment: Terrapleno
@@ -755,6 +960,7 @@ ia:
           groyne: Rumpeundas
           kiln: Furno
           lighthouse: Pharo
+          manhole: Puteo de inspection
           mast: Mast
           mine: Mina
           mineshaft: Puteo de mina
@@ -762,12 +968,20 @@ ia:
           petroleum_well: Puteo petrolifere
           pier: Jectata
           pipeline: Tubulatura
+          pumping_station: Station de pumpage
+          reservoir_covered: Bassino coperte
           silo: Silo
+          snow_cannon: Cannon de nive
+          snow_fence: Barriera a nive
           storage_tank: Cisterna de immagazinage
+          street_cabinet: Armario de servicios
           surveillance: Surveliantia
+          telescope: Telescopio
           tower: Turre
+          utility_pole: Palo de transmission
           wastewater_plant: Station de depuration de aquas usate
           watermill: Molino de aqua
+          water_tap: Tappo de aqua
           water_tower: Turre de aqua
           water_well: Puteo
           water_works: Tractamento de aqua
@@ -778,15 +992,20 @@ ia:
           airfield: Aerodromo militar
           barracks: Barracas
           bunker: Bunker
+          checkpoint: Puncto de controlo
+          trench: Trenchea
           "yes": Militar
         mountain_pass:
           "yes": Passo de montania
         natural:
+          atoll: Atollo
+          bare_rock: Rocca nude
           bay: Baia
           beach: Plagia
           cape: Capo
           cave_entrance: Entrata de caverna
           cliff: Precipitio
+          coastline: Litoral
           crater: Crater
           dune: Duna
           fell: Montania
@@ -797,12 +1016,14 @@ ia:
           grassland: Prato
           heath: Landa
           hill: Collina
+          hot_spring: Fonte thermal
           island: Insula
           land: Terra
           marsh: Palude
           moor: Landa
           mud: Fango
           peak: Picco
+          peninsula: Peninsula
           point: Puncto
           reef: Scolio
           ridge: Cresta
@@ -820,25 +1041,37 @@ ia:
           water: Aqua
           wetland: Terra humide
           wood: Bosco
+          "yes": Elemento natural
         office:
           accountant: Contabile
           administrative: Administration
+          advertising_agency: Agentia publicitari
           architect: Architecto
           association: Association
           company: Compania
+          diplomatic: Officio diplomatic
           educational_institution: Institution educative
           employment_agency: Agentia de empleo
+          energy_supplier: Officio de fornitor de energia
           estate_agent: Agentia immobiliari
+          financial: Officio financiari
           government: Officio governamental
           insurance: Officio de assecurantia
           it: Officio informatic
           lawyer: Advocato
+          logistics: Officio logistic
+          newspaper: Officio de jornal
           ngo: Officio de un ONG
+          notary: Notario
+          religion: Officio religiose
+          research: Officio de recerca
+          tax_advisor: Consiliero fiscal
           telecommunication: Officio de telecommunication
           travel_agent: Agentia de viages
           "yes": Officio
         place:
           allotments: Jardines familial
+          archipelago: Archipelago
           city: Citate
           city_block: Bloco urban
           country: Pais
@@ -853,6 +1086,7 @@ ia:
           locality: Localitate
           municipality: Municipalitate
           neighbourhood: Quartiero
+          plot: Lot de terreno
           postcode: Codice postal
           quarter: Quartiero
           region: Region
@@ -862,7 +1096,6 @@ ia:
           subdivision: Subdivision
           suburb: Suburbio
           town: Urbe
-          unincorporated_area: Area sin municipalitate
           village: Village
           "yes": Loco
         railway:
@@ -888,12 +1121,19 @@ ia:
           switch: Agulia
           tram: Tramvia
           tram_stop: Halto de tram
+          yard: Station de manovras
         shop:
+          agrarian: Magazin agricole
           alcohol: Magazin de bibitas alcoholic
           antiques: Antiquitates
+          appliance: Magazin de electrodomesticos
           art: Magazin de arte
+          baby_goods: Articulos pro neonatos
+          bag: Magazin de saccos
           bakery: Paneteria
+          bathroom_furnishing: Mobiliario de banio
           beauty: Salon de beltate
+          bed: Productos pro le lecto
           beverages: Boteca de bibitas
           bicycle: Magazin de bicyclettas
           bookmaker: Agente de sponsiones
@@ -905,65 +1145,90 @@ ia:
           car_repair: Reparation de automobiles
           carpet: Magazin de tapetes
           charity: Magazin de beneficentia
+          cheese: Magazin de caseos
           chemist: Pharmacia
+          chocolate: Chocolateria
           clothes: Magazin de vestimentos
+          coffee: Magazin de caffe
           computer: Magazin de computatores
           confectionery: Confecteria
           convenience: Magazin de quartiero
           copyshop: Centro de photocopias
           cosmetics: Boteca de cosmetica
+          craft: Magazin de artisanato
+          curtain: Magazin de cortinas
+          dairy: Lacteria
           deli: Boteca de delicatessas fin
           department_store: Grande magazin
           discount: Boteca de disconto
           doityourself: Magazin de bricolage
           dry_cleaning: Lavanderia a sic
+          e-cigarette: Magazin de cigarrettas electronic
           electronics: Boteca de electronica
+          erotic: Boteca erotic
           estate_agent: Agentia immobiliari
+          fabric: Magazin de texitos
           farm: Magazin agricole
           fashion: Boteca de moda
-          fish: Pischeria
+          fishing: Magazin pro le pisca
           florist: Florista
           food: Magazin de alimentation
+          frame: Magazin de quadros
           funeral_directors: Directores de pompas funebre
           furniture: Magazin de mobiles
-          gallery: Galeria
           garden_centre: Jardineria
+          gas: Magazin de gas
           general: Magazin general
           gift: Boteca de donos
           greengrocer: Verdurero
           grocery: Specieria
           hairdresser: Perruccheria
           hardware: Quincalieria
+          health_food: Magazin de alimentos natural
+          hearing_aids: Apparatos de correction auditive
+          herbalist: Herboristeria
           hifi: Hi-fi
           houseware: Magazin de articulos domestic
+          ice_cream: Boteca de gelatos
           interior_decoration: Decoration interior
           jewelry: Joieleria
           kiosk: Kiosque
           kitchen: Magazin de cocina
           laundry: Lavanderia
+          locksmith: Serratureria
           lottery: Lotteria
           mall: Galeria mercante
-          market: Mercato
           massage: Massage
+          medical_supply: Magazin de articulos medic
           mobile_phone: Boteca de telephonos mobile
+          money_lender: Prestator de moneta
           motorcycle: Magazin de motocyclos
+          motorcycle_repair: Reparator de motocyclos
           music: Magazin de musica
+          musical_instrument: Instrumentos musical
           newsagent: Venditor de jornales
+          nutrition_supplements: Supplementos nutritional
           optician: Optico
           organic: Boteca de alimentos organic
           outdoor: Magazin de sport al aere libere
           paint: Magazin de colores
+          pastry: Pastisseria
           pawnbroker: Prestator sur pignore
+          perfumery: Perfumeria
           pet: Boteca de animales
-          pharmacy: Pharmacia
+          pet_grooming: Cura de animales domestic
           photo: Magazin de photographia
           seafood: Fructos de mar
           second_hand: Magazin de secunde mano
+          sewing: Boteca de sutura
           shoes: Scarperia
           sports: Magazin de sport
           stationery: Papireria
+          storage_rental: Location de immagazinage
           supermarket: Supermercato
           tailor: Sartor
+          tattoo: Studio de tatuage
+          tea: Boteca de the
           ticket: Billeteria
           tobacco: Tabacheria
           toys: Magazin de joculos
@@ -972,6 +1237,8 @@ ia:
           vacant: Magazin vacante
           variety_store: Magazin a precio unic
           video: Magazin de video
+          video_games: Magazin de jocos video
+          wholesale: Magazin de commercio in grosso
           wine: Magazin de vinos
           "yes": Boteca
         tourism:
@@ -981,6 +1248,7 @@ ia:
           attraction: Attraction
           bed_and_breakfast: Bed and Breakfast
           cabin: Cabana
+          camp_pitch: Terreno de camping
           camp_site: Terreno de camping
           caravan_site: Terreno pro caravanas
           chalet: Chalet
@@ -994,6 +1262,7 @@ ia:
           picnic_site: Loco de picnic
           theme_park: Parco de attractiones
           viewpoint: Puncto de vista
+          wilderness_hut: Cabana in area natural
           zoo: Jardin zoologic
         tunnel:
           building_passage: Passage sub edificio
@@ -1020,17 +1289,15 @@ ia:
           "yes": Curso de aqua
       admin_levels:
         level2: Frontiera de pais
+        level3: Frontiera de region
         level4: Frontiera de stato
         level5: Frontiera de region
         level6: Frontiera de contato
+        level7: Frontiera de municipio
         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>
+        level11: Frontiera de quartiero
       types:
         cities: Citates
         towns: Villages
@@ -1108,8 +1375,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:'
@@ -1193,45 +1458,57 @@ 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}.
+      see_their_profile_html: 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:
-          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.
+      befriend_them_html: Tu pote equalmente adder le/la como amico a %{befriendurl}.
+    gpx_description:
+      description_with_tags_html: 'Pare que tu file GPX %{trace_name} con le description
+        %{trace_description} e le sequente etiquettas: %{tags}'
+      description_with_no_tags_html: Pare que tu file GPX %{trace_name} con le description
+        %{trace_description} e sin etiquettas
+    gpx_failure:
+      hi: Salute %{to_user},
+      failed_to_import: 'ha fallite de importar. Ecce le error:'
+      more_info_html: Plus information sur le fallimento de importation GPX e como
+        evitar lo se trova sur %{url}.
+      import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures?uselang=ia
+      subject: '[OpenStreetMap] Importation GPX fallite'
+    gpx_success:
+      hi: Salute %{to_user},
+      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!
@@ -1243,32 +1520,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
+      click_the_link: Si isto es tu, per favor clicca sur le ligamine sequente 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,
@@ -1278,23 +1541,36 @@ ia:
           interessa'
         your_note: '%{commenter} ha lassate un commento sur un de tu notas de carta
           in le vicinitate de %{place}.'
+        your_note_html: '%{commenter} ha lassate un commento sur un de tu notas de
+          carta in le vicinitate de %{place}.'
         commented_note: '%{commenter} ha lassate un commento sur un nota de carta
           que tu ha commentate. Le nota es in le vicinitate de %{place}.'
+        commented_note_html: '%{commenter} ha lassate un commento sur un nota de carta
+          que tu ha commentate. Le nota es in le vicinitate de %{place}.'
       closed:
         subject_own: '[OpenStreetMap] %{commenter} ha resolvite un de tu notas'
         subject_other: '[OpenStreetMap] %{commenter} ha resolvite un nota que te interessa'
         your_note: '%{commenter} ha resolvite un de tu notas de carta in le vicinitate
           de %{place}.'
+        your_note_html: '%{commenter} ha resolvite un de tu notas de carta in le vicinitate
+          de %{place}.'
         commented_note: '%{commenter} ha resolvite un nota de carta que tu ha commentate.
           Le nota es in le vicinitate de %{place}.'
+        commented_note_html: '%{commenter} ha resolvite un nota de carta que tu ha
+          commentate. Le nota es in le vicinitate de %{place}.'
       reopened:
         subject_own: '[OpenStreetMap] %{commenter} ha reactivate un de tu notas'
         subject_other: '[OpenStreetMap] %{commenter} ha reactivate un nota de tu interesse'
         your_note: '%{commenter} ha reactivate un de tu notas de carta in le vicinitate
           de %{place}.'
+        your_note_html: '%{commenter} ha reactivate un de tu notas de carta in le
+          vicinitate de %{place}.'
         commented_note: '%{commenter} ha reactivate un nota de carta que tu ha commentate.
           Le nota es in le vicinitate de %{place}.'
+        commented_note_html: '%{commenter} ha reactivate un nota de carta que tu ha
+          commentate. Le nota es in le vicinitate de %{place}.'
       details: Plus detalios sur le nota pote esser trovate a %{url}.
+      details_html: Plus detalios sur le nota pote esser trovate a %{url}.
     changeset_comment_notification:
       hi: Salute %{to_user},
       greeting: Salute,
@@ -1305,19 +1581,58 @@ ia:
           que te interessa'
         your_changeset: '%{commenter} ha commentate a %{time} un de tu gruppos de
           modificationes'
+        your_changeset_html: '%{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}'
+        commented_changeset_html: '%{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_with_comment_html: con commento '%{changeset_comment}'
         partial_changeset_without_comment: sin commento
       details: Plus detalios sur le gruppo de modificationes pote esser trovate a
         %{url}.
+      details_html: 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".
+      unsubscribe_html: 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:
+      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.
+    resend_success_flash:
+      confirmation_sent: Nos ha inviate un nove nota de confirmation a %{email}. Un
+        vice que tu confirma tu conto, tu potera comenciar a cartographar.
+      whitelist: Si tu usa un systema anti-spam que invia requestas de confirmation,
+        alora assecura te de exceptar %{sender} perque nos non pote responder a requestas
+        de confirmation.
   messages:
     inbox:
       title: Cassa de entrata
       my_inbox: Mi cassa de entrata
-      outbox: cassa de exito
+      my_outbox: Mi cassa de exito
       messages: Tu ha %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} nove message'
@@ -1352,9 +1667,8 @@ ia:
       body: Non existe un message con iste ID.
     outbox:
       title: Cassa de exito
-      my_inbox_html: Mi %{inbox_link}
-      inbox: cassa de entrata
-      outbox: cassa de exito
+      my_inbox: Mi cassa de entrata
+      my_outbox: Mi cassa de exito
       messages:
         one: Tu ha %{count} message inviate
         other: Tu ha %{count} messages inviate
@@ -1388,6 +1702,114 @@ 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.
+  profiles:
+    edit:
+      image: Imagine
+      gravatar:
+        gravatar: Usar Gravatar
+        what_is_gravatar: Que es Gravatar?
+        disabled: Gravatar ha essite disactivate.
+        enabled: Tu Gravatar ha essite activate e essera monstrate desde ora.
+      new image: Adder un imagine
+      keep image: Retener le imagine actual
+      delete image: Remover le imagine actual
+      replace image: Reimplaciar le imagine actual
+      image size hint: (imagines quadrate de al minus 100×100 functiona melio)
+      home location: Position de origine
+      no home location: Tu non ha entrate tu position de origine.
+      update home location on click: Actualisar le position de origine quando io clicca
+        super le carta?
+  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: Guai, tu conto ha essite suspendite a causa de activitate
+        suspecte.<br />Per favor contacta le <a href="%{webmaster}">servicio de assistentia</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
+        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
+  shared:
+    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
+    richtext_field:
+      edit: Modificar
+      preview: Previsualisar
   site:
     about:
       next: Sequente
@@ -1435,9 +1857,9 @@ ia:
         english_link: le original in anglese
       native:
         title: A proposito de iste pagina
-        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}.
+        html: Tu vide ora le version in anglese del pagina de derecto de autor. Tu
+          pote retornar al %{native_link} de iste pagina o tu pote cessar de leger
+          sur copyright e %{mapping_link}.
         native_link: version in interlingua
         mapping_link: comenciar le cartographia
       legal_babble:
@@ -1452,17 +1874,19 @@ ia:
           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_html: Le cartographia in nostre tegulas cartographic, e nostre documentation,
-          es publicate sub licentia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> (CC-BY-SA).
+        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 etiam indicar clarmente que le datos es disponibile sub Open Database License, e si vos usa nostre tegulas cartographic, que le cartographia es licentiate sub CC-BY-SA. Vos pote facer isto con un ligamine a <a href="https://www.openstreetmap.org/copyright">iste pagina de copyright</a>.
-          Alternativemente, e obligatorimente si vos distribue OSM in forma de datos, vos pote mentionar le licentia(s) e ligar directemente a illo(s). Si vos usa un medio de communication in le qual le ligamines non es possibile (p.ex. un obra imprimite), nos suggere que vos dirige vostre lectores a openstreetmap.org (forsan per inserer iste adresse complete in loco del parola &lsquo;OpenStreetMap&rsquo;), a opendatacommons.org, e (si relevante) a creativecommons.org.
-        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_3_1_html: |-
+          Le tegulas de carta in le &ldquo;stilo standard&rdquo sur www.openstreetmap.org es un obra producite per le Fundation OpenStreetMap usante datos de OpenStreetMap sub le licentia Open Database. Si tu usa iste tegulas, per favor usa le attribution sequente:
+          &ldquo;Fundo de carta e datos de OpenStreetMap e del Fundation OpenStreetMap&rdquo;.
+        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
@@ -1566,17 +1990,6 @@ ia:
         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_html: Es necessari haber un reproductor Flash pro usar
-        Potlatch, le editor Flash de OpenStreetMap. Tu pote <a href="https://get.adobe.com/flashplayer/">discargar
-        Flash Player a Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Plure
-        altere optiones</a> es tamben disponibile pro modificar OpenStreetMap.
-      potlatch_unsaved_changes: Tu ha modificationes non salveguardate. (Pro salveguardar
-        in Potlatch, tu debe deseliger le via o puncto actual si tu modifica in modo
-        directe, o cliccar super le button Salveguardar si presente.)
-      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.
@@ -1689,6 +2102,15 @@ ia:
         url: http://wiki.openstreetmap.org/
         title: Wiki OpenStreetMap
         description: Percurre le wiki pro le documentation in detalio de OpenStreetMap.
+    potlatch:
+      removed: Tu ha le editor predefinite de OpenStreetMap fixate como Potlatch.
+        Post que Adobe Flash ha essite retirate, Potlatch non plus pote esser usate
+        in un navigator web.
+      desktop_html: Tu pote totevia usar Potlatch si tu <a href="https://www.systemed.net/potlatch/">discarga
+        le application scriptorio pro Mac o Windows</a>.
+      id_html: Alternativemente, tu pote fixar le editor predefinite a iD, le qual
+        functiona in tu navigator web como Potlatch faceva antea. <a href="%{settings_url}">Cambia
+        hic tu parametros de usator</a>.
     sidebar:
       search_results: Resultatos del recerca
       close: Clauder
@@ -1772,23 +2194,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
@@ -1848,11 +2253,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:
@@ -1870,20 +2270,9 @@ ia:
           attender le completion de istes ante de incargar alteres, pro non blocar
           le cauda pro altere usatores.
     edit:
+      cancel: Cancellar
       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
@@ -1921,7 +2310,6 @@ ia:
       more: plus
       trace_details: Vider detalios del tracia
       view_map: Vider carta
-      edit: modificar
       edit_map: Modificar carta
       public: PUBLIC
       identifiable: IDENTIFICABILE
@@ -1929,10 +2317,9 @@ ia:
       trackable: TRACIABILE
       by: per
       in: in
-      map: carta
     index:
       public_traces: Tracias GPS public
-      my_traces: Mi tracias GPS
+      my_traces: Mi tracias
       public_traces_from: Tracias GPS public de %{user}
       description: Percurrer le tracias GPS incargate recentemente
       tagged_with: '  etiquettate con %{tags}'
@@ -1940,8 +2327,9 @@ ia:
         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>.
       upload_trace: Incargar un tracia
-      see_all_traces: Vider tote le tracias
-      see_my_traces: Vider mi tracias
+      all_traces: Tote le tracias
+      traces_from: Tracias public de %{user}
+      remove_tag_filter: Remover filtro de etiquettas
     destroy:
       scheduled_for_deletion: Tracia programmate pro deletion
     make_public:
@@ -2000,6 +2388,14 @@ ia:
       flash: Tu ha revocate le token pro %{application}
     permissions:
       missing: Tu non ha permittite al application le accesso a iste facilitate
+    scopes:
+      read_prefs: Leger preferentias de usator
+      write_prefs: Modificar preferentias de usator
+      write_diary: Crear entratas de diario, commentos e adder amicos
+      write_api: Modificar le carta
+      read_gpx: Leger tracias GPS private
+      write_gpx: Incargar tracias GPS
+      write_notes: Modificar notas
   oauth_clients:
     new:
       title: Registrar un nove application
@@ -2017,13 +2413,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
@@ -2039,19 +2428,7 @@ ia:
       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:
@@ -2060,118 +2437,81 @@ ia:
       flash: Le information del cliente ha essite actualisate con successo
     destroy:
       flash: Le registration del application cliente ha essite destruite
+  oauth2_applications:
+    index:
+      title: Mi applicationes cliente
+      no_applications_html: Ha tu un application que tu vole registrar pro uso con
+        nos per medio del standard %{oauth2}? Tu debe registrar tu application ante
+        que illo pote facer requestas OAuth a iste servicio.
+      oauth_2: OAuth 2
+      new: Registrar nove application
+      name: Nomine
+      permissions: Permissiones
+    application:
+      edit: Modificar
+      delete: Deler
+      confirm_delete: Deler iste application?
+    new:
+      title: Registrar un nove application
+    edit:
+      title: Modificar tu application
+    show:
+      edit: Modificar
+      delete: Deler
+      confirm_delete: Deler iste application?
+      client_id: ID del cliente
+      client_secret: Secreto del cliente
+      client_secret_warning: Assecura te de salveguardar iste secreto; illo non essera
+        accessibile de novo
+      permissions: Permissiones
+      redirect_uris: URIs de redirection
+    not_found:
+      sorry: Guai, ille application non poteva esser trovate.
+  oauth2_authorizations:
+    new:
+      title: Autorisation necessari
+      introduction: Autorisar %{application} a acceder a tu conto con le sequente
+        permissiones?
+      authorize: Autorisar
+      deny: Refusar
+    error:
+      title: Un error ha occurrite
+    show:
+      title: Codice de autorisation
+  oauth2_authorized_applications:
+    index:
+      title: Mi applicationes autorisate
+      application: Application
+      permissions: Permissiones
+      no_applications_html: Tu non ha ancora autorisate applicationes %{oauth2}.
+    application:
+      revoke: Revocar accesso
+      confirm_revoke: Revocar le accesso de iste application?
   users:
-    login:
-      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
-    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_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.
+      contact_support_html: Per favor contacta le <a href="%{support}">servicio de
+        assistentia</a> pro arrangiar le creation de un conto. Nos tentara tractar
+        le requesta le plus rapidemente possibile.
       about:
         header: Libere e modificabile
         html: |-
           <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_html: Tu adresse non es monstrate publicamente. Vide
-        nostre <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="Politica
-        de confidentialitate de OSMF includente un section sur adresses de e-mail">politica
-        de confidentialitate</a> pro plus information.
       display name: 'Nomine public:'
       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.
       continue: Crear conto
       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>.
     terms:
       title: Conditiones
       heading: Conditiones
@@ -2200,6 +2540,10 @@ ia:
         france: Francia
         italy: Italia
         rest_of_world: Resto del mundo
+    terms_declined_flash:
+      terms_declined_html: Nos regretta que tu ha decidite de non acceptar le nove
+        Conditiones de contributor. Pro plus informationes, per favor vide %{terms_declined_link}.
+      terms_declined_link: iste pagina wiki
     no_such_user:
       title: Iste usator non existe
       heading: Le usator %{user} non existe
@@ -2216,7 +2560,6 @@ ia:
       my profile: Mi profilo
       my settings: Mi preferentias
       my comments: Mi commentos
-      oauth settings: configuration oauth
       blocks on me: Blocadas concernente me
       blocks by me: Blocadas facite per me
       send message: Inviar message
@@ -2278,15 +2621,13 @@ ia:
     account:
       title: Modificar conto
       my settings: Mi configurationes
-      current email address: 'Adresse de e-mail actual:'
-      new email address: 'Adresse de e-mail nove:'
-      email never displayed publicly: (nunquam monstrate publicamente)
-      external auth: 'Authentication externe:'
+      current email address: Adresse de e-mail actual
+      external auth: Authentication externe
       openid:
         link: http://wiki.openstreetmap.org/wiki/OpenID
         link text: que es isto?
       public editing:
-        heading: 'Modification public:'
+        heading: Modification public
         enabled: Activate. Non anonyme e pote modificar datos.
         enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: que es isto?
@@ -2304,7 +2645,7 @@ ia:
           public.</li><li>Iste action non pote esser revertite e tote le nove usatores
           es ora public per predefinition.</li></ul>
       contributor terms:
-        heading: 'Conditiones de contributor:'
+        heading: Conditiones de contributor
         agreed: Tu ha acceptate le nove Conditiones de Contributor.
         not yet agreed: Tu non ha ancora acceptate le nove Conditiones de Contributor.
         review link text: Per favor seque iste ligamine a tu convenientia pro revider
@@ -2312,76 +2653,20 @@ 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
-      keep image: Retener le imagine actual
-      delete image: Remover le imagine actual
-      replace image: Reimplaciar le imagine actual
-      image size hint: (imagines quadrate de al minus 100×100 functiona melio)
-      home location: 'Position de origine:'
-      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
       make edits public button: Render tote mi modificationes public
       return to profile: Retornar al profilo
+      oauth1 settings: Configuration OAuth 1
+      oauth2 applications: Applicationes OAuth 2
+      oauth2 authorizations: Autorisationes OAuth 2
       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
@@ -2396,16 +2681,9 @@ ia:
     suspended:
       title: Conto suspendite
       heading: Conto suspendite
-      webmaster: webmaster
       body_html: |-
-        <p>
-          Pardono, tu conto ha essite automaticamente disactivate debite a
-          activitate suspecte.
-        </p>
-        <p>
-          Iste decision essera revidite per un administrator tosto, o
-          tu pote contactar le %{webmaster} si tu desira discuter isto.
-        </p>
+        <p>Guai, tu conto ha essite automaticamente suspendite a causa de activitate suspecte.</p>
+        <p>Iste decision essera tosto revidite per un administrator, o tu pote contactar %{webmaster} si tu vole discuter isto.</p>
     auth_failure:
       connection_failed: Le connexion al fornitor de authentication ha fallite
       invalid_credentials: Datos de authentication non valide
@@ -2449,27 +2727,17 @@ ia:
     new:
       title: Crea blocada de %{name}
       heading_html: Crea blocada de %{name}
-      reason: Le motivo proque %{name} es blocate. Per favor sia tanto calme e rationabile
-        como possibile, e da tante detalios super le situation como tu pote. Non oblida
-        que le message essera publicamente visibile. Nota ben que non tote le usatores
-        comprende le jargon del communitate, dunque usa terminos simple e precise.
       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_html: Modification de un blocada super %{name}
-      reason: Le motivo proque %{name} es blocate. Per favor sia tanto calme e rationabile
-        como possibile, e da tante detalios super le situation como tu pote. Nota
-        ben que non tote le usatores comprende le jargon del communitate, dunque usa
-        terminos simple e precise.
       period: Quante tempore, a partir de ora, essera le usator blocate del API?
       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
@@ -2497,11 +2765,11 @@ ia:
       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
@@ -2529,8 +2797,9 @@ ia:
     show:
       title: '%{block_on} blocate per %{block_by}'
       heading_html: '%{block_on} blocate per %{block_by}'
-      created: Create
-      status: Stato
+      created: 'Create:'
+      duration: 'Durata:'
+      status: 'Stato:'
       show: Monstrar
       edit: Modificar
       revoke: Revocar!
@@ -2554,10 +2823,11 @@ 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}
+      no_notes: Sin notas
       id: ID
       creator: Creator
       description: Description
@@ -2577,7 +2847,7 @@ ia:
       custom_dimensions: Personalisar dimensiones
       format: 'Formato:'
       scale: 'Scala:'
-      image_size: Le imagine monstrara le strato standard in
+      image_dimensions: Le imagine monstrara le strato standard in %{width} x %{height}
       download: Discargar
       short_url: URL curte
       include_marker: Includer marcator
@@ -2619,8 +2889,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>
+      cyclosm: Stilo de tegulas concipite per <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a>
+        e albergate per <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>
       thunderforest: Tegulas fornite per <a href='%{thunderforest_url}' target='_blank'>Andy
         Allan</a>
+      opnvkarte: Tegulas fornite per <a href='%{memomaps_url}' target='_blank'>MeMoMaps</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>
@@ -2765,7 +3038,6 @@ ia:
       centre_map: Centrar le carta hic
   redactions:
     edit:
-      description: Description
       heading: Modificar suppression
       title: Modificar obscuration
     index:
@@ -2773,7 +3045,6 @@ ia:
       heading: Lista de obscurationes
       title: Lista de suppressiones
     new:
-      description: Description
       heading: Specifica information pro nove suppression
       title: Creation de nove obscuration
     show: