From 51babc190a04833a8d63a2ae4e526a0f21fb13ed Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 17 Nov 2018 12:57:58 +0100
Subject: [PATCH] pulled translations from transifex

---
 src/main/res/values-ar/strings.xml     |  2 --
 src/main/res/values-bg/strings.xml     |  4 ----
 src/main/res/values-ca/strings.xml     |  8 --------
 src/main/res/values-cs/strings.xml     |  3 ---
 src/main/res/values-de/strings.xml     |  7 +++----
 src/main/res/values-el/strings.xml     |  2 --
 src/main/res/values-es/strings.xml     |  7 +++----
 src/main/res/values-eu/strings.xml     |  7 +++----
 src/main/res/values-fr/strings.xml     |  4 ----
 src/main/res/values-gl/strings.xml     |  7 +++----
 src/main/res/values-hu/strings.xml     |  7 +++----
 src/main/res/values-id/strings.xml     |  2 --
 src/main/res/values-it/strings.xml     |  7 +++----
 src/main/res/values-iw/strings.xml     |  3 ---
 src/main/res/values-ja/strings.xml     |  3 ---
 src/main/res/values-ko/strings.xml     |  3 ---
 src/main/res/values-nb-rNO/strings.xml |  3 ---
 src/main/res/values-nl/strings.xml     |  4 ----
 src/main/res/values-pl/strings.xml     |  7 +++----
 src/main/res/values-pt-rBR/strings.xml |  4 ----
 src/main/res/values-pt/strings.xml     |  3 ---
 src/main/res/values-ro-rRO/strings.xml |  7 +++----
 src/main/res/values-ru/strings.xml     |  3 ---
 src/main/res/values-sk/strings.xml     |  2 --
 src/main/res/values-sr/strings.xml     |  4 ----
 src/main/res/values-sv/strings.xml     |  3 ---
 src/main/res/values-tr-rTR/strings.xml |  3 ---
 src/main/res/values-uk/strings.xml     |  3 ---
 src/main/res/values-vi/strings.xml     |  3 ---
 src/main/res/values-zh-rCN/strings.xml | 13 ++++++++-----
 src/main/res/values-zh-rTW/strings.xml |  3 ---
 31 files changed, 32 insertions(+), 109 deletions(-)

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index e886542b0..d2ee76e58 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -242,8 +242,6 @@
   <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">عن تطبيق المحادثات 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>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 6813b52e4..ad6297ff5 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -267,8 +267,6 @@
   <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">Относно 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>
@@ -489,7 +487,6 @@
   <string name="no_storage_permission">Conversations се нуждае от достъп до външно място за съхранение</string>
   <string name="no_camera_permission">Conversations се нуждае от достъп до камерата</string>
   <string name="sync_with_contacts">Синхронизиране с контактите</string>
-  <string name="sync_with_contacts_long">Conversations иска да съчетае Вашия списък в XMPP с контактите Ви, за да показва пълните им имена и снимки..\n\nConversations единствено ще чете контактите Ви и ще ги използва вътрешно, без да ги качва на сървъра Ви.\n\nЩе бъдете помолен/а за позволение за достъп до контактите Ви.</string>
   <string name="notify_on_all_messages">Известяване за всички съобщения</string>
   <string name="notify_only_when_highlighted">Известяване само при споменаване</string>
   <string name="notify_never">Известията са изключени</string>
@@ -723,7 +720,6 @@
   <string name="providing_a_name_is_optional">Въвеждането на име не е задължитално</string>
   <string name="create_dialog_group_chat_name">Име на груповия разговор</string>
   <string name="conference_destroyed">Този групов разговор е унищожен</string>
-  <string name="phone_book">Адресен указател</string>
   <string name="unable_to_save_recording">Записът не може да бъде запазен</string>
   <string name="foreground_service_channel_name">Услуга на преден план</string>
   <string name="foreground_service_channel_description">Тази категория известия се използва за показване на постоянно известие, което показва, че Conversations работи.</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 4c5c5c0c5..e9940f8f7 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -260,8 +260,6 @@
   <string name="pref_allow_message_correction_summary">Permet que els contactes editin de manera retroactiva els missatges</string>
   <string name="pref_expert_options">Configuració d\'experts</string>
   <string name="pref_expert_options_summary">Aneu amb cura</string>
-  <string name="title_activity_about">Quant al Conversations</string>
-  <string name="pref_about_conversations_summary">Informació sobre la construció i la seva llicència</string>
   <string name="title_pref_quiet_hours">Hores de silenci</string>
   <string name="title_pref_quiet_hours_start_time">Hora d\'inici</string>
   <string name="title_pref_quiet_hours_end_time">Hora de finalització</string>
@@ -485,11 +483,6 @@ mentrestant.</string>
   <string name="no_storage_permission">Conversations necessita accés a emmagatzematge extern</string>
   <string name="no_camera_permission">Conversations necessita accés a la càmera</string>
   <string name="sync_with_contacts">Sincronitza amb contactes</string>
-  <string name="sync_with_contacts_long">Conversations vol coincidir amb la vostra llista XMPP amb els vostres contactes per 
-mostrar els noms i avatars complets.\n\nConversations només 
-llegeix els vostres contactes i els relacionaran localment sense haver
- de penjar-les al vostre servidor.\n\nAra se us demanarà que 
-concediu permís per accedir als teus contactes.</string>
   <string name="notify_on_all_messages">Notifica a tots els missatges</string>
   <string name="notify_only_when_highlighted">Notifica només quan s\'esmenta</string>
   <string name="notify_never">S\'han desactivat les notificacions</string>
@@ -731,5 +724,4 @@ que l\'administrador del servidor llegeixi els missatges, però pot ser l\'únic
   <string name="providing_a_name_is_optional">Proporcionar un nom és opcional</string>
   <string name="create_dialog_group_chat_name">Nom del xat en grup</string>
   <string name="conference_destroyed">Aquest xat en grup ha estat destruït</string>
-  <string name="phone_book">Agenda d\'adreces</string>
 </resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index e9bd1fca2..221ab0baa 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -231,8 +231,6 @@
   <string name="pref_allow_message_correction_summary">Povolí kontaktům zpětné upravování jejich zpráv</string>
   <string name="pref_expert_options">Expertní nastavení</string>
   <string name="pref_expert_options_summary">S tímto zacházejte velmi opatrně</string>
-  <string name="title_activity_about">O aplikaci Conversations</string>
-  <string name="pref_about_conversations_summary">Informace o sestavení a licenci</string>
   <string name="title_pref_quiet_hours">Tichý režim</string>
   <string name="title_pref_quiet_hours_start_time">Odkdy</string>
   <string name="title_pref_quiet_hours_end_time">Dokdy</string>
@@ -410,7 +408,6 @@
   <string name="shared_images_with_x">Obrázky sdíleny s %s</string>
   <string name="shared_text_with_x">Text sdílen s %s</string>
   <string name="sync_with_contacts">Synchronizovat s kontakty</string>
