diff --git a/app/src/main/res/layout/card_slot.xml b/app/src/main/res/layout/card_slot.xml
deleted file mode 100644
index 40cf969792..0000000000
--- a/app/src/main/res/layout/card_slot.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <LinearLayout
-        android:id="@+id/button_edit"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="horizontal"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
-        android:paddingTop="12.5dp"
-        android:paddingBottom="12.5dp"
-        android:foreground="?android:attr/selectableItemBackground">
-
-        <ImageView
-            android:id="@+id/img_slot"
-            app:tint="?attr/iconColorPrimary"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="15dp"/>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:id="@+id/text_slot_name"
-                android:textColor="?android:attr/textColorPrimary"/>
-
-            <TextView
-                android:id="@+id/text_slot_used"
-                android:text="@string/slot_this_device"
-                android:visibility="gone"
-                android:layout_marginStart="5dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="1dp"
-        android:layout_height="match_parent"
-        android:background="@android:color/darker_gray"
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
-        android:layout_marginTop="12.5dp"
-        android:layout_marginBottom="12.5dp"/>
-
-    <ImageView
-        android:id="@+id/button_delete"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_delete_black_24dp"
-        app:tint="?attr/iconColorPrimary"
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
-        android:paddingTop="12.5dp"
-        android:paddingBottom="12.5dp"
-        android:foreground="?android:attr/selectableItemBackground"/>
-
-</LinearLayout>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 8f85171ff4..e4970acff7 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -305,9 +305,7 @@
     <string name="import_google_auth_failure">فشل استيراد تصدير Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">يحتوي التصدير على معلومات عن دُفعة غير ذات صلة. حاول استيراد دفعة واحدة في كل مرة.</string>
     <string name="no_tokens_can_be_imported">نتيجة لذلك، لا يمكن استيراد أي رموز</string>
-    <string name="authentication_method_raw">خام</string>
     <string name="unlocking_vault">يتم فتح قفل المخزن</string>
-    <string name="slot_this_device">(هذه الأجهزة)</string>
     <string name="remove_group">إزالة المجموعة</string>
     <string name="remove_group_description">هل ترغب حقًا في إزالة هذه المجموعة؟ ستتحول المدخلات في هذه المجموعة تلقائيًا إلى &quot;غير مجمّعة&quot;</string>
     <string name="remove_icon_pack">حذف حزمة الأيقونات</string>
@@ -463,7 +461,6 @@
     <string name="title_activity_about">عن</string>
     <string name="title_activity_edit_entry">تعديل الإدخال</string>
     <string name="title_activity_scan_qr">قم بمسح رمز QR</string>
-    <string name="title_activity_manage_slots">إدارة فتحات المفاتيح</string>
     <string name="title_activity_import_entries">استيراد المدخلات</string>
     <string name="dialog_wipe_entries_title">حذف المدخلات</string>
     <string name="dialog_wipe_entries_message">يحتوي مخزنك بالفعل على إدخالات. هل تريد إزالة هذه الإدخالات قبل استيراد هذا المِلَفّ؟\n\n<b>عند القيام بذلك، ستفقد الوصول بشكل دائم إلى الإدخالات الموجودة في الخزنة.</b></string>
diff --git a/app/src/main/res/values-ast-rES/strings.xml b/app/src/main/res/values-ast-rES/strings.xml
index f74ff44db0..199b511fbb 100644
--- a/app/src/main/res/values-ast-rES/strings.xml
+++ b/app/src/main/res/values-ast-rES/strings.xml
@@ -254,9 +254,7 @@
     <string name="import_google_auth_failure">La importación de la esportación de Google Authenticator falló</string>
     <string name="unrelated_google_auth_batches_error">La esportación contién información d\'un llote que nun tien rellación. Prueba a importar llotes d\'unu nunu.</string>
     <string name="no_tokens_can_be_imported">Como resultáu, nun se pue importar nengún pase</string>
-    <string name="authentication_method_raw">En bruto</string>
     <string name="unlocking_vault">Desbloquiando l\'arca</string>
-    <string name="slot_this_device">(esti preséu)</string>
     <string name="remove_group">Desaniciu d\'un grupu</string>
     <string name="remove_group_description">¿De xuru que quies quitar esti grupu? Les entraes d\'esti grupu cambien automáticamente al grupu «Ensin grupu».</string>
     <string name="remove_icon_pack">Desaniciu d\'un paquete d\'iconos</string>
@@ -387,7 +385,6 @@
     <string name="title_activity_about">Tocante a</string>
     <string name="title_activity_edit_entry">Edición d\'una entrada</string>
     <string name="title_activity_scan_qr">Escanéu d\'un códigu QR</string>
-    <string name="title_activity_manage_slots">Xestión de les claves</string>
     <string name="title_activity_import_entries">Importación d\'entraes</string>
     <string name="dialog_wipe_entries_title">Borráu d\'entraes</string>
     <string name="dialog_wipe_entries_message">L\'arca xá contién entraes. ¿Quies quitales enantes d\'importar esti ficheru?\n\n<b>Al facelo, vas perder permanentemente l\'accesu a les entraes esistentes de l\'arca.</b></string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index fcdf7588cc..90ced7e1f3 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -224,9 +224,7 @@
     <string name="partial_google_auth_import">Установени са частично изнасени данни за Google Authenticator</string>
     <string name="partial_google_auth_import_warning">Няколко QR кода не са внесени. Следните кодове липсват:\n\n<b>%s</b>\n\nМожете да продължите с частично внасяне на данни, но е препоръчително да направите нов опит с всички QR кодове без риск от загуба на маркери за достъп.</string>
     <string name="import_google_auth_failure">Грешка при внасяне към Google Authenticator</string>
-    <string name="authentication_method_raw">Необработен</string>
     <string name="unlocking_vault">Отключване на трезора</string>
-    <string name="slot_this_device">(това устройство)</string>
     <string name="remove_group">Премахни група</string>
     <string name="remove_group_description">Наистина ли искате да премахнете тази група? Записите в тази група автоматично ще преминат към „Без група“.</string>
     <string name="details">Подробности</string>
@@ -325,7 +323,6 @@
     <string name="title_activity_about">Относно</string>
     <string name="title_activity_edit_entry">Редактиране на запис</string>
     <string name="title_activity_scan_qr">Скенирай QR код</string>
-    <string name="title_activity_manage_slots">Управление на слотове за ключове</string>
     <string name="title_activity_import_entries">Импортиране на записи</string>
     <string name="dialog_wipe_entries_title">Изтрий записи</string>
     <string name="dialog_wipe_entries_message">Трезорът ви вече съдържа записи. Искате ли да премахнете тези записи, преди да импортирате този файл?\n\n<b> По този начин ще загубите за постоянно достъп до съществуващите записи в трезора.</b></string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 04cc478140..c257290143 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -263,9 +263,7 @@
     <string name="import_google_auth_failure">No s\'ha pogut importar l\'exportació de Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">L\'exportació conté informació d\'un lot no relacionat. Proveu d\'importar 1 lot alhora.</string>
     <string name="no_tokens_can_be_imported">Com a resultat, no es poden importar tokens</string>
-    <string name="authentication_method_raw">En cru</string>
     <string name="unlocking_vault">Desbloquejant la volta</string>
-    <string name="slot_this_device">(aquest dispositiu)</string>
     <string name="remove_group">Elimina el grup</string>
     <string name="remove_group_description">Segur que vols eliminar aquest grup? Les entrades canviaran automàticament a \"Sense grup\".</string>
     <string name="remove_icon_pack">Esborra el paquet d\'icones</string>
@@ -405,7 +403,6 @@
     <string name="title_activity_about">Quant a</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escaneja un codi QR</string>
