From eb97bd8af6c9a06a52cc8b12d05ac9ea1aa5370a Mon Sep 17 00:00:00 2001
From: Quenty31 <33203663+Quenty31@users.noreply.github.com>
Date: Wed, 8 Nov 2017 15:19:49 +0100
Subject: i10n OC: Memorial (#5615) + #5467 (#5623)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Changed ĩ => ï

* Changed ĩ => ï

* Add ability to disable login and mark accounts as memorial (#5615)
---
 app/views/user_mailer/reset_password_instructions.oc.html.erb | 2 +-
 app/views/user_mailer/reset_password_instructions.oc.text.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/views/user_mailer')

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 6c775b3a1..92e4b8f8b 100644
--- a/app/views/user_mailer/reset_password_instructions.oc.html.erb
+++ b/app/views/user_mailer/reset_password_instructions.oc.html.erb
@@ -1,6 +1,6 @@
 <p>Bonjorn <%= @resource.email %> !</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>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>
 
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 26432d2df..5a5219589 100644
--- a/app/views/user_mailer/reset_password_instructions.oc.text.erb
+++ b/app/views/user_mailer/reset_password_instructions.oc.text.erb
@@ -1,6 +1,6 @@
 Bonjorn <%= @resource.email %> !
 
-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>
+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>
 
 <%= link_to 'Modificar mon senhal', edit_password_url(@resource, reset_password_token: @token) %>
 
-- 
cgit