diff --git a/assets/base/i18n/zh-CN.json b/assets/base/i18n/zh-CN.json
index c815978d3..36a5ffbbb 100644
--- a/assets/base/i18n/zh-CN.json
+++ b/assets/base/i18n/zh-CN.json
@@ -112,13 +112,27 @@
   "channel_info.archive_description.cannot_view_archived": "这将从团队中归档此频道。归档频道可以根据需要被再次恢复。\n\n您确定要归档{term} {name} 吗？",
   "channel_info.archive_failed": "在试图归档频道{displayName}时发生错误",
   "channel_info.archive_title": "归档{term}",
+  "channel_info.channel_auto_follow_threads": "关注此频道中的所有话题",
+  "channel_info.channel_auto_follow_threads_failed": "在尝试关注频道{displayName}中的所有话题时遇到问题",
   "channel_info.channel_files": "文件",
   "channel_info.close": "关闭",
   "channel_info.close_dm": "关闭对话",
   "channel_info.close_dm_channel": "您确定关闭此对话吗？会话将从主屏幕中删除，但您可以再次打开它。",
   "channel_info.close_gm": "关闭群聊",
   "channel_info.close_gm_channel": "您确定关闭此对话吗？会话将从主屏幕中删除，但您可以再次打开它。",
-  "channel_info.convert_failed": "我们无法将{displayName} 转变为私有频道。",
+  "channel_info.convert_failed": "我们无法将{displayName}转换为私有频道。",
+  "channel_info.convert_gm_to_channel": "转换为私有频道",
+  "channel_info.convert_gm_to_channel.button_text": "转换为私有频道",
+  "channel_info.convert_gm_to_channel.button_text_converting": "转换中…",
+  "channel_info.convert_gm_to_channel.conversion_error": "发生错误。无法将群组消息转换为私有频道。",
+  "channel_info.convert_gm_to_channel.loading.footer": "获取详情中…",
+  "channel_info.convert_gm_to_channel.screen_title": "转换为私有频道",
+  "channel_info.convert_gm_to_channel.team_selector_list.title": "选择团队",
+  "channel_info.convert_gm_to_channel.warning.body.yourself": "您自己",
+  "channel_info.convert_gm_to_channel.warning.bodyXXXX": "您在将与{memberNames}的群组消息转换为一个频道。此操作无法撤销。",
+  "channel_info.convert_gm_to_channel.warning.header": "对话历史将对所有频道成员可见",
+  "channel_info.convert_gm_to_channel.warning.no_teams.body": "群组消息无法被转换为频道，因为成员不在同一团队。添加所有成员至同一团队以将此群组消息转换为频道。",
+  "channel_info.convert_gm_to_channel.warning.no_teams.header": "无法转换为频道，因为群组成员来自不同的团队",
   "channel_info.convert_private": "转成非公开频道",
   "channel_info.convert_private_description": "当你转变{displayName}成一个非公开频道，历史和关联关系将会被保留。公共分享文件的链接所有人都可以继续访问。私有频道只能通过邀请加入。\n\n此更改是永久的而且不能撤销。\n\n您确定将{displayName}转变成一个非公开频道吗？",
   "channel_info.convert_private_success": "{displayName} 现在为非公开频道。",
@@ -158,6 +172,8 @@
   "channel_info.unarchive_description": "您确定要取消归档 {term} {name}？",
   "channel_info.unarchive_failed": "在尝试取消归档频道{displayName}时发生错误",
   "channel_info.unarchive_title": "取消归档 {term}",
+  "channel_into.convert_gm_to_channel.team_selector.label": "团队",
+  "channel_into.convert_gm_to_channel.team_selector.placeholder": "选择团队",
   "channel_intro.createdBy": "由{user}在{date}创建",
   "channel_intro.createdOn": "{date}创建",
   "channel_list.channels_category": "频道",
