From 1c469ca98b6f97ba4ae179c3bf442e670ce7cc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=A8=E3=82=A4=E3=83=84=E3=81=AE=E8=B3=A2=E7=8B=BC?=
 =?UTF-8?q?=E3=83=9B=E3=83=AD=20=7C=203rd=20style?= <horo@yoitsu.moe>
Date: Wed, 3 May 2017 20:03:16 +0800
Subject: [PATCH] i18n: Update zh-CN [ Chinese (China) ] translations. (#2699)

* Update zh-CN translations.

* Update doorkeeper.zh-CN.yml

* Follow @Artoria2e5 's change advices.

* forget mail for text format ......

* fix some changes

* mail's html version ......

* https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283

* a space.....

* delete some unused keys
---
 app/javascript/mastodon/locales/zh-CN.json    | 95 +++++++++----------
 .../confirmation_instructions.zh-cn.html.erb  | 10 ++
 .../confirmation_instructions.zh-cn.text.erb  | 10 ++
 .../password_change.zh-cn.html.erb            |  3 +
 .../password_change.zh-cn.text.erb            |  3 +
 ...reset_password_instructions.zh-cn.html.erb |  7 ++
 ...reset_password_instructions.zh-cn.text.erb |  7 ++
 config/locales/doorkeeper.zh-CN.yml           |  6 +-
 config/locales/simple_form.zh-CN.yml          |  4 +
 config/locales/zh-CN.yml                      | 41 +++++++-
 10 files changed, 134 insertions(+), 52 deletions(-)
 create mode 100644 app/views/user_mailer/confirmation_instructions.zh-cn.html.erb
 create mode 100644 app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
 create mode 100644 app/views/user_mailer/password_change.zh-cn.html.erb
 create mode 100644 app/views/user_mailer/password_change.zh-cn.text.erb
 create mode 100644 app/views/user_mailer/reset_password_instructions.zh-cn.html.erb
 create mode 100644 app/views/user_mailer/reset_password_instructions.zh-cn.text.erb

diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 1e0d1fa58..cf1e759c1 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -1,6 +1,6 @@
 {
   "account.block": "屏蔽 @{name}",
-  "account.disclaimer": "由于这个账户处于另一个服务站，实际数字会比这个更多。",
+  "account.disclaimer": "由于这个账户处于另一个服务站上，实际数字会比这个更多。",
   "account.edit_profile": "修改个人资料",
   "account.follow": "关注",
   "account.followers": "关注者",
@@ -20,37 +20,36 @@
   "column.favourites": "赞过的嘟文",
   "column.follow_requests": "关注请求",
   "column.home": "主页",
-  "column.mutes": "Muted users",
+  "column.mutes": "被静音的用户",
   "column.notifications": "通知",
   "column.public": "跨站公共时间轴",
-  "column_back_button.label": "返回",
-  "column_subheading.navigation": "Navigation",
-  "column_subheading.settings": "Settings",
-  "compose_form.lock_disclaimer": "Your account is not {locked}. Anyone can follow you to view your follower-only posts.",
-  "compose_form.lock_disclaimer.lock": "locked",
+  "column_subheading.navigation": "导航",
+  "column_subheading.settings": "设置",
+  "compose_form.lock_disclaimer": "你的账户没 {locked}. 任何人可以通过关注你来查看只有关注者可见的嘟文.",
+  "compose_form.lock_disclaimer.lock": "被保护",
   "compose_form.placeholder": "在想啥？",
   "compose_form.privacy_disclaimer": "你的私人嘟文，将被发送至你所提及的 {domains} 用户。你是否信任{domainsCount, plural, one {这个网站} other {这些网站}}？请留意，嘟文隐私设置只适用于各 Mastodon 服务站，如果 {domains} {domainsCount, plural, one {不是 Mastodon 服务站} other {之中有些不是 Mastodon 服务站}}，对方将无法收到这篇嘟文的隐私设置，然后可能被转嘟给不能预知的用户阅读。",
   "compose_form.publish": "嘟嘟",
   "compose_form.sensitive": "将媒体文件标示为“敏感内容”",
   "compose_form.spoiler": "将部分文本藏于警告消息之后",
   "compose_form.spoiler_placeholder": "敏感内容的警告消息",
-  "confirmation_modal.cancel": "Cancel",
-  "confirmations.block.confirm": "Block",
-  "confirmations.block.message": "Are you sure you want to block {name}?",
-  "confirmations.delete.confirm": "Delete",
-  "confirmations.delete.message": "Are you sure you want to delete this status?",
-  "confirmations.mute.confirm": "Mute",
-  "confirmations.mute.message": "Are you sure you want to mute {name}?",
-  "emoji_button.activity": "Activity",
-  "emoji_button.flags": "Flags",
-  "emoji_button.food": "Food & Drink",
   "emoji_button.label": "加入表情符号",
-  "emoji_button.nature": "Nature",
-  "emoji_button.objects": "Objects",
-  "emoji_button.people": "People",
-  "emoji_button.search": "Search...",
-  "emoji_button.symbols": "Symbols",
-  "emoji_button.travel": "Travel & Places",
+  "confirmation_modal.cancel": "取消",
+  "confirmations.block.confirm": "屏蔽",
+  "confirmations.block.message": "想好了，真的要屏蔽 {name}?",
+  "confirmations.delete.confirm": "删除",
+  "confirmations.delete.message": "想好了，真的要删除这条嘟文?",
+  "confirmations.mute.confirm": "静音",
+  "confirmations.mute.message": "想好了，真的要静音 {name}?",
+  "emoji_button.activity": "活动",
+  "emoji_button.flags": "旗帜",
+  "emoji_button.food": "食物和饮料",
+  "emoji_button.nature": "自然",
+  "emoji_button.objects": "物体",
+  "emoji_button.people": "人物",
+  "emoji_button.search": "搜索...",
+  "emoji_button.symbols": "符号",
+  "emoji_button.travel": "旅途和地点",
   "empty_column.community": "本站时间轴暂时未有内容，快贴文来抢头香啊！",
   "empty_column.hashtag": "这个标签暂时未有内容。",
   "empty_column.home": "你还没有关注任何用户。快看看{public}，向其他用户搭讪吧。",
@@ -77,9 +76,9 @@
   "navigation_bar.edit_profile": "修改个人资料",
   "navigation_bar.favourites": "赞的内容",
   "navigation_bar.follow_requests": "关注请求",
-  "navigation_bar.info": "关于本服务站",
+  "navigation_bar.info": "追加信息",
   "navigation_bar.logout": "注销",
-  "navigation_bar.mutes": "Muted users",
+  "navigation_bar.mutes": "被静音的用户",
   "navigation_bar.preferences": "首选项",
   "navigation_bar.public_timeline": "跨站公共时间轴",
   "notification.favourite": "{name} 赞你的嘟文",
@@ -95,26 +94,26 @@
   "notifications.column_settings.show": "在通知栏显示",
   "notifications.column_settings.sound": "播放音效",
   "notifications.settings": "字段设置",
-  "onboarding.done": "Done",
-  "onboarding.next": "Next",
-  "onboarding.page_five.public_timelines": "The local timeline shows public posts from everyone on {domain}. The federated timeline shows public posts from everyone who people on {domain} follow. These are the Public Timelines, a great way to discover new people.",
-  "onboarding.page_four.home": "The home timeline shows posts from people you follow.",
-  "onboarding.page_four.notifications": "The notifications column shows when someone interacts with you.",
-  "onboarding.page_one.federation": "Mastodon is a network of independent servers joining up to make one larger social network. We call these servers instances.",
-  "onboarding.page_one.handle": "You are on {domain}, so your full handle is {handle}",
-  "onboarding.page_one.welcome": "Welcome to Mastodon!",
-  "onboarding.page_six.admin": "Your instance's admin is {admin}.",
-  "onboarding.page_six.almost_done": "Almost done...",
-  "onboarding.page_six.appetoot": "Bon Appetoot!",
-  "onboarding.page_six.apps_available": "There are {apps} available for iOS, Android and other platforms.",
-  "onboarding.page_six.github": "Mastodon is free open-source software. You can report bugs, request features, or contribute to the code on {github}.",
-  "onboarding.page_six.guidelines": "community guidelines",
-  "onboarding.page_six.read_guidelines": "Please read {domain}'s {guidelines}!",
-  "onboarding.page_six.various_app": "mobile apps",
-  "onboarding.page_three.profile": "Edit your profile to change your avatar, bio, and display name. There, you will also find other preferences.",
-  "onboarding.page_three.search": "Use the search bar to find people and look at hashtags, such as {illustration} and {introductions}. To look for a person who is not on this instance, use their full handle.",
-  "onboarding.page_two.compose": "Write posts from the compose column. You can upload images, change privacy settings, and add content warnings with the icons below.",
-  "onboarding.skip": "Skip",
+  "onboarding.done": "出发！",
+  "onboarding.next": "下一步",
+  "onboarding.page_five.public_timelines": "本站时间轴显示来自 {domain} 的所有人的公共嘟文。 跨站公共时间轴显示来自 {domain} 上的各位关注的所有人的公共嘟文。这些就是寻人好去处的公共时间轴啦。",
+  "onboarding.page_four.home": "你的主时间轴上是你关注的用户的嘟文.",
+  "onboarding.page_four.notifications": "如果你和他人产生了互动，便会出现在通知列上啦~",
+  "onboarding.page_one.federation": "Mastodon 由一系列独立的服务器共同打造一个更大的网络，这就是我们的服务站啦。",
+  "onboarding.page_one.handle": "你在 {domain}, {handle} 就是你的完整账户名称。",
+  "onboarding.page_one.welcome": "欢迎来到 Mastodon!",
+  "onboarding.page_six.admin": "{admin} 是你所在服务站的管理员.",
+  "onboarding.page_six.almost_done": "快完成了...",
+  "onboarding.page_six.appetoot": "嗷呜~",
+  "onboarding.page_six.apps_available": "也有适用于 iOS, Android 和其它平台的 {apps} 咯~",
+  "onboarding.page_six.github": "Mastodon 是自由的开放源代码软件。欢迎来 {github} 报告问题，提交功能请求，或者贡献代码 :-)",
+  "onboarding.page_six.guidelines": "社区指南",
+  "onboarding.page_six.read_guidelines": "别忘了看看 {domain} 的 {guidelines}!",
+  "onboarding.page_six.various_app": "移动应用程序",
+  "onboarding.page_three.profile": "编辑你的用户资料，像是头像、简介、和昵称等等。在那还可以找到其它首选项。",
+  "onboarding.page_three.search": "用搜索来找人和标签吧，像是 {illustration} 或者 {introductions}。想找其它服务站上的人，用完整账户名称（用户名@域名）啦。",
+  "onboarding.page_two.compose": "在这一列开始嘟！上面的按钮提供了上传图片，修改隐私设置和提示敏感内容等多种功能。.",
+  "onboarding.skip": "好啦好啦我知道啦",
   "privacy.change": "调整隐私设置",
   "privacy.direct.long": "只有提及的用户能看到",
   "privacy.direct.short": "私人消息",
@@ -130,8 +129,8 @@
   "report.submit": "提交",
   "report.target": "Reporting",
   "search.placeholder": "搜索",
-  "search_results.total": "{count, number} 项结果",
-  "status.cannot_reblog": "This post cannot be boosted",
+  "status.cannot_reblog": "没法转嘟这条嘟文啦……",
+  "search.status_by": "按{name}搜索嘟文",
   "status.delete": "删除",
   "status.favourite": "赞",
   "status.load_more": "加载更多",
@@ -159,5 +158,5 @@
   "video_player.expand": "展开影片",
   "video_player.toggle_sound": "开关音效",
   "video_player.toggle_visible": "打开或关上",
-  "video_player.video_error": "Video could not be played"
+  "video_player.video_error": "视频无法播放啦……"
 }
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.zh-cn.html.erb b/app/views/user_mailer/confirmation_instructions.zh-cn.html.erb
new file mode 100644
index 000000000..575b2ff9e
--- /dev/null
+++ b/app/views/user_mailer/confirmation_instructions.zh-cn.html.erb
@@ -0,0 +1,10 @@
+<p><%= @resource.email %> ，嗨呀!</p>
+
+<p>你刚刚在 <%= @instance %> 创建了帐号。</p>
+
+<p>点击下面的链接来完成注册啦 : <br>
+<%= link_to '确认账户', confirmation_url(@resource, confirmation_token: @token) %>
+
+<p>别忘了看看 <%= link_to '使用条款', terms_url %>。</p>
+
+<p> <%= @instance %> 敬上</p>
\ No newline at end of file
diff --git a/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb b/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
new file mode 100644
index 000000000..ce237a32d
--- /dev/null
+++ b/app/views/user_mailer/confirmation_instructions.zh-cn.text.erb
@@ -0,0 +1,10 @@
+<%= @resource.email %> ，嗨呀!
+
+你刚刚在 <%= @instance %> 创建了帐号。
+
+点击下面的链接来完成注册啦 : <br>
+<%= link_to '确认账户', confirmation_url(@resource, confirmation_token: @token) %>
+
+别忘了看看 <%= link_to 'terms and conditions', terms_url %>。
+
+<%= @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
new file mode 100644
index 000000000..5cbfd0398
--- /dev/null
+++ b/app/views/user_mailer/password_change.zh-cn.html.erb
@@ -0,0 +1,3 @@
+<p><%= @resource.email %>，嗨呀!</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
new file mode 100644
index 000000000..e6663f41e
--- /dev/null
+++ b/app/views/user_mailer/password_change.zh-cn.text.erb
@@ -0,0 +1,3 @@
+<%= @resource.email %>，嗨呀!
+
+这只是一封用来通知你的密码已经改变的邮件。_(: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
new file mode 100644
index 000000000..9b8973259
--- /dev/null
+++ b/app/views/user_mailer/reset_password_instructions.zh-cn.html.erb
@@ -0,0 +1,7 @@
+<p><%= @resource.email %> ，嗨呀!!</p>
+
+<p>有人（但愿是你）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：</p>
+
+<p><%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %></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
new file mode 100644
index 000000000..b4799ecc6
--- /dev/null
+++ b/app/views/user_mailer/reset_password_instructions.zh-cn.text.erb
@@ -0,0 +1,7 @@
+<%= @resource.email %> ，嗨呀!!
+
+有人（但愿是你）请求更改你 Mastodon 账户的密码。如果是你的话，请点击下面的链接：
+
+<%= link_to '更改密码', edit_password_url(@resource, reset_password_token: @token) %>
+
+如果不是的话，忘了它吧。只有你通过上面的链接设置了新的以后你的密码才会改变。
diff --git a/config/locales/doorkeeper.zh-CN.yml b/config/locales/doorkeeper.zh-CN.yml
index 4ae85cc88..d0dfe8d5d 100644
--- a/config/locales/doorkeeper.zh-CN.yml
+++ b/config/locales/doorkeeper.zh-CN.yml
@@ -15,7 +15,6 @@ zh-CN:
               invalid_uri: '必须是有效的 URL 格式'
               relative_uri: '必须是绝对的 URL 地址'
               secured_uri: '必须是 HTTPS/SSL 的 URL 地址'
-
   doorkeeper:
     applications:
       confirmations:
@@ -124,4 +123,9 @@ zh-CN:
           home: '首页'
       application:
         title: 'OAuth 认证'
+    scopes:
+      follow: 关注（或取消关注），屏蔽（或取消屏蔽）用户
+      read: 读取你的账户数据
+      write: 为你发表嘟文
+
 
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 18e71e095..ed05eb38d 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -10,6 +10,10 @@ zh-CN:
         note: 最多 160 个字符
       imports:
         data: 自其他服务站导出的 CSV 文件
+      sessions:
+        otp: 输入你手机生成的两步验证码，或者恢复代码。
+      user:
+        allowed_languages: 允许下列语言的内容出现在你的公共时间线上。
     labels:
       defaults:
         avatar: 头像
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 9b3608f24..e3c4a41ca 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -5,6 +5,7 @@ zh-CN:
     about_this: 关于本实例
     apps: 应用程序
     business_email: 商业电邮︰
+    closed_registrations: 这个实例目前不开放注册 _(:3」∠)_
     contact: 联络
     description_headline: 关于 %{domain}
     domain_count_after: 个其它实例
@@ -28,6 +29,7 @@ zh-CN:
     terms: 条款
     user_count_after: 位用户
     user_count_before: 这里共注册有
+    version: 版本
   accounts:
     follow: 关注
     followers: 粉丝
@@ -38,9 +40,20 @@ zh-CN:
     posts: 嘟文
     remote_follow: 跨站关注
     unfollow: 取消关注
+  activitypub:
+    activity:
+      announce:
+        name: "%{account_name} 分享了一个活动。"
+      create:
+        name: "%{account_name} 创建了一个记事。"
+    outbox:
+      name: "%{account_name} 的集合"
+      summary: "%{account_name} 的活动集合"
   admin:
     accounts:
       are_you_sure: 你确定吗？
+      confirm: 确认
+      confirmed: 已确认
       display_name: 显示名称
       domain: 域名
       edit: 编辑
@@ -71,6 +84,10 @@ zh-CN:
       public: 公共
       push_subscription_expires: 推送订阅过期
       salmon_url: Salmon 反馈 URL
+      show:
+        created_reports: 这个账户创建的报告
+        report: 报告
+        targeted_reports: 关于这个账户的报告
       silence: 静音
       statuses: 嘟文
       title: 用户
@@ -196,6 +213,7 @@ zh-CN:
       x_months: "%{count} 个月"
       x_seconds: "%{count} 秒"
   errors:
+    '403': 无权查看
     '404': 找不到页面
     '410': 内容已被删除
     '422':
@@ -207,6 +225,16 @@ zh-CN:
     follows: 你所关注的用户
     mutes: 你所静音的用户
     storage: 媒体容量大小
+  followers:
+    domain: 域名
+    explanation_html: 想要保护你的嘟文的话，请慎重考虑关注你的人。<strong>你的受保护的嘟文会发送到有你的关注者的所有实例上</strong>。你也许想要复查一下关注者列表来移除那些你无法信任的关注者。
+    followers_count: 关注者数量
+    lock_link: 保护你的账户
+    purge: 从关注者中移除
+    success: 从 %{count} 个域名中移除了关注者。
+    true_privacy_html: <strong>真正的隐私只能靠端到端加密来实现</strong>！
+    unlocked_warning_html: 任何人都可以关注你然后查看被保护的嘟文， %{lock_link} 可以复核和拒绝关注请求。
+    unlocked_warning_title: 你的账户没被保护
   generic:
     changes_saved_msg: 更改已被保存。
     powered_by: 基于 %{link} 构建
@@ -260,7 +288,9 @@ zh-CN:
     authorized_apps: 已授权的应用
     back: 回到 Mastodon
     edit_profile: 更改个人信息
-    export: 数据导出
+    export: 导出
+    followers: 授权的关注者
+    import: 导入
     preferences: 首选项
     settings: 设置
     two_factor_authentication: 两步认证
@@ -269,9 +299,12 @@ zh-CN:
     over_character_limit: 超过了 %{max} 字的限制
     show_more: 显示更多
     visibilities:
-      private: 仅向粉丝公开
+      private: 限关注者
       public: 公开
-      unlisted: 公开，但不显示在公共时间线中
+      unlisted: 于公共时间线中隐藏
+      private_long: 仅向关注者公开
+      public_long: 向所有人公开
+      unlisted_long: 公开，但不显示在公共时间线中
   stream_entries:
     click_to_show: 显示
     reblogged: 转发
@@ -285,6 +318,8 @@ zh-CN:
     disable: 停用
     enable: 启用
     enabled_success: 已成功启用两步认证
+    lost_recovery_codes: 如果你丢了手机，你可以用恢复代码重新访问你的账户。如果你丢了恢复代码，也可以在这里重新生成一个，不过以前的恢复代码就失效了。<del>（废话）</del>
+    recovery_codes_regenerated: 已成功重新生成恢复代码
     instructions_html: "<strong>请用你手机的认证器应用（如 Google Authenticator、Authy），扫描这里的 QR 二维码</strong>。在两步认证启用后，你登录时将需要使用此应用程序产生的认证码。"
     manual_instructions: 如果你无法扫描 QR 二维码，请手动输入这个文本密码︰
     setup: 设置
-- 
GitLab