From b4a8984b18bed5673284d5fa4a5fcc256386d542 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 16 May 2015 10:19:05 +0200
Subject: [PATCH] pulled new translations from transifex

---
 src/main/res/values-ca/strings.xml     |  34 ++-
 src/main/res/values-pl/strings.xml     |  25 +++
 src/main/res/values-zh-rCN/strings.xml | 295 ++++++++++++++++++++-----
 3 files changed, 302 insertions(+), 52 deletions(-)

diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index a0861b167..9583932bb 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -24,8 +24,8 @@
   <string name="title_activity_choose_contact">Escollir un contacte</string>
   <string name="title_activity_block_list">LLista bloqueix</string>
   <string name="just_now">Ara</string>
-  <string name="minute_ago">1 min avans</string>
-  <string name="minutes_ago">%de minuts avans</string>
+  <string name="minute_ago">1 min abans</string>
+  <string name="minutes_ago">%de minuts abans</string>
   <string name="unread_conversations">Converses sense llegir o no llegides</string>
   <string name="sending">enviant…</string>
   <string name="encrypted_message">Desxifrant missatge. Espera si us plau…</string>
@@ -359,6 +359,7 @@
   <string name="could_not_change_password">No s\'ha pogut canviar la contrasenya</string>
   <string name="otr_session_not_started">Començar a enviar un missatge de conversació xifrat</string>
   <string name="ask_question">Fer una pregunta</string>
