diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 190f1531d..01a90bc9c 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -331,7 +331,6 @@
   <string name="copy_omemo_clipboard_description">انسخ بصمة OMEMO إلى الحافظة</string>
   <string name="regenerate_omemo_key">إعادة إنشاء مفتاح أوميمو OMEMO</string>
   <string name="clear_other_devices">حذف أجهزة</string>
-  <string name="error_trustkeys_title">خطأ</string>
   <string name="fetching_history_from_server">جلب المحفوظات من السرفر</string>
   <string name="no_more_history_on_server">لا مزيد من المحفوظات بالسرفر</string>
   <string name="updating">جاري التحديث..</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 30bd63e05..0e6569060 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Няма ключове, които могат да бъдат използвани за този контакт.\nИзтеглянето на нови ключове от сървъра беше неуспешно. Възможно е да има проблем със сървъра на контакта Ви.</string>
   <string name="error_no_keys_to_trust_presence">Няма ключове, които могат да бъдат използвани за този контакт.\nУверете се, че и двамата имате абонамент за присъствието.</string>
   <string name="error_no_keys_to_trust">Няма ключове, които могат да бъдат използвани за този контакт. Ако сте изчистили някои от ключовете му, то той трябва да създаде нови.</string>
-  <string name="error_trustkeys_title">Грешка</string>
   <string name="fetching_history_from_server">Получаване на историята от сървъра</string>
   <string name="no_more_history_on_server">Няма повече история на сървъра</string>
   <string name="updating">Актуализиране…</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 4ecf02828..17cda4bff 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -362,7 +362,6 @@ mentrestant.</string>
   <string name="error_no_keys_to_trust_server_error">No hi ha claus utilitzables per a aquest contacte.\nEls fitxers noves del servidor no han tingut èxit. Potser hi ha alguna cosa malament amb el servidor del vostre contacte.</string>
   <string name="error_no_keys_to_trust_presence">No hi ha claus disponibles per a aquest contacte.\nAssegureu-vos que teniu una subscripció de presència mútua.</string>
   <string name="error_no_keys_to_trust">No hi ha claus disponibles per a aquest contacte. Si heu purgat qualsevol de les claus, heu de generar-ne de noves.</string>
-  <string name="error_trustkeys_title">Error</string>
   <string name="fetching_history_from_server">Anar a cercar la història als servidors</string>
   <string name="no_more_history_on_server">No hi ha més histories al servidor</string>
   <string name="updating">Actualitzant</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 24c889795..d234a3681 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -319,7 +319,6 @@
   <string name="clear_other_devices">Smazat přístroje</string>
   <string name="clear_other_devices_desc">Opravdu chcete vymazat ostatní přístroje z OMEMO upozornění? Až se příště tyto přístroje připojí, znovu se ohlásí, ale pravděpodobně neobdrží zprávy odeslané v mezičase mezi přihlášeními.</string>
   <string name="error_no_keys_to_trust">Pro tento kontakt nejsou dostupné žádné použitelné klíče. Pokud jste smazali jakýkoliv z jeho klíčů bude třeba vygenerovat nové.</string>
-  <string name="error_trustkeys_title">Chyba</string>
   <string name="fetching_history_from_server">Načíst historii ze serveru</string>
   <string name="no_more_history_on_server">Na serveru není žádná další historie</string>
   <string name="updating">Aktualizuji...</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 983ef7ea2..6f2b666ef 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Für diesen Kontakt sind keine nutzbaren Schlüssel verfügbar.\nDas Abrufen neuer Schlüssel vom Server ist fehlgeschlagen. Vielleicht gitb es ein Problem mit dem Server deines Kontaktes.</string>
   <string name="error_no_keys_to_trust_presence">Für diesen Kontakt sind keine benutzbaren Schlüssel verfügbar.\nStelle sicher, dass du den gegenseitigen Online-Status aktiviert hast.</string>
   <string name="error_no_keys_to_trust">Für diesen Kontakt sind keine benutzbaren Schlüssel verfügbar. Falls sie gelöscht wurden, müssen diese neu erstellt werden.</string>
-  <string name="error_trustkeys_title">Fehler</string>
   <string name="fetching_history_from_server">Lade Chatverlauf…</string>
   <string name="no_more_history_on_server">Keine weiteren Nachrichten vorhanden</string>
   <string name="updating">Aktualisieren…</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index ff6b71bbc..6e501a772 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">No hay claves disponibles para este contacto.\nLa búsqueda de nuevas claves en el servidor ha fallado. Puede que haya algún problema con el servidor de tu contacto.</string>
   <string name="error_no_keys_to_trust_presence">No hay claves disponibles para este contacto.\n Asegúrate que tenéis suscripción de presencia mutua. </string>
   <string name="error_no_keys_to_trust">No hay claves disponibles para este contacto. Si has eliminado alguna de sus claves, tus contactos necesitarán generar nuevas claves.</string>
-  <string name="error_trustkeys_title">Error</string>
   <string name="fetching_history_from_server">Buscando historial en el servidor</string>
   <string name="no_more_history_on_server">No hay más historial en el servidor</string>
   <string name="updating">Actualizando…</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 0417b884d..c9bf41932 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Ez dago gako erabilgarririk kontaktu honetarako.\nEzin izan da zerbitzaritik gako berririk eskuratu. Agian akatsen bat dago zure kontaktuaren zerbitzariarekin.</string>
   <string name="error_no_keys_to_trust_presence">Ez dago gako erabilgarririk kontaktu honetarako.\nEgiaztatu ezazu bien arteko presentzia harpidetza duzuela.</string>
   <string name="error_no_keys_to_trust">Kontaktu honetarako gako erabilgarririk ez dago. Bere gakoak purgatu badituzu, berri batzuk sortu behar dituzte.</string>
-  <string name="error_trustkeys_title">Akatsa</string>
   <string name="fetching_history_from_server">Mezuak zerbitzaritik eskuratzen</string>
   <string name="no_more_history_on_server">Mezu gehiagorik ez zerbitzarian</string>
   <string name="updating">Eguneratzen...</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 6e4310c82..48870a0fd 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Aucune clef utilisable pour ce contact. \nL\'obtention de nouvelles clefs depuis le serveur a échoué. Il pourrait y avoir un problème avec le serveur de votre contact. </string>
   <string name="error_no_keys_to_trust_presence">Il n\'y a aucune clé utilisable disponible pour ce contact.\nAssurez-vous d\'avoir un abonnement de présence mutuelle.</string>
   <string name="error_no_keys_to_trust">il n\'y a pas de clef disponible pour ce contact. Si vous avez purgé toutes ses clefs, il doit en générer de nouvelles.</string>
-  <string name="error_trustkeys_title">Erreur</string>
   <string name="fetching_history_from_server">Récupération de l\'historique sur le serveur</string>
   <string name="no_more_history_on_server">Plus d\'historique sur le serveur</string>
   <string name="updating">Mise à jour…</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 3adb1a950..10eafb107 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Non hai chaves dispoñibles que se poidan usar con este contacto.\nNon se puideron obter novas chaves do servidor. Quizáis hai algún problema coas chaves do seu contacto.</string>
   <string name="error_no_keys_to_trust_presence">Non hai chaves utilizables dispoñibles para este contacto.\nAsegúrese de que ambos teñen mutua suscrición de presenza.</string>
   <string name="error_no_keys_to_trust">Non hai chaves utilizables dispoñibles para este contacto. Si eliminou algunha das chaves do contacto, precisan xerar unhas novas.</string>
