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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index 900009e55650f2fc553ac086de2ac2e4d541f034..aee698bdb7c6664c3e1a693d1008d6d0c92fe795 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -881,6 +881,7 @@ fur:
           shoes: Buteghe di scarpis
           sports: Buteghe di articui sportîfs
           supermarket: Supermarcjât
           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
           toys: Negozi di zugatui
           travel_agency: Agjenzie di viaçs
           "yes": Buteghe


@@ -1211,7 +1212,9 @@ fur:
     about:
       next: Prossim
       local_knowledge_title: Cognossince locâl
     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_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
       community_driven_osm_foundation: Fondazion OSM
       open_data_title: Dâts vierts
       open_data_open_data: dâts vierts


@@ -1309,6 +1312,8 @@ fur:
         title: Pe organizazions
       wiki:
         title: OpenStreetMap Wiki
         title: Pe organizazions
       wiki:
         title: OpenStreetMap Wiki

+    potlatch:
+      change_preferences: Cambie lis tôs preferences culì

     any_questions:
       title: Domandis?
     sidebar:
     any_questions:
       title: Domandis?
     sidebar:


@@ -1338,39 +1343,37 @@ fur:
           rail: Ferade
           subway: Metropolitane
           ferry: Traghet
           rail: Ferade
           subway: Metropolitane
           ferry: Traghet

-          tram_only: Tram
-          runway:
-          - Piste dal aeropuart
+          tram: Tram
+          runway: Piste dal aeropuart

           admin: Confin aministratîf
           admin: Confin aministratîf

-          forest:
-          - Bosc
+          forest: Bosc
+          grass: Prât
+          meadow: Prâts

           sand: Savalon
           golf: Troi di golf
           park: Parc
           sand: Savalon
           golf: Troi di golf
           park: Parc

-          common:
-          - Comugnâi
-          - prâts
-          - zardin
+          common: Comugnâi

           resident: Zone residenziâl
           retail: Zone di buteghis
           industrial: Zone industriâl
           commercial: Aree comerciâl
           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: Zone militâr
           cemetery: Simiteri
           pitch: Cjamp sportîf
           centre: Centri sportîf
           reserve: Riserve naturâl
           military: Zone militâr

-          school:
-          - Scuele
-          - universitât
-          - 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
           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:
     welcome:
       title: Benvignût!
       whats_on_the_map:


@@ -1538,6 +1541,9 @@ fur:
     show:
       edit: Cambie
       delete: Elimine
     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:
       permissions: Permès
   oauth2_authorizations:
     new:


@@ -1719,6 +1725,8 @@ fur:
   user_mutes:
     index:
       table:
   user_mutes:
     index:
       table:

+        thead:
+          actions: Azions

         tbody:
           send_message: Mande messaç
   notes:
         tbody:
           send_message: Mande messaç
   notes: