From 440441ccb3db6719e18fab4ed03213b45ceb2647 Mon Sep 17 00:00:00 2001
From: vidarlee <vidarlee@foxmail.com>
Date: Sun, 21 May 2017 18:23:59 +0900
Subject: Enhance for the Chinese translation (#3198)

* Enhance for the Chinese translation

* Add filtered_languages for Chinese Translation include CN/HK/TW for PR #3175
---
 app/views/user_mailer/password_change.zh-cn.html.erb             | 2 +-
 app/views/user_mailer/password_change.zh-cn.text.erb             | 2 +-
 app/views/user_mailer/reset_password_instructions.zh-cn.html.erb | 4 ++--
 app/views/user_mailer/reset_password_instructions.zh-cn.text.erb | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/views/user_mailer')

diff --git a/app/views/user_mailer/password_change.zh-cn.html.erb b/app/views/user_mailer/password_change.zh-cn.html.erb
index 5cbfd0398..115030af4 100644
--- a/app/views/user_mailer/password_change.zh-cn.html.erb
+++ b/app/views/user_mailer/password_change.zh-cn.html.erb
@@ -1,3 +1,3 @@
 <p><%= @resource.email %>，嗨呀!</p>
 
-<p>这只是一封用来通知你的密码已经改变的邮件。_(:3」∠)_</p>
+<p>这只是一封用来通知你的密码已经被修改的邮件。_(:3」∠)_</p>
diff --git a/app/views/user_mailer/password_change.zh-cn.text.erb b/app/views/user_mailer/password_change.zh-cn.text.erb
index e6663f41e..5a989d324 100644
--- a/app/views/user_mailer/password_change.zh-cn.text.erb
+++ b/app/views/user_mailer/password_change.zh-cn.text.erb
@@ -1,3 +1,3 @@
 <%= @resource.email %>，嗨呀!
 
-这只是一封用来通知你的密码已经改变的邮件。_(:3」∠)_
+这只是一封用来通知你的密码已经被修改的邮件。_(:3」∠)_
diff --git a/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb b/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb
index 9b8973259..245382b2c 100644
--- a/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb
+++ b/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb
@@ -1,7 +1,7 @@
 <p><%= @resource.email %> ，嗨呀!!</p>
 
-<p>有人（但愿是你）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：</p>
+<p>有人（但愿是你）请求更改你Mastodon账户的密码。如果是你的话，请点击下面的链接：</p>
 
 <p><%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %></p>
 
-<p>如果不是的话，忘了它吧。只有你通过上面的链接设置了新的以后你的密码才会改变。</p>
+<p>如果不是的话，忘了它吧。只有你本人通过上面的链接设置新的密码以后你的新密码才会生效。</p>
diff --git a/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb b/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
index b4799ecc6..574a0bb2e 100644
--- a/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
+++ b/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
@@ -1,7 +1,7 @@
 <%= @resource.email %> ，嗨呀!!
 
-有人（但愿是你）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：
+有人（但愿是你）请求更改你Mastodon账户的密码。如果是你的话，请点击下面的链接：
 
 <%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %>
 
-如果不是的话，忘了它吧。只有你通过上面的链接设置了新的以后你的密码才会改变。
+如果不是的话，忘了它吧。只有你本人通过上面的链接设置新的密码以后你的新密码才会生效。
-- 
cgit