Merge branch 'trz/rebase' into trz/rename

1 files changed, 151 insertions, 41 deletions

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 32bfa38a..4f3c79ff 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -9,7 +9,7 @@
   <string name="action_secure">安全对话</string>
   <string name="action_add_account">添加账号</string>
   <string name="action_edit_contact">编辑姓名</string>
-  <string name="action_add_phone_book">添加到手机通讯录</string>
+  <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>
@@ -28,7 +28,8 @@
   <string name="minutes_ago">%d分钟前</string>
   <string name="unread_conversations">未读会话</string>
   <string name="sending">正在发送…</string>
-  <string name="encrypted_message">解密信息中. 请稍候…</string>
+  <string name="message_decrypting">解密信息中. 请稍候…</string>
+  <string name="pgp_message">OpenPGP 加密的信息</string>
   <string name="nick_in_use">该名称已存在</string>
   <string name="admin">管理员</string>
   <string name="owner">所有者</string>
@@ -74,47 +75,48 @@
   <string name="clear_conversation_history">清除会话记录</string>
   <string name="clear_histor_msg">删除该会话中所有信息？\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息。</string>
   <string name="delete_messages">删除消息</string>
-  <string name="also_end_conversation">之后结束该会话</string>
+  <string name="also_end_conversation">结束此会话以后</string>
   <string name="choose_presence">添加在线用户至联系人</string>
-  <string name="send_plain_text_message">发送纯文本信息</string>
+  <string name="send_unencrypted_message">发送未加密的信息</string>
   <string name="send_otr_message">发送 OTR 加密信息</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="openkeychain_required">OpenKeychain</string>
-  <string name="openkeychain_required_long">会话运用了第三方app，名为 <b>OpenKeychain</b> 用来加密、解密信息以及管理您的密钥。\n\nOpenKeychain 遵循 GPLv3 并且可以在 F-Droid 和 Google Play 上获取。\n\n<small>(之后请重启 conversations)</small></string>
+  <string name="openkeychain_required_long">Conversations 使用了第三方app <b>OpenKeychain</b> 来加密、解密信息并管理您的密钥。\n\nOpenKeychain 遵循 GPLv3 并且可以在 F-Droid 和 Google Play 上获取。\n\n<small>（之后请重启 Conversations）</small></string>
   <string name="restart">重启</string>
   <string name="install">安装</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="contact_has_no_pgp_key">Conversations 无法加密信息，因为联系人未提供他/她的公钥。\n\n<small>请通知联系人设置 OpenPGP。</small></string>
   <string name="no_pgp_keys">未找到 OpenPGP 密钥</string>
   <string name="contacts_have_no_pgp_keys">因您的联系人未公布公钥，Conversations未能成功加密您的信息.\n\n<small>请通知联系人设置OpenPGP.</small></string>
-  <string name="encrypted_message_received"><i>加密信息已接收。点击解密并查看。</i></string>
+  <string name="encrypted_message_received"><i>接收到加密消息。轻触以解密。</i></string>
   <string name="pref_general">常规</string>
   <string name="pref_xmpp_resource">XMPP 资源</string>
   <string name="pref_xmpp_resource_summary">客户端标识名称</string>
   <string name="pref_accept_files">接收文件</string>
-  <string name="pref_accept_files_size_summary">自动接收小于 … 的文件</string>
-  <string name="pref_notification_settings">通知设置</string>
+  <string name="pref_accept_files_summary">自动接收小于 … 的文件</string>
+  <string name="pref_notification_settings">通知</string>
   <string name="pref_notifications">通知</string>
   <string name="pref_notifications_summary">收到新消息时通知</string>
   <string name="pref_vibrate">震动</string>
   <string name="pref_vibrate_summary">收到新消息时震动</string>
   <string name="pref_sound">声音</string>
   <string name="pref_sound_summary">收到新消息时的铃声</string>
-  <string name="pref_conference_notifications">讨论组通知</string>
-  <string name="pref_conference_notifications_summary">当有新的消息时总是通知而不是亮屏时才通知</string>
   <string name="pref_notification_grace_period">通知限期</string>
   <string name="pref_notification_grace_period_summary">接收副本短时间内关闭通知</string>
-  <string name="pref_advanced_options">高级选项</string>
+  <string name="pref_advanced_options">高级</string>
   <string name="pref_never_send_crash">总不发送崩溃报告</string>
   <string name="pref_never_send_crash_summary">发送堆栈跟踪帮助 Conversations 开发人员</string>
   <string name="pref_confirm_messages">确认消息</string>
   <string name="pref_confirm_messages_summary">当你已收到消息并且已阅时通知好友</string>