-  <string name="error_trustkeys_title">Fallo</string>
   <string name="fetching_history_from_server">Obtendo historial desde o servidor</string>
   <string name="no_more_history_on_server">Non hai máis historial no servidor</string>
   <string name="updating">Actualizando....</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 74853fe0b..e85e2f945 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Ehhez a kapcsolathoz nem áll rendelkezésre használható kulcs.\n A kiszolgáló új kulcsainak letöltése sikertelen volt. Talán van valami baj a kapcsolattartó szerverével.</string>
   <string name="error_no_keys_to_trust_presence">Ehhez a kapcsolathoz nem áll rendelkezésre használható kulcs.\nGyőződjön meg róla, hogy kölcsönösen felíratkoztak egymás állapotfrissítéseire.</string>
   <string name="error_no_keys_to_trust">Ehhez a kapcsolathoz nem áll rendelkezésre használható kulcs. Ha törölted valamelyik kulcsukat, akkor újakat kell létrehoznod.</string>
-  <string name="error_trustkeys_title">Hiba</string>
   <string name="fetching_history_from_server">Előzmények lekérése a szerverről</string>
   <string name="no_more_history_on_server">Nincs több előzmény a szerveren</string>
   <string name="updating">Frissítés...</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 127336a83..583925f4e 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -280,7 +280,6 @@
   <string name="account_image_description">Avatar akun</string>
   <string name="copy_otr_clipboard_description">Salin OTR fingerprint ke clipboard</string>
   <string name="clear_other_devices">Bersihkan perangkat</string>
-  <string name="error_trustkeys_title">Error</string>
   <string name="fetching_history_from_server">Mengambil data dari server</string>
   <string name="no_more_history_on_server">Tidak ada data lagi di server</string>
   <string name="updating">Merubah...</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 6765c3004..6ff2b33b9 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Non ci sono chiavi utilizzabili per questo contatto.\nRicezione di nuovi chiavi dal server non riuscita. Forse qualcosa non va con il server del tuo contatto.</string>
   <string name="error_no_keys_to_trust_presence">Non ci sono chiavi utilizzabili per questo contatto.\nAssicurati di avere reciprocamente la sottoscrizione sulla presenza.</string>
   <string name="error_no_keys_to_trust">Non ci sono chiavi usabili per questo contatto. Se hai cancellato qualsiasi loro chiave, devono generarne di nuove.</string>
-  <string name="error_trustkeys_title">Errore</string>
   <string name="fetching_history_from_server">Caricamento della cronologia dal server</string>
   <string name="no_more_history_on_server">Fine cronologia sul server</string>
   <string name="updating">Caricamento…</string>
@@ -717,4 +716,13 @@
   <string name="mtm_cert_expired">Il certificato del server è scaduto.</string>
   <string name="mtm_accept_servername">Accetti il nome del server non corrispondente?</string>
   <string name="mtm_hostname_mismatch">Il server non ha potuto autenticarsi come \"%s\". Il certificato è valido solo per:</string>
+  <string name="mtm_connect_anyway">Vuoi connetterti comunque?</string>
+  <string name="mtm_cert_details">Dettagli certificato:</string>
+  <string name="mtm_notification">Verifica del certificato</string>
+  <string name="once">Una volta sola</string>
+  <string name="qr_code_scanner_needs_access_to_camera">Lo scanner di codici QR ha bisogno di accedere alla fotocamera</string>
+  <string name="pref_scroll_to_bottom">Scorri in fondo</string>
+  <string name="pref_scroll_to_bottom_summary">Scorri in basso dopo l\'invio di un messaggio</string>
+  <string name="edit_status_message_title">Modifica messaggio di stato</string>
+  <string name="edit_status_message">Modifica il messaggio di stato</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 4e04cb317..a91bf02a3 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -275,7 +275,6 @@
   <string name="clear_other_devices">נקה מכשירים</string>
   <string name="clear_other_devices_desc">האם אתה בטוח שברצונך לנקות את כל המכשירים מהכרזת ה OMEMO? בפעם הבאה שהמכשירים יתחברו, הם יכריזו שוב על עצמם, אך הם עלולים לאבד הודעות עד להכרזה זו.</string>
   <string name="error_no_keys_to_trust">אין מפתחות שימושיים עבור איש קשר זה. אם מחקת אחד מהמפתחות שלהם, יהיה עליהם ליצר מפתח חדש.</string>
