diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a941bcf33..d131fbd28 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -2,13 +2,13 @@
 <resources>
     <string name="action_settings">设置</string>
     <string name="action_add">新对话</string>
-    <string name="action_accounts">管理账户</string>
-    <string name="action_account">管理账户</string>
+    <string name="action_accounts">管理账号</string>
+    <string name="action_account">管理账号</string>
     <string name="action_end_conversation">关闭 Conversation</string>
     <string name="action_contact_details">联系人详情</string>
     <string name="action_muc_details">群聊详情</string>
     <string name="channel_details">频道详情</string>
-    <string name="action_add_account">添加账户</string>
+    <string name="action_add_account">添加账号</string>
     <string name="action_edit_contact">编辑名称</string>
     <string name="action_add_phone_book">添加到通讯录</string>
     <string name="action_delete_contact">从通讯录中删除</string>
@@ -18,23 +18,23 @@
     <string name="action_unblock_domain">解封域名</string>
     <string name="action_block_participant">封禁成员</string>
     <string name="action_unblock_participant">解封成员</string>
-    <string name="title_activity_manage_accounts">管理账户</string>
+    <string name="title_activity_manage_accounts">管理账号</string>
     <string name="title_activity_settings">设置</string>
     <string name="title_activity_sharewith">通过 Conversations 分享</string>
     <string name="title_activity_start_conversation">开始对话</string>
     <string name="title_activity_choose_contact">选择联系人</string>
     <string name="title_activity_choose_contacts">选择联系人</string>
-    <string name="title_activity_share_via_account">通过账户分享</string>
+    <string name="title_activity_share_via_account">通过账号分享</string>
     <string name="title_activity_block_list">封禁列表</string>
-    <string name="just_now">刚刚</string>
-    <string name="minute_ago">1分钟前</string>
-    <string name="minutes_ago">%d分钟前</string>
+    <string name="just_now">刚才</string>
+    <string name="minute_ago">1 分钟前</string>
+    <string name="minutes_ago">%d 分钟前</string>
     <plurals name="x_unread_conversations">
-        <item quantity="other">%d 未读会话</item>
+        <item quantity="other">%d 个未读会话</item>
     </plurals>
     <string name="sending">发送中…</string>
-    <string name="message_decrypting">正在解密信息。请稍候……</string>
-    <string name="pgp_message">OpenPGP 加密的信息</string>
+    <string name="message_decrypting">正在解密消息。请稍候……</string>
+    <string name="pgp_message">OpenPGP 加密的消息</string>
     <string name="nick_in_use">用户名已存在</string>
     <string name="invalid_muc_nick">无效的用户名</string>
     <string name="admin">管理员</string>
@@ -42,15 +42,15 @@
     <string name="moderator">群主</string>
     <string name="participant">成员</string>
     <string name="visitor">访客</string>
-    <string name="remove_contact_text">将%s从XMPP联系人中移除？与该联系人的会话消息不会清除。</string>
-    <string name="block_contact_text">您想封禁%s吗？</string>
-    <string name="unblock_contact_text">您想解封%s吗？</string>
+    <string name="remove_contact_text">你要将%s从 XMPP 联系人中移除吗？与该联系人的会话消息不会清除。</string>
+    <string name="block_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="contact_blocked">联系人已封禁</string>
     <string name="blocked">已封禁</string>
-    <string name="remove_bookmark_text">从书签中移除%s？相关会话消息不会被清除。</string>
-    <string name="register_account">在服务器上注册新账户</string>
+    <string name="remove_bookmark_text">你想从书签中移除%s吗？相关会话消息不会被清除。</string>
+    <string name="register_account">在服务器上注册新账号</string>
     <string name="change_password_on_server">在服务器上修改密码</string>
     <string name="share_with">分享…</string>
     <string name="start_conversation">开始聊天</string>
@@ -68,12 +68,12 @@
     <string name="save">保存</string>
     <string name="ok">完成</string>
     <string name="crash_report_title">%1$s已崩溃</string>
-    <string name="crash_report_message">用你的 XMPP 账户发送堆栈跟踪来帮助持续开发 %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="problem_connecting_to_account">账号无法连接</string>
+    <string name="problem_connecting_to_accounts">无法连接到多个账号</string>
+    <string name="touch_to_fix">点击管理账号</string>
     <string name="attach_file">发送文件</string>
     <string name="not_in_roster">该联系人不在您的通讯录中，需要添加吗 ?</string>
     <string name="add_contact">添加联系人</string>
@@ -83,33 +83,39 @@
     <string name="sharing_files_please_wait">正在分享文件，请稍候…</string>
     <string name="action_clear_history">清除历史记录</string>
     <string name="clear_conversation_history">清除聊天记录</string>
-    <string name="clear_histor_msg">您确定要删除此聊天中的所有消息吗？\n\n<b>警告：</b>这不会删除存储在其他设备或服务器上的那些消息的副本。</string>
+    <string name="clear_histor_msg">你想删除此聊天中的所有消息吗？
+\n
+\n<b>警告：</b>这不会删除存储在其他设备或服务器上的那些消息的副本。</string>
     <string name="delete_file_dialog">删除文件</string>
-    <string name="delete_file_dialog_msg">您确定要删除此文件吗？
+    <string name="delete_file_dialog_msg">你确定要删除此文件吗？
 \n
 \n<b>警告：</b>这不会删除存储在其他设备或服务器上的此文件的副本。 </string>
     <string name="also_end_conversation">之后关闭此聊天</string>
     <string name="choose_presence">选择设备</string>
-    <string name="send_unencrypted_message">发送未加密的信息</string>
-    <string name="send_message">发送信息</string>
-    <string name="send_message_to_x">发信息给%s</string>
-    <string name="send_omemo_message">发送OMEMO加密信息</string>
-    <string name="send_omemo_x509_message">发送v\\OMEMO加密信息</string>
-    <string name="send_pgp_message">发送OpenPGP加密信息</string>
+    <string name="send_unencrypted_message">发送未加密的消息</string>
+    <string name="send_message">发送消息</string>
+    <string name="send_message_to_x">发消息给%s</string>
+    <string name="send_omemo_message">发送 OMEMO 加密消息</string>
+    <string name="send_omemo_x509_message">发送 v\\OMEMO 加密消息</string>
+    <string name="send_pgp_message">发送 OpenPGP 加密消息</string>
     <string name="your_nick_has_been_changed">昵称已被使用</string>
     <string name="send_unencrypted">不加密发送</string>
