From 2bd46f442dfdb7d1f2ddddaba56900807f7e7ce9 Mon Sep 17 00:00:00 2001 From: Giuseppe Pignataro Date: Mon, 1 May 2017 18:14:51 +0200 Subject: [PATCH] Italian translation (#2654) * Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb * Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml --- .../confirmation_instructions.it.html.erb | 12 ++++++++++++ .../confirmation_instructions.it.text.erb | 12 ++++++++++++ app/views/user_mailer/password_change.it.html.erb | 3 +++ app/views/user_mailer/password_change.it.text.erb | 3 +++ .../reset_password_instructions.it.html.erb | 8 ++++++++ .../reset_password_instructions.it.text.erb | 8 ++++++++ config/locales/activerecord.it.yml | 12 ++++++++++++ 7 files changed, 58 insertions(+) create mode 100644 app/views/user_mailer/confirmation_instructions.it.html.erb create mode 100644 app/views/user_mailer/confirmation_instructions.it.text.erb create mode 100644 app/views/user_mailer/password_change.it.html.erb create mode 100644 app/views/user_mailer/password_change.it.text.erb create mode 100644 app/views/user_mailer/reset_password_instructions.it.html.erb create mode 100644 app/views/user_mailer/reset_password_instructions.it.text.erb create mode 100644 config/locales/activerecord.it.yml diff --git a/app/views/user_mailer/confirmation_instructions.it.html.erb b/app/views/user_mailer/confirmation_instructions.it.html.erb new file mode 100644 index 000000000..2fa745476 --- /dev/null +++ b/app/views/user_mailer/confirmation_instructions.it.html.erb @@ -0,0 +1,12 @@ +

Benvenuto <%= @resource.email %> !

+ +

Hai appena creato un account su <%= @instance %>.

+ +

Per confermare la tua iscrizione, fai clic sul seguente link:
+<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %> + +

Per piacere leggi anche i nostri <%= link_to 'terms and conditions', terms_url %>.

+ +

Sinceramente,

+ +

The <%= @instance %> team

diff --git a/app/views/user_mailer/confirmation_instructions.it.text.erb b/app/views/user_mailer/confirmation_instructions.it.text.erb new file mode 100644 index 000000000..ce9411173 --- /dev/null +++ b/app/views/user_mailer/confirmation_instructions.it.text.erb @@ -0,0 +1,12 @@ +Benvenuto <%= @resource.email %> ! + +Hai appena creato un account su <%= @instance %>. + +er confermare la tua iscrizione, fai clic sul seguente link : +<%= confirmation_url(@resource, confirmation_token: @token) %> + +Per piacere leggi anche i nostri termini e condizioni <%= terms_url %> + +Sinceramente, + +Il team <%= @instance %> \ No newline at end of file diff --git a/app/views/user_mailer/password_change.it.html.erb b/app/views/user_mailer/password_change.it.html.erb new file mode 100644 index 000000000..b4ca99769 --- /dev/null +++ b/app/views/user_mailer/password_change.it.html.erb @@ -0,0 +1,3 @@ +

Ciao <%= @resource.email %>!

+ +

Ti stiamo contattando per avvisarti che la tua password su Mastodon è stata cambiata.

diff --git a/app/views/user_mailer/password_change.it.text.erb b/app/views/user_mailer/password_change.it.text.erb new file mode 100644 index 000000000..ea187670e --- /dev/null +++ b/app/views/user_mailer/password_change.it.text.erb @@ -0,0 +1,3 @@ +Ciao <%= @resource.email %>! + +Ti stiamo contattando per avvisarti che la tua password su Mastodon è stata cambiata. diff --git a/app/views/user_mailer/reset_password_instructions.it.html.erb b/app/views/user_mailer/reset_password_instructions.it.html.erb new file mode 100644 index 000000000..cc411dad3 --- /dev/null +++ b/app/views/user_mailer/reset_password_instructions.it.html.erb @@ -0,0 +1,8 @@ +

Ciao <%= @resource.email %>!

+ +

Qualcuno ha richiesto un link per cambiare la tua password su Mastodon. Lo puoi fare tramite il link qui sotto.

+ +

<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>

+ +

Se non l'hai richiesto tu, ignora questa email.

+

La tua password non verrà cambiata finché non accedi al link qui sopra e ne crei una nuova.

diff --git a/app/views/user_mailer/reset_password_instructions.it.text.erb b/app/views/user_mailer/reset_password_instructions.it.text.erb new file mode 100644 index 000000000..1de485c2e --- /dev/null +++ b/app/views/user_mailer/reset_password_instructions.it.text.erb @@ -0,0 +1,8 @@ +Ciao <%= @resource.email %>! + +Qualcuno ha richiesto un link per cambiare la tua password su Mastodon. Lo puoi fare tramite il link qui sotto. + +<%= edit_password_url(@resource, reset_password_token: @token) %> + +Se non l'hai richiesto tu, ignora questa email. +La tua password non verrà cambiata finché non accedi al link qui sopra e ne crei una nuova. diff --git a/config/locales/activerecord.it.yml b/config/locales/activerecord.it.yml new file mode 100644 index 000000000..be2f0b4c1 --- /dev/null +++ b/config/locales/activerecord.it.yml @@ -0,0 +1,12 @@ +it: + activerecord: + errors: + models: + account: + attributes: + username: + invalid: solo lettere, numeri e trattino basso + status: + attributes: + reblog: + taken: dello stato esiste già