From 40da98289b0d49f80437504e4a991bc5d3b5704c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 26 Oct 2018 17:31:21 +0200
Subject: [PATCH] pulled translations from transifex

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

diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index f847436d28ab3a9c016868417f6aae7db181f66e..e886542b0b77e4064f78f2be361ff6f103430db1 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -113,7 +113,6 @@
   <string name="pref_confirm_messages">تأكيد الرسالة</string>
   <string name="pref_confirm_messages_summary">دع مراسيلك يعرفون متى قد تلقيت و هل قرئت رسائلهم</string>
   <string name="pref_ui_options">واجهة المستخدم</string>
-  <string name="openpgp_error">لقد قام أوبن كي تشاين بالإبلاغ عن وجود خطأ</string>
   <string name="accept">قبول</string>
   <string name="error">حدث خطأ ما</string>
   <string name="your_account">حسابك</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index f0746bbc31aadd990de35390b1a379f21925510b..6813b52e46a73c6b01cacfb24d33ff4c1b57bb8a 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -121,7 +121,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="openpgp_error">OpenKeychain докладва за грешка.</string>
+  <string name="bad_key_for_encryption">Неправилен ключ за шифроване.</string>
   <string name="accept">Приемане</string>
   <string name="error">Възникна грешка</string>
   <string name="recording_error">Грешка</string>
@@ -745,4 +746,5 @@
   <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-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 47fc0aa9ced4d2adfb69cef0ef07f2c301c6b1e2..4c5c5c0c590d4cd3c76531bc73b42d4e0bf53dc1 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -118,7 +118,6 @@
   <string name="pref_confirm_messages">Confirma els missatges</string>
   <string name="pref_confirm_messages_summary">Feu saber als vostres contactes quan heu rebut i llegit els seus missatges</string>
   <string name="pref_ui_options">UI</string>
-  <string name="openpgp_error">L\'OpenKeychain ha informat d\'un error</string>
   <string name="accept">Accepta</string>
   <string name="error">S\'ha produït un error</string>
   <string name="your_account">El vostre compte</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 4402f67455e2b0630265c7d219fa2fa7bdb8dce1..e9bd1fca2e5ba3ac0417438c4b1381046284313a 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -107,7 +107,6 @@
   <string name="pref_never_send_crash_summary">Zasláním detailů o důvodu selhání pomůžete dalšímu vývoji aplikace Konverzace</string>
   <string name="pref_confirm_messages">Potvrzovat zprávy</string>
   <string name="pref_ui_options">UI</string>
-  <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
   <string name="accept">Přijmout</string>
   <string name="error">Došlo k chybě</string>
   <string name="your_account">Váš účet</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 0a5290f5077ba83115baa9d0a17831b4972dc8c1..44b5c371f8d0ad98d96779d0e685199d1a286228 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -121,7 +121,6 @@
   <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">Fehler mit OpenKeychain</string>
   <string name="accept">Annehmen</string>
   <string name="error">Ein Fehler ist aufgetreten</string>
   <string name="recording_error">Fehler</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 21ec90093536a3eb715f78e94f1ee37d9c569870..2f3901e40794c6373e93eab045ad9bcc4a5da068 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -115,7 +115,6 @@
   <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="accept">Αποδοχή</string>
   <string name="error">Έχει συμβεί κάποιο σφάλμα</string>
   <string name="your_account">Ο λογαριασμός σας</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 9e5afdd444808b5139dca217eb8415a0587bd19f..97eed5804a7401b3914afbf05332f3b28fd67964 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -121,7 +121,6 @@
   <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="accept">Aceptar</string>
   <string name="error">Ha ocurrido un error</string>
   <string name="recording_error">Error</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 09fc5e6e837d890f478eaea687ca0f6aeac7dd05..1bb246a136cc074010304f4c7b2a8ee2157be66b 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -121,7 +121,6 @@
   <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="accept">Onartu</string>
   <string name="error">Akats bat gertatu da</string>
   <string name="recording_error">Akatsa</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 14860db27364e0234430e9418f7bd8c5afd88810..e440816fb8d3e28c1b30b37156d88b109cd002ca 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -77,6 +77,9 @@
   <string name="sharing_files_please_wait">Partage des fichiers. Veuillez patienter...</string>
   <string name="action_clear_history">Vider l\'historique</string>
   <string name="clear_conversation_history">Vider l\'historique de la conversation</string>
