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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index a1dc1c8582525ef1d1e011bc54db9208b2deeff3..81f5920ff03798254e10a37d3a11f542f63a9ede 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -41,11 +41,6 @@ fur:
       messages:
         invalid_email_address: nol samee jessi une direzion di pueste eletroniche
           valide
-      models:
-        user_mute:
-          attributes:
-            subject:
-              format: '%{message}'
     models:
       acl: Liste di control des jentradis
       changeset: Grup di cambiaments
@@ -198,7 +193,6 @@ fur:
   auth:
     providers:
       none: Nissune
-      openid: OpenID
       google: Google
       facebook: Facebook
       microsoft: Microsoft
@@ -302,7 +296,6 @@ fur:
       way_paginated: Viis (%{x}-%{y} su %{count})
       relation: Relazions (%{count})
       relation_paginated: Relazions (%{x}-%{y} su %{count})
-      comment: Coments (%{count})
       hidden_comment_by_html: Coment platât di %{user} %{time_ago}
       comment_by_html: Comentât di %{user} %{time_ago}
       changesetxml: Grup di cambiaments XML
@@ -881,6 +874,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
@@ -1158,7 +1152,6 @@ 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
@@ -1211,7 +1204,9 @@ fur:
     about:
       next: Prossim
       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
@@ -1260,10 +1255,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.
@@ -1274,17 +1266,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
@@ -1301,14 +1282,14 @@ fur:
         title: Benvignûts in OpenStreetMap
       beginners_guide:
         title: Guide pai principiants
-      help:
-        title: Forum di jutori
       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:
@@ -1338,32 +1319,37 @@ fur:
           rail: Ferade
           subway: Metropolitane
           ferry: Traghet
-          tram_only: Tram
-          runway_only: Piste dal aeropuart
+          tram: Tram
+          runway: Piste dal aeropuart
           admin: Confin aministratîf
-          forest_only: Bosc
+          forest: Bosc
+          grass: Prât
+          meadow: Prâts
           sand: Savalon
           golf: Troi di golf
           park: Parc
-          common_only: Comugnâi
+          common: Comugnâi
           resident: Zone residenziâl
           retail: Zone di buteghis
           industrial: Zone industriâl
           commercial: Aree comerciâl
-          lake_only: Lâc
+          lake: Lâc
           cemetery: Simiteri
           pitch: Cjamp sportîf
           centre: Centri sportîf
           reserve: Riserve naturâl
           military: Zone militâr
-          school_only: Scuele
-          university: universitât
-          hospital: ospedâl
+          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:
@@ -1531,6 +1517,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:
@@ -1712,6 +1701,8 @@ fur:
   user_mutes:
     index:
       table:
+        thead:
+          actions: Azions
         tbody:
           send_message: Mande messaç
   notes:
@@ -1814,8 +1805,6 @@ fur:
       osm_france: OpenStreetMap France
       thunderforest_credit: Tassei par gentîl concession di %{thunderforest_link}
       andy_allan: Andy Allan
-      opnvkarte_credit: Tassei par gentîl concession di %{memomaps_link}
-      memomaps: MeMoMaps
       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