From 24ab765e118faf00ae44f6a86b0195d57d495ec0 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 25 Jun 2017 16:01:37 +0200
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-bg/strings.xml     |  1 +
 src/main/res/values-de/strings.xml     |  1 +
 src/main/res/values-es/strings.xml     |  2 ++
 src/main/res/values-eu/strings.xml     |  3 +++
 src/main/res/values-fr/strings.xml     |  5 ++++-
 src/main/res/values-it/strings.xml     |  3 ++-
 src/main/res/values-ja/strings.xml     |  1 +
 src/main/res/values-nb-rNO/strings.xml |  3 +++
 src/main/res/values-nl/strings.xml     |  1 +
 src/main/res/values-ro-rRO/strings.xml |  1 +
 src/main/res/values-zh-rCN/strings.xml | 20 ++++++++++++++++++++
 11 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 9644c00d..59ccdaa4 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -578,6 +578,7 @@
   <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="pref_picture_compression">Компресиране на снимките</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 83d7e609..a54abbf6 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -578,6 +578,7 @@
   <string name="certicate_info_not_available">(Nicht verfügbar)</string>
   <string name="certificate_not_found">Kein Zertifikat gefunden</string>
   <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string>
+  <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich erwähnt werde</string>
   <string name="notify_never">Benachrichtigungen deaktiviert</string>
   <string name="notify_paused">Benachrichtigungen pausiert</string>
   <string name="pref_picture_compression">Bilder komprimieren</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index af9f7469..31fd3b31 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -578,6 +578,7 @@
   <string name="certicate_info_not_available">(No disponible)</string>
   <string name="certificate_not_found">Certificado no encontrado</string>
   <string name="notify_on_all_messages">Notificar para todos los mensajes</string>
+  <string name="notify_only_when_highlighted">Notificar solo cuando eres mencionado</string>
   <string name="notify_never">Notificaciones deshabilitadas</string>
   <string name="notify_paused">Notificaciones pausadas</string>
   <string name="pref_picture_compression">Comprimir imágenes</string>
@@ -714,4 +715,5 @@
   <string name="online_right_now">Conectado ahora mismo</string>
   <string name="retry_decryption">Reintentar descifrado</string>
   <string name="session_failure">Fallo de sesión</string>
+  <string name="sasl_downgrade">Downgraded SASL mechanism</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 5d522525..17f2e4b9 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Erabiltzaile izena dagoeneko erabilita</string>
   <string name="account_status_regis_success">Erregistroa burutu da</string>
   <string name="account_status_regis_not_sup">Zerbitzariak ez du erregistratzea onartzen</string>
+  <string name="account_status_tls_error">TLN negoziazioak huts egin du</string>
   <string name="account_status_policy_violation">Politikaren urraketa</string>
   <string name="account_status_incompatible_server">Zerbitzari ez bateragarria</string>
   <string name="account_status_stream_error">Akatsa korrontean</string>
@@ -577,6 +578,7 @@
   <string name="certicate_info_not_available">(Ez eskuragarri)</string>
   <string name="certificate_not_found">Ez da ziurtagiririk aurkitu</string>
   <string name="notify_on_all_messages">Mezu guztiak jakinarazi</string>
+  <string name="notify_only_when_highlighted">Jakinarazi aipatua izaterakoan soilik</string>
   <string name="notify_never">Jakinarazpenak ezgaituta</string>
   <string name="notify_paused">Jakinarazpenak gelditu dira</string>
   <string name="pref_picture_compression">Irudiak konprimatu</string>
@@ -713,4 +715,5 @@
   <string name="online_right_now">orain konektatuta</string>
   <string name="retry_decryption">Saiatu berriz desenkriptatzen</string>
   <string name="session_failure">Saioaren akatsa</string>