-  <string name="sync_with_contacts_long">Aplikace Conversations by ráda porovnala svůj XMPP seznam s vašimi kontakty, aby mohla zobrazit plná jména a avatary.\n\nConversations načte a porovná kontakty pouze lokálně, bez jejich nahrávání na server.\n\nNyní budete dotázáni na udělení práv pro přístup k seznamu kontaktů.</string>
   <string name="notify_on_all_messages">Upozorňovat na všechny zprávy</string>
   <string name="notify_never">Upozornění vypnuta</string>
   <string name="notify_paused">Upozornění pozastavena</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 44b5c371f..e830b4adb 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -121,6 +121,8 @@
   <string name="pref_confirm_messages">Lese- und Empfangsbestätigung senden</string>
   <string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfangen und gelesen hast</string>
   <string name="pref_ui_options">Benutzeroberfläche</string>
+  <string name="openpgp_error">OpenKeychain meldete einen Fehler.</string>
+  <string name="bad_key_for_encryption">Fehlerhafter Schlüssel für die Verschlüsselung</string>
   <string name="accept">Annehmen</string>
   <string name="error">Ein Fehler ist aufgetreten</string>
   <string name="recording_error">Fehler</string>
@@ -265,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Erlaube deinen Kontakten das nachträgliche Korrigieren ihrer Nachrichten</string>
   <string name="pref_expert_options">Experteneinstellungen</string>
   <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
-  <string name="title_activity_about">Über Conversations</string>
-  <string name="pref_about_conversations_summary">Versions- und Lizenzinformationen</string>
   <string name="title_pref_quiet_hours">Ruhige Stunden</string>
   <string name="title_pref_quiet_hours_start_time">Beginn</string>
   <string name="title_pref_quiet_hours_end_time">Ende</string>
@@ -487,7 +487,6 @@
   <string name="no_storage_permission">Conversations benötigt Zugriff auf den externen Speicher</string>
   <string name="no_camera_permission">Conversations benötigt Zugriff auf die Kamera</string>
   <string name="sync_with_contacts">Mit Kontakten synchronisieren</string>
-  <string name="sync_with_contacts_long">Conversations möchte deine XMPP-Kontaktliste mit deinen Kontakten abgleichen, um deren vollständige Namen und Avatare anzuzeigen.\n\nConversations wird deine Kontakte nur lokal lesen, abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</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>
@@ -721,7 +720,6 @@
   <string name="providing_a_name_is_optional">Angabe eines Namens ist optional</string>
   <string name="create_dialog_group_chat_name">Gruppenchatname</string>
   <string name="conference_destroyed">Dieser Gruppenchat wurde aufgelöst</string>
-  <string name="phone_book">Telefonbuch</string>
   <string name="unable_to_save_recording">Aufnahme kann nicht gespeichert werden</string>
   <string name="foreground_service_channel_name">Vordergrunddienst</string>
   <string name="foreground_service_channel_description">Diese Benachrichtigungsart wird verwendet, um eine permanente Benachrichtigung anzuzeigen, die anzeigt, dass Conversations gerade ausgeführt wird.</string>
@@ -744,4 +742,5 @@
   <string name="video_360p">Mittel (360p)</string>
   <string name="video_720p">Hoch (720p)</string>
   <string name="cancelled">abgebrochen</string>
+  <string name="already_drafting_message">Du bist bereits dabei, eine Nachricht zu verfassen.</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 2f3901e40..de43c7eff 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -244,8 +244,6 @@
   <string name="pref_security_settings">Ασφάλεια</string>
   <string name="pref_allow_message_correction">Να επιτρέπεται η διόρθωση μηνυμάτων</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>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 97eed5804..987a5aa1d 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -121,6 +121,8 @@
   <string name="pref_confirm_messages">Confirmar mensajes</string>
   <string name="pref_confirm_messages_summary">Permitir a tus contactos saber cuando has recibido y leído sus mensajes</string>
   <string name="pref_ui_options">Pantalla</string>
+  <string name="openpgp_error">OpenKeychain reportó un error.</string>
+  <string name="bad_key_for_encryption">Clave errónea para el cifrado.</string>
   <string name="accept">Aceptar</string>
   <string name="error">Ha ocurrido un error</string>
   <string name="recording_error">Error</string>
@@ -265,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Permitir a tus contactos editar mensajes previamente enviados</string>
   <string name="pref_expert_options">Opciones para expertos</string>
   <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
-  <string name="title_activity_about">Acerca de Conversations</string>
-  <string name="pref_about_conversations_summary">Información de compilación y licencia</string>
   <string name="title_pref_quiet_hours">Horario de silencio</string>
   <string name="title_pref_quiet_hours_start_time">Hora de comienzo</string>
   <string name="title_pref_quiet_hours_end_time">Hora de fin</string>
@@ -487,7 +487,6 @@
   <string name="no_storage_permission">Conversations necesita acceder al almacenamiento externo</string>
   <string name="no_camera_permission">Conversations necesita acceder a la cámara</string>
   <string name="sync_with_contacts">Sincronizar contactos</string>
-  <string name="sync_with_contacts_long">Conversations quiere cruzar tu lista de contactos de XMPP con tus contactos del móvil para mostrar sus nombres completos y sus fotos de perfil.\n\nConversations solo leerá tus contactos y los cruzará localmente sin subirlos a tu servidor.\n\nEl sistema te preguntará ahora para conceder los permisos de acceso a tus contactos del móvil.</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>
@@ -721,7 +720,6 @@
   <string name="providing_a_name_is_optional">Añadir un nombre es opcional</string>
   <string name="create_dialog_group_chat_name">Nombre de la Conversación en grupo</string>
   <string name="conference_destroyed">Esta conversación en grupo ha sido destruida</string>
-  <string name="phone_book">Libreta de direcciones</string>
   <string name="unable_to_save_recording">No se ha podido grabar la grabación</string>
   <string name="foreground_service_channel_name">Servicio en primer plano</string>
   <string name="foreground_service_channel_description">Esta categoría de notificación se usa para mostrar una notificación permantente indicando que Conversations está ejecutándose.</string>
@@ -744,4 +742,5 @@
   <string name="video_360p">Medio (360p)</string>
   <string name="video_720p">Alta (720p)</string>
   <string name="cancelled">cancelado</string>
+  <string name="already_drafting_message">Ya estás redactando un mensaje.</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 1bb246a13..e256d355b 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -121,6 +121,8 @@
   <string name="pref_confirm_messages">Mezuak egiaztatu</string>
   <string name="pref_confirm_messages_summary">Zure kontaktuak haien mezuak noiz jaso eta irakurri dituzun jakin dezaten baimendu</string>
   <string name="pref_ui_options">Erabiltzaile-interfazea</string>
+  <string name="openpgp_error">OpenKeychainek akats baten berri eman du.</string>
+  <string name="bad_key_for_encryption">Enkriptatzeko gako okerra.</string>
   <string name="accept">Onartu</string>
   <string name="error">Akats bat gertatu da</string>
   <string name="recording_error">Akatsa</string>
@@ -265,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Zure kontaktuak haien mezuak atzeraeraginez editatzea baimendu</string>
   <string name="pref_expert_options">Adituentzako ezarpenak</string>
   <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
