diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 2c05c0f851ddc25d4a0592d08f8ddcb045b4a772..e0f774972b11c357e3ce2522eb5458075075e21b 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -11,11 +11,11 @@
     <string name="action_add_phone_book">添加到通讯录</string>
     <string name="action_delete_contact">删除联系人</string>
     <string name="action_block_contact">屏蔽联系人</string>
-    <string name="action_unblock_contact">解除屏蔽联系人</string>
+    <string name="action_unblock_contact">取消屏蔽联系人</string>
     <string name="action_block_domain">屏蔽域名</string>
-    <string name="action_unblock_domain">解除屏蔽域名</string>
+    <string name="action_unblock_domain">取消屏蔽域名</string>
     <string name="action_block_participant">屏蔽参与者</string>
-    <string name="action_unblock_participant">解除屏蔽参与者</string>
+    <string name="action_unblock_participant">取消屏蔽参与者</string>
     <string name="title_activity_manage_accounts">管理账号</string>
     <string name="title_activity_settings">设置</string>
     <string name="title_activity_choose_contact">选择联系人</string>
@@ -40,14 +40,14 @@
     <string name="visitor">访客</string>
     <string name="remove_contact_text">是否从联系人列表中移除 %s？将不会移除与对方的对话。</string>
     <string name="block_contact_text">是否屏蔽 %s 向您发送消息？</string>
-    <string name="unblock_contact_text">是否解除屏蔽 %s 并允许对方向您发送消息？</string>
+    <string name="unblock_contact_text">是否取消屏蔽 %s 并允许对方向您发送消息？</string>
     <string name="block_domain_text">屏蔽来自 %s 的所有联系人？</string>
-    <string name="unblock_domain_text">解除屏蔽来自 %s 的所有联系人？</string>
+    <string name="unblock_domain_text">取消屏蔽来自 %s 的所有联系人？</string>
     <string name="contact_blocked">联系人已屏蔽</string>
     <string name="blocked">已屏蔽</string>
     <string name="register_account">在服务器上注册新账号</string>
-    <string name="change_password_on_server">在服务器上修改密码</string>
-    <string name="share_with">分享至…</string>
+    <string name="change_password_on_server">在服务器上更改密码</string>
+    <string name="share_with">分享…</string>
     <string name="invite_contact">邀请联系人</string>
     <string name="invite">邀请</string>
     <string name="contacts">联系人</string>
@@ -58,20 +58,20 @@
     <string name="edit">编辑</string>
     <string name="delete">删除</string>
     <string name="block">屏蔽</string>
-    <string name="unblock">解除屏蔽</string>
+    <string name="unblock">取消屏蔽</string>
     <string name="save">保存</string>
-    <string name="ok">完成</string>
-    <string name="crash_report_title">%1$s 已崩溃</string>
+    <string name="ok">确定</string>
+    <string name="crash_report_title">%1$s 崩溃了</string>
     <string name="crash_report_message">使用您的 XMPP 账号发送崩溃报告有助于 %1$s 的持续开发。</string>
     <string name="send_now">立即发送</string>
     <string name="send_never">不再询问</string>
     <string name="problem_connecting_to_account">无法连接到账号</string>
     <string name="problem_connecting_to_accounts">无法连接到多个账号</string>
-    <string name="touch_to_fix">点击以管理您的账号</string>
+    <string name="touch_to_fix">点按即可管理账号</string>
     <string name="attach_file">附加文件</string>
     <string name="not_in_roster">对方不在您的联系人列表中，是否添加？</string>
     <string name="add_contact">添加联系人</string>
-    <string name="send_failed">传递失败</string>
+    <string name="send_failed">发送失败</string>
     <string name="preparing_image">正在准备发送图片</string>
     <string name="preparing_images">正在准备发送图片</string>
     <string name="sharing_files_please_wait">分享文件中。请稍候…</string>
@@ -117,8 +117,8 @@
     <string name="pref_led">LED 通知</string>
     <string name="pref_led_summary">收到新消息时闪烁通知灯</string>
     <string name="pref_ringtone">铃声</string>
-    <string name="pref_notification_sound">通知铃声</string>
-    <string name="pref_notification_sound_summary">新消息的通知铃声</string>
+    <string name="pref_notification_sound">通知提示音</string>
+    <string name="pref_notification_sound_summary">新消息的通知提示音</string>
     <string name="pref_call_ringtone_summary">来电铃声</string>
     <string name="pref_notification_grace_period">静默期</string>
     <string name="pref_notification_grace_period_summary">在其他设备上检测到活动之后，通知在此期间静音。</string>
@@ -139,9 +139,9 @@
     <string name="receive_presence_updates">接收在线状态更新</string>
     <string name="ask_for_presence_updates">请求在线状态更新</string>
     <string name="attach_choose_picture">选择图片</string>
-    <string name="attach_take_picture">拍摄图片</string>
+    <string name="attach_take_picture">拍摄照片</string>
     <string name="preemptively_grant">预先同意订阅请求</string>
-    <string name="error_not_an_image_file">所选的文件不是图片</string>
+    <string name="error_not_an_image_file">所选文件不是图片</string>
     <string name="error_compressing_image">无法转换图片文件</string>
     <string name="error_file_not_found">文件未找到</string>
     <string name="error_io_exception">常规 I/O 错误。也许存储空间已用完？</string>
@@ -199,7 +199,7 @@
     <string name="server_info_roster_version">XEP-0237：花名册版本控制</string>
     <string name="server_info_stream_management">XEP-0198：流管理</string>
     <string name="server_info_external_service_discovery">XEP-0215：外部服务发现</string>
-    <string name="server_info_pep">XEP-0163：个人事件协议 (头像/OMEMO)</string>
+    <string name="server_info_pep">XEP-0163：个人事件协议（头像/OMEMO）</string>
     <string name="server_info_http_upload">XEP-0363：HTTP 文件上传</string>
     <string name="server_info_push">XEP-0357：推送</string>
     <string name="server_info_available">有效</string>
@@ -217,8 +217,8 @@
     <string name="openpgp_key_id">OpenPGP 密钥 ID</string>
     <string name="omemo_fingerprint">OMEMO 指纹</string>
     <string name="omemo_fingerprint_x509">v\\OMEMO 指纹</string>
-    <string name="omemo_fingerprint_selected_message">OMEMO 指纹 (消息来源)</string>
-    <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO 指纹 (消息来源)</string>
+    <string name="omemo_fingerprint_selected_message">OMEMO 指纹（消息来源）</string>
+    <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO 指纹（消息来源）</string>
     <string name="other_devices">其他设备</string>
     <string name="trust_omemo_fingerprints">信任 OMEMO 指纹</string>
     <string name="fetching_keys">正在获取密钥…</string>
@@ -229,8 +229,8 @@
     <string name="delete_contact">删除联系人</string>
     <string name="view_contact_details">查看联系人详情</string>
     <string name="block_contact">屏蔽联系人</string>
-    <string name="unblock_contact">解除屏蔽联系人</string>
-    <string name="create">新建</string>
+    <string name="unblock_contact">取消屏蔽联系人</string>
+    <string name="create">创建</string>
     <string name="select">选择</string>
     <string name="contact_already_exists">此联系人已存在</string>
     <string name="join">加入</string>
@@ -259,12 +259,12 @@
     <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s 和其他 %2$d 人已阅读至此</string>
     <string name="everyone_has_read_up_to_this_point">每个人都已阅读至此</string>
     <string name="publish">发布</string>
-    <string name="touch_to_choose_picture">点击头像从图库中选择图片</string>
+    <string name="touch_to_choose_picture">点按头像即可从图库选择图片</string>
     <string name="publishing">正在发布…</string>
     <string name="error_publish_avatar_server_reject">服务器拒绝了您的发布</string>
     <string name="error_publish_avatar_converting">无法转换图片</string>
     <string name="error_saving_avatar">无法将头像保存到磁盘</string>
-    <string name="or_long_press_for_default">(或长按恢复默认)</string>
+    <string name="or_long_press_for_default">（或长按恢复默认）</string>
     <string name="error_publish_avatar_no_server_support">服务器不支持发布头像</string>
     <string name="private_message">私聊</string>
     <string name="private_message_to">至 %s</string>
@@ -276,7 +276,7 @@
     <string name="skip">跳过</string>
     <string name="disable_notifications">禁用通知</string>
     <string name="enable">启用</string>
-    <string name="conference_requires_password">进入群聊需要输入密码</string>
+    <string name="conference_requires_password">进入群聊需要密码</string>
     <string name="enter_password">输入密码</string>
     <string name="request_presence_updates">请先向您的联系人请求在线状态更新。
 \n
@@ -290,13 +290,13 @@
     <string name="pref_allow_message_correction">消息更正</string>
     <string name="pref_allow_message_correction_summary">允许您的联系人发送后编辑其消息</string>
     <string name="pref_expert_options">专家设置</string>
-    <string name="pref_expert_options_summary">请谨慎设置这些</string>
+    <string name="pref_expert_options_summary">请谨慎设置</string>
     <string name="title_activity_about_x">关于 %s</string>
-    <string name="title_pref_quiet_hours">免打扰时间</string>
+    <string name="title_pref_quiet_hours">勿扰时段</string>
     <string name="title_pref_quiet_hours_start_time">开始时间</string>
     <string name="title_pref_quiet_hours_end_time">结束时间</string>
-    <string name="title_pref_enable_quiet_hours">启用免打扰时间</string>
-    <string name="pref_quiet_hours_summary">通知将在免打扰时间内静音</string>
+    <string name="title_pref_enable_quiet_hours">启用勿扰时段</string>
+    <string name="pref_quiet_hours_summary">通知将在勿扰时段内静音</string>
     <string name="pref_expert_options_other">其他</string>
     <string name="pref_autojoin">同步书签</string>
     <string name="pref_autojoin_summary">在进入或离开群聊时设置“自动加入”标志，并回应其他客户端所做的改变。</string>
@@ -306,12 +306,12 @@
     <string name="conference_resource_constraint">资源限制</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>
+    <string name="using_account">使用账号 %s</string>
+    <string name="hosted_on">托管在 %s</string>
     <string name="checking_x">正在 HTTP 主机上检查 %s</string>
-    <string name="not_connected_try_again">您未连接。稍后再试</string>
+    <string name="not_connected_try_again">您未连接，请稍后重试</string>
     <string name="check_x_filesize">检查 %s 的大小</string>
     <string name="check_x_filesize_on_host">在 %2$s 上检查 %1$s 的大小</string>
     <string name="message_options">消息选项</string>
@@ -322,14 +322,14 @@
     <string name="file_url">文件 URL</string>
     <string name="url_copied_to_clipboard">已复制 URL 到剪贴板</string>
     <string name="jabber_id_copied_to_clipboard">已复制 XMPP 地址到剪贴板</string>
-    <string name="error_message_copied_to_clipboard">已复制错误消息到剪贴板</string>
-    <string name="web_address">web 地址</string>
+    <string name="error_message_copied_to_clipboard">已复制出错信息到剪贴板</string>
+    <string name="web_address">网址</string>
     <string name="scan_qr_code">扫描二维码</string>
     <string name="show_qr_code">显示二维码</string>
     <string name="show_block_list">显示屏蔽列表</string>
     <string name="account_details">账号详情</string>
     <string name="confirm">确认</string>
-    <string name="try_again">再试一次</string>
+    <string name="try_again">重试</string>
     <string name="pref_keep_foreground_service">前台服务</string>
     <string name="pref_keep_foreground_service_summary">防止操作系统中断连接</string>
     <string name="pref_create_backup">创建备份</string>
@@ -339,14 +339,14 @@
     <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_subtitle">不要忘记启用账号。</string>
+    <string name="notification_restored_backup_subtitle">请勿忘记启用账号。</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_x_file">正在接收 %1$s (%2$d%% 已完成)</string>
+    <string name="receiving_x_file">正在接收 %1$s（%2$d%% 已完成）</string>
     <string name="download_x_file">下载 %s</string>
     <string name="delete_x_file">删除 %s</string>
     <string name="file">文件</string>
     <string name="open_x_file">打开 %s</string>
-    <string name="sending_file">正在发送 (%1$d%% 已完成)</string>
+    <string name="sending_file">正在发送（%1$d%% 已完成）</string>
     <string name="preparing_file">正在准备分享文件</string>
     <string name="x_file_offered_for_download">%s 可供下载</string>
     <string name="cancel_transmission">取消传输</string>
@@ -374,9 +374,9 @@
     <string name="fetching_history_from_server">正在从服务器获取聊天记录</string>
     <string name="no_more_history_on_server">服务器上没有更多聊天记录</string>
     <string name="updating">正在更新…</string>
-    <string name="password_changed">密码已修改！</string>
-    <string name="could_not_change_password">无法修改密码</string>
-    <string name="change_password">修改密码</string>
+    <string name="password_changed">密码已更改！</string>
+    <string name="could_not_change_password">无法更改密码</string>
+    <string name="change_password">更改密码</string>
     <string name="current_password">当前密码</string>
     <string name="new_password">新密码</string>
     <string name="password_should_not_be_empty">密码不能为空</string>
@@ -444,7 +444,7 @@
     <string name="location">位置</string>
     <string name="title_undo_swipe_out_group_chat">离开私人群聊</string>
     <string name="title_undo_swipe_out_channel">离开公开频道</string>
-    <string name="pref_dont_trust_system_cas_title">不信任系统证书颁发机构</string>
+    <string name="pref_dont_trust_system_cas_title">不信任系统 CA</string>
     <string name="pref_dont_trust_system_cas_summary">所有证书必须手动批准</string>
     <string name="pref_remove_trusted_certificates_title">移除证书</string>
     <string name="pref_remove_trusted_certificates_summary">删除手动批准的证书</string>
@@ -491,8 +491,8 @@
     <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="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>
@@ -518,37 +518,31 @@
     <string name="no_storage_permission">授予 %1$s 访问外部存储的权限</string>
     <string name="no_camera_permission">授予 %1$s 访问相机的权限</string>
     <string name="sync_with_contacts">联系人列表集成</string>
-    <string name="sync_with_contacts_long">%1$s 在您的设备上本地处理您的联系人列表，以向您显示 XMPP 上匹配联系人的名称和个人资料图片。
-\n
-\n任何联系人列表数据都不会离开您的设备！</string>
+    <string name="sync_with_contacts_long">%1$s 在您的设备上本地处理您的联系人列表，以向您显示 XMPP 上匹配联系人的名称和个人资料照片。\n\n任何联系人列表数据都不会离开您的设备！</string>
     <string name="notify_on_all_messages">通知所有消息</string>
     <string name="notify_only_when_highlighted">仅在提及时通知</string>
     <string name="notify_never">通知已禁用</string>
     <string name="notify_paused">通知已暂停</string>
     <string name="pref_picture_compression">图片压缩</string>
-    <string name="pref_picture_compression_summary">提示：无论此设置如何，使用“选择文件”会发送未压缩的图片。</string>
+    <string name="pref_picture_compression_summary">提示：使用“选择文件”始终会发送未压缩的图片。</string>
     <string name="always">始终</string>
     <string name="large_images_only">仅限大图片</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
