diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
index dc52d3ede..4226f3f4a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
@@ -235,9 +235,9 @@ class Database {
     val allowEncryptionAlgorithmModification: Boolean
         get() = availableEncryptionAlgorithms.size > 1
 
-    fun getEncryptionAlgorithmName(resources: Resources): String {
-        return mDatabaseKDB?.encryptionAlgorithm?.getName(resources)
-                ?: mDatabaseKDBX?.encryptionAlgorithm?.getName(resources)
+    fun getEncryptionAlgorithmName(): String {
+        return mDatabaseKDB?.encryptionAlgorithm?.toString()
+                ?: mDatabaseKDBX?.encryptionAlgorithm?.toString()
                 ?: ""
     }
 
@@ -272,8 +272,8 @@ class Database {
             }
         }
 
-    fun getKeyDerivationName(resources: Resources): String {
-        return kdfEngine?.getName(resources) ?: ""
+    fun getKeyDerivationName(): String {
+        return kdfEngine?.toString() ?: ""
     }
 
     var numberKeyEncryptionRounds: Long
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/element/database/CompressionAlgorithm.kt b/app/src/main/java/com/kunzisoft/keepass/database/element/database/CompressionAlgorithm.kt
index 2d9d67cfa..b3c193dbd 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/element/database/CompressionAlgorithm.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/element/database/CompressionAlgorithm.kt
@@ -23,7 +23,7 @@ import android.content.res.Resources
 import android.os.Parcel
 import android.os.Parcelable
 import com.kunzisoft.keepass.R
-import com.kunzisoft.encrypt.ObjectNameResource
+import com.kunzisoft.keepass.utils.ObjectNameResource
 import com.kunzisoft.keepass.utils.readEnum
 import com.kunzisoft.keepass.utils.writeEnum
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt b/app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt
index 830b8bbfa..ac1f37b3a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/model/SearchInfo.kt
@@ -7,7 +7,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import com.kunzisoft.keepass.otp.OtpEntryFields
 import com.kunzisoft.keepass.settings.PreferencesUtil
-import com.kunzisoft.encrypt.ObjectNameResource
+import com.kunzisoft.keepass.utils.ObjectNameResource
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
index 29593e92f..0d8da21df 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt
@@ -217,12 +217,12 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() {
         if (mDatabase.loaded) {
             // Encryption Algorithm
             mEncryptionAlgorithmPref = findPreference<DialogListExplanationPreference>(getString(R.string.encryption_algorithm_key))?.apply {
-                summary = mDatabase.getEncryptionAlgorithmName(resources)
+                summary = mDatabase.getEncryptionAlgorithmName()
             }
 
             // Key derivation function
             mKeyDerivationPref = findPreference<DialogListExplanationPreference>(getString(R.string.key_derivation_function_key))?.apply {
-                summary = mDatabase.getKeyDerivationName(resources)
+                summary = mDatabase.getKeyDerivationName()
             }
 
             // Round encryption
@@ -398,7 +398,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() {
                                     mDatabase.encryptionAlgorithm = oldEncryption
                                     oldEncryption
                                 }
-                        mEncryptionAlgorithmPref?.summary = algorithmToShow.getName(resources)
+                        mEncryptionAlgorithmPref?.summary = algorithmToShow.toString()
                     }
                     DatabaseTaskNotificationService.ACTION_DATABASE_UPDATE_KEY_DERIVATION_TASK -> {
                         val oldKeyDerivationEngine = data.getSerializable(DatabaseTaskNotificationService.OLD_ELEMENT_KEY) as KdfEngine
@@ -410,7 +410,7 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment() {
                                     mDatabase.kdfEngine = oldKeyDerivationEngine
                                     oldKeyDerivationEngine
                                 }
-                        mKeyDerivationPref?.summary = kdfEngineToShow.getName(resources)
+                        mKeyDerivationPref?.summary = kdfEngineToShow.toString()
 
                         mRoundPref?.summary = kdfEngineToShow.defaultKeyRounds.toString()
                         // Disable memory and parallelism if not available
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/AutofillBlocklistAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/AutofillBlocklistAdapter.kt
index dff69c75c..3445ddb48 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/AutofillBlocklistAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/AutofillBlocklistAdapter.kt
@@ -28,7 +28,7 @@ import android.widget.ImageView
 import android.widget.TextView
 
 import com.kunzisoft.keepass.R
-import com.kunzisoft.encrypt.ObjectNameResource
+import com.kunzisoft.keepass.utils.ObjectNameResource
 
 import java.util.ArrayList
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/ListRadioItemAdapter.kt b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/ListRadioItemAdapter.kt
index 53be10188..a3419039b 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/ListRadioItemAdapter.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferencedialogfragment/adapter/ListRadioItemAdapter.kt
@@ -20,18 +20,15 @@
 package com.kunzisoft.keepass.settings.preferencedialogfragment.adapter
 
 import android.content.Context
-import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
-
+import androidx.recyclerview.widget.RecyclerView
 import com.kunzisoft.keepass.R
-import com.kunzisoft.encrypt.ObjectNameResource
+import java.util.*
 
-import java.util.ArrayList
-
-class ListRadioItemAdapter<T : ObjectNameResource>(private val context: Context)
+class ListRadioItemAdapter<T>(private val context: Context)
     : RecyclerView.Adapter<ListRadioItemAdapter.ListRadioViewHolder>() {
 
     private val inflater: LayoutInflater = LayoutInflater.from(context)
@@ -48,7 +45,7 @@ class ListRadioItemAdapter<T : ObjectNameResource>(private val context: Context)
 
     override fun onBindViewHolder(holder: ListRadioViewHolder, position: Int) {
         val item = this.radioItemList[position]
-        holder.radioButton.text = item.getName(context.resources)
+        holder.radioButton.text = item.toString()
         holder.radioButton.isChecked = radioItemUsed != null && radioItemUsed == item
         holder.radioButton.setOnClickListener(OnItemClickListener(item))
     }
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/ObjectNameResource.kt b/app/src/main/java/com/kunzisoft/keepass/utils/ObjectNameResource.kt
similarity index 96%
rename from encrypt/src/main/java/com/kunzisoft/encrypt/ObjectNameResource.kt
rename to app/src/main/java/com/kunzisoft/keepass/utils/ObjectNameResource.kt
index c0d6a24dc..4bcc8eefb 100644
--- a/encrypt/src/main/java/com/kunzisoft/encrypt/ObjectNameResource.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/utils/ObjectNameResource.kt
@@ -17,7 +17,7 @@
  *  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-package com.kunzisoft.encrypt
+package com.kunzisoft.keepass.utils
 
 import android.content.res.Resources
 
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 838ffb326..38f18e8e7 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -107,7 +107,6 @@
     <string name="progress_create">Creant nova base de dades…</string>
     <string name="progress_title">Treballant…</string>
     <string name="content_description_remove_from_list">Elimina</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Arrel</string>
     <string name="rounds">Passades d\'encriptació</string>
     <string name="rounds_explanation">Més passades d\'encriptació donen protecció addicional contra atacs de força bruta, però poden alentir molt la càrrega i el desat de la base de dades.</string>
@@ -118,7 +117,6 @@
     <string name="special">Especial</string>
     <string name="search">Títol/descripció d\'entrada</string>
     <string name="search_results">Resultats de cerca</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Subratllat</string>
     <string name="unsupported_db_version">Versió de la base de dades no suportada.</string>
     <string name="uppercase">Majúscules</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ae1eb10e0..5448db5cd 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -116,7 +116,6 @@
     <string name="protection">Ochrana</string>
     <string name="read_only_warning">Ke změně v databáze potřebuje KeePassDX oprávnění pro zápis.</string>
     <string name="content_description_remove_from_list">Odstranit</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Kořen</string>
     <string name="rounds">Transformační průchody</string>
     <string name="rounds_explanation">Vyšší počet šifrovacích průchodů zvýší odolnost proti útoku zkoušením všech možných hesel, ale může výrazně zpomalit načítání a ukládání.</string>
@@ -127,7 +126,6 @@
     <string name="special">Speciální</string>
     <string name="search">Hledat</string>
     <string name="search_results">Výsledky hledání</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Podtržítko</string>
     <string name="unsupported_db_version">Nepodporovaná verze databáze.</string>
     <string name="uppercase">Velká písmena</string>
@@ -294,8 +292,6 @@
     <string name="html_text_dev_feature_upgrade">Pamatujte na aktualizaci aplikace instalováním nových verzí.</string>
     <string name="download">Stáhnout</string>
     <string name="contribute">Přispět</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Vzhled aplikace</string>
     <string name="style_choose_summary">Motiv vzhledu aplikace</string>
     <string name="icon_pack_choose_title">Sada ikon</string>
@@ -539,8 +535,6 @@
     <string name="temp_advanced_unlock_enable_summary">Za účelem rozšířeného odemknutí neukládat žádný šifrovaný obsah</string>
     <string name="temp_advanced_unlock_enable_title">Přechodné rozšířené odemknutí</string>
     <string name="advanced_unlock_tap_delete">Pro odstranění klíčů rozšířeného odemknutí klepnout</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="education_advanced_unlock_summary">Abyste rychle odemknuli databázi, propojte své heslo s naskenovanou biometrikou nebo údaji zámku zařízení.</string>
     <string name="temp_advanced_unlock_timeout_title">Vypršení pokročilého odemknutí</string>
     <string name="content">Obsah</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 77911db5e..b382ca960 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -115,7 +115,6 @@
     <string name="protection">Beskyttelse</string>
     <string name="read_only_warning">KeePassDX behøver skrivetilladelse for at ændre i databasen.</string>
     <string name="content_description_remove_from_list">Fjern</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Rod</string>
     <string name="rounds">Transformationsrunder</string>
     <string name="rounds_explanation">Yderligere krypteringsrunder giver højere beskyttelse mod brute-force angreb, men kan virkelig forsinke læsnings- og skrivehastigheden.</string>
@@ -126,7 +125,6 @@
     <string name="special">Speciel</string>
     <string name="search">Søg</string>
     <string name="search_results">Søgeresultater</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Understregning</string>
     <string name="unsupported_db_version">Database-versionen er ikke understøttet.</string>
     <string name="uppercase">Store bogstaver</string>
@@ -293,8 +291,6 @@
     <string name="html_text_dev_feature_upgrade">Glem ikke at holde appen opdateret ved at installere nye versioner.</string>
     <string name="download">Hent</string>
     <string name="contribute">Bidrag</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Tema</string>
     <string name="style_choose_summary">Tema, der bruges i programmet</string>
     <string name="icon_pack_choose_title">Ikonpakke</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index dc80384c1..89fd2907b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -128,7 +128,6 @@
     <string name="read_only">Schreibgeschützt</string>
     <string name="read_only_warning">KeePassDX benötigt Schreibrechte, um etwas an der Datenbank zu ändern.</string>
     <string name="content_description_remove_from_list">Löschen</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Start</string>
     <string name="rounds">Schlüsseltransformationen</string>
     <string name="rounds_explanation">Zusätzliche Schlüsseltransformationen bieten einen besseren Schutz gegen Wörterbuch- oder Brute-Force-Angriffe. Allerdings dauert dann auch das Laden und Speichern der Datenbank entsprechend länger.</string>
@@ -139,7 +138,6 @@
     <string name="special">Spezialsymbole</string>
     <string name="search">Suchen</string>
     <string name="search_results">Suchergebnisse</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Unterstriche</string>
     <string name="unsupported_db_version">Datenbankversion wird nicht unterstützt.</string>
     <string name="uppercase">Großbuchstaben</string>
@@ -279,8 +277,6 @@
     <string name="html_text_dev_feature_upgrade">Denken Sie daran, Ihre App auf dem neuesten Stand zu halten, indem Sie neue Versionen installieren.</string>
     <string name="download">Download</string>
     <string name="contribute">Unterstützen</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="icon_pack_choose_title">Symbolpaket</string>
     <string name="icon_pack_choose_summary">In der App verwendetes Symbolpaket</string>
     <string name="error_move_folder_in_itself">Eine Gruppe kann nicht in sich selbst verschoben werden.</string>
@@ -552,8 +548,6 @@
     <string name="advanced_unlock_not_recognized">Konnte den Abdruck des erweiterten Entsperrens nicht erkennen</string>
     <string name="advanced_unlock_invalid_key">Kann den Schlüssel zum erweiterten Entsperren nicht lesen. Bitte löschen sie ihn und wiederholen sie Prozedur zum Erkennen des Entsperrens.</string>
     <string name="advanced_unlock_prompt_extract_credential_message">Extrahiere Datenbankanmeldedaten mit Daten aus erweitertem Entsperren</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_rebuild_list">Die Liste kann nicht ordnungsgemäß neu erstellt werden.</string>
     <string name="error_database_uri_null">Datenbank-URI kann nicht abgerufen werden.</string>
     <string name="menu_reload_database">Datenbank neu laden</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index b4ee69532..1434af06c 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -118,7 +118,6 @@
     <string name="protection">Προστασία</string>
     <string name="read_only_warning">Το KeePassDX χρειάζεται άδεια εγγραφής για να αλλάξει οτιδήποτε στη βάση δεδομένων σας.</string>
     <string name="content_description_remove_from_list">Αφαίρεση</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Ριζικός Κατάλογος</string>
     <string name="rounds">Κύκλοι μετασχηματισμού Κρυπτογράφησης</string>
     <string name="rounds_explanation">Επιπλέον κύκλοι κρυπτογράφησης παρέχουν πρόσθετη προστασία ενάντια σε επιθέσεις brute force, αλλά μπορεί να επιβραδύνει πολύ την φόρτωση και την αποθήκευση.</string>
@@ -129,7 +128,6 @@
     <string name="special">Ειδικοί</string>
     <string name="search">Αναζήτηση</string>
     <string name="search_results">Αποτελέσματα αναζήτησης</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Υπογράμμιση</string>
     <string name="unsupported_db_version">Μη υποστηριζόμενη έκδοση βάσης δεδομένων.</string>
     <string name="uppercase">Κεφαλαία</string>
@@ -260,8 +258,6 @@
     <string name="html_text_dev_feature_upgrade">Θυμηθείτε να ενημερώνετε την εφαρμογή σας, εγκαθιστώντας νέες εκδόσεις.</string>
     <string name="download">Λήψη</string>
     <string name="contribute">Συνεισφορά</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Θέμα Εφαρμογής</string>
     <string name="style_choose_summary">Θέμα που χρησιμοποιείται στην εφαρμογή</string>
     <string name="icon_pack_choose_title">Πακέτο Εικονιδίων</string>
@@ -541,8 +537,6 @@
     <string name="temp_advanced_unlock_timeout_title">Λήξη προηγμένου ξεκλειδώματος</string>
     <string name="advanced_unlock_tap_delete">Πατήστε για διαγραφή προηγμένων κλειδιών ξεκλειδώματος</string>
     <string name="content">Περιεχόμενα</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_rebuild_list">Δεν είναι δυνατή η σωστή αναδημιουργία της λίστας.</string>
     <string name="error_database_uri_null">Δεν είναι δυνατή η ανάκτηση του URI βάσης δεδομένων.</string>
     <string name="autofill_inline_suggestions_keyboard">Προστέθηκαν προτάσεις αυτόματης συμπλήρωσης.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b84064477..847112ed8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -109,7 +109,6 @@
     <string name="progress_create">Creando nueva base de datos…</string>
     <string name="progress_title">Trabajando…</string>
     <string name="content_description_remove_from_list">Quitar</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Raíz</string>
     <string name="rounds">Pasadas de transformación</string>
     <string name="rounds_explanation">Un alto número de pasadas de cifrado proporciona protección adicional contra ataques de fuerza bruta, pero puede ralentizar mucho el cargado y el guardado.</string>
@@ -119,7 +118,6 @@
     <string name="sort_db">Orden natural</string>
     <string name="special">Especial</string>
     <string name="search">Búsqueda</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Subrayado</string>
     <string name="unsupported_db_version">No se admite esta versión de la base de datos.</string>
     <string name="uppercase">Mayúsculas</string>
@@ -273,8 +271,6 @@
     <string name="html_text_dev_feature_upgrade">Recuerde mantener su aplicación actualizada instalando nuevas versiones.</string>
     <string name="download">Descargar</string>
     <string name="contribute">Contribuir</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Tema de la aplicación</string>
     <string name="style_choose_summary">Tema utilizado en la aplicación</string>
     <string name="icon_pack_choose_title">Seleccione un paquete de iconos</string>
@@ -507,8 +503,6 @@
     <string name="notification">Notificación</string>
     <string name="hide_expired_entries_title">Ocultar las entradas expiradas</string>
     <string name="keyboard_search_share_title">Buscar información compartida</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="upload_attachment">Subir %1$s</string>
     <string name="education_setup_OTP_summary">Configurar la gestión de contraseñas de una sola vez (HOTP / TOTP) para generar un token solicitado para la autenticación de dos factores (2FA).</string>
     <string name="education_setup_OTP_title">Establecer la contaseña de un solo uso</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 694b00d4c..72e10b689 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -117,7 +117,6 @@
     <string name="progress_title">Lanean…</string>
     <string name="protection">Babesa</string>
     <string name="content_description_remove_from_list">Ezabatu</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Enkriptatzeko Rondak</string>
     <string name="rounds_explanation">Enkriptatzeko ronda gehiago indar gordineko atakeen kontrako babes gehiago ematen dute, baina kargatzea eta gordetzea moteldu dezakete modu nabarmenean.</string>
@@ -128,7 +127,6 @@
     <string name="special">Berezia</string>
     <string name="search">Sarreraren Izena / Deskribapena</string>
     <string name="search_results">Bilaketaren emaitzak</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Azpimarratu</string>
     <string name="unsupported_db_version">Euskarririk gabeko datubase bertsioa.</string>
     <string name="uppercase">Maiuskulak</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 95957ab83..a26f69785 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -117,7 +117,6 @@
     <string name="progress_title">Työskennellään…</string>
     <string name="protection">Suojaus</string>
     <string name="content_description_remove_from_list">Poista</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Juuri</string>
     <string name="rounds">Salauskierroksia</string>
     <string name="rounds_explanation">Lisätty kierrosten määrä parantaa suojausta raa\'alla voimalla tehdyiltä murtoyrityksiltä, mutta voi todella hidastaa lataamista ja tallentamista.</string>
@@ -128,7 +127,6 @@
     <string name="special">Erityistä</string>
     <string name="search">Tietueen otsikko/kuvaus</string>
     <string name="search_results">Hakutulokset</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Alleviivattu</string>
     <string name="unsupported_db_version">Ei-tuettu salasanatietokannan versio.</string>
     <string name="uppercase">Isot kirjaimet</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6c2fd3137..49ce413d2 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -258,10 +258,6 @@
     <string name="html_text_dev_feature_upgrade">N’oubliez pas de garder votre application à jour en installant les nouvelles versions.</string>
     <string name="download">Télécharger</string>
     <string name="contribute">Contribuer</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string-array name="timeout_options">
         <item>5 secondes</item>
         <item>10 secondes</item>
@@ -549,8 +545,6 @@
     <string name="temp_advanced_unlock_enable_title">Déverrouillage avancé temporaire</string>
     <string name="advanced_unlock_tap_delete">Appuyez pour supprimer les clés de déverrouillage avancées</string>
     <string name="content">Contenu</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_rebuild_list">Impossible de reconstruire correctement la liste.</string>
     <string name="error_database_uri_null">L\'URI de la base de données ne peut pas être récupéré.</string>
     <string name="autofill_inline_suggestions_keyboard">Suggestions de remplissage automatique ajoutées.</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 9a4c003ea..9f93c9ee3 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -354,7 +354,6 @@
     <string name="autofill_auto_search_title">Automatska pretraga</string>
     <string name="html_text_dev_feature_work_hard">Trudimo se brzo izdati ovu funkciju.</string>
     <string name="html_text_dev_feature_encourage">potičeš programere da stvore &lt;strong&gt;nove funkcije&lt;/strong&gt; i &lt;strong&gt;isprave greške&lt;/strong&gt; na osnovi tvojih napomena.</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="keyboard_auto_go_action_summary">Radnja tipke „Idi” nakon pritiskanja tipke „Polje”</string>
     <string name="html_about_contribution">Kako bismo &lt;strong&gt;zadržali našu slobodu&lt;/strong&gt;, &lt;strong&gt;ispravljali greške&lt;/strong&gt;, &lt;strong&gt;dodavali funkcije&lt;/strong&gt; i &lt;strong&gt;uvijek bili aktivni&lt;/strong&gt;, računamo na tvoj &lt;strong&gt;doprinos&lt;/strong&gt;.</string>
     <string name="autofill_web_domain_blocklist_summary">Popis blokiranja koja sprečavaju automatsko ispunjavanje web domena</string>
@@ -366,7 +365,6 @@
     <string name="keyboard_entry_timeout_summary">Istek vremena za brisanje unosa tipkovnicom</string>
     <string name="education_read_only_title">Zaštiti bazu podataka od pisanja</string>
     <string name="autofill_web_domain_blocklist_title">Popis blokiranja web domena</string>
-    <string name="kdf_AES">AES</string>
     <string name="contribution">Doprinos</string>
     <string name="error_label_exists">Ova oznaka već postoji.</string>
     <string name="warning_database_read_only">Za spremanje promjena u bazi podataka, datoteci dozvoli pisanje</string>
@@ -389,12 +387,10 @@
 \n
 \nKoristi preferirani način ispunjavanja obrazaca.</string>
     <string name="filter">Filtar</string>
-    <string name="encryption_chacha20">ChaCha20</string>
     <string name="show_recent_files_title">Prikaži nedavne datoteke</string>
     <string name="html_text_dev_feature_contibute">&lt;strong&gt;Doprinosom&lt;/strong&gt;,</string>
     <string name="education_entry_new_field_title">Dodaj prilagođena polja</string>
     <string name="education_lock_summary">Zaključaj bazu podataka brzo, aplikaciju možeš postaviti tako da bazu nakon nekog vremena zaključa i kad se ekran isključi.</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="show_recent_files_summary">Prikaži mjesto nedavnih baza podataka</string>
     <string name="education_advanced_unlock_summary">Za brzo otključavanje baze podataka, poveži lozinku sa skeniranom biometrijom.</string>
     <string name="html_text_donation">Kako bismo zadržali našu slobodu i uvijek bili aktivni, računamo na tvoj&lt;strong&gt;doprinos.&lt;/strong&gt;</string>
@@ -525,8 +521,6 @@
     <string name="temp_advanced_unlock_enable_summary">Nemoj spremati šifrirani sadržaj za napredno otključavanje</string>
     <string name="content">Sadržaj</string>
     <string name="temp_advanced_unlock_enable_title">Privremeno napredno otključavanje</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_rebuild_list">Nije moguće ispravno obnoviti popis.</string>
     <string name="error_database_uri_null">URI baze podataka nije moguće dobiti.</string>
     <string name="autofill_inline_suggestions_title">Umetnuti prijedlozi</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ef9c88588..e3faae646 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -119,7 +119,6 @@
     <string name="read_only">Írásvédett</string>
     <string name="read_only_warning">A KeePassDX-nek írási engedélyre van szüksége, hogy bármit is módosíthasson az adatbázisban.</string>
     <string name="content_description_remove_from_list">Eltávolítás</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Gyökérkönyvár</string>
     <string name="rounds">Transzformációs körök</string>
     <string name="rounds_explanation">A további titkosítási körök magasabb védelmet biztosítanak a nyers erőt használó támadások ellen, ugyanakkor jelentősen lassíthatják az adatbázis betöltését vagy mentését.</string>
@@ -130,7 +129,6 @@
     <string name="special">Speciális</string>
     <string name="search">Keresés</string>
     <string name="search_results">Találatok</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Aláhúzás</string>
     <string name="unsupported_db_version">Nem támogatott adatbázis-verzió.</string>
     <string name="uppercase">Nagybetűs</string>
@@ -315,8 +313,6 @@
     <string name="html_text_dev_feature_upgrade">Ne felejtse naprakészen tartani az alkalmazást az új verziók telepítésével.</string>
     <string name="download">Letöltés</string>
     <string name="contribute">Támogatás</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Alkalmazástéma</string>
     <string name="style_choose_summary">Az alkalmazásban használt téma</string>
     <string name="icon_pack_choose_title">Ikoncsomag</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 80dc6b3eb..e9bfb5db8 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -284,12 +284,6 @@
     <string name="file_name">Nama berkas</string>
     <string name="unavailable_feature_hardware">Tidak dapat menemukan perangkat keras yang sesuai.</string>
     <string name="unavailable_feature_version">Perangkat ini menjalankan Android %1$s, tetapi membutuhkan %2$s atau yang lebih baru.</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
-    <string name="kdf_AES">AES</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="download_canceled">Dibatalkan!</string>
     <string name="download_complete">Selesai!</string>
     <string name="download_finalization">Menyelesaikan…</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7fa459f18..752b3cbb6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -291,10 +291,6 @@
     <string name="html_text_dev_feature_upgrade">Ricorda di tenere aggiornata l\'app installando le nuove versioni.</string>
     <string name="download">Scarica</string>
     <string name="contribute">Contribuisci</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Tema dell\'app</string>
     <string name="style_choose_summary">Tema usato nell\'app</string>
     <string name="icon_pack_choose_title">Pacchetto icone</string>
@@ -544,8 +540,6 @@
     <string name="open_advanced_unlock_prompt_unlock_database">Autentica con lo sblocco avanzato per sbloccare il database</string>
     <string name="open_advanced_unlock_prompt_store_credential">Autentica con lo sblocco avanzato per salvare le credenziali</string>
     <string name="menu_keystore_remove_key">Elimina chiave di sblocco avanzato</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_rebuild_list">Non è possibile ricostruire la lista correttamente.</string>
     <string name="error_database_uri_null">Non è stato recuperato l\'indirizzo del database.</string>
     <string name="autofill_inline_suggestions_keyboard">Suggerimento di riempimento aggiunto.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 416eb520e..539e088cf 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -470,10 +470,6 @@
     <string name="download_progression">進行中：%1$d%%</string>
     <string name="download_finalization">終了しています…</string>
     <string name="download_complete">完了しました！</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string-array name="timeout_options">
         <item>5秒</item>
         <item>10秒</item>
@@ -540,8 +536,6 @@
     <string name="temp_advanced_unlock_enable_title">一時的な高度なロック解除</string>
     <string name="advanced_unlock_tap_delete">タップして高度なロック解除用の鍵を削除する</string>
     <string name="content">コンテンツ</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_database_uri_null">データベースの URI が取得できません。</string>
     <string name="autofill_inline_suggestions_keyboard">自動入力候補が追加されました。</string>
     <string name="autofill_inline_suggestions_summary">自動入力候補を互換性のあるキーボード上に直接表示することを試みます</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 05c33cb72..4cce5e774 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -114,7 +114,6 @@
     <string name="progress_title">Darbojas…</string>
     <string name="protection">Aizsardzība</string>
     <string name="content_description_remove_from_list">Noņemt</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Šifrēšanas līmeņi</string>
     <string name="rounds_explanation">Augstākā līmeņa šifrēšana sniedz lielāku aizsardzību, bet palēnina darbības ar datu bāzēm.</string>
@@ -125,7 +124,6 @@
     <string name="special">Speciālie</string>
     <string name="search">Ieraksta nosaukums/apraksts</string>
     <string name="search_results">Meklēšanas rezultāti</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Pasvītrojums</string>
     <string name="unsupported_db_version">Neatbalstīta datu bāzes versija.</string>
     <string name="uppercase">Lielie burti</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 50296e236..d3cc660e5 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -151,9 +151,6 @@
     <string name="clipboard_timeout_summary">ക്ലിപ്പ്ബോർഡിലെ സ്റ്റോറേജിന്റെ ദൈർക്യം</string>
     <string name="key_derivation_function">കീ ഡെറിവേഷൻ ഫംഗ്ഷൻ</string>
     <string name="about_description">KeePass പാസ്‍വേഡ് മാനേജറിന്റെ Android നടപ്പിലാക്കൽ</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="download_complete">പൂർത്തിയാക്കി!</string>
     <string name="education_create_database_title">നിങ്ങളുടെ ഡാറ്റാബേസ് ഫയൽ സൃഷ്ടിക്കുക</string>
     <string name="autofill_auto_search_title">സ്വയം തിരയൽ</string>
@@ -188,7 +185,6 @@
     <string name="database_description_title">ഡാറ്റാബേസിനെ കുറിച്ചുള്ള വിവരണം</string>
     <string name="education_field_copy_title">ഏതെങ്കിലും ഒരു ഫീൽഡ് പകർത്തുക</string>
     <string name="error_invalid_path">Path ശെരിയാണോ എന്ന് ഉറപ്പാക്കുക.</string>
-    <string name="kdf_AES">AES</string>
     <string name="extended_ASCII">വിപുലീകരിച്ച ASCII</string>
     <string name="icon_pack_choose_summary">ആപ്പിൽ ഉപയോഗിച്ചിരിക്കുന്ന ഐക്കൺ പാക്ക്</string>
     <string name="style_choose_title">അപ്പ്ലിക്കേഷന്റെ തീം</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 2234a5d9f..56dde7c45 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -280,10 +280,6 @@
     <string name="html_text_dev_feature_upgrade">Ikke glem å holde programmet ditt oppgradert.</string>
     <string name="download">Last ned</string>
     <string name="contribute">Bidra</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Velg en drakt</string>
     <string name="style_choose_summary">Tilpass programdrakten ved å endre fargene</string>
     <string name="icon_pack_choose_title">Velg en ikonpakke</string>
@@ -426,8 +422,6 @@
     <string name="error_field_name_already_exists">Feltnavnet finnes allerede.</string>
     <string name="content_description_add_item">Legg til element</string>
     <string name="education_advanced_unlock_title">Avansert databaseopplåsing</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="unit_byte">B</string>
     <string name="show_uuid_summary">Viser UUID-en tilhørende en oppføring</string>
     <string name="show_uuid_title">Vis UUID</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 40261e9ef..c89e81d40 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -109,7 +109,6 @@
     <string name="progress_create">Nieuwe database aanmaken…</string>
     <string name="progress_title">Bezig met verwerken…</string>
     <string name="content_description_remove_from_list">Verwijderen</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Hoofdmap</string>
     <string name="rounds">Encryptie-cycli</string>
     <string name="rounds_explanation">Een hoger aantal encryptie-cycli geeft bijkomende bescherming tegen brute-force aanvallen, maar kan het laden en opslaan sterk vertragen.</string>
@@ -119,7 +118,6 @@
     <string name="sort_db">Natuurlijke volgorde</string>
     <string name="special">Speciaal</string>
     <string name="search">Zoeken</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Onderstrepen</string>
     <string name="unsupported_db_version">Niet-ondersteunde databaseversie.</string>
     <string name="uppercase">Hoofdletters</string>
@@ -300,8 +298,6 @@
     <string name="html_text_dev_feature_upgrade">Vergeet niet je app up-to-date te houden door nieuwe versies te installeren.</string>
     <string name="download">Downloaden</string>
     <string name="contribute">Bijdragen</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">App-thema</string>
     <string name="style_choose_summary">Thema gebruikt in de app</string>
     <string name="icon_pack_choose_title">Icon pack</string>
@@ -547,8 +543,6 @@
     <string name="unit_mebibyte">MiB</string>
     <string name="unit_kibibyte">KiB</string>
     <string name="unit_byte">B</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="download_canceled">Geannuleerd!</string>
     <string name="autofill_inline_suggestions_keyboard">Suggesties voor automatisch aanvullen toegevoegd.</string>
     <string name="autofill_inline_suggestions_summary">Probeer suggesties voor automatisch aanvullen rechtstreeks vanaf een compatibel toetsenbord weer te geven</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index bd9511b38..be7d4839e 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -106,7 +106,6 @@
     <string name="progress_create">Lager ny database …</string>
     <string name="progress_title">Arbeider …</string>
     <string name="content_description_remove_from_list">Ta vekk</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Rot</string>
     <string name="rounds">Krypteringsomgangar</string>
     <string name="rounds_explanation">Fleire krypteringsomgangar gjev tilleggsvern mot rå makt-åtak, men kan òg gjera lasting og lagring mykje tregare.</string>
@@ -116,7 +115,6 @@
     <string name="sort_db">DB-sortering</string>
     <string name="special">Spesial</string>
     <string name="search">Oppføringa sin tittel/skildring</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Understreking</string>
     <string name="unsupported_db_version">Kan ikkje bruka databaseutgåva.</string>
     <string name="uppercase">Store bokstavar</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 6c9197cfe..6669ea333 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -293,7 +293,6 @@
     <string name="education_lock_summary">ਆਪਣੇ ਡਾਟਾਬੇਸ ਨੂੰ ਫ਼ੌਰੀ ਤੌਰ ਉੱਤੇ ਲਾਕ ਕਰੋ, ਤੁਸੀਂ ਕੁਝ ਦੇਰ ਬਾਅਦ ਅਤੇ ਜਦੋਂ ਸਕਰੀਨ ਬੰਦ ਹੋਵੇ ਤਾਂ ਇਸ ਨੂੰ ਲਾਕ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਸੈਟਅੱਪ ਕਰ ਸਕਦੇ ਹੋ।</string>
     <string name="education_lock_title">ਡਾਟਾਬੇਸ ਲਾਕ ਕਰੋ</string>
     <string name="upload_attachment">%1$s ਅੱਪਲੋਡ ਕਰੋ</string>
-    <string name="kdf_AES">AES</string>
     <string name="show_uuid_summary">ਐਂਟਰੀ ਨਾਲ ਸੰਬੰਧਿਤ UUID ਦਿਖਾਉਂਦਾ ਹੈ</string>
     <string name="encryption_explanation">ਸਾਰੇ ਡਾਟੇ ਲਈ ਡਾਟਾਬੇਸ ਇੰਕ੍ਰਿਪਸ਼ਨ ਐਲਗੋਰਿਥਮ ਵਰਤਿਆ ਗਿਆ ਹੈ।</string>
     <string name="registration_mode">ਰਜਿਸਟਰੇਸ਼ਨ ਢੰਗ</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index bfe5e2fba..3dfb65f79 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -105,7 +105,6 @@
     <string name="progress_create">Tworzenie nowej bazy danych…</string>
     <string name="progress_title">Pracuję…</string>
     <string name="content_description_remove_from_list">Usuń</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Rundy szyfrowania</string>
     <string name="rounds_explanation">Dodatkowe rundy szyfrowania zapewniają lepszą ochronę przed atakami typu brute force, ale mogą znacznie spowolnić ładowanie i zapisywanie.</string>
@@ -115,7 +114,6 @@
     <string name="sort_db">Porządek naturalny</string>
     <string name="special">Znaki specjalne</string>
     <string name="search">Szukaj</string>
-    <string name="encryption_twofish">Algorytm szyfrujący Twofish</string>
     <string name="underline">Podkreślenie</string>
     <string name="unsupported_db_version">Nieobsługiwana wersja bazy danych.</string>
     <string name="uppercase">Wielkie litery</string>
@@ -296,8 +294,6 @@
     <string name="html_text_dev_feature_upgrade">Pamiętaj, aby aktualizować swoją aplikację, instalując nowe wersje.</string>
     <string name="download">Pobieranie</string>
     <string name="contribute">Przyczyń się</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Motyw aplikacji</string>
     <string name="style_choose_summary">Motyw używany w aplikacji</string>
     <string name="icon_pack_choose_title">Pakiet ikon</string>
@@ -536,8 +532,6 @@
     <string name="advanced_unlock_tap_delete">Naciśnij, aby usunąć zaawansowane klucze odblokowujące</string>
     <string name="content">Zawartość</string>
     <string name="advanced_unlock_prompt_extract_credential_title">Otwórz bazę danych z zaawansowanym rozpoznawaniem odblokowania</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="advanced_unlock_scanning_error">Błąd zaawansowanego odblokowywania: %1$s</string>
     <string name="error_rebuild_list">Nie można poprawnie odbudować listy.</string>
     <string name="error_database_uri_null">Nie można pobrać identyfikatora URI bazy danych.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 229432453..6a13abbcf 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -107,7 +107,6 @@
     <string name="progress_create">Criando novo banco de dados…</string>
     <string name="progress_title">Trabalhando…</string>
     <string name="content_description_remove_from_list">Remover</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Raiz</string>
     <string name="rounds">Rodadas de criptografia</string>
     <string name="rounds_explanation">Rodadas adicionais de criptografia adicionam mais proteção contra ataques de força bruta, mas podem tornar o processo de carregar e salvar mais lentos.</string>
@@ -117,7 +116,6 @@
     <string name="sort_db">Ordenação natural</string>
     <string name="special">Caracteres Especiais</string>
     <string name="search">Título/Descrição da entrada</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Sublinhado</string>
     <string name="unsupported_db_version">Versão de banco de dados não suportada.</string>
     <string name="uppercase">Letras maiúsculas</string>
@@ -292,8 +290,6 @@
     <string name="html_text_dev_feature_upgrade">Lembre-se de manter seu aplicativo atualizado.</string>
     <string name="download">Baixar</string>
     <string name="contribute">Contribuir</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Tema do aplicativo</string>
     <string name="style_choose_summary">Tema usado no aplicativo</string>
     <string name="icon_pack_choose_title">Pacote de ícones</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 6557fdcc2..2ee8a71cb 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -120,7 +120,6 @@
     <string name="read_only">Apenas leitura</string>
     <string name="read_only_warning">KeePassDX precisa de permissões de escrita para poder mudar qualquer coisa no seu banco.</string>
     <string name="content_description_remove_from_list">Remover</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Raiz</string>
     <string name="rounds">Rodadas de criptografia</string>
     <string name="rounds_explanation">Rodadas adicionais de criptografia adicionam mais proteção contra ataques de força bruta, mas podem tornar o processo de carregar e gravar mais lentos.</string>
@@ -131,7 +130,6 @@
     <string name="special">Especiais</string>
     <string name="search">Título/descrição da entrada</string>
     <string name="search_results">Resultados da pesquisa</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Sublinhado</string>
     <string name="unsupported_db_version">Versão da base de dados não suportada.</string>
     <string name="uppercase">Maiúsculas</string>
@@ -279,8 +277,6 @@
     <string name="html_text_dev_feature_upgrade">Lembre-se de manter o sua app atualizada, instalando novas versões.</string>
     <string name="download">Descarregar</string>
     <string name="contribute">Contribuir</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Tema da app</string>
     <string name="style_choose_summary">Tema usado na app</string>
     <string name="icon_pack_choose_title">Pacote de ícones</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 948728c13..825e79673 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -20,10 +20,6 @@
     <string name="icon_pack_choose_title">Pacote de ícones</string>
     <string name="style_choose_summary">Tema usado na app</string>
     <string name="style_choose_title">Tema da app</string>
-    <string name="kdf_AES">AES</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="contribute">Contribuir</string>
     <string name="download">Descarregar</string>
     <string name="html_text_dev_feature_upgrade">Lembre-se de manter o sua app atualizada, instalando novas versões.</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index a7d9acf4e..66bb4fdfd 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -402,10 +402,6 @@
     <string name="download_progression">In progress: %1$d%%</string>
     <string name="download_finalization">Finalizare …</string>
     <string name="download_complete">Complet!</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Tema aplicației</string>
     <string name="style_choose_summary">Tema folosită în aplicație</string>
     <string name="icon_pack_choose_title">Pachet de pictograme</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b06dfe040..222e78c98 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -120,7 +120,6 @@
     <string name="read_only">Только чтение</string>
     <string name="read_only_warning">KeePassDX необходимо разрешение на запись, чтобы иметь возможность изменить что-либо в вашей базе.</string>
     <string name="content_description_remove_from_list">Убрать из списка</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">База</string>
     <string name="rounds">Раунды шифрования</string>
     <string name="rounds_explanation">Дополнительные раунды шифрования – выше стойкость базы к подбору пароля, но медленнее открытие и сохранение.</string>
@@ -131,7 +130,6 @@
     <string name="special">$пеци@льные</string>
     <string name="search">Поиск</string>
     <string name="search_results">Результаты поиска</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">_Подчёркивание_</string>
     <string name="unsupported_db_version">Неподдерживаемая версия базы.</string>
     <string name="uppercase">ЗАГЛАВНЫЕ</string>
@@ -296,8 +294,6 @@
     <string name="html_text_dev_feature_upgrade">Не забывайте обновлять приложение.</string>
     <string name="download">Скачать</string>
     <string name="contribute">Помочь проекту</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Тема приложения</string>
     <string name="style_choose_summary">Тема, используемая в приложении</string>
     <string name="icon_pack_choose_title">Набор значков</string>
@@ -541,8 +537,6 @@
     <string name="temp_advanced_unlock_enable_summary">Не сохранять зашифрованное содержимое для использования расширенной разблокировки</string>
     <string name="advanced_unlock_tap_delete">Нажмите, чтобы удалить ключи расширенной разблокировки</string>
     <string name="content">Содержимое</string>
-    <string name="kdf_Argon2id">Argon2ID</string>
-    <string name="kdf_Argon2d">Argon2D</string>
     <string name="error_database_uri_null">Невозможно получить URI базы.</string>
     <string name="error_rebuild_list">Невозможно правильно перестроить список.</string>
     <string name="autofill_inline_suggestions_keyboard">Предложения автозаполнения добавлены.</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 605a05c9b..eaeee45ca 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -106,7 +106,6 @@
     <string name="progress_create">Vytváram novú databázu…</string>
     <string name="progress_title">Pracujem…</string>
     <string name="content_description_remove_from_list">Odstrániť</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Šifrovacie opakovania</string>
     <string name="rounds_explanation">Vyššie opakovania šifrovania dávajú vyššiu ochranu proti útokom hrubou silou, ale môžu spomaliť načítavanie a ukladanie.</string>
@@ -116,7 +115,6 @@
     <string name="sort_db">DB zoradenie poradia</string>
     <string name="special">Špeciálne</string>
     <string name="search">Záznam názov/popis</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Podčiarknuté</string>
     <string name="unsupported_db_version">Nepodporovaná verzia databázy.</string>
     <string name="uppercase">Veľké písmená</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4683cecef..6b8bbd01a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -116,7 +116,6 @@
     <string name="progress_title">Arbetar…</string>
     <string name="protection">Skydd</string>
     <string name="content_description_remove_from_list">Ta bort</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Root</string>
     <string name="rounds">Transformationsrundor</string>
     <string name="rounds_explanation">Högre antal krypteringsrundor ger ytterligare skydd mot bruteforce-attacker, men kan göra det betydligt långsammare att ladda och spara.</string>
@@ -127,7 +126,6 @@
     <string name="special">Specialtecken</string>
     <string name="search">Postens titel/beskrivning</string>
     <string name="search_results">Sökresultat</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Understreck</string>
     <string name="unsupported_db_version">Databasversionen stöds ej.</string>
     <string name="uppercase">Versaler</string>
@@ -279,8 +277,6 @@
     <string name="html_text_dev_feature_upgrade">Glöm inte att hålla appen uppdaterad genom att installera nya versioner.</string>
     <string name="download">Ladda ner</string>
     <string name="contribute">Bidra</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Apptema</string>
     <string name="style_choose_summary">Tema som används i appen</string>
     <string name="icon_pack_choose_title">Ikonpaket</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 49c347320..1137538d1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -296,10 +296,6 @@
     <string name="html_text_dev_feature_upgrade">Yeni sürümleri yükleyerek uygulamanızı güncel tutmayı unutmayın.</string>
     <string name="download">İndir</string>
     <string name="contribute">Katkıda bulun</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">Uygulama teması</string>
     <string name="style_choose_summary">Uygulamada kullanılan tema</string>
     <string name="icon_pack_choose_title">Simge paketi</string>
@@ -525,8 +521,6 @@
     <string name="temp_advanced_unlock_enable_title">Geçici gelişmiş kilit açma</string>
     <string name="advanced_unlock_tap_delete">Gelişmiş kilit açma anahtarlarını silmek için dokunun</string>
     <string name="content">İçerik</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_rebuild_list">Liste düzgün şekilde yeniden oluşturulamıyor.</string>
     <string name="error_database_uri_null">Veri tabanı URI\'si alınamıyor.</string>
     <string name="autofill_inline_suggestions_keyboard">Otomatik doldurma önerileri eklendi.</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 51814cd66..af918b917 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -107,7 +107,6 @@
     <string name="progress_create">Створення нової бази даних…</string>
     <string name="progress_title">Працює…</string>
     <string name="content_description_remove_from_list">Вилучити</string>
-    <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Корінь</string>
     <string name="rounds">Циклів шифрування</string>
     <string name="rounds_explanation">Додаткова кількість циклів шифрування забезпечує кращий захист від грубих атак, але може дещо уповільнити завантаження та збереження.</string>
@@ -117,7 +116,6 @@
     <string name="sort_db">Звичайний порядок</string>
     <string name="special">Спеціальний</string>
     <string name="search">Введіть заголовок/опис</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">Підкреслення</string>
     <string name="unsupported_db_version">Непідтримувана версія бази даних.</string>
     <string name="uppercase">Великі літери</string>
@@ -271,8 +269,6 @@
     <string name="icon_pack_choose_title">Набір піктограм</string>
     <string name="style_choose_summary">Тема застосунку</string>
     <string name="style_choose_title">Тема застосунку</string>
-    <string name="kdf_AES">AES</string>
-    <string name="encryption_chacha20">ChaCha20</string>
     <string name="download_complete">Готово!</string>
     <string name="download_finalization">Завершення…</string>
     <string name="download_progression">Виконується: %1$d%%</string>
@@ -541,8 +537,6 @@
     <string name="temp_advanced_unlock_enable_title">Тимчасове розширене розблокування</string>
     <string name="advanced_unlock_tap_delete">Торкнутися, щоб видалити клавіші розширеного розблокування</string>
     <string name="content">Вміст</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_rebuild_list">Не вдалося належним чином відновити список.</string>
     <string name="error_database_uri_null">Неможливо отримати URI бази даних.</string>
     <string name="autofill_inline_suggestions_keyboard">Додано пропозиції автозаповнення.</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4e72ab023..9035aa495 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -104,7 +104,6 @@
     <string name="progress_create">正在新建数据库…</string>
     <string name="progress_title">正在处理…</string>
     <string name="content_description_remove_from_list">移除</string>
-    <string name="encryption_rijndael">Rijndael(AES)</string>
     <string name="root">Root</string>
     <string name="rounds">迭代次数</string>
     <string name="rounds_explanation">更多的迭代次数能更好地抵抗暴力破解攻击，但也会增加读取和保存的时间。</string>
@@ -114,7 +113,6 @@
     <string name="sort_db">自然排序</string>
     <string name="special">特殊符号</string>
     <string name="search">搜索</string>
-    <string name="encryption_twofish">Twofish</string>
     <string name="underline">下划线</string>
     <string name="unsupported_db_version">不支持的数据库版本。</string>
     <string name="uppercase">大写</string>
@@ -143,8 +141,6 @@
     <string name="clipboard_error_title">剪切板错误</string>
     <string name="clipboard_error">一些设备不允许程序使用剪切板。</string>
     <string name="clipboard_error_clear">无法清空剪切板</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
     <string name="style_choose_title">主题</string>
     <string name="icon_pack_choose_title">图标包</string>
     <string name="icon_pack_choose_summary">程序中使用的图标包</string>
@@ -541,8 +537,6 @@
     <string name="temp_advanced_unlock_enable_title">临时性高级解锁</string>
     <string name="advanced_unlock_tap_delete">点击删除高级解锁密钥</string>
     <string name="content">内容</string>
-    <string name="kdf_Argon2id">Argon2id</string>
-    <string name="kdf_Argon2d">Argon2d</string>
     <string name="error_rebuild_list">无法正确地重建列表。</string>
     <string name="error_database_uri_null">无法检索数据库 URI 。</string>
     <string name="autofill_inline_suggestions_keyboard">已添加自动填充建议。</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0dc12e47a..978a77d85 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -104,7 +104,6 @@
     <string name="progress_create">創建新資料庫中…</string>
     <string name="progress_title">工作中…</string>
     <string name="content_description_remove_from_list">移除</string>
-    <string name="encryption_rijndael">Rijndael加密(AES)</string>
     <string name="root">Root</string>
     <string name="rounds">加密次數</string>
     <string name="rounds_explanation">更高級的加密次數對暴力攻擊能提供額外保護，但也會增加讀取和保存的時間。</string>
@@ -114,7 +113,6 @@
     <string name="sort_db">資料庫的排序順序</string>
     <string name="special">特別</string>
     <string name="search">條目名稱/說明</string>
-    <string name="encryption_twofish">Twofish演算法</string>
     <string name="underline">強調</string>
     <string name="unsupported_db_version">不支援的資料庫版本。</string>
     <string name="uppercase">大寫</string>
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/EncryptionAlgorithm.kt b/encrypt/src/main/java/com/kunzisoft/encrypt/EncryptionAlgorithm.kt
index be1215e4a..628e1e990 100644
--- a/encrypt/src/main/java/com/kunzisoft/encrypt/EncryptionAlgorithm.kt
+++ b/encrypt/src/main/java/com/kunzisoft/encrypt/EncryptionAlgorithm.kt
@@ -19,15 +19,13 @@
  */
 package com.kunzisoft.encrypt
 
-import android.content.res.Resources
 import com.kunzisoft.encrypt.engine.AesEngine
 import com.kunzisoft.encrypt.engine.ChaCha20Engine
 import com.kunzisoft.encrypt.engine.CipherEngine
 import com.kunzisoft.encrypt.engine.TwofishEngine
+import java.util.*
 
-import java.util.UUID
-
-enum class EncryptionAlgorithm : ObjectNameResource {
+enum class EncryptionAlgorithm {
 
     AESRijndael,
     Twofish,
@@ -51,11 +49,11 @@ enum class EncryptionAlgorithm : ObjectNameResource {
             }
         }
 
-    override fun getName(resources: Resources): String {
+    override fun toString(): String {
         return when (this) {
-            AESRijndael -> resources.getString(R.string.encryption_rijndael)
-            Twofish -> resources.getString(R.string.encryption_twofish)
-            ChaCha20 -> resources.getString(R.string.encryption_chacha20)
+            AESRijndael -> "Rijndael (AES)"
+            Twofish -> "Twofish"
+            ChaCha20 -> "ChaCha20"
         }
     }
 }
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/AesKdf.kt b/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/AesKdf.kt
index 148f7d36e..628832f0d 100644
--- a/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/AesKdf.kt
+++ b/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/AesKdf.kt
@@ -19,11 +19,9 @@
  */
 package com.kunzisoft.encrypt.keyDerivation
 
-import android.content.res.Resources
-import com.kunzisoft.encrypt.R
 import com.kunzisoft.encrypt.CryptoUtil
-import com.kunzisoft.encrypt.stream.bytes16ToUuid
 import com.kunzisoft.encrypt.finalkey.AESKeyTransformerFactory
+import com.kunzisoft.encrypt.stream.bytes16ToUuid
 import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
@@ -44,10 +42,6 @@ class AesKdf : KdfEngine() {
 
     override val defaultKeyRounds: Long = 500000L
 
-    override fun getName(resources: Resources): String {
-        return resources.getString(R.string.kdf_AES)
-    }
-
     @Throws(IOException::class)
     override fun transform(masterKey: ByteArray, kdfParameters: KdfParameters): ByteArray {
 
@@ -83,6 +77,10 @@ class AesKdf : KdfEngine() {
         kdfParameters.setUInt64(PARAM_ROUNDS, keyRounds)
     }
 
+    override fun toString(): String {
+        return "AES"
+    }
+
     companion object {
 
         val CIPHER_UUID: UUID = bytes16ToUuid(
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/Argon2Kdf.kt b/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/Argon2Kdf.kt
index 6650270c1..9070e2bb9 100644
--- a/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/Argon2Kdf.kt
+++ b/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/Argon2Kdf.kt
@@ -19,11 +19,8 @@
  */
 package com.kunzisoft.encrypt.keyDerivation
 
-import android.content.res.Resources
-import androidx.annotation.StringRes
 import com.kunzisoft.encrypt.UnsignedInt
 import com.kunzisoft.encrypt.stream.bytes16ToUuid
-import com.kunzisoft.encrypt.R
 import java.io.IOException
 import java.security.SecureRandom
 import java.util.*
@@ -50,10 +47,6 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
     override val defaultKeyRounds: Long
         get() = DEFAULT_ITERATIONS
 
-    override fun getName(resources: Resources): String {
-        return resources.getString(type.nameId)
-    }
-
     @Throws(IOException::class)
     override fun transform(masterKey: ByteArray, kdfParameters: KdfParameters): ByteArray {
 
@@ -135,6 +128,10 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
         kdfParameters.setUInt32(PARAM_PARALLELISM, UnsignedInt.fromKotlinLong(parallelism))
     }
 
+    override fun toString(): String {
+        return "$type"
+    }
+
     override val defaultParallelism: Long
         get() = DEFAULT_PARALLELISM.toKotlinLong()
 
@@ -144,7 +141,7 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
     override val maxParallelism: Long
         get() = MAX_PARALLELISM
 
-    enum class Type(val CIPHER_UUID: UUID, @StringRes val nameId: Int) {
+    enum class Type(val CIPHER_UUID: UUID, private val typeName: String) {
         ARGON2_D(bytes16ToUuid(
                 byteArrayOf(0xEF.toByte(),
                         0x63.toByte(),
@@ -161,7 +158,7 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
                         0x03.toByte(),
                         0xE3.toByte(),
                         0x0A.toByte(),
-                        0x0C.toByte())), R.string.kdf_Argon2d),
+                        0x0C.toByte())), "Argon2d"),
         ARGON2_ID(bytes16ToUuid(
                 byteArrayOf(0x9E.toByte(),
                         0x29.toByte(),
@@ -178,9 +175,15 @@ class Argon2Kdf(private val type: Type) : KdfEngine() {
                         0xC6.toByte(),
                         0xF0.toByte(),
                         0xA1.toByte(),
-                        0xE6.toByte())), R.string.kdf_Argon2id);
+                        0xE6.toByte())), "Argon2id");
+
+        override fun toString(): String {
+            return typeName
+        }
     }
 
+
+
     companion object {
 
         private const val PARAM_SALT = "S" // byte[]
diff --git a/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/KdfEngine.kt b/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/KdfEngine.kt
index e40437a33..b7768923b 100644
--- a/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/KdfEngine.kt
+++ b/encrypt/src/main/java/com/kunzisoft/encrypt/keyDerivation/KdfEngine.kt
@@ -19,15 +19,13 @@
  */
 package com.kunzisoft.encrypt.keyDerivation
 
-import com.kunzisoft.encrypt.ObjectNameResource
 import com.kunzisoft.encrypt.UnsignedInt
-
 import java.io.IOException
 import java.io.Serializable
-import java.util.UUID
+import java.util.*
 
 // TODO Parcelable
-abstract class KdfEngine : ObjectNameResource, Serializable {
+abstract class KdfEngine : Serializable {
 
     var uuid: UUID? = null
 
diff --git a/encrypt/src/main/res/values/strings.xml b/encrypt/src/main/res/values/strings.xml
index e4c156704..0dd698c07 100644
--- a/encrypt/src/main/res/values/strings.xml
+++ b/encrypt/src/main/res/values/strings.xml
@@ -18,10 +18,4 @@
     along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string name="encryption_rijndael">Rijndael (AES)</string>
-    <string name="encryption_twofish">Twofish</string>
-    <string name="encryption_chacha20">ChaCha20</string>
-    <string name="kdf_AES">AES</string>
-    <string name="kdf_Argon2d">Argon2d</string>
-    <string name="kdf_Argon2id">Argon2id</string>
 </resources>