-  <string name="title_activity_about">Conversationsi buruz</string>
-  <string name="pref_about_conversations_summary">Eraikitze eta lizentzia informazioa</string>
   <string name="title_pref_quiet_hours">Ordu lasaiak</string>
   <string name="title_pref_quiet_hours_start_time">Hasiera ordua</string>
   <string name="title_pref_quiet_hours_end_time">Amaiera ordua</string>
@@ -487,7 +487,6 @@
   <string name="no_storage_permission">Conversationsek kanpoko biltegirako sarbidea behar du</string>
   <string name="no_camera_permission">Conversationsek kamerarako sarbidea behar du</string>
   <string name="sync_with_contacts">Kontaktuekin sinkronizatu</string>
-  <string name="sync_with_contacts_long">Conversationsek zure XMPP zerrenda eta zure kontaktuak uztartu nahi ditu haien izenak eta argazkiak erakusteko.\n\nConversationsek zure kontaktuak modu lokalean soilik irakurri eta uztartuko ditu, zure zerbitzarira kargatu gabe.\n\nJarraian baimenak eskatuko zaizkizu zure kontaktuetara sartu ahal izateko.</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>
@@ -721,7 +720,6 @@
   <string name="providing_a_name_is_optional">Izen bat ematea hautazkoa da</string>
   <string name="create_dialog_group_chat_name">Taldearen izena</string>
   <string name="conference_destroyed">Talde hau suntsitu egin da</string>
-  <string name="phone_book">Helbide liburua</string>
   <string name="unable_to_save_recording">Ezin izan da grabaketa gorde</string>
   <string name="foreground_service_channel_name">Aurreko planoko zerbitzua</string>
   <string name="foreground_service_channel_description">Jakinarazpen maila hau Conversations exekutatzen ari dela adierazten duen jakinarazpen iraunkor bat erakusteko erabiltzen da.</string>
@@ -744,4 +742,5 @@
   <string name="video_360p">Ertaina (360p)</string>
   <string name="video_720p">Altua (720p)</string>
   <string name="cancelled">utzita</string>
+  <string name="already_drafting_message">Dagoeneko mezu baten zirriborroa idazten ari zara.</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index e440816fb..7438fc65a 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -265,8 +265,6 @@
   <string name="pref_allow_message_correction_summary">Permet à vos contacts d\'éditer leurs messages rétroactivement</string>
   <string name="pref_expert_options">Paramètres avancés</string>
   <string name="pref_expert_options_summary">À utiliser avec précaution.</string>
-  <string name="title_activity_about">À propos</string>
-  <string name="pref_about_conversations_summary">Informations sur la version et les licences</string>
   <string name="title_pref_quiet_hours">Heures tranquilles</string>
   <string name="title_pref_quiet_hours_start_time">Heure de début</string>
   <string name="title_pref_quiet_hours_end_time">Heure de fin</string>
@@ -487,7 +485,6 @@
   <string name="no_storage_permission">Conversations a besoin d\'accéder au stockage externe</string>
   <string name="no_camera_permission">Conversations a besoin d\'accéder à l\'appareil photo</string>
   <string name="sync_with_contacts">Synchroniser avec contacts</string>
-  <string name="sync_with_contacts_long">Conversations souhaite associer vos contacts XMPP avec les contacts de votre appareil, pour utiliser leur nom complet et leur avatar.\n\nConversations va uniquement lire vos contacts et les associer localement, sans les envoyer sur le serveur XMPP.\n\nVotre appareil va maintenant vous demander la permission d\'accéder à vos contacts.</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>
@@ -721,7 +718,6 @@
   <string name="providing_a_name_is_optional">Fournir un nom est facultatif</string>
   <string name="create_dialog_group_chat_name">Nom de la conversation de groupe</string>
   <string name="conference_destroyed">Cette conversation de groupe a été supprimée</string>
-  <string name="phone_book">Carnet d\'adresses</string>
   <string name="unable_to_save_recording">Impossible de sauvegarder l\'enregistrement</string>
   <string name="foreground_service_channel_name">Service au premier plan</string>
   <string name="foreground_service_channel_description">Cette catégorie de notification est utilisée pour afficher une notification permanente indiquant que Conversations est en cours.</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 0158e8464..b13b29737 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -121,6 +121,8 @@
   <string name="pref_confirm_messages">Confirmación de mensaxes</string>
   <string name="pref_confirm_messages_summary">Permitir aos seus contactos saber si recibeu e leu as súas mensaxes</string>
   <string name="pref_ui_options">Interface</string>
+  <string name="openpgp_error">OpenKeychain informou de un fallo.</string>
+  <string name="bad_key_for_encryption">Chave incorrecta para cifrar.</string>
   <string name="accept">Aceptar</string>
   <string name="error">Produciuse un erro</string>
   <string name="recording_error">Fallo</string>
@@ -265,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Permitir aos seus contactos editar as súas mensaxes de xeito retroactivo</string>
   <string name="pref_expert_options">Axustes de experto</string>
   <string name="pref_expert_options_summary">Por favor teña coidado con estos axustes</string>
-  <string name="title_activity_about">Sobre o Conversations</string>
-  <string name="pref_about_conversations_summary">Información da compilación e licenza</string>
   <string name="title_pref_quiet_hours">Non molestar</string>
   <string name="title_pref_quiet_hours_start_time">Hora de inicio</string>
   <string name="title_pref_quiet_hours_end_time">Hora de finalización</string>
@@ -487,7 +487,6 @@
   <string name="no_storage_permission">Conversations necesita acceso ao almacenamiento externo</string>
   <string name="no_camera_permission">Conversations necesita acceso á cámara</string>
   <string name="sync_with_contacts">Sincronice con todos os contactos</string>
-  <string name="sync_with_contacts_long">Conversations quere comparar a súa lista XMPP cos seus contactos para mostrar os seus nomes completos e avatares.\n\nConversations só fará esta comprobación de xeito local sen subilos ao servidor.\n\nAgora pediráselle conceder permiso para acceder aos seus contactos.</string>
   <string name="notify_on_all_messages">Notificar todas as mensaxes</string>
   <string name="notify_only_when_highlighted">Notificar só cando é mencionada</string>
   <string name="notify_never">Notificacións deshabilitadas</string>
@@ -721,7 +720,6 @@
   <string name="providing_a_name_is_optional">Proporcionar un nome é optativo</string>
   <string name="create_dialog_group_chat_name">Nome da conversa de grupo</string>
   <string name="conference_destroyed">Esta conversa de grupo foi destruída</string>
-  <string name="phone_book">Axenda de direccións</string>
   <string name="unable_to_save_recording">Non se puido gardar a gravación</string>
   <string name="foreground_service_channel_name">Servizo en segundo plano</string>
   <string name="foreground_service_channel_description">Esta categoría de notificacións utilízase para mostrar unha notificación permanente indicando que Conversations está a funcionar.</string>
@@ -744,4 +742,5 @@
   <string name="video_360p">Media (360p)</string>
   <string name="video_720p">Alta (720p)</string>
   <string name="cancelled">cancelada</string>
