diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index e2a204bce8b8f77426905525feb41685ec800456..0993f97735297b148d9d8d80c287dedc6182e3cc 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -29,16 +29,16 @@
         <item quantity="other">%d 个未读对话</item>
     </plurals>
     <string name="sending">正在发送…</string>
-    <string name="message_decrypting">解密消息中。请稍候…</string>
+    <string name="message_decrypting">正在解密消息。请稍候…</string>
     <string name="pgp_message">OpenPGP 加密消息</string>
-    <string name="nick_in_use">此昵称已在使用中</string>
+    <string name="nick_in_use">昵称已被使用</string>
     <string name="invalid_muc_nick">昵称无效</string>
     <string name="admin">管理员</string>
     <string name="owner">所有者</string>
     <string name="moderator">主持人</string>
     <string name="participant">参与者</string>
     <string name="visitor">访客</string>
-    <string name="remove_contact_text">是否从联系人列表中移除 %s？将不会移除与对方的对话。</string>
+    <string name="remove_contact_text">是否从联系人列表移除 %s？将不会移除与对方的对话。</string>
     <string name="block_contact_text">是否屏蔽 %s 向您发送消息？</string>
     <string name="unblock_contact_text">是否取消屏蔽 %s 并允许对方向您发送消息？</string>
     <string name="block_domain_text">屏蔽来自 %s 的所有联系人？</string>
@@ -74,7 +74,7 @@
     <string name="send_failed">发送失败</string>
     <string name="preparing_image">正在准备发送图片</string>
     <string name="preparing_images">正在准备发送图片</string>
-    <string name="sharing_files_please_wait">分享文件中。请稍候…</string>
+    <string name="sharing_files_please_wait">正在分享文件。请稍候…</string>
     <string name="action_clear_history">清空聊天记录</string>
     <string name="clear_conversation_history">清空聊天记录</string>
     <string name="clear_histor_msg">是否要删除此对话中的所有消息？
@@ -154,12 +154,12 @@
     <string name="account_status_online">在线</string>
     <string name="account_status_connecting">正在连接…</string>
     <string name="account_status_offline">离线</string>
-    <string name="account_status_unauthorized">未授权</string>
+    <string name="account_status_unauthorized">未经授权</string>
     <string name="account_status_not_found">服务器未找到</string>
     <string name="account_status_no_internet">未连接</string>
     <string name="account_status_regis_fail">注册失败</string>
-    <string name="account_status_regis_conflict">此用户名已在使用中</string>
-    <string name="account_status_regis_success">注册已完成</string>
+    <string name="account_status_regis_conflict">用户名已被使用</string>
+    <string name="account_status_regis_success">注册完成</string>
     <string name="account_status_regis_not_sup">服务器不支持注册</string>
     <string name="account_status_regis_invalid_token">注册令牌无效</string>
     <string name="account_status_tls_error">TLS 协商失败</string>
@@ -190,9 +190,9 @@
     <string name="password">密码</string>
     <string name="invalid_jid">此 XMPP 地址无效</string>
     <string name="error_out_of_memory">空间不足。图片太大</string>
-    <string name="add_phone_book_text">是否要添加 %s 到您的通讯录中？</string>
+    <string name="add_phone_book_text">是否要添加 %s 到您的通讯录？</string>
     <string name="server_info_show_more">服务器信息</string>
-    <string name="server_info_mam">XEP-0313：消息存档管理</string>
+    <string name="server_info_mam">XEP-0313：消息归档管理</string>
     <string name="server_info_carbon_messages">XEP-0280：消息抄送</string>
     <string name="server_info_csi">XEP-0352：客户端状态指示</string>
     <string name="server_info_blocking">XEP-0191：屏蔽命令</string>
@@ -302,11 +302,11 @@
     <string name="pref_autojoin_summary">在进入或离开群聊时设置“自动加入”标志，并回应其他客户端所做的改变。</string>
     <string name="toast_message_omemo_fingerprint">OMEMO 指纹已复制到剪贴板</string>
     <string name="conference_banned">禁止您进入此群聊</string>
