diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index fabfeadd4..46c8f6996 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -216,7 +216,6 @@
   <string name="delete_bookmark">إحذف من المفضلة</string>
   <string name="bookmark_already_exists">موجوده بالمفضلة سابقا</string>
   <string name="action_edit_subject">تعديل موضوع مجموعة المحادثة</string>
-  <string name="edit_subject_hint">موضوع مجموعة المحادثة</string>
   <string name="joining_conference">في صدد الإنظمام إلى مجموعة المحادثة ...</string>
   <string name="leave">غادر</string>
   <string name="contact_added_you">جهة اتصال أضافتك </string>
@@ -258,7 +257,6 @@
   <string name="pref_quiet_hours_summary">سوف تكتم التنبيهات إبان ساعات السكون</string>
   <string name="pref_use_indicate_received">طلب تقارير تسليم الرسائل</string>
   <string name="pref_expert_options_other">أخرى</string>
-  <string name="pref_conference_name">إسم مجموعة المحادثة</string>
   <string name="pref_autojoin">إنضمام تلقائي إلى فِرَق المحادثة</string>
   <string name="toast_message_omemo_fingerprint">تم نسخ بصمة OMEMO إلى الحافظة !</string>
   <string name="conference_banned">حسابك محظور للإلتحاق بمجموعة المحادثة هذه</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 5685cf52d..32a034712 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -228,7 +228,6 @@
   <string name="delete_bookmark">Изтриване на отметка</string>
   <string name="bookmark_already_exists">Вече съществува такава отметка</string>
   <string name="action_edit_subject">Редактиране на темата на груповия разговор</string>
-  <string name="edit_subject_hint">Темата на този групов разговор</string>
   <string name="joining_conference">Присъединяване в групов разговор…</string>
   <string name="leave">Напускане</string>
   <string name="contact_added_you">Контактът е добавен във Вашия списък от контакти</string>
@@ -277,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">Получените съобщения ще бъдат отбелязани със зелена отметка, ако това се поддържа</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Оцветяване на бутона за изпращане в зависимост от състоянието на контакта</string>
   <string name="pref_expert_options_other">Други</string>
-  <string name="pref_conference_name">Име на груповия разговор</string>
-  <string name="pref_conference_name_summary">Използване на темата вместо JID за идентифициране на груповите разговори</string>
   <string name="pref_autojoin">Автоматично присъединяване в груповите разговори</string>
   <string name="pref_autojoin_summary">Спазване на флага за автоматично присъединяване в отметките на груповите разговори</string>
   <string name="toast_message_omemo_fingerprint">Отпечатъкът OMEMO е копиран!</string>
@@ -715,4 +712,7 @@
   <string name="p1_s3_filetransfer">Споделяне на файлове през HTTP за S3</string>
   <string name="pref_start_search">Директно търсене</string>
   <string name="pref_start_search_summary">На екрана за „Започване на разговор“ да се отваря клавиатурата и да се поставя курсорът в полето за търсене</string>
+  <string name="group_chat_avatar">Аватар на груповия разговор</string>
+  <string name="host_does_not_support_group_chat_avatars">Сървърът не поддържа аватари за груповите разговори</string>
+  <string name="only_the_owner_can_change_group_chat_avatar">Само собственикът може да променя аватара на груповия разговор</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index bedf87cae..f57b374cc 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -227,7 +227,6 @@
   <string name="delete_bookmark">Elimina dels marcadors</string>
   <string name="bookmark_already_exists">Aquest marcador ja existeix</string>
   <string name="action_edit_subject">Edita el tema del xat de grup</string>
-  <string name="edit_subject_hint">El tema d\'aquest xat de grup</string>
   <string name="joining_conference">S\'està unint al xat de grup...</string>
   <string name="leave">Surt</string>
   <string name="contact_added_you">S\'ha afegit el contacte a la llista de contactes</string>
@@ -276,8 +275,6 @@
   <string name="pref_use_indicate_received_summary">Els missatges rebuts seràn marcats amb uns ticks verds si ho admet</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Pintar el botó d\'enviament per indicar l\'estatus del contacte</string>
   <string name="pref_expert_options_other">Altres</string>
-  <string name="pref_conference_name">Nom del xat de grup</string>
-  <string name="pref_conference_name_summary">Utilitzeu el tema en comptes de JID per identificar els xats del grup</string>
   <string name="pref_autojoin">Uniu-vos automàticament als xats de grup</string>
   <string name="pref_autojoin_summary">Respecta l\'indicador d\'autoentrada als marcadors de xat de grup</string>
   <string name="toast_message_omemo_fingerprint">S\'ha copiat l\'empremta digital d\'OMEMO al porta-retalls.</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index a665b409c..d5d6c3d22 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -228,7 +228,6 @@
   <string name="delete_bookmark">Von Kontaktliste entfernen</string>
   <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string>
   <string name="action_edit_subject">Gruppenchatthema bearbeiten</string>
-  <string name="edit_subject_hint">Thema des Gruppenchats</string>
   <string name="joining_conference">Gruppenchat wird beigetreten…</string>
   <string name="leave">Verlassen</string>
   <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string>
@@ -277,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häkchen markiert. Bitte beachte, dass dies nicht in allen Fällen funktioniert.</string>
   <string name="pref_use_send_button_to_indicate_status_summary">\"Senden\"-Schaltfläche einfärben, um den Online-Status des Kontakts anzuzeigen</string>
   <string name="pref_expert_options_other">Sonstiges</string>
-  <string name="pref_conference_name">Gruppenchatname</string>
-  <string name="pref_conference_name_summary">Thema des Gruppenchats anstatt JID als Namen verwenden</string>
   <string name="pref_autojoin">Gruppenchats automatisch beitreten</string>
   <string name="pref_autojoin_summary">Autojoin-Flag in Gruppenchatlesezeichen beachten</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-Fingerabdruck in die Zwischenablage kopiert!</string>
@@ -715,4 +712,7 @@
   <string name="p1_s3_filetransfer">HTTP-Dateifreigabe für S3</string>
   <string name="pref_start_search">Direkte Suche </string>
   <string name="pref_start_search_summary">Beim Dialog \'Unterhaltung beginnen\' Tastatur öffnen und den Cursor im Suchfeld platzieren</string>
+  <string name="group_chat_avatar">Gruppenchat-Avatar</string>
+  <string name="host_does_not_support_group_chat_avatars">Host unterstützt keine Gruppenchat-Avatare</string>
+  <string name="only_the_owner_can_change_group_chat_avatar">Nur der Eigentümer kann den Gruppenchat-Avatar ändern.</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index afc4756bd..a1d744ca1 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -217,7 +217,6 @@
   <string name="delete_bookmark">Διαγραφή σελιδοδείκτη</string>
   <string name="bookmark_already_exists">Αυτός ο σελιδοδείκτης υπάρχει ήδη</string>
   <string name="action_edit_subject">Επεξεργασία θέματος ομαδικής συζήτησης</string>
-  <string name="edit_subject_hint">Το θέμα της ομαδικής συζήτησης</string>
   <string name="joining_conference">Συμμετοχή σε ομαδική συζήτηση...</string>
   <string name="leave">Έξοδος</string>
   <string name="contact_added_you">Η επαφή σας πρόσθεσε στην λίστα επαφών</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index c5649618e..fcb9f3712 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -228,7 +228,6 @@
   <string name="delete_bookmark">Eliminar marcador</string>
   <string name="bookmark_already_exists">Este marcador ya existe</string>
   <string name="action_edit_subject">Editar asunto de la conversación</string>
-  <string name="edit_subject_hint">El asunto de esta conversación en grupo</string>
   <string name="joining_conference">Uniéndose a conversación...</string>
   <string name="leave">Salir</string>
   <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
@@ -277,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">Cuando el contacto reciba el mensaje será indicado con una marca verde. Cuidado, esto podría no funcionar en todos los casos.</string>
   <string name="pref_use_send_button_to_indicate_status_summary">El color del botón enviar indica el estado del contacto</string>
   <string name="pref_expert_options_other">Otros</string>
-  <string name="pref_conference_name">Nombre en la conversaciones en grupo</string>
-  <string name="pref_conference_name_summary">Usar el asunto de la conversación en lugar del identificador jabber como nombre en las conversaciones en grupo</string>
   <string name="pref_autojoin">Unirse automáticamente a conversaciones en grupo</string>
   <string name="pref_autojoin_summary">Respetar la opción de los marcadores de unirse automáticamente a las conversaciones en grupo</string>
   <string name="toast_message_omemo_fingerprint">¡Huella digital OMEMO copiada al portapapeles!</string>