-    <string name="title_activity_manage_slots">Gestiona les entrades</string>
     <string name="title_activity_import_entries">Importa entrades</string>
     <string name="dialog_wipe_entries_title">Elimina entrades</string>
     <string name="dialog_wipe_entries_message">La teva volta ja té entrades. Vols eliminar les entrades abans d\'importar aquest fitxer?\n\n<b>Si ho fas, perdràs l\'accés a les entrades que tens actualment.</b></string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index f196e2a3d4..7c6c2495c5 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -289,9 +289,7 @@
     <string name="import_google_auth_failure">Importování exportu z Google Authenticator selhalo</string>
     <string name="unrelated_google_auth_batches_error">Export obsahuje informace o nesouvisejícím balíku. Zkuste importovat 1 balík najednou.</string>
     <string name="no_tokens_can_be_imported">Nebyly importovány žádné tokeny</string>
-    <string name="authentication_method_raw">Prosté</string>
     <string name="unlocking_vault">Odemykání trezoru</string>
-    <string name="slot_this_device">(toto zařízení)</string>
     <string name="remove_group">Odstranit skupinu</string>
     <string name="remove_group_description">Opravdu chcete odstranit tuto skupinu? Záznamy z ní budou automaticky přemístěny do „Žádná skupina“.</string>
     <string name="remove_icon_pack">Odstranit balíček ikon</string>
@@ -441,7 +439,6 @@
     <string name="title_activity_about">O aplikaci</string>
     <string name="title_activity_edit_entry">Upravit položku</string>
     <string name="title_activity_scan_qr">Naskenovat QR kód</string>
-    <string name="title_activity_manage_slots">Spravovat sloty klíčů</string>
     <string name="title_activity_import_entries">Importovat položky</string>
     <string name="dialog_wipe_entries_title">Vyčistit položky</string>
     <string name="dialog_wipe_entries_message">Váš trezor už obsahuje záznamy. Chcete tyto záznamy smazat před importem tohoto souboru?\n\n<b>Přístup ke všem stávajícím položkám v trezoru trvale ztratíte.</b></string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index bf215aa848..dedb395b29 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -273,9 +273,7 @@
     <string name="import_google_auth_failure">Import af Google Authenticator-eksport mislykkedes</string>
     <string name="unrelated_google_auth_batches_error">Eksporten indeholder information om et urelateret sæt. Prøv at importere 1 sæt ad gangen.</string>
     <string name="no_tokens_can_be_imported">Som konsekvens, kan ingen tokener importeres</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Oplåser Boksen</string>
-    <string name="slot_this_device">(denne enhed)</string>
     <string name="remove_group">Fjern gruppe</string>
     <string name="remove_group_description">Sikker på, at denne gruppe skal fjernes? Poster heri vil automatisk skifte til \'Ingen gruppe\'.</string>
     <string name="remove_icon_pack">Fjern ikonpakke</string>
@@ -419,7 +417,6 @@
     <string name="title_activity_about">Om</string>
     <string name="title_activity_edit_entry">Redigér post</string>
     <string name="title_activity_scan_qr">Scan en QR-kode</string>
-    <string name="title_activity_manage_slots">Administrér nøglepladser</string>
     <string name="title_activity_import_entries">Importer poster</string>
     <string name="dialog_wipe_entries_title">Ryd poster</string>
     <string name="dialog_wipe_entries_message">Din boks indeholder allerede poster. Vil du fjerne disse poster før import af denne fil?\n\n<b>Ved at gøre dette, vil du permanent miste adgang til de eksisterende poster i boksen.</b></string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 4c0ad6ca84..d8ba0cd35f 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -273,9 +273,7 @@
     <string name="import_google_auth_failure">Importieren von Google Authenticator-Export fehlgeschlagen</string>
     <string name="unrelated_google_auth_batches_error">Der Export enthält Informationen über ein nicht zugehöriges Set. Versuche, jeweils 1 Set zu importieren.</string>
     <string name="no_tokens_can_be_imported">Daher können keine Token importiert werden</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Entsperren der Datenbank</string>
-    <string name="slot_this_device">(Dieses Gerät)</string>
     <string name="remove_group">Gruppe entfernen</string>
     <string name="remove_group_description">Möchtest du diese Gruppe wirklich entfernen? Einträge in dieser Gruppe wechseln automatisch zu »Keine Gruppe«.</string>
     <string name="remove_icon_pack">Symbolpaket entfernen</string>
@@ -419,7 +417,6 @@
     <string name="title_activity_about">Über</string>
     <string name="title_activity_edit_entry">Eintrag bearbeiten</string>
     <string name="title_activity_scan_qr">Scanne einen QR-Code</string>
-    <string name="title_activity_manage_slots">Schlüsselplätze verwalten</string>
     <string name="title_activity_import_entries">Einträge importieren</string>
     <string name="dialog_wipe_entries_title">Einträge löschen</string>
     <string name="dialog_wipe_entries_message">Deine Datenbank enthält bereits Einträge. Möchtest du diese Einträge entfernen, bevor diese Datei importiert wird?\n\n<b>Wenn du dies tust, verlierst du dauerhaft den Zugriff auf die vorhandenen Einträge in der Datenbank.</b></string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 3bf2b9a8bc..732d3a244d 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -273,9 +273,7 @@
     <string name="import_google_auth_failure">Η εισαγωγή της εξαγωγής του Επαληθευτή Google απέτυχε</string>
     <string name="unrelated_google_auth_batches_error">Η εξαγωγή περιέχει πληροφορίες για μια άσχετη παρτίδα. Δοκιμάστε να εισαγάγετε 1 παρτίδα τη φορά.</string>
     <string name="no_tokens_can_be_imported">Ως αποτέλεσμα, δεν μπορούν να εισαχθούν αναγνωστικά</string>
-    <string name="authentication_method_raw">Ακατέργαστη</string>
     <string name="unlocking_vault">Ξεκλείδωμα κρύπτης</string>
-    <string name="slot_this_device">(αυτή η συσκευή)</string>
     <string name="remove_group">Κατάργηση ομάδας</string>
     <string name="remove_group_description">Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτήν την ομάδα; Οι καταχωρίσεις σε αυτήν θα μεταβούν αυτόματα στο \"Χωρίς ομάδα\".</string>
     <string name="remove_icon_pack">Αφαίρεση πακέτου εικονιδίων</string>
@@ -418,7 +416,6 @@
     <string name="title_activity_about">Σχετικά</string>
     <string name="title_activity_edit_entry">Επεξεργασία καταχώρησης</string>
     <string name="title_activity_scan_qr">Σάρωση κωδικού QR</string>
-    <string name="title_activity_manage_slots">Διαχείριση κλειδιών υποδοχής</string>
     <string name="title_activity_import_entries">Εισαγωγή καταχωρήσεων</string>
     <string name="dialog_wipe_entries_title">Διαγραφή καταχωρήσεων</string>
     <string name="dialog_wipe_entries_message">Η κρύπτη σας περιέχει ήδη καταχωρήσεις. Θέλετε να καταργήσετε αυτές τις καταχωρήσεις πριν από την εισαγωγή αυτού του αρχείου;\n\n <b> Με αυτόν τον τρόπο, θα χάσετε μόνιμα την πρόσβαση στις υπάρχουσες καταχωρήσεις στην κρύπτη. </b></string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index eb064078a6..36e670d964 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -272,9 +272,7 @@
     <string name="import_google_auth_failure">Ha fallado la importación de lo exportado de Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">La exportación contiene información para un lote no relacionado. Intente importar 1 lote a la vez.</string>
     <string name="no_tokens_can_be_imported">Como resultado no se puede importar ningún token</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Desbloqueando la bóveda</string>
-    <string name="slot_this_device">(este dispositivo)</string>
     <string name="remove_group">Eliminar grupo</string>
     <string name="remove_group_description">¿Está seguro de que desea eliminar este grupo? Las entradas se moverán automáticamente a \'Sin grupo\'.</string>
     <string name="remove_icon_pack">Eliminar paquete de iconos</string>