-    <string name="decryption_failed">解密失败，可能是私钥不正确。</string>
+    <string name="decryption_failed">解密失败，也许你没有正确的私钥。</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long"><![CDATA[%1$s使用 <b>OpenKeychain</b>来加密和解密消息并管理你的公钥。<br><br>它在 GPLv3+ 许可证下授权并可在 F-Droid 和 Google Play 上获得。<br><br><small>(请之后重启 %1$s)</small>]]></string>
+    <string name="openkeychain_required_long">%1$s使用 &lt;b&gt;OpenKeychain&lt;/b&gt;来加密和解密消息并管理你的公钥。&lt;br&gt;&lt;br&gt;它在 GPLv3+ 许可证下授权并可在 F-Droid 和 Google Play 上获得。&lt;br&gt;&lt;br&gt;&lt;small&gt;（请稍后重新启动%1$s。）&lt;/small&gt;</string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
-    <string name="openkeychain_not_installed">请安装OpenKeychain以解密</string>
+    <string name="openkeychain_not_installed">请安装 OpenKeychain 以解密</string>
     <string name="offering">提供…</string>
     <string name="waiting">等待…</string>
-    <string name="no_pgp_key">无OpenPGP密钥</string>
-    <string name="contact_has_no_pgp_key">因您的联系人未公布其公钥，无法加密您的信息。\n\n<small>请通知您的联系人设置OpenPGP。</small></string>
-    <string name="no_pgp_keys">无OpenPGP密钥</string>
-    <string name="contacts_have_no_pgp_keys">因您的联系人未公布其公钥，无法加密您的信息。\n\n<small>请通知您的联系人设置OpenPGP。</small></string>
+    <string name="no_pgp_key">无 OpenPGP 密钥</string>
+    <string name="contact_has_no_pgp_key">由于你的联系人未公布其公钥，无法加密你的消息。
+\n
+\n<small>请通知你的联系人设置 OpenPGP。</small></string>
+    <string name="no_pgp_keys">无 OpenPGP 密钥</string>
+    <string name="contacts_have_no_pgp_keys">由于你的联系人未公布其公钥，无法加密你的消息。
+\n
+\n<small>请通知你的联系人设置 OpenPGP。</small></string>
     <string name="pref_general">常规</string>
     <string name="pref_accept_files">接收文件</string>
     <string name="pref_accept_files_summary">自动接收小于此大小的文件…</string>
@@ -124,37 +130,37 @@
     <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>
+    <string name="pref_notification_grace_period_summary">在你的其他设备上检测到活动之后，通知在此时间段内将被静音。</string>
     <string name="pref_advanced_options">高级</string>
     <string name="pref_never_send_crash">从不发送崩溃报告</string>
-    <string name="pref_never_send_crash_summary">通过发送堆栈跟踪，您可以为开发提供帮助</string>
+    <string name="pref_never_send_crash_summary">通过发送堆栈跟踪，你可以为开发提供帮助</string>
     <string name="pref_confirm_messages">确认消息</string>
     <string name="pref_confirm_messages_summary">让对方知道你收到并阅读了他们的消息</string>
     <string name="pref_prevent_screenshots">防止截屏</string>
     <string name="pref_prevent_screenshots_summary">在应用切换中隐藏应用程序内容并阻止截图</string>
     <string name="pref_ui_options">用户界面</string>
-    <string name="openpgp_error">OpenKeychain报告一个错误。</string>
+    <string name="openpgp_error">OpenKeychain 出现了一个错误。</string>
     <string name="bad_key_for_encryption">错误的加密密钥。</string>
     <string name="accept">接受</string>
     <string name="error">出现了一个错误</string>
     <string name="recording_error">错误</string>
-    <string name="your_account">你的账户</string>
+    <string name="your_account">你的账号</string>
     <string name="send_presence_updates">发送在线状态更新</string>
     <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="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>
+    <string name="error_io_exception">常规 I/O 错误。也许你的存储空间不够了？</string>
     <string name="error_security_exception_during_image_copy">你用来选择图片的应用没有提供读取文件的足够权限。
 \n
 \n<small>使用不同的文件管理器来选择图片</small>.</string>
     <string name="error_security_exception">你用来共享此文件的应用程序没有提供足够的权限。</string>
     <string name="account_status_unknown">未知</string>
-    <string name="account_status_disabled">暂时不可用</string>
+    <string name="account_status_disabled">暂时禁用</string>
     <string name="account_status_online">在线</string>
     <string name="account_status_connecting">连接中\u2026</string>
     <string name="account_status_offline">离线</string>
@@ -162,12 +168,12 @@
     <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_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>
-    <string name="account_status_tls_error_domain">域名不可验证</string>
+    <string name="account_status_tls_error">TLS 协商失败</string>
+    <string name="account_status_tls_error_domain">域名无法验证</string>
     <string name="account_status_policy_violation">违反政策</string>
     <string name="account_status_incompatible_server">服务器不兼容</string>
     <string name="account_status_incompatible_client">不兼容的客户端</string>
@@ -177,23 +183,24 @@
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
-    <string name="mgmt_account_delete">删除账户</string>
-    <string name="mgmt_account_disable">暂时不可用</string>
+    <string name="mgmt_account_delete">删除账号</string>
+    <string name="mgmt_account_disable">暂时禁用</string>
     <string name="mgmt_account_publish_avatar">发布头像</string>
-    <string name="mgmt_account_publish_pgp">发布OpenPGP公钥</string>
-    <string name="unpublish_pgp">移除OpenPGP公钥</string>
-    <string name="unpublish_pgp_message">您确定要从在线状态中移除OpenPGP公钥吗？\n您的联系人将无法再向您发送 OpenPGP 加密信息。</string>
+    <string name="mgmt_account_publish_pgp">发布 OpenPGP 公钥</string>
+    <string name="unpublish_pgp">移除 OpenPGP 公钥</string>
+    <string name="unpublish_pgp_message">你确定要从在线状态中移除 OpenPGP 公钥吗？
+\n你的联系人将无法再向你发送 OpenPGP 加密消息。</string>
     <string name="openpgp_has_been_published">OpenPGP 公钥已发布。</string>