-  <string name="pref_ui_options">UI 选项</string>
+  <string name="pref_ui_options">UI</string>
   <string name="openpgp_error">OpenKeychain 报告了一个错误</string>
   <string name="error_decrypting_file">解密文件时出现 I/O 错误</string>
   <string name="accept">接受</string>
@@ -149,9 +151,10 @@
   <string name="account_status_regis_not_sup">服务器不支持注册</string>
   <string name="account_status_security_error">安全错误</string>
   <string name="account_status_incompatible_server">服务器不兼容</string>
-  <string name="encryption_choice_none">纯文本内容</string>
+  <string name="encryption_choice_unencrypted">未加密</string>
   <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_edit">编辑账号</string>
   <string name="mgmt_account_delete">删除账号</string>
   <string name="mgmt_account_disable">暂时不可用</string>
@@ -170,7 +173,7 @@
   <string name="passwords_do_not_match">密码不一致</string>
   <string name="invalid_jid">该 Jabber ID 无效</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="contact_status_online">在线</string>
   <string name="contact_status_free_to_chat">自由畅聊</string>
   <string name="contact_status_away">离开</string>
@@ -181,22 +184,24 @@
   <string name="muc_details_other_members">其他成员</string>
   <string name="server_info_show_more">服务器信息</string>
   <string name="server_info_mam">XEP-0313: MAM</string>
-  <string name="server_info_carbon_messages">XEP-0280: 消息碳</string>
+  <string name="server_info_carbon_messages">XEP-0280: 消息复写</string>
   <string name="server_info_csi">XEP-0352: 客户端状态指示</string>
   <string name="server_info_blocking">XEP-0191: 屏蔽指令</string>
-  <string name="server_info_roster_version">XEP-0237: 花名册版本</string>
+  <string name="server_info_roster_version">XEP-0237: 花名册版本控制</string>
   <string name="server_info_stream_management">XEP-0198: 流管理</string>
-  <string name="server_info_pep">XEP-0163: PEP (头像)</string>
+  <string name="server_info_pep">XEP-0163: PEP (替身 / OMEMO)</string>
+  <string name="server_info_http_upload">XEP-0363: HTTP 文件上传</string>
+  <string name="server_info_push">XEP-0357: Push</string>
   <string name="server_info_available">有效</string>
   <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="last_seen_now">刚刚查看过</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="never_seen">未曾查看</string>
   <string name="install_openkeychain">加密信息. 请安装 OpenKeychain 以解密。</string>
   <string name="unknown_otr_fingerprint">未知 OTR 指纹</string>
@@ -204,17 +209,28 @@
   <string name="reception_failed">接收失败</string>
   <string name="your_fingerprint">你的指纹</string>
   <string name="otr_fingerprint">OTR 指纹</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">消息的 OMEMO 指纹</string>
+  <string name="this_device_omemo_fingerprint">自己的 OMEMO 指纹</string>
+  <string name="other_devices">其他设备</string>
+  <string name="trust_omemo_fingerprints">信任的 OMEMO 指纹</string>
+  <string name="fetching_keys">获取密钥中</string>
+  <string name="done">完成</string>
   <string name="verify">验证</string>
   <string name="decrypt">解密</string>
   <string name="conferences">讨论组</string>
   <string name="search">查找</string>
   <string name="create_contact">创建联系人</string>
+  <string name="enter_contact">输入联系人</string>
   <string name="join_conference">加入讨论组</string>
   <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="select">选择</string>
   <string name="contact_already_exists">联系人已存在</string>
   <string name="join">加入</string>
   <string name="conference_address">讨论组地址</string>
@@ -225,6 +241,7 @@
   <string name="you">你</string>
   <string name="action_edit_subject">编辑讨论组主题</string>
   <string name="conference_not_found">讨论组未找到</string>
+  <string name="conference_unknown_error">收到未知错误</string>
   <string name="leave">离开</string>
   <string name="contact_added_you">联系人已添加你到联系人列表</string>
   <string name="add_back">反向添加</string>
@@ -238,7 +255,7 @@
   <string name="error_saving_avatar">不能将头像保存至磁盘</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">私聊</string>
   <string name="private_message_to">至 %s</string>
   <string name="send_private_message_to">发送私密消息到 %s</string>
   <string name="connect">连接</string>
@@ -246,10 +263,9 @@
   <string name="next">下一步</string>
   <string name="server_info_session_established">当前会话已建立</string>
   <string name="additional_information">其他信息</string>
