X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c4adeda099800dcdf7489b1acf57d9f777bc61f5..e5057dd57adca8e8ad6961eb15346cb365464667:/config/locales/fur.yml

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 31b964176..28822994e 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -16,7 +16,7 @@ fur:
       prompt: Sielç un file
     submit:
       diary_comment:
-        create: Salve
+        create: Comente
       diary_entry:
         create: Publiche
         update: Inzorne
@@ -27,6 +27,9 @@ fur:
       client_application:
         create: Regjistre
         update: Inzorne
+      oauth2_application:
+        create: Regjistre
+        update: Inzorne
       trace:
         create: Cjame
         update: Salve cambiaments
@@ -51,7 +54,6 @@ fur:
       message: Messaç
       node: Grop
       node_tag: Etichete dal grop
-      notifier: Promemorie
       old_node: Vecjo grop
       old_node_tag: Vecje etichete dal grop
       old_relation: Viere relazion
@@ -75,14 +77,27 @@ fur:
       way_node: Grop de vie
       way_tag: Etichete de vie
     attributes:
+      client_application:
+        allow_read_prefs: lei lis sôs preferencis dal utent
+        allow_write_prefs: modificâ lis sôs preferencis dal utent
+        allow_write_diary: creâ vôs dal diari, comentâ e zontâ amîs
+        allow_write_api: modificâ la mape
+        allow_read_gpx: lei i siei percors GPS privâts
+        allow_write_gpx: cjamâ percors GPS
+        allow_write_notes: cambiâ lis notis
       diary_comment:
         body: Cuarp
       diary_entry:
         user: Utent
         title: Sogjet
+        body: Cuarp
         latitude: Latitudin
         longitude: Longjitudin
-        language: Lenghe
+        language_code: Lenghe
+      doorkeeper/application:
+        name: Non
+        confidential: Aplicazion confidenziâl?
+        scopes: Permès
       friend:
         user: Utent
         friend: Amì
@@ -112,7 +127,6 @@ fur:
         auth_provider: Fornidôr de autenticazion
         auth_uid: UID de autenticazion
         email: Pueste eletroniche
-        email_confirmation: Conferme de pueste eletroniche
         new_email: Gnove direzion di pueste
         active: Atîf
         display_name: Non di mostrâ
@@ -131,41 +145,41 @@ fur:
   datetime:
     distance_in_words_ago:
       about_x_hours:
-        one: cirche 1 ore indaûr
+        one: cirche %{count} ore indaûr
         other: cirche %{count} oris indaûr
       about_x_months:
-        one: cirche 1 mês indaûr
+        one: cirche %{count} mês indaûr
         other: cirche %{count} mês indaûr
       about_x_years:
-        one: cirche 1 an indaûr
+        one: cirche %{count} an indaûr
         other: cirche %{count} agns indaûr
       almost_x_years:
-        one: scuasit 1 an indaûr
+        one: scuasit %{count} an indaûr
         other: scuasit %{count} agns indaûr
       half_a_minute: mieç minût indaûr
       less_than_x_seconds:
-        one: mancul di 1 secont indaûr
+        one: mancul di %{count} secont indaûr
         other: mancul di %{count} seconts indaûr
       less_than_x_minutes:
-        one: mancul di 1 minût indaûr
+        one: mancul di %{count} minût indaûr
         other: mancul di %{count} minûts indaûr
       over_x_years:
-        one: plui di 1 an indaûr
+        one: plui di %{count} an indaûr
         other: plui di %{count} agns indaûr
       x_seconds:
-        one: 1 secont indaûr
+        one: '%{count} secont indaûr'
         other: '%{count} seconts indaûr'
       x_minutes:
-        one: 1 minût indaûr
+        one: '%{count} minût indaûr'
         other: '%{count} minûts indaûr'
       x_days:
-        one: 1 zornade indaûr
+        one: '%{count} zornade indaûr'
         other: '%{count} zornadis indaûr'
       x_months:
-        one: 1 mês indaûr
+        one: '%{count} mês indaûr'
         other: '%{count} mês indaûr'
       x_years:
-        one: 1 an indaûr
+        one: '%{count} an indaûr'
         other: '%{count} agns indaûr'
   editor:
     default: Predeterminât (par cumò %{name})