-    <string name="mgmt_account_enable">启用账户</string>
-    <string name="mgmt_account_delete_confirm_text">你确定删除账户吗？如果您删除账户，您的所有聊天记录将会丢失</string>
+    <string name="mgmt_account_enable">启用账号</string>
+    <string name="mgmt_account_delete_confirm_text">你确定删除账号吗？如果你删除账号，你的所有聊天记录将会丢失</string>
     <string name="attach_record_voice">录制音频</string>
-    <string name="account_settings_jabber_id">XMPP地址</string>
-    <string name="block_jabber_id">封禁XMPP地址</string>
+    <string name="account_settings_jabber_id">XMPP 地址</string>
+    <string name="block_jabber_id">封禁 XMPP 地址</string>
     <string name="account_settings_example_jabber_id">username@example.com</string>
     <string name="password">密码</string>
-    <string name="invalid_jid">这不是有效的XMPP地址</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_carbon_messages">XEP-0280：消息抄送</string>
@@ -209,21 +216,21 @@
     <string name="server_info_unavailable">无效</string>
     <string name="missing_public_keys">缺少公钥</string>
     <string name="last_seen_now">最后上线于刚才</string>
-    <string name="last_seen_min">最后上线于一分钟前</string>
-    <string name="last_seen_mins">最后上线于%d分钟前</string>
-    <string name="last_seen_hour">最后上线于一小时前</string>
-    <string name="last_seen_hours">最后上线于%d小时前</string>
-    <string name="last_seen_day">最后上线于一天前</string>
-    <string name="last_seen_days">最后上线于%d天前</string>
-    <string name="install_openkeychain">加密信息。请安装OpenKeychain以解密。</string>
-    <string name="openpgp_messages_found">发现新OpenPGP加密信息</string>
-    <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="last_seen_min">最后上线于 1 分钟前</string>
+    <string name="last_seen_mins">最后上线于 %d 分钟前</string>
+    <string name="last_seen_hour">最后上线于 1 小时前</string>
+    <string name="last_seen_hours">最后上线于 %d 小时前</string>
+    <string name="last_seen_day">最后上线于 1 天前</string>
+    <string name="last_seen_days">最后上线于 %d 天前</string>
+    <string name="install_openkeychain">加密消息。请安装 OpenKeychain 以解密。</string>
+    <string name="openpgp_messages_found">发现新 OpenPGP 加密消息</string>
+    <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="other_devices">其他设备</string>
-    <string name="trust_omemo_fingerprints">信任的OMEMO指纹</string>
+    <string name="trust_omemo_fingerprints">信任的 OMEMO 指纹</string>
     <string name="fetching_keys">获取密钥中…</string>
     <string name="done">完成</string>
     <string name="decrypt">解密</string>
@@ -243,8 +250,12 @@
     <string name="delete_bookmark">删除书签</string>
     <string name="destroy_room">解散群聊</string>
     <string name="destroy_channel">解散频道</string>
-    <string name="destroy_room_dialog">您确定要解散此群聊吗？\n\n<b>警告：</b>此群聊将在服务器上完全删除。</string>
-    <string name="destroy_channel_dialog">您确定要解散此公共频道吗？\n\n<b>警告：</b>该频道将在服务器上完全删除。</string>
+    <string name="destroy_room_dialog">你确定要解散此群聊吗？
+\n
+\n<b>警告：</b>此群聊将在服务器上完全删除。</string>
+    <string name="destroy_channel_dialog">你确定要解散此公共频道吗？
+\n
+\n<b>警告：</b>该频道将在服务器上完全删除。</string>
     <string name="could_not_destroy_room">无法解散群聊</string>
     <string name="could_not_destroy_channel">无法解散频道</string>
     <string name="action_edit_subject">编辑群聊主题</string>
@@ -260,16 +271,16 @@
     <string name="publish">发布</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_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>
     <string name="send_private_message_to">与%s私聊</string>
     <string name="connect">连接</string>
-    <string name="account_already_exists">该账户已存在</string>
+    <string name="account_already_exists">该账号已存在</string>
     <string name="next">下一步</string>
     <string name="server_info_session_established">会话已建立</string>
     <string name="skip">跳过</string>
@@ -277,15 +288,17 @@
     <string name="enable">启用</string>
     <string name="conference_requires_password">需要密码才能进入该群聊</string>
     <string name="enter_password">输入密码</string>
-    <string name="request_presence_updates">请先向您的联系人请求在线状态更新。
+    <string name="request_presence_updates">请先向你的联系人请求在线状态更新。
 \n
-\n<small>这将被用来判断您的联系人正在使用的聊天应用</small>。</string>
-    <string name="request_now">现在请求</string>
+\n<small>这将被用来判断你的联系人正在使用的聊天应用</small>。</string>
+    <string name="request_now">立即请求</string>
     <string name="ignore">忽略</string>
-    <string name="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线状态的情况下发送将会出现未知问题。\n\n<small>前往联系人详情以验证您订阅的在线状态。</small></string>
+    <string name="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线状态的情况下发送将会出现未知问题。
+\n
+\n<small>前往联系人详情以验证你订阅的在线状态。</small></string>
     <string name="pref_security_settings">安全</string>
     <string name="pref_allow_message_correction">允许更正消息</string>
-    <string name="pref_allow_message_correction_summary">允许对方发送后编辑信息</string>
+    <string name="pref_allow_message_correction_summary">允许对方发送后编辑消息</string>
     <string name="pref_expert_options">高级设置</string>
     <string name="pref_expert_options_summary">请谨慎使用</string>
     <string name="title_activity_about_x">关于%s</string>
@@ -297,34 +310,34 @@
     <string name="pref_expert_options_other">其他</string>
     <string name="pref_autojoin">同步书签</string>
     <string name="pref_autojoin_summary">加入或离开多用户聊天时设置 “autojoin\" 标志，并回应其他客户端所做更改。</string>
