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 f58a7d866a2ac0d4f82f1102d565691629c1cfce..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:
@@ -229,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.
@@ -1269,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
@@ -1398,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