diff --git a/src/conversations/res/values-hr/strings.xml b/src/conversations/res/values-hr/strings.xml
new file mode 100644
index 000000000..093c6d0b9
--- /dev/null
+++ b/src/conversations/res/values-hr/strings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="pick_a_server">Odaberite svog XMPP davatelja usluga.</string>
+    <string name="use_conversations.im">Koristite conversations.im</string>
+    <string name="create_new_account">Napravi novi račun</string>
+    <string name="do_you_have_an_account">Već imate XMPP račun? To može biti slučaj ako već koristite drugi XMPP klijent ili ste prije koristili Razgovore. Ako niste, možete odmah stvoriti novi XMPP račun.\nSavjet: Neki pružatelji usluga e-pošte također nude XMPP račune.</string>
+    <string name="server_select_text">XMPP je mreža za razmjenu izravnih poruka neovisna o pružatelju usluga. Možete koristiti ovaj klijent s bilo kojim XMPP poslužiteljem koji odaberete.\nMeđutim, radi vaše udobnosti olakšali smo kreiranje računa na conversations.im; pružatelj usluga posebno prilagođen za korištenje s Conversations.</string>
+    <string name="magic_create_text_on_x">Pozvani ste na %1$s. Vodit ćemo vas kroz postupak kreiranja računa.\nPrilikom odabira  %1$s pružatelja moći ćete komunicirati s korisnicima drugih pružatelja dajući im svoju punu XMPP adresu.</string>
+    <string name="magic_create_text_fixed">Pozvani ste na %1$s. Korisničko ime je već odabrano za vas. Vodit ćemo vas kroz postupak kreiranja računa.\nMoći ćete komunicirati s korisnicima drugih pružatelja tako da im date svoju punu XMPP adresu.</string>
+    <string name="your_server_invitation">Vaša pozivnica za poslužitelj</string>
+    <string name="improperly_formatted_provisioning">Neispravno formatiran kod za dodjelu</string>
+    <string name="tap_share_button_send_invite">Dodirnite gumb za dijeljenje kako biste svom kontaktu poslali pozivnicu na %1$s.</string>
+    <string name="if_contact_is_nearby_use_qr">Ako je vaš kontakt u blizini, također može skenirati kod u nastavku kako bi prihvatio vašu pozivnicu.</string>
+    <string name="easy_invite_share_text">Pridružite se %1$s i razgovarajte sa mnom: %2$s</string>
+    <string name="share_invite_with">Podijelite pozivnicu s...</string>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml
index 80e81485c..fa1c87bd1 100644
--- a/src/main/res/values-da-rDK/strings.xml
+++ b/src/main/res/values-da-rDK/strings.xml
@@ -294,6 +294,8 @@
     <string name="title_pref_enable_quiet_hours">Aktiver stilletid</string>
     <string name="pref_quiet_hours_summary">Notifikationer vil være lydløs under stilletid</string>
     <string name="pref_expert_options_other">Andre</string>
+    <string name="pref_autojoin">Synkroniser bogmærker</string>
+    <string name="pref_autojoin_summary">Indstil \"autojoin\"-flag, når du går ind i eller forlader en MUC, og reager på ændringer foretaget af andre klienter.</string>
     <string name="toast_message_omemo_fingerprint">OMEMO-fingeraftryk kopieret til udklipsholder</string>
     <string name="conference_banned">Du er udelukket fra denne gruppechat</string>
     <string name="conference_members_only">Denne gruppechat er kun for medlemmer</string>
@@ -301,6 +303,7 @@
     <string name="conference_kicked">Du er blevet smidt ud af denne gruppechat</string>
     <string name="conference_shutdown">Gruppechatten er lukket ned</string>
     <string name="conference_unknown_error">Du er ikke længere i denne gruppechat</string>
+    <string name="conference_technical_problems">Du forlod denne gruppechat af tekniske årsager</string>
     <string name="using_account">anvender konto %s</string>
     <string name="hosted_on">hostet på %s</string>
     <string name="checking_x">Tjekker %s på HTTP vært</string>
@@ -976,4 +979,5 @@
     <string name="account_registrations_are_not_supported">Kontoregistrering er ikke understøttet</string>
     <string name="no_xmpp_adddress_found">Ingen XMPP-adresse fundet</string>
     <string name="account_status_temporary_auth_failure">Midlertidig godkendelsesfejl</string>