-    <string name="toast_message_omemo_fingerprint">OMEMO指纹已拷贝到剪贴板</string>
+    <string name="toast_message_omemo_fingerprint">OMEMO 指纹已复制到剪贴板</string>
     <string name="conference_banned">您被此群聊封禁</string>
     <string name="conference_members_only">这个群聊只允许成员聊天</string>
     <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_technical_problems">你出于技术原因离开了群聊</string>
-    <string name="using_account">使用账户%s</string>
+    <string name="conference_technical_problems">你由于技术原因离开了群聊</string>
+    <string name="using_account">使用账号%s</string>
     <string name="hosted_on">托管于%s</string>
-    <string name="checking_x">正在HTTP服务器中检查%s</string>
+    <string name="checking_x">正在 HTTP 服务器中检查%s</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>
     <string name="quote">引用</string>
     <string name="paste_as_quote">作为引用粘贴</string>
-    <string name="copy_original_url">复制原始URL</string>
+    <string name="copy_original_url">复制原始 URL</string>
     <string name="send_again">重新发送</string>
-    <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="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="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="account_details">账号详情</string>
     <string name="confirm">确认</string>
     <string name="try_again">重试</string>
     <string name="pref_keep_foreground_service">前台服务</string>
@@ -336,9 +349,9 @@
     <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>
@@ -358,11 +371,11 @@
     <string name="enable_notifications">启用通知</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>
-    <string name="regenerate_omemo_key">重新生成OMEMO密钥</string>
+    <string name="account_image_description">账号头像</string>
+    <string name="copy_omemo_clipboard_description">复制 OMEMO 指纹到剪贴板</string>
+    <string name="regenerate_omemo_key">重新生成 OMEMO 密钥</string>
     <string name="clear_other_devices">清除设备</string>
-    <string name="clear_other_devices_desc">清除所有其他设备的OMEMO通告？下次设备连接时将重新通告，但可能收不到你发送的消息。</string>
+    <string name="clear_other_devices_desc">清除所有其他设备的 OMEMO 通告？下次设备连接时将重新通告，但可能收不到你发送的消息。</string>
     <string name="error_no_keys_to_trust_server_error">此联系人没有可用的密钥。
 \n无法从服务器获取新密钥。也许你的联系人所在服务器发生问题了？</string>
     <string name="error_no_keys_to_trust_presence">没有可以用于这个账户的密钥。\n请确保你有相互的在线状态的订阅。</string>
@@ -376,8 +389,8 @@
     <string name="current_password">当前密码</string>
     <string name="new_password">新密码</string>
     <string name="password_should_not_be_empty">密码不能为空</string>
-    <string name="enable_all_accounts">启用所有账户</string>
-    <string name="disable_all_accounts">禁用所有账户</string>
+    <string name="enable_all_accounts">启用所有账号</string>
+    <string name="disable_all_accounts">禁用所有账号</string>
     <string name="perform_action_with">选择一个操作</string>
     <string name="no_affiliation">没有从属关系</string>
     <string name="no_role">离线</string>
@@ -395,15 +408,15 @@
     <string name="could_not_change_affiliation">不能修改%s的从属关系</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="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="non_anonymous">使XMPP地址对所有人可见</string>
+    <string name="non_anonymous">使 XMPP 地址对所有人可见</string>
     <string name="moderated">使频道受到管理</string>
-    <string name="you_are_not_participating">您尚未参与</string>
+    <string name="you_are_not_participating">你未参与</string>
     <string name="modified_conference_options">群聊设置修改成功！</string>
     <string name="could_not_modify_conference_options">无法更改群聊设置</string>
     <string name="never">从不</string>
@@ -413,7 +426,7 @@
     <string name="mark_as_read">标记为已读</string>
     <string name="pref_input_options">输入</string>
     <string name="pref_enter_is_send">点击回车发送</string>
-    <string name="pref_enter_is_send_summary">使用Enter键发送消息。即使禁用此选项，也可以使用Ctrl+Enter发送消息。</string>
+    <string name="pref_enter_is_send_summary">使用 Enter 键发送消息。即使禁用此选项，也可以使用 Ctrl+Enter 发送消息。</string>
     <string name="pref_display_enter_key">显示回车键</string>
     <string name="pref_display_enter_key_summary">将表情键改为回车键</string>
     <string name="audio">音频</string>
@@ -421,7 +434,7 @@
     <string name="image">图片</string>
     <string name="vector_graphic">矢量图</string>
     <string name="multimedia_file">多媒体文件</string>
-    <string name="pdf_document">PDF文档</string>
+    <string name="pdf_document">PDF 文档</string>
     <string name="apk">Android App</string>
     <string name="vcard">联系人</string>
     <string name="avatar_has_been_published">头像已经发布！</string>
@@ -441,7 +454,7 @@
     <string name="title_undo_swipe_out_conversation">聊天已关闭</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">不信任系统CA</string>
+    <string name="pref_dont_trust_system_cas_title">不信任系统证书</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>
@@ -450,9 +463,9 @@
     <string name="dialog_manage_certs_positivebutton">删除已选</string>
     <string name="dialog_manage_certs_negativebutton">取消</string>
     <plurals name="toast_delete_certificates">
-        <item quantity="other">%d个证书已被删除</item>
+        <item quantity="other">%d 个证书已被删除</item>
     </plurals>
-    <string name="pref_quick_action_summary">以快捷操作替代发送按钮</string>
+    <string name="pref_quick_action_summary">以快捷操作替代“发送”按钮</string>
     <string name="pref_quick_action">快捷操作</string>
     <string name="none">无</string>
     <string name="recently_used">刚用过的</string>
@@ -468,7 +481,7 @@
     <string name="download_failed_could_not_connect">下载失败：无法连接到服务器</string>
     <string name="download_failed_could_not_write_file">下载失败：不能写入文件</string>
     <string name="download_failed_invalid_file">下载失败：无效文件</string>
-    <string name="account_status_tor_unavailable">Tor网络不可用</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="server_info_broken">损坏</string>
@@ -480,7 +493,7 @@
     <string name="pref_treat_vibrate_as_silent">将振动看作静音</string>
     <string name="pref_treat_vibrate_as_dnd_summary">设备振动时显示为忙碌</string>
     <string name="pref_show_connection_options">高级连接设置</string>
-    <string name="pref_show_connection_options_summary">注册账户时显示主机名和端口</string>
+    <string name="pref_show_connection_options_summary">注册账号时显示主机名和端口</string>
     <string name="hostname_example">xmpp.example.com</string>
     <string name="action_add_account_with_certificate">用证书登录</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
@@ -491,22 +504,22 @@
     <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="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="error_fetching_omemo_key">获取 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>
-    <string name="pref_use_tor_summary">所有连接使用Tor网络传输，需要Orbot</string>
+    <string name="pref_use_tor">通过 Tor 连接</string>
+    <string name="pref_use_tor_summary">所有连接使用 Tor 网络传输，需要 Orbot</string>
     <string name="account_settings_hostname">服务器名</string>
     <string name="account_settings_port">端口</string>
-    <string name="hostname_or_onion">服务器或者.onion地址</string>
+    <string name="hostname_or_onion">服务器或者 .onion 地址</string>
     <string name="not_a_valid_port">该端口号无效</string>
     <string name="not_valid_hostname">该主机名无效</string>
-    <string name="connected_accounts">已连接%2$d个中的%1$d个账户</string>
+    <string name="connected_accounts">已连接 %2$d 个中的 %1$d 个账号</string>
     <plurals name="x_messages">
-        <item quantity="other">%d条消息</item>
+        <item quantity="other">%d 条消息</item>
     </plurals>
     <string name="load_more_messages">加载更多消息</string>
     <string name="shared_file_with_x">文件已分享给%s</string>
@@ -517,11 +530,11 @@
     <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\n%1$s只会读取你的通讯录并在本地进行匹配，不会将信息上传到你的服务器。</string>
-    <string name="notify_on_all_messages">为所有信息显示通知</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">图片压缩</string>
     <string name="pref_picture_compression_summary">提示：使用“选择文件”发送原图。这将忽略此设置。</string>
     <string name="always">总是</string>
     <string name="large_images_only">仅大图片</string>
@@ -532,26 +545,26 @@
 \n你将被请求禁用这些优化。</string>
     <string name="disable">禁用</string>
     <string name="selection_too_large">选择区域过大</string>
-    <string name="no_accounts">（没有启用的账户）</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="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">未找到可以分享此链接的应用</string>
     <string name="share_uri_with">分享链接……</string>
     <string name="agree_and_continue">同意并继续</string>
-    <string name="magic_create_text">此向导将为您在conversations.im 上创建一个账户。
-\n您的联系人可以通过您的XMPP完整地址与您聊天。</string>
-    <string name="your_full_jid_will_be">您的XMPP完整地址将是：%s</string>
-    <string name="create_account">创建账户</string>
+    <string name="magic_create_text">此向导将为你在 conversations.im 上创建一个账号。
+\n你的联系人可以通过你的完整 XMPP 地址与你聊天。</string>
+    <string name="your_full_jid_will_be">你的完整 XMPP 地址将是：%s</string>
+    <string name="create_account">创建账号</string>
     <string name="use_own_provider">使用我自己的服务器</string>
-    <string name="pick_your_username">输入您的用户名</string>
+    <string name="pick_your_username">输入你的用户名</string>
     <string name="pref_manually_change_presence">手动更改在线状态</string>
-    <string name="pref_manually_change_presence_summary">编辑状态信息时设置您是否有空。</string>
+    <string name="pref_manually_change_presence_summary">在编辑状态信息时设置你的空闲时间。</string>
     <string name="status_message">状态信息</string>
-    <string name="presence_chat">有空聊天</string>
+    <string name="presence_chat">随时可聊</string>
     <string name="presence_online">在线</string>
     <string name="presence_away">离开</string>
     <string name="presence_xa">不在</string>
@@ -568,7 +581,7 @@
     <string name="gp_medium">中</string>
     <string name="gp_long">长</string>
     <string name="pref_broadcast_last_activity">广播使用应用的时间</string>
-    <string name="pref_broadcast_last_activity_summary">让你的联系人知道你使用Conversations的时间</string>
+    <string name="pref_broadcast_last_activity_summary">让你的联系人知道你使用 Conversations 的时间</string>
     <string name="pref_privacy">隐私</string>
     <string name="pref_theme_options">主题</string>
     <string name="pref_theme_options_summary">选择主题色彩</string>
@@ -577,7 +590,7 @@
     <string name="pref_theme_dark">灰暗</string>
     <string name="pref_use_green_background">绿色背景</string>
     <string name="pref_use_green_background_summary">接收到的消息使用绿色背景</string>
-    <string name="unable_to_connect_to_keychain">无法连接到OpenKeychain</string>
+    <string name="unable_to_connect_to_keychain">无法连接到 OpenKeychain</string>
     <string name="this_device_is_no_longer_in_use">不再使用此设备</string>
     <string name="type_pc">电脑</string>
     <string name="type_phone">手机</string>
@@ -592,13 +605,13 @@
     <string name="no_permission_to_access_x">无权访问%s</string>
     <string name="remote_server_not_found">找不到远程服务器</string>
     <string name="remote_server_timeout">远程服务器超时</string>
-    <string name="unable_to_update_account">无法更新账户</string>
+    <string name="unable_to_update_account">无法更新账号</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="pref_delete_omemo_identities">删除 OMEMO 身份</string>
+    <string name="pref_delete_omemo_identities_summary">重新生成 OMEMO 密钥。所有联系人都需要再次认证。请将此作为最后的办法。</string>
     <string name="delete_selected_keys">删除选择的密钥</string>
     <string name="error_publish_avatar_offline">你需要连接才能发布头像。</string>
-    <string name="show_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>
@@ -612,8 +625,8 @@
     <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_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>
@@ -622,33 +635,34 @@
     <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_account">您将验证您自己账户的 OMEMO 密钥。只有当您从可信的来源跟踪此链接时，这才是安全的。“可信”指的是此链接只可能是你在来源中发布的。</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="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>
+        <item quantity="other">%d 秒</item>
     </plurals>
     <plurals name="minutes">
-        <item quantity="other">%d分钟</item>
+        <item quantity="other">%d 分钟</item>
     </plurals>
     <plurals name="hours">
-        <item quantity="other">%d小时</item>
+        <item quantity="other">%d 小时</item>
     </plurals>
     <plurals name="days">
-        <item quantity="other">%d天</item>
+        <item quantity="other">%d 天</item>
     </plurals>
     <plurals name="weeks">
-        <item quantity="other">%d周</item>
+        <item quantity="other">%d 周</item>
     </plurals>
     <plurals name="months">
-        <item quantity="other">%d个月</item>
+        <item quantity="other">%d 个月</item>
     </plurals>
     <string name="pref_automatically_delete_messages">自动删除消息</string>
     <string name="pref_automatically_delete_messages_description">自动从此设备上删除超过配置时间段的消息。</string>
@@ -659,13 +673,13 @@
     <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>
     <string name="retry_decryption">重试解密</string>
     <string name="session_failure">会话失败</string>
-    <string name="sasl_downgrade">已降级的SASL机制</string>
+    <string name="sasl_downgrade">已降级的 SASL 机制</string>
     <string name="account_status_regis_web">服务器要求在网站上注册</string>
     <string name="open_website">打开网站</string>
     <string name="application_found_to_open_website">没有可以打开网站的应用</string>
@@ -673,22 +687,22 @@
     <string name="pref_headsup_notifications_summary">显示顶部通知</string>
     <string name="today">今天</string>
     <string name="yesterday">昨天</string>
-    <string name="pref_validate_hostname">通过DNSSEC验证主机名</string>
+    <string name="pref_validate_hostname">通过 DNSSEC 验证主机名</string>
     <string name="pref_validate_hostname_summary">包含主机名的服务器证书被认为是已验证的</string>
-    <string name="certificate_does_not_contain_jid">证书不包含XMPP地址</string>
+    <string name="certificate_does_not_contain_jid">证书不包含 XMPP 地址</string>
     <string name="server_info_partial">一部分</string>
     <string name="attach_record_video">录制视频</string>
-    <string name="copy_to_clipboard">复制</string>
+    <string name="copy_to_clipboard">复制到剪贴板</string>
     <string name="message_copied_to_clipboard">消息已被复制</string>
     <string name="message">消息</string>
     <string name="private_messages_are_disabled">禁止私信</string>
     <string name="huawei_protected_apps">受保护的应用</string>
-    <string name="huawei_protected_apps_summary">为了在屏幕关闭时也可收到消息提醒，您需要将Conversations加入受保护的应用列表。</string>
+    <string name="huawei_protected_apps_summary">为了在屏幕关闭时也可收到消息提醒，你需要将 Conversations 加入受保护的应用列表。</string>
     <string name="mtm_accept_cert">接受未知的证书？</string>
     <string name="mtm_trust_anchor">服务器证书未由已知证书机构签发。</string>
     <string name="mtm_accept_servername">接受不匹配的服务器名称？</string>
     <string name="mtm_hostname_mismatch">由于“%s”，服务器无法验证。证书仅对此有效：</string>
-    <string name="mtm_connect_anyway">您仍希望连接吗？</string>
+    <string name="mtm_connect_anyway">你仍要连接吗？</string>
     <string name="mtm_cert_details">证书详情:</string>
     <string name="once">仅一次</string>
     <string name="qr_code_scanner_needs_access_to_camera">二维码扫描器需要摄像头权限</string>
@@ -701,13 +715,14 @@
     <string name="error_trustkey_device_list">无法获取设备列表</string>
     <string name="error_trustkey_bundle">无法获取密钥</string>
     <string name="error_trustkey_hint_mutual">提示：某些情况下，可以将对方加入联系人列表，以解决此问题。</string>
-    <string name="disable_encryption_message">确认要禁用此会话的OMEMO加密吗？\n这会允许您的服务器管理员阅读你们的消息，但这可能是和使用过时客户端的人会话的唯一方式。</string>
+    <string name="disable_encryption_message">你确定要禁用此会话的 OMEMO 加密吗？
+\n这将允许服务器管理员阅读你的消息，但这可能是与使用过时客户端的用户进行交流的唯一方法。</string>
     <string name="disable_now">立即禁用</string>
     <string name="draft">草稿：</string>
-    <string name="pref_omemo_setting">OMEMO加密</string>
-    <string name="pref_omemo_setting_summary_always">OMEMO将始终用于一对一和私人群组聊天。</string>
-    <string name="pref_omemo_setting_summary_default_on">OMEMO将默认用于新对话。</string>
-    <string name="pref_omemo_setting_summary_default_off">OMEMO将明确地被用于新对话。</string>
+    <string name="pref_omemo_setting">OMEMO 加密</string>
+    <string name="pref_omemo_setting_summary_always">OMEMO 将始终用于一对一和私人群组聊天。</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO 将默认用于新对话。</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO 将明确地被用于新对话。</string>
     <string name="create_shortcut">创建快捷方式</string>
     <string name="pref_font_size">字体大小</string>
     <string name="pref_font_size_summary">应用内使用的相对字体大小。</string>
@@ -717,7 +732,7 @@
     <string name="medium">中</string>
     <string name="large">大</string>
     <string name="not_encrypted_for_this_device">消息未对本设备加密。</string>
-    <string name="omemo_decryption_failed">解密OMEMO消息失败。</string>
+    <string name="omemo_decryption_failed">解密 OMEMO 消息失败。</string>
     <string name="undo">撤销</string>
     <string name="location_disabled">位置分享已停用</string>
     <string name="action_fix_to_location">固定位置</string>
@@ -732,13 +747,13 @@
     <string name="please_wait">请等待…</string>
     <string name="no_microphone_permission">授权 %1$s 访问麦克风</string>
     <string name="search_messages">搜索消息</string>
-    <string name="gif">GIF动图</string>
+    <string name="gif">GIF</string>
     <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_jabber_id">复制XMPP地址</string>
-    <string name="p1_s3_filetransfer">用于S3的HTTP文件共享</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>
     <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索栏中</string>
     <string name="group_chat_avatar">群聊头像</string>