+  <string name="clear_histor_msg">Êtes-vous sûr de vouloir supprimer tous les messages de cette conversation ?\n\n <b>Avertissement :</b> Cela ne supprimera pas les copies des messages qui sont stockés sur d\'autres appareils ou serveurs.</string>
+  <string name="delete_file_dialog">Supprimer le fichier</string>
+  <string name="delete_file_dialog_msg">Êtes-vous sûr de vouloir supprimer ce fichier ?\n\n <b>Avertissement :</b> Cela ne supprimera pas les copies de ce fichier qui sont stockés sur d\'autres appareils ou serveurs.</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 en clair</string>
@@ -118,7 +121,6 @@
   <string name="pref_confirm_messages">Confirmation de lecture</string>
   <string name="pref_confirm_messages_summary">Informer vos contacts quand vous avez reçu et lu leurs messages</string>
   <string name="pref_ui_options">Interface</string>
-  <string name="openpgp_error">OpenKeychain a signalé une erreur</string>
   <string name="accept">Accepter</string>
   <string name="error">Une erreur s\'est produite</string>
   <string name="recording_error">Erreur</string>
@@ -150,6 +152,7 @@
   <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>
+  <string name="account_status_stream_opening_error">Erreur d\'ouverture du flux</string>
   <string name="encryption_choice_unencrypted">Non chiffré</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -489,6 +492,8 @@
   <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">Compression de l\'image</string>
+  <string name="pref_picture_compression_summary">Redimensionner et compresser les images</string>
   <string name="always">Toujours</string>
   <string name="automatically">Automatiquement</string>
   <string name="battery_optimizations_enabled">Optimisations de batterie activées</string>
@@ -554,6 +559,7 @@
   <string name="allow">Autoriser</string>
   <string name="no_permission_to_access_x">Permission d\'accéder à %s refusée</string>
   <string name="remote_server_not_found">Serveur distant non trouvé</string>
+  <string name="remote_server_timeout">Dépassement du délai du serveur distant</string>
   <string name="unable_to_update_account">Mise à jour du compte impossible</string>
   <string name="report_jid_as_spammer">Signaler ce JID comme envoyant des messages non sollicités.</string>
   <string name="pref_delete_omemo_identities">Effacer les identités OMEMO</string>
@@ -732,4 +738,10 @@
   <string name="view_media">Voir les média</string>
   <string name="media_browser">Navigateur de média</string>
   <string name="export_channel_name">Exportation de l\'historique</string>
+  <string name="security_violation_not_attaching_file">Fichier omis en raison d\'une violation de la sécurité.</string>
+  <string name="pref_video_compression">Qualité de la vidéo</string>
+  <string name="pref_video_compression_summary">Une qualité inférieure signifie des fichiers plus petits</string>
+  <string name="video_360p">Moyenne (360p)</string>
+  <string name="video_720p">Haute (720p)</string>
+  <string name="cancelled">Annulé</string>
 </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 350a96139f552d5161a16430a5dfe036796569ff..0158e84641484d6f5484de00bd9778d198f99cd2 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -121,7 +121,6 @@
   <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 reportou un erro</string>
   <string name="accept">Aceptar</string>
   <string name="error">Produciuse un erro</string>
   <string name="recording_error">Fallo</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index c60dffef121c54fc941125420cbb1062bec6edd9..561b0c87f9694903855ef62585f44b2dcc93614b 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -77,6 +77,9 @@
   <string name="sharing_files_please_wait">Fájlok megosztása. Kérlek várj...</string>
   <string name="action_clear_history">Előzmények törlése</string>
   <string name="clear_conversation_history">Beszélgetés előzményének törlése</string>