+    <string name="delete_avatar">Slet avatar</string>
     </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 928c8311f..7fbc7ec10 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -292,8 +292,10 @@
     <string name="title_pref_quiet_hours_start_time">Beginn</string>
     <string name="title_pref_quiet_hours_end_time">Ende</string>
     <string name="title_pref_enable_quiet_hours">Ruhige Stunden aktivieren</string>
-    <string name="pref_quiet_hours_summary">Benachrichtigungen sind während der ruhigen Stunden stumm.</string>
+    <string name="pref_quiet_hours_summary">Benachrichtigungen sind während der ruhigen Stunden stumm</string>
     <string name="pref_expert_options_other">Sonstiges</string>
+    <string name="pref_autojoin">Lesezeichen synchronisieren</string>
+    <string name="pref_autojoin_summary">Setzt das \"Autojoin\"-Kennzeichen beim Betreten oder Verlassen eines Gruppenchats/Channels und reagiert auf Änderungen durch andere Clients.</string>
     <string name="toast_message_omemo_fingerprint">OMEMO-Fingerabdruck in die Zwischenablage kopiert</string>
     <string name="conference_banned">Du wurdest aus diesem Gruppenchat ausgeschlossen</string>
     <string name="conference_members_only">Dieser Gruppenchat ist nur für Mitglieder</string>
@@ -301,6 +303,7 @@
     <string name="conference_kicked">Du wurdest aus diesem Gruppchat geworfen</string>
     <string name="conference_shutdown">Gruppenchat wurde geschlossen</string>
     <string name="conference_unknown_error">Du bist nicht länger in diesem Gruppenchat</string>
+    <string name="conference_technical_problems">Du hast diesen Gruppenchat aus technischen Gründen verlassen</string>
     <string name="using_account">verwende Konto %s</string>
     <string name="hosted_on">gehostet bei %s</string>
     <string name="checking_x">%s auf HTTP-Host wird überprüft</string>
@@ -471,7 +474,7 @@
     <string name="server_info_broken">Fehlerhaft</string>
     <string name="pref_presence_settings">Status</string>
     <string name="pref_away_when_screen_off">Abwesend bei gesperrtem Gerät</string>
-    <string name="pref_away_when_screen_off_summary">Als abwesend anzeigen, wenn das Gerät gesperrt ist.</string>
+    <string name="pref_away_when_screen_off_summary">Als abwesend anzeigen, wenn das Gerät gesperrt ist</string>
     <string name="pref_dnd_on_silent_mode">Beschäftigt im lautlosen Modus</string>
     <string name="pref_dnd_on_silent_mode_summary">Als Beschäftigt anzeigen, wenn sich das Gerät im lautlosen Modus befindet</string>
     <string name="pref_treat_vibrate_as_silent">Vibration als Lautlos behandeln</string>
@@ -554,7 +557,7 @@
     <string name="presence_xa">Nicht verfügbar</string>
     <string name="presence_dnd">Beschäftigt</string>
     <string name="secure_password_generated">Ein sicheres Passwort wurde erstellt</string>
-    <string name="device_does_not_support_battery_op">Dein Gerät unterstützt kein Ausschalten der Akkuoptimierung</string>
+    <string name="device_does_not_support_battery_op">Dein Gerät unterstützt nicht das Ausschalten der Akkuoptimierung</string>
     <string name="registration_please_wait">Registrierung fehlgeschlagen: Bitte später versuchen</string>
     <string name="registration_password_too_weak">Registrierung fehlgeschlagen: Passwort zu schwach</string>
     <string name="choose_participants">Teilnehmer wählen</string>
@@ -976,4 +979,5 @@
     <string name="account_registrations_are_not_supported">Kontoregistrierungen werden nicht unterstützt</string>
     <string name="no_xmpp_adddress_found">Keine XMPP-Adresse gefunden</string>
     <string name="account_status_temporary_auth_failure">Temporärer Authentifizierungsfehler</string>
+    <string name="delete_avatar">Profilbild löschen</string>
     </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index fce2d4736..04a5cc170 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -297,6 +297,8 @@
     <string name="title_pref_enable_quiet_hours">Habilitar horario de silencio</string>
     <string name="pref_quiet_hours_summary">Las notificaciones serán silenciadas durante el horario de silencio</string>
     <string name="pref_expert_options_other">Otros</string>