@@ -755,15 +770,15 @@
     <string name="foreground_service_channel_description">这个通知类别用于展示一条表明 %1$s 正在运行的永久通知。</string>
     <string name="notification_group_status_information">状态信息</string>
     <string name="error_channel_name">连接问题</string>
-    <string name="error_channel_description">此通知类别用于显示账户连接问题通知。</string>
+    <string name="error_channel_description">此通知类别用于显示账号连接问题通知。</string>
     <string name="notification_group_messages">消息</string>
     <string name="notification_group_calls">通话</string>
     <string name="messages_channel_name">消息</string>
     <string name="incoming_calls_channel_name">来电</string>
     <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="silent_messages_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>
@@ -783,89 +798,89 @@
     <string name="invalid_country_code">无效国家代码</string>
     <string name="choose_a_country">选择国家</string>
     <string name="phone_number">手机号</string>
-    <string name="verify_your_phone_number">验证手机号</string>
-    <string name="enter_country_code_and_phone_number">Quicksy将发送验证码短信（运营商可能收费）。请输入国家代码和手机号：</string>
-    <string name="we_will_be_verifying"><![CDATA[我们将验证<br/><br/><b>%s</b><br/><br/>。电话号码正确吗？]]></string>
-    <string name="not_a_valid_phone_number">%s不是有效的电话号码。</string>
-    <string name="please_enter_your_phone_number">请输入手机号。</string>
+    <string name="verify_your_phone_number">验证你的手机号</string>
+    <string name="enter_country_code_and_phone_number">Quicksy 将发送短信（运营商可能收费）验证你的电话号码。请输入你的国家代码和手机号：</string>
+    <string name="we_will_be_verifying">我们将验证这个电话号码<br/><br/><b>%s</b><br/><br/>，这样可以吗？或者你想编辑这个号码？</string>
+    <string name="not_a_valid_phone_number">%s 不是有效的电话号码。</string>
+    <string name="please_enter_your_phone_number">请输入你的手机号。</string>
     <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_an_sms_to_x">我们已向你发送短信 <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="resend_sms">重新发送短信</string>
-    <string name="resend_sms_in">重发短信（%s）</string>
-    <string name="wait_x">请稍候（%s）</string>
+    <string name="resend_sms_in">重发短信 (%s)</string>
+    <string name="wait_x">请稍候 (%s)</string>
     <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="possible_pin">自动从剪贴板粘贴了可能是 PIN 码的数据。</string>
+    <string name="please_enter_pin">请输入你的 6 位数 PIN 码。</string>
+    <string name="abort_registration_procedure">你确定要取消注册程序吗？</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="verifying">正在验证…</string>
     <string name="requesting_sms">正请求短信…</string>
-    <string name="incorrect_pin">验证码错误。</string>
-    <string name="pin_expired">我们发给你的PIN码已失效。</string>
+    <string name="incorrect_pin">你输入的 PIN 码有误。</string>
+    <string name="pin_expired">我们发给你的 PIN 码已过期。</string>
     <string name="unknown_api_error_network">未知网络错误。</string>
     <string name="unknown_api_error_response">未知服务器响应。</string>
     <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="no_network_connection">无网络连接.</string>
-    <string name="try_again_in_x">请在%s后重试</string>
+    <string name="try_again_in_x">请在 %s 后重试</string>
     <string name="rate_limited">你被限制速率</string>
     <string name="too_many_attempts">尝试次数过多</string>
     <string name="the_app_is_out_of_date">您正在使用此应用程序的过时版本。</string>
     <string name="update">更新</string>
-    <string name="logged_in_with_another_device">此号码已在其他设备上登录。</string>
-    <string name="enter_your_name_instructions">请输入您的姓名。这样，对方就能知道您是谁。</string>
-    <string name="your_name">您的姓名</string>
-    <string name="enter_your_name">输入姓名</string>
-    <string name="no_name_set_instructions">点击编辑按钮以编辑用户名。</string>
+    <string name="logged_in_with_another_device">此电话号码目前已在其他设备上登录。</string>
+    <string name="enter_your_name_instructions">请输入你的名字，以便让通讯录中没有你的人知道你是谁。</string>
+    <string name="your_name">你的名字</string>
+    <string name="enter_your_name">输入你的名字</string>
+    <string name="no_name_set_instructions">使用编辑按钮设置你的名字。</string>
     <string name="reject_request">拒绝请求</string>
-    <string name="install_orbot">安装Orbot</string>
-    <string name="start_orbot">启动Orbot</string>
+    <string name="install_orbot">安装 Orbot</string>
+    <string name="start_orbot">启动 Orbot</string>
     <string name="no_market_app_installed">未安装应用商店。</string>
-    <string name="group_chat_will_make_your_jabber_id_public">此频道将公开你的XMPP地址</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="choose_account">选择账户</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="restore_warning">请勿使用恢复备份功能来尝试克隆安装的应用程序（同时运行）。恢复备份功能仅用于迁移或丢失原始设备的情况。</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>
     <string name="backup_channel_name">备份与恢复</string>
-    <string name="enter_jabber_id">输入XMPP地址</string>
+    <string name="enter_jabber_id">输入 XMPP 地址</string>
     <string name="create_group_chat">创建群聊</string>
     <string name="join_public_channel">加入公开频道</string>
     <string name="create_private_group_chat">创建私密群聊</string>
     <string name="create_public_channel">创建公开频道</string>
     <string name="create_dialog_channel_name">频道名称</string>
-    <string name="xmpp_address">XMPP地址</string>
+    <string name="xmpp_address">XMPP 地址</string>
     <string name="please_enter_name">请提供频道名</string>
-    <string name="please_enter_xmpp_address">请提供XMPP地址</string>
-    <string name="this_is_an_xmpp_address">这是一个XMPP地址。请提供一个名称。</string>
+    <string name="please_enter_xmpp_address">请提供 XMPP 地址</string>
+    <string name="this_is_an_xmpp_address">这是一个 XMPP 地址。请提供一个名称。</string>
     <string name="creating_channel">创建公开频道…</string>
     <string name="channel_already_exists">频道已存在</string>
     <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_edit_subject">允许任何人编辑话题</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="jabber_ids_are_visible_to_admins">XMPP地址对管理员可见。</string>
