about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorOlivier Humbert <trebmuh@users.noreply.github.com>2017-04-09 14:55:58 +0200
committerEugen <eugen@zeonfederated.com>2017-04-09 14:55:58 +0200
commit082bef30277308a214c93c54120064066ec00e2e (patch)
treeeb617baefd8838d74744a807c8490293446bac3e /app
parente6b48a704885f6afe2d5cce4b46a31f91231ba5e (diff)
French translation update (#1271)
* Update confirmation_instructions.fr.html.erb

consistency across the French translation

* Update 

consistency across the French translation

* Update fr.yml

a bunch of consistency across the French translation + a few typos

* Update doorkeeper.fr.yml

consistency across the French translation (punctuation)
Diffstat (limited to 'app')
-rw-r--r--app/views/user_mailer/confirmation_instructions.fr.html.erb2
-rw-r--r--app/views/user_mailer/confirmation_instructions.fr.text.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/user_mailer/confirmation_instructions.fr.html.erb b/app/views/user_mailer/confirmation_instructions.fr.html.erb
index 2665f1a20..6c45f1a21 100644
--- a/app/views/user_mailer/confirmation_instructions.fr.html.erb
+++ b/app/views/user_mailer/confirmation_instructions.fr.html.erb
@@ -1,5 +1,5 @@
 <p>Bienvenue <%= @resource.email %>&nbsp;!</p>
 
-<p>Vous pouvez confirmer l'email de votre compte Mastodon en cliquant sur le lien ci-dessous&nbsp;:</p>
+<p>Vous pouvez confirmer le courriel de votre compte Mastodon en cliquant sur le lien ci-dessous&nbsp;:</p>
 
 <p><%= link_to 'Confirmer mon compte', confirmation_url(@resource, confirmation_token: @token) %></p>
diff --git a/app/views/user_mailer/confirmation_instructions.fr.text.erb b/app/views/user_mailer/confirmation_instructions.fr.text.erb
index 9d33450f8..dfa3f9f7c 100644
--- a/app/views/user_mailer/confirmation_instructions.fr.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.fr.text.erb
@@ -1,5 +1,5 @@
 Bienvenue <%= @resource.email %> !
 
-Vous pouvez confirmer l'email de votre compte Mastodon en cliquant sur le lien ci-dessous :
+Vous pouvez confirmer le courriel de votre compte Mastodon en cliquant sur le lien ci-dessous :
 
 <%= confirmation_url(@resource, confirmation_token: @token) %>