refactor disable notifications dialog to make use of timeframeutils

23 files changed, 246 insertions, 855 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 056d63d9c..b51bb6329 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -52,6 +52,7 @@ import de.pixart.messenger.entities.MucOptions.User;
 import de.pixart.messenger.services.XmppConnectionService;
 import de.pixart.messenger.services.XmppConnectionService.OnConversationUpdate;
 import de.pixart.messenger.services.XmppConnectionService.OnMucRosterUpdate;
+import de.pixart.messenger.utils.TimeframeUtils;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.xmpp.jid.Jid;
 
@@ -154,44 +155,39 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             } else {
                 choice = new AtomicInteger(mConversation.alwaysNotify() ? 0 : 1);
             }
-            builder.setSingleChoiceItems(choices, choice.get(), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    choice.set(which);
-                }
-            });
+            builder.setSingleChoiceItems(choices, choice.get(), (dialog, which) -> choice.set(which));
             builder.setNegativeButton(R.string.cancel, null);
-            builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    if (choice.get() == 2) {
-                        AlertDialog.Builder builder = new AlertDialog.Builder(ConferenceDetailsActivity.this);
-                        builder.setTitle(R.string.disable_notifications);
-                        final int[] durations = getResources().getIntArray(R.array.mute_options_durations);
-                        builder.setItems(R.array.mute_options_descriptions,
-                                new DialogInterface.OnClickListener() {
-
-                                    @Override
-                                    public void onClick(final DialogInterface dialog, final int which) {
-                                        final long till;
-                                        if (durations[which] == -1) {
-                                            till = Long.MAX_VALUE;
-                                        } else {
-                                            till = System.currentTimeMillis() + (durations[which] * 1000);
-                                        }
-                                        mConversation.setMutedTill(till);
-                                        xmppConnectionService.updateConversation(mConversation);
-                                        updateView();
-                                    }
-                                });
-                        builder.create().show();
-                    } else {
-                        mConversation.setMutedTill(0);
-                        mConversation.setAttribute(Conversation.ATTRIBUTE_ALWAYS_NOTIFY, String.valueOf(choice.get() == 0));
+            builder.setPositiveButton(R.string.ok, (DialogInterface.OnClickListener) (dialog, which) -> {
+                if (choice.get() == 2) {
+                    AlertDialog.Builder builder1 = new AlertDialog.Builder(ConferenceDetailsActivity.this);
+                    builder1.setTitle(R.string.disable_notifications);
+                    final int[] durations = getResources().getIntArray(R.array.mute_options_durations);
+                    final CharSequence[] labels = new CharSequence[durations.length];
+                    for (int i = 0; i < durations.length; ++i) {
+                        if (durations[i] == -1) {
+                            labels[i] = getString(R.string.until_further_notice);
+                        } else {
+                            labels[i] = TimeframeUtils.resolve(ConferenceDetailsActivity.this, 1000L * durations[i]);
+                        }
                     }
-                    xmppConnectionService.updateConversation(mConversation);
-                    updateView();
+                    builder1.setItems(labels, (dialog1, which1) -> {
+                        final long till;
+                        if (durations[which1] == -1) {
+                            till = Long.MAX_VALUE;
+                        } else {
+                            till = System.currentTimeMillis() + (durations[which1] * 1000);
+                        }
+                        mConversation.setMutedTill(till);
+                        xmppConnectionService.updateConversation(mConversation);
+                        updateView();
+                    });
+                    builder1.create().show();
+                } else {
+                    mConversation.setMutedTill(0);
+                    mConversation.setAttribute(Conversation.ATTRIBUTE_ALWAYS_NOTIFY, String.valueOf(choice.get() == 0));
                 }
+                xmppConnectionService.updateConversation(mConversation);
+                updateView();
             });
             builder.create().show();
         }
diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
index bb0e668d6..635c5c7d6 100644
--- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java
@@ -36,6 +36,7 @@ import de.pixart.messenger.R;
 import de.pixart.messenger.crypto.axolotl.AxolotlService;
 import de.pixart.messenger.crypto.axolotl.FingerprintStatus;
 import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession;
+import de.pixart.messenger.databinding.ActivityContactDetailsBinding;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.entities.Contact;
 import de.pixart.messenger.entities.Conversation;
@@ -44,9 +45,9 @@ import de.pixart.messenger.services.XmppConnectionService.OnAccountUpdate;
 import de.pixart.messenger.services.XmppConnectionService.OnRosterUpdate;
 import de.pixart.messenger.utils.CryptoHelper;
 import de.pixart.messenger.utils.Namespace;
+import de.pixart.messenger.utils.TimeframeUtils;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.utils.XmppUri;
-import de.pixart.messenger.databinding.ActivityContactDetailsBinding;
 import de.pixart.messenger.xmpp.OnKeyStatusUpdated;
 import de.pixart.messenger.xmpp.OnUpdateBlocklist;
 import de.pixart.messenger.xmpp.XmppConnection;
@@ -168,44 +169,39 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             } else {
                 choice = new AtomicInteger(1);
             }
-            builder.setSingleChoiceItems(choices, choice.get(), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    choice.set(which);
-                }
-            });
+            builder.setSingleChoiceItems(choices, choice.get(), (dialog, which) -> choice.set(which));
             builder.setNegativeButton(R.string.cancel, null);
-            builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    if (choice.get() == 1) {
-                        AlertDialog.Builder builder = new AlertDialog.Builder(ContactDetailsActivity.this);
-                        builder.setTitle(R.string.disable_notifications);
-                        final int[] durations = getResources().getIntArray(R.array.mute_options_durations);
-                        builder.setItems(R.array.mute_options_descriptions,
-                                new DialogInterface.OnClickListener() {
-
-                                    @Override
-                                    public void onClick(final DialogInterface dialog, final int which) {
-                                        final long till;
-                                        if (durations[which] == -1) {
-                                            till = Long.MAX_VALUE;
-                                        } else {
-                                            till = System.currentTimeMillis() + (durations[which] * 1000);
-                                        }
-                                        mConversation.setMutedTill(till);
-                                        xmppConnectionService.updateConversation(mConversation);
-                                        populateView();
-                                    }
-                                });
-                        builder.create().show();
-                    } else {
-                        mConversation.setMutedTill(0);
-                        mConversation.setAttribute(Conversation.ATTRIBUTE_ALWAYS_NOTIFY, String.valueOf(choice.get() == 0));
+            builder.setPositiveButton(R.string.ok, (DialogInterface.OnClickListener) (dialog, which) -> {
+                if (choice.get() == 1) {
+                    AlertDialog.Builder builder1 = new AlertDialog.Builder(ContactDetailsActivity.this);
+                    builder1.setTitle(R.string.disable_notifications);
+                    final int[] durations = getResources().getIntArray(R.array.mute_options_durations);
+                    final CharSequence[] labels = new CharSequence[durations.length];
+                    for (int i = 0; i < durations.length; ++i) {
+                        if (durations[i] == -1) {
+                            labels[i] = getString(R.string.until_further_notice);
+                        } else {
+                            labels[i] = TimeframeUtils.resolve(ContactDetailsActivity.this, 1000L * durations[i]);
+                        }
                     }
-                    xmppConnectionService.updateConversation(mConversation);
-                    populateView();
+                    builder1.setItems(labels, (dialog1, which1) -> {
+                                final long till;
+                                if (durations[which1] == -1) {
+                                    till = Long.MAX_VALUE;
+                                } else {
+                                    till = System.currentTimeMillis() + (durations[which1] * 1000);
+                                }
+                                mConversation.setMutedTill(till);
+                                xmppConnectionService.updateConversation(mConversation);
+                                populateView();
+                            });
+                    builder1.create().show();
+                } else {
+                    mConversation.setMutedTill(0);
+                    mConversation.setAttribute(Conversation.ATTRIBUTE_ALWAYS_NOTIFY, String.valueOf(choice.get() == 0));
                 }
+                xmppConnectionService.updateConversation(mConversation);
+                populateView();
             });
             builder.create().show();
         }
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 7a0db098f..f3aa81f68 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -96,9 +96,7 @@
   <string name="contact_has_no_pgp_key">Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\n<small>Si us plau, demana al teu contacte que configuri OpenPGP.</small></string>
   <string name="no_pgp_keys">No hi ha claus OPENPGP trobades</string>
   <string name="pref_general">General</string>
-  <string name="pref_xmpp_resource">Recursos XMPP</string>
-  <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
-  <string name="pref_attachments">Fitxers adjunts</string>
+    <string name="pref_attachments">Fitxers adjunts</string>
   <string name="pref_notification_settings">Notificació</string>
   <string name="pref_notifications">Notificacions</string>
   <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
@@ -114,9 +112,7 @@
   <string name="openpgp_error">OpenKeychain ha reportat un error</string>
   <string name="accept">Acceptar</string>
   <string name="error">Un error ha passat</string>
-  <string name="pref_grant_presence_updates">Concedir actualitzacions</string>
-  <string name="pref_grant_presence_updates_summary">Concedeix i sol·liciteu preferentment subscripcions de presència per als contactes que hàgiu creat</string>
-  <string name="your_account">El teu compte</string>
+    <string name="your_account">El teu compte</string>
   <string name="send_presence_updates">Enviar actualitzacions de presència</string>
   <string name="receive_presence_updates">Rebre actualitzacions</string>
   <string name="ask_for_presence_updates">Preguntar per les actualizacions</string>
@@ -159,8 +155,7 @@
   <string name="account_settings_jabber_id">Identificació de Jabber</string>
   <string name="account_settings_password">Contrasenya</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Confirma la contrasenya</string>
-  <string name="password">Contrasenya</string>
+    <string name="password">Contrasenya</string>
   <string name="invalid_jid">Aquesta identificació de Jabber no és vàlida</string>
   <string name="error_out_of_memory">Fora de la capacitat de la mèmoria. L\'imatge és massa gran</string>
   <string name="add_phone_book_text">Voleu afegir a %s a la vostra llibreta d\'adreces?</string>
@@ -383,11 +378,7 @@ mentrestant.</string>
   <string name="modified_conference_options">S\'han modificat les opcions de xat en grup.</string>
   <string name="could_not_modify_conference_options">No s\'han pogut modificar les opcions de xat de grup</string>
   <string name="never">Mai</string>
-  <string name="thirty_minutes">30 minuts</string>
-  <string name="one_hour">1 hora</string>
-  <string name="two_hours">2 Hores</string>
-  <string name="eight_hours">8 Hores</string>
-  <string name="until_further_notice">Fins nou avís</string>
+    <string name="until_further_notice">Fins nou avís</string>
   <string name="pref_input_options">Entrada</string>
   <string name="pref_enter_is_send">Entra per enviar</string>
   <string name="pref_enter_is_send_summary">Utilitza el botó enter per enviar el missatge</string>
@@ -412,9 +403,7 @@ mentrestant.</string>
   <string name="no_application_found_to_display_location">No s\'ha trobat cap aplicació per mostrar la localització</string>
   <string name="location">Localització</string>
   <string name="received_location">Localització rebuda</string>
-  <string name="title_undo_swipe_out_conversation">Conversa tancada</string>
-  <string name="title_undo_swipe_out_muc">Sortir del xat en grup</string>
-  <string name="pref_dont_trust_system_cas_title">No confiar en les CAs del sistema</string>
+    <string name="pref_dont_trust_system_cas_title">No confiar en les CAs del sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Tots els certificats han de ser aprovats manualment</string>
   <string name="pref_remove_trusted_certificates_title">Eliminar certificats</string>
   <string name="pref_remove_trusted_certificates_summary">Esborrar certificats aprovats manualment</string>
@@ -494,15 +483,7 @@ mostrar els noms i avatars complets.\n\nConversations només
 llegeix els vostres contactes i els relacionaran localment sense haver
  de penjar-les al vostre servidor.\n\nAra se us demanarà que 
 concediu permís per accedir als teus contactes.</string>
-  <string name="certificate_information">Informació del certificat</string>
-  <string name="certificate_subject">Subjecte</string>
-  <string name="certificate_issuer">Emissor</string>
-  <string name="certificate_cn">Nom comú</string>
-  <string name="certificate_o">Organització</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(No està disponible)</string>
-  <string name="certificate_not_found">No s\'ha trobat cap certificat</string>
-  <string name="notify_on_all_messages">Notifica a tots els missatges</string>
+    <string name="notify_on_all_messages">Notifica a tots els missatges</string>
   <string name="notify_only_when_highlighted">Notifica només quan s\'esmenta</string>
   <string name="notify_never">S\'han desactivat les notificacions</string>
   <string name="notify_paused">S\'han pausat les notificacions</string>
@@ -538,10 +519,8 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
   <string name="pick_your_username">Tria el teu nom d\'usuari</string>
   <string name="pref_manually_change_presence">Canvia la presència manualment</string>
   <string name="pref_manually_change_presence_summary">Toca el teu avatar per canviar la teva presència</string>
-  <string name="change_presence">Canvi de presència</string>
-  <string name="status_message">Missatge d\'estat</string>
-  <string name="all_accounts_on_this_device">Estableix per a tots els comptes d\'aquest dispositiu</string>
-  <string name="presence_chat">Lliure per xatejar</string>
+    <string name="status_message">Missatge d\'estat</string>
+    <string name="presence_chat">Lliure per xatejar</string>
   <string name="presence_online">En línia</string>
   <string name="presence_away">Lluny</string>
   <string name="presence_xa">No disponible</string>
@@ -552,8 +531,7 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
   <string name="registration_please_wait">Error de registre: torna-ho a provar més tard</string>
   <string name="registration_password_too_weak">Ha fallat la inscripció: la contrasenya és massa feble</string>
   <string name="create_conference">Crea un xat en grup</string>
-  <string name="join_or_create_conference">Uniu-vos o creeu un xat en grup</string>
-  <string name="conference_subject">Subjecte</string>
+    <string name="conference_subject">Subjecte</string>
   <string name="choose_participants">Tria els participants</string>
   <string name="creating_conference">S\'està creant el xat en grup...</string>
   <string name="invite_again">Torna a convidar</string>
@@ -569,17 +547,11 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
   <string name="no_permission_to_access_x">No hi ha permís per accedir %s</string>
   <string name="remote_server_not_found">El servidor remot no s\'ha trobat</string>
   <string name="unable_to_update_account">No es pot actualitzar el compte</string>
-  <string name="missing_presence_subscription_with_x">Falta la subscripció a la presència amb %s</string>
-  <string name="missing_keys_from_x">S\'han perdut les claus OMEMO de %s</string>
-  <string name="wrong_conference_configuration">No és un xat en grup privat i no anònim.</string>
-  <string name="this_conference_has_no_members">No hi ha membres en aquest xat en grup.</string>
-  <string name="report_jid_as_spammer">Informar d\'aquest JID com l\'enviament de missatges no desitjats.</string>
+    <string name="report_jid_as_spammer">Informar d\'aquest JID com l\'enviament de missatges no desitjats.</string>
   <string name="pref_delete_omemo_identities">Elimineu les identitats OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regenereu les vostres claus OMEMO. Tots els contactes hauran de tornar-vos a verificar. Utilitzeu això només com a últim recurs.</string>
   <string name="delete_selected_keys">Elimineu les tecles seleccionades</string>
-  <string name="missing_presence_subscription">Falta la subscripció a la presència</string>
-  <string name="missing_omemo_keys">Falten les claus OMEMO</string>
-  <string name="error_publish_avatar_offline">Cal que us connecteu per publicar el vostre avatar.</string>
+    <string name="error_publish_avatar_offline">Cal que us connecteu per publicar el vostre avatar.</string>
   <string name="copy_to_clipboard">Copiar al portapapers</string>
   <string name="message_copied_to_clipboard">Missatge copiat al portapapers</string>
   <string name="message">Missatge</string>
@@ -613,14 +585,8 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
   <string name="hide_inactive_devices">Amaga els dispositius inactius</string>
   <string name="encrypting_message">Xifrant el missatge</string>
   <string name="transcoding_video">S\'està comprimint el vídeo</string>
-  <string name="pref_automatically_delete_messages_description">Suprimiu automàticament missatges d\'aquest dispositiu que són més grans que el marc de temps configurat.</string>
-  <string name="pref_automatically_delete_messages">Supressió de missatge automàtic</string>
-  <string name="not_fetching_history_retention_period">No es recullen missatges deguts al període de retenció local.</string>
-  <string name="timeout_24_hours">24 hores</string>
-  <string name="timeout_7_days">7 dies</string>
-  <string name="timeout_30_days">30 dies</string>
-  <string name="timeout_6_months">6 mesos</string>
-  <string name="today">Avui</string>
+    <string name="not_fetching_history_retention_period">No es recullen missatges deguts al període de retenció local.</string>
+    <string name="today">Avui</string>
   <string name="block_jabber_id">Bloqueja la identificació de Jabber</string>
   <string name="corresponding_conversations_closed">S\'han tancat les converses corresponents.</string>
   <string name="contact_blocked_past_tense">Contacte bloquejat.</string>
diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml
index d446125c1..d3bcb6a17 100644
--- a/src/main/res/values-ceb/strings.xml
+++ b/src/main/res/values-ceb/strings.xml
@@ -98,9 +98,7 @@
   <string name="contact_has_no_pgp_key">Ang Pix-Art Messenger dili makahimo sa pag-encrypt sa imong mga mensahe tungod kay ang imong contact wala magpahibalo sa iyang public yawe.\n\n<small>Palihog pangutana sa imung kontak nga e-setup ang OpenPGP.</small></string>
   <string name="no_pgp_keys">Walay OpenPGP nga mga Yawe ang nakita</string>
   <string name="pref_general">General</string>
-  <string name="pref_xmpp_resource">XMPP kapanguhaan</string>
-  <string name="pref_xmpp_resource_summary">Ang pangan sa kini nga kliyente nagpaila sa kaugalingon uban</string>
-  <string name="pref_accept_files_wifi">Dawat nga mga file sa WiFi nga mga koneksiyon</string>
+    <string name="pref_accept_files_wifi">Dawat nga mga file sa WiFi nga mga koneksiyon</string>
   <string name="pref_accept_files_summary_wifi">Kung naka konek sa WiFi automatic ma accept ang mga file nga mas gamay pa sa…</string>
   <string name="pref_accept_files_mobile">Dawat sa mga file sa mobile nga mga koneksiyon</string>
   <string name="pref_accept_files_summary_mobile">Kung kanus-a nakakonek sa mobile nga data mo awtomatik ra madawat ang mga file nga mas gamay pa sa…</string>
@@ -124,9 +122,7 @@
   <string name="openpgp_error">OpenKeychain mitaho nga dunay sayop</string>
   <string name="accept">Dawata</string>
   <string name="error">Naay di-mao nga nigawas</string>
-  <string name="pref_grant_presence_updates">Mga update sa presensiya sa Grant</string>
-  <string name="pref_grant_presence_updates_summary">Sa unang grant ug hangyo nga presensya nga mga subscription sa mga kontak nga imung gebuhat</string>
-  <string name="your_account">Imuhang account</string>
+    <string name="your_account">Imuhang account</string>
   <string name="send_presence_updates">Pagpadala ug mga presensya nga update</string>
   <string name="receive_presence_updates">Dawat sa mga presensya nga update</string>
   <string name="ask_for_presence_updates">Mangayu ug mga presensya nga update</string>
@@ -171,8 +167,7 @@
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="account_settings_password">Password</string>
   <string name="account_settings_example_jabber_id">username@pix-art.de</string>
-  <string name="account_settings_confirm_password">Kumpirmasyun sa password</string>
-  <string name="password">Password</string>
+    <string name="password">Password</string>
   <string name="confirm_password">Kumpirmasyun sa password</string>
   <string name="passwords_do_not_match">Ang password kay wala nagkapareha</string>
   <string name="invalid_jid">Dili kini balido nga Jabber-ID</string>
@@ -377,9 +372,7 @@
   <string name="no_application_found_to_display_location">Walay aplikasyon ang nakita para ipakita ang lokasyun</string>
   <string name="location">Lokasyun</string>
   <string name="received_location">Nadawat nga lokasyun</string>
-  <string name="title_undo_swipe_out_conversation">Sirado na ang panag-estorya</string>
-  <string name="title_undo_swipe_out_muc">Hawa sa grupo nga chat</string>
-  <string name="pref_dont_trust_system_cas_title">Ayaw pagsalig nga sistema CAs</string>
+    <string name="pref_dont_trust_system_cas_title">Ayaw pagsalig nga sistema CAs</string>
   <string name="pref_dont_trust_system_cas_summary">Tanang mga sertipiko dapat manually nga mga aprobado</string>
   <string name="pref_remove_trusted_certificates_title">Tangtanga ang mga sertipiko</string>
   <string name="pref_remove_trusted_certificates_summary">Tanggala ang mga aprobado nga mga certificate</string>
@@ -413,8 +406,7 @@ Pili %d mga kontak</item>
   <string name="download_failed_server_not_found">Ang ge-download kay napakyas: Serber kay wala nakita</string>
   <string name="download_failed_file_not_found">Ang ge-download kay napakyas: File kay wala nakita</string>
   <string name="download_failed_could_not_connect">Ang ge-download kay napakyas: Dili maka sumpay sa host</string>
-  <string name="elv_undo">balika</string>
-  <string name="download_failed_could_not_write_file">Napkayas pag-download: Dili makasuwat sa file</string>
+    <string name="download_failed_could_not_write_file">Napkayas pag-download: Dili makasuwat sa file</string>
   <string name="pref_use_white_background">Gamit ug puti nga background</string>
   <string name="pref_use_white_background_summary">Ipakita ang gepdala nga mensahe ingon nga itom nga teksto sa puti nga background</string>
   <string name="action_check_update">Susiha ang mga Kausaban</string>
@@ -475,15 +467,7 @@ Pili %d mga kontak</item>
   <string name="shared_text_with_x">Ipa-ambit ang mga teks uban sa %s</string>
   <string name="sync_with_contacts">Synchronize sa mga kontak</string>
   <string name="sync_with_contacts_long">Ang Pix-Art Messenger kay gusto mo pareha sa XMPP roster uban sa imung mga kontak para mapakita ang tubuok nga mga pangan ug mga avatar.\n\nPix-Art Messenger kay mubasa ra sa imong mga kontak ug iparehas sila sa lokal bisan walay pag-upload sa imung serber.\n\nIkaw gina pangutana namu nga mu grant ka ug permiso para e-access ang imung mga kontak.</string>
-  <string name="certificate_information">Impormasyun sa Sertipiko</string>
-  <string name="certificate_subject">Subject</string>
-  <string name="certificate_issuer">Taga balita</string>
-  <string name="certificate_cn">Komon nga ngalan</string>
-  <string name="certificate_o">Organisasyon</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Walay anaa na)</string>
-  <string name="certificate_not_found">Walay sertipiko ang nakita</string>
-  <string name="notify_on_all_messages">Pahibal-a sa tanang mga mensahe</string>
+    <string name="notify_on_all_messages">Pahibal-a sa tanang mga mensahe</string>
   <string name="notify_only_when_highlighted">Pahibal-a kung ge-hisgutan</string>
   <string name="notify_never">Mga pahibalo kay baldado</string>
   <string name="notify_paused">Mga pahibalo kay gipa ungot</string>
@@ -499,8 +483,7 @@ Pili %d mga kontak</item>
   <string name="battery_optimizations_enabled_explained">Ang imung device kay nagbuhat ug bug-at nga battery para optimization sa Pix-Art Messenger nga pwedi sa rason nga maka dugay sa mga pahibalo o bisag mga mensahe nga nawa.\nKani kay ge recomend mga dili na.</string>
   <string name="battery_optimizations_enabled_dialog">Ang imung device kay nagbuhat ug bug-at nga battery para optimization sa Pix-Art Messenger nga pwedi sa rason nga maka dugay sa mga pahibalo o bisag mga mensahe nga nawa.\n\nKani kay ge recomend mga dili na.</string>
   <string name="install_from_unknown_sources_disabled">Pag-install gikan sa wala mailhi nga mga tinubdan wala tugoti</string>