+  <string name="clear_histor_msg">Biztosan szeretnéd az üzeneteket törölni ebben a beszélgetésben?\n\n<b>Figyelem:</b> Ez nem törli más eszközökön vagy szervereken tárolt üzeneteidet.</string>
+  <string name="delete_file_dialog">Fájl törlése</string>
+  <string name="delete_file_dialog_msg">Biztosan szeretnéd ezt a fájlt törölni?\n\n<b>Figyelem:</b> Ez nem törli más eszközökön vagy szervereken tárolt fájljaidat.</string>
   <string name="also_end_conversation">A beszélgetést is fejezze be</string>
   <string name="choose_presence">Eszköz kiválasztása</string>
   <string name="send_unencrypted_message">Titkosítatlan üzenetküldés</string>
@@ -118,7 +121,6 @@
   <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="accept">Elfogad</string>
   <string name="error">Hiba történt</string>
   <string name="recording_error">Hiba</string>
@@ -150,6 +152,7 @@
   <string name="account_status_policy_violation">Irányelv megsértése</string>
   <string name="account_status_incompatible_server">Nem kompatibilis szerver</string>
   <string name="account_status_stream_error">Adatfolyam hiba</string>
+  <string name="account_status_stream_opening_error">Adatfolyam megnyitási hiba</string>
   <string name="encryption_choice_unencrypted">Titkosítatlan</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -489,6 +492,8 @@
   <string name="notify_only_when_highlighted">Csak akkor értesítsen, ha megemlítenek</string>
   <string name="notify_never">Értesítések letiltva</string>
   <string name="notify_paused">Értesítések szüneteltetve</string>
+  <string name="pref_picture_compression">Kép tömörítés</string>
+  <string name="pref_picture_compression_summary">Átméretezi és tömöríti a képeket</string>
   <string name="always">Mindig</string>
   <string name="automatically">Automatikusan</string>
   <string name="battery_optimizations_enabled">Akkumulátor optimalizációk engedélyezve</string>
@@ -554,6 +559,7 @@
   <string name="allow">Megenged</string>
   <string name="no_permission_to_access_x">Nincs jogosultságod, hogy hozzáférj ehhez: %s</string>
   <string name="remote_server_not_found">A távoli szerver nem található</string>
+  <string name="remote_server_timeout">Távoli szerver időtúllépés</string>
   <string name="unable_to_update_account">Nem sikerült frissíteni a fiókot</string>
   <string name="report_jid_as_spammer">Jelentse ezt a JID-et, mint nemkívánatos üzenetek küldőjét.</string>
   <string name="pref_delete_omemo_identities">OMEMO identitások törlése</string>
@@ -732,4 +738,10 @@
   <string name="view_media">Multimédia megtekintése</string>
   <string name="media_browser">Multimédia böngésző</string>
   <string name="export_channel_name">Előzmény export</string>
+  <string name="security_violation_not_attaching_file">A fájl ki lett hagyva a biztonság megsértése miatt.</string>
+  <string name="pref_video_compression">Videó minőség</string>
+  <string name="pref_video_compression_summary">Alacsonyabb minőség kisebb fájlt jelent</string>
+  <string name="video_360p">Közepes (360p)</string>
+  <string name="video_720p">Magas (720p)</string>
+  <string name="cancelled">visszavonva</string>
 </resources>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 73bd7556854e9c766a433bf824ace66fbb68c700..ad9d4d8d0a06e83967636e7f311bec5ff7797f53 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -99,7 +99,6 @@
   <string name="pref_never_send_crash_summary">Dengan mengirimkan kesalahan Anda membantu pengembangan Aplikasi Conversations</string>
   <string name="pref_confirm_messages">Konfirmasi Pesan</string>
   <string name="pref_ui_options">UI</string>