-    <string name="jabber_ids_are_visible_to_anyone">XMPP 地址对所有人可见。</string>
-    <string name="no_users_hint_channel">此公开频道无成员。邀请成员或使用分享按钮分享地址。</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="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>
     <string name="no_users_hint_group_chat">此私密群聊无成员。</string>
     <string name="manage_permission">管理权限</string>
     <string name="search_participants">搜索成员</string>
@@ -874,9 +889,9 @@
     <string name="discover_channels">发现频道</string>
     <string name="search_channels">搜索频道</string>
     <string name="channel_discovery_opt_in_title">可能侵犯隐私！</string>
-    <string name="i_already_have_an_account">我已有账户</string>
-    <string name="add_existing_account">添加已有账户</string>
-    <string name="register_new_account">注册新账户</string>
+    <string name="i_already_have_an_account">我已有账号</string>
+    <string name="add_existing_account">添加已有账号</string>
+    <string name="register_new_account">注册新账号</string>
     <string name="this_looks_like_a_domain">这好像是一个域名地址</string>
     <string name="add_anway">仍然添加</string>
     <string name="this_looks_like_channel">这好像是一个频道地址</string>
@@ -885,19 +900,19 @@
     <string name="event">事件</string>
     <string name="open_backup">打开备份</string>
     <string name="not_a_backup_file">选择的文件不是备份文件</string>
-    <string name="account_already_setup">账户已设置</string>
-    <string name="please_enter_password">请输入此账户的密码</string>
+    <string name="account_already_setup">账号已设置</string>
+    <string name="please_enter_password">请输入此账号的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="open_join_dialog">加入公开频道…</string>
-    <string name="sharing_application_not_grant_permission">分享程序没有访问文件的权限。</string>
+    <string name="sharing_application_not_grant_permission">共享应用程序未授予访问此文件的权限。</string>
     <string name="group_chats_and_channels"><![CDATA[群聊与频道]]> </string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
-    <string name="pref_channel_discovery_summary">大多数用户应该选择“jabber.network”以从整个XMPP生态系统中获得更好的建议。</string>
+    <string name="pref_channel_discovery_summary">大多数用户应该选择“jabber.network”以从整个 XMPP 生态系统中获得更好的建议。</string>
     <string name="pref_channel_discovery">频道发现方法</string>
     <string name="backup">备份</string>
     <string name="category_about">关于</string>
-    <string name="please_enable_an_account">请启用一个账户</string>
+    <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>
@@ -923,7 +938,7 @@
     <string name="ongoing_video_call">正在进行的视频通话</string>
     <string name="reconnecting_call">重连通话</string>
     <string name="reconnecting_video_call">重连视频通话</string>
-    <string name="disable_tor_to_make_call">禁用Tor以拨打电话</string>
+    <string name="disable_tor_to_make_call">禁用 Tor 以拨打电话</string>
     <string name="incoming_call">来电</string>
     <string name="missed_call_timestamp">错过的通话 · %s</string>
     <string name="outgoing_call">去电</string>
@@ -947,22 +962,22 @@
     <string name="could_not_switch_camera">无法切换摄像头</string>
     <string name="add_to_favorites">置顶</string>
     <string name="remove_from_favorites">取消置顶</string>
-    <string name="gpx_track">GPX轨迹</string>
+    <string name="gpx_track">GPX 轨迹</string>
     <string name="could_not_correct_message">无法更正消息</string>
     <string name="search_all_conversations">所有会话</string>
     <string name="search_this_conversation">该会话</string>
     <string name="your_avatar">你的头像</string>
     <string name="avatar_for_x">%s的头像</string>
-    <string name="encrypted_with_omemo">用OMEMO加密</string>
-    <string name="encrypted_with_openpgp">用OpenPGP加密</string>
+    <string name="encrypted_with_omemo">用 OMEMO 加密</string>
+    <string name="encrypted_with_openpgp">用 OpenPGP 加密</string>
     <string name="not_encrypted">未加密</string>
     <string name="exit">退出</string>
     <string name="record_voice_mail">语音邮件录音</string>
     <string name="play_audio">播放音频</string>
     <string name="pause_audio">暂停音频播放</string>
-    <string name="add_contact_or_create_or_join_group_chat">添加联系人、创建或加入群组会话，或发现频道</string>
+    <string name="add_contact_or_create_or_join_group_chat">添加联系人、创建或加入群聊，或发现频道</string>
     <plurals name="view_users">
-        <item quantity="other">查看%1$d成员</item>
+        <item quantity="other">查看 %1$d 位成员</item>
     </plurals>
     <plurals name="some_messages_could_not_be_delivered">
         <item quantity="other">一些消息无法发送</item>
@@ -973,33 +988,33 @@
     <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="account_registrations_are_not_supported">不支持注册账号</string>
     <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="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_account_title">XMPP 账号</string>
     <string name="pref_up_push_server_title">推送服务器</string>
     <string name="no_account_deactivated">无（未激活）</string>
     <string name="unified_push_distributor">UnifiedPush 分发程序</string>
-    <string name="pref_up_push_account_summary">将通过该账户接收推送消息。</string>
+    <string name="pref_up_push_account_summary">将通过该账号接收推送消息。</string>
     <string name="pref_up_push_server_summary">用户选择的推送服务器，通过 XMPP 将推送消息传递到你的设备。</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="outgoing_call_timestamp">去电 · %s</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="could_not_delete_account_from_server">无法从服务器删除账户</string>
+    <string name="could_not_delete_account_from_server">无法从服务器删除账号</string>
     <string name="group_chats">群聊</string>
     <string name="save_as_group_chat">另存为群聊</string>
     <string name="search_group_chats">搜索群聊</string>
-    <string name="delete_from_server">从服务器删除账户</string>
+    <string name="delete_from_server">从服务器删除账号</string>
     <string name="restore_warning_continued">不要尝试恢复你尚未自行创建的备份！</string>
     <string name="outdated_backup_file_format">你正尝试导入过时的备份文件格式</string>
 </resources>
\ No newline at end of file