+    <string name="pref_autojoin">Sincronizar marcadores</string>
+    <string name="pref_autojoin_summary">Establecer la opción \"unirse automáticamente\" cuando entras o sales de un MUC y reaccionar a las modificaciones realizadas por otros clientes.</string>
     <string name="toast_message_omemo_fingerprint">Huella digital OMEMO copiada al portapapeles</string>
     <string name="conference_banned">Tu entrada a esta conversación en grupo ha sido prohibida</string>
     <string name="conference_members_only">Esta conversación en grupo es solo para miembros</string>
@@ -304,6 +306,7 @@
     <string name="conference_kicked">Has sido expulsado de esta conversación</string>
     <string name="conference_shutdown">La conversación en grupo ha sido cerrada</string>
     <string name="conference_unknown_error">Ya no estás dentro de esta conversación en grupo</string>
+    <string name="conference_technical_problems">Has dejado esta conversación en grupo debido a razones técnicas.</string>
     <string name="using_account">Usando cuenta %s</string>
     <string name="hosted_on">alojado en %s</string>
     <string name="checking_x">Comprobando %s en servidor HTTP</string>
@@ -418,6 +421,7 @@
     <string name="video">vídeo</string>
     <string name="image">imagen</string>
     <string name="vector_graphic">gráfico de vectores</string>
+    <string name="multimedia_file">archivo multimedia</string>
     <string name="pdf_document">documento PDF</string>
     <string name="apk">Android App</string>
     <string name="vcard">Contacto</string>
@@ -988,4 +992,5 @@
     <string name="account_registrations_are_not_supported">Los registros de cuenta no están soportados</string>
     <string name="no_xmpp_adddress_found">Dirección XMPP no encontrada</string>
     <string name="account_status_temporary_auth_failure">Fallo temporal de autenticación</string>
+    <string name="delete_avatar">Eliminar imagen de perfil</string>
     </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 2b52435fe..8c8c00f60 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -294,6 +294,8 @@
     <string name="title_pref_enable_quiet_hours">Establecer horario sen notificacións</string>
     <string name="pref_quiet_hours_summary">As notificacións serán silenciadas durante estas horas</string>
     <string name="pref_expert_options_other">Outro</string>
+    <string name="pref_autojoin">Sincronizar marcadores</string>
+    <string name="pref_autojoin_summary">Poñer marca de \"autojoin\" ao entrar ou deixar unha MUC e reaccionar ás modificacións feitas desde outros clientes.</string>
     <string name="toast_message_omemo_fingerprint">Copiouse a impresión dixital OMEMO ao portapapeis</string>
     <string name="conference_banned">Non podes acceder a esta conversa en grupo</string>
     <string name="conference_members_only">Esta conversa en grupo é so para membros</string>
@@ -301,6 +303,7 @@
     <string name="conference_kicked">Xa foi expulsado de esta conversa en grupo</string>
     <string name="conference_shutdown">A conversa en grupo foi apagada</string>
     <string name="conference_unknown_error">Xa non estás nesta conversa en grupo</string>
+    <string name="conference_technical_problems">Deixaches esta conversa en grupo por razóns técnicas</string>
     <string name="using_account">utilizando a conta %s</string>
     <string name="hosted_on">hospedado en %s</string>
     <string name="checking_x">Comprobando %s no servidor HTTP</string>
@@ -976,4 +979,5 @@
     <string name="account_registrations_are_not_supported">Non está permitido o rexistro de novas contas</string>
     <string name="no_xmpp_adddress_found">Non se atopa un enderezo XMPP</string>
     <string name="account_status_temporary_auth_failure">Fallo temporal da autenticación</string>
+    <string name="delete_avatar">Eliminar avatar</string>
     </resources>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
new file mode 100644
index 000000000..440ee1fed
--- /dev/null
+++ b/src/main/res/values-hr/strings.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Postavke</string>
+    <string name="action_add">Novi razgovor</string>
+    <string name="action_accounts">Upravljanje računima</string>
+    <string name="action_account">Upravljaj računom</string>
+    <string name="action_end_conversation">Zatvori razgovor</string>
+    <string name="action_contact_details">Kontakt podaci</string>
+    <string name="action_muc_details">Pojedinosti grupnog razgovora</string>
+    <string name="channel_details">Detalji kanala</string>
+    <string name="action_add_account">Dodaj račun</string>
+    <string name="action_edit_contact">Uredi ime</string>
+    <string name="action_add_phone_book">Dodaj u adresar</string>
+    <string name="action_delete_contact">Izbriši s popisa</string>
+    <string name="action_block_contact">Blokiraj kontakt</string>
+    <string name="action_unblock_contact">Odblokiraj kontakt</string>
+    <string name="action_block_domain">Blokiraj domenu</string>
+    <string name="action_unblock_domain">Odblokiraj domenu</string>
+    <string name="action_block_participant">Blokiraj sudionika</string>
+    <string name="action_unblock_participant">Deblokiraj sudionika</string>
+    <string name="title_activity_manage_accounts">Upravljanje računima</string>
+    <string name="title_activity_settings">Postavke</string>
+    <string name="title_activity_sharewith">Dijeli s Conversation</string>
+    <string name="title_activity_start_conversation">Započni razgovor</string>
+    <string name="title_activity_choose_contact">Odaberite Kontakt</string>
+    <string name="title_activity_choose_contacts">Odaberite kontakte</string>
+    <string name="title_activity_share_via_account">Dijeli putem računa</string>
+    <string name="title_activity_block_list">Lista blokiranih</string>
+    <string name="just_now">upravo sad</string>
+    <string name="minute_ago">prije 1 min</string>
+    <string name="minutes_ago">prije %d min</string>
+    <plurals name="x_unread_conversations">
+        <item quantity="one">%d nepročitan razgovor</item>
+
+    
+        <item quantity="few">%d nepročitanih razgovora</item>
+
+    
+        <item quantity="other">%d nepročitani razgovori</item>
+
+    </plurals>
+    <string name="sending">slanje…</string>
+    <string name="message_decrypting">Dešifriranje poruke. Molimo pričekajte…</string>
+    <string name="pgp_message">OpenPGP šifrirana poruka</string>
+    <string name="nick_in_use">Nadimak je već u upotrebi</string>
+    <string name="invalid_muc_nick">Nevažeći nadimak</string>
+    <string name="admin">Admin</string>
+    <string name="owner">Vlasnik</string>
+    <string name="moderator">Moderator</string>
+    <string name="participant">Sudionik</string>
+    <string name="visitor">Posjetitelj</string>
+    <string name="remove_contact_text">Želite li ukloniti  %s s popisa kontakata? Razgovori s ovim kontaktom neće biti uklonjeni.</string>
+    <string name="block_contact_text">Želite li blokirati %s da vam šalje poruke?</string>
+    <string name="unblock_contact_text">Želite li deblokirati %s i dopustiti im da vam šalju poruke?</string>
+    <string name="block_domain_text">Blokirati sve kontakte iz %s?</string>
+    <string name="unblock_domain_text">Deblokirati sve kontakte iz %s?</string>
+    <string name="contact_blocked">Kontakt blokiran</string>
+    <string name="blocked">Blokiran</string>
+    <string name="remove_bookmark_text">Želite li ukloniti %s kao oznaku? Razgovori s ovom knjižnom oznakom neće biti uklonjeni.</string>
+    <string name="register_account">Registrirajte novi račun na poslužitelju</string>
+    <string name="change_password_on_server">Promjena lozinke na poslužitelju</string>
+    <string name="share_with">Podijeli s…</string>
+    <string name="start_conversation">Započni razgovor</string>
+    <string name="invite_contact">Pozovi kontakt</string>
+    <string name="invite">Pozovi</string>
+    <string name="contacts">Kontakti</string>
+    <string name="contact">Kontakt</string>
+    <string name="cancel">Otkazati</string>
+    <string name="add">Dodati</string>
+    <string name="edit">Uredi</string>
+    <string name="delete">Obriši</string>
+    <string name="block">Blok</string>
+    <string name="unblock">Odblokiraj</string>
+    <string name="save">Sačuvaj</string>
+    <string name="ok">Ok</string>
+    </resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 37ef96f79..df1331f46 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -297,6 +297,8 @@
     <string name="title_pref_enable_quiet_hours">Attiva ore di quiete</string>
     <string name="pref_quiet_hours_summary">Le notifiche verranno silenziate durante le ore di quiete</string>
     <string name="pref_expert_options_other">Altro</string>