-  <string name="openpgp_error">OpenKeychain melaporkan kesalahan</string>
   <string name="accept">Terima</string>
   <string name="error">Sebuah kesalahan terjadi</string>
   <string name="your_account">Akun anda</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 0e0a87a367b39f1d161ff3789c89d124b9eaf1ce..3fd7222772f14eb85830ab479f5a13d1874eaed1 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -121,7 +121,6 @@
   <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="accept">Accetta</string>
   <string name="error">Si è verificato un errore</string>
   <string name="recording_error">Errore</string>
@@ -736,7 +735,7 @@
   <string name="pref_more_notification_settings">Impostazioni di notifica</string>
   <string name="pref_more_notification_settings_summary">Importanza, suono, vibrazione</string>
   <string name="video_compression_channel_name">Compressione video</string>
-  <string name="view_media">Vedi il media</string>
+  <string name="view_media">Vedi i media</string>
   <string name="media_browser">Browser multimediale</string>
   <string name="export_channel_name">Esportazione cronologia</string>
   <string name="security_violation_not_attaching_file">File omesso per violazione di sicurezza.</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 6adddf29a66c21153e0d878af217231be8c62cd4..d6adfd4f76b21426d36b4ed95bd6d13469cd63d2 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -90,7 +90,6 @@
   <string name="pref_never_send_crash">לעולם אל תשלח דיווחי קריסה</string>
   <string name="pref_never_send_crash_summary">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations</string>
   <string name="pref_confirm_messages">אשר הודעות</string>
-  <string name="openpgp_error">אפליקציית OpenKeychain דיווחה על שגיאה</string>
   <string name="accept">קבל</string>
   <string name="error">אירעה שגיאה</string>
   <string name="your_account">החשבון שלך</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index f6477f87d20fcfd3eae98193ad578f0e0ae8ac03..b10164043e285ab45d8b3cc99c668530eee4536b 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -115,7 +115,6 @@
   <string name="pref_confirm_messages">メッセージの確認</string>
   <string name="pref_confirm_messages_summary">あなたがメッセージを受信して読んだときに、連絡先に知らせます</string>
   <string name="pref_ui_options">UI</string>
-  <string name="openpgp_error">OpenKeychain がエラーを報告しました</string>
   <string name="accept">受付</string>
   <string name="error">エラーが発生しました</string>
   <string name="your_account">あなたのアカウント</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 61bd9bbc0bedda588e7a738015ae4df2b7538676..46cd807a8fa0b4e65686990fe41c50a4f315a370 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -107,7 +107,6 @@
   <string name="pref_confirm_messages">메세지 확인 </string>
   <string name="pref_confirm_messages_summary">당신이 메시지를 수신하고 읽을 때 친구에게 그 사실을 알려줍니다</string>
   <string name="pref_ui_options">UI</string>
-  <string name="openpgp_error">OpenKeychain이 오류를 보고합니다 </string>
   <string name="accept">수락 </string>
   <string name="error">오류가 발생했습니다 </string>
   <string name="your_account">당신의 계정 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 23474562f9f6cb3aaa05c2729bd54b1515d85759..ea0a994c0195475e7b7b0cdd8d6868b404286938 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -115,7 +115,6 @@
   <string name="pref_confirm_messages">Bekreft meldinger</string>
   <string name="pref_confirm_messages_summary">Lar dine kontakter vite når du har mottatt og lest deres meldinger</string>
   <string name="pref_ui_options">Grensesnitt</string>
