X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/904b88b1db9fe4470c73662683200bcb3e112427..212fe75b6fd26d01dfacf31650e7f71eb7f06a63:/config/locales/fur.yml

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index e823ba5d4..018f181cd 100644
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -54,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
@@ -147,41 +146,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})
@@ -194,10 +193,9 @@ fur:
   auth:
     providers:
       none: Nissune
-      openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
+      microsoft: Microsoft
       github: GitHub
       wikipedia: Vichipedie
   api:
@@ -266,49 +264,23 @@ fur:
     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}'
@@ -317,7 +289,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}
@@ -327,7 +299,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}'
@@ -405,6 +377,31 @@ 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
+      comment_by_html: Comentât di %{user} %{time_ago}
+      hidden_comment_by_html: Coment platât di %{user} %{time_ago}
+      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.
@@ -424,6 +421,7 @@ fur:
     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
@@ -481,8 +479,9 @@ fur:
       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
@@ -521,6 +520,11 @@ fur:
       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?
@@ -535,15 +539,12 @@ fur:
   geocoder:
     search:
       title:
-        latlon_html: Risultâts cjolts dal <a href="http://openstreetmap.org/">sît
-          interni</a>
-        osm_nominatim_html: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        osm_nominatim_reverse_html: Risultâts di <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
+        results_from_html: Risultâts di %{results_link}
+        latlon: Interni
     search_osm_nominatim:
       prefix:
         aerialway:
+          cable_car: Funivie
           pylon: Pilon
         aeroway:
           gate: Puarte di aeropuart
@@ -557,6 +558,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
@@ -585,6 +587,7 @@ fur:
           kindergarten: Scuelute
           language_school: Scuele di lenghis
           library: Biblioteche
+          monastery: Monastîr
           music_school: Scuele di musiche
           nightclub: Club noturni
           parking: Parcament
@@ -613,6 +616,7 @@ fur:
           veterinary: Veterinari
           village_hall: Centri civic
           waste_basket: Scovacere
+          weighbridge: Pese
         boundary:
           administrative: Confin aministratîf
           national_park: Parc nazionâl
@@ -662,6 +666,7 @@ fur:
           shoemaker: Cjaliâr
           tailor: Sartôr
         emergency:
+          fire_extinguisher: Estintôr
           phone: Telefon di emergjence
         highway:
           bus_stop: Fermade autobus
@@ -669,6 +674,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
@@ -701,6 +707,8 @@ fur:
           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
@@ -739,6 +747,7 @@ fur:
           vineyard: Vigne
         leisure:
           common: Comugnâi (UK)
+          dog_park: Parc pai cjans
           fishing: Riserve par pescjâ
           garden: Zardin
           golf_course: Troi di golf
@@ -746,6 +755,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
@@ -757,7 +767,9 @@ fur:
           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
@@ -781,18 +793,29 @@ fur:
           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:
@@ -844,6 +867,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
@@ -851,6 +875,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
@@ -892,21 +917,17 @@ fur:
       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'
       states:
         ignored: Ignorât
         open: Viert
         resolved: Risolt
-    update:
-      new_report: La tô segnalazion e je stade registrade corretamentri
     show:
       reports:
-        one: 1 segnalazion
+        one: '%{count} segnalazion'
         other: '%{count} segnalazions'
       resolve: Risolf
       ignore: Ignore
@@ -924,10 +945,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
@@ -943,11 +962,7 @@ 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}, %{fastly}, %{bytemark}
-      e altris %{partners}.
-    partners_ucl: UCL
     partners_fastly: Fastly
-    partners_bytemark: Bytemark Hosting
     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
@@ -958,11 +973,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
@@ -988,8 +1002,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'
@@ -1015,8 +1027,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:
@@ -1028,8 +1038,6 @@ fur:
   messages:
     inbox:
       title: In jentrade
-      my_inbox: I miei messaçs in jentrade
-      my_outbox: I miei messaçs in jessude
       messages: Tu âs %{new_messages} e %{old_messages}
       new_messages:
         one: '%{count} messaç gnûf'
