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

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

diff --git a/config/locales/fur.yml b/config/locales/fur.yml
index f6b6ae6a0a884c1b8cbc6ddab30dd8c47de5c60b..1023859407419871d31727fdf26c3b7c560c966b 100644 (file)
--- a/config/locales/fur.yml
+++ b/config/locales/fur.yml
@@ -27,7 +27,7 @@ fur:
       client_application:
         create: Regjistre
         update: Inzorne
-      doorkeeper_application:
+      oauth2_application:
         create: Regjistre
         update: Inzorne
       trace:
@@ -96,6 +96,7 @@ fur:
         language: Lenghe
       doorkeeper/application:
         name: Non
+        confidential: Aplicazion confidenziâl?
         scopes: Permès
       friend:
         user: Utent
@@ -228,12 +229,10 @@ fur:
       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: Modifiche publiche
         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.
@@ -483,6 +482,7 @@ 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:
@@ -521,6 +521,11 @@ fur:
       comment: Coment
       newer_comments: Coments plui gnûfs
       older_comments: Coments plui vieris
+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Aplicazion regjistrade.
   friendships:
     make_friend:
       heading: Zontâ %{user} ai amîs?
@@ -586,6 +591,9 @@ fur:
           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
@@ -620,6 +628,8 @@ fur:
           church: Edifici de glesie
           civic: Centri civic
           commercial: Edifici comerciâl
+          construction: Edifici in costruzion
+          detached: Cjase unifamiliâr
           dormitory: Dormitori
           garage: Garage
           hospital: Edifici dal ospedâl
@@ -695,6 +705,7 @@ fur:
           cemetery: Simiteri
           commercial: Zone comerciâl
           construction: In costruzion
+          farmland: Cjamps
           forest: Bosc
           grass: Prât
           industrial: Zone industriâl
@@ -748,11 +759,13 @@ fur:
           island: Isule
           land: Tiere
           peak: Pic
+          peninsula: Penisule
           point: Pont
           tree: Arbul
           valley: Val
           volcano: Vulcan
           water: Aghe
+          "yes": Element naturâl
         office:
           architect: Architet
           employment_agency: Agjenzie di ocupazion
@@ -1254,10 +1267,8 @@ fur:
       irc:
         title: IRC
       welcomemat:
-        url: https://welcome.openstreetmap.org/
         title: Pe organizazions
       wiki:
-        url: http://wiki.openstreetmap.org/
         title: OpenStreetMap Wiki
     sidebar:
       search_results: Risultâts de ricercje
@@ -1383,12 +1394,12 @@ fur:
       in: in
     index:
       public_traces: Percors GPS publics
-      my_traces: I miei percors
       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}'
       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
@@ -1398,6 +1409,7 @@ fur:
     settings_menu:
       account_settings: Impostazions dal profîl
       oauth1_settings: Impostazions OAuth1
+      oauth2_applications: Aplicazions OAuth 2
       oauth2_authorizations: Autorizazions OAuth 2
   oauth:
     authorize: