diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-09-10 14:10:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-10 14:10:30 -0500 |
| commit | 7a9c7d4e0b694e716cb018e3057792b4d86026fa (patch) | |
| tree | 973b16e23a7cbeaf5a43550444e54aa1ace50a46 /app/views/user_mailer/reset_password_instructions.oc.html.erb | |
| parent | c9df53044a333276853f7dc7ef2aed6d48df087f (diff) | |
| parent | 932571fa22273e6ff5c229147668c426b4d65326 (diff) | |
Merge pull request #143 from yipdw/sync/upstream
Merge with upstream's 1.6.0
Diffstat (limited to 'app/views/user_mailer/reset_password_instructions.oc.html.erb')
| -rw-r--r-- | app/views/user_mailer/reset_password_instructions.oc.html.erb | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ -<p>Bonjorn <%= @resource.email %> ! </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> +<p>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.</p> <p><%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %></p> <p>S’avètz pas res demandat, fasquètz pas cas a aqueste corrièl.</p> -<p>Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un nòu.</p> +<p>Vòstre senhal cambiarà pas se clicatz pas sul ligam e que ne causissètz pas un novèl.</p> |