+  <string name="already_drafting_message">Xa está a escribir un borrador.</string>
 </resources>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 561b0c87f..3b8c56cd1 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -121,6 +121,8 @@
   <string name="pref_confirm_messages">Üzenetek megerősítése</string>
   <string name="pref_confirm_messages_summary">Jelzed az ismerőseidnek, hogy megkaptad és elolvastad az üzeneteiket</string>
   <string name="pref_ui_options">Kezelőfelület</string>
+  <string name="openpgp_error">Az OpenKeychain hibát jelzett.</string>
+  <string name="bad_key_for_encryption">Rossz kulcs a titkosításhoz.</string>
   <string name="accept">Elfogad</string>
   <string name="error">Hiba történt</string>
   <string name="recording_error">Hiba</string>
@@ -265,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Visszamenőlegesen is megengedi az üzenetek szerkesztését</string>
   <string name="pref_expert_options">Haladó beállítások</string>
   <string name="pref_expert_options_summary">Kérlek, légy óvatos!</string>
-  <string name="title_activity_about">A Conversations programról</string>
-  <string name="pref_about_conversations_summary">Verzió és licenc információk</string>
   <string name="title_pref_quiet_hours">Csöndes órák</string>
   <string name="title_pref_quiet_hours_start_time">Kezdése</string>
   <string name="title_pref_quiet_hours_end_time">Befejezése</string>
@@ -487,7 +487,6 @@
   <string name="no_storage_permission">A Conversations-nek hozzáférésre lenne szüksége a külső tárhelyhez</string>
   <string name="no_camera_permission">A Conversations-nek hozzáférésre lenne szüksége a kamerához</string>
   <string name="sync_with_contacts">Szinkronizáljon a névjegyekkel</string>
-  <string name="sync_with_contacts_long">A Conversations szeretné megfeleltetni az XMPP névsort a névjegyeivel, hogy megmutassa a teljes nevet és arcképet.\n\nA Conversations csak olvassa a névjegyeit és helyileg felelteti meg őket anélkül, hogy feltöltené azokat a szerverre.\n\nMost meg lesz kérdezve, hogy engedélyezi-e a névjegyekhez való hozzáférést.</string>
   <string name="notify_on_all_messages">Értesítsen minden üzenetnél</string>
   <string name="notify_only_when_highlighted">Csak akkor értesítsen, ha megemlítenek</string>
   <string name="notify_never">Értesítések letiltva</string>
@@ -721,7 +720,6 @@
   <string name="providing_a_name_is_optional">A név megadása nem kötelező</string>
   <string name="create_dialog_group_chat_name">Konferencia neve</string>
   <string name="conference_destroyed">Ez a konferencia megszűnt</string>
-  <string name="phone_book">Címjegyzék</string>
   <string name="unable_to_save_recording">Nem sikerült rögzíteni a felvételt</string>
   <string name="foreground_service_channel_name">Előtér szolgáltatás</string>
   <string name="foreground_service_channel_description">Ez az értesítési kategória állandó értesítést jelenít meg arról, hogy a Conversation fut.</string>
@@ -744,4 +742,5 @@
   <string name="video_360p">Közepes (360p)</string>
   <string name="video_720p">Magas (720p)</string>
   <string name="cancelled">visszavonva</string>
+  <string name="already_drafting_message">Már írja az üzenet vázlatát.</string>
 </resources>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index ad9d4d8d0..0a027e0d9 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -205,8 +205,6 @@
   <string name="ignore">Abaikan</string>
   <string name="without_mutual_presence_updates"><b>Perhatian</b> Mengirim ini tanpa kehadiran sesama pembaruan bisa menyebabkan masalah tak terduga.\n\n<small>Pergi ke kontak untuk memverifikasi langganan kehadiran anda.</small></string>
   <string name="pref_expert_options_summary">Harap berhati-hati dengan ini</string>
-  <string name="title_activity_about">Tentang Conversations</string>
-  <string name="pref_about_conversations_summary">Build dan informasi lisensi</string>
   <string name="title_pref_quiet_hours">Waktu sunyi</string>
   <string name="title_pref_quiet_hours_start_time">Waktu mulai</string>
   <string name="title_pref_quiet_hours_end_time">Waktu selesai</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 3fd722277..09a30aa93 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -121,6 +121,8 @@
   <string name="pref_confirm_messages">Conferma messaggi</string>
   <string name="pref_confirm_messages_summary">Fai sapere ai tuoi contatti quando hai ricevuto e letto i loro messaggi</string>
   <string name="pref_ui_options">Interfaccia utente</string>
+  <string name="openpgp_error">OpenKeychain ha riportato un errore.</string>
+  <string name="bad_key_for_encryption">Chiave di cifratura non valida.</string>
   <string name="accept">Accetta</string>
   <string name="error">Si è verificato un errore</string>
   <string name="recording_error">Errore</string>
@@ -265,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Consenti ai tuoi contatti di modificare retroattivamente i loro messaggi</string>
   <string name="pref_expert_options">Impostazioni esperto</string>
   <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
-  <string name="title_activity_about">Info su Conversations</string>
-  <string name="pref_about_conversations_summary">Informazioni sulla licenza</string>
   <string name="title_pref_quiet_hours">Ore di quiete</string>
   <string name="title_pref_quiet_hours_start_time">Orario inizio</string>
   <string name="title_pref_quiet_hours_end_time">Orario fine</string>
@@ -487,7 +487,6 @@
   <string name="no_storage_permission">Conversations ha bisogno di accedere all\'archiviazione esterna</string>
   <string name="no_camera_permission">Conversations ha bisogno di accedere alla fotocamera</string>
   <string name="sync_with_contacts">Sincronizza con i contatti</string>
-  <string name="sync_with_contacts_long">Conversations vuole confrontare il tuo roster XMPP con i tuoi contatti per mostrare i loro nomi ed avatar.\n\nConversations leggerà solamente i contatti e li confronterà localmente senza caricarli sul server.\n\nTi verrà ora chiesto il permesso di accedere ai tuoi contatti.</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 disattivate</string>
@@ -721,7 +720,6 @@
   <string name="providing_a_name_is_optional">Il nome è facoltativo</string>
   <string name="create_dialog_group_chat_name">Nome chat di gruppo</string>
   <string name="conference_destroyed">Questa chat di gruppo è stata distrutta</string>
-  <string name="phone_book">Rubrica</string>
   <string name="unable_to_save_recording">Impossibile salvare la registrazione</string>
   <string name="foreground_service_channel_name">Servizio in primo piano</string>
   <string name="foreground_service_channel_description">Questa categoria di notifiche è usata per mostrare una notifica permanente per indicare che Conversations è in esecuzione.</string>
@@ -744,4 +742,5 @@
   <string name="video_360p">Media (360p)</string>
   <string name="video_720p">Alta (720p)</string>
   <string name="cancelled">annullato</string>
+  <string name="already_drafting_message">Hai già un messaggio in bozze.</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index d6adfd4f7..1bea1d59c 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -197,8 +197,6 @@
   <string name="ignore">התעלם</string>
   <string name="without_mutual_presence_updates"><b>אזהרה:</b>שליחה ללא הרשאות עדכוני נוכחות הדדיות עלולה לגרום לתוצאות בלתי צפויות.\n\n<small>השתמש בתפריט \"פרטי משתמש\" ואשר עדכוני נוכחות</small></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>