@@ -177,11 +191,10 @@ fur:
       description: Remote Control (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
-      none: Nissun
-      openid: OpenID
+      none: Nissune
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Vichipedie
   api:
@@ -207,50 +220,66 @@ fur:
       entry:
         comment: Coment
         full: Note complete
+  account:
+    deletions:
+      show:
+        title: Elimine il gno profîl
+        delete_account: Elimine profîl
+        confirm_delete: Sêstu sigûr?
+        cancel: Scancele
+  accounts:
+    edit:
+      title: Modifiche profîl
+      my settings: Mês impostazions
+      current email address: Direzion di pueste eletroniche atuâl
+      external auth: Autenticazion esterne
+      openid:
+        link text: ce isal chest?
+      public editing:
+        heading: Modifiche publiche
+        enabled: Ativâts. No anonims e si pues cambiâ i dâts.
+        enabled link text: ce isal chest?
+        disabled: Disativâts e no si pues cambiâ i dâts, ducj i cambiaments precedents
+          a son anonims.
+        disabled link text: parcè no puedio cambiâ?
+      contributor terms:
+        heading: Tiermins par contribuî
+        agreed: Tu âs acetât i gnûfs tiermins di contribuzion.
+        not yet agreed: No tu âs ancjemò acetât i gnûfs tiermins di contribuzion.
+        review link text: Frache par plasê su chest leam par viodi e acetâ i gnûf
+          tiermins par contribuî.
+        agreed_with_pd: Tu âs ancje declarât di considerâ i tiei cambiaments intal
+          Public Domini.
+        link text: ce isal chest?
+      save changes button: Salve cambiaments
+      delete_account: Elimine profîl...
+    go_public:
+      heading: Cambiaments publics
+      make_edits_public_button: Rint publics ducj i miei cambiaments
+    update:
+      success_confirm_needed: Informazions dal utent inzornadis cun sucès. Controle
+        la tô pueste par confermâ la tô gnove direzion di pueste eletroniche.
+      success: Informazions dal utent inzornadis cun sucès.
+    destroy:
+      success: Profîl eliminât.
   browse:
-    created: Creât
-    closed: Sierât
-    created_html: Creât <abbr title='%{title}'>%{time}</abbr>
-    closed_html: Sierât <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: Creât <abbr title='%{title}'>%{time}</abbr> di %{user}
-    deleted_by_html: Eliminât <abbr title='%{title}'>%{time}</abbr> di %{user}
-    edited_by_html: Cambiât <abbr title='%{title}'>%{time}</abbr> di %{user}
-    closed_by_html: Sierât <abbr title='%{title}'>%{time}</abbr> di %{user}
+    deleted_ago_by_html: Eliminât di %{user} %{time_ago}
+    edited_ago_by_html: Modificât di %{user} %{time_ago}
     version: Version
     in_changeset: Grup di cambiaments
     anonymous: anonim
     no_comment: (nissun coment)
     part_of: Part di
     part_of_relations:
-      one: 1 relazion
+      one: '%{count} relazion'
       other: '%{count} relazions'
     part_of_ways:
-      one: 1 vie
+      one: '%{count} vie'
       other: '%{count} viis'
     download_xml: Discjame XML
     view_history: Cjale il storic
     view_details: Cjale i detais
     location: 'Lûc:'
-    changeset:
-      title: 'Grup di cambiaments: %{id}'
-      belongs_to: Autôr
-      node: Grops (%{count})
-      node_paginated: Grops (%{x}-%{y} su %{count})
-      way: Viis (%{count})
-      way_paginated: Viis (%{x}-%{y} su %{count})
-      relation: Relazions (%{count})
-      relation_paginated: Relazions (%{x}-%{y} su %{count})
-      comment: Coments (%{count})
-      hidden_commented_by_html: Coment platât di %{user} <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      commented_by_html: Coment di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      changesetxml: Grup di cambiaments XML
-      osmchangexml: XML in formât osmChange
-      feed:
-        title: Grup di cambiaments %{id}
-        title_comment: Grup di cambiaments %{id} - %{comment}
-      join_discussion: Jentre par partecipâ ae discussion
-      discussion: Discussion
     node:
       title_html: 'Grop: %{name}'
       history_title_html: 'Storic dal grop: %{name}'
@@ -259,7 +288,7 @@ fur:
       history_title_html: 'Storic de vie: %{name}'
       nodes: Grops
       nodes_count:
-        one: 1 grop
+        one: '%{count} grop'
         other: '%{count} grops'
       also_part_of_html:
         one: part de vie %{related_ways}
@@ -269,7 +298,7 @@ fur:
       history_title_html: 'Storic de relazion: %{name}'
       members: Membris
       members_count:
-        one: 1 membri
+        one: '%{count} membri'
         other: '%{count} membris'
     relation_member:
       entry_role_html: '%{type} %{name} come %{role}'
@@ -314,28 +343,6 @@ fur:
       wikidata_link: L'element %{page} su Wikidata
       wikipedia_link: La vôs su %{page} te Vichipedie
       telephone_link: Clame %{phone_number}
-    note:
-      title: 'Note: %{id}'
-      new_note: Gnove note
-      description: Descrizion
-      open_title: 'Note no risolte #%{note_name}'
-      closed_title: 'Note risolte #%{note_name}'
-      hidden_title: 'Note platade #%{note_name}'
-      opened_by_html: Creade di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      opened_by_anonymous_html: Creade di un anonim <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      commented_by_html: Coment di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      commented_by_anonymous_html: Coment di un anonim <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      closed_by_html: Risolte di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      closed_by_anonymous_html: Risolte di anonim <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      reopened_by_html: Tornade a ativâ di %{user} <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      reopened_by_anonymous_html: Tornade a ativâ di un anonim <abbr title='%{exact_time}'>%{when}
-        indaûr</abbr>
-      hidden_by_html: Platade di %{user} <abbr title='%{exact_time}'>%{when} indaûr</abbr>
-      report: Segnale cheste note
     query:
       title: Ce ch'al è intun lûc
       introduction: Frache su la mape par cjatâ lis robis dongje.
@@ -355,10 +362,11 @@ fur:
       saved_at: Salvât ai
       user: Utent
       comment: Coment
-      area: Aree
+      area: Zone
     index:
       title: Grups di cambiaments
       title_user: Grups di cambiaments di %{user}
+      title_user_link_html: Grups di cambiaments di %{user_link}
       title_friend: Grups di cambiaments dai tiei amîs
       title_nearby: Grups di cambiaments dai utents dongje
       empty: Nissun grup di cambiaments cjatât.
@@ -368,6 +376,36 @@ fur:
       no_more_area: Nissun altri grup di cambiaments in cheste zone cjatât.
       no_more_user: Nissun altri grup di cambiaments par chest utent.
       load_more: Cjame di plui
+      feed:
+        title: Grup di cambiaments %{id}
+        title_comment: Grup di cambiaments %{id} - %{comment}
+        created: Creât
+        closed: Sierât
+        belongs_to: Autôr
+    show:
+      title: 'Grup di cambiaments: %{id}'
+      created_ago_html: Creât %{time_ago}
+      closed_ago_html: Sierât %{time_ago}
+      created_ago_by_html: Creât di %{user} %{time_ago}
+      closed_ago_by_html: Sierât di %{user} %{time_ago}
+      discussion: Discussion
+      join_discussion: Jentre par partecipâ ae discussion
+      subscribe: Notiti
+      unsubscribe: Disnotiti
+      comment_by_html: Comentât di %{user} %{time_ago}
+      hidden_comment_by_html: Coment platât di %{user} %{time_ago}
+      hide_comment: plate
+      unhide_comment: mostre
+      comment: Coment
+      changesetxml: Grup di cambiaments XML
+      osmchangexml: XML in formât osmChange
+    paging_nav:
+      nodes: Grops (%{count})
+      nodes_paginated: Grops (%{x}-%{y} su %{count})
+      ways: Viis (%{count})
+      ways_paginated: Viis (%{x}-%{y} su %{count})
+      relations: Relazions (%{count})
+      relations_paginated: Relazions (%{x}-%{y} su %{count})
     timeout:
       sorry: Nus displâs, la liste dai grups di cambiaments che tu âs domandât e je
         stade masse timp a cjamâsi.
@@ -375,18 +413,28 @@ fur:
     comment:
       comment: 'Gnûf coment sul grup di cambiaments #%{changeset_id} di %{author}'
       commented_at_by_html: Inzornât %{when} di %{user}
+    comments:
+      comment: 'Gnûf coment sul grup di cambiaments #%{changeset_id} di %{author}'
     index:
       title_all: Discussion sul grup di cambiaments di OpenStreetMap
       title_particular: 'Discussion sul grup di cambiaments #%{changeset_id} di OpenStreetMap'
+    timeout:
+      sorry: Nus displâs, la liste dai coments ai grups di cambiaments che tu âs domandât
+        e je stade masse timp a cjamâsi.
   dashboards:
     contact:
       km away: '%{count}km di distance'
       m away: '%{count}m di distance'
+      latest_edit_html: 'Ultin cambiament (%{ago}):'
     popup:
       your location: La tô posizion
       nearby mapper: Mapadôr dongje
       friend: Amì
     show:
+      title: La mê pagjine iniziâl
+      no_home_location_html: '%{edit_profile_link} e impueste il to lûc iniziâl par
+        viodi utents dongje di te.'
+      edit_your_profile: Cambie il to profîl
       my friends: I miei amîs
       no friends: No tu âs ancjemò nissun amì.
       nearby users: Altris utents dongje
@@ -431,11 +479,13 @@ fur:
         la grafie o che tu vedis seguît il leam just.
     diary_entry:
       posted_by_html: Publicât di %{link_user} ai %{created} par %{language_link}.
+      updated_at_html: Ultim inzornament ai %{updated}.
       comment_link: Scrîf un coment su cheste vôs
       reply_link: Mande un messaç al autôr
       comment_count:
-        one: 1 coment
+        one: '%{count} coment'
         other: '%{count} coments'
+      no_comments: Nissun coment
       edit_link: Cambie cheste vôs
       hide_link: Plate cheste vôs
       confirm: Conferme
@@ -459,12 +509,27 @@ fur:
       all:
         title: Vôs dai diaris di OpenStreetMap
         description: Lis ultimis vôs dai diaris dai utents di OpenStreetMap
-    comments:
+  diary_comments:
+    index:
+      title: Coments ai diaris zontâts par %{user}
+      heading: Coments ai diaris di %{user}
+      subheading_html: Coments ai diaris zontâts di %{user}
+      no_comments: Nissun coment ai diaris
       post: Messaç
       when: Cuant
       comment: Coment
       newer_comments: Coments plui gnûfs
       older_comments: Coments plui vieris
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Aplicazion regjistrade.
+  errors:
+    forbidden:
+      title: Proibît
+    not_found:
+      title: File no cjatât
   friendships:
     make_friend:
       heading: Zontâ %{user} ai amîs?
@@ -479,19 +544,17 @@ fur:
   geocoder:
     search:
       title:
-        latlon_html: Risultâts cjolts dal <a href="http://openstreetmap.org/">sît
-          interni</a>
-        ca_postcode_html: Risultâts cjolts di <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim_html: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames_html: Risultâts cjolts di <a href="http://www.geonames.org/">GeoNames</a>
-        osm_nominatim_reverse_html: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames_reverse_html: Risultâts di <a href="http://www.geonames.org/">GeoNames</a>
+        results_from_html: Risultâts di %{results_link}
+        latlon: Interni
     search_osm_nominatim:
       prefix:
+        aerialway:
+          cable_car: Funivie
+          pylon: Pilon
         aeroway:
-          terminal: Terminâl
+          gate: Puarte di aeropuart
+          hangar: Hangar
+          terminal: Terminâl dal aeropuart
         amenity:
           arts_centre: Centri pes arts
           atm: Bancomat
@@ -500,6 +563,7 @@ fur:
           bench: Bancjute
           bicycle_parking: Parc pes bicicletis
           bicycle_rental: Nauli di bicicletis
+          brothel: Bordel
           bureau_de_change: Ufizi di cambi
           bus_station: Stazion des corieris
           car_rental: Nauli di machinis
@@ -509,23 +573,32 @@ fur:
           charging_station: Stazion di cjarie
           cinema: Cine
           clinic: Cliniche
+          clock: Orloi
           community_centre: Centri civic
+          conference_centre: Centri pe conferencis
           crematorium: Crematori
           dentist: Dentist
           doctors: Dotôrs
           drinking_water: Aghe potabil
           driving_school: Scuele guide
           embassy: Ambassade
+          events_venue: Lûc par events
           ferry_terminal: Terminâl traghets
           fire_station: Stazion dai pompîrs
           fountain: Fontane
-          fuel: Stazion di riforniment
+          fuel: Stazion di servizi
           hospital: Ospedâl
           ice_cream: Gjelato
           kindergarten: Scuelute
+          language_school: Scuele di lenghis
           library: Biblioteche
+          monastery: Monastîr
+          music_school: Scuele di musiche
           nightclub: Club noturni
           parking: Parcament
+          parking_entrance: Jentrade dal parcament
+          parking_space: Puest di parcament
+          payment_terminal: Terminâl pal paiament
           pharmacy: Farmacie
           place_of_worship: Lûc di cult
           police: Polizie
@@ -536,6 +609,7 @@ fur:
           recycling: Pont pal ricicli
           restaurant: Ristorant
           school: Scuele
+          shower: Doce
           social_centre: Centri sociâl
           swimming_pool: Pissine
           taxi: Taxi
@@ -546,31 +620,58 @@ fur:
           vending_machine: Distributôr automatic
           veterinary: Veterinari
           village_hall: Centri civic
+          waste_basket: Scovacere
+          weighbridge: Pese
         boundary:
           administrative: Confin aministratîf
           national_park: Parc nazionâl
-          protected_area: Aree protezude
+          protected_area: Zone protezude
+          "yes": Confin
         bridge:
           aqueduct: Acuedot
           viaduct: Viadot
           "yes": Puint
         building:
+          apartment: Apartament
+          apartments: Apartaments
+          barn: Toblât
           chapel: Capele
           church: Edifici de glesie
+          civic: Centri civic
           commercial: Edifici comerciâl
+          construction: Edifici in costruzion
+          detached: Cjase unifamiliâr
           dormitory: Dormitori
           garage: Garage
+          greenhouse: Sidrere
+          hangar: Hangar
           hospital: Edifici dal ospedâl
           hotel: Edifici di hotel
           house: Cjase
+          hut: Barache
           industrial: Edifici industriâl
+          office: Uficis
           public: Edifici public
           residential: Edifici residenziâl
+          retail: Edifici pe vendite al detai
           school: Edifici scolastic
+          stable: Stale
           train_station: Edifici di une stazion de ferade
           university: Edifici universitari
           "yes": Edifici
+        club:
+          sport: Circul sportîf
+          "yes": Circul
+        craft:
+          blacksmith: Fari
+          electrician: Eletricist
+          painter: Pitôr
+          photographer: Fotograf
+          plumber: Idraulic
+          shoemaker: Cjaliâr
+          tailor: Sartôr
         emergency:
+          fire_extinguisher: Estintôr
           phone: Telefon di emergjence
         highway:
           bus_stop: Fermade autobus
@@ -578,6 +679,7 @@ fur:
           cycleway: Percors ciclabil
           emergency_access_point: Pont di acès di emergjence
           footway: Percors pedonâl
+          give_way: Cartel di precedenze
           motorway: Autostrade
           motorway_junction: Svincul autostradâl
           motorway_link: Autostrade
@@ -599,37 +701,58 @@ fur:
           tertiary: Strade terziarie
           tertiary_link: Strade terziarie
           track: Piste
+          traffic_mirror: Spieli pal traffic
+          traffic_signals: Semafar
+          trunk: Strade rapide
+          trunk_link: Strade rapide
+          unclassified: Strade no classificade
+          "yes": Strade
         historic:
           archaeological_site: Sît archeologic
           battlefield: Cjamp di bataie
+          boundary_stone: Piere di confin
           building: Edifici storic
+          bunker: Bunker
+          cannon: Canon storic
           castle: Cjiscjel
           church: Glesie
+          city_gate: Puarte de citât
           citywalls: Muris
           fort: Fuart
           house: Cjase
           memorial: Memoriâl
           mine: Miniere
           monument: Monument
+          roman_road: Strade romane
           ruins: Ruvinàs
+          stone: Piere
           tomb: Tombe
           tower: Tor
+          wayside_chapel: Capele
+          wayside_cross: Crôs
+          wayside_shrine: Anconute
+          "yes": Lûc storic
+        junction:
+          "yes": Crosade
         landuse:
           cemetery: Simiteri
-          commercial: Aree comerciâl
-          construction: In costruzion
+          commercial: Zone comerciâl
+          construction: Zone in costruzion
+          farmland: Cjamps
           forest: Bosc
           grass: Prât
-          industrial: Aree industriâl
+          industrial: Zone industriâl
           meadow: Prâts
-          military: Aree militâr
+          military: Zone militâr
           mine: Miniere
           quarry: Gjave
           railway: Ferade
-          residential: Aree residenziâl
+          residential: Zone residenziâl
+          retail: Zone di buteghis
           vineyard: Vigne
         leisure:
           common: Comugnâi (UK)
+          dog_park: Parc pai cjans
           fishing: Riserve par pescjâ
           garden: Zardin
           golf_course: Troi di golf
@@ -637,6 +760,7 @@ fur:
           miniature_golf: Minigolf
           nature_reserve: Riserve naturâl
           park: Parc
+          picnic_table: Taule pal picnic
           pitch: Cjamp sportîf
           sauna: Saune
           sports_centre: Centri sportîf
@@ -644,9 +768,17 @@ fur:
           swimming_pool: Pissine
           track: Piste pe corse
           water_park: Parc acuatic
+        man_made:
+          bridge: Puint
+          bunker_silo: Bunker
+          tower: Tor
+          water_tower: Tor pe aghe
+          water_well: Poç
+          works: Fabriche
         military:
           airfield: Cjamp di aviazion militâr
           barracks: Caserme
+          bunker: Bunker
         mountain_pass:
           "yes": Pas di montagne
         natural:
@@ -664,18 +796,31 @@ fur:
           island: Isule
           land: Tiere
           peak: Pic
+          peninsula: Penisule
           point: Pont
+          sand: Savalon
+          strait: Stret
           tree: Arbul
+          tree_row: Rie di arbui
           valley: Val
           volcano: Vulcan
           water: Aghe
+          "yes": Element naturâl
         office:
           architect: Architet
+          association: Associazion
+          company: Aziende
+          diplomatic: Ufici diplomatic
           employment_agency: Agjenzie di ocupazion
           estate_agent: Agjent imobiliâr
+          financial: Ufici finanziari
           government: Ufizi governatîf
           insurance: Agjenzie di assicurazions
+          it: Ufici informatic
           lawyer: Avocat
+          logistics: Ufici di logjistiche
+          newspaper: Ufici di gjornâl
+          notary: Nodâr
           travel_agent: Agjenzie di viaçs
           "yes": Ufizi
         place:
@@ -693,11 +838,13 @@ fur:
           postcode: Codis postâl
           region: Regjon
           sea: Mâr
+          square: Place
           state: Stât
           subdivision: Sotdivision
           suburb: Cuartîr
           town: Citadine
           village: Vilaç
+          "yes": Lûc
         railway:
           abandoned: Ferade bandonade
           construction: Ferade in costruzion
@@ -725,6 +872,7 @@ fur:
           hairdresser: Piruchîr o barbîr
           jewelry: Buteghe dal oresin
           laundry: Lavandarie
+          massage: Massaç
           newsagent: Buteghe dai gjornâi
           optician: Otic
           pet: Buteghe di animâi
@@ -732,6 +880,7 @@ fur:
           shoes: Buteghe di scarpis
           sports: Buteghe di articui sportîfs
           supermarket: Supermarcjât
+          tailor: Sartôr
           toys: Negozi di zugatui
           travel_agency: Agjenzie di viaçs
           "yes": Buteghe
@@ -753,9 +902,11 @@ fur:
           river: Flum
       admin_levels:
         level2: Confin di paîs
+        level3: Confin di regjon
         level4: Confin di stât
         level5: Confin di regjon
         level6: Confin di contee
+        level7: Confine municipâl
         level8: Confin di citât
         level9: Confin di vilaç
       types:
@@ -768,19 +919,26 @@ fur:
   issues:
     index:
       reported_user: Utent segnalât
+      search: Cîr
+      status: Stât
       reports: Segnalazions
-      last_updated_time_html: <abbr title='%{title}'>%{time}</abbr>
-      last_updated_time_user_html: <abbr title='%{title}'>%{time}</abbr> di %{user}
       link_to_reports: Viôt lis segnalazions
       reports_count:
-        one: 1 segnalazion
+        one: '%{count} segnalazion'
         other: '%{count} segnalazions'
-    update:
-      new_report: La tô segnalazion e je stade registrade corretamentri
+      states:
+        ignored: Ignorât
+        open: Viert
+        resolved: Risolt
     show:
       reports:
-        one: 1 segnalazion
+        one: '%{count} segnalazion'
         other: '%{count} segnalazions'
+      resolve: Risolf
+      ignore: Ignore
+    helper:
+      reportable_title:
+        note: 'Note #%{note_id}'
   reports:
     new:
       title_html: Segnale %{link}
@@ -792,10 +950,8 @@ fur:
     home: Va al lûc iniziâl
     logout: Jes
     log_in: Jentre
-    log_in_tooltip: Jentre cuntun profîl esistint
     sign_up: Regjistriti
     start_mapping: Scomence a mapâ
-    sign_up_tooltip: Cree un profîl par colaborâ
     edit: Cambie
     history: Storic
     export: Espuarte
@@ -811,11 +967,9 @@ fur:
     intro_text: OpenStreetMap e je une mape dal mont, creade di int come te e di ûs
       libar sot di une licence vierte.
     intro_2_create_account: Cree il to profîl utent
-    hosting_partners_html: L'hosting al è sostignût di %{ucl}, %{bytemark} e altris
-      %{partners}.
-    partners_ucl: UCL
-    partners_bytemark: Bytemark Hosting
+    partners_fastly: Fastly
     partners_partners: associâts
+    tou: Cundizions pal ûs
     osm_offline: La base di dâts di OpenStreetMap e je par cumò fûr linie parcè che
       o sin daûr a fâ lavôrs essenziâi di manutenzion de base di dâts.
     osm_read_only: La base di dâts di OpenStreetMap e je par cumò dome in leture dilunc
@@ -824,11 +978,10 @@ fur:
     help: Jutori
     about: Informazions
     copyright: Copyright
+    communities: Comunitâts
     community: Comunitât
     community_blogs: Blogs de comunitât
     community_blogs_title: Blogs di bande dai membris de comunitât OpenStreetMap
-    foundation: Fondazion
-    foundation_title: La fondazion OpenStreetMap
     make_a_donation:
       title: Sosten OpenStreetMap fasint une donazion monetarie
       text: Done alc
@@ -854,8 +1007,6 @@ fur:
       see_their_profile: Tu puedis viodi il sô profîl su %{userurl}.
       befriend_them: Tu puedis ancje zontâlu/le come amì su %{befriendurl}.
     gpx_success:
-      loaded_successfully: al sedi stât cjamât cun sucès, cun %{trace_points} suntun
-        totâl di %{possible_points} ponts pussibii.
       subject: '[OpenStreetMap] Impuartazion GPX completade cun sucès'
     signup_confirm:
       subject: '[OpenStreetMap] Benvignût in OpenStreetMap'
@@ -865,6 +1016,11 @@ fur:
         il cambiament.
     note_comment_notification:
       anonymous: Un utent anonim
+    changeset_comment_notification:
+      commented:
+        partial_changeset_with_comment: cun coment '%{changeset_comment}'
+        partial_changeset_with_comment_html: cun coment '%{changeset_comment}'
+        partial_changeset_without_comment: cence coment
   confirmations:
     confirm:
       heading: Controle la tô pueste!
@@ -876,8 +1032,6 @@ fur:
       success: Profîl confermât, graziis par jessiti regjistrât!
       already active: Chest profîl al è za stât confermât.
       unknown token: Chest codiç di conferme al è scjadût o nol esist.
-      reconfirm_html: Se tu âs bisugne di un altri messaç di pueste par conferme,
-        <a href="%{reconfirm}">frache culì</a>.
     confirm_resend:
       failure: L'utent %{name} nol è stât cjatât.
     confirm_email:
@@ -889,7 +1043,6 @@ fur:
   messages:
     inbox:
       title: In jentrade
-      my_inbox: I miei messaçs in jentrade
       messages: Tu âs %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} messaç gnûf'
