Latest translations and fallbacks

public/language/zh-CN/error.json

@@ -125,7 +125,7 @@
     "parse-error": "服务器响应解析出错",
     "wrong-login-type-email": "请输入您的电子邮箱地址登录",
     "wrong-login-type-username": "请输入您的用户名登录",
-    "sso-registration-disabled": "Registration has been disabled for %1 accounts, please register with an email address first",
+    "sso-registration-disabled": "已经禁止注册注册 %1 账户, 请使用邮箱地址注册",
     "invite-maximum-met": "您的邀请人数超出了上限 (%1 超过了 %2)。",
     "no-session-found": "未登录!",
     "not-in-room": "用户已不在聊天室中",
@@ -135,5 +135,5 @@
     "invalid-home-page-route": "无效的首页路径",
     "invalid-session": "Session 无法匹配",
     "invalid-session-text": "您的登入状态已经失效，或者是与服务器信息不匹配。请刷新此页面。",
-    "no-topics-selected": "No topics selected!"
+    "no-topics-selected": "没有主题被选中!"
 }

public/language/zh-CN/topic.json

@@ -68,8 +68,8 @@
     "thread_tools.restore_confirm": "确定要恢复此主题吗？",
     "thread_tools.purge": "清除主题",
     "thread_tools.purge_confirm": "确认清除此主题吗？",
-    "thread_tools.merge_topics": "Merge Topics",
-    "thread_tools.merge": "Merge",
+    "thread_tools.merge_topics": "合并主题",
+    "thread_tools.merge": "合并",
     "topic_move_success": "此主题已成功移到 %1",
     "post_delete_confirm": "确定删除此帖吗？",
     "post_restore_confirm": "确定恢复此帖吗？",
@@ -91,7 +91,7 @@
     "fork_pid_count": "选择了 %1 个帖子",
     "fork_success": "成功分割主题! 点这里跳转到分割后的主题。",
     "delete_posts_instruction": "点击想要删除/永久删除的帖子",
-    "merge_topics_instruction": "Click the topics you want to merge",
+    "merge_topics_instruction": "点击你想合并的主题",
     "composer.title_placeholder": "在此输入您主题的标题...",
     "composer.handle_placeholder": "姓名",
     "composer.discard": "撤销",