@@ -347,5 +345,4 @@
   <string name="shared_file_with_x">שתף קובץ בעזרת %s</string>
   <string name="shared_image_with_x">שתף תמונה בעזרת %s</string>
   <string name="sync_with_contacts">סנכרן עם אנשי קשר</string>
-  <string name="sync_with_contacts_long">‏Conversations מבקשת להתאים את רשימת XMPP שלך עם אנשי הקשר שלך כדי להציג את השמות המלאים שלהם כולל אווטארים.\n\nConversations רק תקרא את אנשי הקשר שלך ותתאים אותם באופן מקומי מבלי להעלות אותם לשרת שלך.\n\nכעת אתה תתבקש להעניק הרשאה כדי לגשת להתקן שלך.</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index b10164043..fe97d8422 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -253,8 +253,6 @@
   <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">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>
@@ -455,7 +453,6 @@
   <string name="shared_images_with_x">%s で画像を共有</string>
   <string name="shared_text_with_x">%s でテキストを共有</string>
   <string name="sync_with_contacts">連絡先と同期</string>
-  <string name="sync_with_contacts_long">Conversations はフルネームやアバターを表示するために、連絡先と XMPP 名簿と一致するようにしたいです。\n\nConversations は、サーバーにアップロードすることはなく、ローカルで連絡先を読んで一致させるだけです。\n\n今、連絡先へのアクセス許可を付与するように求められます。</string>
   <string name="notify_on_all_messages">すべてのメッセージで通知</string>
   <string name="notify_only_when_highlighted">メンションされたときにのみ通知</string>
   <string name="notify_never">通知は無効</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 46cd807a8..171186d99 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -232,8 +232,6 @@
   <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">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>
@@ -411,7 +409,6 @@
   <string name="shared_images_with_x">%s로 이미지를 공유</string>
   <string name="shared_text_with_x">%s 에서 텍스트를 공유</string>
   <string name="sync_with_contacts">연락처와 동기화</string>
-  <string name="sync_with_contacts_long">Conversations는 XMPP 명단과 연락처 명단을 대조시켜서 이름과 아바타를 표시하고자 합니다.\n\nConversations는 당신의 서버에 업로드하지 않고 기기 내부적으로만 연락처를 읽고 대조를 할 것입니다.\n\n이제 연락처에 접근할 권한을 당신에게 물어볼 것입니다.</string>
   <string name="notify_on_all_messages">모든 메세지를 알림</string>
   <string name="notify_never">알림 해제됨</string>
   <string name="notify_paused">알림 일시중지됨</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index ea0a994c0..f70415dc5 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -255,8 +255,6 @@
   <string name="pref_allow_message_correction_summary">La dine kontakter korrigere sine meldinger i ettertid</string>
   <string name="pref_expert_options">Ekspertinnstillinger</string>
   <string name="pref_expert_options_summary">Vær forsiktig med disse</string>
-  <string name="title_activity_about">Om Conversations</string>
-  <string name="pref_about_conversations_summary">Utgave og lisensinformasjon</string>
   <string name="title_pref_quiet_hours">Stille tidsavgrensning</string>
   <string name="title_pref_quiet_hours_start_time">Oppstart</string>
   <string name="title_pref_quiet_hours_end_time">Avslutning</string>
@@ -463,7 +461,6 @@
   <string name="shared_images_with_x">Del bilder med %s</string>
   <string name="shared_text_with_x">Del tekst med %s</string>
   <string name="sync_with_contacts">Synkroniser med kontakter</string>
-  <string name="sync_with_contacts_long">Conversations vil jamføre din XMPP-kontaktliste med dine kontakter for å vise dem med navn og profilbilde.\n\nConversations leser bare dine kontakter for å jamføre dem lokalt, uten å laste dem opp til tjeneren din.\n\nDu kommer nå til å bli spurt om tilgangstillatelse til dine kontakter.</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>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 2fd7b8746..cdc83952f 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -267,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Sta je contacten toe hun berichten na het versturen te verbeteren</string>
   <string name="pref_expert_options">Instellingen voor experts</string>
   <string name="pref_expert_options_summary">Wees voorzichtig met deze instellingen</string>
-  <string name="title_activity_about">Over Conversations</string>
-  <string name="pref_about_conversations_summary">Build en licentie-informatie</string>
   <string name="title_pref_quiet_hours">Stille uren</string>
   <string name="title_pref_quiet_hours_start_time">Begintijd</string>
   <string name="title_pref_quiet_hours_end_time">Eindtijd</string>
@@ -489,7 +487,6 @@
   <string name="no_storage_permission">Conversations heeft toegang nodig tot de externe opslag</string>
   <string name="no_camera_permission">Conversations heeft toegang nodig tot de camera</string>
   <string name="sync_with_contacts">Synchroniseer met contacten</string>
-  <string name="sync_with_contacts_long">Conversations wil je XMPP-contacten met je systeemcontacten vergelijken om hun volledige namen en avatars te tonen.\n\nConversations zal je contacten enkel lokaal lezen en vergelijken zonder ze te uploaden naar je server.\n\nJe zal nu gevraagd worden Conversations toegang te verlenen tot je contacten.</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>
@@ -723,7 +720,6 @@
   <string name="providing_a_name_is_optional">Naam is niet vereist</string>
   <string name="create_dialog_group_chat_name">Gespreksnaam</string>
   <string name="conference_destroyed">Dit groepsgesprek is verwijderd</string>
-  <string name="phone_book">Adresboek</string>
   <string name="unable_to_save_recording">Kan opname niet opslaan</string>
   <string name="foreground_service_channel_name">Voorgronddienst</string>
   <string name="foreground_service_channel_description">Deze meldingscategorie wordt gebruikt om een permanente melding weer te geven dat Conversations wordt uitgevoerd.</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index edb78981a..78af329e9 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -121,6 +121,8 @@
   <string name="pref_confirm_messages">Potwierdzenia wiadomości</string>
   <string name="pref_confirm_messages_summary">Zezwól na wysyłanie do osób z twojej listy kontaktów informacji o tym, kiedy otrzymałeś i przeczytałeś wiadomość od nich</string>
   <string name="pref_ui_options">UI</string>
+  <string name="openpgp_error">OpenKeychain zgłosiło błąd.</string>
+  <string name="bad_key_for_encryption">Zły klucz szyfrowania.</string>
   <string name="accept">Akceptuj</string>
   <string name="error">Wystąpił błąd</string>
   <string name="recording_error">Błąd</string>
@@ -265,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Pozwól swoim kontaktom poprawiać wiadomości</string>
   <string name="pref_expert_options">Ustawienia zaawansowane</string>
   <string name="pref_expert_options_summary">Modyfikuj ustawienia ostrożnie</string>
-  <string name="title_activity_about">O Conversations</string>
-  <string name="pref_about_conversations_summary">Informacje o kompilacji i licencji</string>
   <string name="title_pref_quiet_hours">Godziny ciszy</string>
   <string name="title_pref_quiet_hours_start_time">Początek</string>
   <string name="title_pref_quiet_hours_end_time">Koniec</string>