@@ -418,7 +416,6 @@
     <string name="title_activity_about">Acerca de</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escanear un código QR</string>
-    <string name="title_activity_manage_slots">Administrar claves</string>
     <string name="title_activity_import_entries">Importar entradas</string>
     <string name="dialog_wipe_entries_title">Limpiar entradas</string>
     <string name="dialog_wipe_entries_message">Su bóveda ya contiene entradas. ¿Desea eliminarlas antes de importar este archivo?\n\n<b>Al hacerlo, perderá permanentemente el acceso a las entradas existentes en la bóveda.</b></string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index e566241d15..ad01b255fb 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -273,9 +273,7 @@
     <string name="import_google_auth_failure">Google Authenticatorren esportazioa inportatzeak huts egin du</string>
     <string name="unrelated_google_auth_batches_error">Esportazioak zerikusirik ez duen sorta baten informazioa du. Saiatu sorta bakoitza bere aldetik inportatzen.</string>
     <string name="no_tokens_can_be_imported">Ez izan da tokenik inportatu</string>
-    <string name="authentication_method_raw">Gordina</string>
     <string name="unlocking_vault">Biltegia desblokeatzen</string>
-    <string name="slot_this_device">(gailu hau)</string>
     <string name="remove_group">Ezabatu taldea</string>
     <string name="remove_group_description">Ziur zaude talde hau ezabatu nahi duzula? Talde honetako sarrerak automatikoki aldatuko dira \'Talderik ez\' aukerara.</string>
     <string name="remove_icon_pack">Ezabatu ikono multzoa</string>
@@ -417,7 +415,6 @@
     <string name="title_activity_about">Honi buruz</string>
     <string name="title_activity_edit_entry">Editatu sarrera</string>
     <string name="title_activity_scan_qr">Eskaneatu QR kodea</string>
-    <string name="title_activity_manage_slots">Kudeatu arteka giltzarriak</string>
     <string name="title_activity_import_entries">Inportatu sarrerak</string>
     <string name="dialog_wipe_entries_title">Garbitu sarrerak</string>
     <string name="dialog_wipe_entries_message">Zure biltegiak sarrerak ditu dagoeneko. Sarrera horiek ezabatu nahi dituzu fitxategi hau inportatu aurretik?\n\n<b>Hori egitean, biltegiko sarreretarako sarbidea galduko da betirako.</b></string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 069ea507d9..6aef7a9aed 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -193,9 +193,7 @@
     <string name="no_cameras_available">هیچ دوربینی در دسترس نیست</string>
     <string name="read_qr_error">هنگام خواندن بارکد دوبعدی خطایی رخ داد</string>
     <string name="read_qr_error_phonefactor">آگیس با الگوریتم اختصاصی 2FA مایکروسافت سازگاری ندارد. لطفا اطمینان حاصل فرمایید که گزینه \"تنظیم برنامه بدون اعلانات\" در تنظیمات 2FA آفیس 365 انتخاب شده باشد.</string>
-    <string name="authentication_method_raw">خام</string>
     <string name="unlocking_vault">رمزگشایی مزخن</string>
-    <string name="slot_this_device">(این دستگاه)</string>
     <string name="remove_group">حذف گروه</string>
     <string name="remove_group_description">آیا مطمئن به حذف این گروه هستید؟ تمام آیتم های داخل این گروه تبدیل به \"بدون گروه\" می‌شوند.</string>
     <string name="details">جزئیات</string>
@@ -285,7 +283,6 @@
     <string name="title_activity_about">درباره‌ما</string>
     <string name="title_activity_edit_entry">ویرایش آیتم</string>
     <string name="title_activity_scan_qr">اسکن بارکد دوبعدی</string>
-    <string name="title_activity_manage_slots">مدیریت کلید‌ها</string>
     <string name="dialog_wipe_entries_title">پاک کردن موارد</string>
     <string name="dialog_wipe_entries_message">مخزن شما در حال حاضر شامل آیتم می‌باشد. آیا مطمئن به حذف این آیتم‌ها قبل از وارد کردن می‌باشید؟\n\n<b>بعد از این کار شما به هیچ وجه دسترسی به آیتم های قبلی نخواهید داشت.</b></string>
     <string name="dialog_wipe_entries_checkbox">پاک کردن اطلاعات مخزن</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index dc4994500b..6f900dd9b8 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -271,9 +271,7 @@
     <string name="import_google_auth_failure">Google Authenticatorin varmuuskopion tuonti epäonnistui</string>
     <string name="unrelated_google_auth_batches_error">Vienti sisältää tietoa liittymättömästä erästä. Yritä tuoda 1 erä kerrallaan.</string>
     <string name="no_tokens_can_be_imported">Tämän seurauksena yhtäkään todennuskoodia ei voitu tuoda</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Holvia avataan</string>
-    <string name="slot_this_device">(tämä laite)</string>
     <string name="remove_group">Poista ryhmä</string>
     <string name="remove_group_description">Poistetaanko tämä ryhmä? Ryhmässä olevat kohteet merkitään automaattisesti ryhmättömiksi.</string>
     <string name="remove_icon_pack">Poista kuvakepaketti</string>
@@ -416,7 +414,6 @@
     <string name="title_activity_about">Tietoja</string>
     <string name="title_activity_edit_entry">Muokkaa kohdetta</string>
     <string name="title_activity_scan_qr">Skannaa QR-koodi</string>
-    <string name="title_activity_manage_slots">Hallitse avainpaikkoja</string>
     <string name="title_activity_import_entries">Tuo kohteet</string>
     <string name="dialog_wipe_entries_title">Tyhjennä kohteet</string>
     <string name="dialog_wipe_entries_message">Holvisi sisältää jo kohteita. Haluatko poistaa nämä kohteet ennen tämän tiedoston tuontia?\n\n<b>Tehdessäsi näin menetät pysyvästi pääsyn holvin olemassa oleviin kohteisiin.</b></string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 16e6317323..55dbb17b6e 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -273,9 +273,7 @@
     <string name="import_google_auth_failure">L\'import de l\'export Google Authenticator a échoué</string>
     <string name="unrelated_google_auth_batches_error">L\'export contient des informations pour un lot non lié. Essayez d\'importer 1 lot à la fois.</string>
     <string name="no_tokens_can_be_imported">Aucun jeton ne peut être importé en conséquence</string>
-    <string name="authentication_method_raw">Brut</string>
     <string name="unlocking_vault">Déverrouillage du coffre-fort</string>
-    <string name="slot_this_device">(ces appareils)</string>
     <string name="remove_group">Supprimer groupe</string>
     <string name="remove_group_description">Êtes-vous sûr de vouloir supprimer ce groupe ? Les entrées dans ce groupe seront basculées automatiquement dans \"Aucun groupe\".</string>
     <string name="remove_icon_pack">Supprimer le pack d\'icônes</string>
@@ -418,7 +416,6 @@
     <string name="title_activity_about">À propos</string>
     <string name="title_activity_edit_entry">Modifier l\'entrée</string>
     <string name="title_activity_scan_qr">Scanner un code QR</string>
-    <string name="title_activity_manage_slots">Gérer les emplacements de clés</string>
     <string name="title_activity_import_entries">Importer des entrées</string>
     <string name="dialog_wipe_entries_title">Effacer les entrées</string>
     <string name="dialog_wipe_entries_message">Votre coffre-fort contient déjà des entrées. Voulez-vous supprimer ces entrées avant d\'importer ce fichier ?\n\n<b>En faisant cela, vous perdrez définitivement l\'accès aux entrées existantes dans le coffre-fort.</b></string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 7fbfd16b2e..e526de8efb 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -273,9 +273,7 @@
     <string name="import_google_auth_failure">Ymportearjen fan Google Authenticator-eksport mislearre</string>
     <string name="unrelated_google_auth_batches_error">Eksport befettet ynformaasje foar in net relatearre batch. Probearje 1 batch tagelyk te ymportearjen.</string>
     <string name="no_tokens_can_be_imported">Hjirtroch kinne gjin tokens ymportearre wurde</string>
