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 8ef2b8c4a34c7adbd535c9b11f0ee7b01a4f8a11..687bd1a82d4d6976bc1810d82d2699d74da6ff6c 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -283,7 +283,6 @@ sc:
           motorcycle_parking: Parchègiu pro Mototzicletas
           nightclub: Locale noturnu
           nursing_home: Domo de cura
-          office: Ufìtziu
           parking: Parchègiu
           parking_entrance: Intrada de su Parchègiu
           parking_space: Parchègiu
@@ -296,11 +295,8 @@ sc:
           public_building: Telèfonu Pùblicu
           recycling: Puntu de Retziclàgiu
           restaurant: Ristorante
-          retirement_home: Residèntzia Geriàtrica
-          sauna: Sàuna
           school: Iscola
           shelter: Imbaru
-          shop: Butega
           shower: Dòtzia
           social_centre: Tzentru Sotziale
           social_facility: Istrutura pro servìtzios sotziales
@@ -318,7 +314,6 @@ sc:
           waste_basket: Cuntenidore de Arga
           waste_disposal: Cuntenidore de Arga
           water_point: Puntu de abba
-          youth_centre: Tzentru Giovanile
         boundary:
           administrative: Lìmite Amministrativu
           national_park: Parcu Natzionale
@@ -397,7 +392,6 @@ sc:
           fort: Forte
           heritage: Patrimoniu de s'umanidade
           house: Domo
-          icon: Icona
           manor: Villa
           memorial: Memoriale
           monument: Monumentu
@@ -619,7 +613,6 @@ sc:
           food: Alimentares
           funeral_directors: Pompas fùnebres
           furniture: Mòbiles
-          gallery: Galleria
           general: Empòriu
           gift: Butega de donos
           hairdresser: Pilucheri
@@ -628,14 +621,12 @@ sc:
           laundry: Samunadòrgiu
           lottery: Loteria
           mall: Tzentru cummertziale
-          market: Mercadu
           massage: Messàgiu
           motorcycle: Butega de mototzicletas
           newsagent: Agentzia de imprenta
           optician: Òticu
           paint: Butega de Pinturas
           pawnbroker: Monte de piedade
-          pharmacy: Apotecaria
           photo: Fotògrafu
           second_hand: Ogetos de segunda manu
           supermarket: Supermercadu
@@ -675,7 +666,6 @@ sc:
           stream: Traghinu/Trainu
           waterfall: Istrampu
           weir: Nassàrgiu
-    description:
       types:
         cities: Tzitades
         towns: Tzitadinas
@@ -721,7 +711,7 @@ sc:
     foundation: Fundatzione
     learn_more: Leghe àteru
     more: Àteru
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: Salude %{to_user},
       header: '%{from_user} at cummentadu s''intrada cuotidiana de OpenStreetMap cun
@@ -740,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!
@@ -766,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,
@@ -937,9 +911,6 @@ sc:
       edit: modìfica
       by: De
       map: mapa
-  oauth_clients:
-    form:
-      name: Nùmene
   users:
     login:
       title: Intra