@@ -491,7 +491,6 @@
   <string name="no_storage_permission">Conversations potrzebuje dostępu do zewnętrznej pamięci</string>
   <string name="no_camera_permission">Conversations potrzebuje dostępu do aparatu</string>
   <string name="sync_with_contacts">Synchronizuj z kontaktami</string>
-  <string name="sync_with_contacts_long">Conversations chce dopasować Twoje kontakty XMPP z listą kontaktów w telefonie, by uzupełnić ich pełne imiona oraz awatary.\nConversations jedynie przeczyta Twoje kontakty i dopasuje je lokalnie, bez wysyłania na Twój serwer.\n\nZostaniesz teraz poproszony o przydzielenie pozwolenia na odczyt Twoich kontaktów.</string>
   <string name="notify_on_all_messages">Powiadom o wszystkich wiadomościach</string>
   <string name="notify_only_when_highlighted">Powiadamiaj tylko w przypadku wzmianki o mnie</string>
   <string name="notify_never">Powiadomienia wyłączone</string>
@@ -740,7 +739,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="providing_a_name_is_optional">Nie trzeba podawać nazwy</string>
   <string name="create_dialog_group_chat_name">Nazwa konferencji</string>
   <string name="conference_destroyed">Ta konferencja została usunięta</string>
-  <string name="phone_book">Książka adresowa</string>
   <string name="unable_to_save_recording">Nie można zapisać nagrania</string>
   <string name="foreground_service_channel_name">Usługa na pierwszym planie</string>
   <string name="foreground_service_channel_description">Ta kategoria powiadomień jest używana aby wyświetlać stałe powiadomienie oznaczające, że Conversations działa</string>
@@ -763,4 +761,5 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="video_360p">Średnia (360p)</string>
   <string name="video_720p">Wysoka (720p)</string>
   <string name="cancelled">anulowane</string>
+  <string name="already_drafting_message">Już tworzysz nową wiadomość.</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 7b135d0c1..4edcd924b 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -265,8 +265,6 @@
   <string name="pref_allow_message_correction_summary">Permite que seus contatos editem suas mensagens retroativamente.</string>
   <string name="pref_expert_options">Configurações avançadas</string>
   <string name="pref_expert_options_summary">Por favor, use com cuidado.</string>
-  <string name="title_activity_about">Sobre o Conversations</string>
-  <string name="pref_about_conversations_summary">Informações de licenciamento e construção.</string>
   <string name="title_pref_quiet_hours">Horário de sossego</string>
   <string name="title_pref_quiet_hours_start_time">Início</string>
   <string name="title_pref_quiet_hours_end_time">Fim</string>
@@ -487,7 +485,6 @@
   <string name="no_storage_permission">O Conversations necessita de acesso ao armazenamento externo</string>
   <string name="no_camera_permission">O Conversations necessita de acesso à câmera</string>
   <string name="sync_with_contacts">Sincronizar com os contatos</string>
-  <string name="sync_with_contacts_long">O Conversations quer procurar por correspondências entre contatos da sua conta Jabber e do seu telefone, para complementar as informações de nome completo e avatares\n\nO Conversations fará a verificação localmente, sem enviar nenhuma informação sua para o servidor\n\nVocê será solicitado a fornecer permissão de acesso aos seus contatos agora.</string>
   <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
   <string name="notify_only_when_highlighted">Notificar somente quando for mencionado</string>
   <string name="notify_never">Notificações desabilitadas</string>
@@ -721,7 +718,6 @@
   <string name="providing_a_name_is_optional">O fornecimento do nome é opcional</string>
   <string name="create_dialog_group_chat_name">Nome da conversa em grupo</string>
   <string name="conference_destroyed">Essa conversa em grupo foi destruída</string>
-  <string name="phone_book">Livro de endereços</string>
   <string name="unable_to_save_recording">Não foi possível salvar a gravação</string>
   <string name="foreground_service_channel_name">Serviço ativo</string>
   <string name="foreground_service_channel_description">Essa categoria de notificação é utilizada para exibir uma notificação permanente indicando que o Conversations está em execução.</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index fc8df55d0..836396573 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -245,8 +245,6 @@
   <string name="pref_allow_message_correction_summary">Permitir que os seus contactos editem as suas mensagens depois de enviadas</string>
   <string name="pref_expert_options">Definições avançadas</string>
   <string name="pref_expert_options_summary">Por favor tenha cuidado com estas</string>
-  <string name="title_activity_about">Sobre Conversations</string>
-  <string name="pref_about_conversations_summary">Informação de licença e construção</string>
   <string name="title_pref_quiet_hours">Horas de tranquilidade</string>
   <string name="title_pref_quiet_hours_start_time">Hora de início</string>
   <string name="title_pref_quiet_hours_end_time">Hora de fim</string>
@@ -453,7 +451,6 @@
   <string name="no_storage_permission">Conversations necessita de acesso ao armazenamento externo</string>
   <string name="no_camera_permission">Conversations necessita de acesso à câmara</string>
   <string name="sync_with_contacts">Sincronizar com contactos</string>
-  <string name="sync_with_contacts_long">A aplicação Conversations deseja fazer a correspondência entre a sua lista de contactos XMPP e os seus contactos para mostrar os seus nomes completos e os seus avatares.\n\nA aplicação Conversations irá apenas ler os seus contactos e fazer a correspondência localmente sem enviar os dados para o seu servidor.\n\nIrá agora ser-lhe pedido para dar permissão para aceder aos seus contactos.</string>
   <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
   <string name="notify_only_when_highlighted">Notificar apenas quando mencionado</string>
   <string name="notify_never">Notificações desativadas</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 35d53307f..dfd0faeac 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -121,6 +121,8 @@
   <string name="pref_confirm_messages">Confirmă mesajele</string>
   <string name="pref_confirm_messages_summary">Contactele sunt notificate atunci când ați primit un mesaj și l-ați citit</string>
   <string name="pref_ui_options">Opțiuni interfață</string>
+  <string name="openpgp_error">OpenKeychain a raportat o eroare.</string>
+  <string name="bad_key_for_encryption">Cheie invalidă pentru criptare.</string>
   <string name="accept">Acceptă</string>
   <string name="error">A apărut o eroare</string>
   <string name="recording_error">Eroare</string>
@@ -265,8 +267,6 @@
   <string name="pref_allow_message_correction_summary">Contactele pot să își editeze mesajele scrise în trecut</string>
   <string name="pref_expert_options">Opțiuni expert</string>
   <string name="pref_expert_options_summary">Vă rugăm să aveți grijă cu acestea</string>
-  <string name="title_activity_about">Despre Conversations</string>
-  <string name="pref_about_conversations_summary">Informații despre versiune și licență</string>
   <string name="title_pref_quiet_hours">Ore de liniște</string>
   <string name="title_pref_quiet_hours_start_time">Ora de începere</string>
   <string name="title_pref_quiet_hours_end_time">Ora de terminare</string>
@@ -489,7 +489,6 @@
   <string name="no_storage_permission">Conversations are nevoie de acces la stocarea externă</string>
   <string name="no_camera_permission">Conversations are nevoie de acces la camera foto</string>
   <string name="sync_with_contacts">Sincronizează cu contactele</string>