-    <string name="authentication_method_raw">Rûch</string>
     <string name="unlocking_vault">Klûs wurdt ûntskoattele</string>
-    <string name="slot_this_device">(dit apparaat)</string>
     <string name="remove_group">Groep fuortsmite</string>
     <string name="remove_group_description">Bisto wis datsto dizze groep fuortsmite wolst? Alle items binnen dizze groep wurde automatysk ferpleatst nei ‘Gjin groep’.</string>
     <string name="remove_icon_pack">Piktogrammepakket fuortsmite</string>
@@ -419,7 +417,6 @@
     <string name="title_activity_about">Oer</string>
     <string name="title_activity_edit_entry">Item bewurkje</string>
     <string name="title_activity_scan_qr">Scan in QR-koade</string>
-    <string name="title_activity_manage_slots">Kaaislots beheare</string>
     <string name="title_activity_import_entries">Items ymportearje</string>
     <string name="dialog_wipe_entries_title">Items wiskje</string>
     <string name="dialog_wipe_entries_message">Dyn klûs befettet al items. Wolsto dizze items fuortsmite eardatsto dit bestân ymportearrest?\n\n<b>Hjirmei ferliesto permanint tagong ta de besteande items yn de klûs.</b></string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 73649dd996..449ca22134 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -263,9 +263,7 @@
     <string name="import_google_auth_failure">Fallou a importación do exportado con Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">A exportación contén información sobre un lote non relacionado. Intenta importar 1 lote de cada vez.</string>
     <string name="no_tokens_can_be_imported">Polo tanto, non se pode importar ningún token</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Desbloqueando o almacén</string>
-    <string name="slot_this_device">(este dispositivo)</string>
     <string name="remove_group">Quitar grupo</string>
     <string name="remove_group_description">Tes a certeza de que queres quitar este grupo? As entradas deste grupo pasarán automaticamente a \"Sen grupo\".</string>
     <string name="remove_icon_pack">Quitar paquete de iconas</string>
@@ -407,7 +405,6 @@
     <string name="title_activity_about">Información</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escanear un código QR</string>
-    <string name="title_activity_manage_slots">Xestionar espazos de claves</string>
     <string name="title_activity_import_entries">Importar entradas</string>
     <string name="dialog_wipe_entries_title">Limpar entradas</string>
     <string name="dialog_wipe_entries_message">O teu almacén xa contén entradas. Queres eliminalas antes de importar o ficheiro?\n\n<b>Se o fas, perderás o acceso ás entradas existentes no almacén para sempre.</b></string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 47339d45be..0d0bbece1c 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -263,9 +263,7 @@
     <string name="import_google_auth_failure">गूगल ऑथेंटिकेटर एक्सपोर्ट को इंपोर्ट करना असफल हुआ</string>
     <string name="unrelated_google_auth_batches_error">एक्सपोर्ट में किसी असंबंधित बैच की जानकारी शामिल है. एक समय में 1 बैच इंपोर्ट करने का प्रयास करें।</string>
     <string name="no_tokens_can_be_imported">परिणामस्वरूप कोई टोकन आयात नहीं किया जा सकता</string>
-    <string name="authentication_method_raw">रॉ</string>
     <string name="unlocking_vault">वॉल्ट अनलॉक हो रहा है</string>
-    <string name="slot_this_device">(यह डिवाइस)</string>
     <string name="remove_group">समूह हटाये</string>
     <string name="remove_group_description">क्या आप वाकई इस समूह को हटाना चाहते हैं? इस समूह में प्रविष्टियाँ स्वतः ही \'नो ग्रुप\' में बदल जाएँगी।</string>
     <string name="remove_icon_pack">आइकन पैक हटाएं</string>
@@ -405,7 +403,6 @@
     <string name="title_activity_about">ऐप के बारे में</string>
     <string name="title_activity_edit_entry">प्रविष्टि संपादित करें</string>
     <string name="title_activity_scan_qr">क्यूआर कोड स्कैन करें</string>
-    <string name="title_activity_manage_slots">कुंजी स्लॉट प्रबंधन करें</string>
     <string name="title_activity_import_entries">प्रविष्टियाँ आयात करें</string>
     <string name="dialog_wipe_entries_title">प्रविष्टियों को साफ करें</string>
     <string name="dialog_wipe_entries_message">आपके वॉल्ट में पहले से ही प्रविष्टियाँ हैं। क्या आप इस फ़ाइल को आयात करने से पहले इन प्रविष्टियों को निकालना चाहते हैं?\n\n<b> ऐसा करने पर, आप स्थायी रूप से वॉल्ट में मौजूदा प्रविष्टियों तक पहुंच खो देंगे। </b></string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 2912a005bf..d399581091 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -244,9 +244,7 @@
     <string name="missing_qr_code_descriptor">• QR kód %d</string>
     <string name="import_partial_export_anyway">%d tokenek importálása mindenképp</string>
     <string name="import_google_auth_failure">Google Authenticator export importálása sikertelen</string>
-    <string name="authentication_method_raw">Nyers</string>
     <string name="unlocking_vault">A széf feloldása</string>
-    <string name="slot_this_device">(ez az eszköz)</string>
     <string name="remove_group">Csoport eltávolítása</string>
     <string name="remove_group_description">Biztos, hogy eltávolítja ezt a csoportot? A csoport bejegyzései automatikusan „Csoport nélküli” elemek lesznek.</string>
     <string name="remove_icon_pack">Ikon csomag törlése</string>
@@ -357,7 +355,6 @@
     <string name="title_activity_about">Névjegy</string>
     <string name="title_activity_edit_entry">Elem szerkesztése</string>
     <string name="title_activity_scan_qr">QR kód beolvasása</string>
-    <string name="title_activity_manage_slots">Kulcs helyek kezelése</string>
     <string name="title_activity_import_entries">Elemek importálása</string>
     <string name="dialog_wipe_entries_title">Elemek letörlése</string>
     <string name="dialog_wipe_entries_message">A széfe már tartalmaz elemeket. Le akarja törölni ezeket, mielőtt importálja az újakat?\n\n<b>Ha így dönt, örökre elveszíti a már meglevő adatokat.</b></string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index b913396c58..72dcdb1e95 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -211,9 +211,7 @@
     <string name="no_cameras_available">Kamera tidak tersedia</string>
     <string name="read_qr_error">Terjadi kesalahan saat membaca kode QR</string>
     <string name="read_qr_error_phonefactor">Aegis tidak sesuai dengan algoritma 2FA milik Microsoft. Tolong untuk memastikan telah memilih \"Atur aplikasi tanpa notifikasi\" ketika mengonfigurasi 2FA di Office 365.</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Buka brankas</string>
-    <string name="slot_this_device">(perangkat ini)</string>
     <string name="remove_group">Hapus kelompok</string>
     <string name="remove_group_description">Apakah Anda yakin ingin menghapus kelompok ini? Catatan dalam kelompok ini akan secara otomatis beralih ke \'Tidak ada kelompok\'.</string>
     <string name="remove_icon_pack">Hapus Paket Ikon</string>
@@ -326,7 +324,6 @@
     <string name="title_activity_about">Tentang</string>
     <string name="title_activity_edit_entry">Sunting entri</string>
     <string name="title_activity_scan_qr">Pindai kode QR</string>