+    <string name="pref_autojoin">Sincronizza i segnalibri</string>
+    <string name="pref_autojoin_summary">Imposta il flag \"auto-entrata\" quando entri o esci da un MUC e reagisci alle modifiche fatte dagli altri client.</string>
     <string name="toast_message_omemo_fingerprint">Impronta OMEMO copiata negli appunti</string>
     <string name="conference_banned">Sei stato bandito da questa chat di gruppo</string>
     <string name="conference_members_only">Questa chat di gruppo è solo per membri</string>
@@ -304,6 +306,7 @@
     <string name="conference_kicked">Sei stato buttato fuori da questa chat di gruppo</string>
     <string name="conference_shutdown">La chat di gruppo è stata chiusa</string>
     <string name="conference_unknown_error">Non sei più in questa chat di gruppo</string>
+    <string name="conference_technical_problems">Hai lasciato questa chat di gruppo per motivi tecnici</string>
     <string name="using_account">usando il profilo %s</string>
     <string name="hosted_on">ospitato su %s</string>
     <string name="checking_x">Controllo %s su host HTTP</string>
@@ -418,6 +421,7 @@
     <string name="video">video</string>
     <string name="image">immagine</string>
     <string name="vector_graphic">grafica vettoriale</string>
+    <string name="multimedia_file">file multimediale</string>
     <string name="pdf_document">Documento PDF</string>
     <string name="apk">Applicazione Android</string>
     <string name="vcard">Contatto</string>
@@ -988,4 +992,5 @@
     <string name="account_registrations_are_not_supported">Le registrazioni di profili non sono supportate</string>
     <string name="no_xmpp_adddress_found">Nessun indirizzo XMPP trovato</string>
     <string name="account_status_temporary_auth_failure">Errore di autenticazione temporaneo</string>
+    <string name="delete_avatar">Elimina avatar</string>
     </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 94335a359..5f1edfc60 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -291,6 +291,7 @@
     <string name="title_pref_enable_quiet_hours">消音時間を有効化</string>
     <string name="pref_quiet_hours_summary">消音時間の間、通知は無音になります</string>
     <string name="pref_expert_options_other">その他</string>
+    <string name="pref_autojoin">ブックマーク同期</string>
     <string name="toast_message_omemo_fingerprint">OMEMO フィンガープリントをクリップボードにコピーしました</string>
     <string name="conference_banned">このグループチャットから出禁にされています</string>
     <string name="conference_members_only">このグループチャットはメンバー制です</string>
@@ -298,6 +299,7 @@
     <string name="conference_kicked">このグループチャットから蹴り出されています</string>
     <string name="conference_shutdown">このグループチャットは閉鎖されました</string>
     <string name="conference_unknown_error">あなたはもうこのグループチャットに参加していません</string>
+    <string name="conference_technical_problems">技術的理由の為、あなたはこのグループチャットを離れました</string>
     <string name="using_account">アカウント %s を使用</string>
     <string name="hosted_on">%s 上でホストされた</string>
     <string name="checking_x">HTTP ホスト上の %s を確認中</string>
@@ -412,6 +414,7 @@
     <string name="video">ビデオ</string>
     <string name="image">画像</string>
     <string name="vector_graphic">ベクター画像</string>
+    <string name="multimedia_file">マルチメディアファイル</string>
     <string name="pdf_document">PDF 文書</string>
     <string name="apk">Android アプリ</string>
     <string name="vcard">連絡先</string>
@@ -956,4 +959,5 @@
     <string name="account_registrations_are_not_supported">アカウント登録はサポートされていません</string>
     <string name="no_xmpp_adddress_found">XMPPアドレスがみつかりません</string>
     <string name="account_status_temporary_auth_failure">一時的な認証失敗</string>
+    <string name="delete_avatar">アバターを削除</string>
     </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 53158925f..75c46057a 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -300,6 +300,8 @@
     <string name="title_pref_enable_quiet_hours">Włącz godziny ciszy</string>
     <string name="pref_quiet_hours_summary">Powiadomienia będą wyciszone w wybranym przedziale czasu</string>
     <string name="pref_expert_options_other">Inne</string>
+    <string name="pref_autojoin">Synchronizuj zakładki</string>
+    <string name="pref_autojoin_summary">Ustaw flagę automatycznego dołączania przy wchodzeniu lub opuszczaniu pokoju i reaguj na zmiany innych klientów</string>
     <string name="toast_message_omemo_fingerprint">Odcisk klucza OMEMO został skopiowany do schowka</string>
     <string name="conference_banned">Zbanowany</string>
     <string name="conference_members_only">Konferencja tylko dla użytkowników</string>