-  <string name="sync_with_contacts_long">Conversations dorește să potrivească lista de contacte XMPP cu cea din dispozitiv pentru a putea afișa numele lor complete și avatarele.\n\nConversations doar va citi și potrivi local fără să le încarce pe vreun server.\n\nUrmează să fiți întrebați dacă doriți să permiteți accesul la contacte.</string>
   <string name="notify_on_all_messages">Notifică 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">Notificări dezactivate</string>
@@ -731,7 +730,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="providing_a_name_is_optional">Setarea numelui este opțională</string>
   <string name="create_dialog_group_chat_name">Titlul discuției de grup</string>
   <string name="conference_destroyed">Această discuție de grup a fost distrusă</string>
-  <string name="phone_book">Agendă</string>
   <string name="unable_to_save_recording">Nu s-a putut salva înregistrarea</string>
   <string name="foreground_service_channel_name">Serviciul activ în prim-plan</string>
   <string name="foreground_service_channel_description">Această categorie de notificări este folosită pentru a arăta o notificare permanentă ce indică rularea Conversations</string>
@@ -754,4 +752,5 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="video_360p">Medie (360p)</string>
   <string name="video_720p">Mare (720p)</string>
   <string name="cancelled">anulat</string>
+  <string name="already_drafting_message">Deja aveți ciorna unui mesaj.</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 10876e189..b6829b439 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -264,8 +264,6 @@
   <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">О 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>
@@ -487,7 +485,6 @@
   <string name="no_storage_permission">Conversations требуется доступ к внешнему хранилищу</string>
   <string name="no_camera_permission">Conversations требуется доступ к камере</string>
   <string name="sync_with_contacts">Синхронизировать с контактами</string>
-  <string name="sync_with_contacts_long">Conversations ожидает совпадения вашего XMPP ростера с вашими контактами для отображения их полных имен и аватаров.\n\nConversations только считает ваши контакты и сопоставит их локально без отправки их на ваш сервер.\n\nСейчас вы получите запрос на разрешение доступа к вашим контактам.</string>
   <string name="notify_on_all_messages">Все сообщения</string>
   <string name="notify_only_when_highlighted">Уведомлять только при упоминании</string>
   <string name="notify_never">Без уведомления</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index adf7f6510..40f1dc82a 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -195,8 +195,6 @@
   <string name="ignore">Ignorovať</string>
   <string name="without_mutual_presence_updates"><b>Varovanie:</b> Odoslanie bez povolenia zmien stavu môže spôsobiť nečakané problémy na obidvoch stranách.\n\n<small>Prejdi na detaily kontaktu pre overenie povolenia o zmenách stavu.</small></string>
   <string name="pref_expert_options_summary">S týmto narábajte veľmi opatrne, prosím</string>
-  <string name="title_activity_about">O Conversations</string>
-  <string name="pref_about_conversations_summary">Informácie o tvorbe a licencii</string>
   <string name="title_pref_quiet_hours">Tichý režim</string>
   <string name="title_pref_quiet_hours_start_time">Čas začiatku</string>
   <string name="title_pref_quiet_hours_end_time">Čas konca</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 094b031ee..78c301e3c 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -261,8 +261,6 @@
   <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">О Конверзацији</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>
@@ -481,7 +479,6 @@
   <string name="shared_images_with_x">Подељене слике са %s</string>
   <string name="shared_text_with_x">Подељен текст са %s</string>
   <string name="sync_with_contacts">Синхронизуј са контактима</string>
-  <string name="sync_with_contacts_long">Конверзација жели да поклапи ваш ИксМПП именик са контактима на вашем уређају да би приказала њихова пуна имена и аватаре.\n\nКонверзација ће само да очита ваше контакте и упореди их локално без отпремања на сервер.\n\nСада ћете бити упитани за дозволу приступа вашим контактима.</string>
   <string name="notify_on_all_messages">Обавештења за све поруке</string>
   <string name="notify_never">Обавештења искључена</string>
   <string name="notify_paused">Обавештења паузирана</string>
@@ -662,7 +659,6 @@
   <string name="providing_a_name_is_optional">Име је опционо</string>
   <string name="create_dialog_group_chat_name">Назив групног ћаскања</string>
   <string name="conference_destroyed">Ово групно ћаскање је обрисано</string>
-  <string name="phone_book">Адресар</string>
   <string name="notification_group_messages">Поруке</string>
   <string name="messages_channel_name">Поруке</string>
   <string name="silent_messages_channel_name">Тихе поруке</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 27f268505..9b7977f9f 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -237,8 +237,6 @@
   <string name="pref_allow_message_correction_summary">Tillåt att dina kontakter kan ändra sina meddelanden i efterhand</string>
   <string name="pref_expert_options">Expertinställningar</string>
   <string name="pref_expert_options_summary">Var försiktig med dem</string>
-  <string name="title_activity_about">Om Conversations</string>
-  <string name="pref_about_conversations_summary">Bygg- och licensinformation</string>
   <string name="title_pref_quiet_hours">Tysta timmar</string>
   <string name="title_pref_quiet_hours_start_time">Starttid</string>
   <string name="title_pref_quiet_hours_end_time">Sluttid</string>
@@ -418,7 +416,6 @@
   <string name="shared_images_with_x">Delade bilder med %s</string>
   <string name="shared_text_with_x">Delade text med %s</string>
   <string name="sync_with_contacts">Synkronisera med kontakter</string>
-  <string name="sync_with_contacts_long">Conversations vill matcha din XMPP-kontaktlista med dina kontakter för att visa deras namn och profilbild.\n\nConversations läser endast dina kontakter för att matcha dem lokalt utan att ladda upp dem till din server.\n\nDu kommer nu få frågan om tillåtelse för att använda kontakterna.</string>
   <string name="notify_on_all_messages">Notifiera för alla meddelanden</string>
   <string name="notify_never">Notifieringar deaktiverade</string>
   <string name="notify_paused">Notifieringar pausade</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 7aaf4ea87..29c1ffcb5 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -233,8 +233,6 @@
   <string name="pref_allow_message_correction_summary">Kişilerinizin geçmiş iletilerini düzeltmelerine izin ver</string>
   <string name="pref_expert_options">Uzman seçenekleri</string>
   <string name="pref_expert_options_summary">Lütfen dikkatli olun</string>
-  <string name="title_activity_about">Conversations hakkında</string>
-  <string name="pref_about_conversations_summary">Geliştirme ve lisans bilgisi</string>
   <string name="title_pref_quiet_hours">Sessiz Saatler</string>
   <string name="title_pref_quiet_hours_start_time">Başlangıç zamanı</string>
   <string name="title_pref_quiet_hours_end_time">Bitiş zamanı</string>
@@ -414,7 +412,6 @@
   <string name="shared_images_with_x">%s ile paylaşılan resimler</string>
   <string name="shared_text_with_x">%s ile paylaşılan metin</string>
   <string name="sync_with_contacts">Kişilerle senkronize et</string>
