From ea53c95d67419696df424856a2151fd20d6a1d9a Mon Sep 17 00:00:00 2001
From: "Misty (Bot)" <deploy@nodebb.org>
Date: Fri, 14 Aug 2020 09:05:50 +0000
Subject: [PATCH] Latest translations and fallbacks

---
 public/language/zh-CN/admin/manage/users.json  |  2 +-
 public/language/zh-CN/admin/menu.json          | 18 +++++++++---------
 .../zh-CN/admin/settings/advanced.json         |  2 +-
 .../language/zh-CN/admin/settings/general.json | 10 +++++-----
 .../zh-CN/admin/settings/reputation.json       |  2 +-
 public/language/zh-CN/admin/settings/tags.json |  2 +-
 public/language/zh-CN/flags.json               |  6 +++---
 public/language/zh-CN/notifications.json       |  2 +-
 public/language/zh-CN/tags.json                |  2 +-
 public/language/zh-CN/topic.json               |  6 +++---
 public/language/zh-CN/user.json                |  6 +++---
 11 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/public/language/zh-CN/admin/manage/users.json b/public/language/zh-CN/admin/manage/users.json
index d6e594ab32..4cb8196c58 100644
--- a/public/language/zh-CN/admin/manage/users.json
+++ b/public/language/zh-CN/admin/manage/users.json
@@ -108,5 +108,5 @@
 
 	"alerts.prompt-email": "邮件:",
 	"alerts.email-sent-to": "已发送邀请给 %1",
-	"alerts.x-users-found": "%1 user(s) found, (%2 seconds)"
+	"alerts.x-users-found": "找到 %1 位用户(耗时 %2 秒)"
 }
\ No newline at end of file
diff --git a/public/language/zh-CN/admin/menu.json b/public/language/zh-CN/admin/menu.json
index 7d5aacd35c..883c1b7f16 100644
--- a/public/language/zh-CN/admin/menu.json
+++ b/public/language/zh-CN/admin/menu.json
@@ -1,5 +1,5 @@
 {
-	"dashboard": "Dashboard",
+	"dashboard": "仪表盘",
 	"section-general": "基本",
 
 	"section-manage": "管理",
@@ -17,22 +17,22 @@
 
 	"section-settings": "设置",
 	"settings/general": "通用",
-	"settings/homepage": "Home Page",
-	"settings/navigation": "Navigation",
+	"settings/homepage": "主页",
+	"settings/navigation": "导航",
 	"settings/reputation": "Reputation & Flags",
 	"settings/email": "邮件",
-	"settings/user": "Users",
-	"settings/group": "Groups",
+	"settings/user": "用户",
+	"settings/group": "群组",
 	"settings/guest": "游客",
 	"settings/uploads": "上传",
-	"settings/languages": "Languages",
-	"settings/post": "Posts",
-	"settings/chat": "Chats",
+	"settings/languages": "语言",
+	"settings/post": "帖子",
+	"settings/chat": "聊天",
 	"settings/pagination": "分页",
 	"settings/tags": "话题",
 	"settings/notifications": "通知",
 	"settings/sounds": "Sounds",
-	"settings/social": "Social",
+	"settings/social": "社交",
 	"settings/cookies": "Cookies",
 	"settings/web-crawler": "Web 爬虫",
 	"settings/sockets": "套接字",
diff --git a/public/language/zh-CN/admin/settings/advanced.json b/public/language/zh-CN/admin/settings/advanced.json
index 18ef668762..5d98f437af 100644
--- a/public/language/zh-CN/admin/settings/advanced.json
+++ b/public/language/zh-CN/admin/settings/advanced.json
@@ -29,6 +29,6 @@
 
 	"sockets.settings": "WebSocket Settings",
 	"sockets.max-attempts": "Max Reconnection Attempts",
-	"sockets.default-placeholder": "Default: %1",
+	"sockets.default-placeholder": "默认:%1",
 	"sockets.delay": "Reconnection Delay"
 }
\ No newline at end of file
diff --git a/public/language/zh-CN/admin/settings/general.json b/public/language/zh-CN/admin/settings/general.json
index ec9a0f97e7..f17eb0a640 100644
--- a/public/language/zh-CN/admin/settings/general.json
+++ b/public/language/zh-CN/admin/settings/general.json
@@ -1,8 +1,8 @@
 {
 	"site-settings": "站点设置",
 	"title": "站点标题",
-	"title.short": "Short Title",
-	"title.short-placeholder": "If no short title is specified, the site title will be used",
+	"title.short": "短标题",
+	"title.short-placeholder": "如果没有指定短标题,将会使用站点标题",
 	"title.url": "网址",
 	"title.url-placeholder": "网站标题链接",
 	"title.url-help": "当标题被点击,用户将跳转到该地址。如果留空,用户将跳转到论坛首页。",
@@ -34,8 +34,8 @@
 	"outgoing-links.warning-page": "使用站外链接警告页",
 	"search-default-sort-by": "默认搜索排序",
 	"outgoing-links.whitelist": "添加域名到白名单以绕过警告页面",
-	"site-colors": "Site Color Metadata",
-	"theme-color": "Theme Color",
-	"background-color": "Background Color",
+	"site-colors": "站点颜色元数据",
+	"theme-color": "主题色",
+	"background-color": "背景色",
 	"background-color-help": "Color used for splash screen background when website is installed as a PWA"
 }
diff --git a/public/language/zh-CN/admin/settings/reputation.json b/public/language/zh-CN/admin/settings/reputation.json
index 6ddeac64df..bb8c570fd0 100644
--- a/public/language/zh-CN/admin/settings/reputation.json
+++ b/public/language/zh-CN/admin/settings/reputation.json
@@ -16,5 +16,5 @@
 
 	"flags": "Flag Settings",
 	"flags.limit-per-target": "Maximum number of times something can be flagged",
-	"flags.limit-per-target-placeholder": "Default: 0"
+	"flags.limit-per-target-placeholder": "默认:0"
 }
\ No newline at end of file
diff --git a/public/language/zh-CN/admin/settings/tags.json b/public/language/zh-CN/admin/settings/tags.json
index 1c14c1689a..fef04b0cbb 100644
--- a/public/language/zh-CN/admin/settings/tags.json
+++ b/public/language/zh-CN/admin/settings/tags.json
@@ -1,6 +1,6 @@
 {
     "tag": "话题设置",
-    "link-to-manage": "Manage Tags",
+    "link-to-manage": "管理话题",
     "min-per-topic": "每个主题的最少话题数",
     "max-per-topic": "每话题的最大话题数",
     "min-length": "最短话题长度",
diff --git a/public/language/zh-CN/flags.json b/public/language/zh-CN/flags.json
index 04c9cdbd18..efac0be825 100644
--- a/public/language/zh-CN/flags.json
+++ b/public/language/zh-CN/flags.json
@@ -25,7 +25,7 @@
 	"filter-quick-mine": "委托给我",
 	"filter-cid-all": "全部版块",
 	"apply-filters": "应用过滤器",
-	"more-filters": "More Filters",
+	"more-filters": "更多过滤器",
 
 	"quick-actions": "Quick Actions",
 	"flagged-user": "被举报的用户",
@@ -33,9 +33,9 @@
 	"start-new-chat": "开始新会话",
 	"go-to-target": "查看举报目标",
 	"assign-to-me": "Assign To Me",
-	"delete-post": "Delete Post",
+	"delete-post": "删除帖子",
 	"purge-post": "Purge Post",
-	"restore-post": "Restore Post",
+	"restore-post": "恢复帖子",
 
 	"user-view": "查看资料",
 	"user-edit": "编辑资料",
diff --git a/public/language/zh-CN/notifications.json b/public/language/zh-CN/notifications.json
index e45009c928..37281f7702 100644
--- a/public/language/zh-CN/notifications.json
+++ b/public/language/zh-CN/notifications.json
@@ -35,7 +35,7 @@
     "user_posted_to_dual": "<strong>%1</strong> 和 <strong>%2</strong> 回复了: <strong>%3</strong>",
     "user_posted_to_multiple": "<strong>%1</strong> 和 %2 个其他人回复了: <strong>%3</strong>",
     "user_posted_topic": "<strong>%1</strong> 发表了新主题:<strong>%2</strong>",
-    "user_edited_post": "<strong>%1</strong> has edited a post in <strong>%2</strong>",
+    "user_edited_post": "<strong>%1</strong> 在 <strong>%2</strong> 编辑了一个帖子",
     "user_started_following_you": "<strong>%1</strong>关注了您。",
     "user_started_following_you_dual": "<strong>%1</strong> 和 <strong>%2</strong> 关注了您。",
     "user_started_following_you_multiple": "<strong>%1</strong> 和 %2 个其他人关注了您。",
diff --git a/public/language/zh-CN/tags.json b/public/language/zh-CN/tags.json
index 40c1e8bf31..a71fca1e21 100644
--- a/public/language/zh-CN/tags.json
+++ b/public/language/zh-CN/tags.json
@@ -4,5 +4,5 @@
     "enter_tags_here": "在这里输入话题,每个话题 %1 到 %2 个字符。",
     "enter_tags_here_short": "输入话题...",
     "no_tags": "尚无话题。",
-    "select_tags": "Select Tags"
+    "select_tags": "选择话题"
 }
\ No newline at end of file
diff --git a/public/language/zh-CN/topic.json b/public/language/zh-CN/topic.json
index d069effea1..ccd75c0a81 100644
--- a/public/language/zh-CN/topic.json
+++ b/public/language/zh-CN/topic.json
@@ -40,7 +40,7 @@
     "flag-user": "Flag this user",
     "already-flagged": "Already Flagged",
     "view-flag-report": "View Flag Report",
-    "merged_message": "This topic has been merged into <a href=\"%1\">%2</a>",
+    "merged_message": "此主题已并入<a href=\"/topic/%1\">%2</a>",
     "deleted_message": "此主题已被删除。只有拥有主题管理权限的用户可以查看。",
     "following_topic.message": "当有人回复此主题时,您会收到通知。",
     "not_following_topic.message": "您将在未读主题列表中看到这个主题,但您不会在帖子被回复时收到通知。",
@@ -104,13 +104,13 @@
     "delete_posts_instruction": "点击想要删除/永久删除的帖子",
     "merge_topics_instruction": "Click the topics you want to merge or search for them",
     "merge-topic-list-title": "List of topics to be merged",
-    "merge-options": "Merge options",
+    "merge-options": "合并选项",
     "merge-select-main-topic": "Select the main topic",
     "merge-new-title-for-topic": "New title for topic",
     "move_posts_instruction": "点击您想要移动的帖子",
     "change_owner_instruction": "点击您想转移给其他用户的帖子",
     "composer.title_placeholder": "在此输入您主题的标题...",
-    "composer.handle_placeholder": "Enter your name/handle here",
+    "composer.handle_placeholder": "在这里输入您的姓名/昵称",
     "composer.discard": "撤销",
     "composer.submit": "提交",
     "composer.replying_to": "正在回复 %1",
diff --git a/public/language/zh-CN/user.json b/public/language/zh-CN/user.json
index 2a5a9c7511..b732e632c1 100644
--- a/public/language/zh-CN/user.json
+++ b/public/language/zh-CN/user.json
@@ -13,10 +13,10 @@
     "ban_account_confirm": "您确定要封禁这位用户吗?",
     "unban_account": "解禁账户",
     "delete_account": "删除帐号",
-    "delete_account_as_admin": "Delete <strong>Account</strong>",
+    "delete_account_as_admin": "删除<strong>账号</strong>",
     "delete_content": "Delete Account <strong>Content</strong>",
     "delete_all": "Delete <strong>Account</strong> and <strong>Content</strong>",
-    "delete_account_confirm": "Are you sure you want to anonymize your posts and delete your account?<br /><strong>This action is irreversible and you will not be able to recover any of your data</strong><br /><br />Enter your password to confirm that you wish to destroy this account.",
+    "delete_account_confirm": "您确定要匿名化您的所有帖子,并删除您的账户吗?<br /><strong>此操作不可撤销,您将无法恢复您的任何数据</strong><br /><br />请输入您的密码,以确认删除此帐户",
     "delete_this_account_confirm": "Are you sure you want to delete this account while leaving its contents behind?<br /><strong>This action is irreversible, posts will be anonymized, and you will not be able to restore post associations with the deleted account</strong><br /><br />",
     "delete_account_content_confirm": "Are you sure you want to delete this account's content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
     "delete_all_confirm": "Are you sure you want to delete this account and all of its content (posts/topics/uploads)? <br /><strong>This action is irreversible and you will not be able to recover any data</strong><br /><br />",
@@ -178,7 +178,7 @@
     "consent.right_to_erasure_description": "您随时都可以通过删除帐号,来撤销数据收集和处理的许可。您的个人资料可以被删除,但是您发表的内容仍然会保留。如果您想要同时删除您的帐号<strong>和</strong>内容,请联系此网站的管理团队。",
     "consent.right_to_data_portability": "您拥有数据转移权",
     "consent.right_to_data_portability_description": "您也许想导出有关您和您的账号的机器可读副本。您可以点击下方的按钮来获取它们。",
-    "consent.export_profile": "Export Profile (.json)",
+    "consent.export_profile": "导出个人资料 (.json)",
     "consent.export-profile-success": "Exporting profile, you will get a notification when it is complete.",
     "consent.export_uploads": "导出上传文件 (.zip)",
     "consent.export-uploads-success": "Exporting uploads, you will get a notification when it is complete.",