-    <string name="title_activity_manage_slots">Atur slot kunci</string>
     <string name="title_activity_import_entries">Impor entri</string>
     <string name="dialog_wipe_entries_title">Hapus catatan</string>
     <string name="dialog_wipe_entries_message">Brankas Anda sudah memiliki catatan. Apakah Anda ingin menghapus catatan ini tanpa mengimpor berkas ini?\n\n<b>Jika ini dilakukan, Anda akan kehilangan akses secara permanen ke catatan yang ada di brankas.</b></string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 53d8f29dd7..6b872e50d1 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -273,9 +273,7 @@
     <string name="import_google_auth_failure">Importazione dell\'esportazione di Google Authenticator non riuscita</string>
     <string name="unrelated_google_auth_batches_error">L\'esportazione contiene informazioni per un lotto non correlato. Provare a importare un lotto alla volta.</string>
     <string name="no_tokens_can_be_imported">Di conseguenza non è possibile importare token</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Sblocco della cassaforte</string>
-    <string name="slot_this_device">(questo dispositivo)</string>
     <string name="remove_group">Rimuovi gruppo</string>
     <string name="remove_group_description">Sei sicuro di voler rimuovere questo gruppo? Gli elementi in questo gruppo verranno automaticamente spostati in \'Nessun gruppo\'.</string>
     <string name="remove_icon_pack">Rimuovi pacchetto di icone</string>
@@ -418,7 +416,6 @@
     <string name="title_activity_about">Informazioni su</string>
     <string name="title_activity_edit_entry">Modifica voce</string>
     <string name="title_activity_scan_qr">Scansiona un codice QR</string>
-    <string name="title_activity_manage_slots">Gestisci slot di chiavi</string>
     <string name="title_activity_import_entries">Importa voci</string>
     <string name="dialog_wipe_entries_title">Cancella voci</string>
     <string name="dialog_wipe_entries_message">La tua cassaforte contiene già delle voci. Rimuovere queste voci prima di importare questo file?\n\n<b>In questo modo, perderai definitivamente l\'accesso alle voci esistenti nella cassaforte.</b></string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 3b54f17d9a..0c0620311e 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -256,9 +256,7 @@
     <string name="import_google_auth_failure">ייבוא ייצוא מאמת Google נכשל</string>
     <string name="unrelated_google_auth_batches_error">ייצוא מכיל מידע עבור אצווה לא קשורה. נסה לייבא אצווה אחת בכל פעם.</string>
     <string name="no_tokens_can_be_imported">לא ניתן לייבא אסימונים כתוצאה מכך</string>
-    <string name="authentication_method_raw">גולמי</string>
     <string name="unlocking_vault">פתיחת הכספת</string>
-    <string name="slot_this_device">(המכשיר הזה)</string>
     <string name="remove_group">הסר קבוצה</string>
     <string name="remove_group_description">האם אתה בטוח שברצונך להסיר קבוצה זו? ערכים בקבוצה זו יעברו באופן אוטומטי ל\'אין קבוצה\'.</string>
     <string name="remove_icon_pack">הסרת חבילת סמלים</string>
@@ -388,7 +386,6 @@
     <string name="title_activity_about">אודות</string>
     <string name="title_activity_edit_entry">ערוך רשומה</string>
     <string name="title_activity_scan_qr">סרוק ברקוד</string>
-    <string name="title_activity_manage_slots">ניהול חריצי מקשים</string>
     <string name="title_activity_import_entries">ייבוא רשומה</string>
     <string name="dialog_wipe_entries_title">מחיקת רשומה</string>
     <string name="dialog_wipe_entries_message">הכספת שלך כבר מכילה ערכים. האם ברצונך להסיר את הערכים הללו לפני ייבוא הקובץ הזה?\n\n<b>בכך, תאבד לצמיתות את הגישה לערכים הקיימים בכספת.</b></string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index cbe35f5ecb..b3512fe019 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -264,9 +264,7 @@
     <string name="import_google_auth_failure">Google Authenticator エクスポートのインポートに失敗しました</string>
     <string name="unrelated_google_auth_batches_error">エクスポートには関連のないバッチの情報が含まれています。一度にひとつのバッチをインポートしてください。</string>
     <string name="no_tokens_can_be_imported">インポートできるトークンはありません</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">保管庫のロックを解除しています</string>
-    <string name="slot_this_device">(このデバイス)</string>
     <string name="remove_group">グループを削除</string>
     <string name="remove_group_description">このグループを削除してもよろしいですか？このグループのエントリーは自動的に「グループなし」に切り替わります。</string>
     <string name="remove_icon_pack">アイコンパックを削除</string>
@@ -406,7 +404,6 @@
     <string name="title_activity_about">このプログラムについて</string>
     <string name="title_activity_edit_entry">エントリーを編集</string>
     <string name="title_activity_scan_qr">QRコードをスキャン</string>
-    <string name="title_activity_manage_slots">キースロットの管理</string>
     <string name="title_activity_import_entries">エントリーをインポート</string>
     <string name="dialog_wipe_entries_title">エントリーを消去</string>
     <string name="dialog_wipe_entries_message">あなたの保管庫には既にエントリーが含まれています。このファイルをインポートする前に、これらのエントリーを削除しますか？\n\n<b>その場合、保管庫内の既存のエントリーへのアクセスが永久に失われます。</b></string>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
index 44d8453e4f..2e6c7f8556 100644
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@@ -122,7 +122,6 @@
     <string name="import_error_title">ಅಮದಿಸುವಾಗ ಒಂದು ಅಥವಾ ಜಾಸ್ತಿ ದೋಷಗಳು ಸಂಭವಿಸಿದೆ</string>
     <string name="no_cameras_available">ಯಾವುದೇ ಕ್ಯಾಮರಾಗಳು ಲಭ್ಯವಿಲ್ಲ</string>
     <string name="read_qr_error">ಕ್ಯೂ ಆರ್ ಸಂಕೇತವನ್ನು ಓದಲು ಪ್ರಯತ್ನಿಸುವಾಗ ಒಂದು ದೋಷ ಸಂಭವಿಸಿದೆ</string>
-    <string name="authentication_method_raw">ಕಚ್ಚಾ</string>
     <string name="unlocking_vault">ವೌಲ್ಟಿನ ಬೀಗವನ್ನು ತೆರೆಯಲಾಗುತ್ತಿದೆ</string>
     <string name="remove_group">ಗುಂಪನ್ನು ತೆಗೆದುಹಾಕು</string>
     <string name="remove_group_description">ನಿಜವಾಗಲು ಈ ಗುಂಪನ್ನು ತೆರೆಯಾಲು ಬಯಸುವಿರಾ? ಈ ಗುಂಪಿನಾಲ್ಲಿರುವ ಎಂಟ್ರಿಗಳು ಸ್ವಯಂಚಾಲಿತವಾಗಿ \'ಗುಂಪಿಲ್ಲ\'ಗೆ ಬದಲಾವಣೆ ಆಗುತ್ತವೆ.</string>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
index 2ab07a20ee..1056e8f3e1 100644
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@@ -281,9 +281,7 @@
     <string name="import_google_auth_failure">Neizdevās ievietošana no Google Authenticator izdošanas datnes</string>
     <string name="unrelated_google_auth_batches_error">Izdošanas datne satur informāciju par nesaistītu paketi. Var mēģināt ievietot pa vienai paketei vienlaicīgi.</string>
     <string name="no_tokens_can_be_imported">Iznākumā nevar ievietot nevienu kodu</string>
-    <string name="authentication_method_raw">Neapstrādāts</string>
     <string name="unlocking_vault">Atslēgšana ar biometriju</string>
-    <string name="slot_this_device">(šī ierīce)</string>
     <string name="remove_group">Noņemt kopu</string>
     <string name="remove_group_description">Vai tiešām noņemt šo kopu? Tās ieraksti tiks pārmainīti uz \"Nav kopas\".</string>
     <string name="remove_icon_pack">Noņemt ikonu pakotni</string>