-  <string name="install_from_unknown_sources_disabled_explained">Ang imong device gi-configure nga dili sugtan ang mga app i-install gikan sa wala mailhi nga mga tinubdan, nga maoy hinungdan sa mga problema sa app nga updater.\nGiawhag nga tugutan ang pag-instalar gikan sa wala mailhi nga mga tinubdan.</string>
-  <string name="install_from_unknown_sources_disabled_dialog">Ang imong device gi-configure aron dili sugtan ang mga app i-install gikan sa wala mailhi nga mga tinubdan gawas sa Google PlayStore. Kini maoy hinungdan sa mga problema uban sa updater sa app.\n\nIkaw kay pangutan-on kung mutugot ba sa app nga i-install gekan sa wa mailhing mga tinubdan.</string>
+    <string name="install_from_unknown_sources_disabled_dialog">Ang imong device gi-configure aron dili sugtan ang mga app i-install gikan sa wala mailhi nga mga tinubdan gawas sa Google PlayStore. Kini maoy hinungdan sa mga problema uban sa updater sa app.\n\nIkaw kay pangutan-on kung mutugot ba sa app nga i-install gekan sa wa mailhing mga tinubdan.</string>
   <string name="disable">Wala gipagana</string>
   <string name="selection_too_large">Ang mga gipili nga lugar kay sobra ra kadako</string>
   <string name="cancel_update">Ayaw ipadayun ang pagbag-o?</string>
@@ -527,18 +510,15 @@ Pili %d mga kontak</item>
   <string name="pick_your_username">Pili ug imung username</string>
   <string name="pref_manually_change_presence">Mano-mano nga usbon ang presensya</string>
   <string name="pref_manually_change_presence_summary">Usba ang imong presensya sulod sa imong account</string>
-  <string name="change_presence">Usaba ang presensya</string>
-  <string name="status_message">Status ang mensahe</string>
-  <string name="all_accounts_on_this_device">Ibutang ang tanan nga mga account niini nga device</string>
-  <string name="presence_chat">Libre alang sa Chat</string>
+    <string name="status_message">Status ang mensahe</string>
+    <string name="presence_chat">Libre alang sa Chat</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Layo</string>
   <string name="presence_xa">Walay anaa</string>
   <string name="presence_dnd">Daghan gibuhat</string>
   <string name="secure_password_generated">Usa ka kasaligang password ang nakuha</string>
   <string name="device_does_not_support_battery_op">Ang imong device wala mosuporta sa pagpili gikan sa pag-optimize sa imong baterya</string>
-  <string name="device_does_not_support_unknown_source_op">Ang imong device wala mosuporta sa pagtugot sa pag-install sa app gikan sa wala mailhi nga tinubdan</string>
-  <string name="share">Ipakigbahin</string>
+    <string name="share">Ipakigbahin</string>
   <string name="share_location">Iapkigbahin ang lokasyon</string>
   <string name="location_sharing_disabled">Pagpakigbahin sa lokasyon kay wala gipagana sa mga kahimtang</string>
   <string name="locating">Gepangita…</string>
@@ -548,8 +528,7 @@ Pili %d mga kontak</item>
   <string name="registration_please_wait">Napakyas ang pagrehistro: Sulayi pag-usab taud-taud</string>
   <string name="registration_password_too_weak">Ang pag-rehistro napakyas: Ang password sobra ra ka-huyang</string>
   <string name="create_conference">Buhat ug grupo sa chat</string>
-  <string name="join_or_create_conference">Pag-apil o paghimo og chat sa grupo</string>
-  <string name="conference_subject">Subject</string>
+    <string name="conference_subject">Subject</string>
   <string name="choose_participants">Pili ug mga partisipante</string>
   <string name="creating_conference">Nagbuhat ug grupo sa chat…</string>
   <string name="import_text">Naay mutabang sa imong device nga mahimong i-import.\n Posible ikaw hangyoon nga ibalhin ang daan nga bersyon o Pag-istoryahanay ug ang imong Sinugo ibalik pag-usab sa proseso sa pag-backup. Uyon baka nga i-import ang tabang? </string>
@@ -563,8 +542,7 @@ Pili %d mga kontak</item>
   <string name="request_permissions_message">Pix-Art Messenger mangutana sa imuha kung musugyot ka gayud sa pipila ka mga permiso. Importante nga imong tugotan ang tanan nga mga permiso nga gamiton ang tanang bahin niini nga mensahero. Kung imu ilimod bisag asa niini nga mga permiso ang app musira sa iyang kaugalingon.</string>
   <string name="request_permissions_message_again">Imuhang gelimod ang uban o tanang permisong kinahanglanun para sa Pix-Art Messenger. Gusto ka bang moambak sa mga setting ug tugotan kini nga mga permiso? Kung imu ilimod bisag unsa ining mag permiso, ang app mismo musira sa iyang kaugalingun.</string>
   <string name="unable_to_connect_to_keychain">Dili maka konek sa OpenKeychain</string>
-  <string name="no_permission">Ang Pix-Art Messenger kay walay permiso</string>
-  <string name="send_image">Magpadala umg hulagway?</string>
+    <string name="send_image">Magpadala umg hulagway?</string>
   <string name="this_device_is_no_longer_in_use">Ang kini nga device kay wala na ginagamit</string>
   <string name="import_canceled">Wa madayun ang pag-import</string>
   <string name="Import_failed">Ang pag-import sa database napakyas, ang import dili posible</string>
@@ -579,23 +557,16 @@ Pili %d mga kontak</item>
   <string name="me">Ako</string>
   <string name="contact_asks_for_presence_subscription">Ang kontak nagapangayu ug presensiya sa subscription</string>
   <string name="allow">Itugyot</string>
-  <string name="attach_choose_video">Pili ug bidyo</string>
-  <string name="no_permission_to_access_x">Walay permiso nga maka-acces %s</string>
+    <string name="no_permission_to_access_x">Walay permiso nga maka-acces %s</string>
   <string name="remote_server_not_found">Ang layo nga server wala makita</string>
   <string name="error_file_corrupt">Ang kini nga file kay basin na korakot.</string>
   <string name="unable_to_update_account">Dili mabag-o ang account</string>
-  <string name="missing_presence_subscription_with_x">Nawala ang presensya sa uban %s.</string>
-  <string name="missing_keys_from_x">Nawala ang mga yawe sa OMEMO gikan %s.</string>
-  <string name="wrong_conference_configuration">Dili kini usa ka private, dili anonymous nga grupo sa chat.</string>
-  <string name="this_conference_has_no_members">Walay mga miyembro niining grupoha sa chat.</string>
-  <string name="report_jid_as_spammer">I-report kini nga JID isip pagpadala sa mga mensahe nga dili kinahanglan.</string>
+    <string name="report_jid_as_spammer">I-report kini nga JID isip pagpadala sa mga mensahe nga dili kinahanglan.</string>
   <string name="create_issue">I-report ang usa ka isyu</string>
   <string name="pref_delete_omemo_identities">Pagtangtang sa OMEMO nga mga pakaila sa ilaha</string>
   <string name="pref_delete_omemo_identities_summary">Usaba ang imong mga yawe sa OMEMO. Ang tanan nimong mga contact kinahanglan nga motino kanimo pag-usab. Gamita kini ingon nga usa ka katapusan nga pamaagi.</string>
   <string name="delete_selected_keys">Tangtanga ang napili nga mga yawe</string>
-  <string name="missing_presence_subscription">Nawala ang presensya sa subscripsiyon</string>
-  <string name="missing_omemo_keys">Nawala ang OMEO nga mga yawe</string>
-  <string name="error_publish_avatar_offline">Kinahanglan nga ikaw mahimong konektado sa pagmantala sa imong avatar.</string>
+    <string name="error_publish_avatar_offline">Kinahanglan nga ikaw mahimong konektado sa pagmantala sa imong avatar.</string>
   <string name="copy_to_clipboard">Kopyaha ngato sa clipboard</string>
   <string name="message_copied_to_clipboard">Mensahe ge-kopya ngadto sa clipboard</string>
   <string name="message">Mensahe</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index de949f07a..80520bfbc 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -93,9 +93,7 @@
   <string name="contact_has_no_pgp_key">Není možné zašifrovat zprávu v aplikaci Konverzace, protože druhá strana neoznamuje svůj veřejný klíč.\n\n<small>Požádejte svůj kontakt ať si nastaví OpenPGP.</small></string>
   <string name="no_pgp_keys">Nebyly nalezeny žádné OpenPGP klíče</string>
   <string name="pref_general">Obecné</string>
-  <string name="pref_xmpp_resource">XMPP zdroj</string>
-  <string name="pref_xmpp_resource_summary">Jméno se kterým se tento klient identifikuje</string>
-  <string name="pref_attachments">Přílohy</string>
+    <string name="pref_attachments">Přílohy</string>
   <string name="pref_notification_settings">Upozornění</string>
   <string name="pref_notifications">Upozornění</string>
   <string name="pref_notifications_summary">Upozornit při přijetí nové zprávy</string>
@@ -110,8 +108,7 @@
   <string name="openpgp_error">OpenKeychain nahlásil chybu</string>
   <string name="accept">Přijmout</string>
   <string name="error">Došlo k chybě</string>
-  <string name="pref_grant_presence_updates">Povolit aktualizace stavu</string>
-  <string name="your_account">Váš účet</string>
+    <string name="your_account">Váš účet</string>
   <string name="send_presence_updates">Zasílat změny stavu</string>
   <string name="receive_presence_updates">Přijímat změny stavu</string>
   <string name="ask_for_presence_updates">Zažádat o změny stavu</string>
@@ -150,8 +147,7 @@
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">Heslo</string>
   <string name="account_settings_example_jabber_id">jmeno@server.cz</string>
-  <string name="account_settings_confirm_password">Potvrdit heslo</string>
-  <string name="password">Heslo</string>
+    <string name="password">Heslo</string>
   <string name="invalid_jid">Toto není platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
   <string name="add_phone_book_text">Chcete přidat %s do svého adresáře?</string>
@@ -340,11 +336,7 @@
   <string name="moderated">Moderováno</string>
   <string name="you_are_not_participating">Neúčastníte se</string>
   <string name="never">Nikdy</string>
-  <string name="thirty_minutes">30 minut</string>
-  <string name="one_hour">jedna hodina</string>
-  <string name="two_hours">2 hodiny</string>
-  <string name="eight_hours">8 hodin</string>
-  <string name="until_further_notice">Než opět změním</string>
+    <string name="until_further_notice">Než opět změním</string>
   <string name="pref_input_options">Vstup</string>
   <string name="pref_enter_is_send">Enter odesílá</string>
   <string name="pref_enter_is_send_summary">Použít klávesu enter pro odesílání zpráv</string>
@@ -368,8 +360,7 @@
   <string name="no_application_found_to_display_location">Nebyla nalezena aplikace pro zobrazení pozice</string>
   <string name="location">Pozice</string>
   <string name="received_location">Přijmout pozici</string>
-  <string name="title_undo_swipe_out_conversation">Conversation zavřena</string>
-  <string name="pref_dont_trust_system_cas_title">Nedůvěřovat systémovým CA</string>
+    <string name="pref_dont_trust_system_cas_title">Nedůvěřovat systémovým CA</string>
   <string name="pref_dont_trust_system_cas_summary">Všechny certifikáty musí být schváleny ručně</string>
   <string name="pref_remove_trusted_certificates_title">Odstranit certifikáty</string>
   <string name="pref_remove_trusted_certificates_summary">Smazat ručně povolené certifikáty</string>
@@ -429,15 +420,7 @@
   <string name="shared_text_with_x">Text sdílen s %s</string>
   <string name="sync_with_contacts">Synchronizovat s kontakty</string>
   <string name="sync_with_contacts_long">Aplikace Pix-Art Messenger by ráda porovnala svůj XMPP seznam s vašimi kontakty, aby mohla zobrazit plná jména a avatary.\n\nPix-Art Messenger načte a porovná kontakty pouze lokálně, bez jejich nahrávání na server.\n\nNyní budete dotázáni na udělení práv pro přístup k seznamu kontaktů.</string>
-  <string name="certificate_information">Informace certifikátu</string>
-  <string name="certificate_subject">Předmět</string>
-  <string name="certificate_issuer">Vydavatel</string>
-  <string name="certificate_cn">Jméno</string>
-  <string name="certificate_o">Organizace</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Nedostupné)</string>
-  <string name="certificate_not_found">Certifikát nenalezen</string>
-  <string name="notify_on_all_messages">Upozorňovat na všechny zprávy</string>
+    <string name="notify_on_all_messages">Upozorňovat na všechny zprávy</string>
   <string name="notify_never">Upozornění vypnuta</string>
   <string name="notify_paused">Upozornění pozastavena</string>
   <string name="pref_picture_compression">Komprimovat obrázky</string>
@@ -463,10 +446,8 @@
   <string name="pick_your_username">Zadejte své uživatelské jméno</string>
   <string name="pref_manually_change_presence">Ručně změnit dostupnost</string>
   <string name="pref_manually_change_presence_summary">Dotykem na avatar změnit svou dostupnost</string>
-  <string name="change_presence">Změnit dostupnost</string>
-  <string name="status_message">Stavová zpráva</string>
-  <string name="all_accounts_on_this_device">Nastavit pro všechny účty na tomto přístroji</string>
-  <string name="presence_chat">Volný pro chat</string>
+    <string name="status_message">Stavová zpráva</string>
+    <string name="presence_chat">Volný pro chat</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Pryč</string>
   <string name="presence_xa">Nedostupný</string>
@@ -491,15 +472,11 @@
   <string name="no_permission_to_access_x">Chybí oprávnění přistupovat k %s</string>
   <string name="remote_server_not_found">Vzdálený server nebyl nalezen</string>
   <string name="unable_to_update_account">Nelze aktualizovat účet</string>
-  <string name="missing_presence_subscription_with_x">Chybí informace o změnách stavu od %s.</string>
-  <string name="missing_keys_from_x">Chybí OMEMO klíče od %s.</string>
-  <string name="report_jid_as_spammer">Nahlásit toto JID jako odesilatele nevyžádaného obsahu.</string>
+    <string name="report_jid_as_spammer">Nahlásit toto JID jako odesilatele nevyžádaného obsahu.</string>
   <string name="pref_delete_omemo_identities">Smazat OMEMO identity</string>
   <string name="pref_delete_omemo_identities_summary">Znovu vygenerovat OMEMO klíče. Vyžaduje potvrzení od všech vašich kontaktů. POužijte pouze jako poslední řešení.</string>
   <string name="delete_selected_keys">Smazat vybrané klíče</string>
-  <string name="missing_presence_subscription">Chybí informace o změnách stavu</string>
-  <string name="missing_omemo_keys">Chybí OMEMO klíče</string>
-  <string name="error_publish_avatar_offline">Pro zveřejnění svého avatara musíte být online.</string>
+    <string name="error_publish_avatar_offline">Pro zveřejnění svého avatara musíte být online.</string>
   <string name="show_error_message">Zobrazit chybovou zprávu</string>
   <string name="error_message">Chybová zpráva</string>
   <string name="data_saver_enabled">Zapnuta úspora dat</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f6ec65b4d..1607542a1 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -167,8 +167,7 @@
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="account_settings_password">Passwort</string>
   <string name="account_settings_example_jabber_id">benutzer@pix-art.de</string>
-  <string name="account_settings_confirm_password">Passwort bestätigen</string>
-  <string name="password">Passwort</string>
+    <string name="password">Passwort</string>
   <string name="confirm_password">Passwort bestätigen</string>
   <string name="passwords_do_not_match">Passwörter stimmen nicht überein</string>
   <string name="invalid_jid">Ungültige Jabber-ID</string>
@@ -393,11 +392,7 @@
   <string name="modified_conference_options">Gruppenchat-Optionen geändert!</string>
   <string name="could_not_modify_conference_options">Gruppenchat-Optionen konnten nicht geändert werden</string>
   <string name="never">Niemals</string>
-  <string name="thirty_minutes">30 Minuten</string>
-  <string name="one_hour">1 Stunde</string>
-  <string name="two_hours">2 Stunden</string>
-  <string name="eight_hours">8 Stunden</string>
-  <string name="until_further_notice">Bis auf Weiteres</string>
+    <string name="until_further_notice">Bis auf Weiteres</string>
   <string name="pref_input_options">Eingabe</string>
   <string name="pref_enter_is_send">Eingabe-Taste (Enter) sendet Nachricht</string>
   <string name="pref_enter_is_send_summary">Eingabe-Taste (Enter) zum Versenden einer Nachricht verwenden</string>
@@ -423,9 +418,7 @@
   <string name="no_application_found_to_display_location">Keine App für die Standort-Anzeige gefunden</string>
   <string name="location">Standort</string>
   <string name="received_location">Standort empfangen</string>
-  <string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string>
-  <string name="title_undo_swipe_out_muc">Gruppenchat verlassen</string>
-  <string name="pref_dont_trust_system_cas_title">Zertifizierungsstellen misstrauen</string>
+    <string name="pref_dont_trust_system_cas_title">Zertifizierungsstellen misstrauen</string>
   <string name="pref_dont_trust_system_cas_summary">Alle Zertifikate müssen manuell bestätigt werden</string>
   <string name="pref_remove_trusted_certificates_title">Zertifikate löschen</string>
   <string name="pref_remove_trusted_certificates_summary">Als vertrauenswürdig bestätigte Zertifikate löschen</string>
@@ -455,8 +448,7 @@
   <string name="download_failed_server_not_found">Download fehlgeschlagen: Server nicht gefunden</string>
   <string name="download_failed_file_not_found">Download fehlgeschlagen: Datei nicht gefunden</string>
   <string name="download_failed_could_not_connect">Download fehlgeschlagen: keine Verbindung zum Host</string>
-  <string name="elv_undo">Rückgängig</string>
-  <string name="download_failed_could_not_write_file">Download fehlgeschlagen: Datei kann nicht gespeichert werden</string>
+    <string name="download_failed_could_not_write_file">Download fehlgeschlagen: Datei kann nicht gespeichert werden</string>
   <string name="pref_use_white_background">Weißen Hintergrund benutzen</string>
   <string name="pref_use_white_background_summary">Gesendete Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string>
   <string name="action_check_update">Auf Updates prüfen</string>
@@ -513,15 +505,7 @@
   <string name="shared_text_with_x">Text mit %s geteilt</string>
   <string name="sync_with_contacts">Mit Kontakten synchronisieren</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger möchte deine XMPP-Kontaktliste mit deinen Kontakten abgleichen, um deren vollständige Namen und Profilbilder anzuzeigen.\n\nPix-Art Messenger wird deine Kontakte nur lokal lesen und abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</string>
-  <string name="certificate_information">Zertifikatinformationen</string>
-  <string name="certificate_subject">Betreff</string>
-  <string name="certificate_issuer">Aussteller</string>
-  <string name="certificate_cn">Name</string>
-  <string name="certificate_o">Organisation</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Nicht verfügbar)</string>
-  <string name="certificate_not_found">Kein Zertifikat gefunden</string>
-  <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string>
+    <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string>
   <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich erwähnt werde</string>
   <string name="notify_never">Benachrichtigungen deaktiviert</string>
   <string name="notify_paused">Benachrichtigungen pausiert</string>
@@ -537,8 +521,7 @@
   <string name="battery_optimizations_enabled_explained">Dein Telefon wendet Batterioptimierungen bei Pix-Art Messenger an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können.\nEs ist empfehlenswert diese zu deaktivieren.</string>
   <string name="battery_optimizations_enabled_dialog">Dein Telefon wendet Batterioptimierungen bei Pix-Art Messenger an, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können. Es ist empfehlenswert dies zu deaktivieren.</string>
   <string name="install_from_unknown_sources_disabled">Installation von unbekannter Quelle ist nicht erlaubt</string>
-  <string name="install_from_unknown_sources_disabled_explained">Dein Gerät erlaubt keine Installationen von Apps aus unbekannten Quellen, was Probleme mit automatischen Updates des Messengers verursacht.\nEs ist empfehlenswert, die Installation von Apps aus unbekannten Quellen zu erlauben.</string>
-  <string name="install_from_unknown_sources_disabled_dialog">Dein Gerät erlaubt keine Installationen von Apps aus unbekannten Quellen außer über Google PlayStore. Dies verursacht Probleme mit automatischen Updates des Messengers.\n\nDu wirst nun gefragt, die Installation von Apps aus unbekannten Quellen zu erlauben.</string>
+    <string name="install_from_unknown_sources_disabled_dialog">Dein Gerät erlaubt keine Installationen von Apps aus unbekannten Quellen außer über Google PlayStore. Dies verursacht Probleme mit automatischen Updates des Messengers.\n\nDu wirst nun gefragt, die Installation von Apps aus unbekannten Quellen zu erlauben.</string>
   <string name="disable">Deaktivieren</string>
   <string name="selection_too_large">Der ausgewählte Bereich ist zu groß</string>
   <string name="cancel_update">Update abbrechen?</string>
@@ -565,18 +548,15 @@
   <string name="pick_your_username">Wähle deinen Benutzernamen</string>
   <string name="pref_manually_change_presence">Status manuell festlegen</string>
   <string name="pref_manually_change_presence_summary">Ändere deinen Status in deinem Profil</string>
-  <string name="change_presence">Status ändern</string>
-  <string name="status_message">Statusnachricht</string>
-  <string name="all_accounts_on_this_device">Für alle Profile dieses Gerätes festlegen</string>
-  <string name="presence_chat">Frei zum chatten</string>
+    <string name="status_message">Statusnachricht</string>
+    <string name="presence_chat">Frei zum chatten</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Weg</string>
   <string name="presence_xa">Nicht verfügbar</string>
   <string name="presence_dnd">Beschäftigt</string>
   <string name="secure_password_generated">Ein sicheres Passwort wurde erstellt</string>
   <string name="device_does_not_support_battery_op">Dein Gerät unterstützt kein Ausschalten der Batterieoptimierung</string>
-  <string name="device_does_not_support_unknown_source_op">Dein Gerät bietet keine Einstellung an, um die Installation aus unbekannten Quellen zu erlauben</string>
-  <string name="share">Teilen</string>
+    <string name="share">Teilen</string>
   <string name="share_location">Standort teilen</string>
   <string name="location_sharing_disabled">GPS ist in den Android-Einstellungen deaktiviert</string>
   <string name="locating">Lokalisiere…</string>
@@ -586,8 +566,7 @@
   <string name="registration_please_wait">Registrierung fehlgeschlagen: Bitte später versuchen</string>
   <string name="registration_password_too_weak">Registrierung fehlgeschlagen: Passwort zu schwach</string>
   <string name="create_conference">Gruppenchat erstellen</string>
-  <string name="join_or_create_conference">Gruppenchat beitreten oder erstellen</string>
-  <string name="conference_subject">Titel</string>
+    <string name="conference_subject">Titel</string>
   <string name="choose_participants">Mitglieder auswählen</string>
   <string name="creating_conference">Gruppenchat wird erstellt…</string>
   <string name="import_text">Es wurde ein Backup gefunden, welches importiert werden kann.\nDein Messenger startet während des Importvorgangs neu. Soll das Backup importiert werden? </string>
@@ -601,8 +580,7 @@
   <string name="request_permissions_message">Pix-Art Messenger wird dich nach ein paar Berechtigungen fragen. Es ist wichtig, dass du alle Berechtigungen erlaubst, um alle Funktionen nutzen zu können. Falls du eine dieser Berechtigungen ablehnst wird sich die App schließen.</string>
   <string name="request_permissions_message_again">Du hast eine oder alle Berechtigungen, welche für Pix-Art Messenger benötigt werden abgelehnt. Willst du zu den Einstellungen springen, um diese Berechtigungen zu erlauben? Falls du eine dieser Berechtigungen ablehnst wird sich die App schließen.</string>
   <string name="unable_to_connect_to_keychain">Keine Verbindung zu OpenKeychain</string>
-  <string name="no_permission">Pix-Art Messenger hat keine Berechtigungen</string>
-  <string name="send_image">Bild senden?</string>
+    <string name="send_image">Bild senden?</string>
   <string name="this_device_is_no_longer_in_use">Dieses Gerät wird nicht länger verwendet</string>
   <string name="import_canceled">Import abgebrochen</string>
   <string name="Import_failed">Datenbankimport ist fehlgeschlagen und nicht möglich.</string>
@@ -617,23 +595,16 @@
   <string name="me">Ich</string>
   <string name="contact_asks_for_presence_subscription">Kontakt möchte deinen Online-Status sehen</string>
   <string name="allow">Erlauben</string>