@@ -715,4 +712,7 @@
   <string name="p1_s3_filetransfer">Compartición de Archivos mediante S3</string>
   <string name="pref_start_search">Búsqueda directa</string>
   <string name="pref_start_search_summary">En la pantalla de \'Nueva Conversación\' abrir el teclado y poner el cursor en el campo de búsqueda</string>
+  <string name="group_chat_avatar">Avatar de la conversación en grupo</string>
+  <string name="host_does_not_support_group_chat_avatars">El servidor no soporta avatares en conversaciones en grupo</string>
+  <string name="only_the_owner_can_change_group_chat_avatar">Solo el propietario de la conversación puede cambiar el avatar</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 3fd311ad3..e03a1c10b 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -228,7 +228,6 @@
   <string name="delete_bookmark">Laster-marka ezabatu</string>
   <string name="bookmark_already_exists">Laster-marka hau existitzen da dagoeneko</string>
   <string name="action_edit_subject">Taldearen gaia editatu</string>
-  <string name="edit_subject_hint">Talde honen gaia</string>
   <string name="joining_conference">Taldera batzen...</string>
   <string name="leave">Alde egin</string>
   <string name="contact_added_you">Kontaktuak bere zerrendara gehitu zaitu</string>
@@ -277,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">Jasotako mezuak marka berde batekin markatuko dira. Baliteke kasu guztietan ez funtzionatzea.</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string>
   <string name="pref_expert_options_other">Besteak</string>
-  <string name="pref_conference_name">Taldearen izena</string>
-  <string name="pref_conference_name_summary">Erabili gelaren gaia taldeak identifikatzeko eta ez JIDa</string>
   <string name="pref_autojoin">Taldeetara automatikoki batu</string>
   <string name="pref_autojoin_summary">Automatikoki batzeko marka errespetatu taldeen laster-marketan</string>
   <string name="toast_message_omemo_fingerprint">OMEMO hatz-marka arbelara kopiatu da</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 8996c5918..b438c0a48 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">Bloquer tous les contacts de %s ?</string>
   <string name="unblock_domain_text">Débloquer tous les contacts de %s ?</string>
   <string name="contact_blocked">Contact bloqué</string>
+  <string name="blocked">Bloqué</string>
   <string name="remove_bookmark_text">Voulez-vous retirer %s des favoris? La conversation associée à ce favori ne sera pas supprimée.</string>
   <string name="register_account">Créer un nouveau compte sur le serveur</string>
   <string name="change_password_on_server">Changer de mot de passe sur le serveur</string>
@@ -227,7 +228,6 @@
   <string name="delete_bookmark">Supprimer le favori</string>
   <string name="bookmark_already_exists">Le favori existe déjà</string>
   <string name="action_edit_subject">Modifier le sujet de la conversation de groupe</string>
-  <string name="edit_subject_hint">Sujet de cette conversation de groupe</string>
   <string name="joining_conference">Rejoindre la conversation de groupe</string>
   <string name="leave">Partir</string>
   <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
@@ -276,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">Les messages reçus seront marqués d\'une coche verte (si supporté).</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Le bouton Envoyer change de couleur pour indiquer le statut du contact.</string>
   <string name="pref_expert_options_other">Autres</string>
-  <string name="pref_conference_name">Nom de la conversation de groupe</string>
-  <string name="pref_conference_name_summary">Utiliser le sujet au lieu de JID pour identifier les groupes de discussions</string>
   <string name="pref_autojoin">Joindre les conversations de groupe automatiquement</string>
   <string name="pref_autojoin_summary">Respectez l\'indicateur de jointure automatique dans les signets des groupes de discussion</string>
   <string name="toast_message_omemo_fingerprint">Empreinte OMEMO copiée dans le presse-papier !</string>
@@ -293,6 +291,7 @@
   <string name="check_x_filesize_on_host">Vérification de la taille de %1$s sur %2$s</string>
   <string name="message_options">Options du message</string>
   <string name="quote">Citation</string>
+  <string name="paste_as_quote">Coller en tant que citation</string>
   <string name="copy_original_url">Copier l\'URL</string>
   <string name="send_again">Envoyer de nouveau</string>
   <string name="file_url">URL du fichier</string>