@@ -430,7 +428,6 @@
     <string name="title_activity_about">Par</string>
     <string name="title_activity_edit_entry">Labot ierakstu</string>
     <string name="title_activity_scan_qr">Nolasīt kvadrātkodu</string>
-    <string name="title_activity_manage_slots">Pārvaldīt atslēgu vietas</string>
     <string name="title_activity_import_entries">Ievietot ierakstus</string>
     <string name="dialog_wipe_entries_title">Notīrīt ierakstus</string>
     <string name="dialog_wipe_entries_message">Glabātava jau satur ierakstus. Vai tos noņemt, pirms tiek ievietota šī datne?\n\n<b>Šādi rīkojoties, tiks zaudēta piekļuve pašreizējiem glabātavas ierakstiem.</b></string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 169bd47f88..4b52effdb9 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -273,9 +273,7 @@
     <string name="import_google_auth_failure">Importeren van Google Authenticator-export mislukt</string>
     <string name="unrelated_google_auth_batches_error">Export bevat informatie voor een niet gerelateerde batch. Probeer 1 batch tegelijk te importeren.</string>
     <string name="no_tokens_can_be_imported">Hierdoor kunnen geen tokens worden geïmporteerd</string>
-    <string name="authentication_method_raw">Onbewerkt</string>
     <string name="unlocking_vault">Kluis wordt ontgrendeld</string>
-    <string name="slot_this_device">(dit apparaat)</string>
     <string name="remove_group">Groep verwijderen</string>
     <string name="remove_group_description">Weet je zeker dat je deze groep wilt verwijderen? Alle items binnen deze groep worden automatisch verplaatst naar ‘Geen groep’.</string>
     <string name="remove_icon_pack">Pictogrammenpakket verwijderen</string>
@@ -419,7 +417,6 @@
     <string name="title_activity_about">Over</string>
     <string name="title_activity_edit_entry">Item bewerken</string>
     <string name="title_activity_scan_qr">QR-code scannen</string>
-    <string name="title_activity_manage_slots">Sleutelslots beheren</string>
     <string name="title_activity_import_entries">Items importeren</string>
     <string name="dialog_wipe_entries_title">Items wissen</string>
     <string name="dialog_wipe_entries_message">Je kluis bevat al items. Wil je deze items verwijderen voordat je dit bestand importeert?\n\n<b>Hiermee verlies je permanent toegang tot de bestaande items in de kluis.</b></string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 73c0d54705..4bfce1ce05 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -289,9 +289,7 @@
     <string name="import_google_auth_failure">Importowanie danych z Google Authenticator nie powiodło się</string>
     <string name="unrelated_google_auth_batches_error">Eksport zawiera informacje dla niepowiązanej partii. Spróbuj importować 1 partię jednocześnie.</string>
     <string name="no_tokens_can_be_imported">Nie można zaimportować żadnych tokenów</string>
-    <string name="authentication_method_raw">Dane surowe</string>
     <string name="unlocking_vault">Odblokowywanie sejfu</string>
-    <string name="slot_this_device">(to urządzenie)</string>
     <string name="remove_group">Usuń grupę</string>
     <string name="remove_group_description">Czy na pewno chcesz usunąć tę grupę? Wpisy z tej grupy zostaną automatycznie przeniesione do kategorii \'Brak grupy\'.</string>
     <string name="remove_icon_pack">Usuń pakiet ikon</string>
@@ -440,7 +438,6 @@
     <string name="title_activity_about">O aplikacji</string>
     <string name="title_activity_edit_entry">Edytuj wpis</string>
     <string name="title_activity_scan_qr">Skanuj kod QR</string>
-    <string name="title_activity_manage_slots">Zarządzaj slotami klucza</string>
     <string name="title_activity_import_entries">Importuj wpisy</string>
     <string name="dialog_wipe_entries_title">Wyczyść wpisy</string>
     <string name="dialog_wipe_entries_message">Twój sejf zawiera już wpisy. Czy chcesz usunąć te wpisy przed zaimportowaniem tego pliku?\n\n<b>W ten sposób trwale stracisz dostęp do obecnych wpisów w sejfie.</b></string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 35684a0259..c4231f76c0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -263,9 +263,7 @@
     <string name="import_google_auth_failure">Falha ao importar exportação do Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">A exportação contém informações para um lote não relacionado. Tente importar 1 lote de cada vez.</string>
     <string name="no_tokens_can_be_imported">Como resultado, nenhum token pode ser importado</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Desbloqueando o cofre</string>
-    <string name="slot_this_device">(esse dispositivo)</string>
     <string name="remove_group">Remover grupo</string>
     <string name="remove_group_description">Você tem certeza que deseja remover esse grupo? Entradas nesse grupo serão automaticamente para \'Sem grupo\'.</string>
     <string name="remove_icon_pack">Remover pacote de ícones</string>
@@ -406,7 +404,6 @@
     <string name="title_activity_about">Sobre</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escanear QR code</string>
-    <string name="title_activity_manage_slots">Gerenciar slots de chaves</string>
     <string name="title_activity_import_entries">Importar entradas</string>
     <string name="dialog_wipe_entries_title">Limpar entradas</string>
     <string name="dialog_wipe_entries_message">O seu cofre já contém entradas. Você quer remover essas entradas antes de importar este arquivo?\n\n<b>Ao fazer isso, você perderá permanentemente o acesso às entradas existentes no cofre.</b></string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ba08b2ecdc..a1e70e0344 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -202,9 +202,7 @@
     <string name="encryption_enable_biometrics_error">Ocorreu um erro ao tentar ativar o desbloqueio biométrico. Alguns dispositivos têm implementações deficientes da autenticação biométrica e é provável que o seu seja um deles. Considere alternar para uma configuração somente senha.</string>
     <string name="no_cameras_available">Nenhuma câmera disponível</string>
     <string name="read_qr_error">Ocorreu um erro ao tentar ler o código QR</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Desbloqueando o cofre</string>
-    <string name="slot_this_device">(este dispositivo)</string>
     <string name="remove_group">Remover grupo</string>
     <string name="remove_group_description">Tem certeza que deseja remover este grupo? As entradas neste grupo automaticamente alternarão para \'Sem grupo\'.</string>
     <string name="details">Detalhes</string>
@@ -293,7 +291,6 @@
     <string name="title_activity_about">Sobre</string>
     <string name="title_activity_edit_entry">Editar entrada</string>
     <string name="title_activity_scan_qr">Escanear um código QR</string>
-    <string name="title_activity_manage_slots">Gerenciar slots de chaves</string>
     <string name="dialog_wipe_entries_title">Limpar entradas</string>
     <string name="dialog_wipe_entries_message">O seu cofre já contém entradas. Você quer remover essas entradas antes de importar este arquivo?\n\n<b>Ao fazer isso, você perderá permanentemente o acesso às entradas existentes no cofre.</b></string>
     <string name="dialog_wipe_entries_checkbox">Limpar conteúdo do cofre</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index f728afd7a6..88a749d3f6 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -277,9 +277,7 @@
     <string name="import_google_auth_failure">Importarea din Google Authenticator a eșuat</string>
     <string name="unrelated_google_auth_batches_error">Exportul conține informații pentru un calup neasociat. Încercați să importați câte un calup pe rând.</string>
     <string name="no_tokens_can_be_imported">Nu se pot importa token-uri drept rezultat</string>
-    <string name="authentication_method_raw">Brut</string>
     <string name="unlocking_vault">Deblocarea seifului</string>
-    <string name="slot_this_device">(aceste dispozitive)</string>
     <string name="remove_group">Elimină grupul</string>
     <string name="remove_group_description">Ești sigur că dorești să ștergi acest grup? Intrările din acest grup vor comuta automat la \'Niciun grup\'.</string>
     <string name="remove_icon_pack">Ștergeți pachetul de pictograme</string>