-  <string name="openpgp_error">Feilmelding fra OpenKeychain</string>
   <string name="accept">Godta</string>
   <string name="error">En feil har inntruffet</string>
   <string name="your_account">Din konto</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 044094f21d61c56363f2698fd1aa53e00a81f6ae..2fd7b8746ab132631e7ebf07f68dca55e0b4784d 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -121,7 +121,8 @@
   <string name="pref_confirm_messages">Bevestig berichten</string>
   <string name="pref_confirm_messages_summary">Laat je contacten weten wanneer je hun berichten ontvangen en gelezen hebt</string>
   <string name="pref_ui_options">Gebruikersomgeving</string>
-  <string name="openpgp_error">OpenKeychain rapporteerde een fout</string>
+  <string name="openpgp_error">OpenKeychain rapporteerde een fout.</string>
+  <string name="bad_key_for_encryption">Slechte versleutelingsleutel.</string>
   <string name="accept">Aanvaarden</string>
   <string name="error">Er is een fout opgetreden</string>
   <string name="recording_error">Fout</string>
@@ -745,4 +746,5 @@
   <string name="video_360p">Gemiddeld (360p)</string>
   <string name="video_720p">Hoog (720p)</string>
   <string name="cancelled">geannuleerd</string>
+  <string name="already_drafting_message">Je bent al een bericht aan het opstellen.</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 3582b751b0d034226209af1bdbfbe0f84fcea143..edb78981a59e60c2be77fa33565edc96d4b3986c 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -121,7 +121,6 @@
   <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">Wystąpił błąd OpenKeychain</string>
   <string name="accept">Akceptuj</string>
   <string name="error">Wystąpił błąd</string>
   <string name="recording_error">Błąd</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index b618a0055cf9c0367f03131e5dd6804bd9508158..7b135d0c1d5931c93136d03c1f4b6495a6b7e064 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -77,6 +77,9 @@
   <string name="sharing_files_please_wait">Compartilhando arquivos. Por favor, aguarde...</string>
   <string name="action_clear_history">Limpar o histórico</string>
   <string name="clear_conversation_history">Limpa o histórico de conversas</string>
+  <string name="clear_histor_msg">Deseja realmente excluir todas as mensagens dessa conversa?\n\n<b>Atenção:</b> Isso não excluirá cópias dessas mensagens armazenadas em outros dispositivos ou servidores.</string>
+  <string name="delete_file_dialog">Excluir arquivo</string>
+  <string name="delete_file_dialog_msg">Deseja realmente excluir este arquivo?\n\n<b>Atenção:</b> Isso não excluirá cópias deste arquivo armazenadas em outros dispositivos ou servidores.</string>
   <string name="also_end_conversation">Encerrar essa conversa em seguida</string>
   <string name="choose_presence">Selecione o dispositivo</string>
   <string name="send_unencrypted_message">Enviar mensagem não criptografada</string>
@@ -118,7 +121,6 @@
   <string name="pref_confirm_messages">Confirmação de mensagens</string>
   <string name="pref_confirm_messages_summary">Permite que seus contatos saibam quando você recebeu e leu as mensagens deles.</string>
   <string name="pref_ui_options">IU</string>
-  <string name="openpgp_error">O OpenKeychain informou um erro</string>
   <string name="accept">Aceitar</string>
   <string name="error">Ocorreu um erro</string>
   <string name="recording_error">Erro</string>
@@ -150,6 +152,7 @@
   <string name="account_status_policy_violation">Violação de política</string>
   <string name="account_status_incompatible_server">Servidor incompatível</string>
   <string name="account_status_stream_error">Erro de fluxo</string>
+  <string name="account_status_stream_opening_error">Erro na abertura do fluxo</string>
   <string name="encryption_choice_unencrypted">Descriptografada</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -489,6 +492,8 @@
   <string name="notify_only_when_highlighted">Notificar somente quando for mencionado</string>
   <string name="notify_never">Notificações desabilitadas</string>
   <string name="notify_paused">Notificações pausadas</string>