-    <string name="battery_optimizations_enabled_explained">您的设备正在对 %1$s 使用重度电池优化，可能会导致通知延迟甚至消息丢失。
-\n建议禁用此设置。</string>
-    <string name="battery_optimizations_enabled_dialog">您的设备正在对 %1$s 使用重度电池优化，可能会导致通知延迟甚至消息丢失。
-\n
-\n现在将要求您禁用此设置。</string>
+    <string name="battery_optimizations_enabled_explained">您的设备正在对 %1$s 使用重度电池优化，可能会导致通知延迟甚至消息丢失。\n建议禁用电池优化。</string>
+    <string name="battery_optimizations_enabled_dialog">您的设备正在对 %1$s 使用重度电池优化，可能会导致通知延迟甚至消息丢失。\n\n现在将要求您禁用电池优化。</string>
     <string name="disable">禁用</string>
     <string name="selection_too_large">所选区域太大</string>
-    <string name="no_accounts">(没有启用的账号)</string>
-    <string name="this_field_is_required">此字段是必需的</string>
+    <string name="no_accounts">（没有启用的账号）</string>
+    <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="this_account_is_disabled">您已禁用了此账号</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>
-    <string name="share_uri_with">分享 URI 至…</string>
+    <string name="share_uri_with">分享 URI…</string>
     <string name="agree_and_continue">同意并继续</string>
-    <string name="magic_create_text">指导您在 conversations.im 上创建账号。
-\n当选择 conversations.im 作为提供者时，向其他 XMPP 用户提供您的完整地址，就能和对方交流。</string>
+    <string name="magic_create_text">指导您在 conversations.im 上创建账号。\n选择 conversations.im 作为提供者时，向别人提供您的完整 XMPP 地址，就能和对方交流。</string>
     <string name="your_full_jid_will_be">您的完整 XMPP 地址将是：%s</string>
     <string name="create_account">创建账号</string>
     <string name="use_own_provider">使用我自己的提供者</string>
@@ -563,7 +557,7 @@
     <string name="presence_dnd">忙碌</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_please_wait">注册失败：请稍后重试</string>
     <string name="registration_password_too_weak">注册失败：密码太弱</string>
     <string name="choose_participants">选择参与者</string>
     <string name="creating_conference">正在创建群聊…</string>
@@ -576,7 +570,7 @@
     <string name="pref_broadcast_last_activity_summary">让您的联系人知道您最后一次使用此应用的时间</string>
     <string name="pref_privacy">隐私</string>
     <string name="pref_theme_options">主题</string>
-    <string name="pref_theme_options_summary">选择主题色彩</string>
+    <string name="pref_theme_options_summary">选择调色板</string>
     <string name="pref_theme_automatic">自动</string>
     <string name="pref_theme_light">浅色</string>
     <string name="pref_theme_dark">深色</string>
@@ -585,7 +579,7 @@
     <string name="type_pc">电脑</string>
     <string name="type_phone">手机</string>
     <string name="type_tablet">平板</string>
-    <string name="type_web">Web 浏览器</string>
+    <string name="type_web">网络浏览器</string>
     <string name="type_console">控制台</string>
     <string name="payment_required">需要付款</string>
     <string name="missing_internet_permission">授予使用互联网的权限</string>
@@ -596,13 +590,13 @@
     <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>
+    <string name="report_jid_as_spammer">举报此 XMPP 地址发送垃圾信息。</string>
     <string name="pref_delete_omemo_identities">删除 OMEMO 身份</string>
     <string name="pref_delete_omemo_identities_summary">重新生成 OMEMO 密钥。您的所有联系人将必须再次验证您。仅将此作为最后的方法。</string>
-    <string name="delete_selected_keys">删除已选密钥</string>
+    <string name="delete_selected_keys">删除所选密钥</string>
     <string name="error_publish_avatar_offline">需要连接到网络才能发布头像。</string>
-    <string name="show_error_message">显示出错消息</string>
-    <string name="error_message">出错消息</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>
@@ -614,28 +608,27 @@
     <string name="verified_fingerprints">已验证的指纹</string>
     <string name="use_camera_icon_to_scan_barcode">使用相机扫描对方二维码</string>
     <string name="please_wait_for_keys_to_be_fetched">正在获取密钥，请稍候</string>
-    <string name="share_as_barcode">分享为二维码</string>
-    <string name="share_as_uri">分享为 XMPP URI</string>
-    <string name="share_as_http">分享为 HTTP 链接</string>
+    <string name="share_as_barcode">以二维码形式分享</string>
+    <string name="share_as_uri">以 XMPP URI 形式分享</string>
+    <string name="share_as_http">以 HTTP 链接形式分享</string>
     <string name="pref_blind_trust_before_verification">验证前盲目信任</string>
     <string name="pref_blind_trust_before_verification_summary">信任来自未经验证的联系人的新设备，但对于已验证的联系人，提示手动确认新设备。</string>
     <string name="blindly_trusted_omemo_keys">盲目信任的 OMEMO 密钥，表示它们可能是其他人或者某人可能冒充别人发送消息。</string>
-    <string name="not_trusted">不信任的</string>
+    <string name="not_trusted">未受信任</string>
     <string name="invalid_barcode">二维码无效</string>