-  <string name="attach_choose_video">Video auswählen</string>
-  <string name="no_permission_to_access_x">Keine Berechtigung, um auf %s zuzugreifen</string>
+    <string name="no_permission_to_access_x">Keine Berechtigung, um auf %s zuzugreifen</string>
   <string name="remote_server_not_found">Entfernter Server konnte nicht gefunden werden</string>
   <string name="error_file_corrupt">Die Datei scheint defekt zu sein.</string>
   <string name="unable_to_update_account">Profil kann nicht aktualisiert werden.</string>
-  <string name="missing_presence_subscription_with_x">Fehlender Online-Status von %s.</string>
-  <string name="missing_keys_from_x">Keine OMEMO Schlüssel von %s</string>
-  <string name="wrong_conference_configuration">Dies ist kein privater, nicht-anonymer Gruppenchat.</string>
-  <string name="this_conference_has_no_members">Keine Mitglieder in diesem Gruppenchat.</string>
-  <string name="report_jid_as_spammer">Melde die JID als Sender unerwünschter Nachrichten.</string>
+    <string name="report_jid_as_spammer">Melde die JID als Sender unerwünschter Nachrichten.</string>
   <string name="create_issue">Einen Fehler melden</string>
   <string name="pref_delete_omemo_identities">OMEMO Identitäten zurücksetzen</string>
   <string name="pref_delete_omemo_identities_summary">Regeneriere deine OMEMO-Fingerabdrücke. Alle deine Kontakte müssen dich neu verifizieren. Nutze dies als letzten Ausweg.</string>
   <string name="delete_selected_keys">Ausgewählte Fingerabdrücke löschen</string>
-  <string name="missing_presence_subscription">Online-Status nicht vorhanden</string>
-  <string name="missing_omemo_keys">OMEMO-Fingerabdrücke fehlen</string>
-  <string name="error_publish_avatar_offline">Du musst verbunden sein, um dein Profilbild hochzuladen.</string>
+    <string name="error_publish_avatar_offline">Du musst verbunden sein, um dein Profilbild hochzuladen.</string>
   <string name="copy_to_clipboard">In Zwischenablage kopieren</string>
   <string name="message_copied_to_clipboard">Nachricht in Zwischenablage kopiert</string>
   <string name="message">Nachricht</string>
@@ -673,15 +644,8 @@
   <string name="reply">Antworten</string>
   <string name="encrypting_message">Nachricht wird verschlüsselt</string>
   <string name="transcoding_video">Video wird komprimiert</string>
-  <string name="pref_automatically_delete_messages_description">Nachrichten von diesem Gerät nach dem eingestellten Zeitfenster automatisch löschen.</string>
-  <string name="pref_automatically_delete_messages">Nachrichten automatisch löschen</string>
-  <string name="not_fetching_history_retention_period">Nachrichten werden aufgrund der eingestellten lokalen Speicherfrist nicht abgerufen.</string>
-  <string name="timeout_24_hours">24 Stunden</string>
-  <string name="timeout_7_days">7 Tage</string>
-  <string name="timeout_30_days">30 Tage</string>
-  <string name="timeout_6_months">6 Monate</string>
-  <string name="timeout_12_months">12 Monate</string>
-  <string name="today">Heute</string>
+    <string name="not_fetching_history_retention_period">Nachrichten werden aufgrund der eingestellten lokalen Speicherfrist nicht abgerufen.</string>
+    <string name="today">Heute</string>
   <string name="pref_use_max_brightness_summary">Maximale Helligkeit aktivieren, wenn Videos oder Bilder im Vollbild betracht werden.</string>
   <string name="pref_use_max_brightness">Maximale Helligkeit</string>
   <string name="block_jabber_id">Jabber-ID</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 15ff5d562..6870b397c 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -122,8 +122,7 @@
   <string name="account_settings_jabber_id">ταυτότητα Jabber</string>
   <string name="account_settings_password">Συνθηματικό</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Επιβεβαίωση συνθηματικού</string>
-  <string name="password">Συνθηματικό</string>
+    <string name="password">Συνθηματικό</string>
   <string name="invalid_jid">Αυτή δεν είναι έγκυρη ταυτότητα Jabber</string>
   <string name="error_out_of_memory">Πλήρης μνήμη. Η εικόνα είναι πολύ μεγάλη</string>
   <string name="server_info_show_more">Πληροφορίες διακομιστή</string>
@@ -272,11 +271,7 @@
   <string name="could_not_change_role">Δεν ήταν δυνατή η αλλαγή ρόλου της επαφής %s</string>
   <string name="non_anonymous">Μη-ανώνυμα</string>
   <string name="never">Ποτέ</string>
-  <string name="thirty_minutes">30 λεπτά</string>
-  <string name="one_hour">1 ώρα</string>
-  <string name="two_hours">2 ώρες</string>
-  <string name="eight_hours">8 ώρες</string>
-  <string name="until_further_notice">Μέχρι νεωτέρας</string>
+    <string name="until_further_notice">Μέχρι νεωτέρας</string>
   <string name="pref_enter_is_send">Αποστολή με το πλήκτρο Enter</string>
   <string name="pref_enter_is_send_summary">Χρήση του πλήκτρου Enter για την αποστολή μηνύματος</string>
   <string name="pref_display_enter_key">Εμφάνιση του πλήκτρου Enter</string>
@@ -299,8 +294,7 @@
   <string name="no_application_found_to_display_location">Δεν βρέθηκε εφαρμογή για την απεικόνιση τοποθεσίας</string>
   <string name="location">Τοποθεσία</string>
   <string name="received_location">Ελήφθη τοποθεσία</string>
-  <string name="title_undo_swipe_out_conversation">Η συζήτηση έκλεισε</string>
-  <string name="pref_dont_trust_system_cas_title">Μη έμπιστες αρχές πιστοποίησης συστήματος</string>
+    <string name="pref_dont_trust_system_cas_title">Μη έμπιστες αρχές πιστοποίησης συστήματος</string>
   <string name="pref_dont_trust_system_cas_summary">Όλα τα πιστοποιητικά πρέπει να εγκριθούν χειροκίνητα</string>
   <string name="pref_remove_trusted_certificates_title">Αφαίρεση πιστοποιητικών</string>
   <string name="pref_remove_trusted_certificates_summary">Διαγραφή με μη αυτόματο τρόπο των αναγνωρισμένων πιστοποιητικών</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index d3eeff6e4..d378942d7 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -167,8 +167,7 @@
   <string name="account_settings_jabber_id">Identificador Jabber</string>
   <string name="account_settings_password">Contraseña</string>
   <string name="account_settings_example_jabber_id">usuario@ejemplo.com</string>
-  <string name="account_settings_confirm_password">Confirmar contraseña</string>
-  <string name="password">Contraseña</string>
+    <string name="password">Contraseña</string>
   <string name="confirm_password">Confirmar contraseña</string>
   <string name="passwords_do_not_match">Las contraseñas no coinciden</string>
   <string name="invalid_jid">El identificador no es un identificador Jabber válido</string>
@@ -393,11 +392,7 @@
   <string name="modified_conference_options">¡Opciones de chat de grupo modificadas!</string>
   <string name="could_not_modify_conference_options">Las opciones del grupo no se pudon cambiar</string>
   <string name="never">Nunca</string>
-  <string name="thirty_minutes">30 minutos</string>
-  <string name="one_hour">1 hora</string>
-  <string name="two_hours">2 horas</string>
-  <string name="eight_hours">8 horas</string>
-  <string name="until_further_notice">Hasta nuevo aviso</string>
+    <string name="until_further_notice">Hasta nuevo aviso</string>
   <string name="pref_input_options">Entrada</string>
   <string name="pref_enter_is_send">Intro para enviar</string>
   <string name="pref_enter_is_send_summary">Usar la tecla intro para enviar el mensaje</string>
@@ -423,9 +418,7 @@
   <string name="no_application_found_to_display_location">No se ha encontrado ninguna aplicación para mostrar la ubicación</string>
   <string name="location">Ubicación</string>
   <string name="received_location">Ubicación recibida</string>
-  <string name="title_undo_swipe_out_conversation">Conversación cerrada</string>
-  <string name="title_undo_swipe_out_muc">Salir del grupo</string>
-  <string name="pref_dont_trust_system_cas_title">No confiar en los CAs del sistema</string>
+    <string name="pref_dont_trust_system_cas_title">No confiar en los CAs del sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Todos los certificados deben ser aprobados manualmente</string>
   <string name="pref_remove_trusted_certificates_title">Eliminar certificados</string>
   <string name="pref_remove_trusted_certificates_summary">Eliminar manualmente certificados aceptados</string>
@@ -455,8 +448,7 @@
   <string name="download_failed_server_not_found">Error al descargar: Servidor no encontrado</string>
   <string name="download_failed_file_not_found">Error al descargar: Archivo no encontrado</string>
   <string name="download_failed_could_not_connect">Error al descargar: No se ha podido conectar con el servidor</string>
-  <string name="elv_undo">Deshacer</string>
-  <string name="download_failed_could_not_write_file">Falló la descarga: No se puede escribir el fichero</string>
+    <string name="download_failed_could_not_write_file">Falló la descarga: No se puede escribir el fichero</string>
   <string name="pref_use_white_background">Usar fondo blanco</string>
   <string name="pref_use_white_background_summary">Mostrar los mensajes enviados como texto negro sobre fondo blanco</string>
   <string name="action_check_update">Comprobar actualizaciones</string>
@@ -513,15 +505,7 @@
   <string name="shared_text_with_x">Compartido texto con %s</string>
   <string name="sync_with_contacts">Sincronizar contactos</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger quiere cruzar tu lista de contactos de XMPP con tus contactos del móvil para mostrar sus nombres completos y sus fotos de perfil.\n\nPix-Art Messenger solo leerá tus contactos y los cruzará localmente sin subirlos a tu servidor.\n\nEl sistema te preguntará ahora para conceder los permisos de acceso a tus contactos del móvil.</string>
-  <string name="certificate_information">Información de certificado</string>
-  <string name="certificate_subject">Asunto</string>
-  <string name="certificate_issuer">Editor</string>
-  <string name="certificate_cn">Nombre</string>
-  <string name="certificate_o">Organización</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(No disponible)</string>
-  <string name="certificate_not_found">Certificado no encontrado</string>
-  <string name="notify_on_all_messages">Notificar para todos los mensajes</string>
+    <string name="notify_on_all_messages">Notificar para todos los mensajes</string>
   <string name="notify_only_when_highlighted">Notificar solo cuando eres mencionado</string>
   <string name="notify_never">Notificaciones deshabilitadas</string>
   <string name="notify_paused">Notificaciones pausadas</string>
@@ -537,8 +521,7 @@
   <string name="battery_optimizations_enabled_explained">Tu dispositivo está realizando optimizaciones de uso de batería en Pix-Art Messenger que pueden hacer que los mensajes se retrasen o incluso hacer que se pierdan.\nEs recomendable deshabilitarlas.</string>
   <string name="battery_optimizations_enabled_dialog">Tu dispositivo está realizando optimizaciones de uso de batería en Pix-Art Messenger que pueden hacer que los mensajes se retrasen o incluso hacer que se pierdan.\n\nEl sistema te preguntará ahora para deshabilitarlas.</string>
   <string name="install_from_unknown_sources_disabled">Instalación desde orígenes desconocidos desactivada</string>
-  <string name="install_from_unknown_sources_disabled_explained">Tu dispositivo está configurado para que no permita la instalación de aplicaciones desde orígenes desconocidos, lo que causa problemas con las actualizaciones de la aplicación.\nSe recomienda permitir la instalación desde orígenes desconocidos.</string>
-  <string name="install_from_unknown_sources_disabled_dialog">El dispositivo está configurado para no permitir la instalación de aplicaciones desde orígenes desconocidos, salvo desde Google PlayStore.\n\nAhora se le pedirá que permita la instalación de aplicaciones desde orígenes desconocidos.</string>
+    <string name="install_from_unknown_sources_disabled_dialog">El dispositivo está configurado para no permitir la instalación de aplicaciones desde orígenes desconocidos, salvo desde Google PlayStore.\n\nAhora se le pedirá que permita la instalación de aplicaciones desde orígenes desconocidos.</string>
   <string name="disable">Deshabilitar</string>
   <string name="selection_too_large">El área seleccionada es demasiado grande</string>
   <string name="cancel_update">¿Cancelar actualización?</string>
@@ -565,18 +548,15 @@
   <string name="pick_your_username">Selecciona tu nombre de usuario</string>
   <string name="pref_manually_change_presence">Cambiar manualmente tu estado</string>
   <string name="pref_manually_change_presence_summary">Toca tu imagen para cambiar tu estado</string>
-  <string name="change_presence">Cambiar estado</string>
-  <string name="status_message">Mensaje de estado</string>
-  <string name="all_accounts_on_this_device">Establecer para todas mis cuentas en este dispositivo</string>
-  <string name="presence_chat">Libre para hablar</string>
+    <string name="status_message">Mensaje de estado</string>
+    <string name="presence_chat">Libre para hablar</string>
   <string name="presence_online">Disponible</string>
   <string name="presence_away">Ausente</string>
   <string name="presence_xa">No disponible</string>
   <string name="presence_dnd">Ocupado</string>
   <string name="secure_password_generated">Se ha generado una contraseña segura</string>
   <string name="device_does_not_support_battery_op">Tu dispositivo no soporta la opción de optimización de batería</string>
-  <string name="device_does_not_support_unknown_source_op">El dispositivo no admite instalaciones de aplicaciones de origen desconocido</string>
-  <string name="share">Compartir</string>
+    <string name="share">Compartir</string>
   <string name="share_location">Compartir ubicación</string>
   <string name="location_sharing_disabled">La ubicación compartida está deshabilitada en la configuración</string>
   <string name="locating">Localizando...</string>
@@ -586,8 +566,7 @@
   <string name="registration_please_wait">El registro falló. Prueba de nuevo más tarde</string>
   <string name="registration_password_too_weak">Error en el registro: La contraseña es demasiado débil</string>
   <string name="create_conference">Crear grupo</string>
-  <string name="join_or_create_conference">Unirse o crear chat de grupo</string>
-  <string name="conference_subject">Asunto</string>
+    <string name="conference_subject">Asunto</string>
   <string name="choose_participants">Elige a los participantes</string>
   <string name="creating_conference">Crear chat de grupo…</string>
   <string name="import_text">Se ha encontrado una copia de seguridad que se puede importar,\ny es posible que te preguntan si desea desinstalar una versión anterior o Pix-Art Messenger y el Mensajero se reiniciará durante el proceso de importación. ¿Desea importar la copia de seguridad? </string>
@@ -601,8 +580,7 @@
   <string name="request_permissions_message">Pix-Art Messenger le pedirá que conceda algunos permisos. Es importante que permitas que todos estos permisos usen todas las características de este mensajero. Si usted niega cualquiera de estos permisos, la aplicación se cerrará sola.</string>
   <string name="request_permissions_message_again">Usted ha negado uno o todos los permisos requeridos para Pix-Art Messenger. ¿Desea ir a la configuración para permitir estos permisos? Si rechaza uno de estos permisos, la aplicación se cerrará.</string>
   <string name="unable_to_connect_to_keychain">No se ha podido conectar a OpenKeychain</string>
-  <string name="no_permission">Pix-Art Messenger no tiene permisos</string>
-  <string name="send_image">¿Enviar imagen?</string>
+    <string name="send_image">¿Enviar imagen?</string>
   <string name="this_device_is_no_longer_in_use">Este dispositivo ya no está en uso</string>
   <string name="import_canceled">Importación cancelada</string>
   <string name="Import_failed">La importación de la base de datos falló, una importación no es posible</string>
@@ -617,23 +595,16 @@
   <string name="me">Yo</string>
   <string name="contact_asks_for_presence_subscription">El contacto solicita ver tus actualizaciones de estado</string>
   <string name="allow">Permitir</string>
-  <string name="attach_choose_video">Elige un vídeo</string>
-  <string name="no_permission_to_access_x">Sin permiso de acceso a %s</string>
+    <string name="no_permission_to_access_x">Sin permiso de acceso a %s</string>
   <string name="remote_server_not_found">Servidor no encontrado</string>
   <string name="error_file_corrupt">Este archivo parece estar dañado.</string>
   <string name="unable_to_update_account">No se ha podido actualizar la cuenta</string>
-  <string name="missing_presence_subscription_with_x">Se ha perdido la suscripción de presencia con %s.</string>
-  <string name="missing_keys_from_x">Se ha perdido la clave OMEMO de %s.</string>
-  <string name="wrong_conference_configuration">Esto no es un chat de grupo privado, no anónimo.</string>
-  <string name="this_conference_has_no_members">No hay miembros en este grupo.</string>
-  <string name="report_jid_as_spammer">Reportar a este Id Jabber por enviar mensajes no deseados</string>
+    <string name="report_jid_as_spammer">Reportar a este Id Jabber por enviar mensajes no deseados</string>
   <string name="create_issue">Notificar una incidencia</string>
   <string name="pref_delete_omemo_identities">Eliminar identidades OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regenerar tus clave OMEMO. Todos tus contactos tendrán que verificarte de nuevo. Usa esta opción como último recurso.</string>
   <string name="delete_selected_keys">Eliminar claves seleccionadas</string>
-  <string name="missing_presence_subscription">Se ha perdido la suscripción de presencia</string>
-  <string name="missing_omemo_keys">Se han perdido las claves OMEMO</string>
-  <string name="error_publish_avatar_offline">Debes estar conectado para publicar la imagen de perfil</string>
+    <string name="error_publish_avatar_offline">Debes estar conectado para publicar la imagen de perfil</string>
   <string name="copy_to_clipboard">Copiar al portapapeles</string>
   <string name="message_copied_to_clipboard">Mensaje copiado al portapapeles</string>
   <string name="message">Mensaje</string>
@@ -673,15 +644,8 @@
   <string name="reply">Responder</string>
   <string name="encrypting_message">Cifrando mensaje</string>
   <string name="transcoding_video">Comprimiendo video</string>
-  <string name="pref_automatically_delete_messages_description">Automáticamente borrar mensajes del dispositivo más antiguos que el configurado en el marco de tiempo.</string>
-  <string name="pref_automatically_delete_messages">Borrado automático de mensajes</string>
-  <string name="not_fetching_history_retention_period">No buscar mensajes más antiguos que el establecido en el marco de tiempo.</string>
-  <string name="timeout_24_hours">24 horas</string>
-  <string name="timeout_7_days">7 días</string>
-  <string name="timeout_30_days">30 días</string>
-  <string name="timeout_6_months">6 meses</string>
-  <string name="timeout_12_months">12 meses</string>
-  <string name="today">Hoy</string>
+    <string name="not_fetching_history_retention_period">No buscar mensajes más antiguos que el establecido en el marco de tiempo.</string>
+    <string name="today">Hoy</string>
   <string name="pref_use_max_brightness_summary">Cambiar el brillo al máximo cuando esté viendo videos o imágenes en pantalla completa.</string>
   <string name="pref_use_max_brightness">Brillo al máximo</string>
   <string name="block_jabber_id">Bloquear Identificador Jabber</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index f898b7c88..3ed96bb4d 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -155,8 +155,7 @@
   <string name="account_settings_jabber_id">Jabber IDa</string>
   <string name="account_settings_password">Pasahitza</string>
   <string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string>
-  <string name="account_settings_confirm_password">Pasahitza berretsi</string>
-  <string name="password">Pasahitza</string>
+    <string name="password">Pasahitza</string>
   <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
   <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
   <string name="add_phone_book_text">%s zure helbideen liburura gehitu nahi duzu?</string>
@@ -376,11 +375,7 @@
   <string name="modified_conference_options">Taldearen aukerak aldatu dira</string>
   <string name="could_not_modify_conference_options">Ezin izan dira taldearen aukerak aldatu</string>
   <string name="never">Inoiz</string>
-  <string name="thirty_minutes">30 minutu</string>
-  <string name="one_hour">ordu 1</string>
-  <string name="two_hours">2 ordu</string>
-  <string name="eight_hours">8 ordu</string>
-  <string name="until_further_notice">abisatu arte</string>
+    <string name="until_further_notice">abisatu arte</string>
   <string name="pref_input_options">Sarrera</string>
   <string name="pref_enter_is_send">Sartu teklak bidaltzen du</string>
   <string name="pref_enter_is_send_summary">Sartu tekla erabili mezua bidaltzeko</string>
@@ -405,9 +400,7 @@
   <string name="no_application_found_to_display_location">Kokapena erakutsi dezakeen aplikaziorik ez da aurkitu</string>
   <string name="location">Kokapena</string>
   <string name="received_location">Kokapena jaso da</string>
-  <string name="title_undo_swipe_out_conversation">Elkarrizketa itxi egin da</string>
-  <string name="title_undo_swipe_out_muc">Taldea utzi egin da</string>
-  <string name="pref_dont_trust_system_cas_title">Sistemaren CAtaz ez fidatu</string>
+    <string name="pref_dont_trust_system_cas_title">Sistemaren CAtaz ez fidatu</string>
   <string name="pref_dont_trust_system_cas_summary">Ziurtagiri guztiak eskuz onartu behar dira</string>
   <string name="pref_remove_trusted_certificates_title">Ziurtagiriak kendu</string>
   <string name="pref_remove_trusted_certificates_summary">Eskuz ezabatu onartutako ziurtagiriak</string>
@@ -483,15 +476,7 @@
   <string name="shared_text_with_x">Testua %s(r)ekin partekatu da</string>
   <string name="sync_with_contacts">Kontaktuekin sinkronizatu</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger ek zure XMPP zerrenda eta zure kontaktuak uztartu nahi ditu haien izenak eta argazkiak erakusteko.\n\nPix-Art Messenger ek zure kontaktuak modu lokalean soilik irakurri eta uztartuko ditu, zure zerbitzarira kargatu gabe.\n\nJarraian baimenak eskatuko zaizkizu zure kontaktuetara sartu ahal izateko.</string>
-  <string name="certificate_information">Ziurtagiriaren informazioa</string>
-  <string name="certificate_subject">Subjektua</string>
-  <string name="certificate_issuer">Igorlea</string>
-  <string name="certificate_cn">Izen arrunta</string>
-  <string name="certificate_o">Erakundea</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Ez eskuragarri)</string>
-  <string name="certificate_not_found">Ez da ziurtagiririk aurkitu</string>
-  <string name="notify_on_all_messages">Mezu guztiak jakinarazi</string>
+    <string name="notify_on_all_messages">Mezu guztiak jakinarazi</string>
   <string name="notify_only_when_highlighted">Jakinarazi aipatua izaterakoan soilik</string>
   <string name="notify_never">Jakinarazpenak ezgaituta</string>
   <string name="notify_paused">Jakinarazpenak gelditu dira</string>
@@ -521,10 +506,8 @@
   <string name="pick_your_username">Aukeratu zure erabiltzaile izena</string>
   <string name="pref_manually_change_presence">Presentzia eskuz aldatu</string>
   <string name="pref_manually_change_presence_summary">Ukitu zure profileko argazkia zure presentzia aldatzeko</string>
-  <string name="change_presence">Presentzia aldatu</string>
-  <string name="status_message">Egoera mezua</string>
-  <string name="all_accounts_on_this_device">Gailu honetako kontu guztietarako ezarri</string>
-  <string name="presence_chat">Hitzegiteko aske</string>
+    <string name="status_message">Egoera mezua</string>
+    <string name="presence_chat">Hitzegiteko aske</string>
   <string name="presence_online">Konektatuta</string>
   <string name="presence_away">Kanpoan</string>
   <string name="presence_xa">Ez eskuragarri</string>
@@ -535,8 +518,7 @@
   <string name="registration_please_wait">Erregistroak huts egin du: saiatu berriz beranduago</string>
   <string name="registration_password_too_weak">Erregistroa huts egin du: pasahitza ahulegia da</string>
   <string name="create_conference">Taldea sortu</string>
-  <string name="join_or_create_conference">Talde batera batu edo sortu</string>
-  <string name="conference_subject">Gaia</string>
+    <string name="conference_subject">Gaia</string>
   <string name="choose_participants">Parte hartzaileak hautatu</string>
   <string name="creating_conference">Taldea sortzen…</string>
   <string name="invite_again">Berriz gonbidatu</string>