+  <string name="sasl_downgrade">SASL mekanismoa beheratua</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 26a3745c..06e59499 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -79,7 +79,7 @@
   <string name="delete_messages">Supprimer les messages</string>
   <string name="also_end_conversation">Fermer cette conversation ensuite</string>
   <string name="choose_presence">Choisir l\'appareil</string>
-  <string name="send_unencrypted_message">Envoyer un message non chiffré</string>
+  <string name="send_unencrypted_message">Envoyer un message en clair</string>
   <string name="send_message">Envoyer le message</string>
   <string name="send_message_to_x">Envoyer un message à %s</string>
   <string name="send_otr_message">Envoyer un message chiffré avec OTR</string>
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Identifiant déjà utilisé</string>
   <string name="account_status_regis_success">Enregistrement réussi</string>
   <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
+  <string name="account_status_tls_error">La négociation TLS a echoué</string>
   <string name="account_status_policy_violation">Violation de politique</string>
   <string name="account_status_incompatible_server">Serveur incompatible</string>
   <string name="account_status_stream_error">Erreur de flux</string>
@@ -577,6 +578,7 @@
   <string name="certicate_info_not_available">(Non disponible)</string>
   <string name="certificate_not_found">Aucun certificat trouvé</string>
   <string name="notify_on_all_messages">Notifier pour tous les messages</string>
+  <string name="notify_only_when_highlighted">Notifier seulement en cas de mention</string>
   <string name="notify_never">Notifications désactivées</string>
   <string name="notify_paused">Notifications en pause</string>
   <string name="pref_picture_compression">Compresser images</string>
@@ -713,4 +715,5 @@
   <string name="online_right_now">En ligne actuellement</string>
   <string name="retry_decryption">Nouvelle tentative de déchiffrement</string>
   <string name="session_failure">Échec de la session</string>
+  <string name="sasl_downgrade">Mécanisme SASL dégradé</string>
 </resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index cf4c6996..7f46ece8 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -70,7 +70,7 @@
   <string name="add_contact">Aggiungi contatto</string>
   <string name="send_failed">Invio fallito</string>
   <string name="send_rejected">rifiutato</string>
-  <string name="preparing_image">Preparazioone immagine per la trasmissione</string>
+  <string name="preparing_image">Preparazione immagine per la trasmissione</string>
   <string name="preparing_images">Preparazione immagini per la trasmissione</string>
   <string name="sharing_files_please_wait">Condivisione file. Attendere prego...</string>
   <string name="action_clear_history">Pulisci la cronologia</string>
@@ -578,6 +578,7 @@
   <string name="certicate_info_not_available">(Non disponibile)</string>
   <string name="certificate_not_found">Nessun certificato trovato</string>
   <string name="notify_on_all_messages">Notifica per tutti i messaggi</string>
+  <string name="notify_only_when_highlighted">Notifica solo quando menzionato</string>
   <string name="notify_never">Notifiche disabilitate</string>
   <string name="notify_paused">Notifiche in pausa</string>
   <string name="pref_picture_compression">Comprimi immagini</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index dd883531..be23663d 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -575,6 +575,7 @@
   <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="pref_picture_compression">写真を圧縮</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index a3d70ad3..708987a7 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -157,6 +157,7 @@
   <string name="account_status_regis_conflict">Brukernavn allerede i bruk</string>
   <string name="account_status_regis_success">Registrering fullført</string>
   <string name="account_status_regis_not_sup">Tjeneren støtter ikke registrering</string>
+  <string name="account_status_tls_error">TLS-forhandling mislyktes</string>
   <string name="account_status_policy_violation">Praksisbrudd</string>
   <string name="account_status_incompatible_server">Ukompatibel tjener</string>
   <string name="account_status_stream_error">Strømmingsfeil</string>
@@ -577,6 +578,7 @@
   <string name="certicate_info_not_available">(Ikke tilgjengelig)</string>
   <string name="certificate_not_found">Fant ikke noe sertifikat</string>
   <string name="notify_on_all_messages">Varsle ved alle meldinger</string>
