Date: Sat, 9 Sep 2017 18:22:56 +0200
Subject: [PATCH 1/9] i10n minors changes for 1.6 (#4867)
* wrong preposition + typo
* wrong preposition + typo
* Typo
* Typo
* minor changes
* minor changes
---
app/views/user_mailer/confirmation_instructions.oc.html.erb | 6 +++---
app/views/user_mailer/confirmation_instructions.oc.text.erb | 6 +++---
app/views/user_mailer/password_change.oc.html.erb | 2 +-
app/views/user_mailer/password_change.oc.text.erb | 2 +-
.../user_mailer/reset_password_instructions.oc.html.erb | 6 +++---
.../user_mailer/reset_password_instructions.oc.text.erb | 6 +++---
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/app/views/user_mailer/confirmation_instructions.oc.html.erb b/app/views/user_mailer/confirmation_instructions.oc.html.erb
index ed1428a55..7a16db67a 100644
--- a/app/views/user_mailer/confirmation_instructions.oc.html.erb
+++ b/app/views/user_mailer/confirmation_instructions.oc.html.erb
@@ -1,13 +1,13 @@
-Bonjorn <%= @resource.email %> !
+
Bonjorn <%= @resource.email %> !
Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)
-Per confirmar vòstre inscripcion, mercés de clicar sul ligam seguent :
+
Per confirmar vòstra inscripcion, mercés de clicar sul ligam seguent :
<%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %>
Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.
-Pensatz tanben a gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.
+Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.
Amistosament,
diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb
index 444d296ce..bf2acfec1 100644
--- a/app/views/user_mailer/confirmation_instructions.oc.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.oc.text.erb
@@ -1,13 +1,13 @@
-Bonjorn <%= @resource.email %> !
+Bonjorn <%= @resource.email %> !
Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)
-er confirmar vòstre inscripcion, mercés de clicar sul ligam seguent :
+er confirmar vòstra inscripcion, mercés de clicar sul ligam seguent :
<%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %>
Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.
-Pensatz tanben a gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.
+Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.
Amistosament,
diff --git a/app/views/user_mailer/password_change.oc.html.erb b/app/views/user_mailer/password_change.oc.html.erb
index 476db9536..094c221a8 100644
--- a/app/views/user_mailer/password_change.oc.html.erb
+++ b/app/views/user_mailer/password_change.oc.html.erb
@@ -1,3 +1,3 @@
-Bonjorn <%= @resource.email %> !
+Bonjorn <%= @resource.email %> !
Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon.
diff --git a/app/views/user_mailer/password_change.oc.text.erb b/app/views/user_mailer/password_change.oc.text.erb
index e6caa045c..9fe9116d9 100644
--- a/app/views/user_mailer/password_change.oc.text.erb
+++ b/app/views/user_mailer/password_change.oc.text.erb
@@ -1,3 +1,3 @@
-Bonjorn <%= @resource.email %> !
+Bonjorn <%= @resource.email %> !
Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon.
diff --git a/app/views/user_mailer/reset_password_instructions.oc.html.erb b/app/views/user_mailer/reset_password_instructions.oc.html.erb
index 7363ee4b6..6c775b3a1 100644
--- a/app/views/user_mailer/reset_password_instructions.oc.html.erb
+++ b/app/views/user_mailer/reset_password_instructions.oc.html.erb
@@ -1,8 +1,8 @@
-Bonjorn <%= @resource.email %> !
+Bonjorn <%= @resource.email %> !
-Qualqu’un a demandat una reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.
+Qualqu’un a demandat la reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.
<%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %>
S’avètz pas res demandat, fasquètz pas cas a aqueste corrièl.
-Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un nòu.
+Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un novèl.
diff --git a/app/views/user_mailer/reset_password_instructions.oc.text.erb b/app/views/user_mailer/reset_password_instructions.oc.text.erb
index a95a1ae8c..26432d2df 100644
--- a/app/views/user_mailer/reset_password_instructions.oc.text.erb
+++ b/app/views/user_mailer/reset_password_instructions.oc.text.erb
@@ -1,8 +1,8 @@
-Bonjorn <%= @resource.email %> !
+Bonjorn <%= @resource.email %> !
-Qualqu’un a demandat una reĩnicializacion de vòstre senhal per Mastodon. Podètz realizar la reĩnicializacion en clicant sul ligam çai-jos.