@@ -552,17 +534,11 @@
   <string name="no_permission_to_access_x">%s(e)ra sartzeko baimenik ez</string>
   <string name="remote_server_not_found">Urruneko zerbitzaria ez da aurkitu</string>
   <string name="unable_to_update_account">Ezin izan da kontua eguneratu</string>
-  <string name="missing_presence_subscription_with_x">%s(r)ekin presentzia harpidetza falta da</string>
-  <string name="missing_keys_from_x">%s(r)en OMEMO gakoak falta dira.</string>
-  <string name="wrong_conference_configuration">Hau ez da talde pribatu, ez anonimo bat.</string>
-  <string name="this_conference_has_no_members">Ez dago kiderik talde honetan.</string>
-  <string name="report_jid_as_spammer">JIDa nahi gabeko mezuen bidaltzaile gisa salatu</string>
+    <string name="report_jid_as_spammer">JIDa nahi gabeko mezuen bidaltzaile gisa salatu</string>
   <string name="pref_delete_omemo_identities">OMEMO nortasunak ezabatu</string>
   <string name="pref_delete_omemo_identities_summary">Zure OMEMO gakoak birsortu. Zure kontaktu guztiak zu egiaztatu beharko zaituzte berriz. Soilik azken aukera bezala erabili hau.</string>
   <string name="delete_selected_keys">Hautatutako gakoak ezabatu</string>
-  <string name="missing_presence_subscription">Presentzia harpidetza falta da</string>
-  <string name="missing_omemo_keys">OMEMO gakoak falta dira</string>
-  <string name="error_publish_avatar_offline">Konektatuta egon behar zara zure profileko argazkia argitaratzeko.</string>
+    <string name="error_publish_avatar_offline">Konektatuta egon behar zara zure profileko argazkia argitaratzeko.</string>
   <string name="copy_to_clipboard">Arbelera kopiatu</string>
   <string name="message_copied_to_clipboard">Mezua arbelera kopiatu da</string>
   <string name="message">Mezua</string>
@@ -595,14 +571,8 @@
   <string name="hide_inactive_devices">Erabiltzen ez diren gailuak ezkutatu</string>
   <string name="encrypting_message">Mezua enkriptatzen</string>
   <string name="transcoding_video">Bideoa konprimatzen</string>
-  <string name="pref_automatically_delete_messages_description">Ezarritako denbora tartea baino zaharragoak diren mezuak gailu honetatik automatikoki ezabatu.</string>
-  <string name="pref_automatically_delete_messages">Mezuen ezabatze automatikoa</string>
-  <string name="not_fetching_history_retention_period">Mezurik ez eskuratzen gelditze tarte lokalarengatik.</string>
-  <string name="timeout_24_hours">24 ordu</string>
-  <string name="timeout_7_days">7 egun</string>
-  <string name="timeout_30_days">30 egun</string>
-  <string name="timeout_6_months">6 hilabete</string>
-  <string name="today">Gaur</string>
+    <string name="not_fetching_history_retention_period">Mezurik ez eskuratzen gelditze tarte lokalarengatik.</string>
+    <string name="today">Gaur</string>
   <string name="block_jabber_id">Jabber IDa blokeatu</string>
   <string name="corresponding_conversations_closed">Dagokion elkarrizketa itxi egin da.</string>
   <string name="contact_blocked_past_tense">Kontaktua blokeatu da.</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 29722d1e4..096aa6bad 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -98,8 +98,6 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger ay hindi na encrypt sa iyong mensahe dahil sa iyong kontak na hindi nagpasabi sa public key.\n\n<small>Pakitanong sa iyo\nng kontat na i-setup ang OpenPGP.</small></string>
   <string name="no_pgp_keys">Walang OpenPGP na natagpuan</string>
   <string name="pref_general">Heneral</string>
-  <string name="pref_xmpp_resource">XMPP magkukunan</string>
-  <string name="pref_xmpp_resource_summary">Ang pangalan ng cliyenting ito ay nagpapakilala sa kanyang sarili</string>
   <string name="pref_accept_files_wifi">Tanggapin ang mga dokumento sa pamamagitan ng wifi koneksyon</string>
   <string name="pref_accept_files_summary_wifi">Kapag nakonektado sa wifi automatikong tanggapin ang mga dokumento mas maliit sa…</string>
   <string name="pref_accept_files_mobile">Tumanggap ng mga dokumento gamit ang mobile na koneksyon</string>
@@ -124,8 +122,6 @@
   <string name="openpgp_error">OpenKeychain ay nagulat ng pagkakamali</string>
   <string name="accept">Taggapin</string>
   <string name="error">Isang mali ang naganap</string>
-  <string name="pref_grant_presence_updates">Magbigay ng mga presensya sa pagbabago</string>
-  <string name="pref_grant_presence_updates_summary">Magbigay at mag hiling ng presensya sa suskripsyon para sa mga kontak na iyong nilikha</string>
   <string name="your_account">Iyong account</string>
   <string name="send_presence_updates">Magpadala ng mga presensya sa pagbabago</string>
   <string name="receive_presence_updates">Tumanggap ng mga presensya sa pagbabago</string>
@@ -171,7 +167,6 @@
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="account_settings_password">Ang Password</string>
   <string name="account_settings_example_jabber_id">username@pix-art.de</string>
-  <string name="account_settings_confirm_password">Kompirmahin ang password</string>
   <string name="password">Ang password</string>
   <string name="confirm_password">Kompirmahin ang password</string>
   <string name="passwords_do_not_match">Ang password ay hindi magkatugma</string>
@@ -397,10 +392,6 @@
   <string name="modified_conference_options">Binagong pagpilian ng grupo ng chat!</string>
   <string name="could_not_modify_conference_options">Hindi mabago ang mga pagpipilian sa grupo ng chat</string>
   <string name="never">Tunay na hindi</string>
-  <string name="thirty_minutes">Tatlumpung minuto</string>
-  <string name="one_hour">Isang oras</string>
-  <string name="two_hours">Dalawang oras</string>
-  <string name="eight_hours">Walong oras</string>
   <string name="until_further_notice">Hanggang mayroong abiso</string>
   <string name="pref_input_options">Input</string>
   <string name="pref_enter_is_send">Ipasok ay ipapadala</string>
@@ -427,8 +418,6 @@
   <string name="no_application_found_to_display_location">Walang nakitang aplikasyon sa lokasyon ng display</string>
   <string name="location">Kinalalagyan</string>
   <string name="received_location">Natanggap na lokasyon</string>
-  <string name="title_undo_swipe_out_conversation">Pagpapanayam sinirado</string>
-  <string name="title_undo_swipe_out_muc">Lumayas sa pang-grupong chat</string>
   <string name="pref_dont_trust_system_cas_title">Wag maniwala sa sistema CAs</string>
   <string name="pref_dont_trust_system_cas_summary">Lahat ng mga katibayan ay dapat naaproba ng mano-mano</string>
   <string name="pref_remove_trusted_certificates_title">Tagalin ang mga katibayan</string>
@@ -459,7 +448,6 @@
   <string name="download_failed_server_not_found">Nabigo ang pag-download: Hindi nakita ang server</string>
   <string name="download_failed_file_not_found">Nabigo ang pag-download: Hindi nakita ang file</string>
   <string name="download_failed_could_not_connect">Nabigo ang pag-download: Hindi nakakonekta sa host</string>
-  <string name="elv_undo">pawalang-bisa</string>
   <string name="download_failed_could_not_write_file">Nabigo ang pag-download: Hindi ma-isulat ang file</string>
   <string name="pref_use_white_background">Gumamit ng puting background</string>
   <string name="pref_use_white_background_summary">Ipakita ang mga ipinadalang mensahe bilang itim na teksto sa isang puting background</string>
@@ -517,14 +505,6 @@
   <string name="shared_text_with_x">Ibinahagi ang teksto %s</string>
   <string name="sync_with_contacts">I-synchronize ang mga kontak</string>
   <string name="sync_with_contacts_long">Nais ng Pix-Art Messenger na tumugma sa iyong XMPP roster sa iyong mga kontak upang maipakita ang kanilang mga buong pangalan at avatar. \n\nPix-Art Messenger ay magbabasa lamang ng iyong mga contact at itugma ang mga ito nang lokal nang hindi na-upload ang mga ito sa iyong server. hihiling na magbigay ng pahintulot na ma-access ang iyong mga contact.</string>
-  <string name="certificate_information">Impormasyon sa Sertipiko</string>
-  <string name="certificate_subject">Paksa</string>
-  <string name="certificate_issuer">Tagapag-isyu</string>
-  <string name="certificate_cn">Karaniwang pangalan</string>
-  <string name="certificate_o">Organisasyon</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Hindi magagamit)</string>
-  <string name="certificate_not_found">Walang nahanap na certifiko</string>
   <string name="notify_on_all_messages">I-notify sa lahat ng mensahe</string>
   <string name="notify_only_when_highlighted">I-notify lamang kapag nabanggit</string>
   <string name="notify_never">Hindi pinagana ang mga notification</string>
@@ -541,7 +521,6 @@
   <string name="battery_optimizations_enabled_explained">Ang iyong aparato ay gumagawa ng ilang mabigat na pag-optimize ng baterya sa Pix-Art Messenger na maaaring humantong sa mga naantalang abiso o kahit na pagkawala ng mensahe. \nIto ay inirerekomenda upang huwag paganahin ang mga iyon.</string>
   <string name="battery_optimizations_enabled_dialog">Ang iyong aparato ay gumagawa ng ilang mabigat na mga pag-optimize ng baterya sa Pix-Art Messenger na maaaring humantong sa mga naantalang abiso o kahit na pagkawala ng mensahe. \n\nMaaari kang hilingin ngayon na huwag paganahin ang mga iyon.</string>
   <string name="install_from_unknown_sources_disabled">I-install mula sa hindi kilalang mga pinagkukunan</string>
-  <string name="install_from_unknown_sources_disabled_explained">Ang iyong aparato ay naka-configure upang hindi payagan ang mga pag-install ng app mula sa hindi kilalang mga mapagkukunan, na nagiging sanhi ng mga problema sa updater app. \nIt inirerekomenda upang payagan ang pag-install mula sa hindi kilalang mga mapagkukunan.</string>
   <string name="install_from_unknown_sources_disabled_dialog">Ang iyong aparato ay naka-configure upang hindi payagan ang mga pag-install ng app mula sa hindi kilalang mga mapagkukunan maliban mula sa Google PlayStore. Ito ay magdudulot ng mga problema sa updater sa app.\n\nIkaw ay tatanugin ngayon upang payagan ang mga pag-install ng app mula sa hindi kilalang mga mapagkukunan.</string>
   <string name="disable">Huwag paganahin</string>
   <string name="selection_too_large">Masyadong malaki ang napiling lugar</string>
@@ -569,9 +548,7 @@
   <string name="pick_your_username">Piliin ang iyong username</string>
   <string name="pref_manually_change_presence">Manu-manong baguhin ang presensya</string>
   <string name="pref_manually_change_presence_summary">Baguhin ang iyong presensya sa loob ng iyong account</string>
-  <string name="change_presence">Baguhin ang Presensya</string>
   <string name="status_message">Katayuan ng mensahe</string>
-  <string name="all_accounts_on_this_device">Itakda para sa lahat ng mga account sa aparato na ito</string>
   <string name="presence_chat">Libre para sa Chat</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Malayo</string>
@@ -579,7 +556,6 @@
   <string name="presence_dnd">Abala</string>
   <string name="secure_password_generated">Ang isang ligtas na password ay nabuo</string>
   <string name="device_does_not_support_battery_op">Hindi sinusuportahan ng iyong device ang pag-opt out sa pag-optimize ng baterya</string>
-  <string name="device_does_not_support_unknown_source_op">Ang iyong aparato ay hindi sumusuporta na nagpapahintulot sa pag-install ng app mula sa hindi kilalang pinagmulan</string>
   <string name="share">Ibahagi</string>
   <string name="share_location">Ibahagi ang lokasyon</string>
   <string name="location_sharing_disabled">Hindi pinagana ang pagbabahagi ng lokasyon sa mga setting</string>
@@ -590,7 +566,6 @@
   <string name="registration_please_wait">Nabigo ang pagpaparehistro: Subukang muli sa ibang pagkakataon</string>
   <string name="registration_password_too_weak">Nabigo ang pagpaparehistro: Mahina ang password</string>
   <string name="create_conference">Lumikha ng grupo ng chat</string>
-  <string name="join_or_create_conference">Sumali o lumikha ng grupo ng chat</string>
   <string name="conference_subject">Paksa</string>
   <string name="choose_participants">Pumili ng mga kalahok</string>
   <string name="creating_conference">Paglikha ng grupo ng chat…</string>
@@ -605,7 +580,6 @@
   <string name="request_permissions_message">Hinihiling ka ng Pix-Art Messenger na pahintulutan ang ilang mga pahintulot. Mahalaga na payagan mo ang lahat ng mga pahintulot na gamitin ang lahat ng mga tampok ng sugo na ito. Kung tinatanggihan mo ang alinman sa mga pahintulot na ito ay sarhan ang app mismo.</string>
   <string name="request_permissions_message_again">Tinanggihan mo ang ilan o lahat ng mga pahintulot na kinakailangan para sa Pix-Art Messenger. Gusto mo bang tumalon sa mga setting at payagan ang mga pahintulot na ito? Kung tinanggihan mo ang alinman sa mga pahintulot na ito, tutuparin ng app ang sarili nito.</string>
   <string name="unable_to_connect_to_keychain">Hindi makakonekta sa OpenKeychain</string>
-  <string name="no_permission">Walang Pahintulot ang Pix-Art Messenger</string>
   <string name="send_image">Magpadala ng larawan?</string>
   <string name="this_device_is_no_longer_in_use">Hindi na ginagamit ang aparatong ito</string>
   <string name="import_canceled">Kinansela ang pag-import</string>
@@ -621,22 +595,15 @@
   <string name="me">Ako</string>
   <string name="contact_asks_for_presence_subscription">Ang kontak ay humihingi ng spresensya sa subscription</string>
   <string name="allow">Pahintulutan</string>
-  <string name="attach_choose_video">Pumili ng video</string>
   <string name="no_permission_to_access_x">Walang pahintulot na ma-access ang %s</string>
   <string name="remote_server_not_found">Hindi mahanap ang remote na server</string>
   <string name="error_file_corrupt">Mukhang sira ang file na ito.</string>
   <string name="unable_to_update_account">Hindi ma-update ang account</string>
-  <string name="missing_presence_subscription_with_x">Nawawalang presensya ng subscription na may %s.</string>
-  <string name="missing_keys_from_x">Nawawala ang mga key ng OMEMO mula sa %s.</string>
-  <string name="wrong_conference_configuration">Hindi ito isang pribado, di-hindi nakikilalang grupo ng chat.</string>
-  <string name="this_conference_has_no_members">Walang mga miyembro sa grupo ng chat na ito.</string>
   <string name="report_jid_as_spammer">Iulat ang JID na ito bilang pagpapadala ng mga hindi gustong mensahe.</string>
   <string name="create_issue">Mag-ulat ng isang isyu</string>
   <string name="pref_delete_omemo_identities">Tanggalin ang mga ID ng OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Bumaon ang iyong mga key ng OMEMO. Kailangang i-verify muli ang lahat ng iyong mga contact. Gamitin lamang ito bilang isang huling paraan.</string>
   <string name="delete_selected_keys">Tanggalin ang mga napiling key</string>
-  <string name="missing_presence_subscription">Nawawalang subscription ng presensya</string>
-  <string name="missing_omemo_keys">Nawawala ang mga key ng OMEMO</string>
   <string name="error_publish_avatar_offline">Kailangan mong maiugnay upang mai-publish ang iyong avatar.</string>
   <string name="copy_to_clipboard">Kopyahin sa clipboard</string>
   <string name="message_copied_to_clipboard">Nakopya ang mensahe sa clipboard</string>
@@ -677,14 +644,7 @@
   <string name="reply">Sumagot</string>
   <string name="encrypting_message">Pag-encrypt ng mensahe</string>
   <string name="transcoding_video">Pag-compress ng video</string>
-  <string name="pref_automatically_delete_messages_description">Awtomatikong tanggalin ang mga mensahe mula sa aparatong ito na mas luma kaysa sa naka-configure na time frame.</string>
-  <string name="pref_automatically_delete_messages">Awtomatikong pagtanggal ng mensahe</string>
   <string name="not_fetching_history_retention_period">Hindi nakakakuha ng mga mensahe dahil sa lokal na panahon ng pagpapanatili.</string>
-  <string name="timeout_24_hours">24 na oras</string>
-  <string name="timeout_7_days">7 araw</string>
-  <string name="timeout_30_days">30 araw</string>
-  <string name="timeout_6_months">6 na buwan</string>
-  <string name="timeout_12_months">12 buwan</string>
   <string name="today">Ngayon</string>
   <string name="pref_use_max_brightness_summary">Lumipat sa maximum na liwanag habang nanonood ng mga video o mga imahe sa fullscreen.</string>
   <string name="pref_use_max_brightness">Pinakamataas na liwanag</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 856e3da4b..b4ced17f5 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -151,8 +151,7 @@
   <string name="account_settings_jabber_id">Identifiant</string>
   <string name="account_settings_password">Mot de passe</string>
   <string name="account_settings_example_jabber_id">nom@exemple.com</string>
-  <string name="account_settings_confirm_password">Confirmer le mot de passe</string>
-  <string name="password">Mot de passe</string>
+    <string name="password">Mot de passe</string>
   <string name="confirm_password">Confirmer le mot de passe</string>
   <string name="passwords_do_not_match">Les deux mots de passe ne correspondent pas.</string>
   <string name="invalid_jid">Cet identifiant n\'est pas valide</string>
@@ -350,10 +349,7 @@
   <string name="moderated">Modéré</string>
   <string name="you_are_not_participating">Vous ne participez pas</string>
   <string name="never">Jamais</string>
-  <string name="one_hour">1 heure</string>
-  <string name="two_hours">2 heures</string>
-  <string name="eight_hours">8 heures</string>
-  <string name="until_further_notice">Jusqu\'à nouvel ordre</string>
+    <string name="until_further_notice">Jusqu\'à nouvel ordre</string>
   <string name="pref_input_options">Saisie</string>
   <string name="pref_enter_is_send">Touche Entrée pour envoyer</string>
   <string name="pref_enter_is_send_summary">Utiliser la touche Entrée pour envoyer un message.</string>
@@ -375,8 +371,7 @@
   <string name="no_application_found_to_display_location">Aucune application trouvée pour afficher la position</string>
   <string name="location">Position</string>
   <string name="received_location">Position reçue</string>
-  <string name="title_undo_swipe_out_conversation">Conversation fermée</string>
-  <string name="pref_dont_trust_system_cas_title">Ne pas utiliser les CAs système</string>
+    <string name="pref_dont_trust_system_cas_title">Ne pas utiliser les CAs système</string>
   <string name="pref_dont_trust_system_cas_summary">Tous les certificats doivent être approuvés manuellement.</string>
   <string name="pref_remove_trusted_certificates_title">Retirer les certificats</string>
   <string name="pref_remove_trusted_certificates_summary">Supprimer les certificats approuvés manuellement.</string>
@@ -446,15 +441,7 @@
   <string name="shared_text_with_x">Texte partagé avec %s</string>
   <string name="sync_with_contacts">Synchroniser avec contacts</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger souhaite associer vos contacts XMPP avec les contacts de votre appareil, pour utiliser leur nom complet et leur avatar.\n\nPix-Art Messenger va uniquement lire vos contacts et les associer localement, sans les envoyer sur le serveur XMPP.\n\nVotre appareil va maintenant vous demander la permission d\'accéder à vos contacts.</string>
-  <string name="certificate_information">Informations du certificat</string>
-  <string name="certificate_subject">Sujet</string>
-  <string name="certificate_issuer">Émetteur</string>
-  <string name="certificate_cn">Nom commun</string>
-  <string name="certificate_o">Organisation</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Non disponible)</string>
-  <string name="certificate_not_found">Aucun certificat trouvé</string>
-  <string name="notify_on_all_messages">Notifier pour tous les messages</string>
+    <string name="notify_on_all_messages">Notifier pour tous les messages</string>
   <string name="notify_only_when_highlighted">Notifier seulement en cas de mention</string>
   <string name="notify_never">Notifications désactivées</string>
   <string name="notify_paused">Notifications en pause</string>
@@ -483,10 +470,8 @@
   <string name="pick_your_username">Choisissez votre nom d\'utilisateur</string>
   <string name="pref_manually_change_presence">Changer votre disponibilité</string>
   <string name="pref_manually_change_presence_summary">Cliquez sur votre avatar pour modifier votre disponibilité</string>
-  <string name="change_presence">Changer votre disponibilité</string>
-  <string name="status_message">Message de statut</string>
-  <string name="all_accounts_on_this_device">Configurer pour tous les comptes sur cet appareil</string>
-  <string name="presence_chat">Disponible</string>
+    <string name="status_message">Message de statut</string>
+    <string name="presence_chat">Disponible</string>
   <string name="presence_online">En ligne</string>
   <string name="presence_away">Absent</string>
   <string name="presence_xa">Non disponible</string>
@@ -511,15 +496,11 @@
   <string name="no_permission_to_access_x">Permission d\'accéder à %s refusée</string>
   <string name="remote_server_not_found">Serveur distant non trouvé</string>
   <string name="unable_to_update_account">Mise à jour du compte impossible</string>
-  <string name="missing_presence_subscription_with_x">La notification de présence pour %s est manquante.</string>
-  <string name="missing_keys_from_x">La clef OMEMO de %s est manquante.</string>
-  <string name="report_jid_as_spammer">Signaler ce JID comme envoyant des messages non sollicités.</string>
+    <string name="report_jid_as_spammer">Signaler ce JID comme envoyant des messages non sollicités.</string>
   <string name="pref_delete_omemo_identities">Effacer les identités OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Régénérer vos clefs OMEMO. Tous vos contacts devront vous vérifier à nouveau. À n\'utiliser qu\'en dernier recours.</string>
   <string name="delete_selected_keys">Supprimer les clefs sélectionnées</string>
-  <string name="missing_presence_subscription">La notification de présence est manquante </string>
-  <string name="missing_omemo_keys">Clefs OMEMO manquantes</string>
-  <string name="error_publish_avatar_offline">Vous devez être connecté pour publier votre avatar.</string>
+    <string name="error_publish_avatar_offline">Vous devez être connecté pour publier votre avatar.</string>
   <string name="quote">Citation</string>
   <string name="show_error_message">Afficher le message d\'erreur</string>
   <string name="error_message">Message d\'erreur</string>
@@ -549,14 +530,8 @@
   <string name="hide_inactive_devices">Masquer les appareils inactifs</string>
   <string name="encrypting_message">Chiffrement du message en cours</string>
   <string name="transcoding_video">Compression de la vidéo en cours</string>
-  <string name="pref_automatically_delete_messages_description">Efface automatiquement de cet appareil les messages plus anciens que l\'intervalle choisi.</string>
-  <string name="pref_automatically_delete_messages">Suppression messages auto</string>
-  <string name="not_fetching_history_retention_period">Aucun message récupéré, en raison de la configuration de rétention de l\'appareil.</string>
-  <string name="timeout_24_hours">24 heures</string>
-  <string name="timeout_7_days">7 jours</string>
-  <string name="timeout_30_days">30 jours</string>
-  <string name="timeout_6_months">6 mois</string>
-  <string name="today">Aujourd\'hui</string>
+    <string name="not_fetching_history_retention_period">Aucun message récupéré, en raison de la configuration de rétention de l\'appareil.</string>
+    <string name="today">Aujourd\'hui</string>
   <string name="block_jabber_id">Bloquer l\'ID Jabber</string>
   <string name="corresponding_conversations_closed">Conversations correspondantes fermées.</string>
   <string name="contact_blocked_past_tense">Contact bloqué.</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 2be2b35d4..b2c9d9972 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -96,8 +96,6 @@
   <string name="contact_has_no_pgp_key">Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\n<small>Por favor, pídelle ao teu contacto que configure OpenPGP.</small></string>
   <string name="no_pgp_keys">Non se atoparon chaves OpenPGP</string>
   <string name="pref_general">Xeral</string>