@@ -897,12 +1050,15 @@ fur:
       old_messages:
         one: '%{count} messaç vieli'
         other: '%{count} messaçs vielis'
-      from: Di
-      subject: Sogjet
-      date: Date
       no_messages_yet_html: No tu âs ancjemò nissun messaç. Parcè no tu contatis cualchidun
         de %{people_mapping_nearby_link}?
       people_mapping_nearby: int che e je daûr a mapâ dongje di te
+    messages_table:
+      from: Di
+      to: A
+      subject: Sogjet
+      date: Date
+      actions: Azions
     message_summary:
       unread_button: Segne come no let
       read_button: Segne come let
@@ -911,8 +1067,6 @@ fur:
     new:
       title: Mande messaç
       send_message_to_html: Mande un gnûf messaç a %{name}
-      subject: Sogjet
-      body: Cuarp
       back_to_inbox: Torne ai messaçs in jentrade
     create:
       message_sent: Messaç mandât
@@ -921,51 +1075,64 @@ fur:
       heading: Messaç no cjatât
     outbox:
       title: In jessude
+      actions: Azions
       messages:
         one: Tu âs %{count} messaç in jessude
         other: Tu âs %{count} messaçs in jessude
-      to: A
-      subject: Sogjet
-      date: Date
       no_sent_messages_html: No tu âs ancjemò mandât nissun messaç. Parcè no tu contatis
         cualchidun de %{people_mapping_nearby_link}?
       people_mapping_nearby: int che e je daûr a mapâ dongje di te
     show:
       title: Leture messaç
