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

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

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index 5160dbc3250bb74a0f14ab0f97ad2f18fea9abaa..4dfaac501c735ff1000e4445b1436bf0ff150892 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -22,7 +22,7 @@ scn:
         create: Manna
       client_application:
         create: Riggistra
         create: Manna
       client_application:
         create: Riggistra

-        update: Cancia
+        update: Agghiorna

       redaction:
         create: Crea l'occultamentu
         update: Sarva occultamentu
       redaction:
         create: Crea l'occultamentu
         update: Sarva occultamentu


@@ -93,22 +93,23 @@ scn:
         description: Discrizzioni
         gpx_file: 'Carricari lu file GPX:'
         visibility: 'Visibbilità:'
         description: Discrizzioni
         gpx_file: 'Carricari lu file GPX:'
         visibility: 'Visibbilità:'

-        tagstring: 'Etichetti:'
+        tagstring: Etichetti

       message:
         sender: Mittenti
         title: Oggettu
         body: Corpu
         recipient: Distinatariu
       redaction:
       message:
         sender: Mittenti
         title: Oggettu
         body: Corpu
         recipient: Distinatariu
       redaction:

+        title: Tìtulu

         description: Discrizzioni
       user:
         email: Posta elittrònica
         description: Discrizzioni
       user:
         email: Posta elittrònica

-        new_email: 'Nnirizzu di posta elittrònica novu:'
+        new_email: Nnirizzu di posta elittrònica novu

         active: Attivu
         display_name: Nomu ammustratu
         description: Discrizzioni
         active: Attivu
         display_name: Nomu ammustratu
         description: Discrizzioni

-        home_lat: 'Latitùdini:'
-        home_lon: 'Luncitùdini:'
+        home_lat: Latitùdini
+        home_lon: Luncitùdini

         languages: Lingui
         pass_crypt: Palora d'òrdini
     help:
         languages: Lingui
         pass_crypt: Palora d'òrdini
     help:


@@ -126,17 +127,25 @@ scn:
     remote:
       name: Telecumannu
       description: Telecumannu (JOSM o Merkaartor)
     remote:
       name: Telecumannu
       description: Telecumannu (JOSM o Merkaartor)

+  auth:
+    providers:
+      none: Nuddu
+      openid: OpenID
+      google: Google
+      facebook: Facebook
+      github: GitHub
+      wikipedia: Wikipedia

   api:
     notes:
       comment:
   api:
     notes:
       comment:

-        opened_at_html: Criatu %{when} fa
-        opened_at_by_html: Criatu %{when} fa di %{user}
-        commented_at_html: Aggiurnatu %{when} fa
-        commented_at_by_html: Aggiurnatu %{when} fa di %{user}
-        closed_at_html: Arrisurvuta %{when} fa
-        closed_at_by_html: Arrisurvuta %{when} fa di %{user}
-        reopened_at_html: Rigraputa %{when} fa
-        reopened_at_by_html: Rigraputa %{when} fa di %{user}
+        opened_at_html: Criatu %{when}
+        opened_at_by_html: Criatu %{when} di %{user}
+        commented_at_html: Aggiurnatu %{when}
+        commented_at_by_html: Aggiurnatu %{when} di %{user}
+        closed_at_html: Arrisurvuta %{when}
+        closed_at_by_html: Arrisurvuta %{when} di %{user}
+        reopened_at_html: Rigraputa %{when}
+        reopened_at_by_html: Rigraputa %{when} di %{user}

       rss:
         title: Noti d'OpenStreetMap
         description_area: N’elencu dî noti signalati, cummintati o arrisurvuti ntâ
       rss:
         title: Noti d'OpenStreetMap
         description_area: N’elencu dî noti signalati, cummintati o arrisurvuti ntâ


@@ -152,12 +161,12 @@ scn:
   browse:
     created: Criatu
     closed: Chiudutu
   browse:
     created: Criatu
     closed: Chiudutu

-    created_html: Criatu <abbr title='%{title}'>%{time} fa</abbr>
-    closed_html: Chiudutu <abbr title='%{title}'>%{time} fa</abbr>
-    created_by_html: Criatu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
-    deleted_by_html: Cancillatu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
-    edited_by_html: Canciatu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
-    closed_by_html: Chiudutu <abbr title='%{title}'>%{time} fa</abbr> di %{user}
+    created_html: Criatu <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Chiudutu <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: Criatu <abbr title='%{title}'>%{time}</abbr> di %{user}
+    deleted_by_html: Cancillatu <abbr title='%{title}'>%{time}</abbr> di %{user}
+    edited_by_html: Canciatu <abbr title='%{title}'>%{time}</abbr> di %{user}
+    closed_by_html: Chiudutu <abbr title='%{title}'>%{time}</abbr> di %{user}

     version: Virsioni
     in_changeset: Gruppu di canciamenti
     anonymous: anònimu
     version: Virsioni
     in_changeset: Gruppu di canciamenti
     anonymous: anònimu


@@ -514,6 +523,7 @@ scn:
           viaduct: Viaduttu
           "yes": Ponti
         building:
           viaduct: Viaduttu
           "yes": Ponti
         building:

+          house: Casa

           "yes": Edificiu
         craft:
           brewery: Birrificiu
           "yes": Edificiu
         craft:
           brewery: Birrificiu


@@ -660,6 +670,7 @@ scn:
           "yes": Ricrìu
         man_made:
           lighthouse: Faru
           "yes": Ricrìu
         man_made:
           lighthouse: Faru

+          pier: Molu

           pipeline: Cunnuttu
           tower: Turri
           works: Fàbbrica
           pipeline: Cunnuttu
           tower: Turri
           works: Fàbbrica


@@ -1191,9 +1202,6 @@ scn:
         windowslive:
           title: Trasi cu Windows Live
           alt: Trasi cûn cuntu di Windows Live
         windowslive:
           title: Trasi cu Windows Live
           alt: Trasi cûn cuntu di Windows Live

-        yahoo:
-          title: Trasi cu Yahoo
-          alt: Trasi cu n'OpenID di Yahoo

         wordpress:
           title: Trasi cu Wordpress
           alt: Trasi cu n'OpenID di Wordpress
         wordpress:
           title: Trasi cu Wordpress
           alt: Trasi cu n'OpenID di Wordpress


@@ -1680,7 +1688,6 @@ scn:
         novu</a>, o puru nfòrmati cchiossai a prupòsitu dî tracciati GPS nta sta <a
         href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pàggina dâ wiki</a>.
       upload_trace: Càrrica nu tracciatu
         novu</a>, o puru nfòrmati cchiossai a prupòsitu dî tracciati GPS nta sta <a
         href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pàggina dâ wiki</a>.
       upload_trace: Càrrica nu tracciatu

-      see_all_traces: Talìa tutti li tracciati

     destroy:
       scheduled_for_deletion: Tracciatu ntâ spittata dâ cancillazzioni
     make_public:
     destroy:
       scheduled_for_deletion: Tracciatu ntâ spittata dâ cancillazzioni
     make_public:


@@ -2154,7 +2161,7 @@ scn:
         comment: Cummenta
         subscribe: Abbònati
         unsubscribe: Annulla l’abbunamentu
         comment: Cummenta
         subscribe: Abbònati
         unsubscribe: Annulla l’abbunamentu

-        hide_comment: Ammuccia
+        hide_comment: ammuccia

         unhide_comment: Ammustra
     notes:
       new:
         unhide_comment: Ammustra
     notes:
       new: