prevent deletion of bookmark w/o also closing conversation

src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java

@@ -243,9 +243,6 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             case R.id.action_save_as_bookmark:
                 saveAsBookmark();
                 break;
-            case R.id.action_delete_bookmark:
-                deleteBookmark();
-                break;
             case R.id.action_destroy_room:
                 destroyRoom();
                 break;
@@ -345,28 +342,21 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     }
 
     @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
+    public boolean onPrepareOptionsMenu(final Menu menu) {
-        MenuItem menuItemSaveBookmark = menu.findItem(R.id.action_save_as_bookmark);
+        final MenuItem menuItemSaveBookmark = menu.findItem(R.id.action_save_as_bookmark);
-        MenuItem menuItemDeleteBookmark = menu.findItem(R.id.action_delete_bookmark);
+        final MenuItem menuItemAdvancedMode = menu.findItem(R.id.action_advanced_mode);
-        MenuItem menuItemAdvancedMode = menu.findItem(R.id.action_advanced_mode);
+        final MenuItem menuItemDestroyRoom = menu.findItem(R.id.action_destroy_room);
-        MenuItem menuItemDestroyRoom = menu.findItem(R.id.action_destroy_room);
         menuItemAdvancedMode.setChecked(mAdvancedMode);
         if (mConversation == null) {
             return true;
         }
-        if (mConversation.getBookmark() != null) {
+        menuItemSaveBookmark.setVisible(mConversation.getBookmark() == null);
-            menuItemSaveBookmark.setVisible(false);
-            menuItemDeleteBookmark.setVisible(true);
-        } else {
-            menuItemDeleteBookmark.setVisible(false);
-            menuItemSaveBookmark.setVisible(true);
-        }
         menuItemDestroyRoom.setVisible(mConversation.getMucOptions().getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER));
         return true;
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
+    public boolean onCreateOptionsMenu(final 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);
@@ -392,14 +382,6 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         xmppConnectionService.saveConversationAsBookmark(mConversation, mConversation.getMucOptions().getName());
     }
 