-      from: Di
-      subject: Sogjet
-      date: Date
       reply_button: Rispuint
       unread_button: Segne come di lei
       destroy_button: Elimine
       back: Indaûr
-      to: A
     sent_message_summary:
       destroy_button: Elimine
+    heading:
+      my_inbox: I miei messaçs in jentrade
+      my_outbox: I miei messaçs in jessude
     mark:
       as_read: Messaç segnât come za let
       as_unread: Messaç segnât come di lei
     destroy:
       destroyed: Messaç eliminât
   passwords:
-    lost_password:
+    new:
       title: Password pierdude
       heading: Âstu pierdût la password?
       email address: 'Direzion di pueste:'
       new password button: Azere la password
       help_text: Scrîf la direzion di pueste eletroniche che tu âs doprât par iscrivîti
         e ti mandarin un leam par tornâ a impuestâ la tô password.
-      notice email cannot find: No vin podût cjatâ la tô direzion di pueste, nus displâs.
-    reset_password:
+    edit:
       title: Azere la password
       heading: Azere la password par %{user}
       reset: Azere la password
+    update:
       flash changed: La tô password e je stade cambiade.
+  preferences:
+    show:
+      title: Preferencis
+      preferred_editor: Editôr preferît
+      preferred_languages: Lenghis preferidis
+      edit_preferences: Cambie lis preferencis
+    edit:
+      title: Cambie lis preferencis
+      save: Inzorna lis preferencis
+      cancel: Scancele
+    update_success_flash:
+      message: Preferencis inzornadis.
   profiles:
     edit:
+      title: Cambie il profîl
+      save: Inzorne il profîl
+      cancel: Scancele
       image: Figure
       gravatar:
         gravatar: Dopre Gravatar
+        what_is_gravatar: Ce isal Gravatar?
       new image: Zonte une figure
       keep image: Ten la figure di cumò
       delete image: Gjave la figure di cumò
@@ -974,85 +1141,75 @@ fur:
       home location: Lûc iniziâl
       no home location: No tu âs configurât il lûc iniziâl.
       update home location on click: Aio di inzornâ il lûc iniziâl cuant che o frachi
-        parsore la mape?
+        parsore de mape?
+      show: Mostre
+      delete: Elimine
+    update:
+      success: Profîl inzornât
   sessions:
     new:
       title: Jentre
-      heading: Jentre
+      tab_title: Jentre
       email or username: 'Direzion di pueste eletroniche o non utent:'
       password: 'Password:'
-      openid_html: '%{logo} OpenID:'
       remember: Visiti di me
       lost password link: Password pierdude?
       login_button: Jentre
       register now: Regjistriti cumò
-      with username: 'Âstu za un profîl su OpenStreetMap? Jentre cul to non utent
-        e la tô password:'
-      new to osm: Sêstu gnûf su OpenStreetMap?
-      to make changes: Par cambiâ alc tai dâts di OpenStreetMap, tu scugnis vê un
-        profîl.
-      create account minute: Cree un profîl. I vûl dome un minût.
-      no account: No âstu ancjemò un profîl?
       auth failure: Nus displâs, ma no si à rivât a jentrâ cun i dâts inserîts.
-      openid_logo_alt: Jentre cuntun OpenID
-      auth_providers:
-        openid:
-          title: Jentre cun OpenID
-          alt: Jentre cuntun URL OpenID
-        google:
-          title: Jentre cun Google
-          alt: Jentre cuntun OpenID Google
-        facebook:
-          title: Jentre cun Facebook
-          alt: Jentre cuntun un cont Facebook
-        windowslive:
-          title: Jentre cun Windows Live
-          alt: Jentre cuntun cont di Windows Live
-        github:
-          title: Jentre cun GitHub
-          alt: Jentre cuntun cont GitHub
-        wikipedia:
-          title: Jentre cun Vichipedie
-          alt: Jentre cuntun cont de Vichipedie
-        wordpress:
-          title: Jentre cun Wordpress
-          alt: Jentre cuntun OpenID Wordpress
-        aol:
-          title: Jentre cun AOL
-          alt: Jentre cuntun OpenID AOL
     destroy:
       title: Jes
       heading: Va fûr di OpenStreetMap
       logout_button: Jes
+    suspended_flash:
+      support: assistence
   shared:
+    markdown_help:
+      link: Leam
+      text: Test
+      image: Figure
+      alt: Test alternatîf
+      url: URL
     richtext_field:
+      edit: Cambie
       preview: Anteprime
   site:
     about:
       next: Prossim
-      copyright_html: <span>&copy;</span>Colaboradôrs<br> di OpenStreetMap
       local_knowledge_title: Cognossince locâl
+      community_driven_osm_blog: Blog di OpenStreetMap
+      community_driven_user_diaries: diaris dai utents
+      community_driven_community_blogs: Blogs de comunitât
+      community_driven_osm_foundation: Fondazion OSM
       open_data_title: Dâts vierts
+      open_data_open_data: dâts vierts
+      legal_title: Legâl
+      legal_1_1_terms_of_use: Cundizions pal ûs
+      legal_2_1_contact_the_osmf: contate il OSMF
       partners_title: Associâts
     copyright:
+      title: Copyright e licence
       foreign:
         title: Informazions su cheste traduzion
       native:
         title: Informazions su cheste pagjine
         mapping_link: scomence a mapâ
       legal_babble:
-        title_html: Copyright e licence
         attribution_example:
           title: Esempli di atribuzion
         more_title_html: Par savênt di plui
         contributors_title_html: Nestris colaboradôrs
+        contributors_at_austria: Austrie
+        contributors_au_australia: Australie
+        contributors_fr_france: France
+        contributors_nz_new_zealand: Gnove Zelande
+        contributors_si_slovenia: Slovenie
+        contributors_es_spain: Spagne
+        contributors_gb_united_kingdom: Ream Unît
     index:
       js_1: Tu stâs doprant un sgarfadôr che nol supuarte JavaScript o ben JavaScript
         al è stât disativât.
       js_2: OpenStreetMap al dopre JavaScript par mostrâ la sô mape.
-      permalink: Leam permanent
-      shortlink: Leam curt
-      createnote: Zonte une note
       license:
         copyright: Copyright di OpenStreetMap e dai siei colaboradôrs, sot di une
           licence vierte
@@ -1068,14 +1225,8 @@ fur:
         par cheste funzion.
     export:
       title: Espuarte
-      area_to_export: Aree di espuartâ
       manually_select: Sielç a man une aree divierse
-      format_to_export: Formât di espuartâ
-      osm_xml_data: Dâts XML di OpenStreetMap
       licence: Licence
-      export_details_html: I dâts di OpenStreetMap a son dâts fûr sot de licence <a
-        href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons Open
-        Database License</a> (ODbL).
       too_large:
         body: Cheste aree e je masse grande par espuartâle come dâts XML di OpenStreetMap.
           Par plasê incrès il zoom, sielç une aree plui piçule o dopre une des sorzints
@@ -1085,17 +1236,6 @@ fur:
         other:
           title: Altris sorzints
           description: Altris sorzints elencadis su la wiki di OpenStreetMap
-      options: Opzions
-      format: 'Formât:'
-      scale: Scjale
-      max: max
-      image_size: 'Dimensions figure:'
-      zoom: Ingrandiment
-      add_marker: Zonte un segnalut ae mape
-      latitude: 'Lat:'
-      longitude: 'Lon:'
-      output: Jessude
-      paste_html: Tache l'HTML par inserîlu tal to sît web
       export_button: Espuarte
     fixthemap:
       title: Segnale un probleme / Comede la mape
@@ -1112,22 +1252,23 @@ fur:
         title: Benvignûts in OpenStreetMap
       beginners_guide:
         title: Guide pai principiants
-      help:
-        title: Forum di jutori
-      forums:
-        title: Forums
       irc:
         title: IRC
       welcomemat:
         title: Pe organizazions
       wiki:
-        url: http://wiki.openstreetmap.org/
         title: OpenStreetMap Wiki
+    potlatch:
+      change_preferences: Cambie lis tôs preferences culì
+    any_questions:
+      title: Domandis?
     sidebar:
       search_results: Risultâts de ricercje
       close: Siere
     search:
       search: Cîr
+      get_directions: Cjate indicazions
+      get_directions_title: Cjate lis indicazions tra doi ponts
       from: Di
       to: A
       where_am_i: Dulà soio?
@@ -1138,53 +1279,67 @@ fur:
       table:
         entry:
           motorway: Autostrade
+          main_road: Strade principâl
+          trunk: Strade rapide
           primary: Strade primarie
           secondary: Strade secondarie
+          unclassified: Strade no classificade
+          pedestrian: Strade pedonâl
+          track: Piste
           rail: Ferade
           subway: Metropolitane
-          tram:
-          - Metropolitana leggera
-          - tram
-          runway:
-          - Piste dal aeropuart
-          apron:
-            1: terminâl
+          ferry: Traghet
+          tram: Tram
+          runway: Piste dal aeropuart
           admin: Confin aministratîf
           forest: Bosc
+          grass: Prât
+          meadow: Prâts
+          sand: Savalon
           golf: Troi di golf
           park: Parc
-          resident: Aree residenziâl
-          common:
-          - Comugnâi
-          - prâts
-          industrial: Aree industriâl
+          common: Comugnâi
+          resident: Zone residenziâl
+          retail: Zone di buteghis
+          industrial: Zone industriâl
           commercial: Aree comerciâl