-    <string name="conference_members_only">此群聊仅成员进入</string>
+    <string name="conference_members_only">只有成员才能进入此群聊</string>
     <string name="conference_resource_constraint">资源限制</string>
-    <string name="conference_kicked">已从群聊中踢出了您</string>
+    <string name="conference_kicked">您已被踢出此群聊</string>
     <string name="conference_shutdown">此群聊已关闭</string>
-    <string name="conference_unknown_error">您已不在此群聊中</string>
+    <string name="conference_unknown_error">您已不在此群聊</string>
     <string name="conference_technical_problems">由于技术原因，您离开了群聊</string>
     <string name="using_account">使用账号 %s</string>
     <string name="hosted_on">托管在 %s</string>
@@ -335,10 +335,10 @@
     <string name="pref_create_backup">创建备份</string>
     <string name="pref_create_backup_summary">备份文件将存储在 %s</string>
     <string name="notification_create_backup_title">正在创建备份文件</string>
-    <string name="notification_backup_created_title">已创建备份</string>
+    <string name="notification_backup_created_title">备份已创建</string>
     <string name="notification_backup_created_subtitle">此备份文件已存储在 %s</string>
     <string name="restoring_backup">正在恢复备份</string>
-    <string name="notification_restored_backup_title">已恢复备份</string>
+    <string name="notification_restored_backup_title">备份已恢复</string>
     <string name="notification_restored_backup_subtitle">请勿忘记启用账号。</string>
     <string name="choose_file">选择文件</string>
     <string name="receiving_x_file">正在接收 %1$s（%2$d%% 已完成）</string>
@@ -359,7 +359,7 @@
     <string name="pref_show_dynamic_tags">动态标签</string>
     <string name="pref_show_dynamic_tags_summary">在联系人下方显示动态标签汇总</string>
     <string name="enable_notifications">启用通知</string>
-    <string name="no_conference_server_found">群聊服务器未找到</string>
+    <string name="no_conference_server_found">未找到群聊服务器</string>
     <string name="conference_creation_failed">无法创建群聊</string>
     <string name="account_image_description">账号头像</string>
     <string name="copy_omemo_clipboard_description">复制 OMEMO 指纹到剪贴板</string>
@@ -394,17 +394,17 @@
     <string name="remove_admin_privileges">撤销管理员权限</string>
     <string name="grant_owner_privileges">授予所有者权限</string>
     <string name="remove_owner_privileges">撤销所有者权限</string>
-    <string name="remove_from_room">从群聊中移除</string>
-    <string name="remove_from_channel">从频道中移除</string>
+    <string name="remove_from_room">从群聊移除</string>
+    <string name="remove_from_channel">从频道移除</string>
     <string name="could_not_change_affiliation">无法更改 %s 的从属关系</string>
-    <string name="ban_from_conference">从群聊中封禁</string>
-    <string name="ban_from_channel">从频道中封禁</string>
+    <string name="ban_from_conference">从群聊封禁</string>
+    <string name="ban_from_channel">从频道封禁</string>
     <string name="removing_from_public_conference">您正试图从公开频道中移除 %s。唯一的办法就是永远封禁该用户。</string>
     <string name="ban_now">立即封禁</string>
     <string name="could_not_change_role">无法更改 %s 的角色</string>
     <string name="conference_options">私人群聊配置</string>
     <string name="channel_options">公开频道配置</string>
-    <string name="members_only">私人，仅成员进入</string>
+    <string name="members_only">私人，仅成员</string>
     <string name="non_anonymous">公开用户的 XMPP 地址</string>
     <string name="moderated">开启频道发言审核</string>
     <string name="you_are_not_participating">您未参与</string>
@@ -428,7 +428,7 @@
     <string name="pdf_document">PDF 文档</string>
     <string name="apk">Android 应用</string>
     <string name="vcard">联系人</string>
-    <string name="avatar_has_been_published">已发布头像！</string>
+    <string name="avatar_has_been_published">头像已发布！</string>
     <string name="sending_x_file">正在发送 %s</string>
     <string name="offering_x_file">正在提供 %s</string>
     <string name="hide_offline">隐藏离线</string>
