about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/javascript/mastodon/locales/zh-CN.json8
-rw-r--r--config/locales/en.yml4
-rw-r--r--config/locales/simple_form.zh-CN.yml2
-rw-r--r--config/locales/zh-CN.yml18
4 files changed, 20 insertions, 12 deletions
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index b920bc19e..b67afd29f 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -39,7 +39,7 @@
   "bundle_modal_error.close": "关闭",
   "bundle_modal_error.message": "载入这个组件时发生了错误。",
   "bundle_modal_error.retry": "重试",
-  "column.blocks": "屏蔽用户",
+  "column.blocks": "已屏蔽的用户",
   "column.community": "本站时间轴",
   "column.direct": "私信",
   "column.domain_blocks": "已屏蔽的网站",
@@ -47,7 +47,7 @@
   "column.follow_requests": "关注请求",
   "column.home": "主页",
   "column.lists": "列表",
-  "column.mutes": "被隐藏的用户",
+  "column.mutes": "已隐藏的用户",
   "column.notifications": "通知",
   "column.pins": "置顶嘟文",
   "column.public": "跨站公共时间轴",
@@ -157,7 +157,7 @@
   "missing_indicator.label": "找不到内容",
   "missing_indicator.sublabel": "无法找到此资源",
   "mute_modal.hide_notifications": "同时隐藏来自这个用户的通知",
-  "navigation_bar.blocks": "被屏蔽的用户",
+  "navigation_bar.blocks": "已屏蔽的用户",
   "navigation_bar.community_timeline": "本站时间轴",
   "navigation_bar.direct": "私信",
   "navigation_bar.domain_blocks": "已屏蔽的网站",
@@ -168,7 +168,7 @@
   "navigation_bar.keyboard_shortcuts": "快捷键列表",
   "navigation_bar.lists": "列表",
   "navigation_bar.logout": "注销",
-  "navigation_bar.mutes": "被隐藏的用户",
+  "navigation_bar.mutes": "已隐藏的用户",
   "navigation_bar.pins": "置顶嘟文",
   "navigation_bar.preferences": "首选项",
   "navigation_bar.public_timeline": "跨站公共时间轴",
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 65b5b1e0b..262883e2c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -283,7 +283,7 @@ en:
         create_and_resolve: Resolve with note
         create_and_unresolve: Reopen with note
         delete: Delete
-        placeholder: Describe what actions have been taken, or any other updates to this report…
+        placeholder: Describe what actions have been taken, or any other related updates...
       reopen: Reopen report
       report: 'Report #%{id}'
       report_contents: Contents
@@ -550,7 +550,7 @@ en:
       subject:
         one: "1 new notification since your last visit \U0001F418"
         other: "%{count} new notifications since your last visit \U0001F418"
-      title: In your absence…
+      title: In your absence...
     favourite:
       body: 'Your status was favourited by %{name}:'
       subject: "%{name} favourited your status"
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index b12538b35..5b3b25ab1 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -13,7 +13,7 @@ zh-CN:
         note: 还能输入 <span class="note-counter">%{count}</span> 个字符
         setting_hide_network: 你关注的人和关注你的人将不会在你的个人资料页上展示
         setting_noindex: 此设置会影响到你的公开个人资料以及嘟文页面
-        setting_theme: 此设置会影响到你从任意设备登录时 Mastodon 的显示样式
+        setting_theme: 此设置会影响到所有已登录设备上 Mastodon 的显示样式
       imports:
         data: 请上传从其他 Mastodon 实例导出的 CSV 文件
       sessions:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f7fc1a7a9..357575a3b 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -26,9 +26,9 @@ zh-CN:
       within_reach_title: 始终触手可及
     generic_description: "%{domain} 是这个庞大网络中的一台服务器"
     hosted_on: 一个在 %{domain} 上运行的 Mastodon 实例
-    learn_more: 详细了解
+    learn_more: 了解详情
     other_instances: 其他实例
-    source_code: 源码
+    source_code: 源代码
     status_count_after: 条嘟文
     status_count_before: 他们共嘟出了
     user_count_after: 位用户
@@ -281,7 +281,7 @@ zh-CN:
         create_and_resolve: 添加记录并标记为“已处理”
         create_and_unresolve: 添加记录并重开
         delete: 删除
-        placeholder: 描述已经执行的操作,或其他任何与此条举报相关的跟进情况
+        placeholder: 描述已经执行的操作,或其他任何相关的跟进情况
       reopen: 重开举报
       report: '举报 #%{id}'
       report_contents: 内容
@@ -405,6 +405,9 @@ zh-CN:
     migrate_account_html: 如果你希望引导他人关注另一个帐户,请<a href="%{path}">点击这里进行设置</a>。
     or: 或者
     or_log_in_with: 或通过其他方式登录
+    providers:
+      cas: CAS
+      saml: SAML
     register: 注册
     register_elsewhere: 前往其他实例注册
     resend_confirmation: 重新发送确认邮件
@@ -460,7 +463,7 @@ zh-CN:
     archive_takeout:
       date: 日期
       download: 下载你的存档
-      hint_html: 你可以请求一份包含你的<strong>嘟文和已上传的媒体文件</strong>的存档。导出的数据为 ActivityPub 格式,因而可以通过相应的软件读取。每次可以请求存档的间隔至少为 7 天。
+      hint_html: 你可以请求一份帐户数据存档,其中包含你的<strong>嘟文和已上传的媒体文件</strong>。导出的数据为 ActivityPub 格式,因而可以被兼容的软件读取。每次允许请求存档的间隔至少为 7 天。
       in_progress: 正在准备你的存档……
       request: 请求你的存档
       size: 大小
@@ -574,7 +577,9 @@ zh-CN:
           trillion: T
           unit: ''
   pagination:
+    newer: 更新
     next: 下一页
+    older: 更早
     prev: 上一页
     truncate: "…"
   preferences:
@@ -599,12 +604,14 @@ zh-CN:
       blackberry: Blackberry
       chrome: Chrome
       edge: Microsoft Edge
+      electron: Electron
       firefox: Firefox
       generic: 未知浏览器
       ie: Internet Explorer
       micro_messenger: 微信
       nokia: Nokia S40 Ovi 浏览器
       opera: Opera
+      otter: Otter
       phantom_js: PhantomJS
       qq: QQ浏览器
       safari: Safari
@@ -632,7 +639,7 @@ zh-CN:
     title: 会话
   settings:
     authorized_apps: 已授权的应用
-    back: 回到 Mastodon
+    back: 返回 Mastodon
     delete: 删除帐户
     development: 开发
     edit_profile: 更改个人资料
@@ -681,6 +688,7 @@ zh-CN:
   themes:
     contrast: 高对比度
     default: Mastodon
+    mastodon-light: Mastodon(亮色主题)
   time:
     formats:
       default: "%Y年%-m月%d日 %H:%M"