-          lake:
-          - Lâc
+          lake: Lâc
           cemetery: Simiteri
           pitch: Cjamp sportîf
           centre: Centri sportîf
           reserve: Riserve naturâl
-          military: Aree militâr
-          school:
-          - Scuele
-          - universitât
+          military: Zone militâr
+          school: Scuele
+          university: Universitât
+          hospital: Ospedâl
           station: stazion de ferade
           tunnel: Rie a trats = galarie
           bridge: Rie nere = puint
           private: Acès privât
           construction: Stradis in costruzion
+          bus_stop: Fermade autobus
+          stop: Fermade
+          bicycle_shop: Buteghe di bicicletis
     welcome:
       title: Benvignût!
       whats_on_the_map:
         title: Ce ch'al è su la mape
-      questions:
-        title: Domandis?
+      basic_terms:
+        node: grop
+        way: vie
+        tag: etichete
+      rules:
+        title: Regulis!
       start_mapping: Scomence a mapâ
       add_a_note:
         title: No tu âs timp par fâ i cambiaments? Zonte une note!
+    communities:
+      title: Comunitâts
+      other_groups:
+        title: Altris grups
   traces:
     new:
+      upload_trace: Cjame percors GPS
       visibility_help: ce vuelial dî?
       help: Jutori
     create:
@@ -1193,9 +1348,12 @@ fur:
         jessi zontât ae base di dâts. Chest al sucêt in gjenar jentri di une ore;
         ti mandarìn un messaç cuant che il lavôr al sarà stât completât.
     edit:
+      cancel: Scancele
       title: Daûr a cambiâ il percors %{name}
       heading: Daûr a cambiâ il percors %{name}
       visibility_help: ce vuelial dî?
+    update:
+      updated: Percors inzornât
     trace_optionals:
       tags: Etichetis
     show:
@@ -1207,6 +1365,7 @@ fur:
       uploaded: 'Cjamât ai:'
       points: 'Ponts:'
       start_coordinates: 'Coordenadis iniziâls:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: mape
       edit: cambie
       owner: 'Paron:'
@@ -1219,13 +1378,12 @@ fur:
       visibility: 'Visibilitât:'
       confirm_delete: Eliminâ chest percors?
     trace_paging_nav:
-      showing_page: Pagjine %{page}
       older: Percors plui vieris
       newer: Percors plui gnûfs
     trace:
       pending: IN SPIETE
       count_points:
-        one: 1 pont
+        one: '%{count} pont'
         other: '%{count} ponts'
       more: plui
       trace_details: Cjale i detais dal percors
@@ -1234,19 +1392,47 @@ fur:
       public: PUBLIC
       identifiable: IDENTIFICABIL
       private: PRIVÂT
-      by: di
-      in: in
     index:
       public_traces: Percors GPS publics
-      my_traces: I miei percors GPS
+      my_gps_traces: I miei percors GPS
       public_traces_from: Percors GPS publics di %{user}
       description: Viôt i percors GPS cjamâts sù tai ultins timps
       tagged_with: ' etichetât cun %{tags}'
+      empty_title: Ancjemò nuie par culì
+      upload_new: Cjame un gnûf percors
       upload_trace: Cjame un percors
+      all_traces: Ducj i percors
+      my_traces: I miei percors
+      traces_from: Percors publics di %{user}
     georss:
       title: Percors GPS di OpenStreetMap
     description:
       description_without_count: File GPS di %{user}
+  application:
+    settings_menu:
+      account_settings: Impostazions dal profîl
+      oauth1_settings: Impostazions OAuth1
+      oauth2_applications: Aplicazions OAuth 2
+      oauth2_authorizations: Autorizazions OAuth 2
+    auth_providers:
+      openid:
+        title: Jentre cun OpenID
+        alt: Jentre cuntun URL OpenID
+      google:
+        title: Jentre cun Google
+        alt: Jentre cuntun OpenID Google
+      facebook:
+        title: Jentre cun Facebook
+        alt: Jentre cuntun un cont Facebook
+      microsoft:
+        title: Jentre cun Microsoft
+        alt: Jentre cuntun cont di Microsoft
+      github:
+        title: Jentre cun GitHub
+        alt: Jentre cuntun cont GitHub
+      wikipedia:
+        title: Jentre cun Vichipedie
+        alt: Jentre cuntun cont de Vichipedie
   oauth:
     authorize:
       title: Permèt l'accès al to cont
@@ -1264,6 +1450,12 @@ fur:
       grant_access: Permèt l'accès
     authorize_success:
       verification: Il codiç di verifiche al è %{code}.
+    revoke:
+      flash: Tu âs revocât il token par %{application}
+    scopes:
+      write_prefs: Modificâ lis preferencis dal utent
+      write_api: Modificâ la mape
+      write_notes: Cambiâ lis notis
   oauth_clients:
     new:
       title: Regjistre une gnove aplicazion
@@ -1271,6 +1463,7 @@ fur:
       title: Cambie la tô aplicazion
     show:
       title: Detais OAuth par {app_name}
+      authorize_url: 'Autorize URL:'
       edit: Cambie i detais
       delete: Elimine client
       confirm: Sêstu sigûr?
@@ -1287,29 +1480,60 @@ fur:
       no_apps_html: Âstu une aplicazion web che tu volaressis regjistrâ par doprâ
         ca di no cul standard %{oauth}? Tu scugnis regjistrâle prime che podedi fâ
         richiestis OAuth a chest servizi.
+      oauth: OAuth
       registered_apps: 'Tu âs chestis aplicazions client regjistradis:'
       register_new: Regjistre la tô aplicazion
     form:
       requests: 'Domande i permès ca sot al utent:'
   oauth2_applications:
+    index:
+      no_applications_html: Âstu une aplicazion che tu volaressis regjistrâ par doprâ
+        ca di no cul standard %{oauth2}? Tu scugnis regjistrâle prime che podedi fâ
+        richiestis OAuth a chest servizi.
+      new: Regjistre une gnove aplicazion
+      name: Non
+      permissions: Permès
+    application:
+      edit: Cambie
+      delete: Elimine
+      confirm_delete: Vuelistu eliminâ cheste aplicazion?
     new:
       title: Regjistre une gnove aplicazion
+    edit:
+      title: Cambie la tô aplicazion
+    show:
+      edit: Cambie
+      delete: Elimine
+      confirm_delete: Vuelistu eliminâ cheste aplicazion?
+      client_id: ID dal client
+      client_secret: Segret dal client
+      permissions: Permès
+  oauth2_authorizations:
+    new:
+      title: Covente une autorizazion
+      authorize: Autorize
+      deny: Dinee
+    show:
+      title: Codiç di autorizazion
+  oauth2_authorized_applications:
+    index:
+      title: Lis aplicazions che o ai autorizât
+      application: Aplicazion
+      permissions: Permès
+      no_applications_html: No tu âs autorizât ancjemò nissun aplicazion %{oauth2}.
+    application:
+      revoke: Revoche l'acès
   users:
     new:
       title: Regjistriti
       about:
         header: Libare e modificabile
-      email address: 'Direzion di pueste eletroniche:'
-      confirm email address: 'Conferme direzion pueste:'
-      display name: 'Non di mostrâ:'
       display name description: Il non utent che al vignarà mostrât a ducj. Tu podarâs
         gambiâlu plui tart tes preferencis.
       external auth: 'Autenticazion vie une tierce part:'
-      use external auth: In alternative, dopre une tierce part par jentrâ
-      auth no password: Cun l'autenticazione vie une tierce part, no convente une
-        password ma cualchi imprest o servidôr esterni podarès instès domandânt une
       continue: Regjistriti
       terms accepted: Graziis par vê acetât i gnûfs tiermins par contribuî!
+      use external auth: In alternative, dopre une tierce part par jentrâ
     terms:
       title: Tiermins
       heading: Tiermins
@@ -1333,7 +1557,6 @@ fur:
       deleted: eliminât
     show:
       my diary: Il gno diari
-      new diary entry: gnove vôs dal diari
       my edits: I miei cambiaments
       my traces: I miei percors
       my notes: Lis mês notis