+  <string name="pref_picture_compression">Compressão de imagem</string>
+  <string name="pref_picture_compression_summary">Redimensiona e comprime as imagens</string>
   <string name="always">Sempre</string>
   <string name="automatically">Automaticamente</string>
   <string name="battery_optimizations_enabled">Otimizações de bateria habilitadas</string>
@@ -554,6 +559,7 @@
   <string name="allow">Permitir</string>
   <string name="no_permission_to_access_x">Sem permissão para acessar %s</string>
   <string name="remote_server_not_found">O servidor remoto não foi encontrado</string>
+  <string name="remote_server_timeout">Tempo esgotado para o servidor remoto</string>
   <string name="unable_to_update_account">Não foi possível atualizar a conta</string>
   <string name="report_jid_as_spammer">Informe que esse JID está enviando mensagens indesejáveis</string>
   <string name="pref_delete_omemo_identities">Excluir identidades OMEMO</string>
@@ -732,4 +738,10 @@
   <string name="view_media">Ver mídia</string>
   <string name="media_browser">Navegador de mídia</string>
   <string name="export_channel_name">Exportar histórico</string>
+  <string name="security_violation_not_attaching_file">Arquivo omitido devido a violação de segurança</string>
+  <string name="pref_video_compression">Qualidade do vídeo</string>
+  <string name="pref_video_compression_summary">Qualidade baixa significa arquivos menores</string>
+  <string name="video_360p">Média (360p)</string>
+  <string name="video_720p">Alta (720p)</string>
+  <string name="cancelled">cancelado</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 009980f4a943f3a63fb73c5474c94033c4970a20..fc8df55d01dc2dbb9fee4dff1ba6e39ff3331c55 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -113,7 +113,6 @@
   <string name="pref_never_send_crash_summary">Ao enviar os stack traces você está a ajudar ao desenvolvimento contínuo de Conversations</string>
   <string name="pref_confirm_messages">Confirmar mensagens</string>
   <string name="pref_ui_options">Interface do Utilizador</string>
-  <string name="openpgp_error">O OpenKeychain reportou um erro</string>
   <string name="accept">Aceitar</string>
   <string name="error">Ocorreu um erro</string>
   <string name="recording_error">Erro</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 04bc6e36b878bcd1fe3ee8cb0079575d59654997..35d53307f3f71316b2adcc688908e298e178819e 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -121,7 +121,6 @@
   <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="accept">Acceptă</string>
   <string name="error">A apărut o eroare</string>
   <string name="recording_error">Eroare</string>
@@ -315,7 +314,7 @@
   <string name="notification_export_logs_title">Se scrie jurnal pe card SD</string>
   <string name="choose_file">Alegeți un fișier</string>
   <string name="receiving_x_file">Primesc %1$s (%2$d%% complet)</string>
-  <string name="download_x_file">Descarca %s</string>
+  <string name="download_x_file">Descarcă %s</string>
   <string name="delete_x_file">Șterge %s</string>
   <string name="file">fișier</string>
   <string name="open_x_file">Deschide %s</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 5306f74e4631df4aa6efdd4de482306b67cc00b0..10876e1895906402e80e1319cfa769d366bceda8 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -120,7 +120,6 @@
   <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="accept">Принять</string>
   <string name="error">Произошла ошибка</string>
   <string name="recording_error">Ошибка</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 250619031eb9152b3874d8d1af28f6de8d99d3ae..adf7f6510dbcac18592303c99dadac2bdf09d30e 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -87,7 +87,6 @@
   <string name="pref_never_send_crash">Neodosielať detaily o zlyhaní aplikácie</string>
   <string name="pref_never_send_crash_summary">Zaslaním detailov o dôvode zlyhania pomáhate ďalšiemu vývoju aplikácie Conversations</string>
   <string name="pref_confirm_messages">Potvrdzovať správy</string>