-  <string name="pref_xmpp_resource">Recurso</string>
-  <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que está a empregar</string>
   <string name="pref_attachments">Engadidos</string>
   <string name="pref_notification_settings">Notificación</string>
   <string name="pref_notifications">Notificacións</string>
@@ -114,8 +112,6 @@
   <string name="openpgp_error">OpenKeychain reportou un erro</string>
   <string name="accept">Aceptar</string>
   <string name="error">Produciuse un erro</string>
-  <string name="pref_grant_presence_updates">Suscripción de presencia</string>
-  <string name="pref_grant_presence_updates_summary">Solicitar e permitir subscricións de presenza de xeito preventivo para os contactos que vostede creou</string>
   <string name="your_account">A túa conta</string>
   <string name="send_presence_updates">Enviar actualizacións de presencia</string>
   <string name="receive_presence_updates">Recibir actualizacións de presencia</string>
@@ -159,7 +155,6 @@
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="account_settings_password">Contrasinal</string>
   <string name="account_settings_example_jabber_id">usuaria@exemplo.com</string>
-  <string name="account_settings_confirm_password">Confirmar contrasinal</string>
   <string name="password">Contrasinal</string>
   <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
   <string name="error_out_of_memory">Exceso de memoria. A imaxe é demasiado grande</string>
@@ -380,10 +375,6 @@
   <string name="modified_conference_options">¡Opcións da conversa en grupo modificadas!</string>
   <string name="could_not_modify_conference_options">Non se puideron modificar as opcións da conversa en grupo</string>
   <string name="never">Nunca</string>
-  <string name="thirty_minutes">30 minutos</string>
-  <string name="one_hour">1 hora</string>
-  <string name="two_hours">2 horas</string>
-  <string name="eight_hours">8 horas</string>
   <string name="until_further_notice">Ate novo aviso</string>
   <string name="pref_input_options">Entrada</string>
   <string name="pref_enter_is_send">Enter envía</string>
@@ -409,8 +400,6 @@
   <string name="no_application_found_to_display_location">Non se atopou un aplicativo para mostrar a localización</string>
   <string name="location">Localización</string>
   <string name="received_location">Localización recibida</string>
-  <string name="title_undo_swipe_out_conversation">Pechouse a conversa</string>
-  <string name="title_undo_swipe_out_muc">Deixar a conversa en grupo</string>
   <string name="pref_dont_trust_system_cas_title">Non confiar nas CAs do sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Todos os certificados deberán ser aprovados manualmente</string>
   <string name="pref_remove_trusted_certificates_title">Eliminar certificados</string>
@@ -487,14 +476,6 @@
   <string name="shared_text_with_x">Texto compartido con %s</string>
   <string name="sync_with_contacts">Sincronice con todos os contactos</string>
   <string name="sync_with_contacts_long">Conversations quere comparar a súa lista XMPP cos seus contactos para mostrar os seus nomes completos e avatares.\n\nConversations só fará esta comprobación de xeito local sen subilos ao servidor.\n\nAgora pediráselle conceder permiso para acceder aos seus contactos.</string>
-  <string name="certificate_information">Información do certificado</string>
-  <string name="certificate_subject">Asunto</string>
-  <string name="certificate_issuer">Proveedor</string>
-  <string name="certificate_cn">Nome de contacto</string>
-  <string name="certificate_o">Empresa</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(non dispoñible)</string>
-  <string name="certificate_not_found">Non se atopou certificado</string>
   <string name="notify_on_all_messages">Notificar todas as mensaxes</string>
   <string name="notify_only_when_highlighted">Notificar só cando é mencionada</string>
   <string name="notify_never">Notificacións deshabilitadas</string>
@@ -525,9 +506,7 @@
   <string name="pick_your_username">Escolla un identificador</string>
   <string name="pref_manually_change_presence">Cambiar manualmente a presenza</string>
   <string name="pref_manually_change_presence_summary">Toque o seu avatar para cambiar a presenza</string>
-  <string name="change_presence">Cambiar presenza</string>
   <string name="status_message">Mensaxe de estado</string>
-  <string name="all_accounts_on_this_device">Establecer para todas as contas en este dipositivo</string>
   <string name="presence_chat">Dispoñible para conversar</string>
   <string name="presence_online">En liña</string>
   <string name="presence_away">Fóra</string>
@@ -539,7 +518,6 @@
   <string name="registration_please_wait">Fallo no rexistro: inténteo de novo</string>
   <string name="registration_password_too_weak">Fallo no rexistro: contrasinal moi feble</string>
   <string name="create_conference">Crear conversa en grupo</string>
-  <string name="join_or_create_conference">Únete ou crea unha conversa en grupo</string>
   <string name="conference_subject">Asunto</string>
   <string name="choose_participants">Escoller participantes</string>
   <string name="creating_conference">Creando unha conversa en grupo...</string>
@@ -556,16 +534,10 @@
   <string name="no_permission_to_access_x">Se permiso para acceder %s</string>
   <string name="remote_server_not_found">Non se atopa o servidor remoto</string>
   <string name="unable_to_update_account">Non se puido actualizar a conta</string>
-  <string name="missing_presence_subscription_with_x">Perdida a suscrición de presenza con %s.</string>
-  <string name="missing_keys_from_x">Perdidas as chaves OMEMO de %s.</string>
-  <string name="wrong_conference_configuration">Este non é unha conversa en grupo privado e non é anónima.</string>
-  <string name="this_conference_has_no_members">Non hai membros nesta conversa en grupo.</string>
   <string name="report_jid_as_spammer">Informe de este JID como emisor de mensaxes non desexadas.</string>
   <string name="pref_delete_omemo_identities">Borrar identidades OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Rexenerar as súas chaves OMEMO. Todos os seus contactos deberán verificalo de novo. Utilice esto como último recurso.</string>
   <string name="delete_selected_keys">Eliminar as chaves seleccionadas.</string>
-  <string name="missing_presence_subscription">Falta a suscrición de presenza</string>
-  <string name="missing_omemo_keys">Perda das chaves OMEMO</string>
   <string name="error_publish_avatar_offline">Precisa estar conectada para publicar o seu avatar.</string>
   <string name="copy_to_clipboard">Copiar ao portapapeis</string>
   <string name="message_copied_to_clipboard">Mensaxe copiada ao portapapeis</string>
@@ -599,13 +571,7 @@
   <string name="hide_inactive_devices">Ocultar dispositivos non activos</string>
   <string name="encrypting_message">Cifrando mensaxe</string>
   <string name="transcoding_video">Comprimindo vídeo</string>
-  <string name="pref_automatically_delete_messages_description">Borrar mensaxes de xeito automático de este dispositivo que anteriores ao marco temporal configurado.</string>
-  <string name="pref_automatically_delete_messages">Borrado automático de mensaxes</string>
   <string name="not_fetching_history_retention_period">Sen obtención de mensaxes debido ao período de retención local.</string>
-  <string name="timeout_24_hours">24 horas</string>
-  <string name="timeout_7_days">7 días</string>
-  <string name="timeout_30_days">30 días</string>
-  <string name="timeout_6_months">6 meses</string>
   <string name="today">Hoxe</string>
   <string name="block_jabber_id">Bloquear ID Jabber</string>
   <string name="corresponding_conversations_closed">Conversas correpondentes pechadas.</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 7b1808606..e28a221f3 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -98,9 +98,7 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger tidak dapat mengenkripsi pesan anda karena kontak anda tidak menampilkan kunci publik miliknya.\n\n<small>Mintalah kontak anda untuk menyiapkan OpenPGP.</small></string>
   <string name="no_pgp_keys">Tidak ada kunci OpenPGP yang ditemukan</string>
   <string name="pref_general">Umum</string>
-  <string name="pref_xmpp_resource">Sumber daya XMPP</string>
-  <string name="pref_xmpp_resource_summary">Nama klien ini memperkenalkan dirinya dengan</string>
-  <string name="pref_accept_files_wifi">Menerima berkas di jaringan WiFi</string>
+    <string name="pref_accept_files_wifi">Menerima berkas di jaringan WiFi</string>
   <string name="pref_accept_files_summary_wifi">Saat terhubung ke wifi otomatis menerima berkas lebih kecil dari…</string>
   <string name="pref_accept_files_mobile">Terima berkas dari jaringan telepon genggam</string>
   <string name="pref_accept_files_summary_mobile">Saat terhubung dengan data telepon genggam otomatis menerima berkas lebih kecil dari…</string>
@@ -124,9 +122,7 @@
   <string name="openpgp_error">OpenKeychain laporkan jika ada kerusakan</string>
   <string name="accept">Terima</string>
   <string name="error">Terdapat kesalahan</string>
-  <string name="pref_grant_presence_updates">Berikan pembaruan terbaru</string>
-  <string name="pref_grant_presence_updates_summary">Secara beraturan memberikan dan meminta langganan kehadiran untuk kontak yang telah anda buat</string>
-  <string name="your_account">Akun anda</string>
+    <string name="your_account">Akun anda</string>
   <string name="send_presence_updates">Kirimkan pembaruan terbaru</string>
   <string name="receive_presence_updates">Terkirim pembaruan terbaru</string>
   <string name="ask_for_presence_updates">Mintalah pembaruan terbaru</string>
@@ -171,8 +167,7 @@
   <string name="account_settings_jabber_id">Obrolan-Data diri</string>
   <string name="account_settings_password">Kata sandi</string>
   <string name="account_settings_example_jabber_id">nama pengguna@pix-art.de</string>
-  <string name="account_settings_confirm_password">Konfirmasi sandi</string>
-  <string name="password">Kata sandi</string>
+    <string name="password">Kata sandi</string>
   <string name="confirm_password">Konfirmasi sandi</string>
   <string name="passwords_do_not_match">Kata sandi tidak cocok</string>
   <string name="invalid_jid">Ini bukan ID Jabber yang sah</string>
@@ -397,11 +392,7 @@
   <string name="modified_conference_options">Mengubah pilihan obrolan kelompok!</string>
   <string name="could_not_modify_conference_options">Tidak dapat mengubah pilihan obrolan kelompok</string>
   <string name="never">Tidak pernah</string>
-  <string name="thirty_minutes">30 menit</string>
-  <string name="one_hour">1 jam</string>
-  <string name="two_hours">2 jam</string>
-  <string name="eight_hours">8 jam</string>
-  <string name="until_further_notice">Sampai pemberitahuan lebih lanjut</string>
+    <string name="until_further_notice">Sampai pemberitahuan lebih lanjut</string>
   <string name="pref_input_options">Memasukkan</string>
   <string name="pref_enter_is_send">Masukkan kiriman</string>
   <string name="pref_enter_is_send_summary">Gunakan tombol enter untuk mengirim pesan</string>
@@ -427,9 +418,7 @@
   <string name="no_application_found_to_display_location">Tidak ada aplikasi yang ditemukan untuk menampilkan lokasi</string>
   <string name="location">Lokasi</string>
   <string name="received_location">Lokasi yang diterima</string>
-  <string name="title_undo_swipe_out_conversation">Percakapan ditutup</string>
-  <string name="title_undo_swipe_out_muc">Obrolan kelompok kiri</string>
-  <string name="pref_dont_trust_system_cas_title">Jangan percaya sistem CAs</string>
+    <string name="pref_dont_trust_system_cas_title">Jangan percaya sistem CAs</string>
   <string name="pref_dont_trust_system_cas_summary">Semua sertifikat harus disetujui secara manual</string>
   <string name="pref_remove_trusted_certificates_title">Hapus sertifikat</string>
   <string name="pref_remove_trusted_certificates_summary">Hapus sertifikat yang disetujui secara manual</string>
@@ -457,8 +446,7 @@
   <string name="download_failed_server_not_found">Unduh gagal: server tidak ditemukan</string>
   <string name="download_failed_file_not_found">Unduh gagal: berkas tidak ditemukan</string>
   <string name="download_failed_could_not_connect">Unduh gagal: tidak dapat terhubung ke sistem</string>
-  <string name="elv_undo">kembali</string>
-  <string name="download_failed_could_not_write_file">Unduh gagal: tidak bisa menulis berkas</string>
+    <string name="download_failed_could_not_write_file">Unduh gagal: tidak bisa menulis berkas</string>
   <string name="pref_use_white_background">Gunakan latar belakang putih</string>
   <string name="pref_use_white_background_summary">Tampilkan pesan terkirim sebagai teks hitam di latar belakang putih</string>
   <string name="action_check_update">Periksa pembaruan</string>
@@ -514,15 +502,7 @@
   <string name="shared_text_with_x">Berbagi teks dengan %s</string>
   <string name="sync_with_contacts">Sesuaikan dengan kontak</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger ingin mencocokkan daftar XMPP anda dengan kontak anda untuk menunjukkan nama lengkap dan avatar mereka.\n\nPix-Art Messenger hanya akan membaca kontak anda dan mencocokkannya secara lokal tanpa mengunggahnya ke server anda.\n\nAnda sekarang diminta izin untuk mengakses kontak anda.</string>
-  <string name="certificate_information">Informasi sertifikat</string>
-  <string name="certificate_subject">Perihal</string>
-  <string name="certificate_issuer">Penerbit</string>
-  <string name="certificate_cn">Nama umum</string>
-  <string name="certificate_o">Kelompok</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(tidak tersedia)</string>
-  <string name="certificate_not_found">Tidak ditemukan sertifikat</string>
-  <string name="notify_on_all_messages">Hidupkan pemberitahuan untuk semua pesan</string>
+    <string name="notify_on_all_messages">Hidupkan pemberitahuan untuk semua pesan</string>
   <string name="notify_only_when_highlighted">Pemberitahuan hanya bila disebutkan</string>
   <string name="notify_never">Pemberitahuan tidak diaktifkan</string>
   <string name="notify_paused">Pemberitahuan dijeda</string>
@@ -538,8 +518,7 @@
   <string name="battery_optimizations_enabled_explained">Perangkat anda melakukan beberapa pengoptimalan baterai pada Pix-Art Messenger yang mungkin menyebabkan pemberitahuan tertunda atau bahkan kehilangan pesan.\nDianjurkan untuk tidak mengaktifkannya.</string>
   <string name="battery_optimizations_enabled_dialog">Perangkat anda melakukan beberapa pengoptimalan baterai pada Pix-Art Messenger yang mungkin menyebabkan pemberitahuan tertunda atau bahkan kehilangan pesan.\n\nAnda sekarang akan diminta untuk tidak mengaktifkannya.</string>
   <string name="install_from_unknown_sources_disabled">Memasang dari sumber yang tidak dikenal dimatikan</string>
-  <string name="install_from_unknown_sources_disabled_explained">Perangkat anda diatur agar tidak mengizinkan pemasangan aplikasi dari sumber yang tidak dipercaya, yang menyebabkan masalah pada pembaruan aplikasi.\nDisarankan untuk mengizinkan pemasangan dari sumber yang tidak dipercaya.</string>
-  <string name="install_from_unknown_sources_disabled_dialog">Perangkat anda diatur untuk tidak mengizinkan pemasangan aplikasi dari sumber yang tidak dipercaya kecuali dari Google PlayStore. Hal ini akan menyebabkan masalah pada pembaruan aplikasi.\n\nAnda sekarang akan diminta untuk mengizinkan pemasangan aplikasi dari sumber yang tidak dipercaya.</string>
+    <string name="install_from_unknown_sources_disabled_dialog">Perangkat anda diatur untuk tidak mengizinkan pemasangan aplikasi dari sumber yang tidak dipercaya kecuali dari Google PlayStore. Hal ini akan menyebabkan masalah pada pembaruan aplikasi.\n\nAnda sekarang akan diminta untuk mengizinkan pemasangan aplikasi dari sumber yang tidak dipercaya.</string>
   <string name="disable">Menonaktifkan</string>
   <string name="selection_too_large">Area yang dipilih terlalu besar</string>
   <string name="cancel_update">Batalkan pembaruan?</string>
@@ -566,17 +545,14 @@
   <string name="pick_your_username">Pilih nama pengguna Anda</string>
   <string name="pref_manually_change_presence">Mengubah kehadiran secara manual</string>
   <string name="pref_manually_change_presence_summary">Ubah kehadiranmu di dalam akun Anda</string>
-  <string name="change_presence">Ubah Kehadiran</string>
-  <string name="status_message">Status pesan</string>
-  <string name="all_accounts_on_this_device">Tetapkan untuk semua akun di perangkat ini</string>
-  <string name="presence_chat">Gratis untuk obrolan</string>
+    <string name="status_message">Status pesan</string>
+    <string name="presence_chat">Gratis untuk obrolan</string>
   <string name="presence_online">Terhubung</string>
   <string name="presence_xa">Tidak tersedia</string>
   <string name="presence_dnd">Sibuk</string>
   <string name="secure_password_generated">Kata sandi yang aman telah dibuat</string>
   <string name="device_does_not_support_battery_op">Perangkat anda tidak mendukung pengoptimalan baterai</string>
-  <string name="device_does_not_support_unknown_source_op">Perangkat Anda tidak mendukung mengizinkan pemasangan aplikasi dari sumber yang tidak dikenal</string>
-  <string name="share">Bagikan</string>
+    <string name="share">Bagikan</string>
   <string name="share_location">Berbagi lokasi</string>
   <string name="location_sharing_disabled">Berbagi lokasi dimatikan dalam pengaturan</string>
   <string name="locating">Menemukan…</string>
@@ -586,8 +562,7 @@
   <string name="registration_please_wait">Pendaftaran gagal: Coba lagi nanti</string>
   <string name="registration_password_too_weak">Pendaftaran gagal: Kata sandi terlalu lemah</string>
   <string name="create_conference">Buat obrolan kelompok</string>
-  <string name="join_or_create_conference">Bergabung atau buat obrolan kelompok</string>
-  <string name="conference_subject">Perihal</string>
+    <string name="conference_subject">Perihal</string>
   <string name="choose_participants">Pilih peserta</string>
   <string name="creating_conference">Membuat obrolan kelompok…</string>
   <string name="import_text">Ada cadangan pada perangkat Anda yang bisa diimpor. \nMungkin Anda akan diminta untuk menghapus versi lama atau Percakapan dan Messenger Anda akan dimulai ulang saat proses mencadangkan. Haruskah cadangan diimpor? </string>
@@ -601,8 +576,7 @@
   <string name="request_permissions_message">Pix-Art Messenger akan meminta Anda mengizinkan beberapa izin. Penting bahwa Anda mengizinkan semua hak akses ini untuk menggunakan semua fitur messenger ini. Jika Anda menolak izin ini, aplikasi akan menutup dengan sendiri.</string>
   <string name="request_permissions_message_again">Anda telah menolak beberapa atau semua izin yang dibutuhkan untuk Pix-Art Messenger. Apakah Anda ingin beralih ke pengaturan dan mengizinkan izin ini? Jika Anda menolak semua izin ini, aplikasi akan menutup dengan sendiri.</string>
   <string name="unable_to_connect_to_keychain">Tidak dapat terhubung ke OpenKeychain</string>
-  <string name="no_permission">Pix-Art Messenger tidak memiliki izin</string>
-  <string name="send_image">Kirim gambar?</string>
+    <string name="send_image">Kirim gambar?</string>
   <string name="this_device_is_no_longer_in_use">Perangkat ini tidak lagi digunakan</string>
   <string name="import_canceled">Impor dibatalkan</string>
   <string name="Import_failed">Gagal memasukkan penyimpanan data, masukan tidak mungkin dilakukan</string>
@@ -617,23 +591,16 @@
   <string name="me">Saya</string>
   <string name="contact_asks_for_presence_subscription">Kontak meminta langganan kehadiran</string>
   <string name="allow">Mengizinkan</string>
-  <string name="attach_choose_video">Pilih video</string>
-  <string name="no_permission_to_access_x">Tidak ada izin untuk mengakses %s</string>
+    <string name="no_permission_to_access_x">Tidak ada izin untuk mengakses %s</string>
   <string name="remote_server_not_found">Server jarak jauh tidak ditemukan</string>
   <string name="error_file_corrupt">Berkas ini sepertinya rusak.</string>
   <string name="unable_to_update_account">Tidak dapat memperbarui akun</string>
-  <string name="missing_presence_subscription_with_x">Melewati langganan yang hilang dengan %s.</string>
-  <string name="missing_keys_from_x">Kunci OMEMO yang hilang dari %s.</string>
-  <string name="wrong_conference_configuration">Ini bukan chat grup pribadi non-anonim.</string>
-  <string name="this_conference_has_no_members">Tidak ada anggota dalam obrolan grup ini.</string>
-  <string name="report_jid_as_spammer">Laporkan JID ini sebagai pengiriman pesan yang tidak diinginkan.</string>
+    <string name="report_jid_as_spammer">Laporkan JID ini sebagai pengiriman pesan yang tidak diinginkan.</string>
   <string name="create_issue">Laporkan masalah</string>
   <string name="pref_delete_omemo_identities">Hapus identitas OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regenerasi kunci OMEMO Anda. Semua kontak Anda harus memverifikasi Anda lagi. Gunakan ini hanya sebagai upaya terakhir.</string>
   <string name="delete_selected_keys">Hapus kunci yang dipilih</string>
-  <string name="missing_presence_subscription">Langganan kehadiran hilang</string>
-  <string name="missing_omemo_keys">Kunci OMEMO yang hilang</string>
-  <string name="error_publish_avatar_offline">Anda harus terhubung untuk mempublikasikan avatar Anda.</string>
+    <string name="error_publish_avatar_offline">Anda harus terhubung untuk mempublikasikan avatar Anda.</string>
   <string name="copy_to_clipboard">Menyalin ke clipboard</string>
   <string name="message_copied_to_clipboard">Pesan disalin ke clipboard</string>
   <string name="message">Pesan</string>
@@ -672,15 +639,8 @@
   <string name="reply">Balas</string>
   <string name="encrypting_message">Enkripsi pesan</string>
   <string name="transcoding_video">Pemampatan video</string>
-  <string name="pref_automatically_delete_messages_description">Secara otomatis menghapus pesan dari perangkat ini yang lebih lama dari jangka waktu yang dikonfigurasi.</string>
-  <string name="pref_automatically_delete_messages">Menghapus pesan secara otomatis</string>
-  <string name="not_fetching_history_retention_period">Tidak mengambil pesan karena periode penyimpanan lokal.</string>
-  <string name="timeout_24_hours">24 jam</string>
-  <string name="timeout_7_days">7 hari</string>
-  <string name="timeout_30_days">30 hari</string>
-  <string name="timeout_6_months">6 bulan</string>
-  <string name="timeout_12_months">12 bulan</string>
-  <string name="today">Hari ini</string>
+    <string name="not_fetching_history_retention_period">Tidak mengambil pesan karena periode penyimpanan lokal.</string>
+    <string name="today">Hari ini</string>
   <string name="pref_use_max_brightness_summary">Beralih ke kecerahan maksimum saat menonton video atau gambar di layar penuh.</string>
   <string name="pref_use_max_brightness">Kecerahan maksimum</string>
   <string name="block_jabber_id">Blok Obrolan-Data diri</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index f0ffebcd9..2cefafeea 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -96,9 +96,7 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger non è in grado di cifrare i tuoi messaggi perché il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
   <string name="no_pgp_keys">Nessuna chiave OpenPGP trovata</string>
   <string name="pref_general">Generale</string>
-  <string name="pref_xmpp_resource">Risorsa XMPP</string>
-  <string name="pref_xmpp_resource_summary">Il nome con il quale questo client si identifica</string>
-  <string name="pref_attachments">Allegati</string>
+    <string name="pref_attachments">Allegati</string>
   <string name="pref_notification_settings">Notifiche</string>
   <string name="pref_notifications">Notifiche</string>
   <string name="pref_notifications_summary">Notifica quando arriva un nuovo messaggio</string>
@@ -114,9 +112,7 @@
   <string name="openpgp_error">OpenKeychain ha riportato un errore</string>
   <string name="accept">Accetta</string>
   <string name="error">Si è verificato un errore</string>