@@ -472,7 +472,7 @@
     <string name="download_failed_invalid_file">下载失败：文件无效</string>
     <string name="account_status_tor_unavailable">Tor 网络不可用</string>
     <string name="account_status_bind_failure">绑定失败</string>
-    <string name="account_status_host_unknown">服务器不能为域名做出响应</string>
+    <string name="account_status_host_unknown">域名未响应</string>
     <string name="server_info_broken">损坏</string>
     <string name="pref_presence_settings">在线状态</string>
     <string name="pref_away_when_screen_off">设备锁定时离开</string>
@@ -486,17 +486,17 @@
     <string name="hostname_example">xmpp.example.com</string>
     <string name="action_add_account_with_certificate">用证书登录</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
-    <string name="mam_prefs">存档首选项</string>
-    <string name="server_side_mam_prefs">服务器端存档首选项</string>
-    <string name="fetching_mam_prefs">获取存档首选项中。请稍候…</string>
-    <string name="unable_to_fetch_mam_prefs">无法获取存档首选项</string>
+    <string name="mam_prefs">归档首选项</string>
+    <string name="server_side_mam_prefs">服务器端归档首选项</string>
+    <string name="fetching_mam_prefs">正在获取归档首选项。请稍候…</string>
+    <string name="unable_to_fetch_mam_prefs">无法获取归档首选项</string>
     <string name="captcha_required">需要验证码</string>
     <string name="captcha_hint">请按上图输入文本</string>
     <string name="certificate_chain_is_not_trusted">未受信任的证书链</string>
     <string name="jid_does_not_match_certificate">XMPP 地址与证书不匹配</string>
     <string name="action_renew_certificate">续订证书</string>
     <string name="error_fetching_omemo_key">获取 OMEMO 密钥时出错！</string>
-    <string name="verified_omemo_key_with_certificate">已通过证书验证 OMEMO 密钥！</string>
+    <string name="verified_omemo_key_with_certificate">OMEMO 密钥已通过证书验证！</string>
     <string name="device_does_not_support_certificates">设备不支持客户端证书选择！</string>
     <string name="pref_connection_options">连接</string>
     <string name="pref_use_tor">通过 Tor 连接</string>
@@ -536,7 +536,7 @@
     <string name="this_field_is_required">必填字段</string>
     <string name="correct_message">更正消息</string>
     <string name="send_corrected_message">发送更正后的消息</string>
-    <string name="no_keys_just_confirm">您已信任此人的指纹。选择“完成”即表示您确认 %s 是此群聊的一员。</string>
+    <string name="no_keys_just_confirm">您已信任此人的指纹。选择“完成”即表示您确认 %s 是此群聊的成员。</string>
     <string name="this_account_is_disabled">您禁用了此账号</string>
     <string name="security_error_invalid_file_access">安全错误：文件访问无效！</string>
     <string name="no_application_to_share_uri">未找到可以分享 URI 的应用</string>
@@ -555,7 +555,7 @@
     <string name="presence_away">离开</string>
     <string name="presence_xa">没空</string>
     <string name="presence_dnd">忙碌</string>
-    <string name="secure_password_generated">已生成安全密码</string>
+    <string name="secure_password_generated">安全密码已生成</string>
     <string name="device_does_not_support_battery_op">您的设备不支持选择退出电池优化</string>
     <string name="registration_please_wait">注册失败：请稍后重试</string>
     <string name="registration_password_too_weak">注册失败：密码太弱</string>
@@ -575,7 +575,7 @@
     <string name="pref_theme_light">浅色</string>
     <string name="pref_theme_dark">深色</string>
     <string name="unable_to_connect_to_keychain">无法连接到 OpenKeychain</string>
-    <string name="this_device_is_no_longer_in_use">此设备已不再使用</string>
+    <string name="this_device_is_no_longer_in_use">此设备不再使用</string>
     <string name="type_pc">电脑</string>
     <string name="type_phone">手机</string>
     <string name="type_tablet">平板</string>
@@ -587,7 +587,7 @@
     <string name="contact_asks_for_presence_subscription">对方请求在线状态订阅</string>
     <string name="allow">允许</string>
     <string name="no_permission_to_access_x">没有权限访问 %s</string>
