use the term channel in destroy dialog and some other strings

15 files changed, 97 insertions, 79 deletions

diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 551ff7818..3f9ac5f99 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -3205,32 +3205,26 @@ public class XmppConnectionService extends Service {
         });
     }
 
-    public void destroyRoom(final Conversation mSelectedConversation) {
-        destroyRoom(mSelectedConversation, new OnRoomDestroy() {
-            @Override
-            public void onRoomDestroySucceeded(int resId) {
-                Log.d(Config.LOGTAG, "Destroy succeed");
-                showErrorToastInUi(resId);
-            }
-
+    public void destroyRoom(final Conversation conversation, final OnRoomDestroy callback) {
+        IqPacket request = new IqPacket(IqPacket.TYPE.SET);
+        request.setTo(conversation.getJid().asBareJid());
+        request.query("http://jabber.org/protocol/muc#owner").addChild("destroy");
+        sendIqPacket(conversation.getAccount(), request, new OnIqPacketReceived() {
             @Override
-            public void onRoomDestroyFailed(int resId) {
-                Log.d(Config.LOGTAG, "Destroy failed");
-                showErrorToastInUi(resId);
+            public void onIqPacketReceived(Account account, IqPacket packet) {
+                if (packet.getType() == IqPacket.TYPE.RESULT) {
+                    if (callback != null) {
+                        callback.onRoomDestroySucceeded();
+                    }
+                } else if (packet.getType() == IqPacket.TYPE.ERROR) {
+                    if (callback != null) {
+                        callback.onRoomDestroyFailed();
+                    }
+                }
             }
         });
     }
 
-    public void destroyRoom(final Conversation conference, final OnRoomDestroy callback) {
-        IqPacket request = this.mIqGenerator.destroyRoom(conference);
-        sendIqPacket(conference.getAccount(), request, (account, packet) -> {
-            if (packet.getType() == IqPacket.TYPE.RESULT) {
-                callback.onRoomDestroySucceeded(R.string.destroy_muc_succeed);
-            } else {
-                callback.onRoomDestroyFailed(R.string.destroy_muc_failed);
-            }
-        });
-    }
 
     private void disconnect(Account account, boolean force) {
         if ((account.getStatus() == Account.State.ONLINE)
@@ -4719,9 +4713,9 @@ public class XmppConnectionService extends Service {
     }
 
     public interface OnRoomDestroy {
-        void onRoomDestroySucceeded(int resId);
+        void onRoomDestroySucceeded();
 
-        void onRoomDestroyFailed(int resId);
+        void onRoomDestroyFailed();
     }
 
     public interface OnConversationUpdate {
diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 3d9e87b0d..cee5c20e1 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -64,8 +64,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         public void onClick(View v) {
             final AlertDialog.Builder DestroyMucDialog = new AlertDialog.Builder(ConferenceDetailsActivity.this);
             DestroyMucDialog.setNegativeButton(getString(R.string.cancel), null);
-            DestroyMucDialog.setTitle(getString(R.string.destroy_muc));
-            DestroyMucDialog.setMessage(getString(R.string.destroy_muc_text, mConversation.getName()));
+            final boolean groupChat = mConversation != null && mConversation.isPrivateAndNonAnonymous();
+            DestroyMucDialog.setTitle(groupChat ? R.string.destroy_room : R.string.destroy_channel);
+            DestroyMucDialog.setMessage(getString(groupChat ? R.string.destroy_room_dialog : R.string.destroy_channel_dialog, mConversation.getName()));
             DestroyMucDialog.setPositiveButton(getString(R.string.delete), (dialogInterface, i) -> {
                 Intent intent = new Intent(xmppConnectionService, ConversationsActivity.class);
                 intent.setAction(ConversationsActivity.ACTION_DESTROY_MUC);
@@ -388,9 +389,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        final boolean groupChat = mConversation != null && mConversation.isPrivateAndNonAnonymous();
         getMenuInflater().inflate(R.menu.muc_details, menu);
         final MenuItem share = menu.findItem(R.id.action_share);
-        share.setVisible(mConversation != null && !mConversation.isPrivateAndNonAnonymous());
+        share.setVisible(groupChat);
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -435,6 +437,11 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                     final int limit = GridManager.getCurrentColumnCount(this.binding.media);
                     xmppConnectionService.getAttachments(this.mConversation, limit, this);
                     this.binding.showMedia.setOnClickListener((v) -> MediaBrowserActivity.launch(this, mConversation));
+
+                    final boolean groupChat = mConversation != null && mConversation.isPrivateAndNonAnonymous();
+                    this.binding.destroy.setText(groupChat ? R.string.destroy_room : R.string.destroy_channel);
+                    this.binding.leaveMuc.setText(groupChat ? R.string.action_end_conversation_muc : R.string.action_end_conversation_channel);
+                    this.binding.autojoinCheckbox.setText(groupChat ? R.string.autojoin_group_chat : R.string.autojoin_channel);
                 }
                 updateView();
             }
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index e7343ce63..e84e657b7 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -96,7 +96,7 @@ import rocks.xmpp.addr.Jid;
 
 import static de.pixart.messenger.ui.ConversationFragment.REQUEST_DECRYPT_PGP;
 
-public class ConversationsActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnAffiliationChanged {
+public class ConversationsActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnRoomDestroy {
 
     public static final String ACTION_VIEW_CONVERSATION = "de.pixart.messenger.VIEW";
     public static final String EXTRA_CONVERSATION = "conversationUuid";
@@ -607,7 +607,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
                 Log.d(Config.LOGTAG, "Get " + intent.getAction() + " intent for " + extras.getString("MUC_UUID"));
                 Conversation conversation = xmppConnectionService.findConversationByUuid(extras.getString("MUC_UUID"));
                 ConversationsActivity.this.xmppConnectionService.clearConversationHistory(conversation);
-                xmppConnectionService.destroyRoom(conversation);
+                xmppConnectionService.destroyRoom(conversation, ConversationsActivity.this);
                 endConversation(conversation);
             }
         }
@@ -932,4 +932,18 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
             Log.d(Config.LOGTAG, "AppUpdater stopped");
         }
     }
+
+    @Override
+    public void onRoomDestroySucceeded() {
+        Conversation conversation = ConversationFragment.getConversationReliable(this);
+        final boolean groupChat = conversation != null && conversation.isPrivateAndNonAnonymous();
+        displayToast(getString(groupChat ? R.string.destroy_room_succeed : R.string.destroy_channel_succeed));
+    }
+
+    @Override
+    public void onRoomDestroyFailed() {
+        Conversation conversation = ConversationFragment.getConversationReliable(this);
+        final boolean groupChat = conversation != null && conversation.isPrivateAndNonAnonymous();
+        displayToast(getString(groupChat ? R.string.destroy_room_failed : R.string.destroy_channel_failed));
+    }
 }
\ No newline at end of file
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 9b2b3333c..0aa9768e3 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -235,7 +235,6 @@
                                     android:layout_marginStart="-6dp"
                                     android:layout_marginLeft="-6dp"
                                     android:layout_marginTop="4dp"
-                                    android:text="@string/autojoin_groupchat"
                                     android:textAppearance="@style/TextAppearance.Conversations.Body1" />
 
                                 <RelativeLayout
@@ -288,8 +287,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_horizontal"
-                                android:layout_marginTop="24dp"
-                                android:text="@string/destroy_muc" />
+                                android:layout_marginTop="24dp" />
 
                             <TextView
                                 android:id="@+id/details_account"
@@ -394,8 +392,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_horizontal"
-                                android:layout_marginTop="24dp"
-                                android:text="@string/action_end_conversation_muc" />
+                                android:layout_marginTop="24dp" />
 
                             <Button
                                 android:id="@+id/add_contact_button"
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 653730fbb..0801c2da9 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -404,7 +404,7 @@
     <string name="pref_warn_unencrypted_chat">التنبيه إن كانت المحادثة غير مشفّرة</string>
     <string name="invalid_muc_nick">الاسم المستعار غير صالح</string>
     <string name="title_activity_share_via_account">شاركه عبر حساب</string>
-    <string name="destroy_muc">حذف المحادثة الجماعية</string>
+    <string name="destroy_room">حذف المحادثة الجماعية</string>
     <string name="conference_unknown_error">أنت لم تعد مِن ضمن فريق المحادثة هذا</string>
     <string name="snooze">غفوة</string>
     <string name="huawei_protected_apps">التطبيقات المحمية</string>
@@ -477,7 +477,7 @@
     <string name="ebook">كتاب إلكتروني</string>
     <string name="your_name">اسمك</string>
     <string name="enter_your_name">أدخل اسمك</string>
-    <string name="autojoin_groupchat">إلتحق بفريق المحادثة هذا افتراضيا</string>
+    <string name="autojoin_group_chat">إلتحق بفريق المحادثة هذا افتراضيا</string>
     <string name="pref_play_gif_inside">تشغيل صور جيف المتحركة في المحادثة</string>
     <string name="pref_play_gif_inside_summary">إن تم تنشيط هذه الميزة فسوف يتم تشغيل صور جيف المتحركة تلقائيا داخل نافذة المحادثة.</string>
     <string name="restore_backup">استرجاع النسخة الاحتياطية</string>
diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml
index 0c57cad64..feb39b3fc 100644
--- a/src/main/res/values-ceb/strings.xml
+++ b/src/main/res/values-ceb/strings.xml
@@ -589,11 +589,11 @@
     <string name="pref_use_bundled_emoji_summary">Gamita ang integrated library sa emoji imbis nga gamiton ang imong mga gamit. Ang mga pagbag-o mahimong makuha human sa pag-abli pag-usab sa app.</string>
     <string name="invalid_muc_nick">Dili balido nga angga nga pangan</string>
     <string name="title_activity_share_via_account">Pakigbahin pinaagi sa account</string>
-    <string name="destroy_muc">Guba-a ang grupo sa chat</string>
+    <string name="destroy_room">Guba-a ang grupo sa chat</string>
     <string name="conference_unknown_error">Wala nakay labot diri nga grupo sa chat</string>
-    <string name="destroy_muc_text">Gusto ba nimu gubaun ang kini nga grupo sa chat%s? Kini grupoha kay makanunay na nga matangtang.</string>
-    <string name="destroy_muc_succeed">Ang grupo sa chat nilampos sa pag-guba</string>
-    <string name="destroy_muc_failed">Ang grupo sa chat dili pwedi gub-on</string>
+    <string name="destroy_room_dialog">Gusto ba nimu gubaun ang kini nga grupo sa chat%s? Kini grupoha kay makanunay na nga matangtang.</string>
+    <string name="destroy_room_succeed">Ang grupo sa chat nilampos sa pag-guba</string>
+    <string name="destroy_room_failed">Ang grupo sa chat dili pwedi gub-on</string>
     <string name="snooze">Snooze</string>
     <string name="huawei_protected_apps">Protektado nga mga App</string>
     <string name="huawei_protected_apps_summary">Para kanunay nga makadawat ug pagpahibalo, bisag ang screen nimu kay palong, kinahanglan ka adto sa Pix-Art Messenger para sa lista sa mga protektado nga mga app.</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 978ed38bc..ec6ae1f20 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -690,11 +690,11 @@
     <string name="pref_use_bundled_emoji_summary">Nutze die in die App integrierten Emojis anstatt der von deinem Gerät. Die Änderungen werden nach dem nächsten Öffnen der App wirksam.</string>
     <string name="invalid_muc_nick">Nickname ungültig</string>
     <string name="title_activity_share_via_account">Teilen mit Profil</string>
-    <string name="destroy_muc">Gruppenchat auflösen</string>
+    <string name="destroy_room">Gruppenchat auflösen</string>
     <string name="conference_unknown_error">Du bist nicht länger in diesem Gruppenchat</string>
-    <string name="destroy_muc_text">Möchtest du den Gruppenchat %s auflösen? Dies wird den Gruppenchat dauerhaft entfernen.</string>
-    <string name="destroy_muc_succeed">Gruppenchat erfolgreich aufgelöst</string>
-    <string name="destroy_muc_failed">Gruppenchat konnte nicht aufgelöst werden</string>
+    <string name="destroy_room_dialog">Möchtest du den Gruppenchat %s auflösen? Dies wird den Gruppenchat dauerhaft entfernen.</string>
+    <string name="destroy_room_succeed">Gruppenchat erfolgreich aufgelöst</string>
+    <string name="destroy_room_failed">Gruppenchat konnte nicht aufgelöst werden</string>
     <string name="no_write_access_in_public_muc">Du bist kein Mitglied dieser Gruppe und hast aktuell keine Erlaubnis zum Schreiben.\nBitte gehe in die Gruppenchat-Details indem du <b>OK</b> klickst und sende eine private Nachricht an einen Moderator, Administrator oder Eigentümer dadurch, dass du auf den Namen eines dieser Mitglieder am Anfang der Liste lange klickst und bitte um Erlaubnis schreiben zu dürfen.</string>
     <string name="snooze">Schlummern</string>
     <string name="huawei_protected_apps">Geschützte Apps</string>
@@ -822,7 +822,7 @@
     <string name="enter_your_name">Gib deinen Namen ein</string>
     <string name="enter_your_name_instructions">Bitte gib deinen Nickname ein, der für deine Kontakte sichtbar sein wird.</string>
     <string name="no_name_set_instructions">Keinen Nickname festgelegt.</string>
-    <string name="autojoin_groupchat">Diesem Gruppenchat automatisch beitreten</string>
+    <string name="autojoin_group_chat">Diesem Gruppenchat automatisch beitreten</string>
     <string name="pref_play_gif_inside">GIF-Dateien im Chat abspielen</string>
     <string name="pref_play_gif_inside_summary">Dies auf \"wahr\" zu setzen, spielt GIF-Dateien direkt in der Chat-Ansicht ab.</string>
     <string name="open_with">Öffnen mit…</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index dd87f8d88..87d93a8c2 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -690,11 +690,11 @@
     <string name="pref_use_bundled_emoji_summary">Utilice la librería emoji integrada en lugar de utilizar la de su dispositivo. Los cambios estarán disponibles después de volver a abrir la aplicación.</string>
     <string name="invalid_muc_nick">Apodo inválido</string>
     <string name="title_activity_share_via_account">Compartir a través de cuenta</string>
-    <string name="destroy_muc">Destruye el chat de grupo</string>
+    <string name="destroy_room">Destruye el chat de grupo</string>
     <string name="conference_unknown_error">Ya no estás en este chat de grupo</string>
-    <string name="destroy_muc_text">¿Quieres eliminar el grupo %s? Esto eliminará este grupo de chat permanentemente.</string>
-    <string name="destroy_muc_succeed">El chat de grupo se ha eliminado correctamente</string>
-    <string name="destroy_muc_failed">El chat de grupo no se pudo eliminar</string>
+    <string name="destroy_room_dialog">¿Quieres eliminar el grupo %s? Esto eliminará este grupo de chat permanentemente.</string>
+    <string name="destroy_room_succeed">El chat de grupo se ha eliminado correctamente</string>
+    <string name="destroy_room_failed">El chat de grupo no se pudo eliminar</string>
     <string name="no_write_access_in_public_muc">De momento no estás participando en este grupo y no puedes escribir en él\nPor favor, ve a los detalles del grupo presionando <b>OK</b> y envía un mensaje privado a un moderador, administrador o propietario haciendo un clic largo en el nombre de los miembros en la parte superior de la lista para solicitar acceso de escritura en el grupo.</string>
     <string name="snooze">Dormitar</string>
     <string name="huawei_protected_apps">Aplicaciones protegidas</string>
@@ -822,7 +822,7 @@
     <string name="enter_your_name">Escribe tu nombre</string>
     <string name="enter_your_name_instructions">Por favor, escribe tu alias que será visible para tus contactos.</string>
     <string name="no_name_set_instructions">Alias no configurado.</string>
-    <string name="autojoin_groupchat">Unirse automáticamente a este grupo de chat</string>
+    <string name="autojoin_group_chat">Unirse automáticamente a este grupo de chat</string>
     <string name="pref_play_gif_inside">Reproducir archivos GIF en la conversación</string>
     <string name="pref_play_gif_inside_summary">Activando esto, ejecuta archivos GIF directamente en la conversación.</string>
     <string name="open_with">Abrir con…</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 8f8b7efe8..7ab9488a7 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -631,11 +631,11 @@
     <string name="pref_use_bundled_emoji_summary">Gamitin ang pinagsama-samang emoji library sa halip na gamitin ang iyong mga device. Available ang mga pagbabago pagkatapos muling buksan ang app.</string>
     <string name="invalid_muc_nick">Di-wastong palayaw</string>
     <string name="title_activity_share_via_account">Ibahagi sa pamamagitan ng account</string>
-    <string name="destroy_muc">Wasakin ang chat ng grupo</string>
+    <string name="destroy_room">Wasakin ang chat ng grupo</string>
     <string name="conference_unknown_error">Hindi ka na nasa grupong chat na ito</string>
-    <string name="destroy_muc_text">Gusto mo bang sirain ang %s chat ng grupo? Tatanggalin nito ang permanenteng grupo ng chat na ito.</string>
-    <string name="destroy_muc_succeed">Matagumpay na nawasak ang grupo ng chat</string>
-    <string name="destroy_muc_failed">Hindi maaaring sirain ang grupo ng chat</string>
+    <string name="destroy_room_dialog">Gusto mo bang sirain ang %s chat ng grupo? Tatanggalin nito ang permanenteng grupo ng chat na ito.</string>
+    <string name="destroy_room_succeed">Matagumpay na nawasak ang grupo ng chat</string>
+    <string name="destroy_room_failed">Hindi maaaring sirain ang grupo ng chat</string>
     <string name="snooze">I-snooze</string>
     <string name="huawei_protected_apps">Mga Protektadong Apps</string>
     <string name="huawei_protected_apps_summary">Upang patuloy na makatanggap ng mga abiso, kahit na naka-off ang screen, kailangan mong magdagdag ng Pix-Art Messenger sa listahan ng mga protektadong apps.</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 5fdd7161a..641e5f746 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -682,11 +682,11 @@
     <string name="pref_use_bundled_emoji_summary">Utilise la libraire d’émojis intégrée au lieu de ceux de votre appareil. Les modifications seront prises en considération à la réouverture de l’application.</string>
     <string name="invalid_muc_nick">Psœudonyme invalide</string>
     <string name="title_activity_share_via_account">Partager via le compte</string>
-    <string name="destroy_muc">Supprimer complètement la conférence</string>
+    <string name="destroy_room">Supprimer complètement la conférence</string>
     <string name="conference_unknown_error">Vous ne faîtes plus partie de cette conférence</string>
-    <string name="destroy_muc_text">Désirez-vous supprimer complètement la conférence %s ? Ceci supprimera la conférence pour de bon.</string>
-    <string name="destroy_muc_succeed">La conférence a été supprimée avec succès</string>
-    <string name="destroy_muc_failed">Impossible de supprimer la conférence</string>
+    <string name="destroy_room_dialog">Désirez-vous supprimer complètement la conférence %s ? Ceci supprimera la conférence pour de bon.</string>
+    <string name="destroy_room_succeed">La conférence a été supprimée avec succès</string>
+    <string name="destroy_room_failed">Impossible de supprimer la conférence</string>
     <string name="snooze">Silencer</string>
     <string name="huawei_protected_apps">Applications protégées</string>
     <string name="pref_enable_multi_accounts_title">Activer les comptes multiples</string>
@@ -803,7 +803,7 @@
     <string name="enter_your_name">Saisissez votre nom</string>
     <string name="enter_your_name_instructions">Veuillez saisir le psœudonyme que vous désirez rendre visible à vos contacts.</string>
     <string name="no_name_set_instructions">Aucun psœudonyme n’a été spécifié.</string>
-    <string name="autojoin_groupchat">Rejoindre automatiquement cette conférence</string>
+    <string name="autojoin_group_chat">Rejoindre automatiquement cette conférence</string>
     <string name="pref_play_gif_inside">Animer les fichiers GIF dans la discussion</string>
     <string name="pref_play_gif_inside_summary">L’activation de cette option permet d’animer les images GIF publiées dans la fenêtre de discussion.</string>
     <string name="open_with">Ouvrir avec …</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 96dc68490..94373ddf2 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -627,11 +627,11 @@
     <string name="pref_use_bundled_emoji_summary">Gunakan perpustakaan emoji yang terintegrasi daripada menggunakan perangkat Anda. Perubahan akan tersedia setelah membuka kembali aplikasi.</string>
     <string name="invalid_muc_nick">Nama panggilan tidak sah</string>
     <string name="title_activity_share_via_account">Bagikan melalui akun</string>
-    <string name="destroy_muc">Menghilangkan obrolan kelompok</string>
+    <string name="destroy_room">Menghilangkan obrolan kelompok</string>
     <string name="conference_unknown_error">Anda tidak lagi di obrolan grup ini</string>
-    <string name="destroy_muc_text">Apakah anda ingin menghilangkan obrolan kelompok %s? Tindakan ini akan menghapus obrolan kelompok secara permanen.</string>
-    <string name="destroy_muc_succeed">Obrolan kelompok berhasil dihapus</string>
-    <string name="destroy_muc_failed">Obrolan kelompok tidak dapat dihapus</string>
+    <string name="destroy_room_dialog">Apakah anda ingin menghilangkan obrolan kelompok %s? Tindakan ini akan menghapus obrolan kelompok secara permanen.</string>
+    <string name="destroy_room_succeed">Obrolan kelompok berhasil dihapus</string>
+    <string name="destroy_room_failed">Obrolan kelompok tidak dapat dihapus</string>
     <string name="snooze">Menunda</string>
     <string name="huawei_protected_apps">Aplikasi yang Dilindungi</string>
     <string name="huawei_protected_apps_summary">Agar tetap menerima pemberitahuan, bahkan saat layar dimatikan, Anda perlu menambahkan Pix-Art Messenger ke daftar aplikasi yang dilindungi.</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index ef078ed07..bbc272b1d 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -690,11 +690,11 @@
     <string name="pref_use_bundled_emoji_summary">Usa la libreria di emoji integrata invece di quella del dispositivo. Il cambiamento sarà disponibile alla riapertura dell\'app.</string>
     <string name="invalid_muc_nick">Nickname non valido</string>
     <string name="title_activity_share_via_account">Condividi via account</string>
-    <string name="destroy_muc">Elimina conversazione di gruppo</string>
+    <string name="destroy_room">Elimina conversazione di gruppo</string>
     <string name="conference_unknown_error">Non fai più parte di questa conversazione di gruppo</string>
-    <string name="destroy_muc_text">Vuoi veramente eliminare la conversazione di gruppo %s? Questo rimuoverà questa conversazione di gruppo permanentemente.</string>
-    <string name="destroy_muc_succeed">Conversazione di gruppo eliminata con successo</string>
-    <string name="destroy_muc_failed">La conversazione di gruppo non può essere eliminata</string>
+    <string name="destroy_room_dialog">Vuoi veramente eliminare la conversazione di gruppo %s? Questo rimuoverà questa conversazione di gruppo permanentemente.</string>
+    <string name="destroy_room_succeed">Conversazione di gruppo eliminata con successo</string>
+    <string name="destroy_room_failed">La conversazione di gruppo non può essere eliminata</string>
     <string name="no_write_access_in_public_muc">Non stai partecipando a questa conversazione di gruppo e non hai accesso in scrittura al momento.\nPer favore vai ai dettagli della conversazione di gruppo premendo <b>OK</b> ed invia un messaggio privato al moderatore, amministratore o proprietario tenendo premuto sul nome di uno dei primi nomi dei membri in cima alla lista e chiedi l\'accesso in scrittura.</string>
     <string name="snooze">Posponi</string>
     <string name="huawei_protected_apps">App Protette</string>
@@ -822,7 +822,7 @@
     <string name="enter_your_name">Inserisci il tuo nome</string>
     <string name="enter_your_name_instructions">Per favore inserisci il tuo nome che sarà visibile ai tuoi contatti.</string>
     <string name="no_name_set_instructions">Nessun nome impostato.</string>
-    <string name="autojoin_groupchat">Unisciti automaticamente a questa conversazione di gruppo</string>
+    <string name="autojoin_group_chat">Unisciti automaticamente a questa conversazione di gruppo</string>
     <string name="pref_play_gif_inside">Riproduci file GIF nelle conversazioni</string>
     <string name="pref_play_gif_inside_summary">Attivando questa opzione, i file GIF verranno riprodotti direttamente nella conversazione.</string>
     <string name="open_with">Apri con…</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 2b6008d8b..2c9f8edf1 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -725,6 +725,6 @@ Pix-Art Messenger będzie wciąż ograniczał transfer danych, kiedy tylko to je
     <string name="enter_your_name">Wprowadź swoje imię</string>
     <string name="enter_your_name_instructions">Wprowadź swój pseudonim, który będzie widoczny dla Twoich kontaktów.</string>
     <string name="no_name_set_instructions">Brak ustawionego pseudonimu.</string>
-    <string name="autojoin_groupchat">Automatycznie dołącz do tego czatu grupowego</string>
+    <string name="autojoin_group_chat">Automatycznie dołącz do tego czatu grupowego</string>
     <string name="pref_play_gif_inside">Odtwarzaj pliki GIF w czacie</string>
 </resources>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 8edc8dbf6..9bc8a232a 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -631,11 +631,11 @@
     <string name="pref_use_bundled_emoji_summary">Cihazlarınızın yerine emoji kitaplığını kullanın. Değişiklikler, uygulamayı yeniden açtıktan sonra kullanılabilir olacaktır.</string>
     <string name="invalid_muc_nick">Geçersiz kullanıcı adı</string>
     <string name="title_activity_share_via_account">Hesap yoluyla paylaş</string>
-    <string name="destroy_muc">Grup sohbetini sil</string>
+    <string name="destroy_room">Grup sohbetini sil</string>
     <string name="conference_unknown_error">Artık bu grupta değilsiniz</string>
-    <string name="destroy_muc_text">%s grubunu gerçekten silmek istiyor musunuz? Grup sohbeti kalıcı olarak silinecektir.</string>
-    <string name="destroy_muc_succeed">Grup sohbeti başarıyla silindi</string>
-    <string name="destroy_muc_failed">Grup sohbeti silinemedi</string>
+    <string name="destroy_room_dialog">%s grubunu gerçekten silmek istiyor musunuz? Grup sohbeti kalıcı olarak silinecektir.</string>
+    <string name="destroy_room_succeed">Grup sohbeti başarıyla silindi</string>
+    <string name="destroy_room_failed">Grup sohbeti silinemedi</string>
     <string name="snooze">Ertele</string>
     <string name="huawei_protected_apps">Korunan uygulamalar</string>
     <string name="huawei_protected_apps_summary">Bildirim almaya devam etmek için, ekran kapalı olduğunda bile, korunan uygulamalar listesine Pix-Art Messenger\'ı eklemeniz gerekir.</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3a2eb4ea7..45f771e8a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -690,11 +690,11 @@
     <string name="pref_use_bundled_emoji_summary">Use the integrated emoji library instead of using your devices ones. Changes will be available after reopening the app.</string>
     <string name="invalid_muc_nick">Invalid nickname</string>
     <string name="title_activity_share_via_account">Share via account</string>
-    <string name="destroy_muc">Destroy group chat</string>
+    <string name="destroy_room">Destroy group chat</string>
     <string name="conference_unknown_error">You are no longer in this group chat</string>
-    <string name="destroy_muc_text">Would you like to destroy the group chat %s? This will remove this group chat permanently.</string>
-    <string name="destroy_muc_succeed">Group chat successfully destroyed</string>
-    <string name="destroy_muc_failed">Group chat could not be destroyed</string>
+    <string name="destroy_room_dialog">Would you like to destroy the group chat %s? This will remove this group chat permanently.</string>
+    <string name="destroy_room_succeed">Group chat successfully destroyed</string>
+    <string name="destroy_room_failed">Group chat could not be destroyed</string>
     <string name="no_write_access_in_public_muc">You are not participating this group chat and have no write access at the moment.\nPlease go to the group chat details by pressing <b>OK</b> and send a private message to a moderator, administrator or owner by long clicking one of the members name at the top of the list to ask for write access.</string>
     <string name="snooze">Snooze</string>
     <string name="huawei_protected_apps">Protected Apps</string>
@@ -759,8 +759,8 @@
     <string name="pref_start_search_summary">At ‘Start Conversation’ screen open keyboard and place cursor in search field</string>
     <string name="paste_as_quote">Paste as quote</string>
     <string name="group_chat_avatar">Group chat avatar</string>
-    <string name="host_does_not_support_group_chat_avatars">Host does not support group chat avatars</string>
-    <string name="only_the_owner_can_change_group_chat_avatar">Only the owner can change group chat avatar</string>
+    <string name="host_does_not_support_group_chat_avatars">Host does not support avatars</string>
+    <string name="only_the_owner_can_change_group_chat_avatar">Only the owner can change the avatar</string>
     <string name="contact_name">Contact name</string>
     <string name="nickname">Nickname for this group chat</string>
     <string name="group_chat_name">Name</string>
@@ -822,7 +822,7 @@
     <string name="enter_your_name">Enter your name</string>
     <string name="enter_your_name_instructions">Please enter your nickname which will be visible to your contacts.</string>
     <string name="no_name_set_instructions">No nickname set.</string>
-    <string name="autojoin_groupchat">Automatically join this group chat</string>
+    <string name="autojoin_group_chat">Automatically join this group chat</string>
     <string name="pref_show_links_inside">Show previews of web links in chat</string>
     <string name="pref_show_links_inside_summary">Show previews of web links directly inside the chat view.</string>
     <string name="pref_play_gif_inside">Play GIF files in chat</string>
@@ -874,4 +874,10 @@
     <string name="remove_from_channel">Remove from channel</string>
     <string name="ban_from_channel">Ban from channel</string>
     <string name="manage_permission">Manage privileges</string>
+    <string name="destroy_channel">Destroy channel</string>
+    <string name="destroy_channel_dialog">Would you like to destroy the channel %s? This will remove this channel permanently.</string>
+    <string name="destroy_channel_succeed">Channel successfully destroyed</string>
+    <string name="destroy_channel_failed">Channel could not be destroyed</string>
+    <string name="action_end_conversation_channel">Leave channel</string>
+    <string name="autojoin_channel">Automatically join this channel</string>
 </resources>