-  <string name="sync_with_contacts_long">Conversations XMPP listenizi telefon rehberinizle eşleştirerek kişilerin tam adlarını ve avatarlarını göstermek istiyor.\n\nConversations telefon rehberinizi yalnızca okuyacak ve onları sunucunuza yüklemeden eşleştirecek.\n\nŞimdi telefon rehberinize erişilmesine izin vermeniz istenecek.</string>
   <string name="notify_on_all_messages">Tüm iletilerde uyar</string>
   <string name="notify_never">Uyarılar devre dışı</string>
   <string name="notify_paused">Uyarılar geçici olarak durduruldu</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index d39f6f687..dcb22ae82 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -238,8 +238,6 @@
   <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">Про Розмови</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>
@@ -427,7 +425,6 @@
   <string name="shared_images_with_x">Поділився зображеннями з %s</string>
   <string name="shared_text_with_x">Поділився текстом з %s</string>
   <string name="sync_with_contacts">Синхронізувати контакти</string>
-  <string name="sync_with_contacts_long">Програма хоче співставити Ваш список XMPP розмов з вашою книгою контактів, щоб показати повні імена та аватари контактів.\n\nПрограма лише прочитає Ваші контакти і співставить їх локально без завантаження їх до Вашого сервера.\n\nЗараз Вас попросять надати дозвіл для доступу до Ваших контактів.</string>
   <string name="notify_on_all_messages">Сповіщати про всі повідомлення</string>
   <string name="notify_only_when_highlighted">Повідомляти, лише якщо згадують</string>
   <string name="notify_never">Сповіщення вимкнено</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index d891f402a..e59a2a1dc 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -228,8 +228,6 @@
   <string name="ignore">Bỏ qua</string>
   <string name="without_mutual_presence_updates"><b>Cảnh báo:</b> Gửi mà không có cập nhật hiện diện của nhau có thể gây ra vấn đề khó lường.\n\n<small>Vào chi tiết liên hệ để xác minh đăng ký hiện diện của bạn.</small></string>
   <string name="pref_expert_options_summary">Xin hãy cẩn trọng với chúng</string>
-  <string name="title_activity_about">Thông tin về Conversations</string>
-  <string name="pref_about_conversations_summary">Thông tin bản dựng và giấy phép</string>
   <string name="title_pref_quiet_hours">Giờ yên lặng</string>
   <string name="title_pref_quiet_hours_start_time">Thời gian bắt đầu</string>
   <string name="title_pref_quiet_hours_end_time">Thời gian kết thúc</string>
@@ -379,7 +377,6 @@
   <string name="shared_file_with_x">Chia sẻ tập tin với %s</string>
   <string name="shared_image_with_x">Chia sẻ hình với %s</string>
   <string name="sync_with_contacts">Đồng bộ với danh bạ</string>
-  <string name="sync_with_contacts_long">Conversations muốn so sánh danh sách bạn bè XMPP với danh bạ của bạn để hiện tên đầy đủ và ảnh đại diện của họ.\n\nConversations sẽ chỉ đọc danh bạ và so sánh trên thiết bị chứ không tải lên máy chủ.\n\nBây giờ, bạn sẽ được hỏi trao quyền truy cập danh bạ.</string>
   <string name="notify_on_all_messages">Thông báo tất cả tin nhắn</string>
   <string name="notify_never">Đã tắt thông báo</string>
   <string name="notify_paused">Đã dừng thông báo</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a46722e84..72560a37b 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -77,6 +77,7 @@
   <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="delete_file_dialog">删除文件</string>
   <string name="also_end_conversation">之后结束此会话</string>
   <string name="choose_presence">选择设备</string>
@@ -119,6 +120,8 @@
   <string name="pref_confirm_messages">确认消息</string>
   <string name="pref_confirm_messages_summary">让对方知道你收到并阅读了他们的消息</string>
   <string name="pref_ui_options">用户界面</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>
@@ -263,8 +266,6 @@
   <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">关于 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>
@@ -355,7 +356,7 @@
   <string name="outcast">抛弃</string>
   <string name="member">成员</string>
   <string name="advanced_mode">高级模式</string>
-  <string name="grant_membership">管理员</string>
+  <string name="grant_membership">加为成员</string>
   <string name="remove_membership">吊销的成员</string>
   <string name="grant_admin_privileges">授予管理员权限</string>
   <string name="remove_admin_privileges">吊销管理员权限</string>
@@ -483,7 +484,6 @@
   <string name="no_storage_permission">Conversations 需要外部储存权限</string>
   <string name="no_camera_permission">Conversations 需要摄像头权限</string>
   <string name="sync_with_contacts">同步联系人</string>
-  <string name="sync_with_contacts_long">Conversations需要将您的XMPP名单与您的联系人进行匹配，以显示他们的全名和头像。\n\nConversations只会读取你的联系人并在本地匹配，不会上传到你的服务器。\n\n您现在将被要求授予访问您联系人的权限。</string>
   <string name="notify_on_all_messages">为所有信息显示通知</string>
   <string name="notify_only_when_highlighted">只在被提到时通知</string>
   <string name="notify_never">禁用通知</string>
@@ -713,7 +713,6 @@
   <string name="providing_a_name_is_optional">提供名称是可选的</string>
   <string name="create_dialog_group_chat_name">群聊名称</string>
   <string name="conference_destroyed">群聊已被解散</string>
-  <string name="phone_book">地址簿</string>
   <string name="unable_to_save_recording">无法保存录音</string>
   <string name="foreground_service_channel_name">前台服务</string>
   <string name="foreground_service_channel_description">此通知类别用于显示表明Conversations正在运行的永久通知。</string>
@@ -727,10 +726,14 @@
   <string name="pref_more_notification_settings">通知设置</string>
   <string name="pref_more_notification_settings_summary">重要性，声音，振动</string>
   <string name="video_compression_channel_name">视频压缩</string>
+  <string name="view_media">查看媒体文件</string>
+  <string name="media_browser">媒体浏览器</string>
   <string name="export_channel_name">导出历史记录</string>
+  <string name="security_violation_not_attaching_file">文件由于违反安全策略而被删除。</string>
   <string name="pref_video_compression">视频质量</string>
   <string name="pref_video_compression_summary">画质越低意味着文件越小</string>
   <string name="video_360p">中（360p）</string>
   <string name="video_720p">高（720p）</string>
   <string name="cancelled">已取消</string>
+  <string name="already_drafting_message">你已经在起草一条消息了。</string>
 </resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 5332a05a4..322def109 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -237,8 +237,6 @@
   <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">關於 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>
@@ -416,7 +414,6 @@
   <string name="shared_images_with_x">跟 %s 分享的圖片</string>
   <string name="shared_text_with_x">跟 %s 分享的文字資料</string>
   <string name="sync_with_contacts">與連絡人同步</string>
-  <string name="sync_with_contacts_long">Conversations 會匹配你的 XMPP 花名冊與你的連絡人，以顯示他們的全名和頭像。\n\nConversations 只會讀取你的連絡人並在本地匹配，不會上傳到你的伺服器。\n\n現在將要詢問你是否給予訪問你連絡人的許可權。</string>
   <string name="notify_on_all_messages">為所有訊息顯示通知</string>
   <string name="notify_never">關閉通知</string>
   <string name="notify_paused">暫停通知</string>