about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorQuent-in <pages_quentin@hotmail.com>2017-09-07 22:07:03 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-09-07 22:07:03 +0200
commitb00cc4b9bdf24fb13f9034d2ac96f8f8acec6a26 (patch)
treef0ef26af15142cd9ac563c88aee96e69e479cbea /app/views
parentdd6ede554fa0c0c6c7e6f3c74226a4ae64165999 (diff)
i10n OC / FR update Pinned toots (#4842)
* Added column.pins

New strings

* Added column.pins

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb

* Update password_change.oc.html.erb

* Update password_change.oc.text.erb

* Update reset_password_instructions.oc.html.erb

* Update reset_password_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb
Diffstat (limited to 'app/views')
-rw-r--r--app/views/user_mailer/confirmation_instructions.oc.html.erb4
-rw-r--r--app/views/user_mailer/confirmation_instructions.oc.text.erb4
-rw-r--r--app/views/user_mailer/password_change.oc.html.erb4
-rw-r--r--app/views/user_mailer/password_change.oc.text.erb4
-rw-r--r--app/views/user_mailer/reset_password_instructions.oc.html.erb2
-rw-r--r--app/views/user_mailer/reset_password_instructions.oc.text.erb2
6 files changed, 10 insertions, 10 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.oc.html.erb b/app/views/user_mailer/confirmation_instructions.oc.html.erb
index 9e9732bd8..ed1428a55 100644
--- a/app/views/user_mailer/confirmation_instructions.oc.html.erb
+++ b/app/views/user_mailer/confirmation_instructions.oc.html.erb
@@ -1,8 +1,8 @@
-<p>Bonjorn <%= @resource.email %>&nbsp;!<p>
+<p>Bonjorn <%= @resource.email %> ! <p>
 
 <p>Venètz de vos crear un compte sus <%= @instance %> e vos mercegem :)</p>
 
-<p>Per confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : <br>
+<p>Per confirmar vòstre inscripcion, mercés de clicar sul ligam seguent : <br>
 <%= link_to 'Confirmar mon compte', confirmation_url(@resource, confirmation_token: @token) %></p>
 
 <p>Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.</p>
diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb
index ff1abf62d..444d296ce 100644
--- a/app/views/user_mailer/confirmation_instructions.oc.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.oc.text.erb
@@ -1,8 +1,8 @@
-Bonjorn <%= @resource.email %>&nbsp;!
+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òstre 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.
diff --git a/app/views/user_mailer/password_change.oc.html.erb b/app/views/user_mailer/password_change.oc.html.erb
index a6b506f5e..476db9536 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 @@
-<p>Bonjorn <%= @resource.email %>&nbsp;!</p>
+<p>Bonjorn <%= @resource.email %> ! </p>
 
-<p>Vos contactem per vos avisar que vòstre senhal per Mastodon es ben estat cambiat.</p>
+<p>Vos contactem per vos avisar qu’avèm ben cambiat vòstre senhal Mastodon.</p>
diff --git a/app/views/user_mailer/password_change.oc.text.erb b/app/views/user_mailer/password_change.oc.text.erb
index 1caebde69..e6caa045c 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 %>&nbsp;!
+Bonjorn <%= @resource.email %> ! 
 
-Vos contactem per vos avisar que vòstre senhal per Mastodon es ben estat cambiat.
+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 acf2c0abd..7363ee4b6 100644
--- a/app/views/user_mailer/reset_password_instructions.oc.html.erb
+++ b/app/views/user_mailer/reset_password_instructions.oc.html.erb
@@ -1,4 +1,4 @@
-<p>Bonjorn <%= @resource.email %>&nbsp;!</p>
+<p>Bonjorn <%= @resource.email %> ! </p>
 
 <p>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.</p>
 
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 211974cc2..a95a1ae8c 100644
--- a/app/views/user_mailer/reset_password_instructions.oc.text.erb
+++ b/app/views/user_mailer/reset_password_instructions.oc.text.erb
@@ -1,4 +1,4 @@
-Bonjorn <%= @resource.email %>&nbsp;!
+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.</p>