@@ -512,6 +511,7 @@
   <string name="security_error_invalid_file_access">Erreur de sécurité : accès fichier non-valide</string>
   <string name="no_application_to_share_uri">Aucune application trouvée pour partager l\'URI</string>
   <string name="share_uri_with">Partager l\'URI avec...</string>
+  <string name="welcome_text">Jabber est un réseau de messagerie instantanée indépendant du fournisseur. Vous pouvez utiliser ce client avec n\'importe quel serveur Jabber que vous choisissez.\nToutefois, pour votre commodité, nous avons facilité la création d\'un compte sur conversations.im¹ ; un fournisseur spécialement adapté à l\'utilisation avec Conversations.</string>
   <string name="magic_create_text">Nous vous guiderons pendant toute la procédure de création d\'un compte utilisateur sur conversations.im.¹\nEn choisissant conversations.im comme fournisseur, vous pourrez communiquer avec les utilisateurs d\'autres fournisseurs en leur transmettant votre Jabber ID complet. </string>
   <string name="your_full_jid_will_be">Votre Jabber ID complet sera : %s</string>
   <string name="create_account">Créer un compte</string>
@@ -670,6 +670,7 @@
   <string name="disable_encryption">Désactiver le chiffrement</string>
   <string name="error_trustkey_general">Conversations n\'est pas capable d\'envoyer un message chiffré à %1$s. Ceci peut être lié au fait que votre contact utilise un serveur obsolète ou un client qui ne gère par OMEMO. </string>
   <string name="error_trustkey_device_list">Impossible de récupérer la liste des appareils</string>
+  <string name="error_trustkey_bundle">Impossible de récupérer les trousseaux de clés de l\'appareil</string>
   <string name="error_trustkey_hint_mutual">Indication : Dans certains cas, cela peut être résolu en vous ajoutant respectivement dans votre liste de contacts.</string>
   <string name="disable_encryption_message">Êtes-vous sûr de vouloir désactiver le chiffrement OMEMO pour cette discussion?\nCeci permettra à l\'administrateur de votre serveur de lire vos messages, mais cela peut être le seul moyen de communiquer avec des personnes utilisant un vieux client.</string>
   <string name="disable_now">Désactiver maintenant</string>
@@ -704,4 +705,7 @@
   <string name="pref_use_share_location_plugin_summary">Utiliser le plugin \"Share Location\" plutôt que la carte intégrée</string>
   <string name="copy_link">Copier l\'adresse internet</string>
   <string name="copy_jabber_id">Copier le Jabber ID</string>
+  <string name="group_chat_avatar">Avatar du groupe de discussion</string>
+  <string name="host_does_not_support_group_chat_avatars">Le serveur ne prend pas en charge les avatars pour les groupes de discussion</string>
+  <string name="only_the_owner_can_change_group_chat_avatar">Seul le propriétaire peut changer l\'avatar d\'un groupe de discussion</string>
 </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index fa3cd2f1d..e18610498 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -227,7 +227,6 @@
   <string name="delete_bookmark">Eliminar marcador</string>
   <string name="bookmark_already_exists">Este marcador xa existe</string>
   <string name="action_edit_subject">Editar o tema da conversa en grupo</string>
-  <string name="edit_subject_hint">O tema desta conversa en grupo</string>
   <string name="joining_conference">Entrando na conversa en grupo</string>
   <string name="leave">Saír</string>
   <string name="contact_added_you">Contacto engadido a súa lista de contactos</string>
@@ -276,8 +275,6 @@
   <string name="pref_use_indicate_received_summary">As mensaxes recibidas marcaránse cun sinal verde si este está admitido</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Boton de enviar de cor para indicar o estado do contacto</string>
   <string name="pref_expert_options_other">Outro</string>
-  <string name="pref_conference_name">Nome da conversa en grupo</string>
-  <string name="pref_conference_name_summary">Utilice o tema en lugar do JID para identificar as conversas en grupo</string>
   <string name="pref_autojoin">Unirse automaticamente ás conversas en grupo</string>
   <string name="pref_autojoin_summary">Respecta a marca de autoentrada nos marcadores da conversa en grupo</string>
   <string name="toast_message_omemo_fingerprint">Copiouse a pegada dixital OMEMO ao portapapeis!</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index e9b14429c..7d909e3d3 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -228,7 +228,6 @@
   <string name="delete_bookmark">Könyvjelző törlése</string>
   <string name="bookmark_already_exists">A könyvjelző már létezik</string>
   <string name="action_edit_subject">Konferencia témájának beállítása</string>
