From 2e350299076998a05c1b95a056575cd663b22e17 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 29 May 2025 20:47:07 +0200
Subject: [PATCH] fix regression in muc details screen

---
 .../conversations/entities/MucOptions.java    | 66 ++++++++++++-------
 src/main/res/values-ar/strings.xml            |  1 -
 src/main/res/values-bg/strings.xml            |  1 -
 src/main/res/values-bn-rIN/strings.xml        |  1 -
 src/main/res/values-ca/strings.xml            |  1 -
 src/main/res/values-cs/strings.xml            |  1 -
 src/main/res/values-da-rDK/strings.xml        |  1 -
 src/main/res/values-de/strings.xml            |  1 -
 src/main/res/values-el/strings.xml            |  1 -
 src/main/res/values-es/strings.xml            |  1 -
 src/main/res/values-et/strings.xml            |  1 -
 src/main/res/values-eu/strings.xml            |  1 -
 src/main/res/values-fa-rIR/strings.xml        |  1 -
 src/main/res/values-fi/strings.xml            |  1 -
 src/main/res/values-fr/strings.xml            |  1 -
 src/main/res/values-gl/strings.xml            |  1 -
 src/main/res/values-hr/strings.xml            |  1 -
 src/main/res/values-hu/strings.xml            |  1 -
 src/main/res/values-id/strings.xml            |  1 -
 src/main/res/values-it/strings.xml            |  1 -
 src/main/res/values-iw/strings.xml            |  1 -
 src/main/res/values-ja/strings.xml            |  1 -
 src/main/res/values-ko/strings.xml            |  1 -
 src/main/res/values-nb-rNO/strings.xml        |  1 -
 src/main/res/values-nl/strings.xml            |  1 -
 src/main/res/values-pl/strings.xml            |  1 -
 src/main/res/values-pt-rBR/strings.xml        |  1 -
 src/main/res/values-pt/strings.xml            |  1 -
 src/main/res/values-ro-rRO/strings.xml        |  1 -
 src/main/res/values-ru/strings.xml            |  1 -
 src/main/res/values-sk/strings.xml            |  1 -
 src/main/res/values-sq-rAL/strings.xml        |  1 -
 src/main/res/values-sr/strings.xml            |  1 -
 src/main/res/values-sv/strings.xml            |  1 -
 src/main/res/values-szl/strings.xml           |  1 -
 src/main/res/values-tr-rTR/strings.xml        |  1 -
 src/main/res/values-uk/strings.xml            |  1 -
 src/main/res/values-vi/strings.xml            |  1 -
 src/main/res/values-zh-rCN/strings.xml        |  1 -
 src/main/res/values-zh-rTW/strings.xml        |  1 -
 40 files changed, 43 insertions(+), 62 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 7b3b6efa455a003a938d2ba287df088254f748e1..b5669b6af77d93e18aa7599a102a69435cee29b5 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -117,12 +117,28 @@ public class MucOptions {
 
     public boolean updateConfiguration(final InfoQuery serviceDiscoveryResult) {
         this.infoQuery = serviceDiscoveryResult;
-        final var roomInfo = getRoomInfoForm();
-        String name;
-        Field roomConfigName =
+        final String name = getName(serviceDiscoveryResult);
+        boolean changed = conversation.setAttribute("muc_name", name);
+        changed |=
+                conversation.setAttribute(
+                        Conversation.ATTRIBUTE_MEMBERS_ONLY, this.hasFeature("muc_membersonly"));
+        changed |=
+                conversation.setAttribute(
+                        Conversation.ATTRIBUTE_MODERATED, this.hasFeature("muc_moderated"));
+        changed |=
+                conversation.setAttribute(
+                        Conversation.ATTRIBUTE_NON_ANONYMOUS, this.hasFeature("muc_nonanonymous"));
+        return changed;
+    }
+
+    private String getName(final InfoQuery serviceDiscoveryResult) {
+        final var roomInfo =
+                serviceDiscoveryResult.getServiceDiscoveryExtension(
+                        "http://jabber.org/protocol/muc#roominfo");
+        final Field roomConfigName =
                 roomInfo == null ? null : roomInfo.getFieldByName("muc#roomconfig_roomname");
         if (roomConfigName != null) {
-            name = roomConfigName.getValue();
+            return roomConfigName.getValue();
         } else {
             final var identities = serviceDiscoveryResult.getIdentities();
             final String identityName =
@@ -131,22 +147,11 @@ public class MucOptions {
                             : null;
             final Jid jid = conversation.getJid();
             if (identityName != null && !identityName.equals(jid == null ? null : jid.getLocal())) {
-                name = identityName;
+                return identityName;
             } else {
-                name = null;
+                return null;
             }
         }
-        boolean changed = conversation.setAttribute("muc_name", name);
-        changed |=
-                conversation.setAttribute(
-                        Conversation.ATTRIBUTE_MEMBERS_ONLY, this.hasFeature("muc_membersonly"));
-        changed |=
-                conversation.setAttribute(
-                        Conversation.ATTRIBUTE_MODERATED, this.hasFeature("muc_moderated"));
-        changed |=
-                conversation.setAttribute(
-                        Conversation.ATTRIBUTE_NON_ANONYMOUS, this.hasFeature("muc_nonanonymous"));
-        return changed;
     }
 
     private Data getRoomInfoForm() {
@@ -178,7 +183,11 @@ public class MucOptions {
     }
 
     public boolean allowInvites() {
-        final Field field = getRoomInfoForm().getFieldByName("muc#roomconfig_allowinvites");
+        final var roomInfo = getRoomInfoForm();
+        if (roomInfo == null) {
+            return false;
+        }
+        final var field = roomInfo.getFieldByName("muc#roomconfig_allowinvites");
         return field != null && "1".equals(field.getValue());
     }
 
@@ -187,14 +196,22 @@ public class MucOptions {
     }
 
     public boolean participantsCanChangeSubject() {
-        final Field configField = getRoomInfoForm().getFieldByName("muc#roomconfig_changesubject");
-        final Field infoField = getRoomInfoForm().getFieldByName("muc#roominfo_changesubject");
+        final var roomInfo = getRoomInfoForm();
+        if (roomInfo == null) {
+            return false;
+        }
+        final Field configField = roomInfo.getFieldByName("muc#roomconfig_changesubject");
+        final Field infoField = roomInfo.getFieldByName("muc#roominfo_changesubject");
         final Field field = configField != null ? configField : infoField;
         return field != null && "1".equals(field.getValue());
     }
 
     public boolean allowPm() {
-        final Field field = getRoomInfoForm().getFieldByName("muc#roomconfig_allowpm");
+        final var roomInfo = getRoomInfoForm();
+        if (roomInfo == null) {
+            return true;
+        }
+        final Field field = roomInfo.getFieldByName("muc#roomconfig_allowpm");
         if (field == null) {
             return true; // fall back if field does not exists
         }
@@ -210,7 +227,9 @@ public class MucOptions {
     }
 
     public boolean allowPmRaw() {
-        final Field field = getRoomInfoForm().getFieldByName("muc#roomconfig_allowpm");
+        final var roomInfo = getRoomInfoForm();
+        final Field field =
+                roomInfo == null ? null : roomInfo.getFieldByName("muc#roomconfig_allowpm");
         return field == null || Arrays.asList("anyone", "participants").contains(field.getValue());
     }
 
@@ -752,6 +771,7 @@ public class MucOptions {
         }
 
         @Override
+        @NonNull
         public String toString() {
             return name().toLowerCase(Locale.US);
         }
@@ -842,7 +862,7 @@ public class MucOptions {
         private ChatState chatState = Config.DEFAULT_CHAT_STATE;
         private String occupantId;
 
-        public User(MucOptions options, Jid fullJid) {
+        public User(final MucOptions options, final Jid fullJid) {
             this.options = options;
             this.fullJid = fullJid;
         }
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 0da63828da9cc7a95a2a5436be63fe1c7e337f95..5b30e292987456929d2b73a61285e9037f9f53f6 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">تفاصيل القناة</string>
     <string name="action_add_account">إضافة حساب</string>
     <string name="action_edit_contact">تعديل الإسم</string>
-    <string name="action_add_phone_book">أضف إلى دفتر العناوين</string>
     <string name="action_delete_contact">حذف من الإضافات</string>
     <string name="action_block_contact">حجب جهة إتصال</string>
     <string name="action_unblock_contact">إنهاء حجب جهة اتصال</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index dd1e5e672c41f16a2323027a671e378e4e26e26b..7e380c69533faba2a1393aee63c34b6e5c7d7592 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Подробности за канала</string>
     <string name="action_add_account">Добавяне на профил</string>
     <string name="action_edit_contact">Редактиране на името</string>
-    <string name="action_add_phone_book">Добавяне към адресния указател</string>
     <string name="action_delete_contact">Изтриване от списъка</string>
     <string name="action_block_contact">Блокиране на контакта</string>
     <string name="action_unblock_contact">Деблокиране на контакта</string>
diff --git a/src/main/res/values-bn-rIN/strings.xml b/src/main/res/values-bn-rIN/strings.xml
index 19fc85dd23718bf2664eb533db0692391db76c58..6cb1436bfd9f338bdeba7715901ebaff202b8e6c 100644
--- a/src/main/res/values-bn-rIN/strings.xml
+++ b/src/main/res/values-bn-rIN/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">চ্যনেলের বিশদ বিবরণ</string>
     <string name="action_add_account">একটা অ্যকাউন্ট তৈরী করা যাক</string>
     <string name="action_edit_contact">নামটা বদল করা যাক</string>
-    <string name="action_add_phone_book">অ্যড্রেসবুকে সংরক্ষণ করা যাক</string>
     <string name="action_delete_contact">তালিকা থেকে মুছে ফেলা যাক</string>
     <string name="action_block_contact">এই ব্যক্তিকে ব্লক্ করা যাক</string>
     <string name="action_unblock_contact">ব্লকটা সরিয়ে ফেলা যাক</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index ab12fc30b4be1d42f36aafcc181fdf49fd1c0fb0..4471e71d10a1f3d63b07793fb2e00ae21f3b25ec 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Detalls del canal</string>
     <string name="action_add_account">Afegeix un compte</string>
     <string name="action_edit_contact">Edita el nom</string>
-    <string name="action_add_phone_book">Afegeix a la llibreta d\'adreces</string>
     <string name="action_delete_contact">Elimina de la llista de contactes</string>
     <string name="action_block_contact">Bloqueja el contacte</string>
     <string name="action_unblock_contact">Desbloqueja el contacte</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index e2e8b73d77324d353107922fcddcb3ca9a314795..83decc71126c9fef07f7f878a23b2628b1a94254 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Detaily kanálu</string>
     <string name="action_add_account">Přidat účet</string>
     <string name="action_edit_contact">Upravit jméno</string>
-    <string name="action_add_phone_book">Přidat do adresáře</string>
     <string name="action_delete_contact">Smazat ze seznamu</string>
     <string name="action_block_contact">Zablokovat kontakt</string>
     <string name="action_unblock_contact">Odblokovat kontakt</string>
diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml
index 5232ee3c5b92c0033fcc97e07b5033a9a6f969e1..c208bb06692da39e32c7d838e88d2c7583178dd5 100644
--- a/src/main/res/values-da-rDK/strings.xml
+++ b/src/main/res/values-da-rDK/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Kanaldetaljer  </string>
     <string name="action_add_account">Tilføj konto</string>
     <string name="action_edit_contact">Rediger navn</string>
-    <string name="action_add_phone_book">Tilføj til adressebog</string>
     <string name="action_delete_contact">Slet fra liste</string>
     <string name="action_block_contact">Blokerer kontakt</string>
     <string name="action_unblock_contact">Frigiv kontakt</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 0213884a4258d4a0223ac5edda12c631515d6b71..e39a074c00438163494341ea482358e126d52f6e 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Channeldetails</string>
     <string name="action_add_account">Konto hinzufügen</string>
     <string name="action_edit_contact">Namen bearbeiten</string>
-    <string name="action_add_phone_book">Zum Telefonbuch hinzufügen</string>
     <string name="action_delete_contact">Aus Kontaktliste entfernen</string>
     <string name="action_block_contact">Kontakt sperren</string>
     <string name="action_unblock_contact">Kontakt entsperren</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index ab1e8a8dfe3fd9f0fe94fe023b860ac8dfdacf5e..767aacf68486e749fd24e47be627d26aff3a3803 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Λεπτομέρειες καναλιού</string>
     <string name="action_add_account">Προσθήκη λογαριασμού</string>
     <string name="action_edit_contact">Επεξεργασία ονόματος</string>
-    <string name="action_add_phone_book">Προσθήκη στο βιβλίο διευθύνσεων</string>
     <string name="action_delete_contact">Διαγραφή από τη λίστα επαφών</string>
     <string name="action_block_contact">Αποκλεισμός επαφής</string>
     <string name="action_unblock_contact">Άρση αποκλεισμού επαφής</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index f3d0877cc396df103816e1fa5cdde21fb38245ab..6f9288fba94b2307c4a44a375f60b38698b45d20 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Detalles del canal</string>
     <string name="action_add_account">Añadir cuenta</string>
     <string name="action_edit_contact">Editar contacto</string>
-    <string name="action_add_phone_book">Añadir a contactos</string>
     <string name="action_delete_contact">Eliminar contacto de la lista</string>
     <string name="action_block_contact">Bloquear contacto</string>
     <string name="action_unblock_contact">Desbloquear contacto</string>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index c1c982c7f75dfb9e704900eb1fd3585b9e4e3327..c67548dc65148e23361d5e5931582a88f5b98cd3 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -2,7 +2,6 @@
 <resources>
     <string name="action_settings">Seadistused</string>
     <string name="action_edit_contact">Muuda nime</string>
-    <string name="action_add_phone_book">Lisa aadressiraamatusse</string>
     <string name="title_activity_choose_contacts">Vali kontaktid</string>
     <string name="minute_ago">1 minut tagasi</string>
     <string name="action_contact_details">Kontaktandmed</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index b54edfe433fb10aabe1695b18e9b64386303610c..07755b9769e1914478e24bef6604e8a7012be928 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Kanalaren xehetasunak</string>
     <string name="action_add_account">Kontua gehitu</string>
     <string name="action_edit_contact">Izena editatu</string>
-    <string name="action_add_phone_book">Helbideen liburura gehitu</string>
     <string name="action_delete_contact">Zerrendatik ezabatu</string>
     <string name="action_block_contact">Kontaktua blokeatu</string>
     <string name="action_unblock_contact">Kontaktua desblokeatu</string>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
index 1d5e136ae79f1bf1f5c29bfd7a7559252e8adaad..f6f144b981e12410dfb06d44cb297d589edf2db4 100644
--- a/src/main/res/values-fa-rIR/strings.xml
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -6,7 +6,6 @@
     <string name="action_muc_details">جزئیات چت گروهی</string>
     <string name="action_add_account">اضافه کردن حساب کاربری</string>
     <string name="action_edit_contact">تغییر نام</string>
-    <string name="action_add_phone_book">اضافه کردن به لیست ادرس ها</string>
     <string name="action_delete_contact">حذف از لیست نام ها</string>
     <string name="action_block_contact">بلاک مخاطب</string>
     <string name="action_unblock_contact">غیر بلاک کردن مخاطب</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 3e41feb13a62f8a12d2ec2f663f68ae7ecf821ec..264d85f7de11024291b4e377a9b9e8a7f079a848 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Kanavan tiedot</string>
     <string name="action_add_account">Lisää tili</string>
     <string name="action_edit_contact">Muokkaa nimeä</string>
-    <string name="action_add_phone_book">Lisää yhteystietoihin</string>
     <string name="action_delete_contact">Poista yhteystietolistasta</string>
     <string name="action_block_contact">Estä yhteystieto</string>
     <string name="action_unblock_contact">Peru yhteystiedon esto</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 56fb3acf291bed70abc48cef80a5c1f891d66a1c..8a199d16b5f922d8c41254b2208d6af868da6114 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Détails du salon</string>
     <string name="action_add_account">Ajouter un compte</string>
     <string name="action_edit_contact">Modifier le nom</string>
-    <string name="action_add_phone_book">Ajouter au carnet d\'adresses</string>
     <string name="action_delete_contact">Retirer des contacts</string>
     <string name="action_block_contact">Bloquer le contact</string>
     <string name="action_unblock_contact">Débloquer le contact</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 87af85bb698684e6e8646683c325666eb0e05e45..85f2efe42114f416193542eaaf540356e5efa13c 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Detalles da canle</string>
     <string name="action_add_account">Engadir conta</string>
     <string name="action_edit_contact">Editar contacto</string>
-    <string name="action_add_phone_book">Engadir a libreta de enderezos</string>
     <string name="action_delete_contact">Eliminar contacto da lista</string>
     <string name="action_block_contact">Bloquear contacto</string>
     <string name="action_unblock_contact">Desbloquear contacto</string>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
index 37b76d934eda6eaaf55077c3b1eb86b97d5b22c5..38bd2cb178edf87fe06259a0932db0a43e1a613d 100644
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@@ -8,7 +8,6 @@
     <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>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 310470291983ebd4db812e833bc736e47066c751..7382f9841202f5d30dcc7402ec15d3f32c6da30e 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Csatorna részletei</string>
     <string name="action_add_account">Fiók hozzáadása</string>
     <string name="action_edit_contact">Név szerkesztése</string>
-    <string name="action_add_phone_book">Hozzáadás a címjegyzékhez</string>
     <string name="action_delete_contact">Törlés a névsorból</string>
     <string name="action_block_contact">Partner tiltása</string>
     <string name="action_unblock_contact">Partner tiltásának feloldása</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index e03a944e663831e22fbdfbc47e64a360c56cdd25..188ed8fb31c4fa2782f3d2b244805bf94fdc284b 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Detil channel </string>
     <string name="action_add_account">Tambah Akun</string>
     <string name="action_edit_contact">Ubah Nama</string>
-    <string name="action_add_phone_book">Tambahkan ke daftar kontak</string>
     <string name="action_delete_contact">Hapus dari roster</string>
     <string name="action_block_contact">Blokir kontak</string>
     <string name="action_unblock_contact">Batal blokir kontak</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index d2c754e698551a13ddbbab44c4b79c499b12ad23..c3e6c665036c3e22390647ef5948998ff05cc2f4 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Dettagli canale</string>
     <string name="action_add_account">Aggiungi profilo</string>
     <string name="action_edit_contact">Modifica il nome</string>
-    <string name="action_add_phone_book">Aggiungi alla rubrica</string>
     <string name="action_delete_contact">Cancella dalla lista</string>
     <string name="action_block_contact">Blocca contatto</string>
     <string name="action_unblock_contact">Sblocca contatto</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 34a3af1039f0258240b4ac788f6b87c53de23942..d3ac381804104aaeb1580e209e57f5010c58617c 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -296,7 +296,6 @@
     <string name="crash_report_message">השימוש בחשבון XMPP שלך לשליחת באגים עוזר לפיתוח מתמשך של %1$s.</string>
     <string name="title_activity_share_with">שתף עם…</string>
     <string name="action_archive_chat">ארכיון צ\'אט</string>
-    <string name="action_add_phone_book">הוסף לפנקס הכתובות</string>
     <string name="action_block_participant">חסום משתתף</string>
     <string name="action_unblock_participant">בטל חסימת משתמש</string>
     <string name="title_activity_choose_contacts">בחר אנשי קשר</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index ef567ca2d36b63cb82196215a286cd0b09cbcc0d..6b3c3df8b3f2cfd0592f6ba62f24404fabc7813f 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">談話室の詳細</string>
     <string name="action_add_account">アカウントを追加</string>
     <string name="action_edit_contact">名前を編集</string>
-    <string name="action_add_phone_book">アドレス帳に追加</string>
     <string name="action_delete_contact">連絡先リストから削除</string>
     <string name="action_block_contact">連絡先をブロック</string>
     <string name="action_unblock_contact">連絡先をブロック解除</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 66b9c197c86199bec9d9a12f50f5084283444c53..cc834f29ee3949df2785ba72ff15d29b6069d2f2 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -5,7 +5,6 @@
     <string name="action_contact_details">연락처 정보</string>
     <string name="action_add_account">계정 추가 </string>
     <string name="action_edit_contact">이름 편집 </string>
-    <string name="action_add_phone_book">주소록에 추가</string>
     <string name="action_delete_contact">명단에서 삭제 </string>
     <string name="action_block_contact">연락처 </string>
     <string name="action_unblock_contact">연락처 차단 해제 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 05214a1c33d851ce31b4acd9b225a9b037559489..44766b17041d5bf445b00bb838e95e0432b21116 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -6,7 +6,6 @@
     <string name="action_muc_details">Gruppesludringsdetaljer</string>
     <string name="action_add_account">Legg til samtale</string>
     <string name="action_edit_contact">Rediger navn</string>
-    <string name="action_add_phone_book">Legg til i kontaktliste</string>
     <string name="action_delete_contact">Fjern fra kontaktliste</string>
     <string name="action_block_contact">Blokker kontakt</string>
     <string name="action_unblock_contact">Avblokker kontakt</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 92dd83d18b7d66f4ec264bc5439b035afe51919a..4ea0f47236f7487d200a984bb5d5cde36e3f6058 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Kanaalinformatie</string>
     <string name="action_add_account">Account toevoegen</string>
     <string name="action_edit_contact">Naam veranderen</string>
-    <string name="action_add_phone_book">Toevoegen aan adresboek</string>
     <string name="action_delete_contact">Verwijderen uit lijst</string>
     <string name="action_block_contact">Contact blokkeren</string>
     <string name="action_unblock_contact">Contact deblokkeren</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 304792ed7e06dd71295b28a3a0315e5dfb4bf858..ebfd3f3999cbf64309edb0be865c30a89caa6546 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Szczegóły kanału</string>
     <string name="action_add_account">Dodaj konto</string>
     <string name="action_edit_contact">Edytuj nazwę</string>
-    <string name="action_add_phone_book">Dodaj do kontaktów</string>
     <string name="action_delete_contact">Usuń z rostera</string>
     <string name="action_block_contact">Zablokuj kontakt</string>
     <string name="action_unblock_contact">Odblokuj kontakt</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index eafe781032ff29b1545bc762b029f703654dbaf4..83de695b4f4d585d3f4b3fbf708b85aeaec48fd9 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Detalhes do canal</string>
     <string name="action_add_account">Adicionar conta</string>
     <string name="action_edit_contact">Editar o nome</string>
-    <string name="action_add_phone_book">Adicionar ao livro de endereços</string>
     <string name="action_delete_contact">Excluir da lista de contatos</string>
     <string name="action_block_contact">Bloquear contato</string>
     <string name="action_unblock_contact">Desbloquear contato</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index f1278472859689c08f2dc797b1fdc3e960caf562..9b6199aaebd0dc5b9d7a2a4a9b29ca48808aa0ec 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -5,7 +5,6 @@
     <string name="action_contact_details">Detalhes do contacto</string>
     <string name="action_add_account">Adicionar conta</string>
     <string name="action_edit_contact">Editar nome</string>
-    <string name="action_add_phone_book">Adicionar ao livro de endereços</string>
     <string name="action_delete_contact">Apagar da lista</string>
     <string name="action_block_contact">Bloquear contacto</string>
     <string name="action_unblock_contact">Desbloquear contacto</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index c13784865f0aa4706eda765f35df302e4ac4fb52..e0cc37eec8944592ed054f1c9c974c9a81c7ec85 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Detalii canal</string>
     <string name="action_add_account">Adaugă cont</string>
     <string name="action_edit_contact">Editează nume</string>
-    <string name="action_add_phone_book">Adaugă la lista de contacte</string>
     <string name="action_delete_contact">Șterge din lista de contacte</string>
     <string name="action_block_contact">Blochează contact</string>
     <string name="action_unblock_contact">Deblochează contact</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 13d221fca76da6e199422c753b40f35dabc0fe62..27331dee89fdeef4a814ffe44332a3b9bc8a293c 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Сведения о канале</string>
     <string name="action_add_account">Добавить аккаунт</string>
     <string name="action_edit_contact">Изменить контакт</string>
-    <string name="action_add_phone_book">Добавить в адресную книгу</string>
     <string name="action_delete_contact">Удалить из списка</string>
     <string name="action_block_contact">Заблокировать контакт</string>
     <string name="action_unblock_contact">Разблокировать контакт</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index b5c02d325d4d06c72b11599170d51b878b7be02a..92955079e3bbb51cd9b035d036042e830c0b8830 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Detaily kanála</string>
     <string name="action_add_account">Pridať účet</string>
     <string name="action_edit_contact">Upraviť meno</string>
-    <string name="action_add_phone_book">Pridať do kontaktov</string>
     <string name="action_delete_contact">Vymazať zo zoznamu</string>
     <string name="action_block_contact">Zablokovať kontakt</string>
     <string name="action_unblock_contact">Odblokovať kontakt</string>
diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 06d7414dde5c28d7689820ad6211af6595c03efe..808231d9b74046f736fb392ce6888d38c58135f6 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -7,7 +7,6 @@
     <string name="channel_details">Hollësi kanali</string>
     <string name="action_add_account">Shtoni llogari</string>
     <string name="action_edit_contact">Përpunoni emër</string>
-    <string name="action_add_phone_book">Shtoje te libër adresash</string>
     <string name="action_block_contact">Bllokojeni kontaktin</string>
     <string name="action_unblock_contact">Zhbllokoje kontaktin</string>
     <string name="action_block_domain">Blloko përkatësin</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index d9300d937df8d7b91d7770edb0903ade3f198374..7dc452f926cc9ceb06416e59a01dd6c79f941da3 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Детаљи канала</string>
     <string name="action_add_account">Додај налог</string>
     <string name="action_edit_contact">Измени</string>
-    <string name="action_add_phone_book">Додај у именик</string>
     <string name="action_delete_contact">Обриши са списка контаката</string>
     <string name="action_block_contact">Блокирај контакт</string>
     <string name="action_unblock_contact">Одблокирај контакт</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 37f6679dfd42024793c111baa836e31477e80fd0..6d4119bd182db41a4bf58db95eb69b1c9d4ef2e0 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Gruppdetaljer</string>
     <string name="action_add_account">Lägg till konto</string>
     <string name="action_edit_contact">Redigera namn</string>
-    <string name="action_add_phone_book">Lägg till i kontakter</string>
     <string name="action_delete_contact">Ta bort kontakt</string>
     <string name="action_block_contact">Blockera kontakt</string>
     <string name="action_unblock_contact">Avblockera kontakt</string>
diff --git a/src/main/res/values-szl/strings.xml b/src/main/res/values-szl/strings.xml
index 90786334e60d26033d9f645d930614c642eb64c4..2b43e87ab3ba2d4e40290c14d332735491c08fe2 100644
--- a/src/main/res/values-szl/strings.xml
+++ b/src/main/res/values-szl/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Informacyje kanału</string>
     <string name="action_add_account">Przidej kōnto</string>
     <string name="action_edit_contact">Edytuj miano</string>
-    <string name="action_add_phone_book">Przidej do kōntaktōw</string>
     <string name="action_delete_contact">Skasuj z rostera</string>
     <string name="action_block_contact">Zablokuj kōntakt</string>
     <string name="action_unblock_contact">Ôdblokuj kōntakt</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 37f49a99b847f996374833f32df8edc6fb7da826..6449159c486296d6eb02f287506da37d20956f48 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Kanal ayrıntıları</string>
     <string name="action_add_account">Hesap ekle</string>
     <string name="action_edit_contact">İsmi düzenle</string>
-    <string name="action_add_phone_book">Telefon rehberine ekle</string>
     <string name="action_delete_contact">Kişi listesinden sil</string>
     <string name="action_block_contact">Kişiyi engelle</string>
     <string name="action_unblock_contact">Kişiyi engellemekten vazgeç</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 5720842b669c79ca5d36c82152dcb39d340fe115..45938ecb8bf73811d51930f9bf7b23340be01d11 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Деталі каналу</string>
     <string name="action_add_account">Додати обліковий запис</string>
     <string name="action_edit_contact">Редагувати ім\'я</string>
-    <string name="action_add_phone_book">Додати до контактів</string>
     <string name="action_delete_contact">Вилучити зі списку контактів</string>
     <string name="action_block_contact">Заблокувати контакт</string>
     <string name="action_unblock_contact">Розблокувати контакт</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index e1ed0dd6ebb6e43dee202e94bbaef37a28b0514e..055d25d2e0da4d2634f59dfcc4ef75cb0374299e 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">Chi tiết kênh</string>
     <string name="action_add_account">Thêm tài khoản</string>
     <string name="action_edit_contact">Chỉnh sửa tên</string>
-    <string name="action_add_phone_book">Thêm vào danh bạ</string>
     <string name="action_delete_contact">Xoá khỏi danh sách bạn bè</string>
     <string name="action_block_contact">Chặn liên hệ</string>
     <string name="action_unblock_contact">Bỏ chặn liên hệ</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a31c5315a16c967bc9a96a1a6f9158f6ce95a55a..c73d0323d9ffd597503ba8f60ec3db6afcd43af0 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">频道详情</string>
     <string name="action_add_account">添加账号</string>
     <string name="action_edit_contact">编辑名称</string>
-    <string name="action_add_phone_book">添加到通讯录</string>
     <string name="action_delete_contact">删除联系人</string>
     <string name="action_block_contact">屏蔽联系人</string>
     <string name="action_unblock_contact">取消屏蔽联系人</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index b4cc9ebd27e2796d352b0b84edeb254826e11e8e..ba5fd81aedf7c76d1089aad3ee5f0a6b526415f7 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -8,7 +8,6 @@
     <string name="channel_details">頻道詳細資料</string>
     <string name="action_add_account">新增帳戶</string>
     <string name="action_edit_contact">編輯名稱</string>
-    <string name="action_add_phone_book">新增至通訊錄</string>
     <string name="action_delete_contact">從名冊中刪除</string>
     <string name="action_block_contact">封鎖聯絡人</string>
     <string name="action_unblock_contact">解除封鎖聯絡人</string>