move PrefImportSummaryDialog

2022-11-21 13:05:37 +01:00 · 2022-11-21 13:05:37 +01:00 · c847b35138
parent 6519e8fea6
commit c847b35138
36 changed files with 88 additions and 86 deletions
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
@ -27,7 +27,7 @@ import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
-import info.nightscout.androidaps.utils.alertDialogs.PrefImportSummaryDialog
+import info.nightscout.ui.alertDialogs.PrefImportSummaryDialog
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import info.nightscout.core.ui.dialogs.OKDialog
@ -199,9 +199,9 @@ class ImportExportPrefsImpl @Inject constructor(
    }

    private fun askToConfirmImport(activity: FragmentActivity, fileToImport: PrefsFile, then: ((password: String) -> Unit)) {
-        if (!assureMasterPasswordSet(activity, R.string.nav_import)) return
+        if (!assureMasterPasswordSet(activity, R.string.import_setting)) return
        TwoMessagesAlertDialog.showAlert(
-            activity, rh.gs(R.string.nav_import),
+            activity, rh.gs(R.string.import_setting),
            rh.gs(R.string.import_from) + " " + fileToImport.name + " ?",
            rh.gs(R.string.password_preferences_decrypt_prompt), {
                askForMasterPass(activity, R.string.preferences_import_canceled, then)
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWDefinition.kt
@ -193,14 +193,14 @@ class SWDefinition @Inject constructor(
        .visibility { androidPermission.permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) }
        .validator { !androidPermission.permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) }

-    private val screenImport get() = SWScreen(injector, R.string.nav_import)
+    private val screenImport get() = SWScreen(injector, R.string.import_setting)
        .add(
            SWInfoText(injector)
                .label(R.string.storedsettingsfound)
        )
        .add(SWBreak(injector))
        .add(SWButton(injector)
-                 .text(R.string.nav_import)
+                 .text(R.string.import_setting)
                 .action { importExportPrefs.importSharedPreferences(activity) })
        .visibility { importExportPrefs.prefsFileExists() && !androidPermission.permissionNotGranted(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE) }

--- a/app/src/main/res/layout/maintenance_fragment.xml
+++ b/app/src/main/res/layout/maintenance_fragment.xml
@ -156,7 +156,7 @@
                        android:drawableTop="@drawable/ic_import_settings"
                        android:paddingStart="0dp"
                        android:paddingEnd="0dp"
-                        android:text="@string/nav_import"
+                        android:text="@string/import_setting"
                        android:textSize="11sp"
                        app:layout_column="1"
                        app:layout_columnWeight="1"
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@ -36,7 +36,7 @@
    <string name="setting_imported">Instellings ingevoer</string>
    <string name="filenotfound">Lêer nie gevind nie</string>
    <string name="nav_export">Voer instellings uit na</string>
-    <string name="nav_import">Voer instellings in</string>
+    <string name="import_setting">Voer instellings in</string>
    <string name="end_user_license_agreement">Eindverbruiker Lisensie Ooreenkoms</string>
    <string name="end_user_license_agreement_text">MOET NIE GEBRUIK WORD OM MEDIESE BESLUITE TE MAAK NIE. DAAR IS GEEN WAARBORG DAT DIE PROGRAM, ONDERWORPE AAN TOEPASSELIKE WETTE EN WETGEWING. TENSY ANDERS GEMELD IN TEKS VOORSIEN DIE KOPIEREG-HOUERS EN / OF ANDER PARTYE DIE PROGRAM \"AS IS\" SONDER ËNIGE WAARBORG VAN ENIGE ORDE, UITDRUKKELIK OF IMPLISIET, INKLUSIEF, MAAR NIE BEPERK TOT DIE IMPLISIETE WAARBORG VAN TOEPAASBAARHEID OF NUT VIR EEN SPESIFIEKE DOEL. DIE TOTALE EN ALLE RISIKOVIR DIE KWALITEIT EN PRESTASIE VAN DIE PROGRAM RUS MET JOUSELF. VIR ENIGE PROGRAM DEFEKTIEWE OF FALINGS MOET JY PERSOONLIK DIE KOSTE EN REGSAANSPREEKLIKHEID DRA VAN ALLE NODIGE AKSIES, DIENS, REPARASIES OF KORREKSIES VIR USELF OF ENIGE DERDE PARTYE EN/OF AKSIES, DIENS, REPARASIES OF KORREKSIES WAT DEUR DIE PROGRAM GEDOEN WAS.</string>
    <string name="end_user_license_agreement_i_understand">EK VERSTAAN en STEM IN</string>
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Настройките са импортирани</string>
    <string name="filenotfound">Файлът не е намерен</string>
    <string name="nav_export">Експорт настройки</string>
-    <string name="nav_import">Импорт настройки</string>
+    <string name="import_setting">Импорт настройки</string>
    <string name="password_preferences_encrypt_prompt">Главна парола, която ще бъде използвана за криптиране на експортирани настройки.</string>
    <string name="preferences_export_canceled">Експорт неуспешен! Настройките не са експортирани!</string>
    <string name="preferences_import_canceled">Импорт неуспешен! Настройките не са импортирани!</string>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -40,7 +40,7 @@
    <string name="setting_imported">Configuració importada</string>
    <string name="filenotfound">Arxiu no trobat</string>
    <string name="nav_export">Exportar configuració</string>
-    <string name="nav_import">Importar configuració</string>
+    <string name="import_setting">Importar configuració</string>
    <string name="password_preferences_encrypt_prompt">Se us demanarà una clau mestra, es farà servir per encriptar la configuració exportada.</string>
    <string name="preferences_export_canceled">Exportació cancel·lada! Configuració NO exportada!</string>
    <string name="preferences_import_canceled">Importació cancel·lada! Configuració NO importada!</string>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -47,7 +47,7 @@
    <string name="setting_imported">Nastavení importováno</string>
    <string name="filenotfound">Soubor nenalezen</string>
    <string name="nav_export">Exportovat nastavení</string>
-    <string name="nav_import">Importovat nastavení</string>
+    <string name="import_setting">Importovat nastavení</string>
    <string name="password_preferences_encrypt_prompt">Zobrazí se výzva k zadání hlavního hesla, které bude použito k šifrování exportovaných předvoleb.</string>
    <string name="preferences_export_canceled">Export zrušen! Předvolby NEBYLY exportovány!</string>
    <string name="preferences_import_canceled">Import zrušen! Předvolby NEBYLY importovány!</string>
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Indstillinger importeret</string>
    <string name="filenotfound">Filen blev ikke fundet</string>
    <string name="nav_export">Eksporter indstillinger</string>
-    <string name="nav_import">Importer indstillinger</string>
+    <string name="import_setting">Importer indstillinger</string>
    <string name="password_preferences_encrypt_prompt">Du bliver bedt om hovedadgangskode, som vil blive brugt til at kryptere eksporterede præferencer.</string>
    <string name="preferences_export_canceled">Eksport annulleret! Indstillinger er IKKE eksporteret!</string>
    <string name="preferences_import_canceled">Import er annulleret! Præferencer er IKKE importeret!</string>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Einstellungen importiert</string>
    <string name="filenotfound">Datei nicht gefunden</string>
    <string name="nav_export">Einstellungen exportieren</string>
-    <string name="nav_import">Einstellungen importieren</string>
+    <string name="import_setting">Einstellungen importieren</string>
    <string name="password_preferences_encrypt_prompt">Du wirst nach dem Master-Passwort gefragt. Mit diesem werden die exportierten Einstellungen verschlüsselt.</string>
    <string name="preferences_export_canceled">Export abgebrochen! Einstellungen wurden NICHT exportiert!</string>
    <string name="preferences_import_canceled">Import abgebrochen! Einstellungen wurden NICHT importiert!</string>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -36,7 +36,7 @@
    <string name="setting_imported">Ρυθμίσεις εισήχθησαν</string>
    <string name="filenotfound">Μη εύρεση φακέλου</string>
    <string name="nav_export">Εξαγωγή ρυθμίσεων</string>
-    <string name="nav_import">Εισαγωγή ρυθμίσεων</string>
+    <string name="import_setting">Εισαγωγή ρυθμίσεων</string>
    <string name="end_user_license_agreement">Άδεια χρήσης τελικού χρήστη</string>
    <string name="end_user_license_agreement_text">ΔΕΝ ΠΡΕΠΕΙ ΝΑ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΓΙΑ ΝΑ ΚΑΝΕΤΕ ΙΑΤΡΙΚΗ ΑΠΟΦΑΣΗ. ΔΕΝ ΥΠΑΡΧΕΙ ΕΓΓΥΗΣΗ ΓΙΑ ΤΟ ΠΡΟΓΡΑΜΜΑ, ΣΤΟ ΒΑΘΜΟ ΠΟΥ ΕΠΙΤΡΕΠΕΤΑΙ ΑΠΟ ΤΟ ΕΦΑΡΜΟΣΤΕΟ ΔΙΚΑΙΟ. ΕΚΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΔΙΑΒΑΘΜΙΣΜΕΝΗ ΚΑΤΑ ΤΗΝ ΕΓΓΡΑΦΗ ΤΩΝ ΚΑΤΟΧΟΙ ΠΝΕΥΜΑΤΙΚΩΝ ΔΙΚΑΙΩΜΑΤΩΝ ΚΑΙ/Ή ΑΛΛΑ ΜΕΡΗ ΠΑΡΕΧΟΝΤΑΙ ΤΟ ΠΡΟΓΡΑΜΜΑ \"ΩΣ ΕΧΕΙ\" ΧΩΡΙΣ ΕΓΓΥΗΣΗ ΟΠΟΙΟΥΔΗΠΟΤΕ ΕΙΔΟΥΣ, ΕΞΑΙΡΟΥΜΕΝΕΣ Ή ΣΙΩΠΗΡΕΣ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΕΝΔΕΙΚΤΙΚΑ, ΤΩΝ ΣΙΩΠΗΡΩΝ ΕΓΓΥΗΣΕΩΝ ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ΚΑΙ ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Ο ΟΛΟΚΛΗΡΩΜΕΝΟΣ ΚΙΝΔΥΝΟΣ ΟΣΟΝ ΑΦΟΡΑ ΤΗΝ ΠΟΙΟΤΗΤΑ ΚΑΙ ΤΗΝ ΑΠΟΔΟΣΗ ΤΟΥ ΠΡΟΓΡΑΜΜΑΤΟΣ ΕΙΝΑΙ ΔΙΚΟ ΣΑΣ. ΕΑΝ ΤΟ ΠΡΟΓΡΑΜΜΑ ΔΕΝ ΕΙΝΑΙ ΕΛΑΤΤΩΜΑΤΙΚΟ, ΠΡΕΠΕΙ ΝΑ ΕΞΕΤΑΣΤΕ ΤΟ ΚΟΣΤΟΣ ΟΛΩΝ ΤΩΝ ΑΠΑΡΑΙΤΗΤΩΝ ΣΥΝΤΗΡΗΣΕΩΝ, ΕΠΙΣΚΕΥΩΝ Ή ΔΙΟΡΘΩΣΕΩΝ.</string>
    <string name="end_user_license_agreement_i_understand">ΚΑΤΑΛΑΒΑ ΚΑΙ ΣΥΜΦΩΝΩ</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -47,7 +47,7 @@
    <string name="setting_imported">Ajustes importados</string>
    <string name="filenotfound">Archivo no encontrado</string>
    <string name="nav_export">Exportar ajustes</string>
-    <string name="nav_import">Importar ajustes</string>
+    <string name="import_setting">Importar ajustes</string>
    <string name="password_preferences_encrypt_prompt">Se le solicitará la contraseña maestra, que se utilizará para cifrar los ajustes exportados</string>
    <string name="preferences_export_canceled">¡Exportación cancelada! ¡Las preferencias NO se han exportado!</string>
    <string name="preferences_import_canceled">¡Importación cancelada! ¡Las preferencias NO se han importado!</string>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -47,7 +47,7 @@
    <string name="setting_imported">Paramètres importés</string>
    <string name="filenotfound">Fichier introuvable</string>
    <string name="nav_export">Exporter les paramètres</string>
-    <string name="nav_import">Importer les paramètres</string>
+    <string name="import_setting">Importer les paramètres</string>
    <string name="password_preferences_encrypt_prompt">Le mot de passe principal vous sera demandé pour crypter les préférences exportées.</string>
    <string name="preferences_export_canceled">Export annulé ! Les préférences n\'ont PAS été exportées !</string>
    <string name="preferences_import_canceled">Import annulé ! Les préférences n\'ont PAS été importées !</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -46,7 +46,7 @@
    <string name="setting_imported">Impostazioni importate</string>
    <string name="filenotfound">File non trovato</string>
    <string name="nav_export">Esporta impostazioni</string>
-    <string name="nav_import">Importa impostazioni</string>
+    <string name="import_setting">Importa impostazioni</string>
    <string name="password_preferences_encrypt_prompt">Ti verrà richiesta la password master, che verrà usata per crittografare le preferenze esportate.</string>
    <string name="preferences_export_canceled">Esportazione annullata! Le preferenze NON sono state esportate!</string>
    <string name="preferences_import_canceled">Importazione annullata! Le preferenze NON sono state importate!</string>
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">הגדרות מיובאות</string>
    <string name="filenotfound">הקובץ לא נמצא</string>
    <string name="nav_export">ייצא הגדרות</string>
-    <string name="nav_import">ייבוא הגדרות</string>
+    <string name="import_setting">ייבוא הגדרות</string>
    <string name="password_preferences_encrypt_prompt">אתם תתבקשו למלא סיסמה ראשית שתשמש להצפנת ההעדפות המיוצאות.</string>
    <string name="preferences_export_canceled">ייצוא בוטל! ההגדרות לא יוצאו!</string>
    <string name="preferences_import_canceled">ייבוא בוטל! ההעדפות לא הובאו!</string>
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@ -40,7 +40,7 @@
    <string name="setting_imported">설정을 불러왔습니다</string>
    <string name="filenotfound">파일을 찾을 수 없습니다</string>
    <string name="nav_export">설정 저장하기</string>
-    <string name="nav_import">설정 불러오기</string>
+    <string name="import_setting">설정 불러오기</string>
    <string name="password_preferences_encrypt_prompt">내보낸 preferences 암호화 하기 위해 마스터 비밀번호가 필요합니다.</string>
    <string name="preferences_export_canceled">내보내기 취소됩니다! 환경 설정을 내보내지 않았습니다!</string>
    <string name="preferences_import_canceled">가져오고 취소됩니다! 환경설정을 가져오지 않았습니다.</string>
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Nustatymai importuoti</string>
    <string name="filenotfound">Failas nerastas</string>
    <string name="nav_export">Eksportuoti nustatymus</string>
-    <string name="nav_import">Importuoti nustatymus</string>
+    <string name="import_setting">Importuoti nustatymus</string>
    <string name="password_preferences_encrypt_prompt">Jūsų paprašys nustatyti slaptažodį, kuris bus naudojamas užšifruojant eksportuojamus nustatymus.</string>
    <string name="preferences_export_canceled">Eksportas nutrauktas! Nustatymai NE eksportuoti!</string>
    <string name="preferences_import_canceled">Importas nutrauktas! Nustatymai NE importuoti!</string>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -47,7 +47,7 @@
    <string name="setting_imported">Instellingen geïmporteerd</string>
    <string name="filenotfound">Bestand niet gevonden</string>
    <string name="nav_export">Exporteer instellingen</string>
-    <string name="nav_import">Importeer instellingen</string>
+    <string name="import_setting">Importeer instellingen</string>
    <string name="password_preferences_encrypt_prompt">Je wordt gevraagd om een masterwachtwoord. Daarmee worden geëxporteerde instellingen versleuteld.</string>
    <string name="preferences_export_canceled">Exporteren geannuleerd! Instellingen zijn NIET geëxporteerd!</string>
    <string name="preferences_import_canceled">Importeren geannuleerd! Instellingen zijn NIET geïmporteerd!</string>
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@ -47,7 +47,7 @@
    <string name="setting_imported">Innstillinger importert</string>
    <string name="filenotfound">Fil ikke funnet</string>
    <string name="nav_export">Eksporter innstillinger</string>
-    <string name="nav_import">Importer innstillinger</string>
+    <string name="import_setting">Importer innstillinger</string>
    <string name="password_preferences_encrypt_prompt">Du må angi et hovedpassord som vil bli brukt til å kryptere dine eksporterte innstillinger.</string>
    <string name="preferences_export_canceled">Eksport kansellert! Innstillinger ble IKKE lagret!</string>
    <string name="preferences_import_canceled">Innlesing avbrutt! Innstillinger ble IKKE lest inn!</string>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Ustawienia zaimportowane</string>
    <string name="filenotfound">Nie znaleziono pliku</string>
    <string name="nav_export">Eksportuj ustawienia</string>
-    <string name="nav_import">Importuj ustawienia</string>
+    <string name="import_setting">Importuj ustawienia</string>
    <string name="password_preferences_encrypt_prompt">Zostaniesz poproszony o hasło główne, które będzie użyte do szyfrowania wyeksportowanych preferencji.</string>
    <string name="preferences_export_canceled">Eksportowanie anulowane! Ustawienia NIE zostały wyeksportowane!</string>
    <string name="preferences_import_canceled">Import anulowany! Ustawienia NIE zostały zaimportowane!</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Configurações importadas</string>
    <string name="filenotfound">Arquivo não encontrado</string>
    <string name="nav_export">Exportar configurações</string>
-    <string name="nav_import">Importar configurações</string>
+    <string name="import_setting">Importar configurações</string>
    <string name="password_preferences_encrypt_prompt">Será perguntado pela senha mestre, que será usada para encriptar preferências exportadas.</string>
    <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
    <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Definições importadas</string>
    <string name="filenotfound">Ficheiro não encontrado</string>
    <string name="nav_export">Exportar definições</string>
-    <string name="nav_import">Importar definições</string>
+    <string name="import_setting">Importar definições</string>
    <string name="password_preferences_encrypt_prompt">Ser-lhe-á pedida a senha mestra, que será usada para encriptar preferências exportadas.</string>
    <string name="preferences_export_canceled">Exportação cancelada! Preferências NÃO foram exportadas!</string>
    <string name="preferences_import_canceled">Importação cancelada! Preferências NÃO foram importadas!</string>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Setări importate</string>
    <string name="filenotfound">Nu am găsit fișierul</string>
    <string name="nav_export">Exportă setările</string>
-    <string name="nav_import">Importă setările</string>
+    <string name="import_setting">Importă setările</string>
    <string name="password_preferences_encrypt_prompt">Vi se va solicita parola principală, care va fi utilizată pentru criptare la exportarea setărilor.</string>
    <string name="preferences_export_canceled">Exportarea a eșuat! Preferințele NU au fost exportate!</string>
    <string name="preferences_import_canceled">Importarea a eșuat! Preferințele NU au fost importate!</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -47,7 +47,7 @@
    <string name="setting_imported">настройки импортированы</string>
    <string name="filenotfound">файл не найден</string>
    <string name="nav_export">экспорт настроек</string>
-    <string name="nav_import">импорт настроек</string>
+    <string name="import_setting">импорт настроек</string>
    <string name="password_preferences_encrypt_prompt">Будет предложено ввести главный пароль, который будет использоваться для шифрования экспортированных параметров.</string>
    <string name="preferences_export_canceled">Экспорт отменен! Настройки НЕ экспортированы!</string>
    <string name="preferences_import_canceled">Импорт отменен! Настройки не импортированы!</string>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -47,7 +47,7 @@
    <string name="setting_imported">Nastavenia importované</string>
    <string name="filenotfound">Súbor nenájdený</string>
    <string name="nav_export">Exportovať nastavenia</string>
-    <string name="nav_import">Importovať nastavenia</string>
+    <string name="import_setting">Importovať nastavenia</string>
    <string name="password_preferences_encrypt_prompt">Budete vyzvaný na zadanie hlavného hesla, ktoré bude použité na dešifrovanie exportovaných nastavení.</string>
    <string name="preferences_export_canceled">Export zrušený! Nastavenia neboli exportované!</string>
    <string name="preferences_import_canceled">Import zrušený! Nastavenia neboli importované!</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">Inställningar importerade</string>
    <string name="filenotfound">Hittade inte filen</string>
    <string name="nav_export">Exportera inställningar</string>
-    <string name="nav_import">Importera inställningar</string>
+    <string name="import_setting">Importera inställningar</string>
    <string name="password_preferences_encrypt_prompt">Du kommer att bli tillfrågad om huvudlösenordet som sedan kommer att användas för att kryptera exporterade inställningar.</string>
    <string name="preferences_export_canceled">Exporten avbröts. Inställningarna har INTE exporterats!</string>
    <string name="preferences_import_canceled">Importen avbröts. Inställningarna har inte importerats!</string>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -45,7 +45,7 @@
    <string name="setting_imported">Ayarlar içe aktarıldı</string>
    <string name="filenotfound">Dosya bulunamadı</string>
    <string name="nav_export">Dışarı aktarma ayarları</string>
-    <string name="nav_import">İçe aktarma ayarları</string>
+    <string name="import_setting">İçe aktarma ayarları</string>
    <string name="password_preferences_encrypt_prompt">Dışa aktarılan tercihleri şifrelemek için kullanılacak ana parola sorulacaktır.</string>
    <string name="preferences_export_canceled">Aktarım iptal edildi! Tercihler dışa aktarılmadı!</string>
    <string name="preferences_import_canceled">Aktarım iptal edildi! Tercihler içe aktarılmadı!</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -41,7 +41,7 @@
    <string name="setting_imported">配置导入了</string>
    <string name="filenotfound">找不到文件</string>
    <string name="nav_export">导出配置</string>
-    <string name="nav_import">导入配置</string>
+    <string name="import_setting">导入配置</string>
    <string name="password_preferences_encrypt_prompt">请您输入主密码，该密码将用于加密导出的首选项配置。</string>
    <string name="preferences_export_canceled">导出已取消！首选项未导出！</string>
    <string name="preferences_import_canceled">导入已取消! 未导入首选项 !</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -77,7 +77,6 @@
    <string name="setting_imported">Settings imported</string>
    <string name="filenotfound">File not found</string>
    <string name="nav_export">Export settings</string>
-    <string name="nav_import">Import settings</string>
    <string name="language" translatable="false">Language</string>
    <string name="password_preferences_encrypt_prompt">You will be asked for master password, which will be used to encrypt exported preferences.</string>
    <string name="preferences_export_canceled">Export canceled! Preferences were NOT exported!</string>
@ -87,13 +86,6 @@
    <string name="old_master_password">Old Master Password</string>
    <string name="different_password_used">This file was exported and encrypted with different master password. Provide old master password to decrypt file.</string>
    <string name="master_password_will_be_replaced">As a result of successful import current master password WILL BE REPLACED with that old master password!</string>
-    <string name="check_preferences_before_import">Please check preferences before importing:</string>
-    <string name="check_preferences_cannot_import">Preferences cannot be imported!</string>
-    <string name="check_preferences_dangerous_import">Preferences should not be imported!</string>
-    <string name="check_preferences_details_btn">Explain import issues…</string>
-    <string name="check_preferences_details_title">Import issues details</string>
-    <string name="check_preferences_import_btn">Import</string>
-    <string name="check_preferences_import_anyway_btn">Import anyway (DANGEROUS!)</string>
    <string name="end_user_license_agreement">End User License Agreement</string>
    <string name="end_user_license_agreement_text">MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</string>
    <string name="end_user_license_agreement_i_understand">I UNDERSTAND AND AGREE</string>
--- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils.alertDialogs
+package info.nightscout.ui.alertDialogs

 import android.annotation.SuppressLint
 import android.content.Context
@ -17,11 +17,11 @@ import androidx.annotation.StringRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.view.ContextThemeWrapper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import info.nightscout.androidaps.R
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.interfaces.maintenance.Prefs
 import info.nightscout.interfaces.maintenance.PrefsStatus
 import info.nightscout.shared.extensions.runOnUiThread
+import info.nightscout.ui.R
 import java.util.LinkedList

 object PrefImportSummaryDialog {
@ -111,7 +111,7 @@ object PrefImportSummaryDialog {

        val builder = MaterialAlertDialogBuilder(context, theme)
            .setMessage(context.getString(messageRes))
-            .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(R.string.nav_import), headerIcon, theme))
+            .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(R.string.import_setting), headerIcon, theme))
            .setView(innerLayout)
            .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
                dialog.dismiss()