-    <string name="pref_clean_cache_summary">清理缓存文件夹 (由相机应用使用)</string>
+    <string name="pref_clean_cache_summary">清理缓存文件夹（由相机使用）</string>
     <string name="pref_clean_cache">清理缓存</string>
     <string name="pref_clean_private_storage">清理私人存储空间</string>
-    <string name="pref_clean_private_storage_summary">清理保存文件的私人存储 (它们可以从服务器重新下载)</string>
+    <string name="pref_clean_private_storage_summary">清理保存文件的私人存储（可从服务器重新下载）</string>
     <string name="i_followed_this_link_from_a_trusted_source">我从可信来源收到此链接</string>
-    <string name="verifying_omemo_keys_trusted_source">单击链接后，您将验证 %1$s 的 OMEMO 密钥。只有从可信来源（只有 %2$s 可以发布此链接）收到此链接才是安全的。</string>
+    <string name="verifying_omemo_keys_trusted_source">点击链接后，您将验证 %1$s 的 OMEMO 密钥。只有从可信来源（只有 %2$s 可以发布此链接）收到此链接才是安全的。</string>
     <string name="verifying_omemo_keys_trusted_source_account">您将验证自己账号的 OMEMO 密钥。只有从可信来源（只有您可以发布此链接）收到此链接才是安全的。</string>
     <string name="continue_btn">继续</string>
     <string name="verify_omemo_keys">验证 OMEMO 密钥</string>
     <string name="show_inactive_devices">显示非活动设备</string>
     <string name="hide_inactive_devices">隐藏非活动设备</string>
     <string name="distrust_omemo_key">不再信任设备</string>
-    <string name="distrust_omemo_key_text">是否确定要移除此设备的验证？
-\n此设备及其消息将标记为“不信任的”。</string>
+    <string name="distrust_omemo_key_text">是否确定要移除此设备的验证？\n此设备及其消息将标记为“未受信任”。</string>
     <plurals name="seconds">
         <item quantity="other">%d 秒</item>
     </plurals>
@@ -655,14 +648,14 @@
         <item quantity="other">%d 个月</item>
     </plurals>
     <string name="pref_automatically_delete_messages">自动删除消息</string>
-    <string name="pref_automatically_delete_messages_description">从此设备上自动删除超过配置时限的消息。</string>
+    <string name="pref_automatically_delete_messages_description">自动删除此设备上超过配置时限的消息。</string>
     <string name="encrypting_message">正在加密消息</string>
     <string name="not_fetching_history_retention_period">由于本地保留期限设置，无法获取消息。</string>
     <string name="transcoding_video">正在压缩视频</string>
     <string name="contact_blocked_past_tense">联系人已屏蔽。</string>
     <string name="pref_notifications_from_strangers">陌生人的通知</string>
     <string name="pref_notifications_from_strangers_summary">收到陌生人的消息和来电时通知。</string>
-    <string name="received_message_from_stranger">收到了陌生人发来的消息</string>
+    <string name="received_message_from_stranger">收到了陌生人的消息</string>
     <string name="block_stranger">屏蔽陌生人</string>
     <string name="block_entire_domain">屏蔽整个域名</string>
     <string name="online_right_now">当前在线</string>
@@ -713,7 +706,7 @@
     <string name="create_shortcut">创建快捷方式</string>
     <string name="default_on">默认开启</string>
     <string name="default_off">默认关闭</string>
-    <string name="not_encrypted_for_this_device">消息未对本设备加密。</string>
+    <string name="not_encrypted_for_this_device">未对此设备加密消息。</string>
     <string name="omemo_decryption_failed">解密 OMEMO 消息失败。</string>
     <string name="undo">撤销</string>
     <string name="location_disabled">已禁用位置共享</string>
@@ -721,7 +714,7 @@
     <string name="action_unfix_from_location">取消固定位置</string>
     <string name="action_copy_location">复制位置</string>
     <string name="action_share_location">分享位置</string>
-    <string name="action_directions">方向</string>
+    <string name="action_directions">路线</string>
     <string name="title_activity_share_location">分享位置</string>
     <string name="title_activity_show_location">显示位置</string>
     <string name="share">分享</string>
@@ -733,7 +726,7 @@
     <string name="view_conversation">查看对话</string>
     <string name="pref_use_share_location_plugin">位置共享插件</string>
     <string name="pref_use_share_location_plugin_summary">使用位置共享插件代替内置地图</string>
-    <string name="copy_link">复制 web 地址</string>
+    <string name="copy_link">复制网址</string>
     <string name="copy_jabber_id">复制 XMPP 地址</string>
     <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件共享</string>
     <string name="pref_start_search">直接搜索</string>
@@ -760,11 +753,11 @@
     <string name="ongoing_calls_channel_name">正在进行的通话</string>
     <string name="missed_calls_channel_name">未接来电</string>
     <string name="silent_messages_channel_name">静音消息</string>
-    <string name="silent_messages_channel_description">此通知组用于显示不应触发任何声音的通知。例如，在另一台设备上处于活动状态时（静默期）。</string>
-    <string name="delivery_failed_channel_name">传递失败</string>
+    <string name="silent_messages_channel_description">（静默期）此通知组用于显示不应触发任何声音的通知。例如，在另一台设备上处于活动状态时。</string>
+    <string name="delivery_failed_channel_name">发送失败</string>
     <string name="pref_message_notification_settings">消息通知设置</string>
     <string name="pref_incoming_call_notification_settings">来电通知设置</string>