@@ -307,6 +309,7 @@
     <string name="conference_kicked">Wykopany</string>
     <string name="conference_shutdown">Konferencja została zamknięta</string>
     <string name="conference_unknown_error">Nie uczestniczysz już w tej konferencji</string>
+    <string name="conference_technical_problems">Opuszczono rozmowę grupową z powodu usterki technicznej</string>
     <string name="using_account">używając konta %s</string>
     <string name="hosted_on">udostępnione na %s</string>
     <string name="checking_x">Sprawdzanie %s na hoście HTTP</string>
@@ -1003,4 +1006,5 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
     <string name="account_registrations_are_not_supported">Rejestracja kont nie jest wspierana</string>
     <string name="no_xmpp_adddress_found">Nie znaleziono adresu XMPP</string>
     <string name="account_status_temporary_auth_failure">Tymczasowy błąd uwierzytelniania</string>
+    <string name="delete_avatar">Usuń awatar</string>
     </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index fd4b29cc2..58e17a785 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -297,6 +297,8 @@
     <string name="title_pref_enable_quiet_hours">Habilitar horário de sossego</string>
     <string name="pref_quiet_hours_summary">As notificações serão silenciadas no horário de sossego.</string>
     <string name="pref_expert_options_other">Outras</string>
+    <string name="pref_autojoin">Sincronizar favoritos</string>
+    <string name="pref_autojoin_summary">Define a flag \"autojoin\" ao entrar ou sair de uma sala e reage a modificações feitas por outros clientes.</string>
     <string name="toast_message_omemo_fingerprint">Impressão digital OMEMO copiada para a área de transferência</string>
     <string name="conference_banned">Você foi banido desta conversa em grupo</string>
     <string name="conference_members_only">Somente membros podem entrar nessa conversa em grupo</string>
@@ -304,6 +306,7 @@
     <string name="conference_kicked">Você foi retirado desta conversa em grupo</string>
     <string name="conference_shutdown">A conversa em grupo foi encerrada</string>
     <string name="conference_unknown_error">Você não está mais nesta conversa em grupo</string>
+    <string name="conference_technical_problems">Você saiu desta conversa em grupo devido a razões técnicas</string>
     <string name="using_account">usando a conta %s</string>
     <string name="hosted_on">hospedado em %s</string>
     <string name="checking_x">Verificando %s no host HTTP</string>
@@ -989,4 +992,5 @@
     <string name="account_registrations_are_not_supported">O registro de contas não está ativo</string>
     <string name="no_xmpp_adddress_found">Não foi encontrado nenhum endereço XMPP</string>
     <string name="account_status_temporary_auth_failure">Falha temporária na autenticação</string>
+    <string name="delete_avatar">Excluir avatar</string>
     </resources>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 34c5c155f..2f35075a5 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -297,6 +297,8 @@
     <string name="title_pref_enable_quiet_hours">Activează orar de liniște</string>
     <string name="pref_quiet_hours_summary">Notificările vor fi reduse la tăcere în timpul orelor de liniște</string>
     <string name="pref_expert_options_other">Altele</string>
+    <string name="pref_autojoin">Sincronizare semne de carte</string>
+    <string name="pref_autojoin_summary">Setați \"autojoin\" la intrarea sau ieșirea dintr-o discuție de grup și reacționați la modificările efectuate de alți clienți.</string>
     <string name="toast_message_omemo_fingerprint">Amprentă OMEMO copiată în memorie</string>
     <string name="conference_banned">V-a fost interzis accesul la această discuție de grup</string>
     <string name="conference_members_only">Această discuție de grup este rezervată membrilor</string>
@@ -304,6 +306,7 @@
     <string name="conference_kicked">Ați fost dat(ă) afară din această discuție de grup</string>
     <string name="conference_shutdown">Discuția de grup a fost închisă</string>
     <string name="conference_unknown_error">Nu mai sunteți în această discuție de grup</string>
+    <string name="conference_technical_problems">Ați părăsit această discuție de grup din motive tehnice</string>
     <string name="using_account">folosind cont %s</string>
     <string name="hosted_on">găzduit pe %s</string>
     <string name="checking_x">Verifica %s pe gazda HTTP</string>