@@ -1037,12 +1045,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
@@ -1051,8 +1062,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
@@ -1061,47 +1070,42 @@ fur:
       heading: Messaç no cjatât
     outbox:
       title: In jessude
-      my_inbox: I miei messaçs in jentrade
-      my_outbox: I miei messaçs 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:
@@ -1123,7 +1127,6 @@ fur:
       image: Figure
       gravatar:
         gravatar: Dopre Gravatar
-        link: https://wiki.openstreetmap.org/wiki/Gravatar
         what_is_gravatar: Ce isal Gravatar?
       new image: Zonte une figure
       keep image: Ten la figure di cumò
@@ -1134,6 +1137,8 @@ fur:
       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 de mape?
+      show: Mostre
+      delete: Elimine
     update:
       success: Profîl inzornât
   sessions:
@@ -1142,17 +1147,10 @@ fur:
       heading: 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
@@ -1166,9 +1164,9 @@ fur:
         facebook:
           title: Jentre cun Facebook
           alt: Jentre cuntun un cont Facebook
-        windowslive:
-          title: Jentre cun Windows Live
-          alt: Jentre cuntun cont di Windows Live
+        microsoft:
+          title: Jentre cun Microsoft
+          alt: Jentre cuntun cont di Microsoft
         github:
           title: Jentre cun GitHub
           alt: Jentre cuntun cont GitHub
@@ -1185,6 +1183,8 @@ fur:
       title: Jes
       heading: Va fûr di OpenStreetMap
       logout_button: Jes
+    suspended_flash:
+      support: assistence
   shared:
     markdown_help:
       link: Leam
@@ -1198,9 +1198,16 @@ fur:
   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:
       foreign:
@@ -1214,6 +1221,13 @@ fur:
           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.
@@ -1236,10 +1250,7 @@ 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
       too_large:
         body: Cheste aree e je masse grande par espuartâle come dâts XML di OpenStreetMap.
@@ -1250,17 +1261,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
@@ -1277,16 +1277,14 @@ fur:
         title: Benvignûts in OpenStreetMap
       beginners_guide:
         title: Guide pai principiants
-      help:
-        title: Forum di jutori
-      forums:
-        title: Forum (vecjo)
       irc:
         title: IRC
       welcomemat:
         title: Pe organizazions
       wiki:
         title: OpenStreetMap Wiki
+    potlatch:
+      change_preferences: Cambie lis tôs preferences culì
     any_questions:
       title: Domandis?
     sidebar:
@@ -1311,50 +1309,62 @@ fur:
           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
+          common: Comugnâi
           resident: Zone residenziâl
-          common:
-          - Comugnâi
-          - prâts
           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: Zone militâr
-          school:
-          - Scuele
-          - universitât
+          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
+      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:
@@ -1380,6 +1390,7 @@ fur:
       uploaded: 'Cjamât ai:'
       points: 'Ponts:'
       start_coordinates: 'Coordenadis iniziâls:'
+      coordinates_html: '%{latitude}; %{longitude}'
       map: mape
       edit: cambie
       owner: 'Paron:'
@@ -1392,13 +1403,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
@@ -1407,13 +1417,14 @@ fur:
       public: PUBLIC
       identifiable: IDENTIFICABIL
       private: PRIVÂT
-      by: di
-      in: in
     index:
       public_traces: Percors GPS publics
+      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
@@ -1499,6 +1510,9 @@ fur:
     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:
@@ -1520,9 +1534,6 @@ fur:
       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:'
@@ -1554,7 +1565,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
@@ -1578,13 +1588,10 @@ 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
@@ -1595,24 +1602,18 @@ fur:
       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
-    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
@@ -1643,14 +1644,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}
@@ -1671,7 +1672,6 @@ fur:
       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)
@@ -1684,14 +1684,20 @@ 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
@@ -1704,20 +1710,15 @@ fur:
       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>
+      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.
@@ -1766,6 +1767,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
@@ -1778,9 +1785,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>
-      terms: <a href='%{terms_url}' target='_blank'>Sît web e tiermins di ûs des APIs</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
@@ -1804,13 +1817,18 @@ 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}".