From 29609fbb6a2bdfb8937077fac9f1aa280f730633 Mon Sep 17 00:00:00 2001
From: SerCom_KC <SerCom-KC@users.noreply.github.com>
Date: Mon, 30 Oct 2017 11:34:58 +0800
Subject: Updating Chinese (Simplified) translations (#5508)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* i18n: (zh-CN) fix punctuations and spaces
Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines

* i18n: (zh-CN) fix punctuation

* i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes
https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677

* i18n: (zh-CN) Update missing translations

* i18n: (zh-CN) Fixing errors

* i18n: (zh-CN) Fix indent error

* i18n: (zh-CN) Fix language tag

* i18n: (zh-CN) Remove quotes

* i18n: (zh-CN) Update translation (#5485)

* i18n: (zh-CN) Remove whitespaces, x -> ×

* i18n: (zh-CN) Rewording on time distance

* i18n: (zh-CN) Overall improvements

* i18n: (zh-CN) i18n-tasks normalization

* i18n: (zh-CN) Add missing translation
---
 .../user_mailer/confirmation_instructions.zh-cn.html.erb    | 13 ++++++++-----
 .../user_mailer/confirmation_instructions.zh-cn.text.erb    | 12 ++++++------
 app/views/user_mailer/password_change.zh-cn.html.erb        |  4 ++--
 app/views/user_mailer/password_change.zh-cn.text.erb        |  4 ++--
 .../user_mailer/reset_password_instructions.zh-cn.html.erb  |  9 +++++----
 .../user_mailer/reset_password_instructions.zh-cn.text.erb  |  9 +++++----
 6 files changed, 28 insertions(+), 23 deletions(-)

(limited to 'app/views/user_mailer')

diff --git a/app/views/user_mailer/confirmation_instructions.zh-cn.html.erb b/app/views/user_mailer/confirmation_instructions.zh-cn.html.erb
index de2f8b6e0..8a676498a 100644
--- a/app/views/user_mailer/confirmation_instructions.zh-cn.html.erb
+++ b/app/views/user_mailer/confirmation_instructions.zh-cn.html.erb
@@ -1,10 +1,13 @@
-<p><%= @resource.email %> ，嗨呀!</p>
+<p><%= @resource.email %>，你好呀！</p>
 
-<p>你刚刚在 <%= @instance %> 创建了帐号。</p>
+<p>你刚刚在 <%= @instance %> 创建了一个帐户呢。</p>
 
-<p>点击下面的链接来完成注册啦 : <br>
+<p>点击下面的链接来完成注册啦：<br>
 <%= link_to '确认帐户', confirmation_url(@resource, confirmation_token: @token) %>
 
-<p>别忘了看看 <%= link_to '使用条款', terms_url %>。</p>
+<p>上面的链接按不动？把下面的链接复制到地址栏再试试：<br>
+<span><%= confirmation_url(@resource, confirmation_token: @token) %></span>
 
-<p> <%= @instance %> 敬上</p>
\ No newline at end of file
+<p>记得读一读我们的<%= link_to '使用条款', terms_url %>哦。</p>
+
+<p>来自 <%= @instance %> 管理团队</p>
diff --git a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb b/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
index d7d4b4b23..25d901f16 100644
--- a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
+++ b/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
@@ -1,10 +1,10 @@
-<%= @resource.email %> ，嗨呀!
+<%= @resource.email %>，你好呀！
 
-你刚刚在 <%= @instance %> 创建了帐号。
+你刚刚在 <%= @instance %> 创建了一个帐户呢。
 
-点击下面的链接来完成注册啦 : <br>
-<%= link_to '确认帐户', confirmation_url(@resource, confirmation_token: @token) %>
+点击下面的链接来完成注册啦：
+<%= confirmation_url(@resource, confirmation_token: @token) %>
 
-别忘了看看 <%= link_to 'terms and conditions', terms_url %>。
+记得读一读我们的使用条款哦：<%= terms_url %>
 
-<%= @instance %> 敬上
\ No newline at end of file
+来自 <%= @instance %> 管理团队
\ No newline at end of file
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 115030af4..64e8b6b2f 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><%= @resource.email %>，你好呀！</p>
 
-<p>这只是一封用来通知你的密码已经被修改的邮件。_(:3」∠)_</p>
+<p>提醒一下，你在 <%= @instance %> 上的密码被更改了哦。</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 5a989d324..dbc065173 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 %>，嗨呀!
+<%= @resource.email %>，你好呀！
 
-这只是一封用来通知你的密码已经被修改的邮件。_(:3」∠)_
+提醒一下，你在 <%= @instance %> 上的密码被更改了哦。
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 51e3073f1..124305675 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,8 @@
-<p><%= @resource.email %> ，嗨呀!!</p>
+<p><%= @resource.email %>，你好呀！</p>
 
-<p>有人（但愿是你）请求更改你Mastodon帐户的密码。如果是你的话，请点击下面的链接：</p>
+<p>有人想修改你在 <%= @instance %> 上的密码呢。如果你确实想修改密码的话，点击下面的链接吧：</p>
 
-<p><%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %></p>
+<p><%= link_to '修改密码', edit_password_url(@resource, reset_password_token: @token) %></p>
 
-<p>如果不是的话，忘了它吧。只有你本人通过上面的链接设置新的密码以后你的新密码才会生效。</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 7df590f78..f7cd88847 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,8 @@
-<%= @resource.email %> ，嗨呀!!
+<%= @resource.email %>，你好呀！
 
-有人（但愿是你）请求更改你Mastodon帐户的密码。如果是你的话，请点击下面的链接：
+有人想修改你在 <%= @instance %> 上的密码呢。如果你确实想修改密码的话，点击下面的链接吧：
 
-<%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %>
+<%= edit_password_url(@resource, reset_password_token: @token) %>
 
-如果不是的话，忘了它吧。只有你本人通过上面的链接设置新的密码以后你的新密码才会生效。
+如果你不想修改密码的话，还请忽略这封邮件哦。
+在你点击上面的链接并修改密码前，你的密码是不会改变的。
-- 
cgit