-  <string name="error_trustkeys_title">שגיאה</string>
   <string name="fetching_history_from_server">הורדת היסטוריה מהשרת</string>
   <string name="no_more_history_on_server">אין עוד היסטוריה בשרת</string>
   <string name="updating">מעדכן...</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 8d2d3875a..22114701e 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -332,7 +332,6 @@
   <string name="error_no_keys_to_trust_server_error">この連絡先で使用可能な鍵がありません。\nサーバーから新しい鍵を取得できませんでした。連絡先のサーバーに問題がある可能性があります。</string>
   <string name="error_no_keys_to_trust_presence">この連絡先で利用可能な鍵はありません。\n相互存在サブスクリプションあることを確認してください。</string>
   <string name="error_no_keys_to_trust">この連絡先で利用可能な鍵はありません。あなたがその鍵を消去している場合は、新しいものを生成してもらう必要があります。</string>
-  <string name="error_trustkeys_title">エラー</string>
   <string name="fetching_history_from_server">サーバーから履歴を取得中</string>
   <string name="no_more_history_on_server">サーバーにこれ以上履歴はありません</string>
   <string name="updating">アップデート中…</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 453fea88e..f009dcd1d 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -324,7 +324,6 @@
   <string name="clear_other_devices">기기 제거</string>
   <string name="clear_other_devices_desc">OMEMO 선언으로부터 모든 기기를 지우시겠습니까? 다음에 기기들이 접속할 때, 기기들이 스스로 다시 선언하지만, 그 동안에 보내진 메세지는 받지 못할수도 있습니다.</string>
   <string name="error_no_keys_to_trust">이 연락처에 사용할 수 있는 키가 없습니다. 당신이 그들의 키 중에서 어떤 것이든 제거했다면, 그들이 새로운 키를 만들어야 합니다.</string>
-  <string name="error_trustkeys_title">오류</string>
   <string name="fetching_history_from_server">서버로부터 기록 가져오는중 </string>
   <string name="no_more_history_on_server">서버에 더이상 기록이 없습니다 </string>
   <string name="updating">업데이트중...</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index e9cf21598..4de1ffb63 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Ingen brukbare tilgjengelig for denne kontakten.\nInnhenting av nye nøkler fra tjeneren mislyktes. Kanskje det er noe galt med din kontakts tjener.</string>
   <string name="error_no_keys_to_trust_presence">Det er ingen brukvare nøkler tilgjengelig for denne kontakten.\nForsikre deg om at dere begge abonnerer på hverandres tilstedeværelse.</string>
   <string name="error_no_keys_to_trust">Ingen brukbare nøkler tilgjengelige for denne kontakten. Hvis du har tilintetgjort noen av nøklene deres, må de generere nye.</string>
-  <string name="error_trustkeys_title">Feil</string>
   <string name="fetching_history_from_server">Henter inn historikk fra tjener</string>
   <string name="no_more_history_on_server">Ikke mer historikk på tjeneren</string>
   <string name="updating">Oppdaterer…</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 0e1509408..5435ac525 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Er zijn geen bruikbare sleutels beschikbaar voor dit contact.\nOphalen van nieuwe sleutels van de server is mislukt. Misschien is er iets mis met de server van je contact.</string>
   <string name="error_no_keys_to_trust_presence">Er zijn geen bruikbare sleutels beschikbaar voor dit contact.\nZorg dat je allebei op elkaars aanwezigheidsupdates bent geabonneerd.</string>
   <string name="error_no_keys_to_trust">Er zijn geen bruikbare sleutels beschikbaar voor dit contact. Als je zijn/haar sleutels hebt verwijderd dient hij/zij nieuwe aan te maken.</string>