@@ -424,7 +422,6 @@
     <string name="title_activity_about">Despre</string>
     <string name="title_activity_edit_entry">Editați intrarea</string>
     <string name="title_activity_scan_qr">Scanează cod QR</string>
-    <string name="title_activity_manage_slots">Gestionare sloturi cheie</string>
     <string name="title_activity_import_entries">Importă intrări</string>
     <string name="dialog_wipe_entries_title">Șterge intrările</string>
     <string name="dialog_wipe_entries_message">Seiful tău conține deja intrări. Dorești să ştergi aceste intrări înainte de a importa acest fişier?\n\n<b>Făcând acest lucru, vei pierde permanent accesul la intrările existente din seif.</b></string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index e9643dae36..bd329639f3 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -289,9 +289,7 @@
     <string name="import_google_auth_failure">Невожможно импортировать экспорт из Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">Экспорт содержит информацию для несвязанного пакета. Попробуйте импортировать по 1 пакету за раз.</string>
     <string name="no_tokens_can_be_imported">В результате никакие ключи не могут быть импортированы</string>
-    <string name="authentication_method_raw">Необработанный</string>
     <string name="unlocking_vault">Разблокировка хранилища</string>
-    <string name="slot_this_device">(это устройство)</string>
     <string name="remove_group">Удалить группу</string>
     <string name="remove_group_description">Удалить группу? Записи из этой группы будут автоматически перемещены в «Нет группы».</string>
     <string name="remove_icon_pack">Удалить набор значков</string>
@@ -441,7 +439,6 @@
     <string name="title_activity_about">О программе</string>
     <string name="title_activity_edit_entry">Редактировать запись</string>
     <string name="title_activity_scan_qr">Сканировать QR-код</string>
-    <string name="title_activity_manage_slots">Управление ключевыми слотами</string>
     <string name="title_activity_import_entries">Импорт записей</string>
     <string name="dialog_wipe_entries_title">Очистить записи</string>
     <string name="dialog_wipe_entries_message">В хранилище уже есть записи. Хотите удалить их перед импортом файла?\n\n<b>Если вы удалите существующие записи, то навсегда потеряете к ним доступ.</b></string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index cce6e3e033..d0fba6c58a 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -200,7 +200,6 @@
     <string name="read_qr_error">Pri pokuse o načítanie kódu QR sa vyskytla chyba</string>
     <string name="read_qr_error_phonefactor">Aegis nie je kompatibilný s proprietárnym algoritmom 2FA spoločnosti Microsoft. Pri konfigurácii 2FA v Office 365 nezabudnite vybrať možnosť „Nastaviť aplikáciu bez upozornení“.</string>
     <string name="unlocking_vault">Odomykanie trezoru</string>
-    <string name="slot_this_device">(toto zariadenie)</string>
     <string name="remove_group">Odstránenie skupiny</string>
     <string name="remove_group_description">Ste si istí, že chcete odstrániť túto skupinu? Záznamy v tejto skupine budú automaticky prehodené na \'Žiadna skupina\'.</string>
     <string name="remove_icon_pack">Odstrániť balíček ikon</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index bdfdb1669e..4cf374c46d 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -272,9 +272,7 @@
     <string name="import_google_auth_failure">Import av Google Authenticator-export misslyckades</string>
     <string name="unrelated_google_auth_batches_error">Exporten innehåller information gällande en orelaterad omgång. Försök att importera 1 omgång i taget.</string>
     <string name="no_tokens_can_be_imported">Inga polletter kan importeras till följd av detta</string>
-    <string name="authentication_method_raw">Rådata</string>
     <string name="unlocking_vault">Låser upp valvet</string>
-    <string name="slot_this_device">(denna enhet)</string>
     <string name="remove_group">Ta bort grupp</string>
     <string name="remove_group_description">Är du säker på att du vill ta bort denna grupp? Poster i denna grupp kommer automatiskt att flyttas till \'Grupplös\'.</string>
     <string name="remove_icon_pack">Ta bort ikonpaket</string>
@@ -418,7 +416,6 @@
     <string name="title_activity_about">Om</string>
     <string name="title_activity_edit_entry">Redigera post</string>
     <string name="title_activity_scan_qr">Skanna en rutkod</string>
-    <string name="title_activity_manage_slots">Hantera nyckelplatser</string>
     <string name="title_activity_import_entries">Importera poster</string>
     <string name="dialog_wipe_entries_title">Rensa poster</string>
     <string name="dialog_wipe_entries_message">Ditt valv innehåller redan poster. Vill du ta bort dessa poster innan du importerar den här filen?\n\n<b>Genom att göra det så förlorar du åtkomst till de befintliga posterna i valvet för alltid.</b></string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 0d0b07556c..65d80c39d0 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -272,9 +272,7 @@
     <string name="import_google_auth_failure">Dışa aktarılmış Google Authenticator dosyasını içe aktarma işlemi başarısız oldu</string>
     <string name="unrelated_google_auth_batches_error">Dışa aktarma, ilgisiz bir toplu iş için bilgi içerir. Bir seferde 1 partiyi içe aktarmayı deneyin.</string>
     <string name="no_tokens_can_be_imported">Sonuç olarak hiçbir token içe aktarılamaz</string>
-    <string name="authentication_method_raw">İşlenmemiş</string>
     <string name="unlocking_vault">Kasa kilidi açılıyor</string>
-    <string name="slot_this_device">(bu cihaz)</string>
     <string name="remove_group">Grubu sil</string>
     <string name="remove_group_description">Bu grubu silmek istediğinize emin misiniz? Bu gruptaki girdiler otomatik olarak \'Grupsuz\' grubuna geçecek.</string>
     <string name="remove_icon_pack">İkon paketini sil</string>
@@ -418,7 +416,6 @@
     <string name="title_activity_about">Hakkında</string>
     <string name="title_activity_edit_entry">Girdiyi düzenle</string>
     <string name="title_activity_scan_qr">QR Kodu Tara</string>
-    <string name="title_activity_manage_slots">Anahtar sıralarını yönet</string>
     <string name="title_activity_import_entries">Girdileri içe aktar</string>
     <string name="dialog_wipe_entries_title">Girdileri sil</string>
     <string name="dialog_wipe_entries_message">Kasanızda zaten girdiler bulunmaktadır. İçe aktarmadan önce bu girdileri silmek istediğinize emin misiniz?\n\n<b>Deponun içinde bulunan girdilere erişiminizi sonsuza dek kaybedeceksiniz.</b></string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 2ea664f51e..2c65cfaf6c 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -267,9 +267,7 @@
     <string name="import_google_auth_failure">Не вдалося імпортувати дані з Google Authenticator</string>
     <string name="unrelated_google_auth_batches_error">Експорт містить інформацію про непов\'язаний пакет. Спробуйте імпортувати пакети по одному.</string>
     <string name="no_tokens_can_be_imported">В результаті жоден токен не може бути імпортований</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Розблокування сховища</string>
-    <string name="slot_this_device">(цей пристрій)</string>
     <string name="remove_group">Видалити групу</string>
     <string name="remove_group_description">Ви впевнені, що хочете видалити цю групу? Записи у цій групі автоматично перемістяться в \'Без групи\'.</string>
     <string name="remove_icon_pack">Видалити набір піктограм</string>
@@ -413,7 +411,6 @@
     <string name="title_activity_about">Про додаток</string>
     <string name="title_activity_edit_entry">Редагування запису</string>
     <string name="title_activity_scan_qr">Сканування QR-коду</string>