@@ -1341,8 +1564,11 @@ fur:
       my profile: Il gno profîl
       my settings: Impostazions
       my comments: I mei coments
+      my_preferences: Preferencis
+      my_dashboard: La mê pagjine iniziâl
       blocks on me: Blocs su di me
       blocks by me: Blocs aplicâts di me
+      edit_profile: Cambie il profîl
       send message: Mande messaç
       diary: Diari
       edits: Cambiaments
@@ -1354,75 +1580,40 @@ fur:
       ct status: 'Tiermins par contribuî:'
       ct undecided: Nol à decidût
       ct declined: Refudâts
-      latest edit: 'Ultin cambiament (%{ago}):'
       email address: 'Direzion di pueste:'
       created from: 'Creât di:'
       status: 'Stât:'
       spam score: 'Ponts di spam:'
-      description: Descrizion
-      user location: Lûc dal utent
       role:
         administrator: Chest utent al è un aministradôr
         moderator: Chest utent al è un moderatôr
+        revoke:
+          administrator: Revoche l'acès come aministradôr
       block_history: blocs ricevûts
       moderator_history: blocs aplicâts
       comments: Coments
       create_block: bloche chest utent
       activate_user: ative chest utent
-      deactivate_user: disative chest utent
       confirm_user: Conferme chest utent
       hide_user: plate chest utent
       unhide_user: mostre chest utent
       delete_user: elimine chest utent
       confirm: Conferme
       report: Segnale chest utent
-    account:
-      title: Modifiche profîl
-      my settings: Mês impostazions
-      current email address: Direzion di pueste eletroniche atuâl
-      external auth: Autenticazion esterne
-      openid:
-        link: http://wiki.openstreetmap.org/wiki/OpenID
-        link text: ce isal chest?
-      public editing:
-        heading: Cambiaments publics
-        enabled: Ativâts. No anonims e si pues cambiâ i dâts.
-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
-        enabled link text: ce isal chest?
-        disabled: Disativâts e no si pues cambiâ i dâts, ducj i cambiaments precedents
-          a son anonims.
-        disabled link text: parcè no puedio cambiâ?
-      public editing note:
-        heading: Modifiche publiche
-      contributor terms:
-        heading: Tiermins par contribuî
-        agreed: Tu âs acetât i gnûfs tiermins di contribuzion.
-        not yet agreed: No tu âs ancjemò acetât i gnûfs tiermins di contribuzion.
-        review link text: Frache par plasê su chest leam par viodi e acetâ i gnûf
-          tiermins par contribuî.
-        agreed_with_pd: Tu âs ancje declarât di considerâ i tiei cambiaments intal
-          Public Domini.
-        link text: ce isal chest?
-      save changes button: Salve cambiaments
-      make edits public button: Rint publics ducj i miei cambiaments
-      flash update success confirm needed: Informazions dal utent inzornadis cun sucès.
-        Controle la tô pueste par confermâ la tô gnove direzion di pueste eletroniche.
-      flash update success: Informazions dal utent inzornadis cun sucès.
-    set_home:
-      flash success: Lûc iniziâl salvât cun sucès
     go_public:
       flash success: Ducj i tiei cambiaments a son cumò publics e tu puedis za scomençâ
         a lavorâ.
     index:
       title: Utents
       heading: Utents
-      showing:
-        one: Pagjine %{page} (%{first_item} su %{items})
-        other: Pagjine %{page} (%{first_item}-%{last_item} su %{items})
       summary_html: '%{name} creât di %{ip_address} ai %{date}'
       summary_no_ip_html: '%{name} creât ai %{date}'
       confirm: Conferme i utents selezionâts
       hide: Plate i utents selezionâts
+    suspended:
+      support: assistence
+    auth_failure:
+      unknown_error: Autenticazion falide
   user_role:
     grant:
       confirm: Conferme
@@ -1445,14 +1636,14 @@ fur:
       heading: Liste dai blocs dal utent
       empty: No son stâts metûts blocs fin cumò.
     revoke:
-      time_future: Chest bloc al finìs ca di %{time}.
+      time_future_html: Chest bloc al finìs ca di %{time}.
       revoke: Revoche!
     helper:
       time_future_html: Finìs ca di %{time}.
       time_past_html: Finît %{time} indaûr.
       block_duration:
         hours:
-          one: 1 ore
+          one: '%{count} ore'
           other: '%{count} oris'
     blocks_on:
       title: Blocs su %{name}
@@ -1465,13 +1656,14 @@ fur:
     show:
       title: '%{block_on} blocât di %{block_by}'
       heading_html: '%{block_on} blocât di %{block_by}'
+      created: 'Creât:'
+      duration: 'Durade:'
       status: 'Stât:'
       show: Mostre
       edit: Cambie
       revoke: Revoche!
       confirm: Sêstu sigûr?
       reason: 'Reson dal bloc:'
-      back: Cjale ducj i blocs
       revoker: 'Chel che al à revocât:'
     block:
       not_revoked: (no revocât)
@@ -1484,20 +1676,58 @@ fur:
       reason: Reson dal bloc
       status: Stât
       revoker_name: Revocât di
-      showing_page: Pagjine %{page}
-      next: Sucessîf »
-      previous: « Precedent
+  user_mutes:
+    index:
+      table:
+        thead:
+          actions: Azions
+        tbody:
+          send_message: Mande messaç
   notes:
     index:
       title: Note inseride o comentade di %{user}
       heading: Lis notis di %{user}
-      subheading_html: Lis notis inseridis o comentadis di %{user}
+      subheading_html: Lis notis %{submitted} o %{commented} di %{user}
+      subheading_submitted: inseridis
+      subheading_commented: comentadis
       no_notes: Nissune note
       id: Identificatîf
       creator: Creadôr
       description: Descrizion
       created_at: Creade ai
       last_changed: Ultin cambiament
+    show:
+      title: 'Note: %{id}'
+      description: Descrizion
+      open_title: 'Note no risolte #%{note_name}'
+      closed_title: 'Note risolte #%{note_name}'
+      hidden_title: 'Note platade #%{note_name}'
+      event_opened_by_html: Creât di %{user} %{time_ago}
+      event_opened_by_anonymous_html: Creât di un anonim %{time_ago}
+      event_commented_by_html: Comentât di %{user} %{time_ago}
+      event_commented_by_anonymous_html: Comentât di un anonim %{time_ago}
+      event_closed_by_html: Risolt di %{user} %{time_ago}
+      event_closed_by_anonymous_html: Risolt di un anonim %{time_ago}
+      event_reopened_by_html: Tornât a ativâ di %{user}%{time_ago}
+      event_reopened_by_anonymous_html: Tornât a ativâ di un anonim %{time_ago}
+      event_hidden_by_html: Platât di %{user} %{time_ago}
+      report: segnale cheste note
+      anonymous_warning: Cheste note e inclût coments di utents anonims che a varessin
+        di jessi verificâts in mût indipendent.
+      hide: Plate
+      resolve: Risolf
+      reactivate: Torne a ativâ
+      comment_and_resolve: Comente e risolf
+      comment: Coment
+    new:
+      title: Gnove note
+      intro: Âstu cjatât un erôr o alc ch'al mancje? Informe i altris mapadôrs cussì
+        che al podedi jessi corezût. Sposte il segnalut te posizion juste e inserìs
+        une note par spiegâ il probleme.
+      advice: La tô note e je publiche e e pues jessi doprade par inzornâ la mape,
+        par cui no sta zontâ informazions personâls o di mapis cuviertis dal copyright
+        o listis.
+      add: Zonte une note
   javascripts:
     close: Siere
     share:
@@ -1517,6 +1747,8 @@ fur:
       center_marker: Centre la mape sul marcadôr
       paste_html: Tache l'HTML par inserîlu tal to sît web
       view_larger_map: Viôt une mape plui grande
+    embed:
+      report_problem: Segnale un probleme
     key:
       title: Leiende
       tooltip: Leiende
@@ -1527,6 +1759,12 @@ fur:
         out: Diminuìs zoom
       locate:
         title: Mostre la mê posizion