-  <string name="error_trustkeys_title">Fout</string>
   <string name="fetching_history_from_server">Geschiedenis van server halen</string>
   <string name="no_more_history_on_server">Geen verdere geschiedenis op server</string>
   <string name="updating">Bijwerken…</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index d07a3155e..4c380c458 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -364,7 +364,6 @@
   <string name="error_no_keys_to_trust_server_error">Nie ma dostępnych kluczy dla tego kontaktu.\nPobieranie nowych kluczy z serwera nie powiodło się. Być może jest coś nie tak z serwerem kontaktu?</string>
   <string name="error_no_keys_to_trust_presence">Brak dostępnych kluczy dla tego kontaktu.\nUpewnij się, że wzajemnie powiadamiacie się o obecności.</string>
   <string name="error_no_keys_to_trust">Nie ma dostępnych żadnych użytecznych kluczy dla tego kontaktu. Jeśli usunąłeś jakieś jego klucze, kontakt będzie musiał wygenerować nowe.</string>
-  <string name="error_trustkeys_title">Błąd</string>
   <string name="fetching_history_from_server">Pobieranie historii z serwera</string>
   <string name="no_more_history_on_server">Koniec historii na serwerze</string>
   <string name="updating">Aktualizowanie...</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 21a07a1b6..66c573061 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Não existe nenhuma chave utilizável disponível para este contato.\nA obtenção de novas chaves no servidor não foi bem sucedida. Pode ser que tenha algum problema com o servidor do seu contato.</string>
   <string name="error_no_keys_to_trust_presence">Não existem chaves em condições de uso para esse contato.\nCertifique-se de que existem requisições de presença mútuas.</string>
   <string name="error_no_keys_to_trust">Não existe nenhuma chave utilizável para esse contato. Caso você tenha expurgado alguma chave dele, ele terá que gerar uma nova.</string>
-  <string name="error_trustkeys_title">Erro</string>
   <string name="fetching_history_from_server">Obtendo histórico do servidor</string>
   <string name="no_more_history_on_server">Nenhum outro histórico do servidor</string>
   <string name="updating">Atualizando...</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 643bd62cb..c4c976f7b 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -309,7 +309,6 @@
   <string name="clear_other_devices">Apagar dispositivos</string>
   <string name="clear_other_devices_desc">Tem a certeza que quer apagar todos os outros dispositivos do anúncio OMEMO? A próxima vez que os seus dispositivos se conectem, irão ser eles mesmos a fazerem o anúncio novamente, mas podem não receber as mensagems enviadas entretanto.</string>
   <string name="error_no_keys_to_trust">Não existem chaves disponíveis para serem utilizadas para este contacto. Se removeu alguma das chaves dele, ele irá necessitar de gerar chaves novas. </string>
-  <string name="error_trustkeys_title">Erro</string>
   <string name="fetching_history_from_server">Obtendo o histórico do servidor</string>
   <string name="no_more_history_on_server">Não existe mais histórico no servidor</string>
   <string name="updating">A atualizar...</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index c7d8ad800..6c5e96c5a 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Nu există chei utilizabile pentru acest contact.\nÎncercarea de a descărca chei noi de pe server a eșuat. Se poate ca serverul contactului dumneavoastră să aibă o problemă.</string>
   <string name="error_no_keys_to_trust_presence">Nu există chei disponibile ce pot fi folosite pentru acest contact.\nAsigurați-vă că ați activat trimiterea de actualizări de prezență reciproce.</string>
   <string name="error_no_keys_to_trust">Nu exista chei disponibile și utilizabile pentru acest contact. Dacă ați șters vreuna din cheile contactului, acesta va trebuii să genereze una noua.</string>
-  <string name="error_trustkeys_title">Eroare</string>
   <string name="fetching_history_from_server">Descarc istoric de pe server</string>
   <string name="no_more_history_on_server">Nu mai exista istoric pe server</string>
   <string name="updating">Actualizare...</string>
@@ -568,7 +567,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="create_account">Creează cont</string>
   <string name="use_own_provider">Folosește furnizorul meu</string>
   <string name="pick_your_username">Alegeți un nume de utilizator</string>
