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

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

diff --git a/config/locales/scn.yml b/config/locales/scn.yml
index d8692ffa0f068ec6c33fb4ae9fb2cbc3f2e45d2b..28b1679980eb2e244cbc05ad6275df0500d815e0 100644 (file)
--- a/config/locales/scn.yml
+++ b/config/locales/scn.yml
@@ -243,8 +243,9 @@ scn:
       open_title: 'Nota nun arrisurvuta #%{note_name}'
       closed_title: 'Nota arrisurvuta #%{note_name}'
       hidden_title: 'Nota ammucciata #%{note_name}'
       open_title: 'Nota nun arrisurvuta #%{note_name}'
       closed_title: 'Nota arrisurvuta #%{note_name}'
       hidden_title: 'Nota ammucciata #%{note_name}'

-      open_by: Criata di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
-      open_by_anonymous: Criata di n'anònimu <abbr title='%{exact_time}'>%{when} fa</abbr>
+      opened_by: Criata di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
+      opened_by_anonymous: Criata di n'anònimu <abbr title='%{exact_time}'>%{when}
+        fa</abbr>

       commented_by: Cummentu di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
       commented_by_anonymous: Cummentu di n'anònimu <abbr title='%{exact_time}'>%{when}
         fa</abbr>
       commented_by: Cummentu di %{user} <abbr title='%{exact_time}'>%{when} fa</abbr>
       commented_by_anonymous: Cummentu di n'anònimu <abbr title='%{exact_time}'>%{when}
         fa</abbr>


@@ -1654,7 +1655,7 @@ scn:
         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
         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

-    delete:
+    destroy:

       scheduled_for_deletion: Tracciatu ntâ spittata dâ cancillazzioni
     make_public:
       made_public: Tracciatu fattu pùbblicu
       scheduled_for_deletion: Tracciatu ntâ spittata dâ cancillazzioni
     make_public:
       made_public: Tracciatu fattu pùbblicu