+        metersPopup:
+          one: Tu sês a mancul di %{count} metri di chest pont
+          other: Tu sês a mancul di %{count} metris di chest pont
+        feetPopup:
+          one: Tu sês a mancul di %{count} pît di chest pont
+          other: Tu sês a mancul di %{count} pîts di chest pont
       base:
         standard: Standard
         cycle_map: Cycle Map
@@ -1539,8 +1777,15 @@ fur:
         gps: Percors GPS publics
         overlays: Ative i nivei utii par risolvi i problemis de mape
         title: Nivei
-      copyright: © <a href='%{copyright_url}'>Colaboradôrs di OpenStreetMap</a>
-      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Fâs une donazion</a>
+      make_a_donation: Done alc
+      website_and_api_terms: Tiermins di ûs dal sît e des APIs
+      cyclosm_credit: Stîl dai tassei di %{cyclosm_link} ospitât di %{osm_france_link}
+      osm_france: OpenStreetMap France
+      thunderforest_credit: Tassei par gentîl concession di %{thunderforest_link}
+      andy_allan: Andy Allan
+      tracestrack_credit: Tassei par gentîl concession di %{tracestrack_link}
+      hotosm_credit: Stîl dai tassei di %{hotosm_link} ospitât di %{osm_france_link}
+      hotosm_name: La clape umanitare di OpenStreetMap
     site:
       edit_tooltip: Cambie la mape
       edit_disabled_tooltip: Cres il zoom par cambiâ la mape
@@ -1550,27 +1795,6 @@ fur:
       map_data_zoom_in_tooltip: Aumente il zoom par viodi i dâts de mape
       queryfeature_tooltip: Domande ce ch'al è intun lûc
       queryfeature_disabled_tooltip: Aumente il zoom par domandâ ce ch'al è
-    changesets:
-      show:
-        comment: Coment
-        subscribe: Notiti
-        unsubscribe: Disnotiti
-        hide_comment: plate
-        unhide_comment: mostre
-    notes:
-      new:
-        intro: Âstu cjatât un erôr o alc ch'al mancje? Informe i altris mapadôrs cussì
-          che al podedi jessi corezût. Sposte il segnalut te posizion juste e inserìs
-          une note par spiegâ il probleme.
-        add: Zonte une note
-      show:
-        anonymous_warning: Cheste note e inclût coments di utents anonims che a varessin
-          di jessi verificâts in mût indipendent.
-        hide: Plate
-        resolve: Risolf
-        reactivate: Torne a ativâ
-        comment_and_resolve: Comente e risolf
-        comment: Coment
     edit_help: Môf la mape e aumente il zoom tal lûc che tu vuelis cambiâ, po frache
       culì
     directions:
@@ -1578,22 +1802,95 @@ fur:
       engines:
         fossgis_osrm_bike: Biciclete (OSRM)
         fossgis_osrm_car: Machine (OSRM)
-        fossgis_osrm_foot: A pit (OSRM)
+        fossgis_osrm_foot: A pît (OSRM)
         graphhopper_bicycle: Biciclete (OSRM)
         graphhopper_car: Machine (GraphHopper)
-        graphhopper_foot: A pit (GraphHopper)
+        graphhopper_foot: A pît (GraphHopper)
+        fossgis_valhalla_bicycle: Biciclete (Valhalla)
+        fossgis_valhalla_car: Machine (Valhalla)
+        fossgis_valhalla_foot: A pît (Valhalla)
       descend: Disnivel negatîf
       directions: Indicazions
       distance: Distance
+      distance_m: '%{distance}m'
+      distance_km: '%{distance}km'
       errors:
         no_route: No si à rivât a cjatâ une strade tra chescj doi puescj.
         no_place: No si à rivât a cjatâ "%{place}".
       instructions:
         continue_without_exit: Continue su %{name}
+        slight_right_without_exit: Volte un ninin a diestre su %{name}
+        offramp_right: Cjape la rampe a diestre
+        offramp_right_with_exit: Cjape la jessude %{exit} a diestre
+        offramp_right_with_exit_name: Cjape la jessude %{exit} a diestre su %{name}
+        offramp_right_with_exit_directions: Cjape la jessude %{exit} a diestre bande
+          %{directions}
+        offramp_right_with_exit_name_directions: Cjape la jessude %{exit} a diestre
+          su %{name}, bande %{directions}
+        offramp_right_with_name: Cjape la rampe a diestre su %{name}
+        offramp_right_with_directions: Cjape la rampe a diestre bande %{directions}
+        offramp_right_with_name_directions: Cjape la rampe a diestre su %{name}, bande
+          %{directions}
+        onramp_right_without_exit: Volte a diestre su la rampe su %{name}
+        onramp_right_with_directions: Volte a diestre su la rampe bande %{directions}
+        onramp_right_with_name_directions: Volte a diestre su la rampe su %{name},
+          bande %{directions}
+        onramp_right_without_directions: Volte a diestre su la rampe
+        onramp_right: Volte a diestre su la rampe
+        endofroad_right_without_exit: Ae fin de strade volte a diestre su %{name}
+        merge_right_without_exit: Jentre a diestre su %{name}
+        fork_right_without_exit: Ae crosade volte a diestre su %{name}
+        turn_right_without_exit: Volte a diestre su %{name}
+        sharp_right_without_exit: Volte dut a diestre su %{name}
+        uturn_without_exit: Inversion a U dilunc %{name}
+        sharp_left_without_exit: Volte dut a çampe su %{name}
+        turn_left_without_exit: Volte a çampe su %{name}
+        offramp_left: Cjape la rampe a çampe
+        offramp_left_with_exit: Cjape la jessude %{exit} a çampe
+        offramp_left_with_exit_name: Cjape la jessude %{exit} a çampe su %{name}
+        offramp_left_with_exit_directions: Cjape la jessude %{exit} a çampe bande
+          %{directions}
+        offramp_left_with_exit_name_directions: Cjape la jessude %{exit} a çampe su
+          %{name}, bande %{directions}
+        offramp_left_with_name: Cjape la rampe a çampe su %{name}
+        offramp_left_with_directions: Cjape la rampe a çampe bande %{directions}
+        offramp_left_with_name_directions: Cjape la rampe a çampe su %{name}, bande
+          %{directions}
+        onramp_left_without_exit: Volte a çampe su la rampe su %{name}
+        onramp_left_with_directions: Volte a çampe su la rampe bande %{directions}
+        onramp_left_with_name_directions: Volte a çampe su la rampe su %{name}, bande
+          %{directions}
+        onramp_left_without_directions: Volte a çampe su la rampe
+        onramp_left: Volte a çampe su la rampe
+        endofroad_left_without_exit: Ae fin de strade volte a çampe su %{name}
+        merge_left_without_exit: Jentre a çampe su %{name}
+        fork_left_without_exit: Ae crosade volte a çampe su %{name}
+        slight_left_without_exit: Volte un ninin a çampe su %{name}
+        via_point_without_exit: (pal pont)
         follow_without_exit: Seguìs %{name}
+        roundabout_without_exit: Ae taronde cjape la jessude su %{name}
+        leave_roundabout_without_exit: Lasse la taronde - %{name}
+        stay_roundabout_without_exit: Sta te taronde - %{name}
+        start_without_exit: Scomence su %{name}
         destination_without_exit: Rive ae destinazion
+        against_oneway_without_exit: Va cuintri sens su %{name}
+        end_oneway_without_exit: Fin dal sens unic su %{name}
+        roundabout_with_exit: Ae taronde cjape la jessude %{exit} su %{name}
+        roundabout_with_exit_ordinal: Ae taronde cjape la %{exit} jessude su %{name}
+        exit_roundabout: Jes de taronde su %{name}
         unnamed: cence non
         courtesy: Indicazions furnidis di %{link}
+        exit_counts:
+          first: 1e
+          second: 2e
+          third: 3e
+          fourth: 4e
+          fifth: 5e
+          sixth: 6e
+          seventh: 7e
+          eighth: 8e
+          ninth: 9e
+          tenth: 10e
       time: Timp
     query:
       node: Grop