-  <string name="pref_grant_presence_updates">Concedi aggiornamenti della presenza</string>
-  <string name="pref_grant_presence_updates_summary">Concedi e richiedi preventivamente le sottoscrizioni sulla presenza ai contatti che hai creato</string>
-  <string name="your_account">Il tuo account</string>
+    <string name="your_account">Il tuo account</string>
   <string name="send_presence_updates">Invia aggiornamenti della presenza</string>
   <string name="receive_presence_updates">Ricevi aggiornamenti della presenza</string>
   <string name="ask_for_presence_updates">Chiedi aggiornamenti della presenza</string>
@@ -159,8 +155,7 @@
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="account_settings_password">Password</string>
   <string name="account_settings_example_jabber_id">utente@esempio.com</string>
-  <string name="account_settings_confirm_password">Conferma password</string>
-  <string name="password">Password</string>
+    <string name="password">Password</string>
   <string name="invalid_jid">Questo non è un ID Jabber valido</string>
   <string name="error_out_of_memory">Memoria esaurita. L’immagine è tropppo grande</string>
   <string name="add_phone_book_text">Vuoi aggiungere %s alla tua rubrica?</string>
@@ -380,11 +375,7 @@
   <string name="modified_conference_options">Opzioni della chat di gruppo modificate!</string>
   <string name="could_not_modify_conference_options">Impossibile modificare le opzioni della chat di gruppo</string>
   <string name="never">Mai</string>
-  <string name="thirty_minutes">30 minuti</string>
-  <string name="one_hour">1 ora</string>
-  <string name="two_hours">2 ore</string>
-  <string name="eight_hours">8 ore</string>
-  <string name="until_further_notice">Fino a nuovo avviso</string>
+    <string name="until_further_notice">Fino a nuovo avviso</string>
   <string name="pref_input_options">Input</string>
   <string name="pref_enter_is_send">Invio spedisce</string>
   <string name="pref_enter_is_send_summary">Il tasto invio spedisce il messaggio</string>
@@ -409,9 +400,7 @@
   <string name="no_application_found_to_display_location">Non è stata trovata alcuna applicazione per mostrare la posizione</string>
   <string name="location">Posizione</string>
   <string name="received_location">Posizione ricevuta</string>
-  <string name="title_undo_swipe_out_conversation">Conversazione interrotta</string>
-  <string name="title_undo_swipe_out_muc">Chat di gruppo abbandonata</string>
-  <string name="pref_dont_trust_system_cas_title">Non ti fidare delle CA di sistema</string>
+    <string name="pref_dont_trust_system_cas_title">Non ti fidare delle CA di sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Tutti i certificati devono essere accettati manualmente</string>
   <string name="pref_remove_trusted_certificates_title">Elimina i certificati</string>
   <string name="pref_remove_trusted_certificates_summary">Cancella manualmente i certificati già accettati</string>
@@ -487,15 +476,7 @@
   <string name="shared_text_with_x">Testo condiviso con %s</string>
   <string name="sync_with_contacts">Sincronizza con i contatti</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger vuole confrontare il tuo roster XMPP con i tuoi contatti per mostrare i loro nomi ed avatar.\n\nPix-Art Messenger leggerà solamente i contatti e li confronterà localmente senza caricarli sul server.\n\nTi verrà ora chiesto il permesso di accedere ai tuoi contatti.</string>
-  <string name="certificate_information">Informazioni del certificato</string>
-  <string name="certificate_subject">Soggetto</string>
-  <string name="certificate_issuer">Emittente</string>
-  <string name="certificate_cn">Nome comune</string>
-  <string name="certificate_o">Organizzazione</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Non disponibile)</string>
-  <string name="certificate_not_found">Nessun certificato trovato</string>
-  <string name="notify_on_all_messages">Notifica per tutti i messaggi</string>
+    <string name="notify_on_all_messages">Notifica per tutti i messaggi</string>
   <string name="notify_only_when_highlighted">Notifica solo quando menzionato</string>
   <string name="notify_never">Notifiche disabilitate</string>
   <string name="notify_paused">Notifiche in pausa</string>
@@ -522,10 +503,8 @@
   <string name="pick_your_username">Scegli il tuo nome utente</string>
   <string name="pref_manually_change_presence">Cambia la presenza manualmente</string>
   <string name="pref_manually_change_presence_summary">Tocca il tuo avatar per cambiare la presenza</string>
-  <string name="change_presence">Cambia la presenza</string>
-  <string name="status_message">Messaggio di stato</string>
-  <string name="all_accounts_on_this_device">Imposta per tutti gli account del dispositivo</string>
-  <string name="presence_chat">Disponibile a chattare</string>
+    <string name="status_message">Messaggio di stato</string>
+    <string name="presence_chat">Disponibile a chattare</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Assente</string>
   <string name="presence_xa">Non disponibile</string>
@@ -536,8 +515,7 @@
   <string name="registration_please_wait">Registrazione fallita: riprova più tardi</string>
   <string name="registration_password_too_weak">Registrazione fallita: password troppo debole</string>
   <string name="create_conference">Crea chat di gruppo</string>
-  <string name="join_or_create_conference">Unisciti o crea chat di gruppo</string>
-  <string name="conference_subject">Soggetto</string>
+    <string name="conference_subject">Soggetto</string>
   <string name="choose_participants">Scegli i partecipanti</string>
   <string name="creating_conference">Creazione chat di gruppo...</string>
   <string name="invite_again">Invita di nuovo</string>
@@ -553,17 +531,11 @@
   <string name="no_permission_to_access_x">Nessuna autorizzazione per accedere a %s</string>
   <string name="remote_server_not_found">Server remoto non trovato</string>
   <string name="unable_to_update_account">Impossibile aggiornare l\'account</string>
-  <string name="missing_presence_subscription_with_x">Sottoscrizione della presenza con %s mancante.</string>
-  <string name="missing_keys_from_x">Chiavi OMEMO da %s mancanti.</string>
-  <string name="wrong_conference_configuration">Questa non è una chat di gruppo privata o non-anonima.</string>
-  <string name="this_conference_has_no_members">Non ci sono membri in questa chat di gruppo.</string>
-  <string name="report_jid_as_spammer">Questo JID invia messaggi non richiesti.</string>
+    <string name="report_jid_as_spammer">Questo JID invia messaggi non richiesti.</string>
   <string name="pref_delete_omemo_identities">Elimina identità OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Rigenera le tue chiavi OMEMO. I tuoi contatti dovranno verificare un\'altra volta la tua identità. Solo come ultima possibilità.</string>
   <string name="delete_selected_keys">Cancella le chiavi selezionate</string>
-  <string name="missing_presence_subscription">Sottoiscrizione alla presenza mancante</string>
-  <string name="missing_omemo_keys">Chiave OMEMO mancante</string>
-  <string name="error_publish_avatar_offline">Devi essere connesso per pubblicare l\'avatar.</string>
+    <string name="error_publish_avatar_offline">Devi essere connesso per pubblicare l\'avatar.</string>
   <string name="copy_to_clipboard">Copia negli appunti</string>
   <string name="message_copied_to_clipboard">Messaggio copiato negli appunti</string>
   <string name="message">Messaggio</string>
@@ -596,14 +568,8 @@
   <string name="hide_inactive_devices">Nascondi dispositivi inattivi</string>
   <string name="encrypting_message">Cifratura del messaggio</string>
   <string name="transcoding_video">Compressione video in corso</string>
-  <string name="pref_automatically_delete_messages_description">Elimina automaticamente da questo dispositivo i messaggi più vecchi del lasso di tempo configurato.</string>
-  <string name="pref_automatically_delete_messages">Eliminazione automatica messaggi</string>
-  <string name="not_fetching_history_retention_period">Nessun recupero di messaggi a causa del periodo di conservazione locale.</string>
-  <string name="timeout_24_hours">24 ore</string>
-  <string name="timeout_7_days">7 giorni</string>
-  <string name="timeout_30_days">30 giorni</string>
-  <string name="timeout_6_months">6 mesi</string>
-  <string name="today">Oggi</string>
+    <string name="not_fetching_history_retention_period">Nessun recupero di messaggi a causa del periodo di conservazione locale.</string>
+    <string name="today">Oggi</string>
   <string name="block_jabber_id">Blocca ID Jabber</string>
   <string name="corresponding_conversations_closed">Chiuse le relative conversazioni.</string>
   <string name="contact_blocked_past_tense">Contatto bloccato.</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index dedccd5f0..6957f8641 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -96,9 +96,7 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger kan je berichten niet versleutelen omdat je contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag je contact om OpenPGP te configureren.</small></string>
   <string name="no_pgp_keys">Geen OpenPGP-sleutels gevonden</string>
   <string name="pref_general">Algemeen</string>
-  <string name="pref_xmpp_resource">XMPP-bron</string>
-  <string name="pref_xmpp_resource_summary">De naam waarmee deze cliënt zich identificeert</string>
-  <string name="pref_attachments">Bijlagen</string>
+    <string name="pref_attachments">Bijlagen</string>
   <string name="pref_notification_settings">Melding</string>
   <string name="pref_notifications">Meldingen</string>
   <string name="pref_notifications_summary">Melding wanneer een nieuw bericht ontvangen wordt</string>
@@ -114,9 +112,7 @@
   <string name="openpgp_error">OpenKeychain rapporteerde een fout</string>
   <string name="accept">Aanvaarden</string>
   <string name="error">Er is een fout opgetreden</string>
-  <string name="pref_grant_presence_updates">Verleen toestemming voor aanwezigheidsupdates</string>
-  <string name="pref_grant_presence_updates_summary">Op voorhand toestemming voor aanwezigheidsupdates verlenen en vragen aan contacten die je hebt aangemaakt</string>
-  <string name="your_account">Je account</string>
+    <string name="your_account">Je account</string>
   <string name="send_presence_updates">Verstuur aanwezigheidsupdates</string>
   <string name="receive_presence_updates">Ontvang aanwezigheidsupdates</string>
   <string name="ask_for_presence_updates">Vraag naar aanwezigheidsupdates</string>
@@ -159,8 +155,7 @@
   <string name="account_settings_jabber_id">Jabber-ID:</string>
   <string name="account_settings_password">Wachtwoord:</string>
   <string name="account_settings_example_jabber_id">gebruikersnaam@voorbeeld.nl</string>
-  <string name="account_settings_confirm_password">Wachtwoord bevestigen</string>
-  <string name="password">Wachtwoord</string>
+    <string name="password">Wachtwoord</string>
   <string name="invalid_jid">Dit is geen geldige Jabber-ID</string>
   <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
   <string name="add_phone_book_text">Wil je %s toevoegen aan je adresboek?</string>
@@ -380,11 +375,7 @@
   <string name="modified_conference_options">Gespreksopties aangepast!</string>
   <string name="could_not_modify_conference_options">Kon gespreksopties niet aanpassen</string>
   <string name="never">Nooit</string>
-  <string name="thirty_minutes">30 minuten</string>
-  <string name="one_hour">1 uur</string>
-  <string name="two_hours">2 uur</string>
-  <string name="eight_hours">8 uur</string>
-  <string name="until_further_notice">Voor onbepaalde duur</string>
+    <string name="until_further_notice">Voor onbepaalde duur</string>
   <string name="pref_input_options">Invoer</string>
   <string name="pref_enter_is_send">Enter is versturen</string>
   <string name="pref_enter_is_send_summary">Gebruik de enter-toets om berichten te versturen</string>
@@ -409,9 +400,7 @@
   <string name="no_application_found_to_display_location">Geen applicatie om locatie weer te geven</string>
   <string name="location">Locatie</string>
   <string name="received_location">Locatie ontvangen</string>
-  <string name="title_undo_swipe_out_conversation">Gesprek gesloten</string>
-  <string name="title_undo_swipe_out_muc">Groepsgesprek verlaten</string>
-  <string name="pref_dont_trust_system_cas_title">Systeem-CA\'s niet vertrouwen</string>
+    <string name="pref_dont_trust_system_cas_title">Systeem-CA\'s niet vertrouwen</string>
   <string name="pref_dont_trust_system_cas_summary">Alle certificaten moeten handmatig goedgekeurd worden</string>
   <string name="pref_remove_trusted_certificates_title">Certificaten verwijderen</string>
   <string name="pref_remove_trusted_certificates_summary">Handmatig goedgekeurde certificaten verwijderen</string>
@@ -487,15 +476,7 @@
   <string name="shared_text_with_x">Tekst gedeeld met %s</string>
   <string name="sync_with_contacts">Synchroniseer met contacten</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger wil je XMPP-contacten met je systeemcontacten vergelijken om hun volledige namen en avatars te tonen.\n\nPix-Art Messenger zal je contacten enkel lokaal lezen en vergelijken zonder ze te uploaden naar je server.\n\nJe zal nu gevraagd worden Pix-Art Messenger toegang te verlenen tot je contacten.</string>
-  <string name="certificate_information">Certificaatinformatie</string>
-  <string name="certificate_subject">Onderwerp</string>
-  <string name="certificate_issuer">Uitgever</string>
-  <string name="certificate_cn">Algemene naam</string>
-  <string name="certificate_o">Organisatie</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Niet beschikbaar)</string>
-  <string name="certificate_not_found">Geen certificaat gevonden</string>
-  <string name="notify_on_all_messages">Melding bij alle berichten</string>
+    <string name="notify_on_all_messages">Melding bij alle berichten</string>
   <string name="notify_only_when_highlighted">Melding enkel wanneer aangesproken</string>
   <string name="notify_never">Meldingen uitgeschakeld</string>
   <string name="notify_paused">Meldingen gepauzeerd</string>
@@ -522,10 +503,8 @@
   <string name="pick_your_username">Kies je gebruikersnaam</string>
   <string name="pref_manually_change_presence">Aanwezigheid handmatig instellen</string>
   <string name="pref_manually_change_presence_summary">Tik op je avatar om je aanwezigheid in te stellen</string>
-  <string name="change_presence">Aanwezigheid instellen</string>
-  <string name="status_message">Statusbericht</string>
-  <string name="all_accounts_on_this_device">Instellen voor alle accounts op dit apparaat</string>
-  <string name="presence_chat">Beschikbaar voor gesprek</string>
+    <string name="status_message">Statusbericht</string>
+    <string name="presence_chat">Beschikbaar voor gesprek</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Afwezig</string>
   <string name="presence_xa">Niet beschikbaar</string>
@@ -536,8 +515,7 @@
   <string name="registration_please_wait">Registratie mislukt: probeer later opnieuw</string>
   <string name="registration_password_too_weak">Registratie mislukt: wachtwoord te zwak</string>
   <string name="create_conference">Groepsgesprek aanmaken</string>
-  <string name="join_or_create_conference">Deelnemen aan groepsgesprek of er een aanmaken</string>
-  <string name="conference_subject">Onderwerp</string>
+    <string name="conference_subject">Onderwerp</string>
   <string name="choose_participants">Kies deelnemers</string>
   <string name="creating_conference">Groepsgesprek aanmaken…</string>
   <string name="invite_again">Opnieuw uitnodigen</string>
@@ -553,17 +531,11 @@
   <string name="no_permission_to_access_x">Geen toestemming om toegang te krijgen tot %s</string>
   <string name="remote_server_not_found">Externe server niet gevonden</string>
   <string name="unable_to_update_account">Kan account niet bijwerken</string>
-  <string name="missing_presence_subscription_with_x">Geen aanwezigheidsupdates van %s.</string>
-  <string name="missing_keys_from_x">Geen OMEMO-sleutels van %s.</string>
-  <string name="wrong_conference_configuration">Dit is geen privé, niet-anoniem groepsgesprek.</string>
-  <string name="this_conference_has_no_members">Er neemt niemand deel aan dit groepsgesprek.</string>
-  <string name="report_jid_as_spammer">Rapporteer deze JID voor het sturen van ongewenste berichten</string>
+    <string name="report_jid_as_spammer">Rapporteer deze JID voor het sturen van ongewenste berichten</string>
   <string name="pref_delete_omemo_identities">OMEMO-identiteiten verwijderen</string>
   <string name="pref_delete_omemo_identities_summary">Maak je OMEMO-sleutels opnieuw aan. Al je contacten zullen je opnieuw moeten verifiëren. Gebruik dit enkel als een laatste reddingsmiddel.</string>
   <string name="delete_selected_keys">Geselecteerde sleutels verwijderen</string>
-  <string name="missing_presence_subscription">Geen aanwezigheidsupdates</string>
-  <string name="missing_omemo_keys">Geen OMEMO-sleutels</string>
-  <string name="error_publish_avatar_offline">Je moet verbonden zijn om je avatar te kunnen publiceren.</string>
+    <string name="error_publish_avatar_offline">Je moet verbonden zijn om je avatar te kunnen publiceren.</string>
   <string name="copy_to_clipboard">Kopiëren naar klembord</string>
   <string name="message_copied_to_clipboard">Bericht gekopieerd naar klembord</string>
   <string name="message">Bericht</string>
@@ -596,14 +568,8 @@
   <string name="hide_inactive_devices">Verberg niet-actieve apparaten</string>
   <string name="encrypting_message">Bericht wordt versleuteld</string>
   <string name="transcoding_video">Video wordt gecomprimeerd</string>
-  <string name="pref_automatically_delete_messages_description">Verwijder automatisch berichten van dit apparaat ouder dan de ingestelde tijdsperiode.</string>
-  <string name="pref_automatically_delete_messages">Automatisch berichten verwijderen</string>
-  <string name="not_fetching_history_retention_period">Berichten worden niet opgehaald wegens lokale bewaarperiode.</string>
-  <string name="timeout_24_hours">24 uur</string>
-  <string name="timeout_7_days">7 dagen</string>
-  <string name="timeout_30_days">30 dagen</string>
-  <string name="timeout_6_months">6 maanden</string>
-  <string name="today">Vandaag</string>
+    <string name="not_fetching_history_retention_period">Berichten worden niet opgehaald wegens lokale bewaarperiode.</string>
+    <string name="today">Vandaag</string>
   <string name="block_jabber_id">Jabber-ID blokkeren</string>
   <string name="corresponding_conversations_closed">Bijbehorende gesprekken gesloten.</string>
   <string name="contact_blocked_past_tense">Contact geblokkeerd.</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index f4d3b0d90..928f2085f 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -95,9 +95,7 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger nie może zaszyfrować wiadomości, ponieważ kontakt nie udostępnia klucza publicznego.\n\n<small>Zasugeruj rozmówcy instalację OpenPGP.</small></string>
   <string name="no_pgp_keys">Nie znaleziono kluczy OpenPGP</string>
   <string name="pref_general">Główne</string>
-  <string name="pref_xmpp_resource">Zasób XMPP</string>
-  <string name="pref_xmpp_resource_summary">Nazwa identyfikująca urządzenie</string>
-  <string name="pref_attachments">Załączniki</string>
+    <string name="pref_attachments">Załączniki</string>
   <string name="pref_notification_settings">Powiadomienie</string>
   <string name="pref_notifications">Powiadomienia</string>
   <string name="pref_notifications_summary">Powiadamiaj, gdy nadejdzie wiadomość</string>
@@ -113,9 +111,7 @@
   <string name="openpgp_error">Wystąpił błąd OpenKeychain</string>
   <string name="accept">Akceptuj</string>
   <string name="error">Wystąpił błąd</string>
-  <string name="pref_grant_presence_updates">Zezwól na powiadomienia obecności</string>
-  <string name="pref_grant_presence_updates_summary">Automatycznie zezwalaj i pytaj o powiadomienia obecności, kiedy utworzysz kontakt</string>
-  <string name="your_account">Twoje konto</string>
+    <string name="your_account">Twoje konto</string>
   <string name="send_presence_updates">Wysyłaj powiadomienia obecności</string>
   <string name="receive_presence_updates">Otrzymuj powiadomienia obecności</string>
   <string name="ask_for_presence_updates">Poproś o powiadomienia obecności</string>
@@ -158,8 +154,7 @@
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">Hasło</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Potwierdź hasło</string>
-  <string name="password">Hasło</string>
+    <string name="password">Hasło</string>
   <string name="invalid_jid">Wprowadzono niepoprawny Jabber ID</string>
   <string name="error_out_of_memory">Brak pamięci, obraz jest za duży</string>
   <string name="add_phone_book_text">Czy chcesz dodać %s do listy kontaktów?</string>
@@ -355,11 +350,7 @@
   <string name="moderated">Moderowany</string>
   <string name="you_are_not_participating">Nie bierzesz udziału</string>
   <string name="never">Nigdy</string>
-  <string name="thirty_minutes">30 minut</string>
-  <string name="one_hour">1 godzina</string>
-  <string name="two_hours">2 godziny</string>
-  <string name="eight_hours">8 godzin</string>
-  <string name="until_further_notice">Ręcznie</string>
+    <string name="until_further_notice">Ręcznie</string>
   <string name="pref_input_options">Ustawienia wprowadzania</string>
   <string name="pref_enter_is_send">Enter wysyła</string>
   <string name="pref_enter_is_send_summary">Używaj klawisza Enter do wysyłania wiadomości</string>
@@ -384,8 +375,7 @@
   <string name="no_application_found_to_display_location">Nie odnaleziono aplikacji do wyświetlenia lokalizacji</string>
   <string name="location">Lokalizacja</string>
   <string name="received_location">Otrzymano lokalizację</string>
-  <string name="title_undo_swipe_out_conversation">Zamknięto konwersację</string>
-  <string name="pref_dont_trust_system_cas_title">Nie ufaj certyfikatom systemowym</string>
+    <string name="pref_dont_trust_system_cas_title">Nie ufaj certyfikatom systemowym</string>
   <string name="pref_dont_trust_system_cas_summary">Wymagaj ręcznego potwierdzania certyfikatów</string>
   <string name="pref_remove_trusted_certificates_title">Usuń certyfikat</string>
   <string name="pref_remove_trusted_certificates_summary">Wybierz zaufane certyfikaty do usunięcia</string>
@@ -448,15 +438,7 @@
   <string name="shared_text_with_x">Tekst udostępniony %s</string>
   <string name="sync_with_contacts">Synchronizuj z kontaktami</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger chce dopasować Twoje kontakty XMPP z listą kontaktów w telefonie, by uzupełnić ich pełne imiona oraz awatary.\n\nPix-Art Messenger jedynie przeczyta Twoje kontakty i dopasuje je lokalnie, bez wysyłania na Twój serwer.\n\nZostaniesz teraz poproszony o przydzielenie pozwolenia na odczyt Twoich kontaktów.</string>
-  <string name="certificate_information">Informacja o certyfikacie</string>
-  <string name="certificate_subject">Temat</string>
-  <string name="certificate_issuer">Wystawca</string>
-  <string name="certificate_cn">Nazwa</string>
-  <string name="certificate_o">Organizacja</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Niedostępne)</string>
-  <string name="certificate_not_found">Nie znaleziono certyfikatu</string>
-  <string name="notify_on_all_messages">Powiadom o wszystkich wiadomościach</string>
+    <string name="notify_on_all_messages">Powiadom o wszystkich wiadomościach</string>
   <string name="notify_only_when_highlighted">Powiadamiaj tylko w przypadku wzmianki o mnie</string>
   <string name="notify_never">Powiadomienia wyłączone</string>
   <string name="notify_paused">Powiadomienia wstrzymane</string>
@@ -482,10 +464,8 @@
   <string name="pick_your_username">Wybierz nazwę użytkownika</string>
   <string name="pref_manually_change_presence">Zmień dostępność ręcznie</string>
   <string name="pref_manually_change_presence_summary">Dotknij swojego avatara aby zmienić dostępność</string>
-  <string name="change_presence">Zmień dostępność</string>
-  <string name="status_message">Status</string>
-  <string name="all_accounts_on_this_device">Ustaw na wszystkich kontach na tym urządzeniu</string>
-  <string name="presence_chat">Chętny do rozmowy</string>
+    <string name="status_message">Status</string>
+    <string name="presence_chat">Chętny do rozmowy</string>
   <string name="presence_online">Dostępny</string>
   <string name="presence_away">Zaraz Wracam</string>
   <string name="presence_xa">Niedostępny</string>
@@ -510,15 +490,11 @@
   <string name="no_permission_to_access_x">Brak pozwolenia na dostęp do %s</string>
   <string name="remote_server_not_found">Nie znaleziono serwera</string>
   <string name="unable_to_update_account">Nie można zaktualizować konta</string>
-  <string name="missing_presence_subscription_with_x">Brakuje subskrypcji obecności dla %s</string>
-  <string name="missing_keys_from_x">Brakuje kluczy OMEMO od %s</string>
-  <string name="report_jid_as_spammer">Raportuj ten JID jako rozsyłający spam</string>
+    <string name="report_jid_as_spammer">Raportuj ten JID jako rozsyłający spam</string>
   <string name="pref_delete_omemo_identities">Usuń tożsamości OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Wygeneruj jeszcze raz klucze OMEMO. Wszystkie Twoje kontakty będą musiały zweryfikować Twoje nowe klucze. Użyj tego tylko w ostateczności.</string>
   <string name="delete_selected_keys">Usuń zaznaczone klucze</string>
-  <string name="missing_presence_subscription">Brakuje subskrypcji obecności</string>
-  <string name="missing_omemo_keys">Brakuje kluczy OMEMO</string>
-  <string name="error_publish_avatar_offline">Musisz być połączony/na, aby opublikować swój awatar.</string>
+    <string name="error_publish_avatar_offline">Musisz być połączony/na, aby opublikować swój awatar.</string>
   <string name="copy_to_clipboard">Skopiuj do schowka</string>
   <string name="message_copied_to_clipboard">Wiadomość skopiowana do schowka</string>
   <string name="message">Wiadomość</string>
@@ -552,14 +528,8 @@ Pix-Art Messenger będzie wciąż ograniczał transfer danych, kiedy tylko to je
   <string name="hide_inactive_devices">Ukryj nieaktywne urządzenia</string>
   <string name="encrypting_message">Szyfrowanie wiadomości</string>
   <string name="transcoding_video">Kompresuję film</string>
-  <string name="pref_automatically_delete_messages_description">Automatycznie usuwaj z tego urządzenia wiadomości starsze niż skonfigurowany okres czasu.</string>
-  <string name="pref_automatically_delete_messages">Automatyczne usuwanie wiadomości</string>
-  <string name="not_fetching_history_retention_period">Nie pobieram wiadomości przez lokalny okres retencji</string>
-  <string name="timeout_24_hours">24 godziny</string>
-  <string name="timeout_7_days">7 dni</string>
-  <string name="timeout_30_days">30 dni</string>
-  <string name="timeout_6_months">6 miesięcy</string>
-  <string name="today">Dzisiaj</string>
+    <string name="not_fetching_history_retention_period">Nie pobieram wiadomości przez lokalny okres retencji</string>
+    <string name="today">Dzisiaj</string>
   <string name="block_jabber_id">Zablokuj Jabber ID</string>
   <string name="corresponding_conversations_closed">Odpowiadające rozmowy zostały zamknięte.</string>
   <string name="contact_blocked_past_tense">Kontakt zablokowany</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 8c8e47f42..32b84e6d4 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -93,9 +93,7 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger não é capaz de cifrar as suas mensagens porque o seu contacto não está a anunciar a sua chave pública.\n\n<small>Por favor peça ao seu contacto para configurar o OpenPGP.</small></string>
   <string name="no_pgp_keys">Não foram encontradas chaves OpenPGP</string>
   <string name="pref_general">Geral</string>
-  <string name="pref_xmpp_resource">Recurso XMPP</string>
-  <string name="pref_xmpp_resource_summary">O nome pelo qual este cliente se identifica</string>
-  <string name="pref_attachments">Anexos</string>
+    <string name="pref_attachments">Anexos</string>
   <string name="pref_notification_settings">Notificação</string>
   <string name="pref_notifications">Notificações</string>
   <string name="pref_notifications_summary">Notificar quando uma nova mensagem for recebida</string>
@@ -110,8 +108,7 @@
   <string name="openpgp_error">O OpenKeychain reportou um erro</string>
   <string name="accept">Aceitar</string>
   <string name="error">Ocorreu um erro</string>
-  <string name="pref_grant_presence_updates">Permitir atualizações de presença</string>
-  <string name="your_account">A sua conta</string>
+    <string name="your_account">A sua conta</string>
   <string name="send_presence_updates">Enviar atualizações de presença</string>
   <string name="receive_presence_updates">Receber atualizações de presença</string>
   <string name="ask_for_presence_updates">Pedir atualizações de presença</string>
@@ -147,8 +144,7 @@
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="account_settings_password">Palavra-passe</string>
   <string name="account_settings_example_jabber_id">nomedeutilizador@exemplo.com</string>
-  <string name="account_settings_confirm_password">Confirmar palavra-passe</string>
-  <string name="password">Palavra-passe</string>
+    <string name="password">Palavra-passe</string>
   <string name="invalid_jid">Esse não é um ID Jabber válido</string>
   <string name="error_out_of_memory">Memória insuficiente. A imagem é muito grande</string>
   <string name="add_phone_book_text">Deseja adicionar %s aos seus contactos?</string>
@@ -332,11 +328,7 @@
   <string name="moderated">Moderado</string>
   <string name="you_are_not_participating">Não está a participar</string>
   <string name="never">Nunca</string>
-  <string name="thirty_minutes">30 minutos</string>
-  <string name="one_hour">1 hora</string>
-  <string name="two_hours">2 horas</string>
-  <string name="eight_hours">8 horas</string>
-  <string name="until_further_notice">Até segunda ordem</string>
+    <string name="until_further_notice">Até segunda ordem</string>
   <string name="pref_input_options">Introdução</string>
   <string name="pref_enter_is_send">O enter envia</string>
   <string name="pref_enter_is_send_summary">Use o enter para enviar a mensagem</string>
@@ -360,8 +352,7 @@
   <string name="no_application_found_to_display_location">Não foi encontrada nenhuma aplicação para mostrar a localização</string>
   <string name="location">Localização</string>
   <string name="received_location">Localização recebida</string>
-  <string name="title_undo_swipe_out_conversation">Conversa fechada</string>
-  <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string>
+    <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Todos os certificados têm que ser aprovados manualmente</string>
   <string name="pref_remove_trusted_certificates_title">Remover certificados</string>
   <string name="pref_remove_trusted_certificates_summary">Apagar certificados aprovados manualmente</string>
@@ -429,15 +420,7 @@
   <string name="shared_text_with_x">Mensagem partilhada com %s</string>
   <string name="sync_with_contacts">Sincronizar com contactos</string>
   <string name="sync_with_contacts_long">A aplicação Pix-Art Messenger deseja fazer a correspondência entre a sua lista de contactos XMPP e os seus contactos para mostrar os seus nomes completos e os seus avatares.\n\nA aplicação Pix-Art Messenger irá apenas ler os seus contactos e fazer a correspondência localmente sem enviar os dados para o seu servidor.\n\nIrá agora ser-lhe pedido para dar permissão para aceder aos seus contactos.</string>
-  <string name="certificate_information">Informação do Certificado</string>
-  <string name="certificate_subject">Assunto</string>
-  <string name="certificate_issuer">Emissor</string>
-  <string name="certificate_cn">Nome Comum</string>
-  <string name="certificate_o">Organização</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Não disponível)</string>
-  <string name="certificate_not_found">Nenhum certificado encontrado</string>
-  <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
+    <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
   <string name="notify_never">Notificações desativadas</string>
   <string name="notify_paused">Notificações interrompidas</string>
   <string name="pref_picture_compression">Comprimir Imagens</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 9c6b2fd04..2e302fa5c 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -98,9 +98,7 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger nu a putut să cripteze mesajele tale deoarece contactul nu își anunță cheia publică.\n\n<small>Rugați contactul să își configureze OpenPGP.</small></string>
   <string name="no_pgp_keys">Nu am găsit chei OpenPGP</string>
   <string name="pref_general">General</string>
-  <string name="pref_xmpp_resource">Nume client XMPP</string>
-  <string name="pref_xmpp_resource_summary">Numele cu care această aplicație de identifică</string>
-  <string name="pref_attachments">Atașamente</string>
+    <string name="pref_attachments">Atașamente</string>
   <string name="pref_notification_settings">Notificare</string>
   <string name="pref_notifications">Notificări</string>
   <string name="pref_notifications_summary">Notifică atunci când este primit un mesaj nou</string>
@@ -117,9 +115,7 @@
   <string name="openpgp_error">OpenKeychain a raportat o eroare</string>
   <string name="accept">Acceptă</string>
   <string name="error">A apărut o eroare</string>
-  <string name="pref_grant_presence_updates">Acordă actualizări de prezență</string>
-  <string name="pref_grant_presence_updates_summary">Acordă și cere anticipat abonarea la actualizările de prezență pentru contactele create de dumneavoastră</string>
-  <string name="your_account">Contul tău</string>
+    <string name="your_account">Contul tău</string>
   <string name="send_presence_updates">Trimite actualizări de prezență</string>
   <string name="receive_presence_updates">Primește actualizări de prezență</string>
   <string name="ask_for_presence_updates">Cere actualizări de prezență</string>
@@ -163,8 +159,7 @@
   <string name="account_settings_jabber_id">ID-ul Jabber</string>
   <string name="account_settings_password">Parolă</string>
   <string name="account_settings_example_jabber_id">username@pix-art.de</string>
-  <string name="account_settings_confirm_password">Confirmă parola</string>
-  <string name="password">Parolă</string>
+    <string name="password">Parolă</string>
   <string name="invalid_jid">Acesta nu este un ID Jabber valabil</string>
   <string name="error_out_of_memory">Memorie epuizată. Imaginea este prea mare.</string>
   <string name="add_phone_book_text">Vreți să adăugați pe %s în lista de contacte?</string>
@@ -385,11 +380,7 @@
   <string name="modified_conference_options">Opțiuni discuție de grup modificate!</string>
   <string name="could_not_modify_conference_options">Nu s-au putut modifica opțiunile discuției de grup</string>
   <string name="never">Niciodată</string>
-  <string name="thirty_minutes">30 minute</string>
-  <string name="one_hour">O ora</string>
-  <string name="two_hours">2 ore</string>
-  <string name="eight_hours">8 ore</string>
-  <string name="until_further_notice">Până la noi ordine</string>
+    <string name="until_further_notice">Până la noi ordine</string>
   <string name="pref_input_options">Opțiuni introducere text</string>
   <string name="pref_enter_is_send">ENTER trimite</string>
   <string name="pref_enter_is_send_summary">Apasă tasta ENTER pentru a trimite mesajul</string>
@@ -415,9 +406,7 @@
   <string name="no_application_found_to_display_location">Nu s-a găsit nici o aplicație care să afișeze locația</string>
   <string name="location">Locatie</string>
   <string name="received_location">Locație primită</string>
-  <string name="title_undo_swipe_out_conversation">Conversație închisă</string>
-  <string name="title_undo_swipe_out_muc">A părăsit discuția de grup</string>
-  <string name="pref_dont_trust_system_cas_title">Nu ai încredere în CA din sistem</string>
+    <string name="pref_dont_trust_system_cas_title">Nu ai încredere în CA din sistem</string>
   <string name="pref_dont_trust_system_cas_summary">Toate certificatele trebuie aprobate manual</string>
   <string name="pref_remove_trusted_certificates_title">Înlătură certificatele</string>
   <string name="pref_remove_trusted_certificates_summary">Șterge certificatele aprobate manual</string>
@@ -449,8 +438,7 @@
   <string name="download_failed_server_not_found">Descărcare eșuată: Serverul nu a fost găsit</string>
   <string name="download_failed_file_not_found">Descărcare eșuată: Fișierul nu a fost găsit</string>
   <string name="download_failed_could_not_connect">Descărcare eșuată: Nu s-a putut realiza conexiunea cu gazda.</string>
-  <string name="elv_undo">anulează</string>
-  <string name="download_failed_could_not_write_file">Descărcare eșuată: Nu s-a putut scrie fișierul</string>
+    <string name="download_failed_could_not_write_file">Descărcare eșuată: Nu s-a putut scrie fișierul</string>
   <string name="remind_later">mai târziu</string>
   <string name="update">actualizează</string>
   <string name="account_status_tor_unavailable">Rețeaua Tor nu este disponibilă</string>
@@ -500,16 +488,7 @@
   <string name="shared_text_with_x">Partajează textul cu %s</string>
   <string name="sync_with_contacts">Sincronizează cu contactele</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger dorește să potrivească lista de contacte XMPP cu cea din dispozitiv pentru a putea afișa numele lor complete și avatarele.\n\nPix-Art Messenger doar va citi și potrivi local fără să le încarce pe vreun server.\n\nUrmează să fiți întrebați dacă doriți să permiteți accesul la contacte.</string>
-  <string name="certificate_information">Informații despre certificat</string>
-  <string name="certificate_subject">Subiect</string>
-  <string name="certificate_issuer">
-Emitent</string>
-  <string name="certificate_cn">Nume comun</string>
-  <string name="certificate_o">Organizatie</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Indisponibil)</string>
-  <string name="certificate_not_found">Certificat inexistent</string>
-  <string name="notify_on_all_messages">Notifică la toate mesajele</string>
+    <string name="notify_on_all_messages">Notifică la toate mesajele</string>
   <string name="notify_only_when_highlighted">Notifică doar atunci când cineva vă menționează numele</string>
   <string name="notify_never">Notificări dezactivate</string>
   <string name="notify_paused">Notificări suspendate</string>
@@ -545,10 +524,8 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="pick_your_username">Alege un nume de utilizator</string>
   <string name="pref_manually_change_presence">Schimbă manual setarea de prezență</string>
   <string name="pref_manually_change_presence_summary">Atinge-ți avatarul pentru a-ți schimba starea de prezență</string>
-  <string name="change_presence">Setare prezență</string>
-  <string name="status_message">Mesaj de stare</string>
-  <string name="all_accounts_on_this_device">Setează pentru toate conturile de pe acest dispozitiv</string>
-  <string name="presence_chat">Disponibil/ă pentru conversație</string>
+    <string name="status_message">Mesaj de stare</string>
+    <string name="presence_chat">Disponibil/ă pentru conversație</string>
   <string name="presence_online">Conectat/ă</string>
   <string name="presence_away">Plecat/ă</string>
   <string name="presence_xa">Indisponibil/ă</string>
@@ -562,8 +539,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="registration_please_wait">Înregistrare eșuată: Încercați din nou mai târziu</string>
   <string name="registration_password_too_weak">Înregistrare eșuată: Parolă nesigură</string>
   <string name="create_conference">Creează discuție de grup</string>
-  <string name="join_or_create_conference">Alătură-te sau creează discuție de grup</string>
-  <string name="conference_subject">Subiect</string>
+    <string name="conference_subject">Subiect</string>
   <string name="choose_participants">Alege participanți</string>
   <string name="creating_conference">Se creează discuția de grup...</string>
   <string name="invite_again">Trimite din nou invitația</string>
@@ -579,17 +555,11 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="no_permission_to_access_x">Nu există permisiunea de a accesa %s</string>
   <string name="remote_server_not_found">Serverul nu a fost găsit</string>
   <string name="unable_to_update_account">Nu se poate actualiza contul</string>
-  <string name="missing_presence_subscription_with_x">Lipsește abonarea de la actualizările de prezență cu %s.</string>
-  <string name="missing_keys_from_x">Cheie OMEMO lipsă de la %s.</string>
-  <string name="wrong_conference_configuration">Aceasta este o discuție de grup care nu este privată și nu este anonimă.</string>
-  <string name="this_conference_has_no_members">Discuția de grup nu are nici un membru.</string>
-  <string name="report_jid_as_spammer">Raportează că această identitate trimite mesaje nedorite.</string>
+    <string name="report_jid_as_spammer">Raportează că această identitate trimite mesaje nedorite.</string>
   <string name="pref_delete_omemo_identities">Șterge identitățile OEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regenerează cheile personale OMEMO. Toate contactele vor fi obligate să verifice cheile dumneavoastră din nou. Folosește asta doar ca o ultimă opțiune.</string>
   <string name="delete_selected_keys">Șterge cheile selectate</string>
-  <string name="missing_presence_subscription">Lipsește abonarea de la actualizările de prezență</string>
-  <string name="missing_omemo_keys">Chei OMEMO lipsă</string>
-  <string name="error_publish_avatar_offline">Pentru a putea publica avatarul trebuie să existe o conexiune.</string>
+    <string name="error_publish_avatar_offline">Pentru a putea publica avatarul trebuie să existe o conexiune.</string>
   <string name="copy_to_clipboard">Copiază în clipboard</string>
   <string name="message_copied_to_clipboard">Mesaj copiat în clipboard</string>
   <string name="message">Mesaj</string>
@@ -622,14 +592,8 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="hide_inactive_devices">Ascunde dispozitivele inactive</string>
   <string name="encrypting_message">Mesajul se criptează</string>
   <string name="transcoding_video">Se comprimă clipul video</string>
-  <string name="pref_automatically_delete_messages_description">De pe acest dispozitiv se vor șterge dacă sunt mai vechi de perioada selectată.</string>
-  <string name="pref_automatically_delete_messages">Ștergerea automată a mesajelor</string>
-  <string name="not_fetching_history_retention_period">Politica de retenție locală împiedică descărcarea altor mesaje.</string>
-  <string name="timeout_24_hours">24 ore</string>
-  <string name="timeout_7_days">7 zile</string>
-  <string name="timeout_30_days">30 zile</string>
-  <string name="timeout_6_months">6 luni</string>
-  <string name="today">Azi</string>
+    <string name="not_fetching_history_retention_period">Politica de retenție locală împiedică descărcarea altor mesaje.</string>
+    <string name="today">Azi</string>
   <string name="block_jabber_id">Blochează ID Jabber</string>
   <string name="corresponding_conversations_closed">Conversațiile corespunzătoare au fost închise</string>
   <string name="contact_blocked_past_tense">Contact blocat.</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 0bfb46e99..716018701 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -93,9 +93,7 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger kan inte kryptera ditt meddelande eftersom din kontakt inte annonserar sin publika nyckel.\n\n<small>Be din kontakt att sätta upp OpenPGP.</small></string>
   <string name="no_pgp_keys">Inga OpenPGP-nycklar funna</string>
   <string name="pref_general">Generellt</string>
-  <string name="pref_xmpp_resource">XMPP-resurs</string>
-  <string name="pref_xmpp_resource_summary">Namnet klienten identifierar sig med</string>
-  <string name="pref_attachments">Bifogningar</string>
+    <string name="pref_attachments">Bifogningar</string>
   <string name="pref_notification_settings">Notifiering</string>
   <string name="pref_notifications">Notifieringar</string>
   <string name="pref_notifications_summary">Notifiera när meddelande tagits emot</string>
@@ -111,9 +109,7 @@
   <string name="openpgp_error">OpenKeychain rapporterade ett fel</string>
   <string name="accept">Acceptera</string>
   <string name="error">Ett fel har inträffat</string>
-  <string name="pref_grant_presence_updates">Tillåt tillänglighetsuppdateringar</string>
-  <string name="pref_grant_presence_updates_summary">Tillåt och be om abonnemangsbegäran i förväg för kontakter du har skapat</string>
-  <string name="your_account">Ditt konto</string>
+    <string name="your_account">Ditt konto</string>
   <string name="send_presence_updates">Skicka tillgänglighetsuppdatering</string>
   <string name="receive_presence_updates">Ta emot tillgänglighetsuppdateringar</string>
   <string name="ask_for_presence_updates">Be om tillgänglighetsuppdateringar</string>
@@ -155,8 +151,7 @@
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="account_settings_password">Lösenord</string>
   <string name="account_settings_example_jabber_id">användarnamn@exempel.se</string>
-  <string name="account_settings_confirm_password">Bekräfta lösenord</string>
-  <string name="password">Lösenord</string>
+    <string name="password">Lösenord</string>
   <string name="invalid_jid">Detta är inte ett korrekt Jabber-ID</string>
   <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
   <string name="add_phone_book_text">Vill du lägga till %s i din enhets kontakter?</string>
@@ -350,11 +345,7 @@
   <string name="moderated">Modererad</string>
   <string name="you_are_not_participating">Du deltar ej</string>
   <string name="never">Aldrig</string>
-  <string name="thirty_minutes">30 minuter</string>
-  <string name="one_hour">1 timme</string>
-  <string name="two_hours">2 timmar</string>
-  <string name="eight_hours">8 timmar</string>
-  <string name="until_further_notice">Tills vidare</string>
+    <string name="until_further_notice">Tills vidare</string>
   <string name="pref_input_options">Input</string>
   <string name="pref_enter_is_send">Skicka med enter</string>
   <string name="pref_enter_is_send_summary">Använd enter-knappen för att skicka meddelande</string>
@@ -379,8 +370,7 @@
   <string name="no_application_found_to_display_location">Kunde inte hitta applikation för att visa position</string>
   <string name="location">Position</string>
   <string name="received_location">Mottog position</string>
-  <string name="title_undo_swipe_out_conversation">Konversation stängd</string>
-  <string name="pref_dont_trust_system_cas_title">Lita inte på systemets CAs</string>
+    <string name="pref_dont_trust_system_cas_title">Lita inte på systemets CAs</string>
   <string name="pref_dont_trust_system_cas_summary">Alla certifikat måste manuellt godkännas</string>
   <string name="pref_remove_trusted_certificates_title">Ta bort certifikat</string>
   <string name="pref_remove_trusted_certificates_summary">Ta bort manuellt accepterade certifikat</string>
@@ -452,15 +442,7 @@
   <string name="shared_text_with_x">Delade text med %s</string>
   <string name="sync_with_contacts">Synkronisera med kontakter</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger vill matcha din XMPP-kontaktlista med dina kontakter för att visa deras namn och profilbild.\n\nPix-Art Messenger läser endast dina kontakter för att matcha dem lokalt utan att ladda upp dem till din server.\n\nDu kommer nu få frågan om tillåtelse för att använda kontakterna.</string>
-  <string name="certificate_information">Certifikatinformation</string>
-  <string name="certificate_subject">Ämne</string>
-  <string name="certificate_issuer">Utfärdare</string>
-  <string name="certificate_cn">Common Name</string>
-  <string name="certificate_o">Organisation</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Ej tillgänglig)</string>
-  <string name="certificate_not_found">Inget certifikat funnet</string>
-  <string name="notify_on_all_messages">Notifiera för alla meddelanden</string>
+    <string name="notify_on_all_messages">Notifiera för alla meddelanden</string>
   <string name="notify_never">Notifieringar deaktiverade</string>
   <string name="notify_paused">Notifieringar pausade</string>
   <string name="pref_picture_compression">Komprimera bilder</string>
@@ -485,10 +467,8 @@
   <string name="pick_your_username">Välj användarnamn</string>
   <string name="pref_manually_change_presence">Ändra tillgänglighet manuellt</string>
   <string name="pref_manually_change_presence_summary">Tryck på din avatarbild för att ändra tillgänglighet</string>
-  <string name="change_presence">Ändra tillgänglighet</string>
-  <string name="status_message">Statusmeddelande</string>
-  <string name="all_accounts_on_this_device">Använd för alla konton på den här enheten</string>
-  <string name="presence_chat">Tillgänglig</string>
+    <string name="status_message">Statusmeddelande</string>
+    <string name="presence_chat">Tillgänglig</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Borta</string>
   <string name="presence_xa">Ej tillgänglig</string>
@@ -513,15 +493,11 @@
   <string name="no_permission_to_access_x">Saknar rättigheter för access till %s</string>
   <string name="remote_server_not_found">Fjärrserver hittas inte</string>
   <string name="unable_to_update_account">Kan inte uppdatera konto</string>
-  <string name="missing_presence_subscription_with_x">Saknar tillgänglighetsuppdateringar från %s.</string>
-  <string name="missing_keys_from_x">Saknar OMEMO nyckel från %s.</string>
-  <string name="report_jid_as_spammer">Rapportera detta JID för skickande av oönskade meddelanden.</string>
+    <string name="report_jid_as_spammer">Rapportera detta JID för skickande av oönskade meddelanden.</string>
   <string name="pref_delete_omemo_identities">Ta bort OMEMO identiteter</string>
   <string name="pref_delete_omemo_identities_summary">Regenerera din OMEMO-nyckel. Alla dina kontakter kommer att behöva verifiera dig igen. Använd detta endast som en sista utväg.</string>
   <string name="delete_selected_keys">Ta bort valda nycklar</string>