-    <string name="pref_more_notification_settings_summary">重要性、声音、振动</string>
+    <string name="pref_more_notification_settings_summary">重要程度、声音、振动</string>
     <string name="video_compression_channel_name">视频压缩</string>
     <string name="view_media">查看媒体</string>
     <string name="group_chat_members">参与者</string>
@@ -772,8 +765,8 @@
     <string name="security_violation_not_attaching_file">由于违反安全规定，文件已删除。</string>
     <string name="pref_video_compression">视频质量</string>
     <string name="pref_video_compression_summary">质量越低，文件越小</string>
-    <string name="video_360p">中 (360p)</string>
-    <string name="video_720p">高 (720p)</string>
+    <string name="video_360p">360p（中）</string>
+    <string name="video_720p">720p（高）</string>
     <string name="cancelled">已取消</string>
     <string name="already_drafting_message">您已经在起草一条消息了。</string>
     <string name="feature_not_implemented">功能未实现</string>
@@ -796,7 +789,7 @@
     <string name="back">返回</string>
     <string name="possible_pin">已自动从剪贴板粘贴可能的 PIN 码。</string>
     <string name="please_enter_pin">请输入您的 6 位 PIN 码。</string>
-    <string name="abort_registration_procedure">是否确定要中止注册程序？</string>
+    <string name="abort_registration_procedure">是否确定要中止注册过程？</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="verifying">正在验证…</string>
@@ -808,9 +801,9 @@
     <string name="unable_to_connect_to_server">无法连接到服务器。</string>
     <string name="unable_to_establish_secure_connection">无法建立安全连接。</string>
     <string name="unable_to_find_server">无法找到服务器。</string>
-    <string name="something_went_wrong_processing_your_request">处理请求时出了问题。</string>
+    <string name="something_went_wrong_processing_your_request">处理您的请求时出了点问题。</string>
     <string name="invalid_user_input">用户输入无效</string>
-    <string name="temporarily_unavailable">暂时不可用。稍后再试。</string>
+    <string name="temporarily_unavailable">暂时不可用，请稍后重试。</string>
     <string name="no_network_connection">无网络连接。</string>
     <string name="try_again_in_x">请在 %s 后重试</string>
     <string name="rate_limited">您的速率受到限制</string>
@@ -828,13 +821,13 @@
     <string name="no_market_app_installed">未安装应用商店。</string>
     <string name="group_chat_will_make_your_jabber_id_public">此频道将公开您的 XMPP 地址</string>
     <string name="ebook">电子书</string>
-    <string name="video_original">原始 (未压缩)</string>
-    <string name="open_with">打开为…</string>
-    <string name="set_profile_picture">Conversations 个人资料图片</string>
+    <string name="video_original">未压缩（原始）</string>
+    <string name="open_with">打开…</string>
+    <string name="set_profile_picture">Conversations 个人资料照片</string>
     <string name="choose_account">选择账号</string>
     <string name="restore_backup">恢复备份</string>
     <string name="restore">恢复</string>
-    <string name="enter_password_to_restore">输入 %s 账号的密码以恢复备份。</string>
+    <string name="enter_password_to_restore">请输入 %s 的密码以恢复备份。</string>
     <string name="restore_warning">请勿使用恢复备份功能尝试克隆（同时运行）安装。恢复备份仅适用于迁移或您丢失原始设备的情况。</string>
     <string name="unable_to_restore_backup">无法恢复备份。</string>
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
@@ -854,12 +847,12 @@
     <string name="joined_an_existing_channel">您已加入现有的频道</string>
     <string name="unable_to_set_channel_configuration">无法保存频道配置</string>
     <string name="allow_participants_to_edit_subject">允许参与者（非访客）编辑话题</string>
-    <string name="allow_participants_to_invite_others">允许任何参与者邀请其他用户</string>
+    <string name="allow_participants_to_invite_others">允许任何参与者邀请别人</string>
     <string name="anyone_can_edit_subject">参与者（非访客）可以编辑话题。</string>
     <string name="owners_can_edit_subject">所有者可以编辑话题。</string>
     <string name="admins_can_edit_subject">管理员可以编辑话题。</string>
-    <string name="owners_can_invite_others">所有者可以邀请其他用户。</string>
-    <string name="anyone_can_invite_others">任何参与者可以邀请其他用户。</string>
+    <string name="owners_can_invite_others">所有者可以邀请别人。</string>
+    <string name="anyone_can_invite_others">任何参与者可以邀请别人。</string>
     <string name="jabber_ids_are_visible_to_admins">用户的 XMPP 地址仅管理员可见。</string>
     <string name="jabber_ids_are_visible_to_anyone">用户的 XMPP 地址对任何人可见。</string>
     <string name="no_users_hint_channel">此公开频道无参与者。邀请联系人或使用分享按钮分发频道的 XMPP 地址。</string>
@@ -897,13 +890,13 @@
     <string name="please_enable_an_account">请启用账号</string>
     <string name="make_call">进行通话</string>
     <string name="rtp_state_incoming_call">来电</string>