-    protected void deleteBookmark() {
-        final Account account = mConversation.getAccount();
-        final Bookmark bookmark = mConversation.getBookmark();
-        bookmark.setConversation(null);
-        xmppConnectionService.deleteBookmark(account, bookmark);
-        updateView();
-    }
-
     protected void destroyRoom() {
         final boolean groupChat = mConversation != null && mConversation.isPrivateAndNonAnonymous();
         AlertDialog.Builder builder = new AlertDialog.Builder(this);

src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java

@@ -502,17 +502,25 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
     }
 
     protected void deleteConference() {
-        int position = conference_context_id;
+        final int position = conference_context_id;
         final Bookmark bookmark = (Bookmark) conferences.get(position);
-
+        final var conversation = bookmark.getConversation();
-        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        final boolean hasConversation = conversation != null;
+        final AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setNegativeButton(R.string.cancel, null);
         builder.setTitle(R.string.delete_bookmark);
-        builder.setMessage(JidDialog.style(this, R.string.remove_bookmark_text, bookmark.getJid().toEscapedString()));
+        if (hasConversation) {
-        builder.setPositiveButton(R.string.delete, (dialog, which) -> {
+            builder.setMessage(JidDialog.style(this, R.string.remove_bookmark_and_close, bookmark.getJid().toEscapedString()));
+        } else {
+            builder.setMessage(JidDialog.style(this, R.string.remove_bookmark, bookmark.getJid().toEscapedString()));
+        }
+        builder.setPositiveButton(hasConversation ? R.string.delete_and_close : R.string.delete, (dialog, which) -> {
             bookmark.setConversation(null);
             final Account account = bookmark.getAccount();
             xmppConnectionService.deleteBookmark(account, bookmark);
+            if (conversation != null) {
+                xmppConnectionService.archiveConversation(conversation);
+            }
             filter(mSearchEditText.getText().toString());
         });
         builder.create().show();
@@ -1245,7 +1253,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         }
 
         @Override
-        public void onCreateContextMenu(final ContextMenu menu, final View v, final ContextMenuInfo menuInfo) {
+        public void onCreateContextMenu(@NonNull final ContextMenu menu, @NonNull final View v, final ContextMenuInfo menuInfo) {
             super.onCreateContextMenu(menu, v, menuInfo);
             final StartConversationActivity activity = (StartConversationActivity) getActivity();
             if (activity == null) {
@@ -1258,6 +1266,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
                 final Bookmark bookmark = (Bookmark) activity.conferences.get(acmi.position);
                 final Conversation conversation = bookmark.getConversation();
                 final MenuItem share = menu.findItem(R.id.context_share_uri);
+                final MenuItem delete = menu.findItem(R.id.context_delete_conference);
+                if (conversation != null) {
+                    delete.setTitle(R.string.delete_and_close);
+                } else {
+                    delete.setTitle(R.string.delete_bookmark);
+                }
                 share.setVisible(conversation == null || !conversation.isPrivateAndNonAnonymous());
             } else if (mResContextMenu == R.menu.contact_context) {
                 activity.contact_context_id = acmi.position;

src/main/res/menu/muc_details.xml

@@ -26,11 +26,6 @@
         android:orderInCategory="80"
         app:showAsAction="never"
         android:title="@string/save_as_bookmark"/>
-    <item
-        android:id="@+id/action_delete_bookmark"
-        android:orderInCategory="80"
-        app:showAsAction="never"
-        android:title="@string/delete_bookmark"/>
     <item
         android:id="@+id/action_destroy_room"
         android:orderInCategory="82"

src/main/res/values-ar/strings.xml

@@ -46,7 +46,6 @@
     <string name="unblock_domain_text">الغاء حجب جميع جهات الإتصال من %s?</string>
     <string name="contact_blocked">جهة الاتصال محجوبه</string>
     <string name="blocked">محجوب</string>
-    <string name="remove_bookmark_text">هل تريد حذف %sمن قائمة المفضلة؟ المحادثات مع هذا المفضل لن تحذف.</string>
     <string name="register_account">تسجيل حساب جديد في سيرفر</string>
     <string name="change_password_on_server">تغيير كلمة المرور في سيرفر</string>
     <string name="share_with">مشاركة مع</string>

src/main/res/values-bg/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">Деблокиране на всички контакти от %s?</string>
     <string name="contact_blocked">Контактът е блокиран</string>
     <string name="blocked">Блокиран</string>
-    <string name="remove_bookmark_text">Искате ли да премахнете отметката за %s? Разговорите, свързани с тази отметка, няма да бъдат премахнати.</string>
     <string name="register_account">Регистриране на нов профил на сървъра</string>
     <string name="change_password_on_server">Промяна на паролата в сървъра</string>
     <string name="share_with">Споделяне с…</string>

src/main/res/values-ca/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">Voleu desbloquejar tots el contactes de %s?</string>
     <string name="contact_blocked">Contacte bloquejat</string>
     <string name="blocked">Bloquejats</string>
-    <string name="remove_bookmark_text">Vols esborrar %s com a marcador? Les converses amb aquest marcador no seran eliminades.</string>
     <string name="register_account">Registra un compte nou al servidor</string>
     <string name="change_password_on_server">Canvia la contrasenya al servidor</string>
     <string name="share_with">Comparteix amb…</string>

src/main/res/values-cs/strings.xml

@@ -52,7 +52,6 @@
     <string name="unblock_domain_text">Odblokovat všechny kontakty z %s?</string>
     <string name="contact_blocked">Kontakt zablokován</string>
     <string name="blocked">Zablokovaný</string>
-    <string name="remove_bookmark_text">Přejete si odstranit %s ze záložek? Předešlé rozhovory pod záložkou nebudou odstraněny.</string>
     <string name="register_account">Registrovat nový účet na serveru</string>
     <string name="change_password_on_server">Změnit heslo na serveru</string>
     <string name="share_with">Sdílet s…</string>
@@ -993,7 +992,6 @@
     <string name="missed_calls_channel_name">Zmeškané hovory</string>
     <string name="save_as_group_chat">Uložit jako skupinový chat</string>
     <string name="conference_technical_problems">Tento skupinový chat jste opustili z technických důvodů</string>
-    <string name="channel_discover_opt_in_message">Vyhledávání kanálů používá službu třetí strany jménem &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Používání této služby odešle vaši IP adresu a vyhledávaný termín této službě. Pro více informací konzultujte jejich &lt;a href=https://search.jabber.network/privacy&gt;Zásady ochrany osobních údajů&lt;/a&gt;.</string>
     <string name="reconnecting_call">Znovu spojuji hovor</string>
     <string name="blindly_trusted_omemo_keys">Slepě důvěřované klíče OMEMO, které mohou být někdo jiný nebo někým zasaženy.</string>
     <string name="incoming_call_duration_timestamp">Příchozí hovor ·(%s) · %s</string>

src/main/res/values-da-rDK/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">Frigiv alle kontakter fra %s? </string>
     <string name="contact_blocked">Kontakt blokeret</string>
     <string name="blocked">Blokeret</string>
-    <string name="remove_bookmark_text">Vil du gerne slette %s som et bogmærke? Samtaler med dette bogmærke vil ikke blive slettet.</string>
     <string name="register_account">Register ny konto på server</string>
     <string name="change_password_on_server">Ændr adgangskode på server</string>
     <string name="share_with">Del med…</string>
@@ -1003,7 +1002,6 @@
     <string name="unified_push_distributor">UnifiedPush-distributør</string>
     <string name="outgoing_call_timestamp">Udgående opkald · %s</string>
     <string name="outgoing_call_duration_timestamp">Udgående opkald (%s) · %s</string>
-    <string name="channel_discover_opt_in_message">Kanalopdagelse bruger en tredjepartstjeneste kaldet &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Brug af denne funktion vil overføre din IP-adresse og søgetermer til den service. Se deres &lt;a href=https://search.jabber.network/privacy&gt;privatlivspolitik&lt;/a&gt; for at få flere oplysninger.</string>
     <string name="incoming_call_duration_timestamp">Indkommende opkald (%s) · %s</string>
     <string name="delete_from_server">Fjern konto fra server</string>
     <string name="pref_up_push_server_summary">En brugervalgt push-server til at videresende push-meddelelser via XMPP til din enhed.</string>

src/main/res/values-de/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">Alle Kontakte von %s entsperren?</string>
     <string name="contact_blocked">Kontakt gesperrt</string>
     <string name="blocked">Gesperrt</string>
-    <string name="remove_bookmark_text">Möchtest du %s als Lesezeichen entfernen? Unterhaltungen mit diesem Lesezeichen werden dabei nicht entfernt.</string>
     <string name="register_account">Neues Konto auf Server erstellen</string>
     <string name="change_password_on_server">Passwort ändern</string>
     <string name="share_with">Teilen mit…</string>
@@ -1010,7 +1009,6 @@
     <string name="group_chats">Gruppenchats</string>
     <string name="save_as_group_chat">Als Gruppenchat speichern</string>
     <string name="search_group_chats">Gruppenchats durchsuchen</string>
-    <string name="channel_discover_opt_in_message">Die Channelsuche verwendet einen Drittanbieterservice namens &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Wenn du diese Funktion verwendest, werden deine IP-Adresse und deine Suchbegriffe an diesen Dienst übertragen. Weitere Informationen findest du in der &lt;a href=https://search.jabber.network/privacy&gt;Datenschutzerklärung&lt;/a&gt;.</string>
     <string name="restore_warning_continued">Versuche nicht, Backups wiederherzustellen, die du nicht selbst erstellt hast!</string>
     <string name="outdated_backup_file_format">Du versuchst, ein veraltetes Sicherungsdateiformat zu importieren</string>
     <string name="audiobook">Hörbuch</string>

src/main/res/values-el/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">Άρση αποκλεισμού όλων των επαφών από το %s;</string>
     <string name="contact_blocked">Η επαφή αποκλείστηκε</string>
     <string name="blocked">Αποκλεισμένος</string>
-    <string name="remove_bookmark_text">Θέλετε να αφαιρέσετε το %s από σελιδοδείκτη; Οι συζητήσεις που σχετίζονται με αυτόν τον σελιδοδείκτη δεν θα αφαιρεθούν.</string>
     <string name="register_account">Εγγραφή νέου λογαριασμού στον διακομιστή</string>
     <string name="change_password_on_server">Αλλαγή συνθηματικού στον διακομιστή</string>
     <string name="share_with">Διαμοιρασμός με...</string>

src/main/res/values-es/strings.xml

@@ -51,7 +51,6 @@
     <string name="unblock_domain_text">¿Desbloquear todos los contatos de %s?</string>
     <string name="contact_blocked">Contacto bloqueado</string>
     <string name="blocked">Bloqueado</string>
-    <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? Las conversaciones con este marcador no serán eliminadas.</string>
     <string name="register_account">Registrar nueva cuenta en servidor</string>
     <string name="change_password_on_server">Cambiar contraseña en servidor</string>
     <string name="share_with">Compartir con…</string>
@@ -1023,7 +1022,6 @@
     <string name="could_not_delete_account_from_server">No se pudo eliminar la cuenta del servidor</string>
     <string name="group_chats">Chats en grupo</string>
     <string name="search_group_chats">Buscar un grupo de chats</string>
-    <string name="channel_discover_opt_in_message">La búsqueda de canales utiliza un servicio de terceros denominado &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Si utiliza esta función, tu dirección IP y la búsqueda de términos serán transferidos a este servicio. Para obtener más información, consulta la &lt;a href=https://search.jabber.network/privacy&gt;Política de privacidad&lt;/a&gt;.</string>
     <string name="save_as_group_chat">Guardar como un chat en grupo</string>
     <string name="restore_warning_continued">¡No intentes restaurar las copias de seguridad que no creaste tu mismo!</string>
     <string name="outdated_backup_file_format">Estás intentando importar un formato de copia de seguridad obsoleto</string>

src/main/res/values-fa-rIR/strings.xml

@@ -582,7 +582,6 @@
     <string name="server_info_stream_management">XEP-0198: Stream Management</string>
     <string name="search_all_conversations">همهٔ گفتگوها</string>
     <string name="disable_notifications">قطع اعلان‌ها</string>
-    <string name="remove_bookmark_text">آیا می‌خواهید نشانک‌گذاری %s را بردارید؟ گفتگوها با این نشانک پاک نخواهند شد.</string>
     <string name="return_to_ongoing_call">بازگشت به تماس جاری</string>
     <string name="last_seen_min">آخرین بار یک دقیقه پیش</string>
     <string name="could_not_change_affiliation">تغییر نسبت %s ممکن نبود</string>
@@ -983,7 +982,6 @@
     <string name="this_account_is_disabled">شما این حساب را غیرفعال کرده‌اید</string>
     <string name="pref_connection_options">اتصال</string>
     <string name="contact_asks_for_presence_subscription">مخاطب می‌خواهد وضعیت وصل‌بودن شما را بداند</string>
-    <string name="channel_discover_opt_in_message">کاوش کانال‌ها یک سرویس خارجی به نام &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; را به‌کار می‌برد.&lt;br&gt;&lt;br&gt;به‌کاربردن این ویژگی نشانی IP و کلمات مورد جستجوی شما را به این سرویس می‌فرستد. برای اطلاعات بیشتر &lt;a href=https://search.jabber.network/privacy&gt;سیاست محرمانگی&lt;/a&gt; آن‌ها را ببینید.</string>
     <string name="incorrect_pin">کدی که وارد کردید نادرست است.</string>
     <string name="phone_number">شماره تلفن</string>
     <string name="pref_theme_automatic">خودکار</string>

src/main/res/values-fi/strings.xml

@@ -49,7 +49,6 @@
     <string name="unblock_domain_text">Perutaanko kaikkien verkkotunnuksen %s käyttäjien esto?</string>
     <string name="contact_blocked">Yhteystieto estetty</string>
     <string name="blocked">Estetty</string>
-    <string name="remove_bookmark_text">Poistetaanko %s kirjanmerkeistä? Mitään keskustelujasi sen kanssa ei poisteta.</string>
     <string name="register_account">Rekisteröi uusi tili palvelimella</string>
     <string name="change_password_on_server">Vaihda salasanaa palvelimelle</string>
     <string name="start_conversation">Aloita keskustelu</string>
@@ -916,7 +915,6 @@
     <string name="group_chats">Ryhmäkeskustelut</string>
     <string name="search_group_chats">Etsi ryhmäkeskusteluista</string>
     <string name="pref_start_search">Suoraan hakuun</string>
-    <string name="channel_discover_opt_in_message">Kanavien löytö käyttää kolmannen osapuolen palvelua nimeltä &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Tämän ominaisuuden käyttö lähettää IP-osoitteesi ja hakusanasi palvelulle. Lue lisää heidän &lt;a href=https://search.jabber.network/privacy&gt;yksityisyyskäytännöstään&lt;/a&gt; (englanniksi).</string>
     <string name="search_messages">Hae viesteistä</string>
     <string name="this_account_is_logged_out">Olet kirjautunut ulos tältä tililtä</string>
     <string name="missed_calls_channel_name">Vastaamattomat puhelut</string>

src/main/res/values-fr/strings.xml

@@ -51,7 +51,6 @@
     <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>
     <string name="share_with">Partager avec…</string>
@@ -994,7 +993,6 @@
 \n
 \n%1$s ne lira que votre carnet d\'adresses et le comparera localement sans rien télécharger sur votre serveur.</string>
     <string name="multimedia_file">ficher multimédia</string>
-    <string name="channel_discover_opt_in_message">La découverte des canaux utilise un service tiers appelé &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;L\'utilisation de cette fonction transmet votre adresse IP et votre recherche à ce service. Voir leur &lt;a href=https://search.jabber.network/privacy&gt;Politique de gestion de la vie privée&lt;/a&gt; pour plus d\'informations.</string>
     <string name="search_group_chats">Rechercher des groupes</string>
     <string name="outgoing_call_duration_timestamp">Appel sortant (%s) · %s</string>
     <string name="data_saver_enabled_explained">Votre système d\'exploitation empêche %1$s d\'accéder à l\'internet lorsqu\'il est en arrière-plan. Pour être notifié de nouveaux messages, vous devez permettre à %1$s d\'accéder à Internet lorsque l\'économiseur de données est activé.

src/main/res/values-gl/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">Desbloquear todos os contactos desde 1%s?</string>
     <string name="contact_blocked">Contacto bloqueado</string>
     <string name="blocked">Bloqueado</string>
-    <string name="remove_bookmark_text">Desexas eliminar o marcador %s? As conversas deste marcador non se eliminarán. </string>
     <string name="register_account">Rexistrar nova conta no servidor</string>
     <string name="change_password_on_server">Cambiar o contrasinal no servidor</string>
     <string name="share_with">Compartir con…</string>
@@ -1013,7 +1012,6 @@
     <string name="save_as_group_chat">Gardar como conversa en grupo</string>
     <string name="search_group_chats">Buscar conversas en grupo</string>
     <string name="group_chats">Conversas en grupo</string>
-    <string name="channel_discover_opt_in_message">O descubrimento de canles usa un servizo externo chamado &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Ao usar esta ferramenta transmitirás o teu enderezo IP e termos de busca a ese servizo. Le a súa &lt;a href=https://search.jabber.network/privacy&gt;Política de Privacidade&lt;/a&gt; para saber máis.</string>
     <string name="restore_warning_continued">Non intentes restablecer unha copia de apoio que non tiveses creado ti!</string>
     <string name="outdated_backup_file_format">Estás intentando importar un ficheiro de apoio co formato antigo</string>
     <string name="audiobook">Audiolibro</string>

src/main/res/values-hr/strings.xml

@@ -56,7 +56,6 @@
     <string name="unblock_domain_text">Deblokirati sve kontakte iz %s?</string>
     <string name="contact_blocked">Kontakt blokiran</string>
     <string name="blocked">Blokiran</string>
-    <string name="remove_bookmark_text">Želite li ukloniti %s kao oznaku? Razgovori s ovom knjižnom oznakom neće biti uklonjeni.</string>
     <string name="register_account">Registrirajte novi račun na poslužitelju</string>
     <string name="change_password_on_server">Promjena lozinke na poslužitelju</string>
     <string name="share_with">Podijeli s…</string>

src/main/res/values-hu/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">%s összes partnerének tiltását feloldja?</string>
     <string name="contact_blocked">Partner tiltva</string>
     <string name="blocked">Tiltva</string>
-    <string name="remove_bookmark_text">Szeretné eltávolítani ezt a könyvjelzőkből: %s? Ezzel a könyvjelzővel megjelölt beszélgetései nem lesznek eltávolítva.</string>
     <string name="register_account">Új fiók regisztrálása a kiszolgálón</string>
     <string name="change_password_on_server">Jelszó megváltoztatása a kiszolgálón</string>
     <string name="share_with">Megosztás ezzel…</string>

src/main/res/values-id/strings.xml

@@ -49,7 +49,6 @@
     <string name="unblock_domain_text">Batalkan blokir semua kontak dari %s?</string>
     <string name="contact_blocked">Kontak terblokir</string>
     <string name="blocked">Diblok</string>
-    <string name="remove_bookmark_text">Apakah Anda ingin menghapus %s bookmark ini? Percakapan di bookmark ini tidak akan dihapus.</string>
     <string name="register_account">Daftarkan akun baru di server</string>
     <string name="change_password_on_server">Ganti password di server</string>
     <string name="share_with">Bagikan dengan...</string>

src/main/res/values-it/strings.xml

@@ -51,7 +51,6 @@
     <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 %s dai segnalibri? Le conversazioni con questo segnalibro non verranno rimosse.</string>
     <string name="register_account">Registra un nuovo profilo sul server</string>
     <string name="change_password_on_server">Cambia la password sul server</string>
     <string name="share_with">Condividi con…</string>
@@ -1025,7 +1024,6 @@
     <string name="group_chats">Chat di gruppo</string>
     <string name="save_as_group_chat">Salva come chat di gruppo</string>
     <string name="search_group_chats">Cerca chat di gruppo</string>
-    <string name="channel_discover_opt_in_message">La scoperta dei canali usa un servizio di terze parti chiamato &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;L\'uso di questa funzione invierà il tuo indirizzo IP e i termini di ricerca a quel servizio. Vedi la sua &lt;a href=https://search.jabber.network/privacy&gt;informativa sulla privacy&lt;/a&gt; per maggiori informazioni.</string>
     <string name="restore_warning_continued">Non tentare di ripristinare dei backup che non hai creato te stesso!</string>
     <string name="outdated_backup_file_format">Stai tentando di importare un formato di file di backup obsoleto</string>
     <string name="audiobook">Audiolibro</string>

src/main/res/values-ja/strings.xml

@@ -49,7 +49,6 @@
     <string name="unblock_domain_text">%sのすべての連絡先のブロックを解除しますか？</string>
     <string name="contact_blocked">連絡先をブロックしました</string>
     <string name="blocked">ブロックしました</string>
-    <string name="remove_bookmark_text">%s のブックマークを削除しますか? このブックマークとの会話は削除されません。</string>
     <string name="register_account">サーバーに新規アカウントを登録</string>
     <string name="change_password_on_server">サーバーのパスワードを変更</string>
     <string name="share_with">…で共有</string>
@@ -987,7 +986,6 @@
     <string name="account_state_logged_out">ログアウトしました</string>
     <string name="outgoing_call_timestamp">発信通話 · %s</string>
     <string name="audiobook">オーディオブック</string>
-    <string name="channel_discover_opt_in_message">談話室の探索は&lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;というサービスを利用します.&lt;br&gt;&lt;br&gt;利用するとIPアドレスと検索語はそのサービスに送信されます。詳細についてはそのサービスの&lt;a href=https://search.jabber.network/privacy&gt;個人情報保護方針&lt;/a&gt;を参照してください。</string>
     <string name="restore_warning_continued">自分で保存したバックアップしか復元しないでください！</string>
     <string name="pref_up_push_server_summary">XMPP経由でPushメッセージを端末に転送するユーザー指定のPushサーバー。</string>
     <string name="log_in">ログイン</string>

src/main/res/values-nl/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">Alle contacten van %s deblokkeren?</string>
     <string name="contact_blocked">Contact geblokkeerd</string>
     <string name="blocked">Geblokkeerd</string>
-    <string name="remove_bookmark_text">Wil je %s als bladwijzer verwijderen? De gesprekken met deze bladwijzer zullen niet worden verwijderd.</string>
     <string name="register_account">Nieuwe account op server registreren</string>
     <string name="change_password_on_server">Wachtwoord op server veranderen</string>
     <string name="share_with">Delen met…</string>

src/main/res/values-pl/strings.xml

@@ -52,7 +52,6 @@
     <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 chcesz usunąć zakładkę %s? Rozmowy z tą zakładką nie zostaną usunięte.</string>
     <string name="register_account">Zarejestruj nowe konto na serwerze</string>
     <string name="change_password_on_server">Zmień hasło na serwerze</string>
     <string name="share_with">Udostępnij…</string>
@@ -1041,7 +1040,6 @@
     <string name="delete_from_server">Usuń konto z serwera</string>
     <string name="could_not_delete_account_from_server">Nie można usunąć konta z serwera</string>
     <string name="search_group_chats">Wyszukaj czatów grupowych</string>
-    <string name="channel_discover_opt_in_message">Wykrywanie kanałów korzysta z usługi innego podmiotu o nazwie &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Użycie tej funkcji spowoduje przesłanie adresu IP i wyszukiwanych terminów do tej usługi. Zobacz ich &lt;a href=https://search.jabber.network/privacy&gt;Politykę prywatności&lt;/a&gt;, aby uzyskać więcej informacji.</string>
     <string name="group_chats">Czaty grupowe</string>
     <string name="save_as_group_chat">Zapisz jako czat grupowy</string>
     <string name="restore_warning_continued">Nie próbuj przywracać kopii zapasowych, których nie utworzono samodzielnie!</string>

src/main/res/values-pt-rBR/strings.xml

@@ -51,7 +51,6 @@
     <string name="unblock_domain_text">Desbloquear todos os contatos de %s?</string>
     <string name="contact_blocked">Contato bloqueado</string>
     <string name="blocked">Bloqueado</string>
-    <string name="remove_bookmark_text">Você deseja remover %s dos favoritos? As conversas associadas a esse favorito não serão removidas.</string>
     <string name="register_account">Registrar uma nova conta no servidor</string>
     <string name="change_password_on_server">Alterar a senha no servidor</string>
     <string name="share_with">Compartilhar com...</string>

src/main/res/values-ro-rRO/strings.xml

@@ -51,7 +51,6 @@
     <string name="unblock_domain_text">Deblochează toate contactele de la %s?</string>
     <string name="contact_blocked">Contact blocat</string>
     <string name="blocked">Blocat</string>
-    <string name="remove_bookmark_text">Ați dori să ștergeți %s din semne de carte? Conversațiile asociate cu acest semn de carte nu vor fi șterse.</string>
     <string name="register_account">Înregistrează un cont nou pe server</string>
     <string name="change_password_on_server">Schimbă parola pe server</string>
     <string name="share_with">Partajează cu…</string>
@@ -1027,7 +1026,6 @@
     <string name="could_not_delete_account_from_server">Nu s-a putut șterge contul de pe server</string>
     <string name="delete_from_server">Șterge contul de pe server</string>
     <string name="group_chats">Discuții de grup</string>
-    <string name="channel_discover_opt_in_message">Descoperirea de canale publice folosește un serviciu terț numit &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Folosind această funcție se va transmite adresa dumneavoastră IP și cuvintele căutate către acest serviciu. Pentru mai multe informații citiți &lt;a href=https://search.jabber.network/privacy&gt;Politica de confidențialitate&lt;/a&gt; a serviciului.</string>
     <string name="save_as_group_chat">Salvare ca discuție de grup</string>
     <string name="search_group_chats">Caută discuții de grup</string>
     <string name="restore_warning_continued">Nu încercați să restaurați copii de rezervă pe care nu le-ați creat personal!</string>

src/main/res/values-ru/strings.xml

@@ -52,7 +52,6 @@
     <string name="unblock_domain_text">Разблокировать всех пользователей домена %s?</string>
     <string name="contact_blocked">Контакт заблокирован</string>
     <string name="blocked">Заблокирован</string>
-    <string name="remove_bookmark_text">Вы хотите удалить %s из избранного? Беседы, связанные с данной закладкой, будут сохранены.</string>
     <string name="register_account">Создать новую учётную запись на сервере</string>
     <string name="change_password_on_server">Изменить пароль на сервере</string>
     <string name="share_with">Поделиться с…</string>
@@ -1025,7 +1024,6 @@
     <string name="audio_video_disabled_tor">Звонки выключены, пока используется Tor</string>
     <string name="pref_up_push_account_summary">Учётная запись для получения пуш-уведомлений.</string>
     <string name="pref_up_push_server_summary">Выбираемый пользователем сервер для перенаправления уведомлений на Ваше устройство.</string>
-    <string name="channel_discover_opt_in_message">Обзор каналов использует сторонний сервис &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Эта функция передаст Ваш IP-адрес и ваш поисковый запрос этому сервису. Ознакомьтесь с их &lt;a href=https://search.jabber.network/privacy&gt;Политикой приватности&lt;/a&gt; для получения подробностей.</string>
     <string name="no_account_deactivated">Нет (неактивно)</string>
     <string name="verifying_omemo_keys_trusted_source_account">Вы собираетесь проверить ключи OMEMO своей учетной записи. Это безопасно только в том случае, если вы перешли по этой ссылке из надежного источника, где только вы могли опубликовать эту ссылку.</string>
     <string name="restore_warning_continued">Не пытайтесь восстановить резервные копии, которые не были созданы вами!</string>

src/main/res/values-sk/strings.xml

@@ -59,7 +59,6 @@
     <string name="unblock_domain_text">Odblokovať všetky kontakty od %s?</string>
     <string name="contact_blocked">Kontakt zablokovaný</string>
     <string name="blocked">Zablokovaný</string>
-    <string name="remove_bookmark_text">Chcete vymazať %sako záložku? Rozhovory s touto záložkou nebudú zmazané.</string>
     <string name="register_account">Registrovať nový účet na serveri</string>
     <string name="change_password_on_server">Zmeniť heslo na serveri</string>
     <string name="share_with">Zdieľať s</string>

src/main/res/values-sq-rAL/strings.xml

@@ -840,7 +840,6 @@
     <string name="remove_contact_text">Do të donit të hiqet %s prej listës tuaj të kontakteve\? Bisedat me këtë kontakt s’do të hiqen.</string>
     <string name="block_contact_text">Do të donit t’i bllokohet %s dërgimi i mesazheve për ju\?</string>
     <string name="unblock_contact_text">Do të donit të zhbllokohet %s dhe të lejohet t’ju dërgojë mesazhe\?</string>
-    <string name="remove_bookmark_text">Do të donit të hiqet %s si faqerojtës\? Bisedat me këtë faqerojtës s’do të hiqen.</string>
     <string name="crash_report_message">Përdorimi i llogarisë tuaj XMPP për të dërguar “stack traces” ndihmon zhvillimin e pandërprerë të %1$s.</string>
     <string name="clear_histor_msg">Doni të fshihen krejt mesazhet te kjo bisedë\?
 \n
@@ -1041,5 +1040,4 @@
     <string name="call_integration_not_available">S’ka integrim thirrjesh!</string>
     <string name="no_permission_to_place_call">Pa leje për bërje thirrjesh</string>
     <string name="sasl_downgrade">U kalua në version të mëparshëm SASL-i</string>
-    <string name="channel_discover_opt_in_message">Pikasje kanalesh përdor një shërbim palë të tretë të quajtur &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Përdorim i kësaj veçorie do t’i transmetojë atij shërbimi adresën tuaj IP dhe terma kërkimesh. Për më tepër hollësi, shihni &lt;a href=https://search.jabber.network/privacy&gt;Rregullat e tyre mbi Privatësinë&lt;/a&gt;.</string>
 </resources>

src/main/res/values-sr/strings.xml

@@ -51,7 +51,6 @@
     <string name="unblock_domain_text">Одблокирати све контакте од %s?</string>
     <string name="contact_blocked">Контакт блокиран</string>
     <string name="blocked">Блокиран</string>
-    <string name="remove_bookmark_text">Да ли желите да уклоните %s са обележивача? Преписке са овим контактом неће бити уклоњене.</string>
     <string name="register_account">Региструј нови налог на серверу</string>
     <string name="change_password_on_server">Промени лозинку на серверу</string>
     <string name="share_with">Подели помоћу…</string>

src/main/res/values-sv/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">Avblockera alla kontakter från %s?</string>
     <string name="contact_blocked">Kontakt blockerad</string>
     <string name="blocked">Blockerad</string>
-    <string name="remove_bookmark_text">Vill du ta bort %s som ett bokmärke\? Konversationer med detta bokmärke kommer inte att tas bort.</string>
     <string name="register_account">Registrera ett nytt konto på servern</string>
     <string name="change_password_on_server">Byt lösenord på servern</string>
     <string name="share_with">Dela med…</string>
@@ -1042,7 +1041,6 @@
     <string name="save_as_group_chat">Spara som gruppchatt</string>
     <string name="audiobook">Ljudbok</string>
     <string name="report_spam">Rapportera spam</string>
-    <string name="channel_discover_opt_in_message">Funktionen Channel Discovery, använder en tredjepartstjänst som heter &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Om du använder den här funktionen, överförs din IP-adress och din söktermer till den tjänsten. Se deras &lt;a href=https://search.jabber.network/privacy&gt;sekretesspolicy&lt;/a&gt; för mer information.</string>
     <string name="restore_warning_continued">Försök inte att återställa säkerhetskopior som du inte har skapat själv!</string>
     <string name="could_not_delete_account_from_server">Det gick inte att ta bort kontot från servern</string>
     <string name="quicksy_wants_your_consent">Quicksy ber om ditt samtycke för att använda dina uppgifter</string>

src/main/res/values-szl/strings.xml

@@ -51,7 +51,6 @@
     <string name="unblock_domain_text">Ôdblokować wszyjske kōntakty ze %s\?</string>
     <string name="contact_blocked">Kōntakt zablokowany</string>
     <string name="blocked">Zablokowane</string>
-    <string name="remove_bookmark_text">Chcesz wymazać zokłodka %s\? Godki z niōm niy bydōm wymazane.</string>
     <string name="register_account">Zaregistruj nowe kōnto na serwerze</string>
     <string name="change_password_on_server">Umiyń hasło na serwerze</string>
     <string name="share_with">Udostympnij…</string>

src/main/res/values-tr-rTR/strings.xml

@@ -50,7 +50,6 @@
     <string name="unblock_domain_text">%s üzerinden gelen kişilerdeki engellemeyi kaldırmak istiyor musunuz?</string>
     <string name="contact_blocked">Kişi engellendi</string>
     <string name="blocked">Engellendi</string>
-    <string name="remove_bookmark_text">%s kişisini yer imlerinden çıkarmak ister misiniz? Bu yer imi ile kayıtlı konuşmalar silinmeyecektir.</string>
     <string name="register_account">Sunucuda yeni bir hesap oluştur</string>
     <string name="change_password_on_server">Sunucudaki şifreni değiştir</string>
     <string name="share_with">Paylaş…</string>

src/main/res/values-uk/strings.xml

@@ -45,7 +45,6 @@
     <string name="unblock_domain_text">Розблокувати всі контакти з %s\?</string>
     <string name="contact_blocked">Контакт заблоковано</string>
     <string name="blocked">Заблоковано</string>
-    <string name="remove_bookmark_text">Бажаєте вилучити %s із закладок\? Розмови, пов\'язані з цією закладкою, залишаться.</string>
     <string name="register_account">Зареєструвати новий обліковий запис на сервері</string>
     <string name="change_password_on_server">Змінити пароль</string>
     <string name="share_with">Поділитися…</string>
@@ -975,7 +974,6 @@
     <string name="search_this_conversation">Ця розмова</string>
     <string name="add_contact_or_create_or_join_group_chat">Додати контакт, створити чи приєднатися до групи або знайти канали</string>
     <string name="pref_up_push_account_title">Обліковий запис XMPP</string>
-    <string name="channel_discover_opt_in_message">Пошук каналів використовує сторонній сервіс &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Використання цієї функції передає Вашу IP-адресу та пошукові запити цьому сервісу. Перегляньте їхню &lt;a href=https://search.jabber.network/privacy&gt;Політику конфіденційності&lt;/a&gt;, щоб отримати більше інформації.</string>
     <string name="outgoing_call_timestamp">Вихідний виклик · %s</string>
     <string name="openkeychain_required_long">%1$s використовує &lt;b&gt;OpenKeychain&lt;/b&gt; для шифрування/дешифрування повідомлень і керування публічними ключами.&lt;br&gt;&lt;br&gt;OpenKeychain поширюється на умовах ліцензії GPLv3+ і доступний для завантаження на F-Droid та Google Play.&lt;br&gt;&lt;br&gt;&lt;small&gt;(Після встановлення необхідно перезапустити %1$s.)&lt;/small&gt;</string>
     <string name="more_options">Додатково</string>

src/main/res/values-vi/strings.xml

@@ -49,7 +49,6 @@
     <string name="unblock_domain_text">Bỏ chặn tất cả liên hệ từ %s?</string>
     <string name="contact_blocked">Đã chặn liên hệ</string>
     <string name="blocked">Đã chặn</string>
-    <string name="remove_bookmark_text">Bạn có muốn xoá dấu trang %s không? Các cuộc hội thoại với dấu trang này sẽ không bị xoá.</string>
     <string name="register_account">Đăng ký tài khoản mới trên máy chủ</string>
     <string name="change_password_on_server">Đổi mật k trên máy chủ</string>
     <string name="share_with">Chia sẻ với…</string>
@@ -962,7 +961,6 @@
     <string name="search_group_chats">Tìm kiếm tin nhắn trong nhóm</string>
     <string name="download_failed_invalid_file">Tải về thất bại: Tệp tin không hợp lệ</string>
     <string name="missed_calls_channel_name">Cuộc gọi nhỡ</string>
-    <string name="channel_discover_opt_in_message">Khám phá kênh sử dụng một dịch vụ bên thứ ba gọi là &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;SỬ dụng chức năng này sẽ truyền địa chỉ IP của bạn và tìm kiếm điều khoản đến dịch vụ đó. Hãy đọc &lt;a href=https://search.jabber.network/privacy&gt;Chính sách quyền riêng tư&lt;/a&gt; của họ để có thêm thông tin.</string>
     <string name="rtp_state_content_add_video">Chuyển sang gọi video\?</string>
     <string name="reconnecting_call">Đang kết nối lại cuộc gọi</string>
     <string name="outgoing_call_timestamp">Cuộc gọi đi · %s</string>

src/main/res/values-zh-rCN/strings.xml

@@ -49,7 +49,6 @@
     <string name="unblock_domain_text">解除屏蔽来自 %s 的所有联系人？</string>
     <string name="contact_blocked">联系人已屏蔽</string>
     <string name="blocked">已屏蔽</string>
-    <string name="remove_bookmark_text">是否从书签中移除 %s？将不会移除与此书签相关的对话。</string>
     <string name="register_account">在服务器上注册新账号</string>
     <string name="change_password_on_server">在服务器上修改密码</string>
     <string name="share_with">分享至…</string>
@@ -1014,7 +1013,6 @@
     <string name="incoming_call_duration_timestamp">来电 (%s) · %s</string>
     <string name="outgoing_call_duration_timestamp">去电 (%s) · %s</string>
     <string name="outgoing_call_timestamp">去电 · %s</string>
-    <string name="channel_discover_opt_in_message">频道发现使用称为 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服务。&lt;br&gt;&lt;br&gt;使用此功能会将您的 IP 地址和搜索词传输到此服务。请参阅其 &lt;a href=https://search.jabber.network/privacy&gt;隐私政策&lt;/a&gt; 以获取更多信息。</string>
     <string name="could_not_delete_account_from_server">无法从服务器删除账号</string>
     <string name="group_chats">群聊</string>
     <string name="save_as_group_chat">保存为群聊</string>

src/main/res/values-zh-rTW/strings.xml

@@ -49,7 +49,6 @@
     <string name="unblock_domain_text">要解除封鎖來自 %s 的所有聯絡人嗎？</string>
     <string name="contact_blocked">聯絡人已封鎖</string>
     <string name="blocked">已封鎖</string>
-    <string name="remove_bookmark_text">要從書籤中移除 %s 嗎？與此書籤相關的會話將不會被移除。</string>
     <string name="register_account">在伺服器上註冊新帳戶</string>
     <string name="change_password_on_server">在伺服器上變更密碼</string>
     <string name="share_with">分享至…</string>
@@ -1017,7 +1016,6 @@
     <string name="delete_from_server">從伺服器移除帳戶</string>
     <string name="could_not_delete_account_from_server">無法從伺服器刪除帳戶</string>
     <string name="search_group_chats">搜尋群組聊天</string>
-    <string name="channel_discover_opt_in_message">頻道探索使用一個名為 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服務，&lt;br&gt;&lt;br&gt;使用此功能會將您的 IP 位址和搜尋詞彙傳送至此服務。更多資訊請參見他們的 &lt;a href=https://search.jabber.network/privacy&gt;隱私權政策&lt;/a&gt;。</string>
     <string name="group_chats">群組聊天</string>
     <string name="save_as_group_chat">儲存為群組聊天</string>
     <string name="this_account_is_logged_out">您已登出此帳戶</string>

src/main/res/values/strings.xml

@@ -51,7 +51,8 @@
     <string name="unblock_domain_text">Unblock all contacts from %s?</string>
     <string name="contact_blocked">Contact blocked</string>
     <string name="blocked">Blocked</string>
-    <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? Conversations with this bookmark will not be removed.</string>
+    <string name="remove_bookmark">Would you like to remove the bookmark for %s?</string>
+    <string name="remove_bookmark_and_close">Would you like to remove the bookmark for %s and close the conversation?</string>
     <string name="register_account">Register new account on server</string>
     <string name="change_password_on_server">Change password on server</string>
     <string name="share_with">Share with…</string>
@@ -1028,4 +1029,5 @@
     <string name="privacy_policy">Privacy policy</string>
     <string name="contact_list_integration_not_available">Contact list integration is not available</string>
     <string name="call_integration_not_available">Call integration not available!</string>
+    <string name="delete_and_close">Delete &amp; Close</string>
 </resources>