--- a/app/src/main/res/drawable/ic_header_error.xml
+++ b/app/src/main/res/drawable/ic_header_error.xml
@ -1,16 +1,16 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="0.8"
-        android:scaleY="0.8">
-        <path
-            android:fillColor="#000"
-            android:pathData="M8.27,3L3,8.27V15.73L8.27,21H15.73C17.5,19.24 21,15.73 21,15.73V8.27L15.73,3M9.1,5H14.9L19,9.1V14.9L14.9,19H9.1L5,14.9V9.1M9.12,7.71L7.71,9.12L10.59,12L7.71,14.88L9.12,16.29L12,13.41L14.88,16.29L16.29,14.88L13.41,12L16.29,9.12L14.88,7.71L12,10.59" />
-    </group>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.8"
+        android:scaleY="0.8">
+        <path
+            android:fillColor="#000"
+            android:pathData="M8.27,3L3,8.27V15.73L8.27,21H15.73C17.5,19.24 21,15.73 21,15.73V8.27L15.73,3M9.1,5H14.9L19,9.1V14.9L14.9,19H9.1L5,14.9V9.1M9.12,7.71L7.71,9.12L10.59,12L7.71,14.88L9.12,16.29L12,13.41L14.88,16.29L16.29,14.88L13.41,12L16.29,9.12L14.88,7.71L12,10.59" />
+    </group>
 </vector>