-  <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
   <string name="accept">Prijať</string>
   <string name="error">Došlo k chybe</string>
   <string name="your_account">Váš účet</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 20f859dec084b20846159a88fd08604c82e91f7a..094b031ee0351dc0e9d68ebdf399b4aab004ab8b 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -118,7 +118,6 @@
   <string name="pref_confirm_messages">Потврди поруке</string>
   <string name="pref_confirm_messages_summary">Обзнаните контактима када примите и прочитате њихове поруке</string>
   <string name="pref_ui_options">Сучеље</string>
-  <string name="openpgp_error">Отворени кључарник је пријавио грешку</string>
   <string name="accept">Прихвати</string>
   <string name="error">Десила се грешка</string>
   <string name="recording_error">Грешка</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index e4e73256aa77125b65d9c6e1cb5410511e5366b2..27f268505351bbd186db0fd839f37b2aefaf435e 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -109,7 +109,6 @@
   <string name="pref_confirm_messages">Bekräfta meddelanden</string>
   <string name="pref_confirm_messages_summary">Låt dina kontakter veta när du har mottagit och läst deras meddelanden</string>
   <string name="pref_ui_options">Gränssnitt</string>
-  <string name="openpgp_error">OpenKeychain rapporterade ett fel</string>
   <string name="accept">Acceptera</string>
   <string name="error">Ett fel har inträffat</string>
   <string name="your_account">Ditt konto</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 93efe9d66a2b1850862772c5fecbca9875f832d6..7aaf4ea8776d6f43a4c9e3483bd292e682ff9159 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -108,7 +108,6 @@
   <string name="pref_confirm_messages">İletileri onayla</string>
   <string name="pref_confirm_messages_summary">Onların iletilerini aldığınızda ve okuduğunuzda, kişilerinizin bunu bilmesini sağlayın</string>
   <string name="pref_ui_options">Arabirim</string>
-  <string name="openpgp_error">OpenKeychain bir hata bildirdi</string>
   <string name="accept">Kabul et</string>
   <string name="error">Bir hata oluştu</string>
   <string name="your_account">Hesabınız</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 821328162a458d12d9b54d2a55713756bc9841a8..d39f6f687fc6e7a65bbf02dee153962b9ab862bd 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -109,7 +109,6 @@
   <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="accept">Прийняти</string>
   <string name="error">Сталася помилка</string>
   <string name="your_account">Ваш обліковий запис</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index b12ddf35e12ec720774392b0ddcee2f560db0f62..d891f402a9ab5ad91f2bc24a5ea652d95219273c 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -108,7 +108,6 @@
   <string name="pref_confirm_messages">Xác nhận tin nhắn</string>
   <string name="pref_confirm_messages_summary">Báo cho liên hệ của bạn biết khi bạn đã nhận và đọc tin nhắn</string>
   <string name="pref_ui_options">UI</string>
-  <string name="openpgp_error">OpenKeychain đã báo cáo một lỗi</string>
   <string name="accept">Chấp thuận</string>
   <string name="error">Đã có lỗi xảy ra</string>
   <string name="your_account">Tài khoản của bạn</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 9b1e9c3b0744f24c2c1f7ba943a3f40c4c423f57..a46722e8477e54724521144c64cc4784ae55c7f6 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -119,7 +119,6 @@
   <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="accept">接受</string>
   <string name="error">产生了一个错误</string>
   <string name="recording_error">错误</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index da55b59ec325aed286a81c66e7fd4b781707e7c3..5332a05a48ffe3bb89f985498434efab1a48fa58 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -109,7 +109,6 @@
   <string name="pref_confirm_messages">確認訊息</string>
   <string name="pref_confirm_messages_summary">讓聯絡人知道它們的訊息已經收到以及讀取</string>
   <string name="pref_ui_options">UI</string>
-  <string name="openpgp_error">OpenKeychain 報告了一個錯誤</string>
   <string name="accept">接受</string>
   <string name="error">產生了一個錯誤</string>
   <string name="your_account">你的帳號</string>