-    <string name="rtp_state_incoming_video_call">视频来电</string>
+    <string name="rtp_state_incoming_video_call">视频通话来电</string>
     <string name="rtp_state_content_add_video">切换到视频通话？</string>
     <string name="rtp_state_content_add">添加额外轨道？</string>
     <string name="rtp_state_connecting">正在连接</string>
     <string name="rtp_state_connected">已连接</string>
     <string name="rtp_state_reconnecting">正在重新连接</string>
-    <string name="rtp_state_accepting_call">正在接受通话</string>
+    <string name="rtp_state_accepting_call">正在接听通话</string>
     <string name="rtp_state_ending_call">正在结束通话</string>
     <string name="answer_call">接听</string>
     <string name="dismiss_call">拒接</string>
@@ -912,7 +905,7 @@
     <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_retracted">已撤回通话</string>
+    <string name="rtp_state_retracted">已取消通话</string>
     <string name="rtp_state_application_failure">应用错误</string>
     <string name="rtp_state_security_error">验证问题</string>
     <string name="hang_up">挂断</string>
@@ -961,9 +954,9 @@
         <item quantity="other">查看 %1$d 位参与者</item>
     </plurals>
     <plurals name="some_messages_could_not_be_delivered">
-        <item quantity="other">无法传递一些消息</item>
+        <item quantity="other">一些消息发送失败</item>
     </plurals>
-    <string name="failed_deliveries">传递失败</string>
+    <string name="failed_deliveries">发送失败</string>
     <string name="more_options">更多选项</string>
     <string name="no_application_found">未找到应用程序</string>
     <string name="invite_to_app">邀请至 Conversations</string>
@@ -977,17 +970,17 @@
     <string name="no_xmpp_adddress_found">未找到 XMPP 地址</string>
     <string name="account_status_temporary_auth_failure">验证暂时失败</string>
     <string name="delete_avatar">删除头像</string>
-    <string name="audio_video_disabled_tor">使用 Tor 时，已禁用通话</string>
+    <string name="audio_video_disabled_tor">使用 Tor 时会禁用通话</string>
     <string name="switch_to_video">切换到视频</string>
     <string name="reject_switch_to_video">拒绝视频切换请求</string>
     <string name="pref_up_push_account_title">XMPP 账号</string>
     <string name="pref_up_push_server_title">推送服务器</string>
-    <string name="no_account_deactivated">无 (已停用)</string>
+    <string name="no_account_deactivated">无（已停用）</string>
     <string name="unified_push_distributor">UnifiedPush 分发程序</string>
     <string name="pref_up_push_account_summary">接收推送消息的账号。</string>
     <string name="decline">拒绝</string>
-    <string name="incoming_call_duration_timestamp">来电 (%s) · %s</string>
-    <string name="outgoing_call_duration_timestamp">去电 (%s) · %s</string>
+    <string name="incoming_call_duration_timestamp">来电（%s）· %s</string>
+    <string name="outgoing_call_duration_timestamp">去电（%s）· %s</string>
     <string name="outgoing_call_timestamp">去电 · %s</string>
     <string name="could_not_delete_account_from_server">无法从服务器删除账号</string>
     <string name="group_chats">群聊</string>
@@ -997,33 +990,33 @@
     <string name="outdated_backup_file_format">您正尝试导入过时的备份文件格式</string>
     <string name="audiobook">有声读物</string>
     <string name="reconnect_on_other_host">在其他主机上重新连接</string>
-    <string name="this_account_is_logged_out">您已登出此账号</string>
+    <string name="this_account_is_logged_out">您登出了此账号</string>
     <string name="log_in">登入</string>
     <string name="hide_notification">隐藏通知</string>
     <string name="contact_uses_unverified_keys">您的联系人使用未经验证的设备。扫描对方二维码进行验证并阻止主动式中间人攻击。</string>
     <string name="log_out">登出</string>
     <string name="account_state_logged_out">已登出</string>
     <string name="unverified_devices">您正在使用未经验证的设备。扫描您其他设备的二维码进行验证并阻止主动式中间人攻击。</string>
-    <string name="report_spam_and_block">报告垃圾消息并屏蔽垃圾消息发送者</string>
-    <string name="report_spam">报告垃圾消息</string>
+    <string name="report_spam_and_block">举报垃圾信息并屏蔽垃圾信息发送者</string>
+    <string name="report_spam">举报垃圾信息</string>
     <string name="welcome_header_quicksy">欢迎使用 Quicksy！</string>
     <string name="quicksy_wants_your_consent">Quicksy 请求您同意使用您的数据</string>
     <string name="privacy_policy">隐私政策</string>
     <string name="contact_list_integration_not_available">联系人列表集成不可用</string>
     <string name="rtp_state_contact_offline">联系人不可用</string>
     <string name="no_permission_to_place_call">没有拨打电话的权限</string>
-    <string name="call_integration_not_available">呼叫集成不可用！</string>
+    <string name="call_integration_not_available">通话集成不可用！</string>
     <string name="remove_bookmark_and_close">是否移除 %s 的书签并存档对话？</string>
     <string name="remove_bookmark">是否移除 %s 的书签？</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>