-    <string name="remote_server_not_found">远程服务器未找到</string>
+    <string name="remote_server_not_found">未找到远程服务器</string>
     <string name="remote_server_timeout">远程服务器超时</string>
     <string name="unable_to_update_account">无法更新账号</string>
     <string name="report_jid_as_spammer">举报此 XMPP 地址发送垃圾信息。</string>
@@ -597,10 +597,9 @@
     <string name="error_publish_avatar_offline">需要连接到网络才能发布头像。</string>
     <string name="show_error_message">显示出错信息</string>
     <string name="error_message">出错信息</string>
-    <string name="data_saver_enabled">省流量模式已启用</string>
-    <string name="data_saver_enabled_explained">操作系统正限制 %1$s 在后台时访问互联网。要接收新消息通知，应当在“省流量模式”开启时允许 %1$s 无限制访问。
-\n%1$s 仍将在可能的情况下努力节省数据。</string>
-    <string name="device_does_not_support_data_saver">设备不支持对 %1$s 禁用省流量模式。</string>
+    <string name="data_saver_enabled">流量节省程序已启用</string>
+    <string name="data_saver_enabled_explained">操作系统正限制 %1$s 在后台时访问互联网。要接收新消息通知，应当在“流量节省程序”开启时允许 %1$s 无限制访问。 \n在可能的情况下，%1$s 仍会尽可能节省数据。</string>
+    <string name="device_does_not_support_data_saver">设备不支持为 %1$s 禁用流量节省程序。</string>
     <string name="error_unable_to_create_temporary_file">无法创建临时文件</string>
     <string name="this_device_has_been_verified">此设备已经过验证</string>
     <string name="copy_fingerprint">复制指纹</string>
@@ -670,7 +669,7 @@
     <string name="today">今天</string>
     <string name="yesterday">昨天</string>
     <string name="pref_validate_hostname">用 DNSSEC 验证主机名</string>
-    <string name="pref_validate_hostname_summary">将包含主机名的服务器证书视为是已验证的</string>
+    <string name="pref_validate_hostname_summary">将包含已验证主机名的服务器证书视为已验证</string>
     <string name="certificate_does_not_contain_jid">证书不包含 XMPP 地址</string>
     <string name="server_info_partial">部分</string>
     <string name="attach_record_video">录制视频</string>
@@ -730,7 +729,7 @@
     <string name="copy_jabber_id">复制 XMPP 地址</string>
     <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件共享</string>
     <string name="pref_start_search">直接搜索</string>
-    <string name="pref_start_search_summary">在“新对话”屏幕上打开键盘并将光标放在搜索栏中</string>
+    <string name="pref_start_search_summary">在“新对话”屏幕上打开键盘并将光标放入搜索栏</string>
     <string name="group_chat_avatar">群聊头像</string>
     <string name="host_does_not_support_group_chat_avatars">主机不支持群聊头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改群聊头像</string>
@@ -770,7 +769,7 @@
     <string name="cancelled">已取消</string>
     <string name="already_drafting_message">您已经在起草一条消息了。</string>
     <string name="feature_not_implemented">功能未实现</string>
-    <string name="invalid_country_code">无效的国家/地区代码</string>
+    <string name="invalid_country_code">国家/地区代码无效</string>
     <string name="choose_a_country">选择国家/地区</string>
     <string name="phone_number">电话号码</string>
     <string name="verify_your_phone_number">验证您的电话号码</string>
@@ -781,8 +780,8 @@
     <string name="search_countries">搜索国家/地区</string>
     <string name="verify_x">验证 %s</string>
     <string name="we_have_sent_you_an_sms_to_x"><![CDATA[我们已向您发送短信至 <b>%s</b>。]]></string>
-    <string name="we_have_sent_you_another_sms">我们已经向您发送了另一条带有 6 位数验证码的短信。</string>
-    <string name="please_enter_pin_below">请在下方输入 6 位 PIN 码。</string>
+    <string name="we_have_sent_you_another_sms">我们已向您发送了另一条带有六位数验证码的短信。</string>
+    <string name="please_enter_pin_below">请在下方输入六位数的 PIN 码。</string>
     <string name="resend_sms">重新发送短信</string>
     <string name="resend_sms_in">重新发送短信 (%s)</string>
     <string name="wait_x">请稍候 (%s)</string>