@@ -989,4 +992,5 @@
     <string name="account_registrations_are_not_supported">Nu este posibilă înregistrarea unui cont</string>
     <string name="no_xmpp_adddress_found">Nu a fost găsită o adresă XMPP</string>
     <string name="account_status_temporary_auth_failure">Eroare temporară de autentificare</string>
+    <string name="delete_avatar">Șterge avatar</string>
     </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index ad19591cf..cca20889f 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -291,6 +291,8 @@
     <string name="title_pref_enable_quiet_hours">启用静默时间段</string>
     <string name="pref_quiet_hours_summary">在静默时间段内通知将保持静音</string>
     <string name="pref_expert_options_other">其他</string>
+    <string name="pref_autojoin">同步书签</string>
+    <string name="pref_autojoin_summary">加入或离开多用户聊天时设置 “autojoin\" 标志，并回应其他客户端所做更改。</string>
     <string name="toast_message_omemo_fingerprint">OMEMO指纹已拷贝到剪贴板</string>
     <string name="conference_banned">您被封禁了</string>
     <string name="conference_members_only">这个群聊只允许成员聊天</string>
@@ -298,6 +300,7 @@
     <string name="conference_kicked">您被从此群聊踢出</string>
     <string name="conference_shutdown">这个群聊已被关闭</string>
     <string name="conference_unknown_error">您已不在该群组</string>
+    <string name="conference_technical_problems">你出于技术原因离开了群聊</string>
     <string name="using_account">使用帐户%s</string>
     <string name="hosted_on">托管于%s</string>
     <string name="checking_x">正在HTTP服务器中检查%s</string>
@@ -963,4 +966,5 @@
     <string name="account_registrations_are_not_supported">不支持注册账户</string>
     <string name="no_xmpp_adddress_found">未找到 XMPP 地址</string>
     <string name="account_status_temporary_auth_failure">临时认证失败</string>
+    <string name="delete_avatar">删除群聊</string>
     </resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index edcacf374..5c21adb4f 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -145,8 +145,10 @@
     <string name="account_status_not_found">未找到伺服器</string>
     <string name="account_status_no_internet">未連接網路</string>
     <string name="account_status_regis_fail">註冊失敗</string>
-    <string name="account_status_regis_conflict"> 用戶名已存在</string>
+    <string name="account_status_regis_conflict">使用者名稱已被使用</string>
     <string name="account_status_regis_success">註冊完成</string>
+    <string name="account_status_regis_not_sup">伺服器不支援註冊</string>
+    <string name="account_status_regis_invalid_token">無效的註冊權杖</string>
     <string name="account_status_policy_violation">違反政策</string>
     <string name="account_status_incompatible_server">伺服器不相容</string>
     <string name="account_status_stream_error">串流錯誤</string>
@@ -162,6 +164,7 @@
     <string name="unpublish_pgp_message">確定要移除上線狀態中的 OpenPGP 公開金鑰嗎？\n這樣一來，你的聯絡人就無法傳送以 OpenPGP 加密的訊息給你了。</string>
     <string name="mgmt_account_enable">啟用帳戶</string>
     <string name="mgmt_account_are_you_sure">確定?</string>
+    <string name="mgmt_account_delete_confirm_text">刪除帳戶將清除您全部的會話記錄</string>
     <string name="attach_record_voice">錄音</string>
     <string name="account_settings_jabber_id">XMPP 位址</string>
     <string name="block_jabber_id">封鎖 XMPP 位址</string>
@@ -186,18 +189,22 @@
     <string name="missing_public_keys">缺少公開金鑰通知</string>
     <string name="last_seen_now">剛剛查看過</string>
     <string name="last_seen_mins">%d 分鐘前查看過</string>
+    <string name="last_seen_hour">一小時前查看過</string>
     <string name="last_seen_hours">%d 小時前查看過</string>
+    <string name="last_seen_day">一天前查看過</string>
     <string name="last_seen_days">%d 天前查看過</string>
     <string name="openpgp_key_id">OpenPGP 金鑰 ID</string>
     <string name="omemo_fingerprint">OMEMO 指紋</string>
     <string name="omemo_fingerprint_x509">v\\OMEMO 指紋</string>