-  <string name="edit_subject_hint">A konferencia témája</string>
   <string name="joining_conference">Konferenciához csatlakozás...</string>
   <string name="leave">Távozás</string>
   <string name="contact_added_you">Ez a felhasználó hozzáadott téged a névjegyeihez</string>
@@ -277,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">A megkapott üzenetek egy zöld pipával lesznek jelölve ha támogatott ez a funkció</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Kiszínezi a küldés gombot, hogy jelezze a partner állapotát</string>
   <string name="pref_expert_options_other">Egyéb</string>
-  <string name="pref_conference_name">Konferencia neve</string>
-  <string name="pref_conference_name_summary">A konferencia tárgyát használja a JID helyett azonosításra </string>
   <string name="pref_autojoin">Automatikus csatlakozás konferenciákhoz </string>
   <string name="pref_autojoin_summary">Tiszteletben tartja az automata csatlakozás beállítást a konferencia könyvjelzőkben</string>
   <string name="toast_message_omemo_fingerprint">Az OMEMO ujjlenyomat vágólapra lett másolva!</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 7c8b22364..6897a7f8e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">Bloccare tutti i contatti da %s?</string>
   <string name="unblock_domain_text">Sbloccare tutti i contatti da %s?</string>
   <string name="contact_blocked">Contatto bloccato</string>
+  <string name="blocked">Bloccato</string>
   <string name="remove_bookmark_text">Vuoi rimuovere il segnalibro %s? La conversazione associata con questo contatto non sarà rimossa.</string>
   <string name="register_account">Registra un nuovo account sul server</string>
   <string name="change_password_on_server">Cambia la password sul server</string>
@@ -227,7 +228,6 @@
   <string name="delete_bookmark">Elimina segnalibro</string>
   <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
   <string name="action_edit_subject">Modifica titolo chat di gruppo</string>
-  <string name="edit_subject_hint">L\'argomento di questa chat di gruppo</string>
   <string name="joining_conference">Ingresso nella chat di gruppo...</string>
   <string name="leave">Abbandona</string>
   <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
@@ -276,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">I messaggi ricevuti verranno contrassegnati con una spunta verde se supportato</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Colora il pulsante di invio per indicare lo stato del contatto</string>
   <string name="pref_expert_options_other">Altro</string>
-  <string name="pref_conference_name">Nome chat di gruppo</string>
-  <string name="pref_conference_name_summary">Usa il titolo invece del JID per identificare le chat di gruppo</string>
   <string name="pref_autojoin">Unisciti automaticamente alle chat di gruppo</string>
   <string name="pref_autojoin_summary">Rispetta l\'opzione di entrata automatica nei segnalibri di chat di gruppo</string>
   <string name="toast_message_omemo_fingerprint">impronta OMEMO copiata negli appunti|</string>
@@ -714,4 +712,7 @@
   <string name="p1_s3_filetransfer">Condivisione file in HTTP per S3</string>
   <string name="pref_start_search">Ricerca diretta</string>
   <string name="pref_start_search_summary">Nella schermata \'Inizia conversazione\' apri la tastiera e posiziona il cursore nella casella di ricerca</string>
+  <string name="group_chat_avatar">Avatar chat di gruppo</string>
+  <string name="host_does_not_support_group_chat_avatars">L\'host non supporta gli avatar per chat di gruppo</string>
+  <string name="only_the_owner_can_change_group_chat_avatar">Solo il proprietario può cambiare l\'avatar della chat di gruppo</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 80dc74a3a..e94e59b97 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -226,7 +226,6 @@
   <string name="delete_bookmark">ブックマークを削除</string>
   <string name="bookmark_already_exists">このブックマークはすでに存在します</string>
   <string name="action_edit_subject">談話室の題を編集</string>
-  <string name="edit_subject_hint">この談話室の題</string>
   <string name="joining_conference">談話室に参加しています…</string>
   <string name="leave">退出</string>
   <string name="contact_added_you">連絡先があなたを連絡先リストに追加しました</string>