-  <string name="missing_presence_subscription">Saknar tillgänglighetsuppdateringar</string>
-  <string name="missing_omemo_keys">Saknar OMEMO nycklar</string>
-  <string name="error_publish_avatar_offline">Du måste vara ansluten för att publicera din avatarbild</string>
+    <string name="error_publish_avatar_offline">Du måste vara ansluten för att publicera din avatarbild</string>
   <string name="quote">Citera</string>
   <string name="show_error_message">Visa felmeddelande</string>
   <string name="error_message">Felmeddelande</string>
@@ -550,14 +526,8 @@
   <string name="show_inactive_devices">Visa inaktiva enheter</string>
   <string name="hide_inactive_devices">Göm inaktiva enheter</string>
   <string name="encrypting_message">Krypterar meddelande</string>
-  <string name="pref_automatically_delete_messages_description">Ta automatiskt bort meddelanden från denna enhet som är äldre än den konfigurerade tidsramen.</string>
-  <string name="pref_automatically_delete_messages">Automatisk borttagning av meddelanden</string>
-  <string name="not_fetching_history_retention_period">Hämtar inte meddelanden på grund av inställningen för borttagning av gamla meddelanden.</string>
-  <string name="timeout_24_hours">24 timmar</string>
-  <string name="timeout_7_days">7 dagar</string>
-  <string name="timeout_30_days">30 dagar</string>
-  <string name="timeout_6_months">6 månader</string>
-  <string name="block_jabber_id">Blockera Jabber-ID</string>
+    <string name="not_fetching_history_retention_period">Hämtar inte meddelanden på grund av inställningen för borttagning av gamla meddelanden.</string>
+    <string name="block_jabber_id">Blockera Jabber-ID</string>
   <string name="corresponding_conversations_closed">Motsvarande konversationer är stängda.</string>
   <string name="contact_blocked_past_tense">Kontakt blockerad.</string>
   <string name="pref_notifications_from_strangers">Notifieringar från främlingar</string>
diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml
index 934591a45..206161e88 100644
--- a/src/main/res/values-tl/strings.xml
+++ b/src/main/res/values-tl/strings.xml
@@ -96,9 +96,7 @@
   <string name="no_pgp_key">Walang OpenPGP key ang nakita</string>
   <string name="no_pgp_keys">Walang OpenPGP keys ang nakita</string>
   <string name="pref_general">Pangkalahatan</string>
-  <string name="pref_xmpp_resource">Pinanggalingan ng XMPP</string>
-  <string name="pref_xmpp_resource_summary">Ang pangalan ng kliyente kinikilala ang sarili nito na</string>
-  <string name="pref_accept_files_wifi">Natanggap ang mga payl sa koneksyon sa waypay</string>
+    <string name="pref_accept_files_wifi">Natanggap ang mga payl sa koneksyon sa waypay</string>
   <string name="pref_accept_files_summary_wifi">Kapag naka konek kana sa waypi ay kusang natatanggap ang mga payl na mas maliit sa…</string>
   <string name="pref_notification_settings">Notipikasyon</string>
   <string name="pref_notifications">Mga notipikasyon</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 75b84374c..5ec19b82b 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -98,8 +98,6 @@
   <string name="contact_has_no_pgp_key">Pix-Art Messenger, mesajlarınızı şifreleyemiyor; çünkü kişi sizin veya onun genel anahtarınızı ilan etmiyor.\n\n<small>Lütfen iletişim bilgilerinizden OpenPGP\'yi kurmasını isteyin.</small></string>
   <string name="no_pgp_keys">OpenPGP anahtarları bulunamadı</string>
   <string name="pref_general">Genel</string>
-  <string name="pref_xmpp_resource">XMPP kaynağı</string>
-  <string name="pref_xmpp_resource_summary">Bu müşterinin kendini tanımladığı ad</string>
   <string name="pref_accept_files_wifi">WiFi bağlantılarındaki dosyaları kabul et</string>
   <string name="pref_accept_files_summary_wifi">Wifi\'ye bağlandığında otomatik olarak…dan daha küçük dosyaları kabul et…</string>
   <string name="pref_accept_files_mobile">Mobil bağlantılarda gelen dosyaları kabul et</string>
@@ -124,8 +122,6 @@
   <string name="openpgp_error">OpenKeychain bir hata raporladı</string>
   <string name="accept">Kabul et</string>
   <string name="error">Bir hata oluştu</string>
-  <string name="pref_grant_presence_updates">Durum güncellemelerini ver</string>
-  <string name="pref_grant_presence_updates_summary">Oluşturduğunuz kişilere önceden abone olma ve üyelik aboneliklerini talep etme</string>
   <string name="your_account">Sizin hesabınız</string>
   <string name="send_presence_updates">Durum güncellemelerini gönder</string>
   <string name="receive_presence_updates">Durum güncellemelerini alın</string>
@@ -171,7 +167,6 @@
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="account_settings_password">Şifre</string>
   <string name="account_settings_example_jabber_id">kullanıcıadı@pix-art.de</string>
-  <string name="account_settings_confirm_password">Şifreyi onayla</string>
   <string name="password">Parola</string>
   <string name="confirm_password">Parolayı onayla</string>
   <string name="passwords_do_not_match">Parolalar uyuşmuyor</string>
@@ -397,10 +392,6 @@
   <string name="modified_conference_options">Grup sohbeti seçeneklerini düzenle!</string>
   <string name="could_not_modify_conference_options">Grup sohbeti seçenekleri değiştirilemedi</string>
   <string name="never">Hiçbir zaman</string>
-  <string name="thirty_minutes">30 dakika</string>
-  <string name="one_hour">1 saat</string>
-  <string name="two_hours">2 saat</string>
-  <string name="eight_hours">8 saat</string>
   <string name="until_further_notice">Yeni bildiriye kadar</string>
   <string name="pref_input_options">Giriş</string>
   <string name="pref_enter_is_send">Giriş gönder</string>
@@ -427,8 +418,6 @@
   <string name="no_application_found_to_display_location">Konum gösterecek hiç bir uygulama bulunamadı</string>
   <string name="location">Konum</string>
   <string name="received_location">Alınan konum</string>
-  <string name="title_undo_swipe_out_conversation">Sohbet kapandı</string>
-  <string name="title_undo_swipe_out_muc">Sohbet grubundan ayrıl</string>
   <string name="pref_dont_trust_system_cas_title">Sistem CAs\'larına güvenme</string>
   <string name="pref_dont_trust_system_cas_summary">Tüm sertifikalar manuel onaylanmalıdır</string>
   <string name="pref_remove_trusted_certificates_title">Sertifikaları kaldır</string>
@@ -459,7 +448,6 @@
   <string name="download_failed_server_not_found">İndirileme başarısız oldu: Sunucu bulunamadı</string>
   <string name="download_failed_file_not_found">İndirileme başarısız oldu:: Dosya bulunamadı</string>
   <string name="download_failed_could_not_connect">İndirme başarısız: Ana bilgisayara bağlanılamadı</string>
-  <string name="elv_undo">geri al</string>
   <string name="download_failed_could_not_write_file">İndirme başarısız: Dosya yazılamadı</string>
   <string name="pref_use_white_background">Beyaz arka planı kullan</string>
   <string name="pref_use_white_background_summary">Gönderilen mesajları siyah arka planda siyah metin olarak göster</string>
@@ -517,14 +505,6 @@
   <string name="shared_text_with_x">%s ile paylaşılan metin</string>
   <string name="sync_with_contacts">Bağlantıyı senkronize et</string>
   <string name="sync_with_contacts_long">Pix-Art Messenger, tam adlarını ve avatarlarını göstermek için XMPP listenizi kişilerinizle eşleştirmek istiyor\n\nPix-Art Messenger yalnızca kişilerinizi okuyacak ve bunları sunucunuza yüklemeden yerel olarak eşleştirecektir.\n\nKişilerinize erişmek için izin vermeniz istenecektir.</string>
-  <string name="certificate_information">Sertifika Bilgisi</string>
-  <string name="certificate_subject">Konu</string>
-  <string name="certificate_issuer">Yayınlayan</string>
-  <string name="certificate_cn">Ortak İsim</string>
-  <string name="certificate_o">Organizasyon</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Mevcut değil)</string>
-  <string name="certificate_not_found">Sertifika bulunamadı</string>
   <string name="notify_on_all_messages">Tüm mesajları bildir</string>
   <string name="notify_only_when_highlighted">Yalnızca bahsedildiğinde bildir</string>
   <string name="notify_never">Bildirimler devre dışı</string>
@@ -541,7 +521,6 @@
   <string name="battery_optimizations_enabled_explained">Cihazınız, Pix-Art Messenger\'da, bildirimleri gecikmeli hatta mesaj kaybına yol açabilecek bazı ağır pil optimizasyonları yapıyor. \n Bunları devre dışı bırakmanız önerilir.</string>
   <string name="battery_optimizations_enabled_dialog">Cihazınız, Pix-Art Messenger\'da, bildirimleri gecikmeli hatta mesaj kaybına yol açabilecek bazı ağır pil optimizasyonları yapıyor. \n\nBu işlemi devre dışı bırakmanız istendi.</string>
   <string name="install_from_unknown_sources_disabled">Bilinmeyen açık kaynaklardan yüklemeleri devre dışı bırak</string>
-  <string name="install_from_unknown_sources_disabled_explained">Cihazınız, bilinmeyen kaynaklardan gelen uygulama yüklemelerine izin vermeyecek şekilde yapılandırıldı; bu da, uygulama güncelleyicisinde sorunlara neden oluyor. \n Bilinmeyen kaynaklardan yüklemelere izin verilmesi önerilir.</string>
   <string name="install_from_unknown_sources_disabled_dialog">Cihazınız, Google PlayStore dışında bilinmeyen kaynaklardan uygulama yüklemelerine izin vermeyecek şekilde yapılandırıldı. Bu, uygulama güncelleyicisinde sorunlara neden olur. \n\n Bundan sonra bilinmeyen kaynaklardan uygulama yüklemelerine izin vermeniz istenecektir.</string>
   <string name="disable">Devre dışı</string>
   <string name="selection_too_large">Seçilen alan çok büyük</string>
@@ -569,9 +548,7 @@
   <string name="pick_your_username">Kullanıcı adınızı seçin</string>
   <string name="pref_manually_change_presence">Manuel olarak durumu değiştir</string>
   <string name="pref_manually_change_presence_summary">Hesabınızdaki durumu değiştirin</string>
-  <string name="change_presence">Durum Değiştir</string>
   <string name="status_message">Durum mesajı</string>
-  <string name="all_accounts_on_this_device">Bu cihazdaki tüm hesapları ayarla</string>
   <string name="presence_chat">Sohbet için Ücretsiz</string>
   <string name="presence_online">Çevrimiçi</string>
   <string name="presence_away">Uzakta</string>
@@ -579,7 +556,6 @@
   <string name="presence_dnd">Meşgul</string>
   <string name="secure_password_generated">Güvenli bir parola oluşturuldu</string>
   <string name="device_does_not_support_battery_op">Cihazınız, pil optimizasyonunun devre dışı bırakılmasını desteklemez</string>
-  <string name="device_does_not_support_unknown_source_op">Cihazınız, bilinmeyen kaynaklardan gelen uygulama yüklemelerine izin vermeyi desteklemez</string>
   <string name="share">Paylaş</string>
   <string name="share_location">Konumu paylaş</string>
   <string name="location_sharing_disabled">Konum paylaşımı ayarlarda devre dışı bırakıldı</string>
@@ -590,7 +566,6 @@
   <string name="registration_please_wait">Kayıt başarısız: Daha sonra tekrar deneyin</string>
   <string name="registration_password_too_weak">Kayıt başarısız oldu: Şifre çok zayıf</string>
   <string name="create_conference">Grup sohbeti oluştur</string>
-  <string name="join_or_create_conference">Grup sohbeti oluştur veya katıl</string>
   <string name="conference_subject">Konu</string>
   <string name="choose_participants">Katılımcıları seç</string>
   <string name="creating_conference">Grup sohbeti oluşturuluyor…</string>
@@ -605,7 +580,6 @@
   <string name="request_permissions_message">Pix-Art Messenger birkaç izin vermenizi isteyecektir. Tüm bu izinlerin bu mesajlaşma aracının tüm özelliklerine sahip olmasına izin vermeniz önemlidir. Bu izinlerden herhangi birini reddederseniz, uygulama kendiliğinden kapanacaktır.</string>
   <string name="request_permissions_message_again">Pix-Art Messenger için gerekli bazı veya tüm izinleri reddettiniz. Ayarlara atlamak ve bu izinlere izin vermek ister misiniz? Bu izinlerden herhangi birine siz karar verirseniz, uygulama kendiliğinden kapanacaktır.</string>
   <string name="unable_to_connect_to_keychain">OpenKeyChain\'e bağlanılamıyor</string>
-  <string name="no_permission">Pix-Art Messenger\'ın izinleri yok</string>
   <string name="send_image">Resim gönder?</string>
   <string name="this_device_is_no_longer_in_use">Bu cihaz artık kullanılmıyor</string>
   <string name="import_canceled">İçe aktarım iptal edildi</string>
@@ -621,22 +595,15 @@
   <string name="me">Ben</string>
   <string name="contact_asks_for_presence_subscription">Bağlantı aboneliği olup olmadığını öğrenmek ister misiniz</string>
   <string name="allow">İzin ver</string>
-  <string name="attach_choose_video">Video seç</string>
   <string name="no_permission_to_access_x">%s\'a erişim izni yok</string>
   <string name="remote_server_not_found">Uzak sunucu bulunamadı</string>
   <string name="error_file_corrupt">Dosya bozuk gibi görünüyor.</string>
   <string name="unable_to_update_account">Hesap güncellenemiyor</string>
-  <string name="missing_presence_subscription_with_x">%s ile mevcut abonelik eksik.</string>
-  <string name="missing_keys_from_x">OMEMO anahtarlar %s\'den eksik.</string>
-  <string name="wrong_conference_configuration">Bu gizli, gizli olmayan grup sohbeti değildir.</string>
-  <string name="this_conference_has_no_members">Bu grup sohbetinde hiç üye yok.</string>
   <string name="report_jid_as_spammer">Bu JID\'i istenmeyen mesajlar gönderdiğini bildirin.</string>
   <string name="create_issue">Bir sorun bildir</string>
   <string name="pref_delete_omemo_identities">OMEMO kimliklerini sil</string>
   <string name="pref_delete_omemo_identities_summary">OMEMO anahtarlarınızı yeniden oluşturun. Tüm kişilerin seni tekrar doğrulaması gerekecek. Bunu son çözüm olarak kullanın.</string>
   <string name="delete_selected_keys">Seçilen anahtarları sil</string>
-  <string name="missing_presence_subscription">Durum aboneliği eksik</string>
-  <string name="missing_omemo_keys">Eksik OMEMO anahtarları</string>
   <string name="error_publish_avatar_offline">Avatarınızı yayınlamak için bağlanmanız gerekir.</string>
   <string name="copy_to_clipboard">Panoya kopyala</string>
   <string name="message_copied_to_clipboard">İleti panoya kopyalandı</string>
@@ -677,14 +644,7 @@
   <string name="reply">Yanıtla</string>
   <string name="encrypting_message">Mesajı şifrele</string>
   <string name="transcoding_video">Video sıkıştırılıyor</string>
-  <string name="pref_automatically_delete_messages_description">Bu cihazdan, yapılandırılmış zaman aralığından olan eski mesajları otomatik olarak silin.</string>
-  <string name="pref_automatically_delete_messages">Otomatik ileti silme</string>
   <string name="not_fetching_history_retention_period">Yerel koruma süresi nedeniyle ileti getirilemiyor.</string>
-  <string name="timeout_24_hours">24 saat</string>
-  <string name="timeout_7_days">7 gün</string>
-  <string name="timeout_30_days">30 gün</string>
-  <string name="timeout_6_months">6 Ay</string>
-  <string name="timeout_12_months">12 Ay</string>
   <string name="today">Bugün</string>
   <string name="pref_use_max_brightness_summary">Videoları veya resimleri tam ekran izlerken maksimum parlaklığa geçin.</string>
   <string name="pref_use_max_brightness">En yüksek parlaklık</string>
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 68666ddcc..062f29b48 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -16,13 +16,6 @@
         <item>5242880</item>
         <item>10485760</item>
     </string-array>
-    <string-array name="mute_options_descriptions">
-        <item>@string/thirty_minutes</item>
-        <item>@string/one_hour</item>
-        <item>@string/two_hours</item>
-        <item>@string/eight_hours</item>
-        <item>@string/until_further_notice</item>
-    </string-array>
 
     <integer-array name="mute_options_durations">
         <item>1800</item>
@@ -80,14 +73,6 @@
         <item>@string/always</item>
     </string-array>
 
-    <string-array name="presence_show_options">
-        <item>@string/presence_chat</item>
-        <item>@string/presence_online</item>
-        <item>@string/presence_away</item>
-        <item>@string/presence_xa</item>
-        <item>@string/presence_dnd</item>
-    </string-array>
-
     <integer-array name="automatic_message_deletion_values">
         <item>0</item>
         <item>86400</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e63bea6ae..4ccdd2b78 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -166,7 +166,6 @@
     <string name="account_settings_jabber_id">Jabber-ID</string>
     <string name="account_settings_password">Password</string>
     <string name="account_settings_example_jabber_id">username@pix-art.de</string>
-    <string name="account_settings_confirm_password">Confirm password</string>
     <string name="password">Password</string>
     <string name="confirm_password">Confirm password</string>
     <string name="passwords_do_not_match">Passwords do not match</string>
@@ -393,10 +392,6 @@
     <string name="modified_conference_options">Modified group chat options!</string>
     <string name="could_not_modify_conference_options">Could not modify group chat options</string>
     <string name="never">Never</string>
-    <string name="thirty_minutes">30 minutes</string>
-    <string name="one_hour">1 hour</string>
-    <string name="two_hours">2 hours</string>
-    <string name="eight_hours">8 hours</string>
     <string name="until_further_notice">Until further notice</string>
     <string name="pref_input_options">Input</string>
     <string name="pref_enter_is_send">Enter is send</string>
@@ -510,14 +505,6 @@
     <string name="shared_text_with_x">Shared text with %s</string>
     <string name="sync_with_contacts">Synchronize with contacts</string>
     <string name="sync_with_contacts_long">Pix-Art Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nPix-Art Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string>
-    <string name="certificate_information">Certificate Information</string>
-    <string name="certificate_subject">Subject</string>
-    <string name="certificate_issuer">Issuer</string>
-    <string name="certificate_cn">Common Name</string>
-    <string name="certificate_o">Organization</string>
-    <string name="certificate_sha1">SHA-1</string>
-    <string name="certicate_info_not_available">(Not available)</string>
-    <string name="certificate_not_found">No certificate found</string>
     <string name="notify_on_all_messages">Notify on all messages</string>
     <string name="notify_only_when_highlighted">Notify only when mentioned</string>
     <string name="notify_never">Notifications disabled</string>
@@ -534,7 +521,6 @@
     <string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string>
     <string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
     <string name="install_from_unknown_sources_disabled">Install from unknown sources disabled</string>
-    <string name="install_from_unknown_sources_disabled_explained">Your device is configured to not allow app installs from unknown sources, which causes problems with the in app updater.\nIt is recommended to allow installs from unknown sources.</string>
     <string name="install_from_unknown_sources_disabled_dialog">Your device is configured to not allow app installs from unknown sources except from Google PlayStore. This will cause problems with the in app updater.\n\nYou will now be asked to allow app installs from unknown sources.</string>
     <string name="disable">Disable</string>
     <string name="selection_too_large">The selected area is too large</string>
@@ -562,9 +548,7 @@
     <string name="pick_your_username">Choose your username</string>
     <string name="pref_manually_change_presence">Manage availability manually</string>
     <string name="pref_manually_change_presence_summary">Set your availability when editing your status message.</string>
-    <string name="change_presence">Change Presence</string>
     <string name="status_message">Status message</string>
-    <string name="all_accounts_on_this_device">Set for all accounts on this device</string>
     <string name="presence_chat">Free for Chat</string>
     <string name="presence_online">Online</string>
     <string name="presence_away">Away</string>
@@ -572,7 +556,6 @@
     <string name="presence_dnd">Busy</string>
     <string name="secure_password_generated">A secure password has been generated</string>
     <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string>
-    <string name="device_does_not_support_unknown_source_op">Your device does not support allowing app installs from unknown source</string>
     <string name="share">Share</string>
     <string name="share_location">Share location</string>
     <string name="location_sharing_disabled">Location sharing is disabled in settings</string>
@@ -583,7 +566,6 @@
     <string name="registration_please_wait">Registration failed: Try again later</string>
     <string name="registration_password_too_weak">Registration failed: Password too weak</string>
     <string name="create_conference">Create group chat</string>
-    <string name="join_or_create_conference">Join or create group chat</string>
     <string name="conference_subject">Subject</string>
     <string name="choose_participants">Choose participants</string>
     <string name="creating_conference">Creating group chat…</string>
@@ -598,7 +580,6 @@
     <string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string>
     <string name="request_permissions_message_again">You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself.</string>
     <string name="unable_to_connect_to_keychain">Unable to connect to OpenKeychain</string>
-    <string name="no_permission">Pix-Art Messenger has no permissions</string>
     <string name="send_image">Send image?</string>
     <string name="this_device_is_no_longer_in_use">This device is no longer in use</string>
     <string name="import_canceled">Import canceled</string>
@@ -614,22 +595,15 @@
     <string name="me">Me</string>
     <string name="contact_asks_for_presence_subscription">Contact asks for presence subscription</string>
     <string name="allow">Allow</string>
-    <string name="attach_choose_video">Choose video</string>
     <string name="no_permission_to_access_x">No permission to access %s</string>
     <string name="remote_server_not_found">Remote server not found</string>
     <string name="error_file_corrupt">This file seems to be corrupt.</string>
     <string name="unable_to_update_account">Unable to update account</string>
-    <string name="missing_presence_subscription_with_x">Missing presence subscription with %s.</string>
-    <string name="missing_keys_from_x">Missing OMEMO keys from %s.</string>
-    <string name="wrong_conference_configuration">This is not a private, non-anonymous group chat.</string>
-    <string name="this_conference_has_no_members">There are no members in this group chat.</string>
     <string name="report_jid_as_spammer">Report this JID as sending unwanted messages.</string>
     <string name="create_issue">Report an issue</string>
     <string name="pref_delete_omemo_identities">Delete OMEMO identities</string>
     <string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string>
     <string name="delete_selected_keys">Delete selected keys</string>
-    <string name="missing_presence_subscription">Missing presence subscription</string>
-    <string name="missing_omemo_keys">Missing OMEMO keys</string>
     <string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string>
     <string name="copy_to_clipboard">Copy to clipboard</string>
     <string name="message_copied_to_clipboard">Message copied to clipboard</string>
@@ -670,8 +644,6 @@
     <string name="reply">Reply</string>
     <string name="encrypting_message">Encrypting message</string>
     <string name="transcoding_video">Compressing video</string>
-    <string name="pref_automatically_delete_messages_description">Automatically delete messages from this device that are older than the configured time frame.</string>
-    <string name="pref_automatically_delete_messages">Automatic message deletion</string>
     <string name="not_fetching_history_retention_period">Not fetching messages due to local retention period.</string>
     <plurals name="seconds">
         <item quantity="one">%d second</item>
@@ -776,12 +748,10 @@
     <string name="pref_enable_multi_accounts_summary">You want to use multiple accounts, so you have to set a password for daily backups.</string>
     <string name="mtm_accept_cert">Accept Unknown Certificate?</string>
     <string name="mtm_trust_anchor">The server certificate is not signed by a known Certificate Authority.</string>
-    <string name="mtm_cert_expired">The server certificate is expired.</string>
     <string name="mtm_accept_servername">Accept Mismatching Server Name?</string>
     <string name="mtm_hostname_mismatch">Server could not authenticate as \"%s\". The certificate is only valid for:</string>
     <string name="mtm_connect_anyway">Do you want to connect anyway?</string>
     <string name="mtm_cert_details">Certificate details:</string>
-    <string name="mtm_notification">Certificate Verification</string>
     <string name="once">Once</string>
     <string name="theme">Theme</string>
     <string name="qr_code_scanner_needs_access_to_camera">The QR code scanner needs access to the camera</string>