-    <string name="title_activity_manage_slots">Керувати ключовими слотами</string>
     <string name="title_activity_import_entries">Імпортування записів</string>
     <string name="dialog_wipe_entries_title">Очистити записи</string>
     <string name="dialog_wipe_entries_message">Ваше сховище вже містить записи. Видалити ці записи перед імпортом цього файлу?\n\n<b>При цьому ви назавжди втратите доступ до наявних записів у сховищі.</b></string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 3b7e965dc1..d8582463af 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -219,9 +219,7 @@
     <string name="no_cameras_available">Không có máy ảnh nào có sẵn</string>
     <string name="read_qr_error">Đã xảy ra lỗi trong khi cố gắng đọc mã QR</string>
     <string name="read_qr_error_phonefactor">Aegis không tương thích với thuật toán Xác thực 2 yếu tố độc quyền của Microsoft. Vui lòng chắc chắn là bạn chọn \"Thiết lập ứng dụng không có thông báo\" khi thiết lập Xác thực 2 yếu tố trong Office 365.</string>
-    <string name="authentication_method_raw">Thô</string>
     <string name="unlocking_vault">Đang mở khoá kho</string>
-    <string name="slot_this_device">(thiết bị này)</string>
     <string name="remove_group">Xoá nhóm</string>
     <string name="remove_group_description">Bạn có chắc bạn muốn xoá nhóm này không? Các mục trong nhóm này sẽ tự động chuyển thành \"Không có nhóm\".</string>
     <string name="remove_icon_pack">Xoá gói biểu tượng</string>
@@ -329,7 +327,6 @@
     <string name="title_activity_about">Giới thiệu</string>
     <string name="title_activity_edit_entry">Chỉnh sửa mục</string>
     <string name="title_activity_scan_qr">Quét mã QR</string>
-    <string name="title_activity_manage_slots">Quản lý ô mã khoá</string>
     <string name="title_activity_import_entries">Nhập các mục</string>
     <string name="dialog_wipe_entries_title">Quét sạch các mục</string>
     <string name="dialog_wipe_entries_message">Kho của bạn đã chứa các mục rồi. Bạn có muốn xoá các mục đó trước khi nhập tệp này không?\n\n<b>Khi làm vậy, bạn sẽ vĩnh viễn mất quyền truy cập vào các mục hiện có trong kho.</b></string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1d0c031f6b..83646e58cb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -265,9 +265,7 @@
     <string name="import_google_auth_failure">导入 Google 身份验证器的导出文件失败</string>
     <string name="unrelated_google_auth_batches_error">导出文件包含多个批次的内容。请一次只导入一个批次。</string>
     <string name="no_tokens_can_be_imported">没有可导入的令牌</string>
-    <string name="authentication_method_raw">源文件</string>
     <string name="unlocking_vault">解锁数据库</string>
-    <string name="slot_this_device">（本设备）</string>
     <string name="remove_group">删除群组</string>
     <string name="remove_group_description">您确定要删除这个群组吗？此群组内的条目将自动移动到“无群组”。</string>
     <string name="remove_icon_pack">删除图标包</string>
@@ -406,7 +404,6 @@
     <string name="title_activity_about">关于</string>
     <string name="title_activity_edit_entry">编辑条目</string>
     <string name="title_activity_scan_qr">扫描二维码</string>
-    <string name="title_activity_manage_slots">管理密钥槽位</string>
     <string name="title_activity_import_entries">导入条目</string>
     <string name="dialog_wipe_entries_title">擦除条目</string>
     <string name="dialog_wipe_entries_message">您的数据库已经包含条目。 您想要在导入此文件之前删除这些条目吗？\n\n<b>这样做，您将永久失去对数据库中现有条目的访问权限。</b></string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b3568f927e..6d897fb5ee 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -245,9 +245,7 @@
     <string name="read_qr_error_phonefactor">Aegis 不相容於微軟私有的雙因素驗證演算法。請確保在 Microsoft 365 設定雙因素驗證時選擇「設定無通知的應用程式」。</string>
     <string name="partial_google_auth_import">偵測到不完整的 Google Authenticator 匯出</string>
     <string name="import_google_auth_failure">匯入 Google Authenticator 失敗</string>
-    <string name="authentication_method_raw">原始檔案</string>
     <string name="unlocking_vault">解鎖保險箱</string>
-    <string name="slot_this_device"> （此裝置）</string>
     <string name="remove_group">移除群組</string>
     <string name="remove_group_description">您確定要刪除這個群組嗎？此群組內的條目將自動移動到「無群組」。</string>
     <string name="remove_icon_pack">移除圖示合輯</string>
@@ -371,7 +369,6 @@
     <string name="title_activity_about">關於</string>
     <string name="title_activity_edit_entry">編輯條目</string>
     <string name="title_activity_scan_qr">掃描QR碼</string>
-    <string name="title_activity_manage_slots">管理密鎖槽位</string>
     <string name="title_activity_import_entries">匯入條目</string>
     <string name="dialog_wipe_entries_title">清除條目</string>
     <string name="dialog_wipe_entries_message">您的保險箱中已包含某些條目，您是否想在匯入這個檔案前，先移除這些重複的條目？\n\n<b>如此將永久刪除保險箱中原本存在的重複條目。</b></string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 99a98d72d8..2403d9f021 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="authentication_methods">
-        <item>@string/authentication_method_none</item>
-        <item>@string/authentication_method_password</item>
-        <item>@string/authentication_method_biometrics</item>
-    </string-array>
-
     <string-array name="otp_types_array">
         <item>TOTP</item>
         <item>HOTP</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 07278be65a..576cfb32f4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -280,9 +280,7 @@
     <string name="import_google_auth_failure">Importing Google Authenticator export failed</string>
     <string name="unrelated_google_auth_batches_error">Export contains information for an unrelated batch. Try importing 1 batch at a time.</string>
     <string name="no_tokens_can_be_imported">No tokens can be imported as a result</string>
-    <string name="authentication_method_raw">Raw</string>
     <string name="unlocking_vault">Unlocking the vault</string>
-    <string name="slot_this_device">(this devices)</string>
     <string name="remove_group">Remove group</string>
     <string name="remove_group_description">Are you sure you want to remove this group? Entries in this group will automatically switch to \'No group\'.</string>
     <string name="remove_icon_pack">Remove icon pack</string>
@@ -292,7 +290,7 @@
     <string name="lock">Lock</string>
     <string name="name">Name</string>
     <string name="no_group">No group</string>
-    <string name="sort">Sort</string>
+    <string name="sort" context="Title of the Sort button in the top action bar of the main view">Sort</string>
     <string name="sort_alphabetically">Issuer (A to Z)</string>
     <string name="sort_alphabetically_reverse">Issuer (Z to A)</string>
     <string name="sort_alphabetically_name">Account (A to Z)</string>
@@ -307,7 +305,7 @@
     <string name="preference_reset_usage_count">Reset usage count</string>
     <string name="preference_reset_usage_count_summary">Reset the usage count of every entry in your vault</string>
     <string name="preference_reset_usage_count_dialog">Are you sure you want to set the usage count of every entry in your vault to 0?</string>
-    <string name="note">Note</string>
+    <string name="note" context="Users can add a note to an entry">Note</string>
     <string name="clear">Clear</string>
 
     <string name="pref_highlight_entry_title">Highlight tokens when tapped</string>
@@ -459,7 +457,6 @@
     <string name="title_activity_about">About</string>
     <string name="title_activity_edit_entry">Edit entry</string>
     <string name="title_activity_scan_qr">Scan a QR code</string>
-    <string name="title_activity_manage_slots">Manage key slots</string>
     <string name="title_activity_import_entries">Import entries</string>
     <string name="dialog_wipe_entries_title">Wipe entries</string>
     <string name="dialog_wipe_entries_message">Your vault already contains entries. Do you want to remove these entries before importing this file?\n\n<b>In doing so, you will permanently lose access to the existing entries in the vault.</b></string>