@@ -273,8 +272,6 @@
   <string name="pref_use_indicate_received_summary">サポートされている場合、受信したメッセージに緑色のチェックマークが付きます</string>
   <string name="pref_use_send_button_to_indicate_status_summary">送信ボタンに連絡先ステータスを示す色が付きます</string>
   <string name="pref_expert_options_other">その他</string>
-  <string name="pref_conference_name">談話室名</string>
-  <string name="pref_conference_name_summary">談話室のJIDの代わりに題を使う</string>
   <string name="pref_autojoin">自動で談話室に参加</string>
   <string name="toast_message_omemo_fingerprint">OMEMO フィンガープリントをクリップボードにコピーしました!</string>
   <string name="conference_banned">この談話室から締め出されています</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 65499d3ff..3ff2dc318 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -226,7 +226,6 @@
   <string name="delete_bookmark">Slett bokmerke</string>
   <string name="bookmark_already_exists">Dette bokmerket finnes allerede</string>
   <string name="action_edit_subject">Endre gruppesludringsemne</string>
-  <string name="edit_subject_hint">Emnet for denne gruppesludringen</string>
   <string name="joining_conference">Tar del i gruppesludring…</string>
   <string name="leave">Forlat</string>
   <string name="contact_added_you">Kontakt la deg til i sin liste</string>
@@ -275,8 +274,6 @@
   <string name="pref_use_indicate_received_summary">Mottatte meldinger vil bli avmerket i grønt hvis støttet</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Fargelegg send-knapp for å indikere kontakt-status</string>
   <string name="pref_expert_options_other">Annet</string>
-  <string name="pref_conference_name">Gruppesludringsnavn</string>
-  <string name="pref_conference_name_summary">Bruk emne istedenfor JID til å identifisere gruppesludringer</string>
   <string name="pref_autojoin">Ta del i gruppesludringer automatisk</string>
   <string name="pref_autojoin_summary">Respekter flagget for automatisk tilknytning i gruppesludringsbokmerker</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-fingeravtrykk kopiert til utklippstavle!</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 167f9703f..6cd12ea66 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -228,7 +228,6 @@
   <string name="delete_bookmark">Bladwijzer verwijderen</string>
   <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string>
   <string name="action_edit_subject">Gespreksonderwerp bewerken</string>
-  <string name="edit_subject_hint">Het onderwerp van dit groepsgesprek</string>
   <string name="joining_conference">Deelnemen aan groepsgesprek…</string>
   <string name="leave">Verlaten</string>
   <string name="contact_added_you">Contact heeft je toegevoegd aan zijn/haar contacten</string>
@@ -277,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">Indien ondersteund, worden ontvangen berichten met een groen vinkje aangeduid</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Kleur verstuur-knop in om status van contact weer te geven</string>
   <string name="pref_expert_options_other">Andere</string>
-  <string name="pref_conference_name">Gespreksnaam</string>
-  <string name="pref_conference_name_summary">Gebruik onderwerp ipv JID om groepsgesprekken te identificeren</string>
   <string name="pref_autojoin">Automatisch deelnemen aan groepsgesprekken</string>
   <string name="pref_autojoin_summary">Respecteer de autojoin-vlag bij groepsgespreksbladwijzers</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-vingerafdruk gekopieerd naar klembord!</string>
@@ -715,4 +712,7 @@
   <string name="p1_s3_filetransfer">Bestanden delen via HTTP voor S3</string>
   <string name="pref_start_search">Rechtstreeks zoeken</string>
   <string name="pref_start_search_summary">Open het toetsenbord op het scherm ‘Gesprek starten’ en plaats de cursor in het zoekveld</string>
+  <string name="group_chat_avatar">Gespreksafbeelding</string>
+  <string name="host_does_not_support_group_chat_avatars">Host ondersteunt geen gespreksafbeeldingen</string>
+  <string name="only_the_owner_can_change_group_chat_avatar">Enkel de eigenaar kan de gespreksafbeelding wijzigen</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 4fd21aaf1..28dcbd9af 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -42,6 +42,7 @@
   <string name="block_domain_text">Zablokować wszystkie kontakty z %s?</string>
   <string name="unblock_domain_text">Odblokować wszystkie kontakty z %s?</string>
   <string name="contact_blocked">Kontakt zablokowany</string>