-    <string name="pref_use_colorful_bubbles_summary">为已发送和已接收消息使用不同的背景颜色</string>
+    <string name="title_activity_share_with">分享…</string>
+    <string name="pref_use_colorful_bubbles_summary">为发送和接收的消息使用不同的背景颜色</string>
     <string name="no_certificate_selected">未选择客户端证书！</string>
-    <string name="pref_use_colorful_bubbles">彩色消息气泡</string>
-    <string name="pref_dynamic_colors">动态色彩</string>
-    <string name="pref_dynamic_colors_summary">系统色彩 (Material You)</string>
+    <string name="pref_use_colorful_bubbles">多彩消息气泡</string>
+    <string name="pref_dynamic_colors">动态配色</string>
+    <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>
@@ -1042,20 +1035,20 @@
     <string name="pref_light_dark_mode">浅色/深色模式</string>
     <string name="pref_allow_screenshots">允许截屏</string>
     <string name="pref_category_e2ee">端到端加密</string>
-    <string name="pref_title_trust_system_ca_store">证书颁发机构</string>
+    <string name="pref_title_trust_system_ca_store">证书授权服务</string>
     <string name="pref_title_trust_system_ca_store_summary">信任系统的 CA 证书</string>
     <string name="detect_mim">需要通道绑定</string>
     <string name="detect_mim_summary">通道绑定可以检测某些中间人攻击</string>
     <string name="pref_category_server_connection">服务器连接</string>
-    <string name="pref_summary_appearance">主题、色彩、截屏、输入</string>
+    <string name="pref_summary_appearance">主题、配色、截屏、输入</string>
     <string name="pref_category_sending">发送</string>
     <string name="pref_category_receiving">接收</string>
     <string name="pref_connection_summary">主机名和端口、Tor</string>
     <string name="pref_connection_summary_w_cd">主机名和端口、Tor、频道发现</string>
     <string name="pref_keyboard_options">键盘</string>
     <string name="pref_category_application">应用程序</string>
-    <string name="pref_category_interaction">交互</string>
-    <string name="pref_category_on_this_device">在设备上</string>
+    <string name="pref_category_interaction">互动</string>
+    <string name="pref_category_on_this_device">设备上</string>
     <string name="pref_title_interface">界面</string>
     <string name="pref_category_operating_system">操作系统</string>
     <string name="pref_summary_security">端到端加密、验证前盲目信任、中间人攻击检测</string>
@@ -1077,7 +1070,7 @@
     <string name="pref_backup_summary">创建一次性备份、计划定期备份</string>
     <string name="allow_private_messages">允许频道内私信</string>
     <string name="edit_nick">编辑昵称</string>
-    <string name="your_avatar_tap_to_select_new_avatar">您的头像。点击从图库中选择新头像。</string>
+    <string name="your_avatar_tap_to_select_new_avatar">您的头像。点按即可从图库选择新头像。</string>
     <string name="could_not_disable_video">无法禁用视频。</string>
     <string name="delete_pgp_key">删除 OpenPGP 密钥</string>
     <string name="edit_name_and_topic">编辑名称和话题</string>
@@ -1088,10 +1081,10 @@
     <string name="call_is_using_speaker">正在使用扬声器进行通话。</string>
     <string name="call_is_using_bluetooth">正在使用蓝牙进行通话。</string>
     <string name="flip_camera">翻转摄像头</string>
-    <string name="video_is_disabled_tap_to_enable">视频已禁用，点击以启用。</string>
-    <string name="video_is_enabled_tap_to_disable">视频已启用，点击以禁用。</string>
-    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">正在使用扬声器进行通话，点击切换到听筒。</string>
-    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">正在使用听筒进行通话，点击切换到扬声器。</string>
+    <string name="video_is_disabled_tap_to_enable">已禁用视频，点按即可启用。</string>
+    <string name="video_is_enabled_tap_to_disable">已启用视频，点按即可禁用。</string>
+    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">正在使用扬声器进行通话，点按即可切换到听筒。</string>
+    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">正在使用听筒进行通话，点按即可切换到扬声器。</string>
     <string name="server_info_login_mechanism">登录机制</string>
     <string name="server_info_bind2">XEP-0386：绑定 2</string>
     <string name="server_info_sasl2">XEP-0388：可扩展 SASL 配置文件</string>
@@ -1105,5 +1098,9 @@
     <string name="pref_chat_bubbles_summary">背景颜色、字体大小、头像</string>
     <string name="pref_chat_bubbles">消息气泡</string>
     <string name="pref_title_bubbles">消息气泡</string>
-    <string name="pref_show_avatars_summary">除了群聊，您的消息还有一对一聊天也会显示头像。</string>
+    <string name="pref_show_avatars_summary">在群聊和一对一聊天中为您的消息显示头像。</string>
+    <string name="pref_call_integration">通话集成</string>
+    <string name="custom_notifications">自定义通知</string>
+    <string name="custom_notifications_enable">是否为此对话启用自定义通知（重要程度、声音、振动）设置？</string>
+    <string name="pref_call_integration_summary">此应用的通话与常规通话交互，例如另一个通话开始时结束一个通话。</string>
 </resources>
\ No newline at end of file