+  <string name="smp_explain_question">Si vosté i el seu contacte tenen un secret en comú que ningú més sap (com una broma o simplement el que vau dinar l\'última vegada que es van trobar) pot utilitzar aquest secret per comprovar les empremtes de cadascú.\n\nProporcionaràs una pista o una pregunta a la que el seu contacte donarà una resposta, que distingeix entre majúscules i minúscules.</string>
   <string name="smp_explain_answer">El seu contacte l\'hi agradaria verificar la seva empremta digital per un repte amb un secret compartit.El seu contacte proporciona el següent suggeriment o pregunta per aquest secret.</string>
   <string name="shared_secret_hint_should_not_be_empty">El seu suggeriment no pot estar buit</string>
   <string name="shared_secret_can_not_be_empty">El teu secret compartit no pot estar buit</string>
@@ -416,4 +417,33 @@
   <string name="sending_x_file">Enviant %s</string>
   <string name="offering_x_file">Oferint %s</string>
   <string name="hide_offline">Amaga el fora de línia</string>
+  <string name="disable_account">Deshabilita el compte</string>
+  <string name="contact_is_typing">%s està escrivint...</string>
+  <string name="contact_has_stopped_typing">%s ha deixat d\'escriure</string>
+  <string name="pref_chat_states">Notificacions d\'escriptura</string>
+  <string name="pref_chat_states_summary">Permet el teu contacte saber quan estàs escrivint un missatge nou</string>
+  <string name="send_location">Enviar localització</string>
+  <string name="show_location">Mostrar localització</string>
+  <string name="no_application_found_to_display_location">No s\'ha trobat cap aplicació per mostrar la localització</string>
+  <string name="location">Localització</string>
+  <string name="received_location">Localització rebuda</string>
+  <string name="title_undo_swipe_out_conversation">Conversa tancada</string>
+  <string name="title_undo_swipe_out_muc">S\'ha sortit de la conferència</string>
+  <string name="pref_certificate_options">Opcions de certificats</string>
+  <string name="pref_dont_trust_system_cas_title">No confiar en les CAs del sistema</string>
+  <string name="pref_dont_trust_system_cas_summary">Tots els certificats han de ser aprovats manualment</string>
+  <string name="pref_remove_trusted_certificates_title">Eliminar certificats</string>
+  <string name="pref_remove_trusted_certificates_summary">Esborrar certificats aprovats manualment</string>
+  <string name="toast_no_trusted_certs">No hi ha certificats aprovats manualment</string>
+  <string name="dialog_manage_certs_title">Esborrar certificats</string>
+  <string name="dialog_manage_certs_positivebutton">Esborrar selecció</string>
+  <string name="dialog_manage_certs_negativebutton">Cancel·lar</string>
+  <plurals name="toast_delete_certificates">
+    <item quantity="one">%d certificat esborrat</item>
+    <item quantity="other">%d certificats esborrats</item>
+  </plurals>
+  <plurals name="select_contact">
+    <item quantity="one">Seleccionar %d contacte</item>
+    <item quantity="other">Seleccionar %d contactes</item>
+  </plurals>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index e18493573..70c3a49df 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -202,6 +202,7 @@
   <string name="install_openkeychain">Wiadomość zaszyfrowana. Zainstaluj OpenKeychain, żeby odszyfrować.</string>
   <string name="unknown_otr_fingerprint">Nieznany odcisk klucza OTR</string>
   <string name="openpgp_messages_found">Znaleziono wiadomości zaszyfrowane przez OpenPGP</string>
+  <string name="reception_failed">Odbiór nieudany</string>
   <string name="your_fingerprint">Twój odcisk klucza</string>
   <string name="otr_fingerprint">Odcisk klucza OTR</string>
   <string name="verify">Weryfikuj</string>
@@ -236,7 +237,9 @@
   <string name="error_publish_avatar_server_reject">Serwer odrzucił żądanie publikacji</string>
   <string name="error_publish_avatar_converting">Wystąpił błąd podczas konwersji obrazu</string>
   <string name="error_saving_avatar">Nie udało się zapisać obrazu w pamięci urządzenia</string>
+  <string name="or_long_press_for_default">(lub przytrzymaj długo, aby ustawić domyślny)</string>
   <string name="error_publish_avatar_no_server_support">Serwer nie udostępnia możliwości publikacji awatarów</string>
+  <string name="private_message">szepcze</string>
   <string name="private_message_to">do %s</string>
   <string name="send_private_message_to">Wyślij prywatną wiadomość do %s</string>
   <string name="connect">Połącz</string>
@@ -252,10 +255,12 @@
   <string name="conference_requires_password">Konferencja jest zabezpieczona hasłem</string>
   <string name="enter_password">Wprowadź hasło</string>
   <string name="missing_presence_updates">Kontakt nie udostępnia powiadomień o obecności</string>
+  <string name="request_presence_updates">Poproś kontakt o udostępnienie powiadomień o obecności.\n\n<small>Pozwoli to na ustalenie klienta, z którego korzysta rozmówca.</small></string>
   <string name="request_now">Zażądaj teraz</string>
   <string name="delete_fingerprint">Usuń odcisk klucza</string>
   <string name="sure_delete_fingerprint">Czy na pewno chcesz usunąć odcisk klucza?</string>
   <string name="ignore">Ignoruj</string>
+  <string name="without_mutual_presence_updates"><b>Uwaga:</b> Wysyłanie bez obustronnych powiadomień o obecności może powodować nieoczekiwane problemy.\n\n<small>Sprawdź subskrypcję powiadomień w szczegółach kontaktu.</small></string>
   <string name="pref_encryption_settings">Ustawienia szyfrowania</string>
   <string name="pref_force_encryption">Wymuszaj szyfrowanie typu end-to-end</string>
   <string name="pref_force_encryption_summary">Szyfruj wszystkie wiadomości (poza konferencjami)</string>
@@ -283,6 +288,7 @@
   <string name="conference_banned">Zbanowano cię w konferencji</string>
   <string name="conference_members_only">To jest zamknięty pokój</string>
   <string name="conference_kicked">Wyrzucono cię z konferencji</string>
+  <string name="using_account">używając konta %s</string>
   <string name="checking_image">Sprawdzanie obrazka na hoście HTTP</string>
   <string name="image_file_deleted">Obraz został usunięty</string>
   <string name="not_connected_try_again">Brak połączenia. Spróbuj ponownie później</string>
@@ -302,6 +308,7 @@
   <string name="account_details">Szczegóły konta</string>
   <string name="verify_otr">Weryfikuj OTR</string>
   <string name="remote_fingerprint">Zdalny odcisk klucza</string>
+  <string name="scan">skanuj</string>
   <string name="or_touch_phones">(lub zetknij telefony)</string>
   <string name="smp">Protokół socialist millionaire</string>
   <string name="shared_secret_hint">Podpowiedź lub pytanie</string>
@@ -309,6 +316,7 @@
   <string name="confirm">Potwierdź</string>
   <string name="in_progress">W toku</string>
   <string name="respond">Odpowiedz</string>
+  <string name="failed">Operacja nieudana</string>
   <string name="secrets_do_not_match">Sekrety są niezgodne</string>
   <string name="try_again">Spróbuj ponownie</string>
   <string name="finish">Zakończ</string>
@@ -382,6 +390,7 @@
   <string name="private_conference">Konferencja prywatna, dla zaakceptowanych uczestników</string>
   <string name="conference_options">Opcje konferencji</string>
   <string name="members_only">Prywatna (tylko zaakceptowani)</string>
+  <string name="non_anonymous">Nieanonimowa</string>
   <string name="modified_conference_options">Opcje konferencji zostały zmienione!</string>
   <string name="could_not_modify_conference_options">Nie udało się zmienić opcji konferencji</string>
   <string name="never">Nigdy</string>
@@ -420,7 +429,23 @@
   <string name="received_location">Otrzymano lokalizację</string>
   <string name="title_undo_swipe_out_conversation">Zamknięto konwersację</string>
   <string name="title_undo_swipe_out_muc">Opuszczono konferencję</string>
+  <string name="pref_certificate_options">Ustawienia certyfikatów</string>
   <string name="pref_dont_trust_system_cas_title">Nie ufaj certyfikatom systemowym</string>
   <string name="pref_dont_trust_system_cas_summary">Wymagaj ręcznego potwierdzania certyfikatów</string>
+  <string name="pref_remove_trusted_certificates_title">Usuń certyfikat</string>
+  <string name="pref_remove_trusted_certificates_summary">Wybierz zaufane certyfikaty do usunięcia</string>
+  <string name="toast_no_trusted_certs">Brak ręcznie zaufanych certyfikatów</string>
+  <string name="dialog_manage_certs_title">Usuń certyfikaty</string>
+  <string name="dialog_manage_certs_positivebutton">Usuń zaznaczone</string>
   <string name="dialog_manage_certs_negativebutton">Anuluj</string>
+  <plurals name="toast_delete_certificates">
+    <item quantity="one">Usunięto %d certyfikat</item>
+    <item quantity="few">Usunięto %d certyfikaty</item>
+    <item quantity="other">Usunięto %d certyfikatów</item>
+  </plurals>
+  <plurals name="select_contact">
+    <item quantity="one">%d kontakt wybrany</item>
+    <item quantity="few">%d kontakty wybrane</item>
+    <item quantity="other">%d kontaktów wybranych</item>
+  </plurals>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 49ca9b974..2f80e064a 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -11,6 +11,10 @@
   <string name="action_edit_contact">编辑姓名</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>
+  <string name="action_block_domain">屏蔽域名</string>
+  <string name="action_unblock_domain">解除域名屏蔽</string>
   <string name="title_activity_manage_accounts">管理账户</string>
   <string name="title_activity_settings">设置</string>
   <string name="title_activity_conference_details">讨论组详情</string>
@@ -18,6 +22,7 @@
   <string name="title_activity_sharewith">分享会话</string>
   <string name="title_activity_start_conversation">开始会话</string>
   <string name="title_activity_choose_contact">选择联系人</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>
@@ -30,56 +35,65 @@
   <string name="moderator">版主</string>
   <string name="participant">参与者</string>
   <string name="visitor">访客</string>
-  <string name="remove_contact_text">将 %s从列表中移除? 与该联系人的会话消息不会清除.</string>
-  <string name="remove_bookmark_text">从书签中移除 %s?相关会话消息不会被清除 .</string>
+  <string name="remove_contact_text">将 %s 从列表中移除? 与该联系人的会话消息不会清除.</string>
+  <string name="block_contact_text">你想屏蔽 %s 将不能发送信息给你？</string>
+  <string name="unblock_contact_text">你想解除对 %s 的屏蔽吗，他们将可以发送信息给你？</string>
+  <string name="block_domain_text">屏蔽 %s 中的所有联系人？</string>
+  <string name="unblock_domain_text">解除对 %s 中所有联系人的屏蔽？</string>
+  <string name="contact_blocked">联系人已屏蔽</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>
   <string name="invite_contact">邀请联系人</string>
   <string name="contacts">联系人</string>
   <string name="cancel">取消</string>
+  <string name="set">设置</string>
   <string name="add">添加</string>
   <string name="edit">编辑</string>
   <string name="delete">删除</string>
+  <string name="block">屏蔽</string>
+  <string name="unblock">解除屏蔽</string>
   <string name="save">保存</string>
   <string name="ok">完成</string>
-  <string name="crash_report_title">Conversations停止运行</string>
-  <string name="crash_report_message">发送堆栈跟踪到正在开发Conversations的人员\n<b>警告:</b> 该操作将用您的 XMPP账户发送堆栈跟踪到开发人员.</string>
+  <string name="crash_report_title">Conversations 崩溃</string>
+  <string name="crash_report_message">发送堆栈跟踪信息到 Conversations 的开发人员\n<b>警告:</b> 该操作将用您的 XMPP 账户发送堆栈跟踪给开发人员。</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="attach_file">附件</string>
-  <string name="not_in_roster">该联系人不在您的列表.需要加为联系人吗 ?</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_rejected">拒绝</string>
   <string name="preparing_image">准备传输图像</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_messages">删除消息</string>
   <string name="also_end_conversation">之后结束该会话</string>
   <string name="choose_presence">添加在线用户至联系人</string>
   <string name="send_plain_text_message">发送纯文本信息</string>
   <string name="send_otr_message">发送 OTR 加密信息</string>
   <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
-  <string name="your_nick_has_been_changed">用户名修改成功</string>
+  <string name="your_nick_has_been_changed">昵称修改成功</string>
   <string name="download_image">下载图片</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">会话运用了第三方app，名为 <b>OpenKeychain</b> 用来加密、解码信息以及管理您的公钥.\n\nOpenKeychain 遵循 GPLv3 并且在 F-Droid和Google Play上可操作.\n\n<small>(之后请重启conversations.)</small></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="restart">重启</string>
   <string name="install">安装</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="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">因您的联系人未公布公钥，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>
@@ -91,41 +105,41 @@
   <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_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_never_send_crash">总不发送故障报告</string>
-  <string name="pref_never_send_crash_summary">发送堆栈跟踪帮助Conversations开发人员</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="error_decrypting_file">解密文件时出现 I/O 错误</string>
   <string name="accept">接受</string>
   <string name="error">产生了一个错误</string>
   <string name="pref_grant_presence_updates">同意更新在线联系人</string>
-  <string name="pref_grant_presence_updates_summary">预先同意并请求您的联系人进行更新</string>
+  <string name="pref_grant_presence_updates_summary">预先同意并请求更新您的联系人</string>
   <string name="subscriptions">关注</string>
   <string name="your_account">你的账号</string>
-  <string name="keys">Keys</string>
-  <string name="send_presence_updates">发送在线联系人更新列表</string>
-  <string name="receive_presence_updates">接收在线联系人更新列表</string>
-  <string name="ask_for_presence_updates">请求在线联系人更新列表</string>
+  <string name="keys">密钥</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_compressing_image">转换图像出错</string>
   <string name="error_file_not_found">未找到文件</string>
-  <string name="error_io_exception">常规的I/O错误.可能是存储空间不足的原因？</string>
-  <string name="error_security_exception_during_image_copy">您用来选择图片的app没有给予足够权限支持我们读取文件.\n\n<small>请使用另一文件管理器选择图片</small></string>
+  <string name="error_io_exception">常规的 I/O 错误。可能是存储空间不足？</string>
+  <string name="error_security_exception_during_image_copy">您用来选择图片的 app 没有给予足够权限支持我们读取文件。\n\n<small>请使用另一文件管理器选择图片</small></string>
   <string name="account_status_unknown">未知</string>
   <string name="account_status_disabled">暂时不可用</string>
   <string name="account_status_online">在线</string>
-  <string name="account_status_connecting">Connecting\u2026</string>
+  <string name="account_status_connecting">连接中\u2026</string>
   <string name="account_status_offline">离线</string>
   <string name="account_status_unauthorized">未授权</string>
   <string name="account_status_not_found">未找到服务器</string>
@@ -134,6 +148,8 @@
   <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_security_error">安全错误</string>
+  <string name="account_status_incompatible_server">服务器不兼容</string>
   <string name="encryption_choice_none">纯文本内容</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -141,11 +157,11 @@
   <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="mgmt_account_publish_pgp">发布 OpenPGP 公钥</string>
   <string name="mgmt_account_enable">启用账户</string>
   <string name="mgmt_account_are_you_sure">确定?</string>
   <string name="mgmt_account_delete_confirm_text">如果删除用户，所有会话信息将会丢失</string>
-  <string name="attach_record_voice">Record voice 录音</string>
+  <string name="attach_record_voice">录音</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">密码</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
@@ -153,23 +169,28 @@
   <string name="password">密码</string>
   <string name="confirm_password">确认密码</string>
   <string name="passwords_do_not_match">密码不一致</string>
-  <string name="invalid_jid">该Jabber ID 无效</string>
-  <string name="error_out_of_memory">空间不足，图片过大</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="contact_status_online">在线</string>
-  <string name="contact_status_free_to_chat">免费对话</string>
+  <string name="contact_status_free_to_chat">自由畅聊</string>
   <string name="contact_status_away">离开</string>
   <string name="contact_status_extended_away">长时间离开</string>
   <string name="contact_status_do_not_disturb">请勿打扰</string>
   <string name="contact_status_offline">离线</string>
   <string name="muc_details_conference">讨论组</string>
   <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_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_stream_management">XEP-0198: 流管理</string>
   <string name="server_info_pep">XEP-0163: PEP (头像)</string>
   <string name="server_info_available">有效</string>
   <string name="server_info_unavailable">无效</string>
-  <string name="missing_public_keys">缺少公共秘钥公告</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>
@@ -178,9 +199,9 @@
   <string name="last_seen_day">最近一次查看为一天前</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>
-  <string name="openpgp_messages_found">OpenPGP 发现加密信息</string>
+  <string name="install_openkeychain">加密信息. 请安装 OpenKeychain 以解密。</string>
+  <string name="unknown_otr_fingerprint">未知 OTR 指纹</string>
+  <string name="openpgp_messages_found">发现 OpenPGP 加密信息</string>
   <string name="reception_failed">接收失败</string>
   <string name="your_fingerprint">你的指纹</string>
   <string name="otr_fingerprint">OTR 指纹</string>
@@ -192,6 +213,8 @@
   <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="contact_already_exists">联系人已存在</string>
   <string name="join">加入</string>
@@ -200,26 +223,26 @@
   <string name="save_as_bookmark">保存为书签</string>
   <string name="delete_bookmark">删除书签</string>
   <string name="bookmark_already_exists">该书签已存在</string>
-  <string name="you">你的</string>
+  <string name="you">你</string>
   <string name="action_edit_subject">编辑讨论组主题</string>
   <string name="conference_not_found">讨论组未找到</string>
   <string name="leave">离开</string>
   <string name="contact_added_you">联系人已添加你到联系人列表</string>
   <string name="add_back">反向添加</string>
-  <string name="contact_has_read_up_to_this_point">目前读到%s 处</string>
+  <string name="contact_has_read_up_to_this_point">目前读到 %s 处</string>
   <string name="publish">发布</string>
-  <string name="touch_to_choose_picture">点击头像可选择头像 </string>
-  <string name="publish_avatar_explanation">请注意: 所有关注您最新动态的人将看到该图像.</string>
-  <string name="publishing">发布…</string>
+  <string name="touch_to_choose_picture">点击头像可从相册中选择头像 </string>
+  <string name="publish_avatar_explanation">请注意: 所有关注您最新动态的人将看到该图像。</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">不能将头像保存至disk</string>
+  <string name="error_publish_avatar_converting">转换头像图片出错</string>
+  <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_to">至 %s</string>
-  <string name="send_private_message_to">发送私密消息到%s</string>
-  <string name="connect">Connect</string>
+  <string name="send_private_message_to">发送私密消息到 %s</string>
+  <string name="connect">连接</string>
   <string name="account_already_exists">该账号已存在</string>
   <string name="next">下一步</string>
   <string name="server_info_session_established">当前会话已建立</string>
@@ -232,21 +255,193 @@
   <string name="conference_requires_password">讨论组设有密码</string>
   <string name="enter_password">输入密码</string>
   <string name="missing_presence_updates">缺少在线联系人更新</string>
-  <string name="request_presence_updates">请先发送更新在线联系人请求.\n\n<small>这将用来判断您的联系人所用的客户端类型人.</small></string>
+  <string name="request_presence_updates">请先发送更新在线联系人的请求。\n\n<small>以判断您的联系人所用的客户端类型。</small></string>
   <string name="request_now">现在发送请求</string>
   <string name="delete_fingerprint">删除指纹</string>
   <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="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线联系人的情况下发送将会出现未知问题。\n\n<small>前往联系人详情以验证您订阅的在线联系人。</small></string>
   <string name="pref_encryption_settings">加密设置</string>
-  <string name="pref_force_encryption">强制要求 end-to-end 加密</string>
+  <string name="pref_force_encryption">强制要求端对端加密</string>
   <string name="pref_force_encryption_summary"> 总是发送加密信息(讨论组信息除外)</string>
   <string name="pref_dont_save_encrypted">不保存加密信息</string>
   <string name="pref_dont_save_encrypted_summary">警告:此操作将会导致信息丢失</string>
-  <string name="pref_expert_options">Expert 选项</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="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="pref_use_larger_font"> 放大字体</string>
-  <string name="pref_use_larger_font_summary">整个app界面使用更大号的字体</string>
+  <string name="pref_use_larger_font_summary">整个 app 界面使用较大的字体</string>
   <string name="pref_use_send_button_to_indicate_status">发送按钮显示状态</string>
+  <string name="pref_use_indicate_received">请求消息回复</string>
+  <string name="pref_use_indicate_received_summary">如果支持消息将会以绿色对勾标识</string>
   <string name="pref_use_send_button_to_indicate_status_summary">发送按钮采用其他颜色以示发送状态的区别</string>
+  <string name="pref_expert_options_other">其他</string>
+  <string name="pref_conference_name">讨论组名称</string>
+  <string name="pref_conference_name_summary">用讨论组的主题来标示讨论组而不是 JID</string>
+  <string name="toast_message_otr_fingerprint">OTR 指纹已拷贝到剪贴板！</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_image">正在 HTTP 托管中检查图片</string>
+  <string name="image_file_deleted">此图片已经被删除</string>
+  <string name="not_connected_try_again">你没有连接。请稍后重试</string>
+  <string name="check_image_filesize">检查图片文件尺寸</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="image_url">图片 URL</string>
+  <string name="message_text">消息文本</string>
+  <string name="url_copied_to_clipboard">已经拷贝 URL 到剪贴板</string>
+  <string name="message_copied_to_clipboard">消息已经拷贝到剪贴板</string>
+  <string name="image_transmission_failed">图片传送失败</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="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>
+  <string name="confirm">确认</string>
+  <string name="in_progress">处理中</string>
+  <string name="respond">回应</string>
+  <string name="failed">失败</string>
+  <string name="secrets_do_not_match">秘密不符</string>
+  <string name="try_again">再试一遍</string>
+  <string name="finish">完成</string>
+  <string name="verified">验证通过！</string>
+  <string name="smp_requested">联系人请求 SMP 验证</string>
+  <string name="no_otr_session_found">没有找到 OTR 会话</string>
+  <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="receiving_x_file">接收中 %1$s (已完成 %2$d%%)</string>
+  <string name="download_x_file">下载 %s</string>
+  <string name="file">文件</string>
+  <string name="open_x_file"> 打开 %s</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>
+  <string name="file_transmission_failed">文件传送失败</string>
+  <string name="file_deleted">文件已经删除</string>
+  <string name="no_application_found_to_open_file">没有可以打开此文件的应用</string>
+  <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_summary">在联系人下方显示只读标签</string>
+  <string name="enable_notifications">启用通知</string>
+  <string name="conference_with">与…创建讨论组</string>
+  <string name="no_conference_server_found">无法找到讨论组服务器</string>
+  <string name="conference_creation_failed">讨论组创建失败！</string>
+  <string name="conference_created">讨论组已创建！</string>
+  <string name="secret_accepted">秘密被接受！</string>
+  <string name="reset">重置</string>
+  <string name="account_image_description">账户头像</string>
+  <string name="copy_otr_clipboard_description">拷贝 OTR 指纹到剪贴板</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="ask_question">提出问题</string>
+  <string name="smp_explain_question">如果你和你的联系人有一个共知的秘密(比如一个内部笑话或者仅仅只是上次见面时吃的午餐) 你可以使用这个秘密来验证彼此的指纹。\n\n你的联系人将以大小写敏感的方式给出答案，你可以给出提示或问题。</string>
+  <string name="smp_explain_answer">你的联系人可以通过一个你们共知的秘密来验证指纹。你的联系人给出了如下的提示或问题。</string>
+  <string name="shared_secret_hint_should_not_be_empty">你的提示不能为空</string>
+  <string name="shared_secret_can_not_be_empty">你共知的秘密不能为空</string>
+  <string name="manual_verification_explanation">请仔细核对下面显示出来的你的联系人的指纹。\n你可以使用任何可信赖的联系方式，比如加密邮件或电话，来交换这些指纹信息。</string>
+  <string name="change_password">修改密码</string>
+  <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="perform_action_with">做一个动作和</string>
+  <string name="no_affiliation">没有从属关系</string>
+  <string name="no_role">没有角色</string>
+  <string name="outcast">抛弃</string>
+  <string name="member">成员</string>
+  <string name="advanced_mode">高级模式</string>
+  <string name="grant_membership">已授予的成员</string>
+  <string name="remove_membership">吊销的成员</string>
+  <string name="grant_admin_privileges">授予管理员权限</string>
+  <string name="remove_admin_privileges">吊销管理员权限</string>
+  <string name="remove_from_room">从讨论组移出</string>
+  <string name="could_not_change_affiliation">不能修改 %s 的从属关系</string>
+  <string name="ban_from_conference">屏蔽出讨论组</string>
+  <string name="removing_from_public_conference">你正尝试将 %s 移出一个公共的讨论组。唯一的方式是永远屏蔽这个用户</string>
+  <string name="ban_now">现在屏蔽</string>
+  <string name="could_not_change_role">不能修改 %s 的角色</string>
+  <string name="public_conference">公开访问的讨论组</string>
+  <string name="private_conference">私密，只有成员可以加入的讨论组</string>
+  <string name="conference_options">讨论组选项</string>
+  <string name="members_only">私密(只对成员开放)</string>
+  <string name="non_anonymous">非匿名</string>
+  <string name="modified_conference_options">讨论组选项已修改！</string>
+  <string name="could_not_modify_conference_options">不能修改讨论组选项</string>
+  <string name="never">从不</string>
+  <string name="thirty_minutes">30 分钟</string>
+  <string name="one_hour">1 个小时</string>
+  <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_enter_is_send">回车是发送</string>
+  <string name="pref_enter_is_send_summary">用回车键来发送消息</string>
+  <string name="pref_display_enter_key">显示回车键</string>
+  <string name="pref_display_enter_key_summary">改变表情键为回车键</string>
+  <string name="audio">音频</string>
+  <string name="video">视频</string>
+  <string name="image">图像</string>
+  <string name="pdf_document">PDF 文档</string>
+  <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="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_has_stopped_typing">%s 已停止输入</string>
+  <string name="pref_chat_states">键盘输入通知</string>
+  <string name="pref_chat_states_summary">让对方知道你正在输入新消息</string>
+  <string name="send_location">发送位置</string>
+  <string name="show_location">显示位置</string>
+  <string name="no_application_found_to_display_location">无法找到显示位置的应用</string>
+  <string name="location">位置</string>
+  <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>
+  <string name="pref_remove_trusted_certificates_summary">删除人工通过的证书</string>
+  <string name="toast_no_trusted_certs">没有人工通过的证书</string>
+  <string name="dialog_manage_certs_title">移除证书</string>
+  <string name="dialog_manage_certs_positivebutton">删除选项</string>
+  <string name="dialog_manage_certs_negativebutton">取消</string>
+  <plurals name="toast_delete_certificates">
+    <item quantity="other">%d 个证书已被删除</item>
+  </plurals>
+  <plurals name="select_contact">
+    <item quantity="other">选择 %d 个联系人</item>
+  </plurals>
 </resources>