+  <string name="blocked">Zablokowane</string>
   <string name="remove_bookmark_text">Czy usunąć zakładkę %s? Konwersacja powiązana z zakładką nie zostanie usunięta.</string>
   <string name="register_account">Zarejestruj nowe konto na serwerze</string>
   <string name="change_password_on_server">Zmień hasło na serwerze</string>
@@ -227,7 +228,6 @@
   <string name="delete_bookmark">Usuń zakładkę</string>
   <string name="bookmark_already_exists">Zakładka już istnieje</string>
   <string name="action_edit_subject">Edytuj tytuł konferencji</string>
-  <string name="edit_subject_hint">Tytuł konferencji</string>
   <string name="joining_conference">Dołączanie do konferencji</string>
   <string name="leave">Opuść pokój</string>
   <string name="contact_added_you">Kontakt został dodany do listy</string>
@@ -276,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">Jeżeli to możliwe, oznaczaj dostarczone wiadomości zielonym haczykiem</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Koloruj przycisk wysyłania w zależności od statusu kontaktu</string>
   <string name="pref_expert_options_other">Inne</string>
-  <string name="pref_conference_name">Nazwa konferencji</string>
-  <string name="pref_conference_name_summary">Użyj tytułu zamiast JID do identyfikowania konferencji</string>
   <string name="pref_autojoin">Automatycznie dołączaj do konferencji</string>
   <string name="pref_autojoin_summary">Respektuj flagę autodołączenia do konferencji z zakładek</string>
   <string name="toast_message_omemo_fingerprint">Odcisk klucza OMEMO został skopiowany do schowka!</string>
@@ -735,4 +733,7 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="p1_s3_filetransfer">Udostępnianie plików przez HTTP S3</string>
   <string name="pref_start_search">Wyszukiwanie bezpośrednie</string>
   <string name="pref_start_search_summary">Na ekranie \'Rozpocznij konwersację\' otwórz klawiaturę i umieść kursor w polu wyszukiwania</string>
+  <string name="group_chat_avatar">Awatar konwersacji</string>
+  <string name="host_does_not_support_group_chat_avatars">Serwer nie wspiera awatarów konwersacji</string>
+  <string name="only_the_owner_can_change_group_chat_avatar">Tylko właściciel może zmienić awatar konwersacji</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 90311a979..0f9adabea 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -227,7 +227,6 @@
   <string name="delete_bookmark">Excluir o favorito</string>
   <string name="bookmark_already_exists">Esse favorito já existe</string>
   <string name="action_edit_subject">Editar o assunto da conversa em grupo</string>
-  <string name="edit_subject_hint">O assunto desta conversa em grupo</string>
   <string name="joining_conference">Entrando na conversa em grupo...</string>
   <string name="leave">Sair</string>
   <string name="contact_added_you">O contato foi adicionado à sua lista de contatos</string>
@@ -276,8 +275,6 @@
   <string name="pref_use_indicate_received_summary">As mensagens recebidas serão marcadas com um tique verde, se suportado.</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Colore o botão de envio para indicar o status do contato.</string>
   <string name="pref_expert_options_other">Outras</string>
-  <string name="pref_conference_name">Nome da conversa em grupo</string>
-  <string name="pref_conference_name_summary">Use o assunto ao invés do JID para identificar as conversas em grupo</string>
   <string name="pref_autojoin">Entrar automaticamente nas conversas em grupo</string>
   <string name="pref_autojoin_summary">Respeita a sinalização de entrada automática dos favoritos de conversa em grupo</string>
   <string name="toast_message_omemo_fingerprint">Impressão digital OMEMO copiada para a área de transferência!</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 55c36f227..75e854de9 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -228,7 +228,6 @@
   <string name="delete_bookmark">Șterge semn de carte</string>
   <string name="bookmark_already_exists">Acest semn de carte exista</string>
   <string name="action_edit_subject">Editează subiectul discuției de grup</string>
-  <string name="edit_subject_hint">Subiectul acestei discuții de grup</string>
   <string name="joining_conference">Vă alăturați discuției de grup...</string>
   <string name="leave">Paraseste</string>
   <string name="contact_added_you">Contactul v-a adăugat în lista de contacte</string>
@@ -277,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">Mesajele primite vor fi marcate cu o bifa verde, dacă este suportat</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Colorează butonul de trimitere pentru a indica starea contactului</string>
   <string name="pref_expert_options_other">Altele</string>
