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

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

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 93efac1fb9bf6090c95c47bb90a62b18439283bd..687bd1a82d4d6976bc1810d82d2699d74da6ff6c 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -666,7 +666,6 @@ sc:
           stream: Traghinu/Trainu
           waterfall: Istrampu
           weir: Nassàrgiu
-    description:
       types:
         cities: Tzitades
         towns: Tzitadinas
@@ -731,22 +730,13 @@ sc:
       had_added_you: '%{user} t''at annantu comente a amigu in OpenStreetMap.'
       see_their_profile: Podes bìdere su profilu suo in %{userurl}.
       befriend_them: Lu/a podes fintzas annànghere comente a amigu/a in %{befriendurl}.
-    gpx_notification:
-      greeting: Salude,
-      your_gpx_file: Paret chi fu GPX file tuo
-      with_description: cun sa descritzione
-      and_the_tags: 'e sas etichetas imbenientes:'
-      and_no_tags: e peruna eticheta.
-      failure:
-        subject: '[OpenStreetMap] Faddina de importatzione de GPX'
-        failed_to_import: 'non si podet importare. Sa faddina est istada:'
-        more_info_1: Prus informatzione in relatzione a errores de importatzione de
-          GPX e comente los evitare
-        more_info_2: 'los podes agatare a:'
-      success:
-        subject: '[OpenStreetMap] Importatzione de GPX curreta'
-        loaded_successfully: carrigadu in manera curreta cun %{trace_points} puntos
-          in unu totale de %{possible_points} puntos possìbiles.
+    gpx_failure:
+      failed_to_import: 'non si podet importare. Sa faddina est istada:'
+      subject: '[OpenStreetMap] Faddina de importatzione de GPX'
+    gpx_success:
+      loaded_successfully: carrigadu in manera curreta cun %{trace_points} puntos
+        in unu totale de %{possible_points} puntos possìbiles.
+      subject: '[OpenStreetMap] Importatzione de GPX curreta'
     signup_confirm:
       subject: '[OpenStreetMap] Bene bènnidos a OpenStreetMap'
       greeting: Salude!
@@ -757,17 +747,10 @@ sc:
         la cunfirmare:'
     email_confirm:
       subject: '[OpenStreetMap] Cunfirma s''indiritzu de posta'
-    email_confirm_plain:
       greeting: Salude,
       hopefully_you: Calicunu (isperamus tue matessi) cheret cambiare s'indiritzu
         eletrònicu tuo dae %{server_url} cun %{new_address}.
-    email_confirm_html:
-      greeting: Salude,
-      hopefully_you: Calicunu (isperamus tue matessi) cheret cambiare s'indiritzu
-        eletrònicu tuo dae %{server_url} cun %{new_address}.
-    lost_password_plain:
-      greeting: Salude,
-    lost_password_html:
+    lost_password:
       greeting: Salude,
     note_comment_notification:
       greeting: Salude,