From 7fe54f85e25e537b5aa6b0f4c1f4e8ee46c69cbb Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Tue, 22 Sep 2020 10:22:16 -0500
Subject: [PATCH] Revert "Splitting out chinese translation regions."

This reverts commit d1f0e61b0269d5c30c61eccab05353070e1d3fd9.
---
 translations/{zh_CN.json => zh.json} |   0
 translations/zh_HK.json              | 249 ---------------------------
 translations/zh_TW.json              | 249 ---------------------------
 3 files changed, 498 deletions(-)
 rename translations/{zh_CN.json => zh.json} (100%)
 delete mode 100644 translations/zh_HK.json
 delete mode 100644 translations/zh_TW.json

diff --git a/translations/zh_CN.json b/translations/zh.json
similarity index 100%
rename from translations/zh_CN.json
rename to translations/zh.json
diff --git a/translations/zh_HK.json b/translations/zh_HK.json
deleted file mode 100644
index e9384c9..0000000
--- a/translations/zh_HK.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-    "post": "回帖",
-    "remove_post": "移除帖子",
-    "no_posts": "没有帖子。",
-    "create_a_post": "创建新帖子",
-    "create_post": "创建帖子",
-    "number_of_posts": "{{count}} 个帖子",
-    "posts": "帖子",
-    "related_posts": "这些帖子可能相关",
-    "comments": "评论",
-    "number_of_comments": "{{count}} 条评论",
-    "remove_comment": "移除评论",
-    "communities": "社群",
-    "create_a_community": "创建新社群",
-    "create_community": "创建社群",
-    "remove_community": "移除社群",
-    "subscribed_to_communities": "订阅新<1>社群</1>",
-    "trending_communities": "热门<1>社群</1>",
-    "list_of_communities": "社群列表",
-    "community_reqs": "小写字母、下划线（_）且不含空格。",
-    "edit": "编辑",
-    "reply": "回复",
-    "cancel": "取消",
-    "unlock": "解锁",
-    "lock": "加锁",
-    "link": "链接",
-    "mod": "社群管理",
-    "mods": "社群管理",
-    "moderates": "监管",
-    "remove_as_mod": "删除社群管理权限",
-    "appoint_as_mod": "任命为社群管理",
-    "modlog": "管理记录",
-    "admin": "总管理员",
-    "admins": "总管理员",
-    "remove_as_admin": "移除管理员权限",
-    "appoint_as_admin": "添加管理员权限",
-    "remove": "移除",
-    "removed": "已被社群管理移除",
-    "locked": "已锁定",
-    "reason": "原因",
-    "mark_as_read": "标记为已读",
-    "mark_as_unread": "标记为未读",
-    "delete": "删除",
-    "deleted": "作者已删除",
-    "restore": "恢复",
-    "ban": "禁止",
-    "ban_from_site": "禁止此站点",
-    "unban": "取消禁止",
-    "unban_from_site": "取消禁止网站",
-    "save": "保存",
-    "unsave": "取消保存",
-    "create": "创建",
-    "username": "用户名",
-    "email_or_username": "邮箱或用户名",
-    "number_of_users": "{{count}} 名用户",
-    "number_of_subscribers": "{{count}} 名订阅者",
-    "number_of_points": "{{count}} 积分",
-    "name": "名称",
-    "title": "标语",
-    "category": "分类",
-    "subscribers": "订阅",
-    "both": "全部",
-    "saved": "保存",
-    "unsubscribe": "取消订阅",
-    "subscribe": "订阅",
-    "subscribed": "已订阅",
-    "prev": "上一页",
-    "next": "下一页",
-    "sidebar": "介绍",
-    "sort_type": "排序方式",
-    "hot": "最热",
-    "new": "最新",
-    "top_day": "日",
-    "week": "周",
-    "month": "月",
-    "year": "年",
-    "all": "所有",
-    "top": "推荐",
-    "api": "API",
-    "inbox": "收件箱",
-    "inbox_for": "<1>{{user}}</1> 收件箱",
-    "mark_all_as_read": "标记所有已读",
-    "type": "类型",
-    "unread": "未读",
-    "reply_sent": "回复已发送",
-    "search": "搜索",
-    "overview": "个人中心",
-    "view": "查看",
-    "logout": "注销",
-    "login_sign_up": "登录/注册",
-    "login": "登录",
-    "sign_up": "注册",
-    "notifications_error": "你的浏览器不支持桌面通知，尝试 Firefox 或 Chrome。",
-    "unread_messages": "未读消息",
-    "password": "密码",
-    "verify_password": "确认密码",
-    "email": "邮箱",
-    "optional": "选项",
-    "expires": "过期",
-    "url": "相关网址",
-    "body": "内容",
-    "copy_suggested_title": "复制建议的标题: {{title}}",
-    "community": "社群",
-    "expand_here": "展开",
-    "subscribe_to_communities": "订阅一些 <1>社群</1>.",
-    "chat": "聊天",
-    "no_results": "没有结果.",
-    "setup": "设置",
-    "lemmy_instance_setup": "创设 Lemmy 实例",
-    "setup_admin": "设置管理员",
-    "your_site": "你的站点",
-    "modified": "修改",
-    "sponsors": "赞助者",
-    "sponsors_of_lemmy": "Lemmy 的赞助者",
-    "sponsor_message": "Lemmy 是自由的<1>开源</1>软件，这意味着它决不会有广告、盈利行为和风险投资介入。您的捐款将被直接用于支持项目的开发。感谢以下诸位：",
-    "support_on_patreon": "在 Patreon 支持",
-    "support_on_liberapay": "在 Liberapay支持",
-    "general_sponsors": "向Lemmy捐助10至39美元者为普通赞助人。",
-    "crypto": "加密货币",
-    "bitcoin": "比特币",
-    "ethereum": "以太币",
-    "code": "代码",
-    "joined": "已加入",
-    "powered_by": "保留所有权利",
-    "landing": "Lemmy是一个 <1>链接聚合器</1> / reddit的替代选择，为在<2>fediverse</2>上使用而设计。<3></3>它支持自托管， 提供实时更新的讨论串, 并且十分轻量 (<4>约80kB</4>)。对ActivityPub网络的联邦整合已经在规划之中。<5></5>这是一个<6>非常早期的beta版本</6>，许多功能还不能使用或还未开发完成。 <7></7>请到 <8>这里</8>提出新功能或报告bug。<9></9>由<10>Rust</10>、 <11>Actix</11>、<12>Inferno</12>、<13>Typescript</13>写成。",
-    "not_logged_in": "未登录.",
-    "community_ban": "你已被此社群拉黑。",
-    "site_ban": "你已被本站拉黑",
-    "couldnt_create_comment": "无法创建评论。",
-    "couldnt_like_comment": "无法点赞评论。",
-    "couldnt_update_comment": "无法更新评论。",
-    "couldnt_save_comment": "无法保存评论。",
-    "no_comment_edit_allowed": "没有编辑评论的权限。",
-    "no_post_edit_allowed": "没有编辑帖子的权限。",
-    "no_community_edit_allowed": "没有编辑社群的权限。",
-    "couldnt_find_community": "无法找到社群。",
-    "couldnt_update_community": "无法更新社群。",
-    "community_already_exists": "社群已存在。",
-    "community_moderator_already_exists": "社群监管人已存在。",
-    "community_follower_already_exists": "社群关注者已存在。",
-    "community_user_already_banned": "社群用户已被禁止。",
-    "couldnt_create_post": "无法创建帖子。",
-    "couldnt_like_post": "无法点赞帖子。",
-    "couldnt_find_post": "无法找到帖子。",
-    "couldnt_get_posts": "无法获取帖子",
-    "couldnt_update_post": "无法更新帖子",
-    "couldnt_save_post": "无法保存帖子。",
-    "no_slurs": "文明语言。",
-    "not_an_admin": "不是管理员。",
-    "site_already_exists": "站点已存在。",
-    "couldnt_update_site": "无法更新站点。",
-    "couldnt_find_that_username_or_email": "用户名/邮箱不存在。",
-    "password_incorrect": "密码不正确。",
-    "passwords_dont_match": "密码不匹配。",
-    "admin_already_created": "抱歉，管理员已存在。",
-    "user_already_exists": "用户已存在。",
-    "couldnt_update_user": "无法更新用户。",
-    "system_err_login": "系统错误。请尝试注销后重新登入。",
-    "nsfw": "工作场所不宜",
-    "show_nsfw": "显示工作场所不宜内容",
-    "theme": "主题",
-    "from": "由",
-    "donate_to_lemmy": "向 Lemmy 捐赠",
-    "donate": "捐赠",
-    "monero": "门罗币",
-    "to": "发布到",
-    "are_you_sure": "你确定吗？",
-    "yes": "是",
-    "no": "否",
-    "logged_in": "已登录。",
-    "message": "消息",
-    "create_private_message": "创建私信",
-    "send_secure_message": "发送安全消息",
-    "send_message": "发送消息",
-    "more": "更多",
-    "preview": "预览",
-    "upload_image": "上传图片",
-    "enable_nsfw": "允许工作场所不宜内容",
-    "show_avatars": "显示头像",
-    "avatar": "头像",
-    "formatting_help": "格式帮助",
-    "sorting_help": "排序帮助",
-    "view_source": "显示来源",
-    "sticky": "固定",
-    "unsticky": "取消固定",
-    "archive_link": "链接归档",
-    "settings": "设置",
-    "stickied": "已置顶",
-    "delete_account": "删除账号",
-    "delete_account_confirm": "警告！此操作将永久删除你的数据，请输入密码进行确认。",
-    "cross_posts": "此链接也已被发布到：",
-    "cross_post": "复数发布",
-    "cross_posted_to": "已被复数发布到： ",
-    "users": "用户",
-    "banned": "已被禁止",
-    "creator": "作者",
-    "number_of_communities": "{{count}} 个社群",
-    "old": "最早",
-    "docs": "文档",
-    "upload_avatar": "上传头像",
-    "replies": "回复",
-    "number_online": "{{count}} 名在线用户",
-    "mentions": "提到",
-    "message_sent": "消息已发送",
-    "old_password": "当前密码",
-    "forgot_password": "忘记密码",
-    "reset_password_mail_sent": "发送邮件重置密码。",
-    "password_change": "修改密码",
-    "new_password": "新密码",
-    "messages": "信息",
-    "no_email_setup": "此服务器还未正确设定邮箱。",
-    "matrix_user_id": "Matrix用户",
-    "private_message_disclaimer": "警告：Lemmy的私信功能并不安全。想要进行安全的信息传递，请在 <1>Riot.im</1>上创建账号。",
-    "send_notifications_to_email": "向邮箱发送通知",
-    "language": "语言",
-    "browser_default": "浏览器默认语言",
-    "downvotes_disabled": "反对投票已禁用",
-    "enable_downvotes": "启用反对投票功能",
-    "upvote": "点赞",
-    "number_of_upvotes": "{{count}} 个赞",
-    "downvote": "反对",
-    "number_of_downvotes": "{{count}} 个反对",
-    "open_registration": "开放注册",
-    "registration_closed": "注册功能已关闭",
-    "recent_comments": "最新评论",
-    "by": " ",
-    "transfer_community": "转让社群",
-    "transfer_site": "站点转让",
-    "post_title_too_long": "帖子标题过长。",
-    "couldnt_get_comments": "无法获取评论。",
-    "email_already_exists": "该邮箱已被占用。",
-    "couldnt_create_private_message": "无法创建私信。",
-    "no_private_message_edit_allowed": "没有编辑私信的权限。",
-    "couldnt_update_private_message": "无法更新私信。",
-    "time": "时间",
-    "action": "动作",
-    "block_leaving": "确定要离开吗？",
-    "show_context": "显示上下文",
-    "admin_settings": "管理员设置",
-    "site_config": "网站配置",
-    "banned_users": "被禁止用户",
-    "site_saved": "网站已保存",
-    "emoji_picker": "选择表情",
-    "invalid_username": "用户名无效",
-    "invalid_community_name": "无效的名称",
-    "click_to_delete_picture": "点击删除图片",
-    "picture_deleted": "图片已删除",
-    "select_a_community": "选择一个社群"
-}
diff --git a/translations/zh_TW.json b/translations/zh_TW.json
deleted file mode 100644
index e9384c9..0000000
--- a/translations/zh_TW.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-    "post": "回帖",
-    "remove_post": "移除帖子",
-    "no_posts": "没有帖子。",
-    "create_a_post": "创建新帖子",
-    "create_post": "创建帖子",
-    "number_of_posts": "{{count}} 个帖子",
-    "posts": "帖子",
-    "related_posts": "这些帖子可能相关",
-    "comments": "评论",
-    "number_of_comments": "{{count}} 条评论",
-    "remove_comment": "移除评论",
-    "communities": "社群",
-    "create_a_community": "创建新社群",
-    "create_community": "创建社群",
-    "remove_community": "移除社群",
-    "subscribed_to_communities": "订阅新<1>社群</1>",
-    "trending_communities": "热门<1>社群</1>",
-    "list_of_communities": "社群列表",
-    "community_reqs": "小写字母、下划线（_）且不含空格。",
-    "edit": "编辑",
-    "reply": "回复",
-    "cancel": "取消",
-    "unlock": "解锁",
-    "lock": "加锁",
-    "link": "链接",
-    "mod": "社群管理",
-    "mods": "社群管理",
-    "moderates": "监管",
-    "remove_as_mod": "删除社群管理权限",
-    "appoint_as_mod": "任命为社群管理",
-    "modlog": "管理记录",
-    "admin": "总管理员",
-    "admins": "总管理员",
-    "remove_as_admin": "移除管理员权限",
-    "appoint_as_admin": "添加管理员权限",
-    "remove": "移除",
-    "removed": "已被社群管理移除",
-    "locked": "已锁定",
-    "reason": "原因",
-    "mark_as_read": "标记为已读",
-    "mark_as_unread": "标记为未读",
-    "delete": "删除",
-    "deleted": "作者已删除",
-    "restore": "恢复",
-    "ban": "禁止",
-    "ban_from_site": "禁止此站点",
-    "unban": "取消禁止",
-    "unban_from_site": "取消禁止网站",
-    "save": "保存",
-    "unsave": "取消保存",
-    "create": "创建",
-    "username": "用户名",
-    "email_or_username": "邮箱或用户名",
-    "number_of_users": "{{count}} 名用户",
-    "number_of_subscribers": "{{count}} 名订阅者",
-    "number_of_points": "{{count}} 积分",
-    "name": "名称",
-    "title": "标语",
-    "category": "分类",
-    "subscribers": "订阅",
-    "both": "全部",
-    "saved": "保存",
-    "unsubscribe": "取消订阅",
-    "subscribe": "订阅",
-    "subscribed": "已订阅",
-    "prev": "上一页",
-    "next": "下一页",
-    "sidebar": "介绍",
-    "sort_type": "排序方式",
-    "hot": "最热",
-    "new": "最新",
-    "top_day": "日",
-    "week": "周",
-    "month": "月",
-    "year": "年",
-    "all": "所有",
-    "top": "推荐",
-    "api": "API",
-    "inbox": "收件箱",
-    "inbox_for": "<1>{{user}}</1> 收件箱",
-    "mark_all_as_read": "标记所有已读",
-    "type": "类型",
-    "unread": "未读",
-    "reply_sent": "回复已发送",
-    "search": "搜索",
-    "overview": "个人中心",
-    "view": "查看",
-    "logout": "注销",
-    "login_sign_up": "登录/注册",
-    "login": "登录",
-    "sign_up": "注册",
-    "notifications_error": "你的浏览器不支持桌面通知，尝试 Firefox 或 Chrome。",
-    "unread_messages": "未读消息",
-    "password": "密码",
-    "verify_password": "确认密码",
-    "email": "邮箱",
-    "optional": "选项",
-    "expires": "过期",
-    "url": "相关网址",
-    "body": "内容",
-    "copy_suggested_title": "复制建议的标题: {{title}}",
-    "community": "社群",
-    "expand_here": "展开",
-    "subscribe_to_communities": "订阅一些 <1>社群</1>.",
-    "chat": "聊天",
-    "no_results": "没有结果.",
-    "setup": "设置",
-    "lemmy_instance_setup": "创设 Lemmy 实例",
-    "setup_admin": "设置管理员",
-    "your_site": "你的站点",
-    "modified": "修改",
-    "sponsors": "赞助者",
-    "sponsors_of_lemmy": "Lemmy 的赞助者",
-    "sponsor_message": "Lemmy 是自由的<1>开源</1>软件，这意味着它决不会有广告、盈利行为和风险投资介入。您的捐款将被直接用于支持项目的开发。感谢以下诸位：",
-    "support_on_patreon": "在 Patreon 支持",
-    "support_on_liberapay": "在 Liberapay支持",
-    "general_sponsors": "向Lemmy捐助10至39美元者为普通赞助人。",
-    "crypto": "加密货币",
-    "bitcoin": "比特币",
-    "ethereum": "以太币",
-    "code": "代码",
-    "joined": "已加入",
-    "powered_by": "保留所有权利",
-    "landing": "Lemmy是一个 <1>链接聚合器</1> / reddit的替代选择，为在<2>fediverse</2>上使用而设计。<3></3>它支持自托管， 提供实时更新的讨论串, 并且十分轻量 (<4>约80kB</4>)。对ActivityPub网络的联邦整合已经在规划之中。<5></5>这是一个<6>非常早期的beta版本</6>，许多功能还不能使用或还未开发完成。 <7></7>请到 <8>这里</8>提出新功能或报告bug。<9></9>由<10>Rust</10>、 <11>Actix</11>、<12>Inferno</12>、<13>Typescript</13>写成。",
-    "not_logged_in": "未登录.",
-    "community_ban": "你已被此社群拉黑。",
-    "site_ban": "你已被本站拉黑",
-    "couldnt_create_comment": "无法创建评论。",
-    "couldnt_like_comment": "无法点赞评论。",
-    "couldnt_update_comment": "无法更新评论。",
-    "couldnt_save_comment": "无法保存评论。",
-    "no_comment_edit_allowed": "没有编辑评论的权限。",
-    "no_post_edit_allowed": "没有编辑帖子的权限。",
-    "no_community_edit_allowed": "没有编辑社群的权限。",
-    "couldnt_find_community": "无法找到社群。",
-    "couldnt_update_community": "无法更新社群。",
-    "community_already_exists": "社群已存在。",
-    "community_moderator_already_exists": "社群监管人已存在。",
-    "community_follower_already_exists": "社群关注者已存在。",
-    "community_user_already_banned": "社群用户已被禁止。",
-    "couldnt_create_post": "无法创建帖子。",
-    "couldnt_like_post": "无法点赞帖子。",
-    "couldnt_find_post": "无法找到帖子。",
-    "couldnt_get_posts": "无法获取帖子",
-    "couldnt_update_post": "无法更新帖子",
-    "couldnt_save_post": "无法保存帖子。",
-    "no_slurs": "文明语言。",
-    "not_an_admin": "不是管理员。",
-    "site_already_exists": "站点已存在。",
-    "couldnt_update_site": "无法更新站点。",
-    "couldnt_find_that_username_or_email": "用户名/邮箱不存在。",
-    "password_incorrect": "密码不正确。",
-    "passwords_dont_match": "密码不匹配。",
-    "admin_already_created": "抱歉，管理员已存在。",
-    "user_already_exists": "用户已存在。",
-    "couldnt_update_user": "无法更新用户。",
-    "system_err_login": "系统错误。请尝试注销后重新登入。",
-    "nsfw": "工作场所不宜",
-    "show_nsfw": "显示工作场所不宜内容",
-    "theme": "主题",
-    "from": "由",
-    "donate_to_lemmy": "向 Lemmy 捐赠",
-    "donate": "捐赠",
-    "monero": "门罗币",
-    "to": "发布到",
-    "are_you_sure": "你确定吗？",
-    "yes": "是",
-    "no": "否",
-    "logged_in": "已登录。",
-    "message": "消息",
-    "create_private_message": "创建私信",
-    "send_secure_message": "发送安全消息",
-    "send_message": "发送消息",
-    "more": "更多",
-    "preview": "预览",
-    "upload_image": "上传图片",
-    "enable_nsfw": "允许工作场所不宜内容",
-    "show_avatars": "显示头像",
-    "avatar": "头像",
-    "formatting_help": "格式帮助",
-    "sorting_help": "排序帮助",
-    "view_source": "显示来源",
-    "sticky": "固定",
-    "unsticky": "取消固定",
-    "archive_link": "链接归档",
-    "settings": "设置",
-    "stickied": "已置顶",
-    "delete_account": "删除账号",
-    "delete_account_confirm": "警告！此操作将永久删除你的数据，请输入密码进行确认。",
-    "cross_posts": "此链接也已被发布到：",
-    "cross_post": "复数发布",
-    "cross_posted_to": "已被复数发布到： ",
-    "users": "用户",
-    "banned": "已被禁止",
-    "creator": "作者",
-    "number_of_communities": "{{count}} 个社群",
-    "old": "最早",
-    "docs": "文档",
-    "upload_avatar": "上传头像",
-    "replies": "回复",
-    "number_online": "{{count}} 名在线用户",
-    "mentions": "提到",
-    "message_sent": "消息已发送",
-    "old_password": "当前密码",
-    "forgot_password": "忘记密码",
-    "reset_password_mail_sent": "发送邮件重置密码。",
-    "password_change": "修改密码",
-    "new_password": "新密码",
-    "messages": "信息",
-    "no_email_setup": "此服务器还未正确设定邮箱。",
-    "matrix_user_id": "Matrix用户",
-    "private_message_disclaimer": "警告：Lemmy的私信功能并不安全。想要进行安全的信息传递，请在 <1>Riot.im</1>上创建账号。",
-    "send_notifications_to_email": "向邮箱发送通知",
-    "language": "语言",
-    "browser_default": "浏览器默认语言",
-    "downvotes_disabled": "反对投票已禁用",
-    "enable_downvotes": "启用反对投票功能",
-    "upvote": "点赞",
-    "number_of_upvotes": "{{count}} 个赞",
-    "downvote": "反对",
-    "number_of_downvotes": "{{count}} 个反对",
-    "open_registration": "开放注册",
-    "registration_closed": "注册功能已关闭",
-    "recent_comments": "最新评论",
-    "by": " ",
-    "transfer_community": "转让社群",
-    "transfer_site": "站点转让",
-    "post_title_too_long": "帖子标题过长。",
-    "couldnt_get_comments": "无法获取评论。",
-    "email_already_exists": "该邮箱已被占用。",
-    "couldnt_create_private_message": "无法创建私信。",
-    "no_private_message_edit_allowed": "没有编辑私信的权限。",
-    "couldnt_update_private_message": "无法更新私信。",
-    "time": "时间",
-    "action": "动作",
-    "block_leaving": "确定要离开吗？",
-    "show_context": "显示上下文",
-    "admin_settings": "管理员设置",
-    "site_config": "网站配置",
-    "banned_users": "被禁止用户",
-    "site_saved": "网站已保存",
-    "emoji_picker": "选择表情",
-    "invalid_username": "用户名无效",
-    "invalid_community_name": "无效的名称",
-    "click_to_delete_picture": "点击删除图片",
-    "picture_deleted": "图片已删除",
-    "select_a_community": "选择一个社群"
-}