-  <string name="skip">Skip略过</string>
+  <string name="skip">忽略</string>
   <string name="disable_notifications">关闭通知</string>
   <string name="disable_notifications_for_this_conversation">关闭该会话消息</string>
-  <string name="notifications_disabled">通知已关闭</string>
   <string name="enable">打开通知</string>
   <string name="conference_requires_password">讨论组设有密码</string>
   <string name="enter_password">输入密码</string>
@@ -260,15 +276,17 @@
   <string name="sure_delete_fingerprint">是否确定删除该指纹?</string>
   <string name="ignore">忽略</string>
   <string name="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线联系人的情况下发送将会出现未知问题。\n\n<small>前往联系人详情以验证您订阅的在线联系人。</small></string>
-  <string name="pref_encryption_settings">加密设置</string>
+  <string name="pref_security_settings">安全</string>
   <string name="pref_force_encryption">强制要求端对端加密</string>
   <string name="pref_force_encryption_summary"> 总是发送加密信息(讨论组信息除外)</string>
+  <string name="pref_allow_message_correction">允许更正消息</string>
+  <string name="pref_allow_message_correction_summary">允许您的联系人追回编辑他们的信息</string>
   <string name="pref_dont_save_encrypted">不保存加密信息</string>
   <string name="pref_dont_save_encrypted_summary">警告:此操作将会导致信息丢失</string>
-  <string name="pref_expert_options">导出选项</string>
+  <string name="pref_expert_options">高级设置</string>
   <string name="pref_expert_options_summary">请谨慎使用</string>
   <string name="title_activity_about">关于 Conversations</string>
-  <string name="pref_about_conversations_summary">构建及许可证信息</string>
+  <string name="pref_about_conversations_summary">编译及许可证信息</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>
@@ -283,16 +301,22 @@
   <string name="pref_expert_options_other">其他</string>
   <string name="pref_conference_name">讨论组名称</string>
   <string name="pref_conference_name_summary">用讨论组的主题来标示讨论组而不是 JID</string>
+  <string name="pref_autojoin">自动加入讨论组</string>
+  <string name="pref_autojoin_summary">将讨论组加入到自动加入书签</string>
   <string name="toast_message_otr_fingerprint">OTR 指纹已拷贝到剪贴板！</string>
+  <string name="toast_message_omemo_fingerprint">OMEMO 指纹已拷贝到剪贴板！</string>
   <string name="conference_banned">你被此讨论组屏蔽</string>
   <string name="conference_members_only">此讨论组只允许成员加入</string>
   <string name="conference_kicked">你被从此讨论组踢出</string>
   <string name="using_account">用账户  %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="message_options">消息选项</string>
   <string name="copy_text">拷贝文本</string>
   <string name="copy_original_url">拷贝原始URL</string>
   <string name="send_again">再次发送</string>
+  <string name="file_url">文件  </string>
   <string name="message_text">消息文本</string>
   <string name="url_copied_to_clipboard">已经拷贝 URL 到剪贴板</string>
   <string name="message_copied_to_clipboard">消息已经拷贝到剪贴板</string>
@@ -304,7 +328,6 @@
   <string name="verify_otr">验证 OTR</string>
   <string name="remote_fingerprint">远程指纹</string>
   <string name="scan">扫描</string>
-  <string name="or_touch_phones">(或轻触手机)</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">提示或问题</string>
   <string name="shared_secret_secret">共知的秘密</string>
@@ -321,7 +344,10 @@
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">保持前台服务</string>
   <string name="pref_keep_foreground_service_summary">防止操作系统中断你的连接</string>
-  <string name="choose_file">关闭文件</string>
+  <string name="pref_export_logs">导出日志</string>
+  <string name="pref_export_logs_summary">将日志写入 SD 卡</string>
+  <string name="notification_export_logs_title">正在将日志写入 SD 卡</string>
+  <string name="choose_file">选择文件</string>
   <string name="receiving_x_file">接收中 %1$s (已完成 %2$d%%)</string>
   <string name="download_x_file">下载 %s</string>
   <string name="file">文件</string>
@@ -336,7 +362,7 @@
   <string name="could_not_verify_fingerprint">不能验证指纹</string>
   <string name="manually_verify">手工验证</string>
   <string name="are_you_sure_verify_fingerprint">你确认验证你的联系人的 OTR 指纹？</string>
-  <string name="pref_show_dynamic_tags">现实动态标签</string>
+  <string name="pref_show_dynamic_tags">显示动态标签</string>
   <string name="pref_show_dynamic_tags_summary">在联系人下方显示只读标签</string>
   <string name="enable_notifications">启用通知</string>
   <string name="conference_with">与…创建讨论组</string>