-  <string name="pref_conference_name">Titlul discuției de grup</string>
-  <string name="pref_conference_name_summary">Folosește subiectul discuției pentru a o identifica</string>
   <string name="pref_autojoin">Alătură-te automat discuțiilor de grup</string>
   <string name="pref_autojoin_summary">Respectă setarea de alăturare automată la o discuție de grup conform semnului de carte</string>
   <string name="toast_message_omemo_fingerprint">Amprentă OMEMO copiată în memorie!</string>
@@ -726,4 +723,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="p1_s3_filetransfer">Partajare fișiere prin HTTP pentru S3</string>
   <string name="pref_start_search">Activează direct căutarea</string>
   <string name="pref_start_search_summary">În ecranul \"Pornește o conversație\" focalizează câmpul de căutare și arată tastatura</string>
+  <string name="group_chat_avatar">Avatar discuție de grup</string>
+  <string name="host_does_not_support_group_chat_avatars">Serverul gazdă nu suporta avatare pentru grupuri</string>
+  <string name="only_the_owner_can_change_group_chat_avatar">Doar proprietarul grupului poate schimba avatarul</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index dcb1bf8aa..17dea12c2 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -227,7 +227,6 @@
   <string name="delete_bookmark">Удалить закладку</string>
   <string name="bookmark_already_exists">Такая закладка уже существует</string>
   <string name="action_edit_subject">Редактировать тему конференции</string>
-  <string name="edit_subject_hint">Тема конференции</string>
   <string name="joining_conference">Вход в конференцию…</string>
   <string name="leave">Покинуть</string>
   <string name="contact_added_you">Собеседник добавил вас в список контактов</string>
@@ -276,8 +275,6 @@
   <string name="pref_use_indicate_received_summary">Если поддерживается, поступившие сообщения будут отмечены зелёной галочкой</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Раскрасить кнопку отправить, указывая текущий статус собеседника</string>
   <string name="pref_expert_options_other">Другие</string>
-  <string name="pref_conference_name">Название конференции</string>
-  <string name="pref_conference_name_summary">Использовать тему вместо JID в качестве идентификатора конференций</string>
   <string name="pref_autojoin">Автоматически присоединяться к конференциям</string>
   <string name="pref_autojoin_summary">Использовать флаг autojoin в закладках конференций</string>
   <string name="toast_message_omemo_fingerprint">OMEMO отпечаток скопирован в буфер обмена!</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 482008b1c..6461e95b2 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -228,7 +228,6 @@
   <string name="delete_bookmark">删除书签</string>
   <string name="bookmark_already_exists">该书签已存在</string>
   <string name="action_edit_subject">编辑群聊主题</string>
-  <string name="edit_subject_hint">群聊的主题</string>
   <string name="joining_conference">正在加入群聊…</string>
   <string name="leave">离开</string>
   <string name="contact_added_you">联系人已添加你到联系人列表</string>
@@ -277,8 +276,6 @@
   <string name="pref_use_indicate_received_summary">如果支持，收到的消息将标记为绿色对勾</string>
   <string name="pref_use_send_button_to_indicate_status_summary">着色发送按钮以示联系人状态</string>
   <string name="pref_expert_options_other">其他</string>
-  <string name="pref_conference_name">群聊名称</string>
-  <string name="pref_conference_name_summary">显示群聊主题</string>
   <string name="pref_autojoin">自动加入群聊</string>
   <string name="pref_autojoin_summary">允许群组的自动加入标志生效</string>
   <string name="toast_message_omemo_fingerprint">OMEMO 指纹已拷贝到剪贴板！</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 296a4f15c..5f5f63136 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -256,8 +256,6 @@
   <string name="pref_use_indicate_received_summary">如果支援收到的訊息將會以綠色勾號標識</string>
   <string name="pref_use_send_button_to_indicate_status_summary">發送按鈕採用其他顏色以示發送狀態的區別</string>
   <string name="pref_expert_options_other">其他</string>
-  <string name="pref_conference_name">聊天群組名稱</string>
-  <string name="pref_conference_name_summary">用標題而非 JID 來識別聊天群組</string>
   <string name="toast_message_omemo_fingerprint">OMEMO 指紋已拷貝到剪貼板！</string>
   <string name="using_account">用帳戶  %s</string>
   <string name="checking_x">正在 HTTP 伺服器中檢查 %s</string>