-  <string name="pref_manually_change_presence">Setare disponibilitatea manual</string>
+  <string name="pref_manually_change_presence">Setează disponibilitate manual</string>
   <string name="pref_manually_change_presence_summary">Setați-vă disponibilitatea atunci când vă editați mesajul de stare.</string>
   <string name="change_presence">Setare prezență</string>
   <string name="status_message">Mesaj de stare</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 84e6ea070..9f805cb05 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">Для этого контакта не существует доступных ключей.\nПопытка получения новых ключей с сервера оказалась неудачной. Возможно, что-то не так с сервером вашего собеседника.</string>
   <string name="error_no_keys_to_trust_presence">Нет доступных ключей для данного контакта.\nУбедитесь, что у вас есть подписка на взаимное присутствие.</string>
   <string name="error_no_keys_to_trust">Для этого контакта не существует доступных ключей. Если вы очистили все его ключи, ему необходимо создать новые.</string>
-  <string name="error_trustkeys_title">Ошибка</string>
   <string name="fetching_history_from_server">Получение истории с сервера</string>
   <string name="no_more_history_on_server">На сервере больше нет истории</string>
   <string name="updating">Обновление…</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index cd9289d27..01cf47769 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -269,7 +269,6 @@
   <string name="account_image_description">Avatar účtu</string>
   <string name="copy_otr_clipboard_description">Skopírovať OTR identifikátor do schránky</string>
   <string name="copy_omemo_clipboard_description">Skopírovať OMEMO identifikátor do schránky</string>
-  <string name="error_trustkeys_title">Chyba</string>
   <string name="fetching_history_from_server">Načítať históriu zo serveru</string>
   <string name="no_more_history_on_server">Na serveri nie je žiadna ďalšia história</string>
   <string name="updating">Aktualizujem...</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index be81e3520..408189b90 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -329,7 +329,6 @@
   <string name="clear_other_devices">Очисти уређаје</string>
   <string name="clear_other_devices_desc">Желите ли заиста да уклоните све остале уређаје са ОМЕМО објаве? Када се ваши уређаји следећи пут повежу, објавиће се сами, али у међувремену можда неће примати поруке.</string>
   <string name="error_no_keys_to_trust">Нема употребљивих кључева за овај контакт. Ако сте очистили било који од тих кључева, контакт мора да генерише нови.</string>
-  <string name="error_trustkeys_title">Грешка</string>
   <string name="fetching_history_from_server">Добављам историјат са сервера</string>
   <string name="no_more_history_on_server">Нема више историјата на серверу</string>
   <string name="updating">Ажурирам…</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index f9d0b2d66..e1710869b 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -329,7 +329,6 @@
   <string name="clear_other_devices">Rensa enheter</string>
   <string name="clear_other_devices_desc">Är du säker på att du vill rensa alla andra enheter från OMEMO-annonsering? Nästa gång dina enheter ansluter kommer de att återannonsera sig, men de kanske inte tar emot enheter under tiden.</string>
   <string name="error_no_keys_to_trust">Det finns inga användbara nycklar tillgängliga för den här kontakten. Om du har rensat någon av dennes nycklar behöver de generera nya.</string>
-  <string name="error_trustkeys_title">Fel</string>
   <string name="fetching_history_from_server">Hämtar historik från server</string>
   <string name="no_more_history_on_server">Ingen mer historik på server</string>
   <string name="updating">Uppdaterar…</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 81661c482..0178455e1 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -325,7 +325,6 @@
   <string name="clear_other_devices">Aygıtları sil</string>
   <string name="clear_other_devices_desc">OMEMO bildirimindeki diğer aygıtların hepsini silmek istediğinizden emin misiniz? Aygıtlarınız yeniden bağlandıklarında kendilerini yeniden bildirecekler ama bu süre zarfındaki iletileri alamayabilirler.</string>
   <string name="error_no_keys_to_trust">Bu kişi için kullanılabilecek bir anahtar bulunmuyor. Eğer anahtarlarını sildiyseniz, yeni anahtar oluşturmaları gerekiyor.</string>