@@ -347,12 +373,23 @@
   <string name="reset">重置</string>
   <string name="account_image_description">账户头像</string>
   <string name="copy_otr_clipboard_description">拷贝 OTR 指纹到剪贴板</string>
+  <string name="copy_omemo_clipboard_description">拷贝 OMEMO 指纹到剪贴板</string>
+  <string name="regenerate_omemo_key">重新生成 OMEMO 密钥</string>
+  <string name="wipe_omemo_pep">从 PEP 中清除其他设备</string>
+  <string name="clear_other_devices">清除设备</string>
+  <string name="clear_other_devices_desc">你想清除所有其他设备的 OMEMO 通告？下次你的设备连接，将会重新收到通告，但也许将不会收到当时你发送的消息。</string>
+  <string name="purge_key">清除密钥</string>
+  <string name="purge_key_desc_part1">是否确认清除该密钥？</string>
+  <string name="purge_key_desc_part2">这是不可逆的损坏，你不能用此再建立一个会话了。</string>
+  <string name="error_no_keys_to_trust_server_error">此联系人没有可用的密钥。\n从服务器获取密钥失败。也许你的联系人所在服务器发生问题。</string>
+  <string name="error_no_keys_to_trust">此联系人没有可用的密钥。如果你曾经清除过他们的密钥，那么需要他们生成新的密钥。</string>
+  <string name="error_trustkeys_title">错误</string>
   <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="otr_session_not_started">要启动加密聊天先发送一条消息</string>
+  <string name="otr_session_not_started">发送消息来开始加密聊天</string>
   <string name="ask_question">提出问题</string>
   <string name="smp_explain_question">如果你和你的联系人有一个共知的秘密(比如一个内部笑话或者仅仅只是上次见面时吃的午餐) 你可以使用这个秘密来验证彼此的指纹。\n\n你的联系人将以大小写敏感的方式给出答案，你可以给出提示或问题。</string>
   <string name="smp_explain_answer">你的联系人可以通过一个你们共知的秘密来验证指纹。你的联系人给出了如下的提示或问题。</string>
@@ -365,7 +402,7 @@
   <string name="password_should_not_be_empty">密码不能为空</string>
   <string name="enable_all_accounts">启用所有账户</string>
   <string name="disable_all_accounts">禁用所有账户</string>
-  <string name="perform_action_with">做一个动作和</string>
+  <string name="perform_action_with">选择一个操作</string>
   <string name="no_affiliation">没有从属关系</string>
   <string name="no_role">没有角色</string>
   <string name="outcast">抛弃</string>
@@ -384,8 +421,10 @@
   <string name="public_conference">公开访问的讨论组</string>
   <string name="private_conference">私密，只有成员可以加入的讨论组</string>
   <string name="conference_options">讨论组选项</string>
-  <string name="members_only">私密(只对成员开放)</string>
+  <string name="members_only">私密，只有成员可以加入</string>
   <string name="non_anonymous">非匿名</string>
+  <string name="moderated">版主</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>
@@ -394,7 +433,7 @@
   <string name="two_hours">2 个小时</string>
   <string name="eight_hours">8 个小时</string>
   <string name="until_further_notice">直到新的通知</string>
-  <string name="pref_input_options">输入选项</string>
+  <string name="pref_input_options">输入</string>
   <string name="pref_enter_is_send">回车是发送</string>
   <string name="pref_enter_is_send_summary">用回车键来发送消息</string>
   <string name="pref_display_enter_key">显示回车键</string>
@@ -406,14 +445,14 @@
   <string name="apk">Android App</string>
   <string name="vcard">联系人</string>
   <string name="received_x_file">已经收到 %s</string>
-  <string name="disable_foreground_service">禁用前端服务</string>
+  <string name="disable_foreground_service">禁用前台服务</string>
   <string name="touch_to_open_conversations">轻触打开 Conversations</string>
   <string name="avatar_has_been_published">头像已经发布！</string>
   <string name="sending_x_file">发送中 %s</string>
   <string name="offering_x_file">提供中 %s</string>
   <string name="hide_offline">隐藏离线联系人</string>
   <string name="disable_account">禁用账户</string>
-  <string name="contact_is_typing">%s 正在输入…</string>
+  <string name="contact_is_typing">%s 正在输入</string>
   <string name="contact_has_stopped_typing">%s 已停止输入</string>
   <string name="pref_chat_states">键盘输入通知</string>
   <string name="pref_chat_states_summary">让对方知道你正在输入新消息</string>
@@ -424,7 +463,6 @@
   <string name="received_location">位置已收到</string>
   <string name="title_undo_swipe_out_conversation">Conversation 已关闭</string>
   <string name="title_undo_swipe_out_muc">离开讨论组</string>