+  <string name="notify_only_when_highlighted">Varsle bare når fremhevet</string>
   <string name="notify_never">Varslinger deaktivert</string>
   <string name="notify_paused">Varslinger pauset</string>
   <string name="pref_picture_compression">Komprimer bilder</string>
@@ -713,4 +715,5 @@
   <string name="online_right_now">pålogget akkurat nå</string>
   <string name="retry_decryption">Prøv å dekryptere igjen</string>
   <string name="session_failure">Økt-feil</string>
+  <string name="sasl_downgrade">Nedgradert SASL-mekanisme</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 6219fc2e..633bab3b 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -578,6 +578,7 @@
   <string name="certicate_info_not_available">(Niet beschikbaar)</string>
   <string name="certificate_not_found">Geen certificaat gevonden</string>
   <string name="notify_on_all_messages">Melding bij alle berichten</string>
+  <string name="notify_only_when_highlighted">Melding enkel wanneer aangesproken</string>
   <string name="notify_never">Meldingen uitgeschakeld</string>
   <string name="notify_paused">Meldingen gepauzeerd</string>
   <string name="pref_picture_compression">Afbeeldingen comprimeren</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 870f575b..285485a1 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -582,6 +582,7 @@ Emitent</string>
   <string name="certicate_info_not_available">(Indisponibil)</string>
   <string name="certificate_not_found">Certificat inexistent</string>
   <string name="notify_on_all_messages">Notifica la toate mesajele</string>
+  <string name="notify_only_when_highlighted">Notifică doar atunci când cineva vă menționează numele</string>
   <string name="notify_never">Notificari dezactivate</string>
   <string name="notify_paused">Notificari suspendate</string>
   <string name="pref_picture_compression">Comprima imaginile</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 7dcd29a5..b51d63c3 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -80,6 +80,7 @@
   <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_otr_message">发送 OTR 加密信息</string>
   <string name="send_omemo_message">发送 OMEMO 加密信息</string>
@@ -156,6 +157,7 @@
   <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_tls_error">TLS 协商失败</string>
   <string name="account_status_policy_violation">违反政策</string>
   <string name="account_status_incompatible_server">服务器不兼容</string>
   <string name="account_status_stream_error">流错误</string>
@@ -168,12 +170,16 @@
   <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="openpgp_has_been_published">OpenPGP 公钥已发布</string>
   <string name="republish_pgp_keys">记得重新发布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">录音</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="block_jabber_id">屏蔽 Jabber ID</string>
   <string name="account_settings_password">密码</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="account_settings_confirm_password">确认密码</string>
@@ -467,6 +473,8 @@
   <string name="disable_account">禁用账户</string>
   <string name="contact_is_typing">%s 正在输入</string>
   <string name="contact_has_stopped_typing">%s 已停止输入</string>
+  <string name="contacts_are_typing">%s 正在输入</string>
+  <string name="contacts_have_stopped_typing">%s 已停止输入</string>
   <string name="pref_chat_states">键盘输入通知</string>
   <string name="pref_chat_states_summary">让对方知道你正在向他们写消息</string>
   <string name="send_location">发送位置</string>
@@ -567,6 +575,7 @@
   <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="pref_picture_compression">压缩图片</string>
@@ -695,4 +704,15 @@
   <string name="encrypting_message">消息加密中</string>
   <string name="not_fetching_history_retention_period">由于本地保留期限，因此无法提取消息。</string>
   <string name="transcoding_video_progress">正在压缩视频 (已完成 %s%% )</string>
+  <string name="corresponding_conversations_closed">相应的对话已关闭。</string>
+  <string name="contact_blocked_past_tense">联系人已屏蔽</string>
+  <string name="pref_notifications_from_strangers">陌生人也通知</string>
+  <string name="pref_notifications_from_strangers_summary">收到陌生人信息时通知</string>
+  <string name="received_message_from_stranger">已收到陌生人的信息</string>
+  <string name="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>
 </resources>