+    <string name="omemo_fingerprint_selected_message">OMEMO 指紋 (訊息來源)</string>
+    <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO 指紋 (訊息來源)</string>
     <string name="other_devices">其他裝置</string>
     <string name="trust_omemo_fingerprints">信任的 OMEMO 指紋</string>
     <string name="fetching_keys">正在擷取金鑰…</string>
     <string name="done">完成</string>
     <string name="decrypt">解密</string>
     <string name="bookmarks">書籤</string>
-    <string name="search">尋找</string>
+    <string name="search">搜尋</string>
     <string name="enter_contact">輸入聯絡人</string>
     <string name="delete_contact">刪除聯絡人</string>
     <string name="view_contact_details">檢視聯絡人詳細資料</string>
@@ -310,7 +317,7 @@
     <string name="no_role">離線</string>
     <string name="outcast">拋棄</string>
     <string name="member">成員</string>
-    <string name="advanced_mode">高級模式</string>
+    <string name="advanced_mode">進階模式</string>
     <string name="grant_admin_privileges">授予管理員許可權</string>
     <string name="remove_admin_privileges">吊銷管理員許可權</string>
     <string name="could_not_change_affiliation">不能修改 %s 的從屬關係</string>
@@ -320,28 +327,34 @@
     <string name="you_are_not_participating">您尚未參與</string>
     <string name="never">從不</string>
     <string name="until_further_notice">直到新的通知</string>
+    <string name="snooze">延遲</string>
+    <string name="reply">回覆</string>
+    <string name="mark_as_read">標示為已讀</string>
     <string name="pref_input_options">輸入</string>
-    <string name="pref_enter_is_send">回車是發送</string>
-    <string name="pref_display_enter_key">顯示回車鍵</string>
-    <string name="pref_display_enter_key_summary">改變表情鍵為回車鍵</string>
+    <string name="pref_enter_is_send">Enter 鍵傳送</string>
+    <string name="pref_display_enter_key">顯示 Enter 鍵</string>
+    <string name="pref_display_enter_key_summary">變更表情符號鍵為 Enter 鍵</string>
     <string name="audio">音訊</string>
     <string name="video">影片</string>
-    <string name="image">圖像</string>
-    <string name="pdf_document">PDF 文檔</string>
-    <string name="apk">Android App</string>
-    <string name="vcard">連絡人</string>
+    <string name="image">圖片</string>
+    <string name="vector_graphic">向量圖形</string>
+    <string name="multimedia_file">多媒體檔案</string>
+    <string name="pdf_document">PDF 文件</string>
+    <string name="apk">Android 應用程式</string>
+    <string name="vcard">聯絡人</string>
     <string name="avatar_has_been_published">頭像已經發佈！</string>
     <string name="sending_x_file">發送中 %s</string>
     <string name="offering_x_file">提供中 %s</string>
     <string name="hide_offline">隱藏離線連絡人</string>
-    <string name="contact_is_typing">%s 正在輸入中…</string>
-    <string name="contact_has_stopped_typing">%s 停止輸入了</string>
-    <string name="contacts_are_typing">%s 正在輸入中…</string>
-    <string name="contacts_have_stopped_typing">%s 停止輸入了</string>
+    <string name="contact_is_typing">%s 正在輸入…</string>
+    <string name="contact_has_stopped_typing">%s 已停止輸入</string>
+    <string name="contacts_are_typing">%s 正在輸入…</string>
+    <string name="contacts_have_stopped_typing">%s 已停止輸入</string>
     <string name="pref_chat_states">鍵盤輸入通知</string>
     <string name="pref_chat_states_summary">讓聯絡人知道你正在寫訊息送給它們</string>
-    <string name="send_location">發送位置</string>
+    <string name="send_location">傳送位置</string>
     <string name="show_location">顯示位置</string>
+    <string name="no_application_found_to_display_location">找不到可以顯示位置的應用程式</string>
     <string name="location">位置</string>
     <string name="title_undo_swipe_out_conversation">Conversation 已關閉</string>
     <string name="pref_dont_trust_system_cas_title">不信任系統的憑證機構</string>
@@ -394,6 +407,8 @@
         <item quantity="other">%d 則訊息</item>
     </plurals>
     <string name="load_more_messages">載入更多訊息</string>
+    <string name="shared_file_with_x">與 %s 分享的檔案</string>
+    <string name="shared_image_with_x">與 %s 分享的圖片</string>
     <string name="sync_with_contacts">與連絡人同步</string>
     <string name="notify_on_all_messages">為所有訊息顯示通知</string>
     <string name="notify_never">關閉通知</string>