-  <string name="error_trustkeys_title">Hata</string>
   <string name="fetching_history_from_server">Sunucudan geçmiş alınıyor</string>
   <string name="no_more_history_on_server">Sunucuda başka geçmiş kalmadı</string>
   <string name="updating">Güncelleniyor…</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index bb0f1f52f..cb952f70f 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -331,7 +331,6 @@
   <string name="clear_other_devices_desc">Ви певні, що хочете стерти всі інші пристрої з OMEMO-оголошення? Наступного разу, коли Ваші пристрої приєднаються, вони знову оголосять про себе, але вони можуть не отримати повідомлення, які можуть бути надіслані тим часом. </string>
   <string name="error_no_keys_to_trust_presence">Немає ключів для цього контакту.\nПеревірте, що ви взаємно підписані на присутність.</string>
   <string name="error_no_keys_to_trust">Немає ключів, які би можна було використати для цього контакта. Якщо ви очистили які-небудь з їх ключів, їм потрібно згенерувати нові.</string>
-  <string name="error_trustkeys_title">Помилка</string>
   <string name="fetching_history_from_server">Отримую історію з сервера</string>
   <string name="no_more_history_on_server">Більше немає історії на сервері</string>
   <string name="updating">Оновлюю…</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 2db4d5bf1..9f034b5f7 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -311,7 +311,6 @@
   <string name="clear_other_devices">Xoá các thiết bị</string>
   <string name="clear_other_devices_desc">Có chắc là bạn muốn xoá toàn bộ các thiết bị khác khỏi thông báo OMEMO? Lần sau khi kết nối, các thiết bị sẽ tự thông báo lại nhưng có khả năng chúng sẽ không nhận được tin nhắn đã gửi trong khoảng thời gian đó.</string>
   <string name="error_no_keys_to_trust">Không còn khoá nào sẵn có cho liên hệ này. Nếu bạn đã xoá bất kỳ khoá nào, họ phải tạo khoá mới.</string>
-  <string name="error_trustkeys_title">Lỗi</string>
   <string name="fetching_history_from_server">Đang nhận lịch sử từ máy chủ</string>
   <string name="no_more_history_on_server">Không còn lịch sử nào trên máy chủ</string>
   <string name="updating">Đang cập nhật...</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index d1767c606..7fee251df 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -363,7 +363,6 @@
   <string name="error_no_keys_to_trust_server_error">没有找到可以的密钥。\n服务器似乎发生错误，无法获取新的密钥。 </string>
   <string name="error_no_keys_to_trust_presence">没有可以用于这个账户的密钥。请确保你有相互的在线状态的订阅。</string>
   <string name="error_no_keys_to_trust">此联系人没有可用的密钥。如果你曾经清除过他们的密钥，那么需要他们生成新的密钥。</string>
-  <string name="error_trustkeys_title">错误</string>
   <string name="fetching_history_from_server">从服务器获取历史记录</string>
   <string name="no_more_history_on_server">服务器上没有更多历史记录</string>
   <string name="updating">更新中…</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 34b8f705c..e715e8666 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -329,7 +329,6 @@
   <string name="clear_other_devices">清除設備</string>
   <string name="clear_other_devices_desc">你想清除所有其他設備的 OMEMO 通告？下次你的設備連接，將會重新收到通告，但也許將不會收到當時你發送的消息。</string>
   <string name="error_no_keys_to_trust">此連絡人沒有可用的金鑰。如果你曾經清除過他們的金鑰，那麼需要他們生成新的金鑰。</string>
-  <string name="error_trustkeys_title">錯誤</string>
   <string name="fetching_history_from_server">從伺服器獲取歷史記錄</string>
   <string name="no_more_history_on_server">伺服器上沒有更多歷史記錄</string>
   <string name="updating">更新中…</string>