--- a/app/src/main/res/drawable/ic_header_import.xml
+++ b/app/src/main/res/drawable/ic_header_import.xml
@ -1,16 +1,16 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="0.66"
-        android:scaleY="0.66">
-        <path
-            android:fillColor="#000"
-            android:pathData="M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z" />
-    </group>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.66"
+        android:scaleY="0.66">
+        <path
+            android:fillColor="#000"
+            android:pathData="M14,12L10,8V11H2V13H10V16M20,18V6C20,4.89 19.1,4 18,4H6A2,2 0 0,0 4,6V9H6V6H18V18H6V15H4V18A2,2 0 0,0 6,20H18A2,2 0 0,0 20,18Z" />
+    </group>
 </vector>
--- a/app/src/main/res/drawable/ic_header_log.xml
+++ b/app/src/main/res/drawable/ic_header_log.xml
@ -1,16 +1,16 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="0.8"
-        android:scaleY="0.8">
-        <path
-            android:fillColor="?attr/colorControlNormal"
-            android:pathData="M15,20A1,1 0 0,0 16,19V4H8A1,1 0 0,0 7,5V16H5V5A3,3 0 0,1 8,2H19A3,3 0 0,1 22,5V6H20V5A1,1 0 0,0 19,4A1,1 0 0,0 18,5V9L18,19A3,3 0 0,1 15,22H5A3,3 0 0,1 2,19V18H13A2,2 0 0,0 15,20M9,6H14V8H9V6M9,10H14V12H9V10M9,14H14V16H9V14Z" />
-    </group>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:pivotX="12"
+        android:pivotY="12"
+        android:scaleX="0.8"
+        android:scaleY="0.8">
+        <path
+            android:fillColor="?attr/colorControlNormal"
+            android:pathData="M15,20A1,1 0 0,0 16,19V4H8A1,1 0 0,0 7,5V16H5V5A3,3 0 0,1 8,2H19A3,3 0 0,1 22,5V6H20V5A1,1 0 0,0 19,4A1,1 0 0,0 18,5V9L18,19A3,3 0 0,1 15,22H5A3,3 0 0,1 2,19V18H13A2,2 0 0,0 15,20M9,6H14V8H9V6M9,10H14V12H9V10M9,14H14V16H9V14Z" />
+    </group>
 </vector>
--- a/app/src/main/res/layout/dialog_alert_import_summary.xml
+++ b/app/src/main/res/layout/dialog_alert_import_summary.xml
--- a/app/src/main/res/layout/import_summary_details.xml
+++ b/app/src/main/res/layout/import_summary_details.xml
--- a/app/src/main/res/layout/import_summary_item.xml
+++ b/app/src/main/res/layout/import_summary_item.xml
--- a/ui/src/main/res/values/strings.xml
+++ b/ui/src/main/res/values/strings.xml
@ -152,4 +152,14 @@
    <!-- Other dialogs -->
    <string name="basal_rate">Basal rate</string>

+    <!--    PrefImport-->
+    <string name="check_preferences_details_btn">Explain import issues…</string>
+    <string name="check_preferences_details_title">Import issues details</string>
+    <string name="check_preferences_import_btn">Import</string>
+    <string name="check_preferences_import_anyway_btn">Import anyway (DANGEROUS!)</string>
+    <string name="import_setting">Import settings</string>
+    <string name="check_preferences_before_import">Please check preferences before importing:</string>
+    <string name="check_preferences_cannot_import">Preferences cannot be imported!</string>
+    <string name="check_preferences_dangerous_import">Preferences should not be imported!</string>
+
 </resources>