@@ -904,7 +903,7 @@
     <string name="rtp_state_ringing">正在响铃</string>
     <string name="rtp_state_declined_or_busy">占线</string>
     <string name="rtp_state_connectivity_error">无法连接通话</string>
-    <string name="rtp_state_connectivity_lost_error">连接已中断</string>
+    <string name="rtp_state_connectivity_lost_error">连接中断</string>
     <string name="rtp_state_retracted">已取消通话</string>
     <string name="rtp_state_application_failure">应用错误</string>
     <string name="rtp_state_security_error">验证问题</string>
@@ -962,13 +961,13 @@
     <string name="invite_to_app">邀请至 Conversations</string>
     <string name="unable_to_parse_invite">无法解析邀请</string>
     <string name="server_does_not_support_easy_onboarding_invites">服务器不支持生成邀请</string>
-    <string name="no_active_accounts_support_this">没有已启用的账号支持此功能</string>
+    <string name="no_active_accounts_support_this">没有活动账号支持此功能</string>
     <string name="backup_started_message">备份已开始。一旦完成，将会收到通知。</string>
     <string name="unable_to_enable_video">无法启用视频。</string>
     <string name="plain_text_document">纯文本文档</string>
     <string name="account_registrations_are_not_supported">不支持账号注册</string>
     <string name="no_xmpp_adddress_found">未找到 XMPP 地址</string>
-    <string name="account_status_temporary_auth_failure">验证暂时失败</string>
+    <string name="account_status_temporary_auth_failure">临时身份验证失败</string>
     <string name="delete_avatar">删除头像</string>
     <string name="audio_video_disabled_tor">使用 Tor 时会禁用通话</string>
     <string name="switch_to_video">切换到视频</string>
@@ -1006,9 +1005,9 @@
     <string name="rtp_state_contact_offline">联系人不可用</string>
     <string name="no_permission_to_place_call">没有拨打电话的权限</string>
     <string name="call_integration_not_available">通话集成不可用！</string>
-    <string name="remove_bookmark_and_close">是否移除 %s 的书签并存档对话？</string>
+    <string name="remove_bookmark_and_close">是否移除 %s 的书签并归档对话？</string>
     <string name="remove_bookmark">是否移除 %s 的书签？</string>
-    <string name="delete_and_close">删除并存档对话</string>
+    <string name="delete_and_close">删除并归档对话</string>
     <string name="channel_discover_opt_in_message">频道发现使用称为 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服务。&lt;br&gt;&lt;br&gt;使用此功能会将您的 IP 地址和搜索词传输到此服务。请参阅其 &lt;a href=https://search.jabber.network/privacy&gt;隐私政策&lt;/a&gt; 以获取更多信息。</string>
     <string name="start_chat">开始对话</string>
     <string name="title_activity_share_with">分享至…</string>
@@ -1019,12 +1018,12 @@
     <string name="pref_dynamic_colors_summary">系统配色 (Material You)</string>
     <string name="title_activity_new_chat">新对话</string>
     <string name="archive_this_chat">之后删除对话</string>
-    <string name="title_undo_swipe_out_chat">对话已存档</string>
+    <string name="title_undo_swipe_out_chat">对话已归档</string>
     <string name="switch_to_chat">切换到对话</string>
-    <string name="action_archive_chat">存档对话</string>
+    <string name="action_archive_chat">归档对话</string>
     <string name="barcode_does_not_contain_fingerprints_for_this_chat">二维码不包含此对话的指纹。</string>
     <string name="welcome_header">加入对话</string>
-    <string name="corresponding_chats_closed">相应的对话已存档。</string>
+    <string name="corresponding_chats_closed">相应的对话已归档。</string>
     <string name="pref_send_crash_reports">发送崩溃报告</string>
     <string name="pref_title_security">安全</string>
     <string name="notifications">通知</string>