-  <string name="pref_certificate_options">证书选项</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>
@@ -444,4 +482,76 @@
   <string name="none">无</string>
   <string name="recently_used">最近使用过的</string>
   <string name="choose_quick_action">选择快速动作</string>
+  <string name="search_for_contacts_or_groups">搜索联系人或群组</string>
+  <string name="send_private_message">发送私密消息</string>
+  <string name="user_has_left_conference">%s 已离开讨论组！</string>
+  <string name="username">用户名</string>
+  <string name="username_hint">用户名</string>
+  <string name="invalid_username">该用户名无效</string>
+  <string name="download_failed_server_not_found">下载失败：未找到服务器</string>
+  <string name="download_failed_file_not_found">下载失败：未找到文件</string>
+  <string name="download_failed_could_not_connect">下载失败：无法连接到服务器</string>
+  <string name="account_status_tor_unavailable">Tor network 不可用</string>
+  <string name="server_info_broken">损坏</string>
+  <string name="pref_presence_settings">存在</string>
+  <string name="pref_away_when_screen_off">关闭屏幕时离开</string>
+  <string name="pref_away_when_screen_off_summary">当屏幕关闭时将标记您的资源为离开状态</string>
+  <string name="pref_xa_on_silent_mode">静音模式时不可用</string>
+  <string name="pref_xa_on_silent_mode_summary">当设备进入静音模式时把资源标识改为不可用</string>
+  <string name="pref_show_connection_options">高级边接设置</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>
+  <string name="authenticate_with_certificate">留空以认证 w/ 证书</string>
+  <string name="mam_prefs">压缩设置</string>
+  <string name="server_side_mam_prefs">服务端压缩设置</string>
+  <string name="fetching_mam_prefs">正在获取压缩设置。请稍后...</string>
+  <string name="unable_to_fetch_mam_prefs">获取压缩设置失败</string>
+  <string name="captcha_ocr">验证码</string>
+  <string name="captcha_required">需要验证码</string>
+  <string name="captcha_hint">输入图片中的文字</string>
+  <string name="certificate_chain_is_not_trusted">证书链不受信任</string>
+  <string name="jid_does_not_match_certificate">Jabber ID 与证书不匹配</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="device_does_not_support_certificates">您的设备不支持设备证书选择！</string>
+  <string name="pref_connection_options">连接</string>
+  <string name="account_settings_hostname">主机名</string>
+  <string name="account_settings_port">端口</string>
+  <string name="not_a_valid_port">该端口号无效</string>
+  <string name="not_valid_hostname">该主机名无效</string>
+  <string name="connected_accounts">%2$d 个中的 %1$d 个账户已连接</string>
+  <plurals name="x_messages">
+    <item quantity="other">%d 条消息</item>
+  </plurals>
+  <string name="shared_file_with_x">用 %s 分享文件</string>
+  <string name="shared_image_with_x">用 %s 分享图片</string>
+  <string name="no_storage_permission">Conversations 需要访问外部存储</string>
+  <string name="sync_with_contacts">与联系人同步</string>
+  <string name="sync_with_contacts_long">Conversations 会匹配你的 XMPP 花名册与你的联系人，以显示他们的全名和头像。\n\nConversations 只会读取你的联系人并在本地匹配，不会上传到你的服务器。\n\n现在将要询问你是否给予访问你联系人的权限。</string>
+  <string name="certificate_information">证书详情</string>
+  <string name="certificate_subject">主题</string>
+  <string name="certificate_issuer">发行人</string>
+  <string name="certificate_cn">通用名称</string>
+  <string name="certificate_o">组织</string>
+  <string name="certificate_sha1">SHA-1</string>
+  <string name="certicate_info_not_available">(不可用）</string>
+  <string name="certificate_not_found">未发现证书</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="always">总是</string>
+  <string name="automatically">自动</string>
+  <string name="battery_optimizations_enabled">启用节电模式</string>
+  <string name="battery_optimizations_enabled_explained">你的设备正在为Conversations进行电池优化，这可能导致通知的延迟甚至消息的丢失。
+建议不要这样做</string>
+  <string name="battery_optimizations_enabled_dialog">你的设备正在为Conversations进行电池优化，这可能导致通知的延迟甚至消息的丢失。
+你将会被提示禁用该功能。</string>
+  <string name="disable">禁用</string>
+  <string name="selection_too_large">选择区域过大</string>
+  <string name="no_accounts">(没有激活的账户)</string>
+  <string name="this_field_is_required">必填</string>
 </resources>