@@ -320,6 +336,7 @@
   "general_settings.help": "帮助",
   "general_settings.notifications": "通知",
   "general_settings.report_problem": "报告一个问题",
+  "generic.back": "返回",
   "get_post_link_modal.title": "复制链接",
   "global_threads.allThreads": "你所有的主题",
   "global_threads.emptyThreads.message": "您被提及或参与过的任何主题都将与您关注的任何主题一起显示在此处。",
@@ -456,7 +473,7 @@
   "mobile.calls_leave": "离开",
   "mobile.calls_leave_call": "离开通话",
   "mobile.calls_limit_msg": "每个通话最的参加者人数为 {maxParticipants}。联系您的系统管理员增加人数上限。",
-  "mobile.calls_limit_msg_GA": "升级到云平台专业版或者云平台企业版开启超过 {maxParticipants}参加者的群组通话。",
+  "mobile.calls_limit_msg_GA": "升级到云平台专业版或云平台企业版以启用超过 {maxParticipants} 位参与者的群组通话。",
   "mobile.calls_limit_reached": "达到参加者上限",
   "mobile.calls_lower_hand": "放下手",
   "mobile.calls_mic_error": "打开设置允许Mattermost访问您的麦克风权限用来加入。",
@@ -478,7 +495,7 @@
   "mobile.calls_phone": "电话",
   "mobile.calls_quality_warning": "由于网络条件不稳定，通话质量可能会下降。",
   "mobile.calls_raise_hand": "举手",
-  "mobile.calls_raised_hand": "<bold>{name} {num, plural, =0 {} other {+# 等 }}</bold>举起了手",
+  "mobile.calls_raised_hand": "<bold>{name}{num, plural, =0 {} other {与另外 # 人}}</bold>举起了手",
   "mobile.calls_react": "反馈",
   "mobile.calls_rec": "反馈",
   "mobile.calls_record": "录制",
@@ -612,6 +629,7 @@
   "mobile.managed.settings": "前往设置",
   "mobile.markdown.code.copy_code": "复制代码",
   "mobile.markdown.code.plusMoreLines": "+{count, number} 行",
+  "mobile.markdown.copy_header": "复制标题文本",
   "mobile.markdown.image.too_large": "图片超过最大尺寸 {maxWidth}x{maxHeight}：",
   "mobile.markdown.link.copy_url": "复制网址",
   "mobile.mention.copy_mention": "复制提及",
@@ -709,6 +727,9 @@
   "mobile.server_url.empty": "请输入有效的服务端网址",
   "mobile.server_url.invalid_format": "每个 URL 必须以 http:// 或 https:// 开头",
   "mobile.session_expired.title": "会话已过期",
+  "mobile.session_expired_days": "请登录以继续接收通知。{siteName}的会话已配置为每 {daysCount, number} 天过期。",
+  "mobile.session_expired_days_hrs": "请登录以继续接收通知。{siteName}的会话已配置为每 {daysCount, number} 天 {hoursCount, number} 小时过期。",
+  "mobile.session_expired_hrs": "请登录以继续接收通知。{siteName}的会话已配置为每 {hoursCount, number} 小时过期。",
   "mobile.set_status.dnd": "请勿打扰",
   "mobile.storage_permission_denied_description": "上传文件到您的 Mattermost。打开设定并允许 {applicationName} 读写此设备上的文件。",
   "mobile.storage_permission_denied_title": "{applicationName} 想要访问您的文件",
@@ -1012,7 +1033,7 @@
   "suggestion.mention.all": "通知此频道所有人",
   "suggestion.mention.channel": "通知此频道所有人",
   "suggestion.mention.channels": "我的频道",
-  "suggestion.mention.groups": "组提及",
+  "suggestion.mention.groups": "群组提及",
   "suggestion.mention.here": "通知所有在此频道在线的人",
   "suggestion.mention.members": "频道成员",
   "suggestion.mention.morechannels": "其他频道",