fix: Remembering database location #2262

4.2.3

CHANGELOG

@@ -1,3 +1,25 @@
+KeePassDX(4.2.4)
+ * Fix remembering database location #2262
+
+KeePassDX(4.2.3)
+ * Fix multiple Passkey selection #2253
+ * Fix database dialog subtitle #2254
+ * Fix save search info if URL present #2255
+ * Small fixes
+
+KeePassDX(4.2.2)
+ * Fix database merge algorithm #2223
+ * Fix save search info #2243
+ * Fix Play Service as privileged app for Passkey Cross Device Authentication #2244
+ * Small fixes
+
+KeePassDX(4.2.1)
+ * Fix Magikeyboard autosearch #2233
+ * Fix database merge #2223
+ * Fix dialog database action #2234
+ * Fix autofill selection #2238 #2235
+ * Small fixes
+
 KeePassDX(4.2.0)
  * Passkeys management #1421 #2097 (@cali-95)
  * Confirm usage of passkey #2165 #2124

README.md

@@ -6,19 +6,21 @@
 
 ### Features
 
- - Create database files / entries and groups.
- - Support for **.kdb** and **.kdbx** files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm.
- - **Compatible** with the majority of alternative programs (KeePass, KeePassXC, KeeWeb, …).
+ - **Passkeys** for authentication and **local storage of private keys**.
+ - **Biometric recognition** for fast unlocking (fingerprint / face unlock / …).
+ - **One-Time Password** management (HOTP / TOTP) for two-factor authentication (2FA).
+ - **Autofill** for easy form filling with passwords.
+ - **Magikeyboard** to efficiently fill in any field.
+ - Create **encrypted database files**.
+ - Organisation of credentials by **entry** and in **group** trees.
  - Allows opening and **copying URI / URL fields quickly**.
- - **Biometric recognition** for fast unlocking *(fingerprint / face unlock / …)*.
- - **One-Time Password** management *(HOTP / TOTP)* for Two-factor authentication (2FA).
- - Material design with **themes**.
- - **Auto-Fill** and Integration.
- - Field filling **keyboard**.
- - Dynamic **templates** 
+ - Dynamic **templates**  for each type of entry.
  - **History** of each entry.
  - Precise management of **settings**.
- - Code written in **native languages** *(Kotlin / Java / JNI / C)*.
+ - Material design with **themes**.
+ - Support for **.kdb** and **.kdbx** files (version 1 to 4) with AES - Twofish - ChaCha20 - Argon2 algorithm.
+ - **Compatible** with the majority of alternative programs (KeePass, KeePassXC, KeeWeb, …).
+ - Code written in **native languages** (Kotlin / Java / JNI / C).
 
 KeePassDX is **open source** and **ad-free**.
 

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 19
         targetSdkVersion 35
-        versionCode = 145
-        versionName = "4.2.0"
+        versionCode = 149
+        versionName = "4.2.4"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"

app/src/free/assets/passkeys_privileged_apps_community.json

@@ -48,6 +48,18 @@
         ]
       }
     },
+    {
+      "type": "android",
+      "info": {
+        "package_name": "org.ironfoxoss.ironfox.nightly",
+        "signatures": [
+          {
+            "build": "release",
+            "cert_fingerprint_sha256": "C5:E2:91:B5:A5:71:F9:C8:CD:9A:97:99:C2:C9:4E:02:EC:97:03:94:88:93:F2:CA:75:6D:67:B9:42:04:F9:04"
+          }
+        ]
+      }
+    },
     {
       "type": "android",
       "info": {

app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt

@@ -125,6 +125,8 @@ class EntryActivity : DatabaseLockActivity() {
     private var mBackgroundColor: Int? = null
     private var mForegroundColor: Int? = null
 
+    override fun manageDatabaseInfo(): Boolean = true
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt

@@ -63,7 +63,6 @@ import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.buildSpecia
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveRegisterInfo
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSearchInfo
 import com.kunzisoft.keepass.credentialprovider.TypeMode
-import com.kunzisoft.keepass.credentialprovider.magikeyboard.MagikeyboardService
 import com.kunzisoft.keepass.credentialprovider.passkey.util.PasskeyHelper.buildPasskeyResponseAndSetResult
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.element.Attachment
@@ -158,6 +157,8 @@ class EntryEditActivity : DatabaseLockActivity(),
         }
     }
 
+    override fun manageDatabaseInfo(): Boolean = true
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_entry_edit)
@@ -486,14 +487,12 @@ class EntryEditActivity : DatabaseLockActivity(),
     }
 
     private fun entryValidatedForKeyboardSelection(database: ContextualDatabase, entry: Entry) {
-        // Populate Magikeyboard with entry
-        MagikeyboardService.populateKeyboardAndMoveAppToBackground(
-            this,
-            entry.getEntryInfo(database)
+        // Build Magikeyboard response with the entry selected
+        this.buildSpecialModeResponseAndSetResult(
+            entryInfo = entry.getEntryInfo(database),
+            extras = buildEntryResult(entry)
         )
         onValidateSpecialMode()
-        // Don't keep activity history for entry edition
-        finishForEntryResult(entry)
     }
 
     private fun entryValidatedForAutofill(database: ContextualDatabase, entry: Entry) {

app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt

@@ -55,10 +55,8 @@ import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
 import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.utils.AppUtil.isContributingUser
@@ -94,6 +92,8 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
 
     private var mExternalFileHelper: ExternalFileHelper? = null
 
+    override fun manageDatabaseInfo(): Boolean  = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -214,6 +214,12 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
             // Retrieve settings for default database
             mAdapterDatabaseHistory?.setDefaultDatabase(it)
         }
+
+        // Remove all the remember locations if needed
+        if (PreferencesUtil.rememberDatabaseLocations(applicationContext).not()) {
+            FileDatabaseHistoryAction.getInstance(applicationContext)
+                .deleteAll()
+        }
     }
 
     override fun onDatabaseRetrieved(database: ContextualDatabase) {
@@ -226,22 +232,6 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         result: ActionRunnable.Result
     ) {
         if (result.isSuccess) {
-            // Update list
-            when (actionTask) {
-                ACTION_DATABASE_CREATE_TASK,
-                ACTION_DATABASE_LOAD_TASK -> {
-                    result.data?.getParcelableCompat<Uri>(DATABASE_URI_KEY)?.let { databaseUri ->
-                        val mainCredential =
-                            result.data?.getParcelableCompat(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY)
-                                ?: MainCredential()
-                        databaseFilesViewModel.addDatabaseFile(
-                            databaseUri,
-                            mainCredential.keyFileUri,
-                            mainCredential.hardwareKey
-                        )
-                    }
-                }
-            }
             // Launch activity
             when (actionTask) {
                 ACTION_DATABASE_CREATE_TASK -> {
@@ -250,13 +240,13 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
                         database,
                         false
                     )
+                    coordinatorLayout.showActionErrorIfNeeded(result)
                 }
                 ACTION_DATABASE_LOAD_TASK -> {
                     launchGroupActivityIfLoaded(database)
                 }
             }
         }
-        coordinatorLayout.showActionErrorIfNeeded(result)
     }
 
     /**
@@ -467,7 +457,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
          * -------------------------
          */
 
-        fun launchForSearchResult(
+        fun launchForSearch(
             context: Context,
             searchInfo: SearchInfo
         ) {
@@ -488,7 +478,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
             context: Context,
             typeMode: TypeMode,
             searchInfo: SearchInfo? = null,
-            activityResultLauncher: ActivityResultLauncher<Intent>? = null,
+            activityResultLauncher: ActivityResultLauncher<Intent>?,
         ) {
             EntrySelectionHelper.startActivityForSelectionModeResult(
                 context = context,
@@ -512,10 +502,10 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         ) {
             EntrySelectionHelper.startActivityForRegistrationModeResult(
                 context = context,
-                activityResultLauncher = activityResultLauncher,
                 intent = Intent(context, FileDatabaseSelectActivity::class.java),
                 registerInfo = registerInfo,
-                typeMode = typeMode
+                typeMode = typeMode,
+                activityResultLauncher = activityResultLauncher
             )
         }
     }

app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt

@@ -18,6 +18,7 @@
  */
 package com.kunzisoft.keepass.activities
 
+import android.app.Activity
 import android.app.SearchManager
 import android.content.ComponentName
 import android.content.Context
@@ -41,7 +42,6 @@ import android.widget.TextView
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.appcompat.app.ActionBarDrawerToggle
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
@@ -274,6 +274,8 @@ class GroupActivity : DatabaseLockActivity(),
         mGroupEditViewModel.selectIcon(icon)
     }
 
+    override fun manageDatabaseInfo(): Boolean = true
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -839,7 +841,7 @@ class GroupActivity : DatabaseLockActivity(),
                 // Open child group
                 loadMainGroup(GroupState(group.nodeId, 0))
             } catch (e: ClassCastException) {
-                Log.e(TAG, "Node can't be cast in Group")
+                Log.e(TAG, "Node can't be cast in Group", e)
             }
 
             Type.ENTRY -> try {
@@ -865,14 +867,16 @@ class GroupActivity : DatabaseLockActivity(),
                                 if (!database.isReadOnly
                                     && searchInfo != null
                                     && PreferencesUtil.isKeyboardSaveSearchInfoEnable(this@GroupActivity)
+                                    && entryVersioned.containsSearchInfo(database, searchInfo).not()
                                 ) {
                                     updateEntryWithRegisterInfo(
                                         database,
                                         entryVersioned,
                                         searchInfo.toRegisterInfo()
                                     )
+                                } else {
+                                    entrySelectedForKeyboardSelection(database, entryVersioned)
                                 }
-                                entrySelectedForKeyboardSelection(database, entryVersioned)
                             }
                             TypeMode.PASSKEY -> {
                                 entrySelectedForPasskeySelection(database, entryVersioned)
@@ -881,14 +885,16 @@ class GroupActivity : DatabaseLockActivity(),
                                 if (!database.isReadOnly
                                     && searchInfo != null
                                     && PreferencesUtil.isAutofillSaveSearchInfoEnable(this@GroupActivity)
+                                    && entryVersioned.containsSearchInfo(database, searchInfo).not()
                                 ) {
                                     updateEntryWithRegisterInfo(
                                         database,
                                         entryVersioned,
                                         searchInfo.toRegisterInfo()
                                     )
+                                } else {
+                                    entrySelectedForAutofillSelection(database, entryVersioned)
                                 }
-                                entrySelectedForAutofillSelection(database, entryVersioned)
                             }
                         }
                         loadGroup()
@@ -908,18 +914,15 @@ class GroupActivity : DatabaseLockActivity(),
                             finish()
                     })
             } catch (e: ClassCastException) {
-                Log.e(TAG, "Node can't be cast in Entry")
+                Log.e(TAG, "Node can't be cast in Entry", e)
             }
         }
     }
 
     private fun entrySelectedForKeyboardSelection(database: ContextualDatabase, entry: Entry) {
         removeSearch()
-        // Populate Magikeyboard with entry
-        MagikeyboardService.populateKeyboardAndMoveAppToBackground(
-            this,
-            entry.getEntryInfo(database)
-        )
+        // Build response with the entry selected
+        this.buildSpecialModeResponseAndSetResult(entry.getEntryInfo(database))
         onValidateSpecialMode()
     }
 
@@ -980,6 +983,17 @@ class GroupActivity : DatabaseLockActivity(),
         updateEntry(entry, newEntry)
     }
 
+    private fun Entry.containsSearchInfo(
+        database: ContextualDatabase,
+        searchInfo: SearchInfo
+    ): Boolean {
+        return getEntryInfo(
+            database,
+            raw = true,
+            removeTemplateConfiguration = false
+        ).containsSearchInfo(searchInfo)
+    }
+
     private fun finishNodeAction() {
         actionNodeMode?.finish()
     }
@@ -1521,7 +1535,7 @@ class GroupActivity : DatabaseLockActivity(),
          * 		Search Launch
          * -------------------------
          */
-        fun launchForSearchResult(
+        fun launchForSearch(
             context: Context,
             database: ContextualDatabase,
             searchInfo: SearchInfo,
@@ -1536,13 +1550,18 @@ class GroupActivity : DatabaseLockActivity(),
             }
         }
 
+        /*
+         * -------------------------
+         * 		Selection Launch
+         * -------------------------
+         */
         fun launchForSelection(
             context: Context,
             database: ContextualDatabase,
             typeMode: TypeMode,
             searchInfo: SearchInfo? = null,
             autoSearch: Boolean = false,
-            activityResultLauncher: ActivityResultLauncher<Intent>? = null,
+            activityResultLauncher: ActivityResultLauncher<Intent>?,
         ) {
             if (database.loaded) {
                 checkTimeAndBuildIntent(context, null) { intent ->
@@ -1590,7 +1609,7 @@ class GroupActivity : DatabaseLockActivity(),
          * -------------------------
          */
         fun launch(
-            activity: AppCompatActivity,
+            activity: Activity,
             database: ContextualDatabase,
             onValidateSpecialMode: () -> Unit,
             onCancelSpecialMode: () -> Unit,
@@ -1610,7 +1629,7 @@ class GroupActivity : DatabaseLockActivity(),
                 searchAction = { searchInfo ->
                     // Search action
                     if (database.loaded) {
-                        launchForSearchResult(activity,
+                        launchForSearch(activity,
                             database,
                             searchInfo,
                             true)
@@ -1632,11 +1651,7 @@ class GroupActivity : DatabaseLockActivity(),
                                     MagikeyboardService.performSelection(
                                         items = items,
                                         actionPopulateKeyboard = { entryInfo ->
-                                            // Keyboard populated
-                                            MagikeyboardService.populateKeyboardAndMoveAppToBackground(
-                                                activity,
-                                                entryInfo
-                                            )
+                                            activity.buildSpecialModeResponseAndSetResult(items)
                                             onValidateSpecialMode()
                                         },
                                         actionEntrySelection = { autoSearch ->
@@ -1645,6 +1660,7 @@ class GroupActivity : DatabaseLockActivity(),
                                                 database = database,
                                                 typeMode = TypeMode.MAGIKEYBOARD,
                                                 searchInfo = searchInfo,
+                                                activityResultLauncher = activityResultLauncher,
                                                 autoSearch = autoSearch
                                             )
                                             onLaunchActivitySpecialMode()

app/src/main/java/com/kunzisoft/keepass/activities/IconPickerActivity.kt

@@ -78,6 +78,8 @@ class IconPickerActivity : DatabaseLockActivity() {
 
     private var mExternalFileHelper: ExternalFileHelper? = null
 
+    override fun manageDatabaseInfo(): Boolean = true
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

app/src/main/java/com/kunzisoft/keepass/activities/ImageViewerActivity.kt

@@ -45,6 +45,8 @@ class ImageViewerActivity : DatabaseLockActivity() {
     private lateinit var imageView: ImageView
     private lateinit var progressView: View
 
+    override fun manageDatabaseInfo(): Boolean = false
+
     @SuppressLint("ClickableViewAccessibility")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)

app/src/main/java/com/kunzisoft/keepass/activities/KeyGeneratorActivity.kt

@@ -28,6 +28,8 @@ class KeyGeneratorActivity : DatabaseLockActivity() {
     private lateinit var validationButton: View
     private var lockView: View? = null
 
+    override fun manageDatabaseInfo(): Boolean = true
+
     private val keyGeneratorViewModel: KeyGeneratorViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/kunzisoft/keepass/activities/MainCredentialActivity.kt

@@ -36,7 +36,6 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.biometric.BiometricManager
 import androidx.coordinatorlayout.widget.CoordinatorLayout
@@ -125,6 +124,8 @@ class MainCredentialActivity : DatabaseModeActivity() {
     private var mReadOnly: Boolean = false
     private var mForceReadOnly: Boolean = false
 
+    override fun manageDatabaseInfo(): Boolean  = false
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -803,13 +804,13 @@ class MainCredentialActivity : DatabaseModeActivity() {
 
         @Throws(FileNotFoundException::class)
         fun launchForSelection(
-            activity: AppCompatActivity,
+            activity: Activity,
             databaseFile: Uri,
             keyFile: Uri?,
             hardwareKey: HardwareKey?,
             typeMode: TypeMode,
             searchInfo: SearchInfo?,
-            activityResultLauncher: ActivityResultLauncher<Intent>? = null,
+            activityResultLauncher: ActivityResultLauncher<Intent>?
         ) {
             buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                 EntrySelectionHelper.startActivityForSelectionModeResult(
@@ -831,20 +832,20 @@ class MainCredentialActivity : DatabaseModeActivity() {
         @Throws(FileNotFoundException::class)
         fun launchForRegistration(
             activity: Activity,
-            activityResultLauncher: ActivityResultLauncher<Intent>?,
             databaseFile: Uri,
             keyFile: Uri?,
             hardwareKey: HardwareKey?,
             typeMode: TypeMode,
-            registerInfo: RegisterInfo?
+            registerInfo: RegisterInfo?,
+            activityResultLauncher: ActivityResultLauncher<Intent>?
         ) {
             buildAndLaunchIntent(activity, databaseFile, keyFile, hardwareKey) { intent ->
                 EntrySelectionHelper.startActivityForRegistrationModeResult(
                     context = activity,
-                    activityResultLauncher = activityResultLauncher,
                     intent = intent,
                     typeMode = typeMode,
-                    registerInfo = registerInfo
+                    registerInfo = registerInfo,
+                    activityResultLauncher = activityResultLauncher,
                 )
             }
         }

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt

@@ -1,13 +1,17 @@
 package com.kunzisoft.keepass.activities.legacy
 
 import android.Manifest
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Bundle
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContract
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
+import androidx.core.app.ActivityOptionsCompat
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -16,13 +20,14 @@ import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment
 import com.kunzisoft.keepass.activities.dialogs.DatabaseChangedDialogFragment.Companion.DATABASE_CHANGED_DIALOG_TAG
 import com.kunzisoft.keepass.activities.stylish.StylishActivity
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.setActivityResult
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.database.DatabaseTaskProvider.Companion.startDatabaseService
-import com.kunzisoft.keepass.database.ProgressMessage
 import com.kunzisoft.keepass.model.SnapFileDatabaseInfo
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.tasks.ProgressTaskDialogFragment
 import com.kunzisoft.keepass.tasks.ProgressTaskDialogFragment.Companion.PROGRESS_TASK_DIALOG_TAG
+import com.kunzisoft.keepass.tasks.ProgressTaskViewModel
 import com.kunzisoft.keepass.viewmodels.DatabaseViewModel
 import kotlinx.coroutines.launch
 
@@ -32,6 +37,7 @@ abstract class DatabaseActivity : StylishActivity(), DatabaseRetrieval {
     protected val mDatabase: ContextualDatabase?
         get() = mDatabaseViewModel.database
 
+    private val progressTaskViewModel: ProgressTaskViewModel by viewModels()
     private var progressTaskDialogFragment: ProgressTaskDialogFragment? = null
     private var databaseChangedDialogFragment: DatabaseChangedDialogFragment? = null
 
@@ -53,58 +59,104 @@ abstract class DatabaseActivity : StylishActivity(), DatabaseRetrieval {
         }
     }
 
+    /**
+     * Useful to only waiting for the activity result and prevent any parallel action
+     */
+    var credentialResultLaunched = false
+
+    /**
+     * Utility activity result launcher,
+     * Used recursively, close each activity with return data
+     */
+    protected var mCredentialActivityResultLauncher: CredentialActivityResultLauncher =
+        CredentialActivityResultLauncher(
+        registerForActivityResult(
+                ActivityResultContracts.StartActivityForResult()
+            ) {
+                setActivityResult(
+                    lockDatabase = false,
+                    resultCode = it.resultCode,
+                    data = it.data
+                )
+            }
+        )
+
+    /**
+     * Custom ActivityResultLauncher to manage the database action
+     */
+    protected inner class CredentialActivityResultLauncher(
+        val builder: ActivityResultLauncher<Intent>
+    ) : ActivityResultLauncher<Intent>() {
+
+        override fun launch(
+            input: Intent?,
+            options: ActivityOptionsCompat?
+        ) {
+            credentialResultLaunched = true
+            builder.launch(input, options)
+        }
+
+        override fun unregister() {
+            builder.unregister()
+        }
+
+        override fun getContract(): ActivityResultContract<Intent?, *> {
+            return builder.getContract()
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        if (savedInstanceState != null
+            && savedInstanceState.containsKey(CREDENTIAL_RESULT_LAUNCHER_KEY)
+        ) {
+            credentialResultLaunched = savedInstanceState.getBoolean(CREDENTIAL_RESULT_LAUNCHER_KEY)
+        }
+
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.STARTED) {
                 mDatabaseViewModel.actionState.collect { uiState ->
-                    when (uiState) {
-                        is DatabaseViewModel.ActionState.Loading -> {}
-                        is DatabaseViewModel.ActionState.OnDatabaseReloaded -> {
-                            if (finishActivityIfReloadRequested()) {
-                                finish()
+                    if (credentialResultLaunched.not()) {
+                        when (uiState) {
+                            is DatabaseViewModel.ActionState.Wait -> {}
+                            is DatabaseViewModel.ActionState.OnDatabaseReloaded -> {
+                                if (finishActivityIfReloadRequested()) {
+                                    finish()
+                                }
                             }
-                        }
-
-                        is DatabaseViewModel.ActionState.OnDatabaseInfoChanged -> {
-                            if (manageDatabaseInfo()) {
-                                showDatabaseChangedDialog(
-                                    uiState.previousDatabaseInfo,
-                                    uiState.newDatabaseInfo,
-                                    uiState.readOnlyDatabase
+                            is DatabaseViewModel.ActionState.OnDatabaseInfoChanged -> {
+                                if (manageDatabaseInfo()) {
+                                    showDatabaseChangedDialog(
+                                        uiState.previousDatabaseInfo,
+                                        uiState.newDatabaseInfo,
+                                        uiState.readOnlyDatabase
+                                    )
+                                }
+                            }
+                            is DatabaseViewModel.ActionState.OnDatabaseActionRequested -> {
+                                startDatabasePermissionService(
+                                    uiState.bundle,
+                                    uiState.actionTask
                                 )
                             }
-                        }
-
-                        is DatabaseViewModel.ActionState.OnDatabaseActionRequested -> {
-                            startDatabasePermissionService(
-                                uiState.bundle,
-                                uiState.actionTask
-                            )
-                        }
-
-                        is DatabaseViewModel.ActionState.OnDatabaseActionStarted -> {
-                            if (showDatabaseDialog())
-                                startDialog(uiState.progressMessage)
-                        }
-
-                        is DatabaseViewModel.ActionState.OnDatabaseActionUpdated -> {
-                            if (showDatabaseDialog())
-                                updateDialog(uiState.progressMessage)
-                        }
-
-                        is DatabaseViewModel.ActionState.OnDatabaseActionStopped -> {
-                            // Remove the progress task
-                            stopDialog()
-                        }
-
-                        is DatabaseViewModel.ActionState.OnDatabaseActionFinished -> {
-                            onDatabaseActionFinished(
-                                uiState.database,
-                                uiState.actionTask,
-                                uiState.result
-                            )
-                            stopDialog()
+                            is DatabaseViewModel.ActionState.OnDatabaseActionStarted -> {
+                                progressTaskViewModel.show(uiState.progressMessage)
+                            }
+                            is DatabaseViewModel.ActionState.OnDatabaseActionUpdated -> {
+                                progressTaskViewModel.show(uiState.progressMessage)
+                            }
+                            is DatabaseViewModel.ActionState.OnDatabaseActionStopped -> {
+                                progressTaskViewModel.hide()
+                            }
+                            is DatabaseViewModel.ActionState.OnDatabaseActionFinished -> {
+                                onDatabaseActionFinished(
+                                    uiState.database,
+                                    uiState.actionTask,
+                                    uiState.result
+                                )
+                                progressTaskViewModel.hide()
+                            }
                         }
                     }
                 }
@@ -112,15 +164,34 @@ abstract class DatabaseActivity : StylishActivity(), DatabaseRetrieval {
         }
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.RESUMED) {
-                mDatabaseViewModel.databaseState.collect { database ->
-                    // Nullable function
-                    onUnknownDatabaseRetrieved(database)
-                    database?.let {
-                        onDatabaseRetrieved(database)
+                progressTaskViewModel.progressTaskState.collect { state ->
+                    when (state) {
+                        is ProgressTaskViewModel.ProgressTaskState.Show ->
+                            startDialog()
+                        is ProgressTaskViewModel.ProgressTaskState.Hide ->
+                            stopDialog()
                     }
                 }
             }
         }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.RESUMED) {
+                mDatabaseViewModel.databaseState.collect { database ->
+                    if (credentialResultLaunched.not()) {
+                        // Nullable function
+                        onUnknownDatabaseRetrieved(database)
+                        database?.let {
+                            onDatabaseRetrieved(database)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putBoolean(CREDENTIAL_RESULT_LAUNCHER_KEY, credentialResultLaunched)
+        super.onSaveInstanceState(outState)
     }
 
     /**
@@ -203,29 +274,21 @@ abstract class DatabaseActivity : StylishActivity(), DatabaseRetrieval {
         }
     }
 
-    private fun startDialog(progressMessage: ProgressMessage) {
+    private fun startDialog() {
         lifecycleScope.launch {
-            if (progressTaskDialogFragment == null) {
-                progressTaskDialogFragment = supportFragmentManager
-                    .findFragmentByTag(PROGRESS_TASK_DIALOG_TAG) as ProgressTaskDialogFragment?
+            if (showDatabaseDialog()) {
+                if (progressTaskDialogFragment == null) {
+                    progressTaskDialogFragment = supportFragmentManager
+                        .findFragmentByTag(PROGRESS_TASK_DIALOG_TAG) as ProgressTaskDialogFragment?
+                }
+                if (progressTaskDialogFragment == null) {
+                    progressTaskDialogFragment = ProgressTaskDialogFragment()
+                    progressTaskDialogFragment?.show(
+                        supportFragmentManager,
+                        PROGRESS_TASK_DIALOG_TAG
+                    )
+                }
             }
-            if (progressTaskDialogFragment == null) {
-                progressTaskDialogFragment = ProgressTaskDialogFragment()
-                progressTaskDialogFragment?.show(
-                    supportFragmentManager,
-                    PROGRESS_TASK_DIALOG_TAG
-                )
-            }
-            updateDialog(progressMessage)
-        }
-    }
-
-    private fun updateDialog(progressMessage: ProgressMessage) {
-        progressTaskDialogFragment?.apply {
-            updateTitle(progressMessage.titleId)
-            updateMessage(progressMessage.messageId)
-            updateWarning(progressMessage.warningId)
-            setCancellable(progressMessage.cancelable)
         }
     }
 
@@ -237,4 +300,8 @@ abstract class DatabaseActivity : StylishActivity(), DatabaseRetrieval {
     protected open fun showDatabaseDialog(): Boolean {
         return true
     }
+
+    companion object {
+        const val CREDENTIAL_RESULT_LAUNCHER_KEY = "com.kunzisoft.keepass.CREDENTIAL_RESULT_LAUNCHER_KEY"
+    }
 }

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseLockActivity.kt

@@ -370,9 +370,11 @@ abstract class DatabaseLockActivity : DatabaseModeActivity(),
                 .setNegativeButton(android.R.string.cancel, null)
                 .setPositiveButton(R.string.lock) { _, _ ->
                     sendBroadcast(Intent(LOCK_ACTION))
+                    finish()
                 }.create().show()
         } else {
             sendBroadcast(Intent(LOCK_ACTION))
+            finish()
         }
     }
 

app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseModeActivity.kt

@@ -1,12 +1,9 @@
 package com.kunzisoft.keepass.activities.legacy
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.contract.ActivityResultContracts
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.isIntentSenderMode
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.removeInfo
@@ -15,7 +12,6 @@ import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveReg
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSearchInfo
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSpecialMode
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveTypeMode
-import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.setActivityResult
 import com.kunzisoft.keepass.credentialprovider.SpecialMode
 import com.kunzisoft.keepass.credentialprovider.TypeMode
 import com.kunzisoft.keepass.model.RegisterInfo
@@ -34,21 +30,6 @@ abstract class DatabaseModeActivity : DatabaseActivity() {
 
     private var mToolbarSpecial: ToolbarSpecial? = null
 
-    /**
-     * Utility activity result launcher,
-     * Used recursively, close each activity with return data
-     */
-    protected open var mCredentialActivityResultLauncher: ActivityResultLauncher<Intent>? =
-        registerForActivityResult(
-        ActivityResultContracts.StartActivityForResult()
-    ) {
-        setActivityResult(
-            lockDatabase = false,
-            resultCode = it.resultCode,
-            data = it.data
-        )
-    }
-
     open fun onDatabaseBackPressed() {
         if (mSpecialMode != SpecialMode.DEFAULT)
             onCancelSpecialMode()

app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt

@@ -34,15 +34,20 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.element.node.NodeIdUUID
 import com.kunzisoft.keepass.model.EntryInfo
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.utils.LOCK_ACTION
+import com.kunzisoft.keepass.utils.getEnum
 import com.kunzisoft.keepass.utils.getEnumExtra
+import com.kunzisoft.keepass.utils.getParcelableCompat
 import com.kunzisoft.keepass.utils.getParcelableExtraCompat
 import com.kunzisoft.keepass.utils.getParcelableList
+import com.kunzisoft.keepass.utils.putEnum
 import com.kunzisoft.keepass.utils.putEnumExtra
 import com.kunzisoft.keepass.utils.putParcelableList
+import java.io.IOException
 import java.util.UUID
 
 object EntrySelectionHelper {
@@ -157,10 +162,21 @@ object EntrySelectionHelper {
         return this
     }
 
+    fun Bundle.addSearchInfo(searchInfo: SearchInfo?): Bundle {
+        searchInfo?.let {
+            putParcelable(KEY_SEARCH_INFO, it)
+        }
+        return this
+    }
+
     fun Intent.retrieveSearchInfo(): SearchInfo? {
         return getParcelableExtraCompat(KEY_SEARCH_INFO)
     }
 
+    fun Bundle.getSearchInfo(): SearchInfo? {
+        return getParcelableCompat(KEY_SEARCH_INFO)
+    }
+
     fun Intent.addRegisterInfo(registerInfo: RegisterInfo?): Intent {
         registerInfo?.let {
             putExtra(KEY_REGISTER_INFO, it)
@@ -168,10 +184,21 @@ object EntrySelectionHelper {
         return this
     }
 
+    fun Bundle.addRegisterInfo(registerInfo: RegisterInfo?): Bundle {
+        registerInfo?.let {
+            putParcelable(KEY_REGISTER_INFO, it)
+        }
+        return this
+    }
+
     fun Intent.retrieveRegisterInfo(): RegisterInfo? {
         return getParcelableExtraCompat(KEY_REGISTER_INFO)
     }
 
+    fun Bundle.getRegisterInfo(): RegisterInfo? {
+        return getParcelableCompat(KEY_REGISTER_INFO)
+    }
+
     fun Intent.removeInfo() {
         removeExtra(KEY_SEARCH_INFO)
         removeExtra(KEY_REGISTER_INFO)
@@ -182,8 +209,17 @@ object EntrySelectionHelper {
         return this
     }
 
+    fun Bundle.addSpecialMode(specialMode: SpecialMode): Bundle {
+        this.putEnum(KEY_SPECIAL_MODE, specialMode)
+        return this
+    }
+
     fun Intent.retrieveSpecialMode(): SpecialMode {
-        return getEnumExtra<SpecialMode>(KEY_SPECIAL_MODE) ?: SpecialMode.DEFAULT
+        return this.getEnumExtra<SpecialMode>(KEY_SPECIAL_MODE) ?: SpecialMode.DEFAULT
+    }
+
+    fun Bundle.getSpecialMode(): SpecialMode {
+        return this.getEnum<SpecialMode>(KEY_SPECIAL_MODE) ?: SpecialMode.DEFAULT
     }
 
     fun Intent.addTypeMode(typeMode: TypeMode): Intent {
@@ -233,12 +269,26 @@ object EntrySelectionHelper {
         removeExtra(EXTRA_NODE_ID)
     }
 
+    /**
+     * Retrieve nodes ids from intent and get the corresponding entry info list in [database]
+     */
+    fun Intent.retrieveAndRemoveEntries(database: ContextualDatabase): List<EntryInfo> {
+        val nodesIds = retrieveNodesIds()
+            ?: throw IOException("NodesIds is null")
+        removeNodesIds()
+        return nodesIds.mapNotNull { nodeId ->
+            database
+                .getEntryById(NodeIdUUID(nodeId))
+                ?.getEntryInfo(database)
+        }
+    }
+
     /**
      * Intent sender uses special retains data in callback
      */
     fun isIntentSenderMode(specialMode: SpecialMode, typeMode: TypeMode): Boolean {
         return (specialMode == SpecialMode.SELECTION
-                && (typeMode == TypeMode.AUTOFILL || typeMode == TypeMode.PASSKEY))
+                && (typeMode == TypeMode.MAGIKEYBOARD || typeMode == TypeMode.AUTOFILL || typeMode == TypeMode.PASSKEY))
                 || (specialMode == SpecialMode.REGISTRATION
                 && (typeMode == TypeMode.AUTOFILL || typeMode == TypeMode.PASSKEY))
     }

app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/AutofillLauncherActivity.kt

@@ -38,14 +38,17 @@ import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.addRegisterInfo
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.addSearchInfo
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.addSpecialMode
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.getRegisterInfo
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.getSearchInfo
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.getSpecialMode
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.setActivityResult
 import com.kunzisoft.keepass.credentialprovider.SpecialMode
 import com.kunzisoft.keepass.credentialprovider.autofill.AutofillComponent
 import com.kunzisoft.keepass.credentialprovider.autofill.AutofillHelper.addAutofillComponent
+import com.kunzisoft.keepass.credentialprovider.autofill.AutofillHelper.retrieveAutofillComponent
 import com.kunzisoft.keepass.credentialprovider.viewmodel.AutofillLauncherViewModel
 import com.kunzisoft.keepass.credentialprovider.viewmodel.CredentialLauncherViewModel
 import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.database.exception.RegisterInReadOnlyDatabaseException
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.utils.AppUtil.randomRequestCode
@@ -67,15 +70,21 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
             autofillLauncherViewModel.manageRegistrationResult(it)
         }
 
-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
+    override fun applyCustomStyle(): Boolean = false
 
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return true
-    }
+    override fun finishActivityIfReloadRequested(): Boolean = true
+
+    override fun manageDatabaseInfo(): Boolean  = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        // To apply the bypass https://github.com/Kunzisoft/KeePassDX/issues/2238
+        // before managing intent in super class
+        intent.retrieveSelectionBundle()?.apply {
+            intent.addSpecialMode(getSpecialMode())
+            intent.addSearchInfo(getSearchInfo())
+            intent.addRegisterInfo(getRegisterInfo())
+            intent.addAutofillComponent(retrieveAutofillComponent())
+        }
         super.onCreate(savedInstanceState)
         autofillLauncherViewModel.initialize()
         lifecycleScope.launch {
@@ -87,10 +96,6 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                         showBlockRestartMessage()
                         autofillLauncherViewModel.cancelResult()
                     }
-                    is AutofillLauncherViewModel.UIState.ShowReadOnlyMessage -> {
-                        showReadOnlySaveMessage()
-                        autofillLauncherViewModel.cancelResult()
-                    }
                     is AutofillLauncherViewModel.UIState.ShowAutofillSuggestionMessage -> {
                         showAutofillSuggestionMessage()
                     }
@@ -101,8 +106,8 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
             // Retrieve the UI
             autofillLauncherViewModel.credentialUiState.collect { uiState ->
                 when (uiState) {
-                    is CredentialLauncherViewModel.UIState.Loading -> {}
-                    is CredentialLauncherViewModel.UIState.LaunchGroupActivityForSelection -> {
+                    is CredentialLauncherViewModel.CredentialState.Loading -> {}
+                    is CredentialLauncherViewModel.CredentialState.LaunchGroupActivityForSelection -> {
                         GroupActivity.launchForSelection(
                             context = this@AutofillLauncherActivity,
                             database = uiState.database,
@@ -111,7 +116,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                             activityResultLauncher = mAutofillSelectionActivityResultLauncher,
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration -> {
+                    is CredentialLauncherViewModel.CredentialState.LaunchGroupActivityForRegistration -> {
                         GroupActivity.launchForRegistration(
                             context = this@AutofillLauncherActivity,
                             database = uiState.database,
@@ -120,7 +125,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                             activityResultLauncher = mAutofillRegistrationActivityResultLauncher
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForSelection -> {
+                    is CredentialLauncherViewModel.CredentialState.LaunchFileDatabaseSelectActivityForSelection -> {
                         FileDatabaseSelectActivity.launchForSelection(
                             context = this@AutofillLauncherActivity,
                             searchInfo = uiState.searchInfo,
@@ -128,7 +133,7 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                             activityResultLauncher = mAutofillSelectionActivityResultLauncher
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForRegistration -> {
+                    is CredentialLauncherViewModel.CredentialState.LaunchFileDatabaseSelectActivityForRegistration -> {
                         FileDatabaseSelectActivity.launchForRegistration(
                             context = this@AutofillLauncherActivity,
                             registerInfo = uiState.registerInfo,
@@ -136,14 +141,14 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
                             activityResultLauncher = mAutofillRegistrationActivityResultLauncher,
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.SetActivityResult -> {
+                    is CredentialLauncherViewModel.CredentialState.SetActivityResult -> {
                         setActivityResult(
                             lockDatabase = uiState.lockDatabase,
                             resultCode = uiState.resultCode,
                             data = uiState.data
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.ShowError -> {
+                    is CredentialLauncherViewModel.CredentialState.ShowError -> {
                         toastError(uiState.error)
                         autofillLauncherViewModel.cancelResult()
                     }
@@ -174,29 +179,34 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
         ).show()
     }
 
-    private fun showReadOnlySaveMessage() {
-        toastError(RegisterInReadOnlyDatabaseException())
-    }
-
     companion object {
 
+        private const val KEY_PENDING_INTENT_BUNDLE = "com.kunzisoft.keepass.extra.BUNDLE"
         private val TAG = AutofillLauncherActivity::class.java.name
 
+        fun Intent.retrieveSelectionBundle(): Bundle? {
+            return this.getBundleExtra(KEY_PENDING_INTENT_BUNDLE)
+        }
+
         fun getPendingIntentForSelection(
             context: Context,
             searchInfo: SearchInfo? = null,
             autofillComponent: AutofillComponent
         ): PendingIntent? {
             try {
+                // Doesn't work with direct extra Parcelable in Android 11 (don't know why?)
+                // https://github.com/Kunzisoft/KeePassDX/issues/2238
+                // Wrap into a bundle to bypass the problem
+                val tempBundle = Bundle().apply {
+                    addSpecialMode(SpecialMode.SELECTION)
+                    addSearchInfo(searchInfo)
+                    addAutofillComponent(autofillComponent)
+                }
                 return PendingIntent.getActivity(
                     context,
                     randomRequestCode(),
-                    // Doesn't work with direct extra Parcelable (don't know why?)
-                    // Wrap into a bundle to bypass the problem
                     Intent(context, AutofillLauncherActivity::class.java).apply {
-                        addSpecialMode(SpecialMode.SELECTION)
-                        addSearchInfo(searchInfo)
-                        addAutofillComponent(autofillComponent)
+                        putExtra(KEY_PENDING_INTENT_BUNDLE, tempBundle)
                     },
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                         PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT
@@ -215,12 +225,16 @@ class AutofillLauncherActivity : DatabaseModeActivity() {
             registerInfo: RegisterInfo
         ): PendingIntent? {
             try {
+                // Bypass intent issue
+                val tempBundle = Bundle().apply {
+                    addSpecialMode(SpecialMode.REGISTRATION)
+                    addRegisterInfo(registerInfo)
+                }
                 return PendingIntent.getActivity(
                     context,
                     randomRequestCode(),
                     Intent(context, AutofillLauncherActivity::class.java).apply {
-                        addSpecialMode(SpecialMode.REGISTRATION)
-                        addRegisterInfo(registerInfo)
+                        putExtra(KEY_PENDING_INTENT_BUNDLE, tempBundle)
                     },
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                         PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_CANCEL_CURRENT

app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/EntrySelectionLauncherActivity.kt

@@ -22,20 +22,22 @@ package com.kunzisoft.keepass.credentialprovider.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import androidx.core.net.toUri
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
+import androidx.lifecycle.lifecycleScope
 import com.kunzisoft.keepass.activities.FileDatabaseSelectActivity
 import com.kunzisoft.keepass.activities.GroupActivity
 import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
-import com.kunzisoft.keepass.credentialprovider.TypeMode
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.addSearchInfo
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.setActivityResult
 import com.kunzisoft.keepass.credentialprovider.magikeyboard.MagikeyboardService
+import com.kunzisoft.keepass.credentialprovider.viewmodel.CredentialLauncherViewModel
+import com.kunzisoft.keepass.credentialprovider.viewmodel.EntrySelectionViewModel
 import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.database.exception.RegisterInReadOnlyDatabaseException
-import com.kunzisoft.keepass.database.helper.SearchHelper
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.otp.OtpEntryFields
-import com.kunzisoft.keepass.utils.KeyboardUtil.isKeyboardActivatedInSettings
-import com.kunzisoft.keepass.utils.getParcelableCompat
 import com.kunzisoft.keepass.view.toastError
+import kotlinx.coroutines.launch
 
 /**
  * Activity to search or select entry in database,
@@ -43,201 +45,133 @@ import com.kunzisoft.keepass.view.toastError
  */
 class EntrySelectionLauncherActivity : DatabaseModeActivity() {
 
-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
+    private val entrySelectionViewModel: EntrySelectionViewModel by viewModels()
 
-    override fun finishActivityIfReloadRequested(): Boolean {
-        return false
+    private var mEntrySelectionActivityResultLauncher: ActivityResultLauncher<Intent>? =
+        this.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            entrySelectionViewModel.manageSelectionResult(it)
+        }
+
+    override fun applyCustomStyle() = false
+
+    override fun finishActivityIfReloadRequested() = false
+
+    override fun manageDatabaseInfo(): Boolean = false
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        entrySelectionViewModel.initialize()
+        lifecycleScope.launch {
+            // Initialize the parameters
+            entrySelectionViewModel.uiState.collect { uiState ->
+                when (uiState) {
+                    is EntrySelectionViewModel.UIState.Loading -> {}
+                    is EntrySelectionViewModel.UIState.PopulateKeyboard -> {
+                        MagikeyboardService.addEntryAndLaunchNotificationIfAllowed(
+                            context = this@EntrySelectionLauncherActivity,
+                            entry = uiState.entryInfo,
+                            toast = true
+                        )
+                    }
+                    is EntrySelectionViewModel.UIState.LaunchFileDatabaseSelectForSearch -> {
+                        FileDatabaseSelectActivity.launchForSearch(
+                            context = this@EntrySelectionLauncherActivity,
+                            searchInfo = uiState.searchInfo
+                        )
+                        finish()
+                    }
+                    is EntrySelectionViewModel.UIState.LaunchGroupActivityForSearch -> {
+                        GroupActivity.launchForSearch(
+                            context = this@EntrySelectionLauncherActivity,
+                            database = uiState.database,
+                            searchInfo = uiState.searchInfo
+                        )
+                        finish()
+                    }
+                }
+            }
+        }
+        lifecycleScope.launch {
+            // Retrieve the UI
+            entrySelectionViewModel.credentialUiState.collect { uiState ->
+                when (uiState) {
+                    is CredentialLauncherViewModel.CredentialState.Loading -> {}
+                    is CredentialLauncherViewModel.CredentialState.LaunchGroupActivityForSelection -> {
+                        GroupActivity.launchForSelection(
+                            context = this@EntrySelectionLauncherActivity,
+                            database = uiState.database,
+                            searchInfo = uiState.searchInfo,
+                            typeMode = uiState.typeMode,
+                            activityResultLauncher = mEntrySelectionActivityResultLauncher
+                        )
+                    }
+                    is CredentialLauncherViewModel.CredentialState.LaunchGroupActivityForRegistration -> {
+                        GroupActivity.launchForRegistration(
+                            context = this@EntrySelectionLauncherActivity,
+                            database = uiState.database,
+                            registerInfo = uiState.registerInfo,
+                            typeMode = uiState.typeMode,
+                            activityResultLauncher = null // Null to not get any callback
+                        )
+                        finish()
+                    }
+                    is CredentialLauncherViewModel.CredentialState.LaunchFileDatabaseSelectActivityForSelection -> {
+                        FileDatabaseSelectActivity.launchForSelection(
+                            context = this@EntrySelectionLauncherActivity,
+                            searchInfo = uiState.searchInfo,
+                            typeMode = uiState.typeMode,
+                            activityResultLauncher = mEntrySelectionActivityResultLauncher
+                        )
+                    }
+                    is CredentialLauncherViewModel.CredentialState.LaunchFileDatabaseSelectActivityForRegistration -> {
+                        FileDatabaseSelectActivity.launchForRegistration(
+                            context = this@EntrySelectionLauncherActivity,
+                            registerInfo = uiState.registerInfo,
+                            typeMode = uiState.typeMode,
+                            activityResultLauncher = null // Null to not get any callback
+                        )
+                        finish()
+                    }
+                    is CredentialLauncherViewModel.CredentialState.SetActivityResult -> {
+                        setActivityResult(
+                            lockDatabase = uiState.lockDatabase,
+                            resultCode = uiState.resultCode,
+                            data = uiState.data
+                        )
+                    }
+                    is CredentialLauncherViewModel.CredentialState.ShowError -> {
+                        toastError(uiState.error)
+                        entrySelectionViewModel.cancelResult()
+                    }
+                }
+            }
+        }
     }
 
     override fun onUnknownDatabaseRetrieved(database: ContextualDatabase?) {
         super.onUnknownDatabaseRetrieved(database)
-
-        val keySelectionBundle = intent.getBundleExtra(KEY_SELECTION_BUNDLE)
-        if (keySelectionBundle != null) {
-            // To manage package name
-            var searchInfo = SearchInfo()
-            keySelectionBundle.getParcelableCompat<SearchInfo>(KEY_SEARCH_INFO)?.let { mSearchInfo ->
-                searchInfo = mSearchInfo
-            }
-            launch(database, searchInfo)
-        } else {
-            // To manage share
-            var sharedWebDomain: String? = null
-            var otpString: String? = null
-
-            when (intent?.action) {
-                Intent.ACTION_SEND -> {
-                    if ("text/plain" == intent.type) {
-                        // Retrieve web domain or OTP
-                        intent.getStringExtra(Intent.EXTRA_TEXT)?.let { extra ->
-                            if (OtpEntryFields.isOTPUri(extra))
-                                otpString = extra
-                            else
-                                sharedWebDomain = extra.toUri().host
-                        }
-                    }
-                    launchSelection(database, sharedWebDomain, otpString)
-                }
-                Intent.ACTION_VIEW -> {
-                    // Retrieve OTP
-                    intent.dataString?.let { extra ->
-                        if (OtpEntryFields.isOTPUri(extra))
-                            otpString = extra
-                    }
-                    launchSelection(database, null, otpString)
-                }
-                else -> {
-                    if (database != null) {
-                        GroupActivity.launch(this, database)
-                    } else {
-                        FileDatabaseSelectActivity.launch(this)
-                    }
-                }
-            }
-        }
-        finish()
+        entrySelectionViewModel.launchActionIfNeeded(intent, mSpecialMode, database)
     }
 
-    private fun launchSelection(database: ContextualDatabase?,
-                                sharedWebDomain: String?,
-                                otpString: String?) {
-        // Build domain search param
-        val searchInfo = SearchInfo().apply {
-            this.webDomain = sharedWebDomain
-            this.otpString = otpString
-        }
-        launch(database, searchInfo)
-    }
-
-    private fun launch(database: ContextualDatabase?,
-                       searchInfo: SearchInfo) {
-
-        // Setting to integrate Magikeyboard
-        val searchShareForMagikeyboard = isKeyboardActivatedInSettings()
-
-        // If database is open
-        val readOnly = database?.isReadOnly != false
-        SearchHelper.checkAutoSearchInfo(
-            context = this,
-            database = database,
-            searchInfo = searchInfo,
-            onItemsFound = { openedDatabase, items ->
-                // Items found
-                if (searchInfo.otpString != null) {
-                    if (!readOnly) {
-                        GroupActivity.launchForRegistration(
-                            context = this,
-                            activityResultLauncher = null,
-                            database = openedDatabase,
-                            registerInfo = searchInfo.toRegisterInfo(),
-                            typeMode = TypeMode.DEFAULT
-                        )
-                    } else {
-                        toastError(RegisterInReadOnlyDatabaseException())
-                    }
-                } else if (searchShareForMagikeyboard) {
-                    MagikeyboardService.performSelection(
-                        items,
-                        { entryInfo ->
-                            // Automatically populate keyboard
-                            MagikeyboardService.populateKeyboardAndMoveAppToBackground(
-                                this,
-                                entryInfo
-                            )
-                        },
-                        { autoSearch ->
-                            GroupActivity.launchForSelection(
-                                context = this,
-                                database = openedDatabase,
-                                typeMode = TypeMode.MAGIKEYBOARD,
-                                searchInfo = searchInfo,
-                                autoSearch = autoSearch
-                            )
-                        }
-                    )
-                } else {
-                    GroupActivity.launchForSearchResult(
-                        this,
-                        openedDatabase,
-                        searchInfo,
-                        true
-                    )
-                }
-            },
-            onItemNotFound = { openedDatabase ->
-                // Show the database UI to select the entry
-                if (searchInfo.otpString != null) {
-                    if (!readOnly) {
-                        GroupActivity.launchForRegistration(
-                            context = this,
-                            activityResultLauncher = null,
-                            database = openedDatabase,
-                            registerInfo = searchInfo.toRegisterInfo(),
-                            typeMode = TypeMode.DEFAULT
-                        )
-                    } else {
-                        toastError(RegisterInReadOnlyDatabaseException())
-                    }
-                } else if (searchShareForMagikeyboard) {
-                    GroupActivity.launchForSelection(
-                        context = this,
-                        database = openedDatabase,
-                        typeMode = TypeMode.MAGIKEYBOARD,
-                        searchInfo = searchInfo,
-                        autoSearch = false
-                    )
-                } else {
-                    GroupActivity.launchForSearchResult(
-                        this,
-                        openedDatabase,
-                        searchInfo,
-                        false
-                    )
-                }
-            },
-            onDatabaseClosed = {
-                // If database not open
-                if (searchInfo.otpString != null) {
-                    FileDatabaseSelectActivity.launchForRegistration(
-                        context = this,
-                        activityResultLauncher = null,
-                        registerInfo = searchInfo.toRegisterInfo(),
-                        typeMode = TypeMode.DEFAULT
-                    )
-                } else if (searchShareForMagikeyboard) {
-                    FileDatabaseSelectActivity.launchForSelection(
-                        context = this,
-                        typeMode = TypeMode.MAGIKEYBOARD,
-                        searchInfo = searchInfo
-                    )
-                } else {
-                    FileDatabaseSelectActivity.launchForSearchResult(
-                        this,
-                        searchInfo
-                    )
-                }
-            }
-        )
+    override fun onDestroy() {
+        super.onDestroy()
     }
 
     companion object {
 
-        private const val KEY_SELECTION_BUNDLE = "KEY_SELECTION_BUNDLE"
-        private const val KEY_SEARCH_INFO = "KEY_SEARCH_INFO"
-
-        fun launch(context: Context,
-                   searchInfo: SearchInfo? = null) {
-            val intent = Intent(context, EntrySelectionLauncherActivity::class.java).apply {
-                putExtra(KEY_SELECTION_BUNDLE, Bundle().apply {
-                    putParcelable(KEY_SEARCH_INFO, searchInfo)
-                })
-            }
-            // New task needed because don't launch from an Activity context
-            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or
-                    Intent.FLAG_ACTIVITY_CLEAR_TASK
-            context.startActivity(intent)
+        fun launch(
+            context: Context,
+            searchInfo: SearchInfo? = null
+        ) {
+            context.startActivity(Intent(
+                context,
+                EntrySelectionLauncherActivity::class.java
+            ).apply {
+                addSearchInfo(searchInfo)
+                // New task needed because don't launch from an Activity context
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or
+                        Intent.FLAG_ACTIVITY_CLEAR_TASK
+            })
         }
     }
 }

app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/HardwareKeyActivity.kt

@@ -76,14 +76,14 @@ class HardwareKeyActivity: DatabaseModeActivity(){
         lifecycleScope.launch {
             mHardwareKeyLauncherViewModel.credentialUiState.collect { uiState ->
                 when (uiState) {
-                    is CredentialLauncherViewModel.UIState.SetActivityResult -> {
+                    is CredentialLauncherViewModel.CredentialState.SetActivityResult -> {
                         setActivityResult(
                             lockDatabase = uiState.lockDatabase,
                             resultCode = uiState.resultCode,
                             data = uiState.data
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.ShowError -> {
+                    is CredentialLauncherViewModel.CredentialState.ShowError -> {
                         toastError(uiState.error)
                         mHardwareKeyLauncherViewModel.cancelResult()
                     }

app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt

@@ -112,19 +112,19 @@ class PasskeyLauncherActivity : DatabaseLockActivity() {
         lifecycleScope.launch {
             passkeyLauncherViewModel.credentialUiState.collect { uiState ->
                 when (uiState) {
-                    is CredentialLauncherViewModel.UIState.Loading -> {}
-                    is CredentialLauncherViewModel.UIState.SetActivityResult -> {
+                    is CredentialLauncherViewModel.CredentialState.Loading -> {}
+                    is CredentialLauncherViewModel.CredentialState.SetActivityResult -> {
                         setActivityResult(
                             lockDatabase = uiState.lockDatabase,
                             resultCode = uiState.resultCode,
                             data = uiState.data
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.ShowError -> {
+                    is CredentialLauncherViewModel.CredentialState.ShowError -> {
                         toastError(uiState.error)
                         passkeyLauncherViewModel.cancelResult()
                     }
-                    is CredentialLauncherViewModel.UIState.LaunchGroupActivityForSelection -> {
+                    is CredentialLauncherViewModel.CredentialState.LaunchGroupActivityForSelection -> {
                         GroupActivity.launchForSelection(
                             context = this@PasskeyLauncherActivity,
                             database = uiState.database,
@@ -133,7 +133,7 @@ class PasskeyLauncherActivity : DatabaseLockActivity() {
                             activityResultLauncher = mPasskeySelectionActivityResultLauncher
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration -> {
+                    is CredentialLauncherViewModel.CredentialState.LaunchGroupActivityForRegistration -> {
                         GroupActivity.launchForRegistration(
                             context = this@PasskeyLauncherActivity,
                             database = uiState.database,
@@ -142,7 +142,7 @@ class PasskeyLauncherActivity : DatabaseLockActivity() {
                             activityResultLauncher = mPasskeyRegistrationActivityResultLauncher
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForSelection -> {
+                    is CredentialLauncherViewModel.CredentialState.LaunchFileDatabaseSelectActivityForSelection -> {
                         FileDatabaseSelectActivity.launchForSelection(
                             context = this@PasskeyLauncherActivity,
                             typeMode = uiState.typeMode,
@@ -150,7 +150,7 @@ class PasskeyLauncherActivity : DatabaseLockActivity() {
                             activityResultLauncher = mPasskeySelectionActivityResultLauncher
                         )
                     }
-                    is CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForRegistration -> {
+                    is CredentialLauncherViewModel.CredentialState.LaunchFileDatabaseSelectActivityForRegistration -> {
                         FileDatabaseSelectActivity.launchForRegistration(
                             context = this@PasskeyLauncherActivity,
                             typeMode = uiState.typeMode,

app/src/main/java/com/kunzisoft/keepass/credentialprovider/autofill/AutofillHelper.kt

@@ -27,6 +27,7 @@ import android.content.Intent
 import android.graphics.BlendMode
 import android.graphics.drawable.Icon
 import android.os.Build
+import android.os.Bundle
 import android.service.autofill.Dataset
 import android.service.autofill.Field
 import android.service.autofill.FillResponse
@@ -53,6 +54,7 @@ import com.kunzisoft.keepass.model.SearchInfo
 import com.kunzisoft.keepass.settings.AutofillSettingsActivity
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.utils.AppUtil.randomRequestCode
+import com.kunzisoft.keepass.utils.getParcelableCompat
 import com.kunzisoft.keepass.utils.getParcelableExtraCompat
 import java.io.IOException
 import kotlin.math.min
@@ -64,20 +66,50 @@ object AutofillHelper {
     private const val EXTRA_BASE_STRUCTURE = "com.kunzisoft.keepass.autofill.BASE_STRUCTURE"
     private const val EXTRA_INLINE_SUGGESTIONS_REQUEST = "com.kunzisoft.keepass.autofill.INLINE_SUGGESTIONS_REQUEST"
 
-    fun Intent.addAutofillComponent(autofillComponent: AutofillComponent) {
-        this.putExtra(EXTRA_BASE_STRUCTURE, autofillComponent.assistStructure)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            autofillComponent.compatInlineSuggestionsRequest?.let {
-                this.putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
+    fun Intent.addAutofillComponent(autofillComponent: AutofillComponent?): Intent {
+        autofillComponent?.let {
+            this.putExtra(EXTRA_BASE_STRUCTURE, autofillComponent.assistStructure)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                autofillComponent.compatInlineSuggestionsRequest?.let {
+                    this.putExtra(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
+                }
             }
         }
+        return this
     }
 
     fun Intent.retrieveAutofillComponent(): AutofillComponent? {
-        getParcelableExtraCompat<AssistStructure>(EXTRA_BASE_STRUCTURE)?.let { assistStructure ->
+        this.getParcelableExtraCompat<AssistStructure>(EXTRA_BASE_STRUCTURE)?.let { assistStructure ->
             return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                AutofillComponent(assistStructure,
-                        getParcelableExtraCompat(EXTRA_INLINE_SUGGESTIONS_REQUEST))
+                AutofillComponent(
+                    assistStructure,
+                    this.getParcelableExtraCompat(EXTRA_INLINE_SUGGESTIONS_REQUEST))
+            } else {
+                AutofillComponent(assistStructure, null)
+            }
+        }
+        return null
+    }
+
+    fun Bundle.addAutofillComponent(autofillComponent: AutofillComponent?): Bundle {
+        autofillComponent?.let {
+            this.putParcelable(EXTRA_BASE_STRUCTURE, autofillComponent.assistStructure)
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                autofillComponent.compatInlineSuggestionsRequest?.let {
+                    this.putParcelable(EXTRA_INLINE_SUGGESTIONS_REQUEST, it)
+                }
+            }
+        }
+        return this
+    }
+
+    fun Bundle.retrieveAutofillComponent(): AutofillComponent? {
+        this.getParcelableCompat<AssistStructure>(EXTRA_BASE_STRUCTURE)?.let { assistStructure ->
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                AutofillComponent(
+                    assistStructure,
+                    this.getParcelableCompat(EXTRA_INLINE_SUGGESTIONS_REQUEST)
+                )
             } else {
                 AutofillComponent(assistStructure, null)
             }

app/src/main/java/com/kunzisoft/keepass/credentialprovider/magikeyboard/MagikeyboardService.kt

@@ -462,9 +462,11 @@ class MagikeyboardService : InputMethodService(), KeyboardView.OnKeyboardActionL
             KeyboardEntryNotificationService.launchNotificationIfAllowed(context, entry, toast)
         }
 
-        fun performSelection(items: List<EntryInfo>,
-                             actionPopulateKeyboard: (entryInfo: EntryInfo) -> Unit,
-                             actionEntrySelection: (autoSearch: Boolean) -> Unit) {
+        fun performSelection(
+            items: List<EntryInfo>,
+            actionPopulateKeyboard: (entryInfo: EntryInfo) -> Unit,
+            actionEntrySelection: (autoSearch: Boolean) -> Unit
+        ) {
             EntrySelectionHelper.performSelection(
                 items = items,
                 actionPopulateCredentialProvider = { itemFound ->
@@ -478,15 +480,5 @@ class MagikeyboardService : InputMethodService(), KeyboardView.OnKeyboardActionL
                 actionEntrySelection = actionEntrySelection
             )
         }
-
-        fun populateKeyboardAndMoveAppToBackground(activity: Activity,
-                                                   entry: EntryInfo,
-                                                   toast: Boolean = true) {
-            // Populate Magikeyboard with entry
-            addEntryAndLaunchNotificationIfAllowed(activity, entry, toast)
-            // Consume the selection mode
-            activity.intent.removeModes()
-            activity.moveTaskToBack(true)
-        }
     }
 }

app/src/main/java/com/kunzisoft/keepass/credentialprovider/viewmodel/AutofillLauncherViewModel.kt

@@ -9,8 +9,7 @@ import android.util.Log
 import androidx.activity.result.ActivityResult
 import androidx.annotation.RequiresApi
 import androidx.lifecycle.viewModelScope
-import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.removeNodesIds
-import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveNodesIds
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveAndRemoveEntries
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveRegisterInfo
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSearchInfo
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSpecialMode
@@ -21,7 +20,7 @@ import com.kunzisoft.keepass.credentialprovider.autofill.AutofillHelper
 import com.kunzisoft.keepass.credentialprovider.autofill.AutofillHelper.retrieveAutofillComponent
 import com.kunzisoft.keepass.credentialprovider.autofill.KeeAutofillService
 import com.kunzisoft.keepass.database.ContextualDatabase
-import com.kunzisoft.keepass.database.element.node.NodeIdUUID
+import com.kunzisoft.keepass.database.exception.RegisterInReadOnlyDatabaseException
 import com.kunzisoft.keepass.database.helper.SearchHelper
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
@@ -119,7 +118,7 @@ class AutofillLauncherViewModel(application: Application): CredentialLauncherVie
                     onItemNotFound = { openedDatabase ->
                         // Show the database UI to select the entry
                         mCredentialUiState.value =
-                            CredentialLauncherViewModel.UIState.LaunchGroupActivityForSelection(
+                            CredentialState.LaunchGroupActivityForSelection(
                                 database = openedDatabase,
                                 searchInfo = searchInfo,
                                 typeMode = TypeMode.AUTOFILL
@@ -128,7 +127,7 @@ class AutofillLauncherViewModel(application: Application): CredentialLauncherVie
                     onDatabaseClosed = {
                         // If database not open
                         mCredentialUiState.value =
-                            CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForSelection(
+                            CredentialState.LaunchFileDatabaseSelectActivityForSelection(
                                 searchInfo = searchInfo,
                                 typeMode = TypeMode.AUTOFILL
                             )
@@ -156,17 +155,10 @@ class AutofillLauncherViewModel(application: Application): CredentialLauncherVie
                         Log.d(TAG, "Autofill selection result")
                         if (intent == null)
                             throw IOException("Intent is null")
-                        val nodesIds = intent.retrieveNodesIds()
-                            ?: throw IOException("NodesIds is null")
-                        intent.removeNodesIds()
+                        val entries = intent.retrieveAndRemoveEntries(database)
                         val autofillComponent = mAutofillComponent
                         if (autofillComponent == null)
                             throw IOException("Autofill component is null")
-                        val entries = nodesIds.mapNotNull { nodeId ->
-                            database
-                                .getEntryById(NodeIdUUID(nodeId))
-                                ?.getEntryInfo(database)
-                        }
                         withContext(Dispatchers.Main) {
                             AutofillHelper.buildResponse(
                                 context = getApplication(),
@@ -211,32 +203,36 @@ class AutofillLauncherViewModel(application: Application): CredentialLauncherVie
                     if (!readOnly) {
                         // Show the database UI to select the entry
                         mCredentialUiState.value =
-                            CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration(
+                            CredentialState.LaunchGroupActivityForRegistration(
                                 database = openedDatabase,
                                 registerInfo = registerInfo,
                                 typeMode = TypeMode.AUTOFILL
                             )
                     } else {
-                        mUiState.value = UIState.ShowReadOnlyMessage
+                        mCredentialUiState.value = CredentialState.ShowError(
+                            RegisterInReadOnlyDatabaseException()
+                        )
                     }
                 },
                 onItemNotFound = { openedDatabase ->
                     if (!readOnly) {
                         // Show the database UI to select the entry
                         mCredentialUiState.value =
-                            CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration(
+                            CredentialState.LaunchGroupActivityForRegistration(
                                 database = openedDatabase,
                                 registerInfo = registerInfo,
                                 typeMode = TypeMode.AUTOFILL
                             )
                     } else {
-                        mUiState.value = UIState.ShowReadOnlyMessage
+                        mCredentialUiState.value = CredentialState.ShowError(
+                            RegisterInReadOnlyDatabaseException()
+                        )
                     }
                 },
                 onDatabaseClosed = {
                     // If database not open
                     mCredentialUiState.value =
-                        CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForRegistration(
+                        CredentialState.LaunchFileDatabaseSelectActivityForRegistration(
                             registerInfo = registerInfo,
                             typeMode = TypeMode.AUTOFILL
                         )
@@ -274,7 +270,6 @@ class AutofillLauncherViewModel(application: Application): CredentialLauncherVie
     sealed class UIState {
         object Loading: UIState()
         object ShowBlockRestartMessage: UIState()
-        object ShowReadOnlyMessage: UIState()
         object ShowAutofillSuggestionMessage: UIState()
     }
 

app/src/main/java/com/kunzisoft/keepass/credentialprovider/viewmodel/CredentialLauncherViewModel.kt

@@ -25,12 +25,12 @@ abstract class CredentialLauncherViewModel(application: Application): AndroidVie
     protected var isResultLauncherRegistered: Boolean = false
     private var mSelectionResult: ActivityResult? = null
 
-    protected val mCredentialUiState = MutableStateFlow<UIState>(UIState.Loading)
-    val credentialUiState: StateFlow<UIState> = mCredentialUiState
+    protected val mCredentialUiState = MutableStateFlow<CredentialState>(CredentialState.Loading)
+    val credentialUiState: StateFlow<CredentialState> = mCredentialUiState
 
     fun showError(error: Throwable) {
         Log.e(TAG, "Error on credential provider launch", error)
-        mCredentialUiState.value = UIState.ShowError(error)
+        mCredentialUiState.value = CredentialState.ShowError(error)
     }
 
     open fun onResult() {
@@ -41,7 +41,7 @@ abstract class CredentialLauncherViewModel(application: Application): AndroidVie
     fun setResult(intent: Intent, lockDatabase: Boolean = false) {
         // Remove the launcher register
         onResult()
-        mCredentialUiState.value = UIState.SetActivityResult(
+        mCredentialUiState.value = CredentialState.SetActivityResult(
             lockDatabase = lockDatabase,
             resultCode = RESULT_OK,
             data = intent
@@ -50,7 +50,7 @@ abstract class CredentialLauncherViewModel(application: Application): AndroidVie
 
     fun cancelResult(lockDatabase: Boolean = false) {
         onResult()
-        mCredentialUiState.value = UIState.SetActivityResult(
+        mCredentialUiState.value = CredentialState.SetActivityResult(
             lockDatabase = lockDatabase,
             resultCode = RESULT_CANCELED
         )
@@ -115,34 +115,34 @@ abstract class CredentialLauncherViewModel(application: Application): AndroidVie
         database: ContextualDatabase?
     )
 
-    sealed class UIState {
-        object Loading : UIState()
+    sealed class CredentialState {
+        object Loading : CredentialState()
         data class LaunchGroupActivityForSelection(
             val database: ContextualDatabase,
             val searchInfo: SearchInfo?,
             val typeMode: TypeMode
-        ): UIState()
+        ): CredentialState()
         data class LaunchGroupActivityForRegistration(
             val database: ContextualDatabase,
             val registerInfo: RegisterInfo?,
             val typeMode: TypeMode
-        ): UIState()
+        ): CredentialState()
         data class LaunchFileDatabaseSelectActivityForSelection(
             val searchInfo: SearchInfo?,
             val typeMode: TypeMode
-        ): UIState()
+        ): CredentialState()
         data class LaunchFileDatabaseSelectActivityForRegistration(
             val registerInfo: RegisterInfo?,
             val typeMode: TypeMode
-        ): UIState()
+        ): CredentialState()
         data class SetActivityResult(
             val lockDatabase: Boolean,
             val resultCode: Int,
             val data: Intent? = null
-        ): UIState()
+        ): CredentialState()
         data class ShowError(
             val error: Throwable
-        ): UIState()
+        ): CredentialState()
     }
 
     companion object {

app/src/main/java/com/kunzisoft/keepass/credentialprovider/viewmodel/EntrySelectionViewModel.kt

@@ -0,0 +1,297 @@
+package com.kunzisoft.keepass.credentialprovider.viewmodel
+
+import android.app.Activity.RESULT_CANCELED
+import android.app.Activity.RESULT_OK
+import android.app.Application
+import android.content.Intent
+import android.util.Log
+import androidx.activity.result.ActivityResult
+import androidx.core.net.toUri
+import androidx.lifecycle.viewModelScope
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveAndRemoveEntries
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveNodeId
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSearchInfo
+import com.kunzisoft.keepass.credentialprovider.SpecialMode
+import com.kunzisoft.keepass.credentialprovider.TypeMode
+import com.kunzisoft.keepass.credentialprovider.magikeyboard.MagikeyboardService
+import com.kunzisoft.keepass.database.ContextualDatabase
+import com.kunzisoft.keepass.database.exception.RegisterInReadOnlyDatabaseException
+import com.kunzisoft.keepass.database.helper.SearchHelper
+import com.kunzisoft.keepass.model.EntryInfo
+import com.kunzisoft.keepass.model.SearchInfo
+import com.kunzisoft.keepass.otp.OtpEntryFields
+import com.kunzisoft.keepass.utils.KeyboardUtil.isKeyboardActivatedInSettings
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.IOException
+
+class EntrySelectionViewModel(application: Application): CredentialLauncherViewModel(application) {
+
+    private var searchShareForMagikeyboard: Boolean = false
+    private var mLockDatabaseAfterSelection: Boolean = false
+    private val mUiState = MutableStateFlow<UIState>(UIState.Loading)
+    val uiState: StateFlow<UIState> = mUiState
+
+    fun initialize() {
+        searchShareForMagikeyboard = getApplication<Application>().isKeyboardActivatedInSettings()
+        mLockDatabaseAfterSelection = false // TODO Close database after selection
+    }
+
+    override fun launchActionIfNeeded(
+        intent: Intent,
+        specialMode: SpecialMode,
+        database: ContextualDatabase?
+    ) {
+        // Launch with database when a nodeId is present
+        if ((database != null && database.loaded) || intent.retrieveNodeId() == null) {
+            super.launchActionIfNeeded(intent, specialMode, database)
+        }
+    }
+
+    override suspend fun launchAction(
+        intent: Intent,
+        specialMode: SpecialMode,
+        database: ContextualDatabase?
+    ) {
+        val searchInfo: SearchInfo? = intent.retrieveSearchInfo()
+        if (searchInfo != null) {
+            launch(database, searchInfo)
+        } else {
+            // To manage share
+            var sharedWebDomain: String? = null
+            var otpString: String? = null
+
+            when (intent.action) {
+                Intent.ACTION_SEND -> {
+                    if ("text/plain" == intent.type) {
+                        // Retrieve web domain or OTP
+                        intent.getStringExtra(Intent.EXTRA_TEXT)?.let { extra ->
+                            if (OtpEntryFields.isOTPUri(extra))
+                                otpString = extra
+                            else
+                                sharedWebDomain = extra.toUri().host
+                        }
+                    }
+                    launchSelection(database, sharedWebDomain, otpString)
+                }
+                Intent.ACTION_VIEW -> {
+                    // Retrieve OTP
+                    intent.dataString?.let { extra ->
+                        if (OtpEntryFields.isOTPUri(extra))
+                            otpString = extra
+                    }
+                    launchSelection(database, null, otpString)
+                }
+                else -> {
+                    if (database != null && database.loaded) {
+                        mUiState.value = UIState.LaunchGroupActivityForSearch(
+                            database = database,
+                            searchInfo = SearchInfo()
+                        )
+                    } else {
+                        mUiState.value = UIState.LaunchFileDatabaseSelectForSearch(
+                            searchInfo = SearchInfo()
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    // -------------
+    //  Selection
+    // -------------
+
+    private fun launchSelection(
+        database: ContextualDatabase?,
+        sharedWebDomain: String?,
+        otpString: String?
+    ) {
+        // Build domain search param
+        val searchInfo = SearchInfo().apply {
+            this.webDomain = sharedWebDomain
+            this.otpString = otpString
+        }
+        launch(database, searchInfo)
+    }
+
+    private fun launch(
+        database: ContextualDatabase?,
+        searchInfo: SearchInfo
+    ) {
+        // If database is open
+        val readOnly = database?.isReadOnly != false
+        SearchHelper.checkAutoSearchInfo(
+            context = getApplication(),
+            database = database,
+            searchInfo = searchInfo,
+            onItemsFound = { openedDatabase, items ->
+                // Items found
+                if (searchInfo.otpString != null) {
+                    if (!readOnly) {
+                        mCredentialUiState.value =
+                            CredentialState.LaunchGroupActivityForRegistration(
+                                database = openedDatabase,
+                                registerInfo = searchInfo.toRegisterInfo(),
+                                typeMode = TypeMode.DEFAULT
+                            )
+                    } else {
+                        mCredentialUiState.value = CredentialState.ShowError(
+                            RegisterInReadOnlyDatabaseException()
+                        )
+                    }
+                } else if (searchShareForMagikeyboard) {
+                    MagikeyboardService.performSelection(
+                        items,
+                        { entryInfo ->
+                            populateKeyboard(entryInfo)
+                        },
+                        { autoSearch ->
+                            mCredentialUiState.value = CredentialState.LaunchGroupActivityForSelection(
+                                database = openedDatabase,
+                                searchInfo = searchInfo,
+                                typeMode = TypeMode.MAGIKEYBOARD
+                            )
+                        }
+                    )
+                } else {
+                    mUiState.value = UIState.LaunchGroupActivityForSearch(
+                        database = openedDatabase,
+                        searchInfo = searchInfo
+                    )
+                }
+            },
+            onItemNotFound = { openedDatabase ->
+                // Show the database UI to select the entry
+                if (searchInfo.otpString != null) {
+                    if (!readOnly) {
+                        mCredentialUiState.value =
+                            CredentialState.LaunchGroupActivityForRegistration(
+                                database = openedDatabase,
+                                registerInfo = searchInfo.toRegisterInfo(),
+                                typeMode = TypeMode.DEFAULT
+                            )
+                    } else {
+                        mCredentialUiState.value = CredentialState.ShowError(
+                            RegisterInReadOnlyDatabaseException()
+                        )
+                    }
+                } else if (searchShareForMagikeyboard) {
+                    mCredentialUiState.value = CredentialState.LaunchGroupActivityForSelection(
+                        database = openedDatabase,
+                        searchInfo = searchInfo,
+                        typeMode = TypeMode.MAGIKEYBOARD
+                    )
+                } else {
+                    mUiState.value = UIState.LaunchGroupActivityForSearch(
+                        database = openedDatabase,
+                        searchInfo = searchInfo
+                    )
+                }
+            },
+            onDatabaseClosed = {
+                // If database not open
+                if (searchInfo.otpString != null) {
+                    mCredentialUiState.value = CredentialState.LaunchFileDatabaseSelectActivityForRegistration(
+                        registerInfo = searchInfo.toRegisterInfo(),
+                        typeMode = TypeMode.DEFAULT
+                    )
+                } else if (searchShareForMagikeyboard) {
+                    mCredentialUiState.value = CredentialState.LaunchFileDatabaseSelectActivityForSelection(
+                        searchInfo = searchInfo,
+                        typeMode = TypeMode.MAGIKEYBOARD
+                    )
+                } else {
+                    mUiState.value = UIState.LaunchFileDatabaseSelectForSearch(
+                        searchInfo = searchInfo
+                    )
+                }
+            }
+        )
+    }
+
+    private fun populateKeyboard(entryInfo: EntryInfo) {
+        // Automatically populate keyboard
+        mUiState.value = UIState.PopulateKeyboard(entryInfo)
+        setResult(Intent(), lockDatabase = mLockDatabaseAfterSelection)
+    }
+
+    override fun manageSelectionResult(
+        database: ContextualDatabase,
+        activityResult: ActivityResult
+    ) {
+        super.manageSelectionResult(database, activityResult)
+        val intent = activityResult.data
+        viewModelScope.launch(CoroutineExceptionHandler { _, e ->
+            Log.e(TAG, "Unable to create selection response for Magikeyboard", e)
+            showError(e)
+        }) {
+            when (activityResult.resultCode) {
+                RESULT_OK -> {
+                    withContext(Dispatchers.IO) {
+                        Log.d(TAG, "Magikeyboard selection result")
+                        if (intent == null)
+                            throw IOException("Intent is null")
+                        val entries = intent.retrieveAndRemoveEntries(database)
+                        withContext(Dispatchers.Main) {
+                            // Populate Magikeyboard with entry
+                            entries.firstOrNull()?.let { entryInfo ->
+                                populateKeyboard(entryInfo)
+                            } // TODO Manage multiple entries in Magikeyboard
+                        }
+                    }
+                }
+                RESULT_CANCELED -> {
+                    withContext(Dispatchers.Main) {
+                        cancelResult()
+                    }
+                }
+            }
+        }
+    }
+
+    override fun manageRegistrationResult(activityResult: ActivityResult) {
+        super.manageRegistrationResult(activityResult)
+        viewModelScope.launch(CoroutineExceptionHandler { _, e ->
+            Log.e(TAG, "Unable to create selection response for Magikeyboard", e)
+            showError(e)
+        }) {
+            when (activityResult.resultCode) {
+                RESULT_OK -> {
+                    // Empty data result
+                    // TODO Show Toast indicating value is saved
+                    withContext(Dispatchers.Main) {
+                        setResult(Intent(), lockDatabase = false)
+                    }
+                }
+                RESULT_CANCELED -> {
+                    withContext(Dispatchers.Main) {
+                        cancelResult()
+                    }
+                }
+            }
+        }
+    }
+
+    sealed class UIState {
+        object Loading: UIState()
+        data class PopulateKeyboard(
+            val entryInfo: EntryInfo
+        ): UIState()
+        data class LaunchFileDatabaseSelectForSearch(
+            val searchInfo: SearchInfo
+        ): UIState()
+        data class LaunchGroupActivityForSearch(
+            val database: ContextualDatabase,
+            val searchInfo: SearchInfo
+        ): UIState()
+    }
+
+    companion object {
+        private val TAG = EntrySelectionViewModel::class.java.name
+    }
+}

app/src/main/java/com/kunzisoft/keepass/credentialprovider/viewmodel/PasskeyLauncherViewModel.kt

@@ -238,7 +238,7 @@ class PasskeyLauncherViewModel(application: Application): CredentialLauncherView
                                         "launch manual selection in opened database"
                             )
                             mCredentialUiState.value =
-                                CredentialLauncherViewModel.UIState.LaunchGroupActivityForSelection(
+                                CredentialState.LaunchGroupActivityForSelection(
                                     database = openedDatabase,
                                     searchInfo = searchInfo,
                                     typeMode = TypeMode.PASSKEY
@@ -247,7 +247,7 @@ class PasskeyLauncherViewModel(application: Application): CredentialLauncherView
                         onDatabaseClosed = {
                             Log.d(TAG, "Manual passkey selection in closed database")
                             mCredentialUiState.value =
-                                CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForSelection(
+                                CredentialState.LaunchFileDatabaseSelectActivityForSelection(
                                     searchInfo = searchInfo,
                                     typeMode = TypeMode.PASSKEY
                                 )
@@ -426,7 +426,7 @@ class PasskeyLauncherViewModel(application: Application): CredentialLauncherView
                                             "but launch manual registration for a new entry"
                                 )
                                 mCredentialUiState.value =
-                                    CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration(
+                                    CredentialState.LaunchGroupActivityForRegistration(
                                         database = openedDatabase,
                                         registerInfo = registerInfo,
                                         typeMode = TypeMode.PASSKEY
@@ -435,7 +435,7 @@ class PasskeyLauncherViewModel(application: Application): CredentialLauncherView
                             onItemNotFound = { openedDatabase ->
                                 Log.d(TAG, "Launch new manual registration in opened database")
                                 mCredentialUiState.value =
-                                    CredentialLauncherViewModel.UIState.LaunchGroupActivityForRegistration(
+                                    CredentialState.LaunchGroupActivityForRegistration(
                                         database = openedDatabase,
                                         registerInfo = registerInfo,
                                         typeMode = TypeMode.PASSKEY
@@ -444,7 +444,7 @@ class PasskeyLauncherViewModel(application: Application): CredentialLauncherView
                             onDatabaseClosed = {
                                 Log.d(TAG, "Manual passkey registration in closed database")
                                 mCredentialUiState.value =
-                                    CredentialLauncherViewModel.UIState.LaunchFileDatabaseSelectActivityForRegistration(
+                                    CredentialState.LaunchFileDatabaseSelectActivityForRegistration(
                                         registerInfo = registerInfo,
                                         typeMode = TypeMode.PASSKEY
                                     )

app/src/main/java/com/kunzisoft/keepass/database/DatabaseTaskProvider.kt

@@ -121,7 +121,6 @@ class DatabaseTaskProvider(
     }
 
     private fun initServiceConnection() {
-        actionTaskListener?.onActionStopped()
         if (serviceConnection == null) {
             serviceConnection = object : ServiceConnection {
                 override fun onBindingDied(name: ComponentName?) {

app/src/main/java/com/kunzisoft/keepass/database/ProgressMessage.kt

@@ -4,7 +4,7 @@ import androidx.annotation.StringRes
 
 data class ProgressMessage(
     @StringRes
-    var titleId: Int,
+    var titleId: Int? = null,
     @StringRes
     var messageId: Int? = null,
     @StringRes

app/src/main/java/com/kunzisoft/keepass/services/AttachmentFileNotificationService.kt

@@ -165,7 +165,7 @@ class AttachmentFileNotificationService: LockNotificationService() {
                     }
                 }
                 if (attachmentNotificationList.isEmpty()) {
-                    stopSelf()
+                    stopService()
                 }
             }
         }

app/src/main/java/com/kunzisoft/keepass/services/ClipboardEntryNotificationService.kt

@@ -62,7 +62,7 @@ class ClipboardEntryNotificationService : LockNotificationService() {
             sendBroadcast(Intent(LOCK_ACTION))
         }
         // Stop the service
-        stopSelf()
+        stopService()
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {

app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt

@@ -262,11 +262,12 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
                     )
                 }
             } else {
+                /* Do not stopped here, service cannot be connected
                 mActionTaskListeners.forEach { actionTaskListener ->
                     actionTaskListener.onActionStopped(
                         database
                     )
-                }
+                }*/
             }
         }
     }
@@ -338,7 +339,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
         val intentAction = intent?.action
 
         if (intentAction == null && !database.loaded) {
-            stopSelf()
+            stopService()
         }
 
         val actionRunnable: ActionRunnable? = when (intentAction) {
@@ -447,10 +448,10 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
                                 TimeoutHelper.releaseTemporarilyDisableTimeout()
                                 // Stop service after save if user remove task
                                 if (save && mTaskRemovedRequested) {
-                                    actionOnLock()
+                                    stopService()
                                 } else if (TimeoutHelper.checkTimeAndLockIfTimeout(this@DatabaseTaskNotificationService)) {
                                     if (!database.loaded) {
-                                        stopSelf()
+                                        stopService()
                                     } else {
                                         // Restart the service to open lock notification
                                         try {
@@ -535,11 +536,10 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
 
         val notificationBuilder = buildNewNotification().apply {
             setSmallIcon(iconId)
-            intent?.let {
-                setContentTitle(getString(
-                    intent.getIntExtra(DATABASE_TASK_TITLE_KEY, mProgressMessage.titleId))
-                )
-            }
+            val titleId = mProgressMessage.titleId?.let {
+                intent?.getIntExtra(DATABASE_TASK_TITLE_KEY, it)
+            } ?: R.string.app_name
+            setContentTitle(getString(titleId))
             setAutoCancel(false)
             setContentIntent(null)
         }
@@ -661,7 +661,9 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
     }
 
     private fun updateMessage(resId: Int) {
-        mProgressMessage.messageId = resId
+        mProgressMessage = mProgressMessage.copy(
+            messageId = resId
+        )
         notifyProgressMessage()
     }
 
@@ -673,7 +675,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
         updateMessage(R.string.decrypting_db)
     }
 
-    override fun actionOnLock() {
+    override fun stopService() {
         if (!TimeoutHelper.temporarilyDisableLock) {
             closeDatabase(mDatabase)
             // Remove the database during the lock
@@ -685,7 +687,7 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
             // Remove the lock timer (no more needed if it exists)
             TimeoutHelper.cancelLockTimer(this)
             // Service is stopped after receive the broadcast
-            super.actionOnLock()
+            super.stopService()
         }
     }
 
@@ -729,7 +731,9 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
             // Close channels
             closeChallengeResponse()
             // Restore previous message
-            mProgressMessage = previousMessage
+            mProgressMessage = previousMessage.apply {
+                cancelable = null
+            }
             notifyProgressMessage()
         }
         return response

app/src/main/java/com/kunzisoft/keepass/services/KeyboardEntryNotificationService.kt

@@ -55,7 +55,7 @@ class KeyboardEntryNotificationService : LockNotificationService() {
             sendBroadcast(Intent(LOCK_ACTION))
         }
         // Stop the service
-        stopSelf()
+        stopService()
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {

app/src/main/java/com/kunzisoft/keepass/services/LockNotificationService.kt

@@ -20,7 +20,6 @@
 package com.kunzisoft.keepass.services
 
 import android.content.Intent
-import androidx.core.app.ServiceCompat
 import com.kunzisoft.keepass.timeout.TimeoutHelper
 import com.kunzisoft.keepass.utils.LockReceiver
 import com.kunzisoft.keepass.utils.registerLockReceiver
@@ -29,13 +28,7 @@ import com.kunzisoft.keepass.utils.unregisterLockReceiver
 abstract class LockNotificationService : NotificationService() {
 
     private var mLockReceiver: LockReceiver = LockReceiver {
-        actionOnLock()
-    }
-
-    protected open fun actionOnLock() {
-        // Stop the service in all cases
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        stopSelf()
+        stopService()
     }
 
     override fun onCreate() {
@@ -46,7 +39,7 @@ abstract class LockNotificationService : NotificationService() {
 
     override fun onTaskRemoved(rootIntent: Intent?) {
         if (!TimeoutHelper.temporarilyDisableLock) {
-            actionOnLock()
+            stopService()
         }
         super.onTaskRemoved(rootIntent)
     }

app/src/main/java/com/kunzisoft/keepass/services/NotificationService.kt

@@ -17,6 +17,7 @@ import android.util.TypedValue
 import android.widget.Toast
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.app.ServiceCompat
 import androidx.core.content.ContextCompat
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.stylish.Stylish
@@ -114,6 +115,12 @@ abstract class NotificationService : Service() {
         }
     }
 
+    protected open fun stopService() {
+        // Stop the service in all cases
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        stopSelf()
+    }
+
     protected fun defineTimerJob(builder: NotificationCompat.Builder,
                                  type: NotificationServiceType,
                                  timeoutMilliseconds: Long,

app/src/main/java/com/kunzisoft/keepass/settings/ExternalSettingsActivity.kt

@@ -13,6 +13,8 @@ abstract class ExternalSettingsActivity : DatabaseModeActivity() {
 
     private var lockView: FloatingActionButton? = null
 
+    override fun manageDatabaseInfo(): Boolean = true
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 

app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt

@@ -27,32 +27,27 @@ import android.view.View
 import android.widget.Button
 import android.widget.ProgressBar
 import android.widget.TextView
-import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import com.kunzisoft.keepass.R
 import kotlinx.coroutines.launch
 
 open class ProgressTaskDialogFragment : DialogFragment() {
 
-    @StringRes
-    private var title = UNDEFINED
-    @StringRes
-    private var message = UNDEFINED
-    @StringRes
-    private var warning = UNDEFINED
-    private var cancellable: (() -> Unit)? = null
-
     private var titleView: TextView? = null
     private var messageView: TextView? = null
     private var warningView: TextView? = null
     private var cancelButton: Button? = null
     private var progressView: ProgressBar? = null
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    private val progressTaskViewModel: ProgressTaskViewModel by activityViewModels()
 
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         try {
             activity?.let {
                 val builder = AlertDialog.Builder(it)
@@ -71,68 +66,63 @@ open class ProgressTaskDialogFragment : DialogFragment() {
                 cancelButton = root.findViewById(R.id.progress_dialog_cancel)
                 progressView = root.findViewById(R.id.progress_dialog_bar)
 
-                updateTitle(title)
-                updateMessage(message)
-                updateWarning(warning)
-                setCancellable(cancellable)
-
                 isCancelable = false
 
+                lifecycleScope.launch {
+                    repeatOnLifecycle(Lifecycle.State.STARTED) {
+                        progressTaskViewModel.progressTaskState.collect { state ->
+                            when (state) {
+                                is ProgressTaskViewModel.ProgressTaskState.Show -> {
+                                    val value = state.value
+                                    updateView(
+                                        titleView,
+                                        value.titleId?.let { title ->
+                                            getString(title)
+                                        })
+                                    updateView(
+                                        messageView,
+                                        value.messageId?.let { message ->
+                                            getString(message)
+                                        })
+                                    updateView(
+                                        warningView,
+                                        value.warningId?.let { warning ->
+                                            getString(warning)
+                                        })
+                                    cancelButton?.apply {
+                                        isVisible = value.cancelable != null
+                                        setOnClickListener {
+                                            value.cancelable?.invoke()
+                                        }
+                                    }
+                                }
+                                else -> {
+                                    // Nothing here, this fragment is stopped externally
+                                }
+                            }
+                        }
+                    }
+                }
+
                 return builder.create()
             }
         } catch (e: Exception) {
-            Log.e(TAG, "Unable to create progress dialog")
+            Log.e(TAG, "Unable to create progress dialog", e)
         }
         return super.onCreateDialog(savedInstanceState)
     }
 
-    fun setTitle(@StringRes titleId: Int) {
-        this.title = titleId
-    }
-
-    private fun updateView(textView: TextView?, @StringRes resId: Int) {
-        activity?.lifecycleScope?.launch {
-            if (resId == UNDEFINED) {
-                textView?.visibility = View.GONE
-            } else {
-                textView?.setText(resId)
-                textView?.visibility = View.VISIBLE
-            }
+    private fun updateView(textView: TextView?, value: String?) {
+        if (value == null) {
+            textView?.visibility = View.GONE
+        } else {
+            textView?.text = value
+            textView?.visibility = View.VISIBLE
         }
     }
 
-    private fun updateCancelable() {
-        activity?.lifecycleScope?.launch {
-            cancelButton?.isVisible = cancellable != null
-            cancelButton?.setOnClickListener {
-                cancellable?.invoke()
-            }
-        }
-    }
-
-    fun updateTitle(@StringRes resId: Int?) {
-        this.title = resId ?: UNDEFINED
-        updateView(titleView, title)
-    }
-
-    fun updateMessage(@StringRes resId: Int?) {
-        this.message = resId ?: UNDEFINED
-        updateView(messageView, message)
-    }
-
-    fun updateWarning(@StringRes resId: Int?) {
-        this.warning = resId ?: UNDEFINED
-        updateView(warningView, warning)
-    }
-
-    fun setCancellable(cancellable: (() -> Unit)?) {
-        this.cancellable = cancellable
-        updateCancelable()
-    }
-
     companion object {
         private val TAG = ProgressTaskDialogFragment::class.java.simpleName
         const val PROGRESS_TASK_DIALOG_TAG = "progressDialogFragment"
-        const val UNDEFINED = -1
     }
 }

app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskViewModel.kt

@@ -0,0 +1,28 @@
+package com.kunzisoft.keepass.tasks
+
+import androidx.lifecycle.ViewModel
+import com.kunzisoft.keepass.database.ProgressMessage
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+
+class ProgressTaskViewModel: ViewModel() {
+
+    private val mProgressTaskState = MutableStateFlow<ProgressTaskState>(ProgressTaskState.Hide)
+    val progressTaskState: StateFlow<ProgressTaskState> = mProgressTaskState
+
+    fun show(value: ProgressMessage) {
+        mProgressTaskState.update { currentState ->
+            ProgressTaskState.Show(value)
+        }
+    }
+
+    fun hide() {
+        mProgressTaskState.value = ProgressTaskState.Hide
+    }
+
+    sealed class ProgressTaskState {
+        data class Show(val value: ProgressMessage): ProgressTaskState()
+        object Hide: ProgressTaskState()
+    }
+}

app/src/main/java/com/kunzisoft/keepass/utils/AppUtil.kt

@@ -98,25 +98,43 @@ object AppUtil {
         }
 
         val processedPackageNames = mutableSetOf<String>()
-
         for (resolveInfo in resolveInfoList) {
             val packageName = resolveInfo.activityInfo.packageName
             if (packageName != null && !processedPackageNames.contains(packageName)) {
-                try {
-                    val packageInfo = packageManager.getPackageInfo(
-                        packageName,
-                        PackageManager.GET_SIGNING_CERTIFICATES
-                    )
-                    val signatureFingerprints = packageInfo.signingInfo?.getAllFingerprints()
-                    signatureFingerprints?.let {
-                        browserList.add(AndroidPrivilegedApp(packageName, signatureFingerprints))
-                        processedPackageNames.add(packageName)
-                    }
-                } catch (e: Exception) {
-                    Log.e(AppUtil::class.simpleName, "Error processing package: $packageName", e)
+                buildAndroidPrivilegedApp(packageManager, packageName)?.let { privilegedApp ->
+                    browserList.add(privilegedApp)
+                    processedPackageNames.add(packageName)
                 }
             }
         }
+
+        // Add the Play Service
+        val gServices = "com.google.android.gms"
+        buildAndroidPrivilegedApp(packageManager, gServices)?.let { privilegedApp ->
+            browserList.add(privilegedApp)
+            processedPackageNames.add(gServices)
+        }
+
         return browserList.distinctBy { it.packageName } // Ensure uniqueness just in case
     }
+
+    @RequiresApi(Build.VERSION_CODES.P)
+    private fun buildAndroidPrivilegedApp(
+        packageManager: PackageManager,
+        packageName: String
+    ): AndroidPrivilegedApp? {
+        return try {
+            val packageInfo = packageManager.getPackageInfo(
+                packageName,
+                PackageManager.GET_SIGNING_CERTIFICATES
+            )
+            val signatureFingerprints = packageInfo.signingInfo?.getAllFingerprints()
+            signatureFingerprints?.let {
+                 AndroidPrivilegedApp(packageName, signatureFingerprints)
+            }
+        } catch (e: Exception) {
+            Log.e(AppUtil::class.simpleName, "Error processing package: $packageName", e)
+            null
+        }
+    }
 }

app/src/main/java/com/kunzisoft/keepass/viewmodels/DatabaseViewModel.kt

@@ -32,7 +32,7 @@ class DatabaseViewModel(application: Application): AndroidViewModel(application)
     val database: ContextualDatabase?
         get() = databaseState.value
 
-    private val mActionState = MutableStateFlow<ActionState>(ActionState.Loading)
+    private val mActionState = MutableStateFlow<ActionState>(ActionState.Wait)
     val actionState: StateFlow<ActionState> = mActionState
 
     private var mDatabaseTaskProvider: DatabaseTaskProvider = DatabaseTaskProvider(
@@ -469,7 +469,7 @@ class DatabaseViewModel(application: Application): AndroidViewModel(application)
     }
 
     sealed class ActionState {
-        object Loading: ActionState()
+        object Wait: ActionState()
         object OnDatabaseReloaded: ActionState()
         data class OnDatabaseActionRequested(
             val bundle: Bundle? = null,

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

@@ -335,7 +335,7 @@
     <string name="device_unlock_explanation_summary">استخدم إلغاء القفل الجهاز لفتح قاعدة البيانات بسهولة</string>
     <string name="lock_database_show_button_summary">يعرض زر القَفل في الواجهة</string>
     <string name="lock_database_show_button_title">أظهر زر القفل</string>
-    <string name="lock_database_back_root_summary">قفل قاعدة البيانات عند النقر على زر الرجوع في الشاشة الرئيسية</string>
+    <string name="lock_database_back_root_summary">اضغط على \"رجوع\" لقفل قاعدة البيانات إذا كنت في الشاشة الجذر لقاعدة البيانات</string>
     <string name="lock_database_back_root_title">اضغط على \"رجوع\" للإقفال</string>
     <string name="clipboard_explanation_summary">انسخ حقول المدخل باستخدام الحافظة</string>
     <string name="database_opened">قاعدة البيانات مفتوحة</string>
@@ -642,8 +642,8 @@
     <string name="show_uuid_title">أظهر \"المعرّف العام المميز\" UUID</string>
     <string name="unlock_and_link_biometric">رابط فتح الجهاز</string>
     <string name="device_unlock_invalid_key">لا يمكن قراءة مفتاح فتح الجهاز. يرجى حذفه وتكرار إجراء التعرف على الفتح.</string>
-    <string name="menu_appearance_settings_summary">المظاهر والألوان والسمات</string>
-    <string name="autofill_explanation_summary">تمكين الملء التلقائي لملء النماذج بسرعة في التطبيقات الأخرى</string>
+    <string name="menu_appearance_settings_summary">المظاهر والألوان والأيقونات والخطوط والسمات</string>
+    <string name="autofill_explanation_summary">اضبط الملء التلقائي لملء النماذج بسرعة في التطبيقات الأخرى</string>
     <string name="device_credential_unlock_enable_summary">يتيح لك استخدام بيانات اعتماد جهازك لفتح قاعدة البيانات</string>
     <string name="unlock">فتح</string>
     <string name="menu_app_settings_summary">البحث، القفل، التاريخ، الخصائص</string>
@@ -691,4 +691,45 @@
     <string name="warning_large_keyfile">لا يُنصح بإضافة ملف مفتاحي كبير، فقد يؤدي هذا إلى منع فتح قاعدة البيانات.</string>
     <string name="hide_templates_title">أخفِ القوالب</string>
     <string name="error_otp_secret_length">يجب أن يتكوّن المفتاح السري من %1$d أحرف على الأقل.</string>
+    <string name="entry_application_id">معرّف التطبيق</string>
+    <string name="warning_overwrite_data_title">أتريد الكتابة فوق البيانات الموجودة؟</string>
+    <string name="warning_overwrite_data_description">سيؤدي هذا الإجراء إلى استبدال البيانات الموجودة في الإدخال، ويمكنك استرداد البيانات القديمة إذا كانت المحفوظات مفعلة.</string>
+    <string name="credential_provider">موفّر بيانات الاعتماد</string>
+    <string name="passkeys">مفاتيح المرور</string>
+    <string name="passkeys_explanation_summary">اضبط مفاتيح المرور لتسجيل دخول سريع وآمن بدون كلمة سر</string>
+    <string name="passkeys_preference_title">إعدادات مفاتيح المرور</string>
+    <string name="passkeys_close_database_title">أغلق قاعدة البيانات</string>
+    <string name="passkeys_close_database_summary">أغلق قاعدة البيانات بعد اختيار مفتاح المرور</string>
+    <string name="passkeys_privileged_apps_title">التطبيقات المتميزة</string>
+    <string name="passkeys_privileged_apps_summary">أدر المتصفحات في القائمة المخصّصة للتطبيقات المتميزة</string>
+    <string name="passkeys_privileged_apps_explanation">تحذير: يعمل تطبيق مميز كبوابة لاسترداد أصل الاستيثاق. تأكد من شرعيته لتجنب المشكلات الأمنية.</string>
+    <string name="passkeys_privileged_apps_ask_title">التطبيق غير معروف</string>
+    <string name="passkeys_privileged_apps_ask_message">يحاول %1$s تنفيذ إجراء مفتاح المرور.\n\nأتريد إضافته إلى قائمة التطبيقات المتميزة؟</string>
+    <string name="passkeys_missing_signature_app_ask_title">التوقيع مفقود</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">تحذير: أُنشئ مفتاح المرور من عميل آخر أو حُذف التوقيع. تأكد من أن التطبيق الذي تريد الاستيثاق عليه جزء من نفس الخدمة وأنه شرعي لتجنب المشكلات الأمنية.\nإذا كان التطبيق متصفحًا، فلا تضف توقيعه إلى الإدخال، بل إلى قائمة التطبيقات الموثوقة في الإعدادات.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s غير معروف ويحاول الاستيثاق باستخدام مفتاح مرور موجود.</string>
+    <string name="passkeys_missing_signature_app_ask_question">إضافة توقيع التطبيق إلى إدخال مفتاح المرور؟</string>
+    <string name="passkeys_auto_select_title">تحديد تلقائي</string>
+    <string name="passkeys_auto_select_summary">حدّد تلقائي إذا كان هناك إدخال واحد فقط وقاعدة البيانات مفتوحة، فقط إذا كان التطبيق الطالب متوافقًا</string>
+    <string name="passkeys_backup_eligibility_title">أهلية النسخ الاحتياطي</string>
+    <string name="passkeys_backup_eligibility_summary">تحديد وقت الإنشاء ما إذا كان مسموحًا بنسخ مصدر بيانات اعتماد المفتاح العام احتياطيًا</string>
+    <string name="passkeys_backup_state_title">حالة النسخ الاحتياطي</string>
+    <string name="passkeys_backup_state_summary">أشر إلى أن بيانات الاعتماد مدعومة ومحمية ضد فقدان جهاز واحد</string>
+    <string name="credential_provider_service_subtitle">مفاتيح المرور، موفّر بيانات اعتماد الملء التلقائي</string>
+    <string name="passkey">مفتاح المرور</string>
+    <string name="passkey_service_name">موفّر بيانات اعتماد KeePassDX</string>
+    <string name="passkey_creation_description">احفظ مفتاح المرور في مدخل جديد</string>
+    <string name="passkey_update_description">حدِّث مفتاح المرور في %1$s</string>
+    <string name="passkey_selection_username">لم يُعثر على مفتاح مرور</string>
+    <string name="passkey_selection_description">حدّد مفتاح مرور موجود</string>
+    <string name="passkey_database_username">قاعدة بيانات KeePassDX</string>
+    <string name="passkey_locked_database_description">حدّد لفتح القفل</string>
+    <string name="passkey_username">اسم مستخدم مفتاح المرور</string>
+    <string name="passkey_private_key">المفتاح الخاص لمفتاح المرور</string>
+    <string name="passkey_credential_id">معرّف بيانات مفتاح المرور</string>
+    <string name="passkey_user_handle">معرّف مستخدم مفتاح المرور</string>
+    <string name="passkey_relying_party">الطرف المعتمد لمفتاح المرور</string>
+    <string name="passkey_backup_eligibility">أهلية النسخ الاحتياطي لمفتاح المرور</string>
+    <string name="passkey_backup_state">حالة النسخ الاحتياطي لمفتاح المرور</string>
+    <string name="error_passkey_result">تعذر إرجاع مفتاح المرور</string>
 </resources>

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

@@ -232,7 +232,7 @@
     <string name="auto_focus_search_title">Бързо търсене</string>
     <string name="subdomain_search_title">Търсене на поддомейни</string>
     <string name="menu_delete">Изтриване</string>
-    <string name="menu_appearance_settings_summary">Теми, цветове, атрибути</string>
+    <string name="menu_appearance_settings_summary">Теми, цветове, икони, шрифтове, атрибути</string>
     <string name="download_initialization">Подготвяне…</string>
     <string name="content_description_entry_background_color">Цвят на фона на запис</string>
     <string name="html_about_licence">KeePassDX © %1$d Kunzisoft е приложение с &lt;strong&gt;отворен код&lt;/strong&gt; и &lt;strong&gt;без реклами&lt;/strong&gt;. \nРазпространява се под лиценза &lt;strong&gt;GPLv3&lt;/strong&gt; без каквато и да е гаранция.</string>
@@ -283,11 +283,11 @@
     <string name="search">Търсене</string>
     <string name="uppercase">Горен регистър</string>
     <string name="warning">Внимание</string>
-    <string name="lock_database_back_root_summary">Заключва хранилището при докосване на бутона „Назад“ на началния екран</string>
+    <string name="lock_database_back_root_summary">Бутонът „Назад“ в кореновата папка заключва хранилището</string>
     <string name="read_only">Само за четене</string>
     <string name="contains_duplicate_uuid">Хранилището съдържа повтарящ се идентификатор.</string>
     <string name="biometric">Биометричен ключ</string>
-    <string name="set_credential_provider_service_title">Задаване на подразбирана услуга за автоматично попълване</string>
+    <string name="set_credential_provider_service_title">Услуга за автоматично попълване на регистрации</string>
     <string name="password_size_title">Дължина на създаваните пароли</string>
     <string name="lock_database_back_root_title">Заключване при „Назад“</string>
     <string name="content">Съдържание</string>
@@ -398,7 +398,7 @@
     <string name="education_search_summary">Търсете по заглавие, потребител или съдържание на други полета, за да намерите своите пароли.</string>
     <string name="html_about_contribution">За &lt;strong&gt;запазване на нашата независимост&lt;/strong&gt;, &lt;strong&gt;отстраняване на дефекти&lt;/strong&gt;, &lt;strong&gt;добавяне на нови възможности&lt;/strong&gt; и &lt;strong&gt;поддържане на активна разработка&lt;/strong&gt;, разчитаме на вашата &lt;strong&gt;поддръжка&lt;/strong&gt;.</string>
     <string name="lock_database_show_button_title">Бутон за заключване</string>
-    <string name="autofill_explanation_summary">Включете услугата за попълване на формуляри в други приложения</string>
+    <string name="autofill_explanation_summary">Настройки на услугата за попълване на формуляри в други приложения</string>
     <string name="properties">Свойства</string>
     <string name="education_validate_entry_summary">Не забравяйте да потвърдите записа и да го запазите в хранилището.
 \n
@@ -653,7 +653,7 @@
     <string name="biometric_auto_open_prompt_summary">Автоматична заявка за отключване на устройството ако хранилището се отключва с устройството</string>
     <string name="allow_copy_password_summary">Разрешава копиране на паролите и защитените полета от записите в междинната памет</string>
     <string name="error_rebuild_list">Списъкът не може да бъде изграден отново.</string>
-    <string name="error_otp_type">Формулярът не разпознава този вид OTP и може да не създава правилни кодове за достъп.</string>
+    <string name="error_otp_type">Формулярът не разпознава този вид OTP и може да не създава верни кодове за достъп.</string>
     <string name="warning_keyfile_integrity">Отпечатъкът от файла не е сигурен, защото Андроид може да променя данните в движение. Променете разширението на файла на .bin, за бъде невредим.</string>
     <string name="allow_copy_password_title">Доверяване на междинната памет</string>
     <string name="warning_exact_alarm">Приложението няма права за използване на точен будилник. В резултат на това дейностите, които зависят от него няма да се изпълняват на време.</string>
@@ -681,4 +681,45 @@
     <string name="hide_templates_summary">Шаблоните не се показват</string>
     <string name="hide_templates_title">Скриване на шаблоните</string>
     <string name="error_otp_secret_length">Тайният ключ трябва да бъде най-малко %1$d знаци.</string>
+    <string name="entry_application_id">Идент. приложение</string>
+    <string name="warning_overwrite_data_title">Презаписване на информация?</string>
+    <string name="warning_overwrite_data_description">Чрез това действие ще бъде презаоисана информация на записа. Може да намерите старите данни ако историята е включена.</string>
+    <string name="credential_provider">Доставчик на регистрации</string>
+    <string name="passkeys">Ключове за достъп</string>
+    <string name="passkeys_explanation_summary">Настройки на ключове за достъп за бърз и сигурен вход без парола</string>
+    <string name="passkeys_preference_title">Настройки на ключове за достъп</string>
+    <string name="passkeys_close_database_title">Затваряне на хранилище</string>
+    <string name="passkeys_close_database_summary">Затваряне на хранилището след избор на ключ за достъп</string>
+    <string name="passkeys_privileged_apps_explanation">ВНИМАНИЕ: Привилегированото приложение работи като шлюз, който получава източника на удостоверяването. За да избегнете проблеми със сигурността се уверете в неговата автентичност.</string>
+    <string name="passkeys_privileged_apps_title">Привилегировани приложения</string>
+    <string name="passkeys_privileged_apps_summary">Управление на мрежови четци в потребителския списък с привилегировани приложения</string>
+    <string name="passkeys_privileged_apps_ask_title">Неразпознато приложение</string>
+    <string name="passkeys_privileged_apps_ask_message">Приложението „%1$s“ опитва да извърши действия с ключ за достъп .\n\nДа бъде ли добавено в списъка с привилегировани приложения?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Липсващ подпис</string>
+    <string name="passkeys_missing_signature_app_ask_message">Приложението „%1$s“ не е разпознато, но се опитва да извърши удостоверяване с ключ за достъп.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Добавяне на подпис към запис на ключ за достъп?</string>
+    <string name="passkeys_auto_select_title">Автоматичен избор</string>
+    <string name="passkeys_auto_select_summary">Работи при отключено хранилище, съвпадение на един запис и съвместимо запитващо приложение</string>
+    <string name="passkeys_backup_eligibility_title">Възможност за резервно копие</string>
+    <string name="passkeys_backup_eligibility_summary">Настройка, определяща още при създаване разрешението за резервно копие на публичния ключ на източника на регистрацията</string>
+    <string name="passkeys_backup_state_title">Наличие на резервно копие</string>
+    <string name="passkeys_backup_state_summary">Указва дали регистрацията е включена в резервно копие и е защитена от загуба на едно устройство</string>
+    <string name="credential_provider_service_subtitle">Услуга за автоматично попълване на ключове за достъп и регистрации</string>
+    <string name="passkey">Ключ за достъп</string>
+    <string name="passkey_service_name">Доставчик на регистрации на KeePassDX</string>
+    <string name="passkey_creation_description">Запазване ключа за достъп в друг запис</string>
+    <string name="passkey_update_description">Обновяване ключа за достъп в/ъв %1$s</string>
+    <string name="passkey_selection_username">Ключ за достъп не е намерен</string>
+    <string name="passkey_selection_description">Изберете съществуващ ключ за достъп</string>
+    <string name="passkey_database_username">Хранилище на KeePassDX</string>
+    <string name="passkey_locked_database_description">Изберете за отключване</string>
+    <string name="passkey_username">Потребител на ключа за достъп</string>
+    <string name="passkey_private_key">Частен ключ на ключа за достъп</string>
+    <string name="passkey_credential_id">Идент. на регистрация на ключа за достъп</string>
+    <string name="passkey_user_handle">Идент. на потребител на ключа за достъп</string>
+    <string name="passkey_backup_eligibility">Възможност за резервно копие на ключа за достъп</string>
+    <string name="passkey_backup_state">Състояние на резервно копие на ключа за достъп</string>
+    <string name="error_passkey_result">Грешка при връщане на ключ за достъп</string>
+    <string name="passkey_relying_party">Доверяваща страна на ключа за достъп</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">ВНИМАНИЕ: Ключът за достъп е създаден от друг клиент или подписът е премахнат. За да избегнете проблеми със сигурността се уверете, че приложението, което удостоверявате е част от същата услуга и е автентично.\nАко приложението е мрежов четец не добавяйте подписа му към записа, а в настройките го добавете в списъка с привилегировани приложения.</string>
 </resources>

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

@@ -180,8 +180,8 @@
     <string name="general">Obecné</string>
     <string name="autofill">Samovyplnění</string>
     <string name="autofill_sign_in_prompt">Přihlásit se s KeePassDX</string>
-    <string name="set_credential_provider_service_title">Nastavit výchozí službu samovyplnění</string>
-    <string name="autofill_explanation_summary">Zapnout samovyplnění formulářů za účelem rychlého vyplnění v ostatních aplikacích</string>
+    <string name="set_credential_provider_service_title">Služba poskytovatele údajů</string>
+    <string name="autofill_explanation_summary">Nastavit automatické vyplnění formulářů za účelem rychlého vyplnění v ostatních aplikacích</string>
     <string name="password_size_title">Délka generovaného hesla</string>
     <string name="password_size_summary">Nastavení výchozí délky generovaných hesel</string>
     <string name="list_password_generator_options_title">Znaky hesla</string>
@@ -206,7 +206,7 @@
     <string name="assign_master_key">Přiřadit hlavní klíč</string>
     <string name="create_keepass_file">Vytvořit nový trezor</string>
     <string name="recycle_bin_title">Využití koše</string>
-    <string name="recycle_bin_summary">Před smazáním přesune vybrané položky do skupiny s názvem \"Koš\"</string>
+    <string name="recycle_bin_summary">Před smazáním přesune vybrané záznamy do skupiny s názvem „Koš“</string>
     <string name="monospace_font_fields_enable_title">Písmo kolonek</string>
     <string name="monospace_font_fields_enable_summary">Čitelnost znaků v kolonkách můžete přizpůsobit změnou písma</string>
     <string name="allow_copy_password_title">Důvěřovat schránce</string>
@@ -283,9 +283,9 @@
     <string name="keyboard_setting_label">Magikeyboard nastavení</string>
     <string name="keyboard_entry_category">Záznam</string>
     <string name="keyboard_entry_timeout_title">Časový limit</string>
-    <string name="keyboard_entry_timeout_summary">Doba uchování položky v Magikeyboardu</string>
+    <string name="keyboard_entry_timeout_summary">Doba uchování položky v klávesnici</string>
     <string name="keyboard_notification_entry_title">Informace o oznámení</string>
-    <string name="keyboard_notification_entry_summary">Zobrazit oznámení, když je položka dostupná</string>
+    <string name="keyboard_notification_entry_summary">Zobrazit oznámení, když je záznam dostupný</string>
     <string name="keyboard_notification_entry_content_title_text">Záznam</string>
     <string name="keyboard_notification_entry_content_title">%1$s dostupné v Magikeyboardu</string>
     <string name="keyboard_notification_entry_content_text">%1$s</string>
@@ -299,7 +299,7 @@
     <string name="selection_mode">Režim výběru</string>
     <string name="do_not_kill_app">Nezavírejte aplikaci…</string>
     <string name="lock_database_back_root_title">K uzamknutí stiskněte Zpět</string>
-    <string name="lock_database_back_root_summary">Zamknout obrazovku, pokud uživatel stiskne tlačítko Zpět v hlavním panelu</string>
+    <string name="lock_database_back_root_summary">Stiskněte „Zpět“ pro uzamčení databáze, pokud se nacházíte na hlavní obrazovce databáze</string>
     <string name="clear_clipboard_notification_title">Vymazat při ukončení</string>
     <string name="clear_clipboard_notification_summary">Uzamknout databázi, jakmile trvání schránky vyprší nebo po uzavření oznámení</string>
     <string name="recycle_bin">Koš</string>
@@ -524,7 +524,7 @@
     <string name="unit_mebibyte">MiB</string>
     <string name="unit_kibibyte">KiB</string>
     <string name="unit_byte">B</string>
-    <string name="error_otp_type">Nemohu rozpoznat existující typ OTP v této formě, jeho validace patrně nebude generovat správný token.</string>
+    <string name="error_otp_type">Nemohu rozpoznat existující typ OTP v této formě a jeho validace patrně nebude generovat správný token.</string>
     <string name="download_canceled">Zrušeno!</string>
     <string name="icon_section_custom">Vlastní</string>
     <string name="icon_section_standard">Standardní</string>
@@ -679,7 +679,7 @@
     <string name="ask">Zeptat se</string>
     <string name="configure">Nastavit</string>
     <string name="unlock_and_link_biometric">Propojení s odemykáním zařízení</string>
-    <string name="menu_appearance_settings_summary">Motivy, barvy, atributy</string>
+    <string name="menu_appearance_settings_summary">Motivy, barvy, ikony, písma, atributy</string>
     <string name="unlock">Odemknout</string>
     <string name="education_validate_entry_title">Ověřit vstup</string>
     <string name="education_validate_entry_summary">Nezapomeňte ověřit svůj vstup a uložit databázi.
@@ -705,4 +705,45 @@
     <string name="hide_templates_title">Skrýt šablony</string>
     <string name="hide_templates_summary">Šablony nejsou zobrazeny</string>
     <string name="error_otp_secret_length">Tajný klíč musí obsahovat alespoň %1$d znaků.</string>
+    <string name="entry_application_id">ID aplikace</string>
+    <string name="warning_overwrite_data_title">Přepsat existující data?</string>
+    <string name="warning_overwrite_data_description">Tato akce nahradí existující data v položce, pokud je povolena historie, můžete původní data získat.</string>
+    <string name="credential_provider">Poskytovatel údajů</string>
+    <string name="passkeys">Přístupové klíče</string>
+    <string name="passkeys_explanation_summary">Nastavte přístupové klíče pro rychlé a bezpečné přihlášení bez hesla</string>
+    <string name="passkeys_preference_title">Nastavení přístupových klíčů</string>
+    <string name="passkeys_close_database_title">Zavřít databázi</string>
+    <string name="passkeys_close_database_summary">Zavřít databázi po výběru přístupového klíče</string>
+    <string name="passkeys_privileged_apps_title">Privilegované aplikace</string>
+    <string name="passkeys_privileged_apps_summary">Spravovat prohlížeče ve vlastním seznamu privilegovaných aplikací</string>
+    <string name="passkeys_privileged_apps_explanation">VAROVÁNÍ: Privilegovaná aplikace funguje jako brána k získání původu autentifikace. Ujistěte se, že se jedná o důvěryhodnou aplikaci, pro zabránění bezpečnostním problémům.</string>
+    <string name="passkeys_privileged_apps_ask_title">Aplikace nerozpoznána</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s se pokouší provést akci přísupového klíče.\n\nChcete ji přidat do seznamu privilegovaných aplikací?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Chybějící podpis</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">VAROVÁNÍ: Přístupový klíč byl vytvořen z jiného klienta nebo byl vymazán podpis. Ujistěte se, že aplikace, kterou chcete autentifikovat, je součástí stejné služby a že je legitimní pro zabránění bezpečnostním problémům.\nPokud je aplikace prohlížeč, nepřidávejte její podpis do záznamu, ale do seznamu privilegovaných aplikací v nastavení.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s je nerozpoznaná a pokouší se o autentifikaci s existujícím přístupovým klíčem.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Přidat podpis aplikace do záznamu přístupového klíče?</string>
+    <string name="passkeys_auto_select_title">Automatický výběr</string>
+    <string name="passkeys_auto_select_summary">Automaticky vybrat, pokud existuje pouze jeden záznam a aplikace je otevřená, pouze pokud je žádající aplikace kompatibilní</string>
+    <string name="passkeys_backup_eligibility_title">Možnost zálohy</string>
+    <string name="passkeys_backup_eligibility_summary">Při vytváření určit, zda je povoleno zálohovat zdroj ověřovacích údajů veřejného klíče</string>
+    <string name="passkeys_backup_state_title">Stav zálohy</string>
+    <string name="passkeys_backup_state_summary">Uvést, že přihlašovací údaje jsou zálohovány a chráněny proti ztrátě jednoho zařízení</string>
+    <string name="credential_provider_service_subtitle">Přístupové klíče, poskytovatel automatického vyplnění</string>
+    <string name="passkey">Přístupový klíč</string>
+    <string name="passkey_service_name">Poskytovatel údajů KeePassDX</string>
+    <string name="passkey_creation_description">Uložit přístupový klíč do nového záznamu</string>
+    <string name="passkey_update_description">Aktualizovat přístupový klíč v %1$s</string>
+    <string name="passkey_selection_username">Nenalezeny žádné přístupové klíče</string>
+    <string name="passkey_selection_description">Vyberte existující přístupový klíč</string>
+    <string name="passkey_database_username">Databáze KeePassDX</string>
+    <string name="passkey_locked_database_description">Vyberte k odemčení</string>
+    <string name="passkey_username">Uživatelské jméno přístupového klíče</string>
+    <string name="passkey_private_key">Soukromý klíč přístupového klíče</string>
+    <string name="passkey_credential_id">ID údaje přístupového klíče</string>
+    <string name="passkey_user_handle">Uživatelská adresa přístupového klíče</string>
+    <string name="passkey_relying_party">Strana předávající přístupový klíč</string>
+    <string name="passkey_backup_eligibility">Způsobilost přístupového klíče k zálohování</string>
+    <string name="passkey_backup_state">Stav zálohy přístupového klíče</string>
+    <string name="error_passkey_result">Nepodařilo se vrátit přístupový klíč</string>
 </resources>

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

@@ -153,7 +153,7 @@
     <string name="menu_appearance_settings">Erscheinungsbild</string>
     <string name="password_size_title">Generierte Passwortlänge</string>
     <string name="password_size_summary">Legt die Standardlänge des generierten Passworts fest</string>
-    <string name="clipboard_notifications_title">Kopier-Benachrichtigung</string>
+    <string name="clipboard_notifications_title">Kopierbenachrichtigung</string>
     <string name="clipboard_notifications_summary">Benachrichtigung anzeigen, um beim Betrachten eines Eintrags Felder kopieren zu können</string>
     <string name="lock_database_screen_off_title">Bildschirmsperre</string>
     <string name="lock_database_screen_off_summary">Datenbank wenige Sekunden nach Bildschirmabschaltung sperren</string>
@@ -197,7 +197,7 @@
     <string name="autofill">Automatisches Ausfüllen</string>
     <string name="autofill_sign_in_prompt">Mit KeePassDX anmelden</string>
     <string name="set_credential_provider_service_title">Standard-Autofill-Service festlegen</string>
-    <string name="autofill_explanation_summary">Automatisches Ausfüllen aktivieren, um Formulare in anderen Apps schnell auszufüllen</string>
+    <string name="autofill_explanation_summary">Automatisches Ausfüllen konfigurieren, um Formulare in anderen Apps schnell auszufüllen</string>
     <string name="autofill_select_entry">Eintrag auswählen …</string>
     <string name="clipboard">Zwischenablage</string>
     <string name="biometric_delete_all_key_title">Verschlüsselungsschlüssel löschen</string>
@@ -223,8 +223,8 @@
     <string name="reset_education_screens_summary">Alle Hilfsinfos nochmal anzeigen</string>
     <string name="reset_education_screens_text">Hilfeanzeige zurückgesetzt</string>
     <string name="education_create_database_title">Datenbankdatei erstellen</string>
-    <string name="education_create_database_summary">Erste Datei zur Passwortverwaltung erstellen.</string>
-    <string name="education_select_database_title">Existierende Datenbank öffnen</string>
+    <string name="education_create_database_summary">Eine erste Datei zur Passwortverwaltung erstellen.</string>
+    <string name="education_select_database_title">Vorhandene Datenbank öffnen</string>
     <string name="education_select_database_summary">Öffnet über den Dateimanager eine früher erstellte Datenbankdatei, um sie weiterzuverwenden.</string>
     <string name="education_new_node_title">Datenbankelemente hinzufügen</string>
     <string name="education_new_node_summary">Einträge helfen, digitale Konten zu verwalten.
@@ -257,7 +257,7 @@
     <string name="html_text_dev_feature_buy_pro">Durch den Kauf der &lt;strong&gt;Pro-Version&lt;/strong&gt;,</string>
     <string name="html_text_dev_feature_contibute">Durch deinen &lt;strong&gt;Beitrag&lt;/strong&gt;,</string>
     <string name="html_text_dev_feature_encourage">ermutigst du die Entwickler, &lt;strong&gt;neue Funktionen&lt;/strong&gt; einzuführen und gemäß deinen Anmerkungen &lt;strong&gt;Fehler zu beheben&lt;/strong&gt;.</string>
-    <string name="html_text_dev_feature_thanks">Vielen Dank für deine Unterstützung.</string>
+    <string name="html_text_dev_feature_thanks">Vielen Dank für die Unterstützung.</string>
     <string name="html_text_dev_feature_work_hard">Wir bemühen uns, diese Funktion bald zu veröffentlichen.</string>
     <string name="html_text_dev_feature_upgrade">Denke daran, die App durch die Installation neuer Versionen auf dem aktuellsten Stand zu halten.</string>
     <string name="download">Download</string>
@@ -312,7 +312,7 @@
     <string name="hide_broken_locations_title">Defekte Datenbankverknüpfungen ausblenden</string>
     <string name="hide_broken_locations_summary">Defekte Verknüpfungen in der Liste der zuletzt verwendeten Datenbanken ausblenden</string>
     <string name="do_not_kill_app">App nicht beenden …</string>
-    <string name="lock_database_back_root_summary">Datenbank sperren, wenn auf dem Hauptbildschirm die Taste „Zurück“ gedrückt wird</string>
+    <string name="lock_database_back_root_summary">„Zurück“ drücken, um die Datenbank zu sperren, wenn man sich auf dem Hauptbildschirm der Datenbank befindet</string>
     <string name="clear_clipboard_notification_title">Beim Schließen löschen</string>
     <string name="recycle_bin">Papierkorb</string>
     <string name="keyboard_selection_entry_title">Eintragsauswahl</string>
@@ -508,7 +508,7 @@
     <string name="temp_device_unlock_timeout_title">Ablauf der Geräteentsperrung</string>
     <string name="temp_device_unlock_enable_summary">Bei Nutzung der Geräteentsperrung keine verschlüsselten Inhalte speichern</string>
     <string name="temp_device_unlock_enable_title">Zeitlich begrenzte Geräteentsperrung</string>
-    <string name="device_credential_unlock_enable_summary">Ermöglicht das Öffnen der Datenbank mit deinen Geräteanmeldedaten</string>
+    <string name="device_credential_unlock_enable_summary">Ermöglicht das Öffnen der Datenbank mit den persönlichen Geräteanmeldedaten</string>
     <string name="device_unlock_tap_delete">Drücken, um alle Geräteentsperrschlüssel zu löschen</string>
     <string name="content">Inhalt</string>
     <string name="device_unlock_prompt_extract_credential_title">Datenbank mit Geräteentsperrdaten öffnen</string>
@@ -536,7 +536,7 @@
     <string name="error_upload_file">Beim Hochladen der Datei ist ein Fehler aufgetreten.</string>
     <string name="import_app_properties_title">App-Einstellungen importieren</string>
     <string name="error_start_database_action">Beim Ausführen einer Aktion in der Datenbank ist ein Fehler aufgetreten.</string>
-    <string name="error_otp_type">Der vorhandene OTP-Typ wird von diesem Formular nicht erkannt, seine Validierung kann Token möglicherweise nicht mehr korrekt erzeugen.</string>
+    <string name="error_otp_type">Der vorhandene OTP-Typ wird von diesem Formular nicht erkannt, und seine Validierung kann Token möglicherweise nicht mehr korrekt erzeugen.</string>
     <string name="content_description_otp_information">Informationen zu Einmalpasswörtern</string>
     <string name="warning_database_revoked">Auf die Datei kann nicht zugegriffen werden. Bitte die Datenbank schließen und von ihrem Speicherort aus erneut öffnen.</string>
     <string name="error_export_app_properties">Fehler beim Exportieren der App-Einstellungen.</string>
@@ -682,7 +682,7 @@
     <string name="ask">Fragen</string>
     <string name="later">Später</string>
     <string name="unlock_and_link_biometric">Geräteentsperrverknüpfung</string>
-    <string name="menu_appearance_settings_summary">Design, Farben, Attribute</string>
+    <string name="menu_appearance_settings_summary">Design, Farben, Symbole, Schriftarten, Attribute</string>
     <string name="warning_database_notification_permission">Die Benachrichtigungsberechtigung ermöglicht es, den Status der Datenbank anzuzeigen und sie mit einer leicht zugänglichen Taste zu sperren.
 \n
 \nWird diese Berechtigung nicht aktiviert, ist die im Hintergrund geöffnete Datenbank nicht sichtbar, wenn eine Anwendung im Vordergrund läuft.</string>
@@ -704,4 +704,28 @@
     <string name="recursive_number_entries_title">Rekursive Anzahl der Einträge</string>
     <string name="generate_keyfile">Schlüsseldatei generieren</string>
     <string name="error_otp_secret_length">Geheimschlüssel muss mindestens %1$d Zeichen lang sein.</string>
+    <string name="entry_application_id">App-ID</string>
+    <string name="warning_overwrite_data_title">Bestehende Daten überschreiben?</string>
+    <string name="warning_overwrite_data_description">Diese Aktion ersetzt die bestehenden Daten im Eintrag. Die alten Daten können wiederhergestellt werden, wenn der Verlauf aktiviert ist.</string>
+    <string name="passkeys">Passkeys</string>
+    <string name="passkeys_preference_title">Passkeys-Einstellungen</string>
+    <string name="passkeys_close_database_title">Datenbank schließen</string>
+    <string name="passkeys_privileged_apps_title">Vertrauliche Apps</string>
+    <string name="passkeys_missing_signature_app_ask_title">Signatur fehlt</string>
+    <string name="passkeys_auto_select_title">Automatische Auswahl</string>
+    <string name="passkeys_backup_eligibility_title">Backup-Erlaubnis</string>
+    <string name="passkeys_backup_state_title">Backup-Status</string>
+    <string name="passkeys_privileged_apps_ask_title">App nicht erkannt</string>
+    <string name="passkey">Passkey</string>
+    <string name="passkey_selection_username">Kein Passkey gefunden</string>
+    <string name="passkey_creation_description">Passkey in neuem Eintrag speichern</string>
+    <string name="passkey_update_description">Passkey in %1$s aktualisieren</string>
+    <string name="passkey_selection_description">Vorhandenen Passkey auswählen</string>
+    <string name="passkey_database_username">KeePassDX-Datenbank</string>
+    <string name="passkey_username">Passkey-Benutzername</string>
+    <string name="passkey_backup_state">Passkey-Backup-Status</string>
+    <string name="passkey_backup_eligibility">Passkey-Backup-Erlaubnis</string>
+    <string name="passkeys_close_database_summary">Datenbank nach der Passwortauswahl schließen</string>
+    <string name="credential_provider">Anmeldeinformationsanbieter</string>
+    <string name="passkeys_explanation_summary">Passkeys für eine schnelle und sichere Anmeldung ohne Passwort konfigurieren</string>
 </resources>

app/src/main/res/values-et/strings.xml

@@ -403,7 +403,7 @@
     <string name="database_history">Ajalugu</string>
     <string name="properties">Omadused</string>
     <string name="menu_appearance_settings">Välimus</string>
-    <string name="menu_appearance_settings_summary">Välimus, värvid, omadused</string>
+    <string name="menu_appearance_settings_summary">Välimus, värvid, ikoonid, kirjatüübid, omadused</string>
     <string name="html_text_dev_feature_upgrade">Ära unusta paigaldada viimaseid versioone ja tagada, et rakendus on alati uuendatud.</string>
     <string name="at_least_one_char">Vähemalt üks tähemärk igast</string>
     <string name="exclude_ambiguous_chars">Välista mitmetähenduslikud tähemärgid</string>
@@ -452,7 +452,7 @@
     <string name="lock_database_screen_off_summary">Mõni sekund peale ekraani väljalülitumist lukusta andmebaas</string>
     <string name="lock_database_back_root_title">Vajuta nuppu „Tagasi“</string>
     <string name="lock_database_show_button_title">Näita lukustuse nuppu</string>
-    <string name="lock_database_back_root_summary">Lukusta andmebaas peale juurkaustas „Tagasi“ nupu klõpsimist</string>
+    <string name="lock_database_back_root_summary">Kui sa pole andmebaasi juurkasutas, siis lukusta andmebaas peale „Tagasi“ nupu klõpsimist</string>
     <string name="allow_copy_password_title">Lõikelaua usaldamine</string>
     <string name="allow_copy_password_summary">Luba sisestatud salasõna ja kaitstud väljade kopeerimise lõikelauale</string>
     <string name="education_unlock_title">Eemalda oma andmebaasi lukustus</string>
@@ -470,7 +470,7 @@
     <string name="allow_copy_password_warning">Hoiatus: süsteemiülene lõikelaud on kõikide rakenduste kasutuses. Kui sa kopeerid sinna delikaatseid andmeid, siis muu tarkvara võib seda seal näha. Kui sa kasutad KDE Connecti või muud lõikelaua jagamise teenust, siis sõltuvalt seadistustest võivad need delikaatsed andmed olla nähtavad ka muudes seadmetes.</string>
     <string name="warning_database_revoked">Failihaldur on blokeerinud ligipääsu failile. Sulge andmebaas ja ava ta uuesti oma asukohast.</string>
     <string name="autofill_sign_in_prompt">Logi sisse KeePassDX abil</string>
-    <string name="autofill_explanation_summary">Täitmaks andmevorme teistes rakenduses, luba automaattäite teenus</string>
+    <string name="autofill_explanation_summary">Täitmaks andmevorme teistes rakenduses, seadista automaattäite teenus</string>
     <string name="autofill_select_entry">Vali kirje…</string>
     <string name="set_credential_provider_service_title">Vali vaikimisi kasutatav automaattäite teenus</string>
     <string name="autofill_preference_title">Automaattäite teenuse seadistused</string>
@@ -662,4 +662,45 @@
     <string name="keyboard_previous_fill_in_summary">Peale tegevust „Automaatne võtmetoiming“ lülita automaatselt tagasi eelmisele klahvistikule</string>
     <string name="education_read_only_summary">Saad juhtida sessioonil kasutatavat avamisviisi.\n\n„Kirjutuskaitstud“ tagab, et juhuslike muudatustega ei läheks andmeid kaotsi.\n„Muudetav“ võimaldab sul lisada, kustutada või muuta kõiki andmebaasi kirjeid.</string>
     <string name="error_otp_secret_length">Salavõti peab olema vähemalt %1$d tähemärki pikk.</string>
+    <string name="entry_application_id">Rakenduse tunnus</string>
+    <string name="passkeys_close_database_title">Sulge andmebaas</string>
+    <string name="passkeys_privileged_apps_ask_title">Rakendust ei õnnestu tuvastada</string>
+    <string name="warning_overwrite_data_title">Kas soovid olemasolevad andmed üle kirjutada?</string>
+    <string name="warning_overwrite_data_description">Selle toiminguga asendad kirje olemasolevad andmed, aga kui ajaloo logimine on kasutusel, siis saad vanu kirjeid ka hiljem näha.</string>
+    <string name="credential_provider">kasutajanime/salasõna automaattäite teenus</string>
+    <string name="passkeys">WebAuthn pääsuvõtmed</string>
+    <string name="passkeys_explanation_summary">Seadista WebAuthn pääsuvõtmed, mis võimaldavad kiiret ja turvalist salasõnadeta ligipääsu</string>
+    <string name="passkeys_preference_title">Pääsuvõtmete seadistused</string>
+    <string name="passkeys_close_database_summary">Peale pääsuvõtme valimist sulge andmebaas</string>
+    <string name="passkeys_privileged_apps_title">Eesõigustega rakendused</string>
+    <string name="passkeys_privileged_apps_summary">Halda brausereid sinu loodud eesõigustega rakenduste loendis</string>
+    <string name="passkeys_privileged_apps_explanation">HOIATUS: Eesõigustega rakendus toimib lüüsina autentimise algallikaga suhtlemisel. Turvaprobleemide vältimiseks palun taga, et kasutad õiget rakendust.</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s kaset pääsuvõtmega autentimiseks.\n\nKas lisame ta eesõigustega rakenduste loendisse?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Allkiri on puudu</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">HOAITUS: See pääsuluba on loodud teise kliendi poolt või on allkiri kustutatud. Turvaprobleemide vältimiseks palun kontrolli rakendus, milles soovi end tuvastada on sama teenuse osa ning sisuliselt õige.\n\nKui rakendus on veebibrauser, siis ära lisa allkirja kirje juurde vaid seadistustes leiduva eesõigustega rakenduste loendisse.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s on antud kontekstis tundmatu ja mittetunnustatud ning ta proovib autentimist olemasoleva pääsuvõtmega.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Kas soovid lisada rakenduse allkirja pääsuvõtme kirjele?</string>
+    <string name="passkeys_auto_select_title">Automaatne valik</string>
+    <string name="passkeys_auto_select_summary">Vali automaatselt vaid siis, kui vaid üks kirje ja andmebaas on avatud ning vaid siis, kui rakendus ühildub</string>
+    <string name="passkeys_backup_eligibility_title">Varunduse kõlblikkus</string>
+    <string name="passkeys_backup_eligibility_summary">Otsusta loomise hetkel, kas avaliku võtme allikat on lubatud varundada</string>
+    <string name="passkeys_backup_state_title">Varunduse olek</string>
+    <string name="passkeys_backup_state_summary">Anna märku, kas autentimisandmed on varundatud ja kaitstud üksiku seadme kaotsimineku puhul</string>
+    <string name="credential_provider_service_subtitle">Pääsuvõtmed - automaattäite teenusepakkuja</string>
+    <string name="passkey">WebAuthn pääsuvõti</string>
+    <string name="passkey_service_name">KeePassDX autentimisteenusepakkuja</string>
+    <string name="passkey_creation_description">Salvesta pääsuvõti uue kirjena</string>
+    <string name="passkey_update_description">Uuenda pääsuvõtit: %1$s</string>
+    <string name="passkey_selection_username">Pääsuvõtit ei leidu</string>
+    <string name="passkey_selection_description">Vali olemasolev pääsuvõti</string>
+    <string name="passkey_database_username">KeePassDX-i andmebaas</string>
+    <string name="passkey_locked_database_description">Vali lukustuse eemaldamiseks</string>
+    <string name="passkey_username">Pääsuvõtme kasutajanimi</string>
+    <string name="passkey_private_key">Pääsuvõtme privaatvõti</string>
+    <string name="passkey_credential_id">Pääsuvõtme autentimisühiku tunnus</string>
+    <string name="passkey_user_handle">Pääsuvõtme kasutaja võrgutunnus</string>
+    <string name="passkey_relying_party">Pääsuvõtit edastav osapool</string>
+    <string name="passkey_backup_eligibility">Pääsuvõtme kõlblikkus varundamiseks</string>
+    <string name="passkey_backup_state">Pääsuvõtme varunduse olek</string>
+    <string name="error_passkey_result">Pääsuvõtme väljastamine vastuseks ei õnnestu</string>
 </resources>

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

@@ -437,4 +437,30 @@
     <string name="success_import_app_properties">Sovellusasetukset tuotu</string>
     <string name="error_export_app_properties">Virhe sovellusasetuksia viedessä</string>
     <string name="success_export_app_properties">Sovellusasetukset tuotu</string>
+    <string name="error_otp_secret_length">Secret key on oltava vähintään %1$d merkkiä.</string>
+    <string name="warning_database_info_changed_options">Yhdistä tiedot, korvaa ulkoiset muutokset tallentamalla tietokanta tai lataa se uudelleen uusimmilla muutoksilla.</string>
+    <string name="warning_database_info_changed_options_read_only">Lataa tietokanta uudelleen uusimmilla muutoksilla.</string>
+    <string name="warning_database_info_reloaded">Tietokannan uudelleenlataaminen poistaa paikallisesti muokatut tiedot.</string>
+    <string name="warning_database_revoked">Tiedostonhallintaohjelma on peruuttanut tiedoston käyttöoikeuden. Sulje tietokanta ja avaa se uudelleen sen sijainnista.</string>
+    <string name="warning_exact_alarm">Et ole antanut sovellukselle lupaa käyttää tarkkaa hälytystä. Tämän seurauksena ajastinta vaativat toiminnot eivät toimi tarkalla ajalla.</string>
+    <string name="warning_keyfile_integrity">Tiedoston tiivisteen eheys ei ole taattu, koska Android voi muuttaa sen tietoja lennossa. Vaihda tiedostopääte .bin:ksi oikean eheyden varmistamiseksi.</string>
+    <string name="warning_copy_permission">Ilmoitusoikeus tarvitaan leikepöydän ilmoitusominaisuuden käyttämiseen.</string>
+    <string name="later">Myöhemmin</string>
+    <string name="ask">Kysy</string>
+    <string name="merge_success">Yhdistäminen suoritettu onnistuneesti</string>
+    <string name="permission">Lupa</string>
+    <string name="configure">Määritä</string>
+    <string name="biometric_security_update_required">Biometrinen turvallisuuspäivitys vaaditaan.</string>
+    <string name="unlock_and_link_biometric">Laitteen lukituksen avauslinkki</string>
+    <string name="device_unlock_prompt_store_credential_title">Linkki laitteen lukituksen avaamiseen</string>
+    <string name="device_unlock_prompt_store_credential_message">Sinun on edelleen muistettava pääkäyttäjätunnuksesi, jos käytät laitteen lukituksen avaamisen tunnistusta.</string>
+    <string name="device_unlock_prompt_extract_credential_title">Laitteen lukituksen tunnistus</string>
+    <string name="device_unlock_prompt_extract_credential_message">Hae tietokannan tunnistetiedot laitteen lukituksen avaustiedoilla</string>
+    <string name="device_unlock_invalid_key">Laitteen lukituksen avausavainta ei voi lukea. Poista se ja toista lukituksen tunnistamismenettely.</string>
+    <string name="device_unlock_not_recognized">Laitteen lukituksen avaustunnistetta ei tunnistettu</string>
+    <string name="device_unlock_prompt_not_initialized">Laitteen lukituksen avauskehotuksen alustaminen epäonnistui.</string>
+    <string name="credential_before_click_device_unlock_button">Kirjoita salasana ja napsauta sitten tätä painiketta.</string>
+    <string name="properties">Ominaisuudet</string>
+    <string name="menu_appearance_settings_summary">Teemat, värit, kuvakkeet, fontit, attribuutit</string>
+    <string name="device_credential">Laitteen tunnistetiedot</string>
 </resources>

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

@@ -19,7 +19,7 @@
 --><resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="feedback">Commentaires</string>
     <string name="homepage">Page d’accueil</string>
-    <string name="about_description">Implémentation Android du gestionnaire de mots de passe KeePass</string>
+    <string name="about_description">Implémentation Android du gestionnaire de mots de passe KeePass.</string>
     <string name="accept">Accepter</string>
     <string name="add_entry">Ajouter une entrée</string>
     <string name="add_group">Ajouter un groupe</string>
@@ -165,7 +165,7 @@
     <string name="autofill">Remplissage automatique</string>
     <string name="autofill_sign_in_prompt">Se connecter avec KeePassDX</string>
     <string name="set_credential_provider_service_title">Définir le service de remplissage automatique par défaut</string>
-    <string name="autofill_explanation_summary">Activer le remplissage automatique pour remplir rapidement des formulaires dans d’autres applications</string>
+    <string name="autofill_explanation_summary">Configurer le remplissage automatique pour remplir rapidement des formulaires dans d’autres applications</string>
     <string name="autofill_select_entry">Sélectionner une entrée…</string>
     <string name="password_size_title">Taille du mot de passe généré</string>
     <string name="password_size_summary">Défini la taille par défaut des mots de passe générés</string>
@@ -319,7 +319,7 @@
     <string name="selection_mode">Mode sélection</string>
     <string name="do_not_kill_app">Ne pas fermer l\'application…</string>
     <string name="lock_database_back_root_title">Appuyer sur \"Retour\" pour verrouiller</string>
-    <string name="lock_database_back_root_summary">Verrouille la base de données lorsque l’utilisateur clique sur le bouton retour de l’écran racine</string>
+    <string name="lock_database_back_root_summary">Appuyer sur « Retour » pour verrouiller la base de données si vous vous trouvez sur l\'écran racine de la base de données</string>
     <string name="clear_clipboard_notification_title">Suppression à la fermeture</string>
     <string name="clear_clipboard_notification_summary">Verrouille la base de données lorsque la durée du presse-papier expire ou que la notification est fermée après avoir commencé à l’utiliser</string>
     <string name="recycle_bin">Corbeille</string>
@@ -539,7 +539,7 @@
     <string name="unit_mebibyte">Mébioctets</string>
     <string name="unit_kibibyte">Kibioctets</string>
     <string name="unit_byte">Octets</string>
-    <string name="error_otp_type">Le type OTP existant n\'est pas reconnu par ce formulaire, sa validation peut ne plus générer correctement le jeton.</string>
+    <string name="error_otp_type">Le type OTP existant n\'est pas reconnu par ce formulaire, et sa validation peut ne plus générer correctement le jeton.</string>
     <string name="download_canceled">Annulé !</string>
     <string name="icon_section_custom">Customisé</string>
     <string name="icon_section_standard">Standard</string>
@@ -702,4 +702,45 @@
     <string name="hide_templates_title">Cacher les gabarits</string>
     <string name="hide_templates_summary">Les gabarits ne sont pas affichés</string>
     <string name="error_otp_secret_length">La clé secrète doit avoir ai moins %1$d caractères.</string>
+    <string name="entry_application_id">ID d\'application</string>
+    <string name="warning_overwrite_data_title">Écraser les données existantes ?</string>
+    <string name="warning_overwrite_data_description">Cette action va remplacer la donnée existante de cette entrée, vous pourrez récupérer l\'ancienne donnée si l\'historique est activé.</string>
+    <string name="passkeys">Clé d\'accès</string>
+    <string name="passkeys_explanation_summary">Configurer des clés d\'accès pour une connexion rapide et sécurisée, sans mot de passe</string>
+    <string name="passkeys_preference_title">Paramètres des clés d\'accès</string>
+    <string name="passkeys_close_database_title">Fermer la base de données</string>
+    <string name="credential_provider">Fournisseur d\'authentification</string>
+    <string name="passkeys_close_database_summary">Fermer la base de données après la sélection d\'un mot de passe</string>
+    <string name="passkeys_privileged_apps_title">Applications privilégiées</string>
+    <string name="passkeys_privileged_apps_summary">Gérer les navigateurs dans la liste personnalisée des applications privilégiées</string>
+    <string name="passkeys_privileged_apps_explanation">AVERTISSEMENT : une application privilégiée sert de passerelle pour récupérer l\'origine d\'une authentification. Assurez-vous de sa légitimité afin d\'éviter tout problème de sécurité.</string>
+    <string name="passkeys_privileged_apps_ask_title">Application non reconnue</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s tente d\'effectuer une action Passkey.\n\nL\'ajouter à la liste des applications privilégiées ?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Signature manquante</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">AVERTISSEMENT : la clé d\'accès a été créée à partir d\'un autre client ou la signature a été supprimée. Assurez-vous que l\'application que vous souhaitez authentifier fait partie du même service et qu\'elle est légitime afin d\'éviter tout problème de sécurité.\nSi l\'application est un navigateur, n\'ajoutez pas sa signature à l\'entrée, mais à la liste des applications privilégiées dans les paramètres.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s n\'est pas reconnu et tente de s\'authentifier avec une clé d\'accès existante.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Ajouter la signature d\'application à l\'entrée contenant la clé d\'accès ?</string>
+    <string name="passkeys_auto_select_title">Sélection automatique</string>
+    <string name="passkeys_auto_select_summary">Sélection automatique s\'il n\'y a qu\'une seule entrée et que la base de données est ouverte, uniquement si l\'application requérante est compatible</string>
+    <string name="passkeys_backup_eligibility_title">Admissibilité à la sauvegarde</string>
+    <string name="passkeys_backup_eligibility_summary">Déterminer au moment de la création si la source d\'authentification de clé publique est autorisé à une copie de sauvegarde</string>
+    <string name="passkeys_backup_state_title">État de sauvegarde</string>
+    <string name="passkeys_backup_state_summary">Indiquer que les informations d\'authentification sont sauvegardées et protégées contre la perte d\'un seul appareil</string>
+    <string name="credential_provider_service_subtitle">Clés d\'accès, Remplissage automatique fournisseur d\'authentification</string>
+    <string name="passkey">Clé d\'accès</string>
+    <string name="passkey_service_name">KeePassDX Fournisseur d\'Authentification</string>
+    <string name="passkey_creation_description">Enregistrer la clé d\'accès dans la nouvelle entrée</string>
+    <string name="passkey_update_description">Mettre à jour la clé d\'accès dans %1$s</string>
+    <string name="passkey_selection_username">Aucune clé d\'accès trouvée</string>
+    <string name="passkey_selection_description">Sélectionner une clé d\'accès existante</string>
+    <string name="passkey_database_username">Base de données KeePassDX</string>
+    <string name="passkey_locked_database_description">Sélectionner pour déverrouiller</string>
+    <string name="passkey_username">Nom d\'Utilisateur de Clé d\'Accès</string>
+    <string name="passkey_private_key">Clé Privée de Clé d\'Accès</string>
+    <string name="passkey_credential_id">Identifiant d\'Authentification de Clé d\'Accès</string>
+    <string name="passkey_user_handle">Identifiant Utilisateur de Clé d\'Accès</string>
+    <string name="passkey_relying_party">Partie Utilisatrice de Clé d\'Accès</string>
+    <string name="passkey_backup_eligibility">Admissibilité à la Sauvegarde de Clé d\'Accès</string>
+    <string name="passkey_backup_state">État de la Sauvegarde de Clé d\'Accès</string>
+    <string name="error_passkey_result">Impossible de restituer la clé d\'accès</string>
 </resources>

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

@@ -18,7 +18,7 @@
     along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 --><resources>
     <string name="feedback">Visszajelzés</string>
-    <string name="homepage">Honlap</string>
+    <string name="homepage">Weboldal</string>
     <string name="about_description">A KeePass jelszókezelő androidos megvalósítása.</string>
     <string name="accept">Elfogadás</string>
     <string name="add_entry">Bejegyzés hozzáadása</string>
@@ -29,7 +29,7 @@
     <string name="application">Alkalmazás</string>
     <string name="menu_app_settings">Alkalmazásbeállítások</string>
     <string name="brackets">Zárójelek</string>
-    <string name="file_manager_install_description">Az adatbázisfájlok létrehozásához, megnyitásához és mentéséhez szükség van egy fájlkezelőre, amely képes fogadni az ACTION_CREATE_DOCUMENT és ACTION_OPEN_DOCUMENT Intenteket.</string>
+    <string name="file_manager_install_description">Az adatbázisfájlok létrehozásához, megnyitásához és mentéséhez szükség van egy fájlkezelőre, amely képes fogadni az ACTION_CREATE_DOCUMENT és ACTION_OPEN_DOCUMENT intenteket.</string>
     <string name="clipboard_cleared">Vágólap törölve</string>
     <string name="clipboard_error_title">Vágólaphiba</string>
     <string name="clipboard_error">Egyes eszközök nem engedik, hogy az alkalmazások használják a vágólapot.</string>
@@ -56,7 +56,7 @@
     <string name="entry_password">Jelszó</string>
     <string name="save">Mentés</string>
     <string name="entry_title">Cím</string>
-    <string name="entry_url">URL</string>
+    <string name="entry_url">Webcím</string>
     <string name="entry_user_name">Felhasználónév</string>
     <string name="error_arc4">Az Arcfour adatfolyam-titkosítás nem támogatott.</string>
     <string name="error_can_not_handle_uri">Ez az URI nem kezelhető a KeePassDX-ben.</string>
@@ -83,7 +83,7 @@
     <string name="hint_length">Hossz</string>
     <string name="hint_pass">Jelszó</string>
     <string name="password">Jelszó</string>
-    <string name="invalid_credentials">A hitelesítő adatok nem olvashatók.</string>
+    <string name="invalid_credentials">A hitelesítési adatok nem olvashatók.</string>
     <string name="invalid_algorithm">Hibás algoritmus.</string>
     <string name="invalid_db_sig">Az adatbázis formátuma nem ismerhető fel.</string>
     <string name="keyfile_is_empty">A kulcsfájl üres.</string>
@@ -106,11 +106,11 @@
     <string name="menu_open">Megnyitás</string>
     <string name="menu_search">Keresés</string>
     <string name="menu_showpass">Jelszó megjelenítése</string>
-    <string name="menu_url">Ugrás az URL-re</string>
+    <string name="menu_url">Ugrás a webcímre</string>
     <string name="minus">Mínusz</string>
     <string name="never">Soha</string>
     <string name="no_results">Nincs találat</string>
-    <string name="no_url_handler">Telepítsen egy webböngészőt az URL megnyitásához.</string>
+    <string name="no_url_handler">Telepítsen egy webböngészőt a webcím megnyitásához.</string>
     <string name="progress_create">Új adatbázis létrehozása…</string>
     <string name="progress_title">Feldolgozás…</string>
     <string name="protection">Védelem</string>
@@ -127,15 +127,13 @@
     <string name="search">Keresés</string>
     <string name="underline">Aláhúzás</string>
     <string name="unsupported_db_version">Nem támogatott adatbázis-verzió.</string>
-    <string name="uppercase">Nagybetűs</string>
+    <string name="uppercase">Nagybetűk</string>
     <string name="warning">Figyelmeztetés</string>
     <string name="warning_password_encoding">Kerülje a Latin-1 karakterkészlettől eltérő jelszókaraktereket az adatbázis-fájlban (a nem felismert karakterek mert ugyanarra a betűre lesznek alakítva).</string>
     <string name="version_label">Verzió: %1$s</string>
     <string name="encrypted_value_stored">Titkosított jelszó tárolva</string>
     <string name="unavailable">Nem érhető el</string>
-    <string name="education_unlock_summary">Adja meg a jelszót és/vagy a kulcsfájlt, hogy kinyithassa az adatbázist.
-\n
-\nKészítsen biztonsági mentést az adatbázisról minden egyes módosítás után.</string>
+    <string name="education_unlock_summary">Adja meg a jelszót és/vagy a kulcsfájlt, hogy kinyithassa az adatbázist. \n \nBiztonsági mentés létrehozása az adatbázisról minden egyes módosítás után.</string>
     <string-array name="list_size_options">
         <item>Kicsi</item>
         <item>Közepes</item>
@@ -184,8 +182,8 @@
     <string name="general">Általános</string>
     <string name="autofill">Automatikus kitöltés</string>
     <string name="autofill_sign_in_prompt">Bejelentkezés a KeePassDX-szel</string>
-    <string name="set_credential_provider_service_title">Alapértelmezett automatikus kitöltési szolgáltatás beállítása</string>
-    <string name="autofill_explanation_summary">Automatikus kitöltés engedélyezése az űrlapok gyors kitöltéséhez más alkalmazásokban</string>
+    <string name="set_credential_provider_service_title">Hitelesítő adatkezelő szolgáltatás</string>
+    <string name="autofill_explanation_summary">Automatikus kitöltés az űrlapok gyors kitöltéséhez más alkalmazásokban</string>
     <string name="password_size_title">Előállított jelszó mérete</string>
     <string name="password_size_summary">Beállítja az előállított jelszavak alapértelmezett méretét</string>
     <string name="list_password_generator_options_title">Jelszó karakterek</string>
@@ -193,7 +191,7 @@
     <string name="clipboard">Vágólap</string>
     <string name="clipboard_notifications_title">Vágólap-értesítések</string>
     <string name="clipboard_notifications_summary">Vágólap-értesítések megjelenítése a bejegyzésmezők másolásakor</string>
-    <string name="clipboard_warning">Ha a vágólap automatikus törlése meghiúsul, akkor törölje kézzel az előzményeket.</string>
+    <string name="clipboard_warning">Ha a vágólap automatikus törlése meghiúsul, akkor törölje saját kezűleg az előzményeket.</string>
     <string name="lock">Zárolás</string>
     <string name="lock_database_screen_off_title">Képernyőzár</string>
     <string name="lock_database_screen_off_summary">Az adatbázis zárolása néhány másodperc után, ha a képernyő kikapcsol</string>
@@ -217,7 +215,7 @@
     <string name="allow_copy_password_warning">Figyelmeztetés: A vágólapon osztozik az összes alkalmazás. Ha érzékeny adatokat másol, akkor a többi szoftver is hozzáférhet.</string>
     <string name="database_name_title">Adatbázis neve</string>
     <string name="database_description_title">Adatbázis leírása</string>
-    <string name="database_version_title">Adatbázis verzió</string>
+    <string name="database_version_title">Adatbázis-verzió</string>
     <string name="text_appearance">Szöveg</string>
     <string name="application_appearance">Felhasználói felület</string>
     <string name="other">Egyéb</string>
@@ -243,7 +241,7 @@
     <string name="keyboard_key_vibrate_title">Rezgés gombnyomáskor</string>
     <string name="keyboard_key_sound_title">Hang gombnyomáskor</string>
     <string name="allow_no_password_title">Mesterkulcs elhagyásának engedélyezése</string>
-    <string name="allow_no_password_summary">A „Megnyitás” gomb engedélyezése, ha nincsenek hitelesítő adatok kiválasztva</string>
+    <string name="allow_no_password_summary">A „Megnyitás” gomb engedélyezése, ha nincsenek hitelesítési adatok kiválasztva</string>
     <string name="enable_education_screens_title">Oktatóképernyők</string>
     <string name="enable_education_screens_summary">Elemek kiemelése, hogy megtudja hogyan működik az alkalmazás</string>
     <string name="reset_education_screens_title">Oktatóképernyők visszaállítása</string>
@@ -278,18 +276,18 @@
     <string name="education_lock_summary">Zárolja gyorsan az adatbázist, beállíthatja hogy az alkalmazás lezárja egy idő után, valamint ha a képernyőt kikapcsolja.</string>
     <string name="education_sort_title">Elemek rendezése</string>
     <string name="education_sort_summary">Válasszon, hogy az elemek és csoportok hogyan legyenek rendezve.</string>
-    <string name="education_donation_title">Közreműködés</string>
+    <string name="education_donation_title">Részvétel</string>
     <string name="education_entry_edit_summary">Szerkessze a bejegyzése egyéni mezőit. Az adatok hivatkozhatóak a különböző mezők között.</string>
     <string name="education_donation_summary">Segítsen a stabilitás és a biztonság növelésében, és az új funkciók hozzáadásában.</string>
     <string name="html_text_ad_free">Számos más jelszókezelő alkalmazással ellentétben, ez egy &lt;strong&gt;reklámmentes&lt;/strong&gt;, &lt;strong&gt;copyleft licencelésű szabad szoftver&lt;/strong&gt;, amely nem gyűjt személyes adatokat a kiszolgálókon, bármelyik verziót is használja.</string>
     <string name="html_text_buy_pro">A pro verzió megvásárlásával hozzáférést kap ehhez a &lt;strong&gt;vizuális stílushoz&lt;/strong&gt;, és segít a &lt;strong&gt;közösségi projektek megvalósulásában.&lt;/strong&gt;</string>
     <string name="html_text_feature_generosity">Ez a &lt;strong&gt;vizuális stílus&lt;/strong&gt; az Ön nagylelkűségének köszönhetően érhető el.</string>
     <string name="html_text_donation">Azzal, hogy &lt;strong&gt;hozzájárul&lt;/strong&gt; a projekthez &lt;i&gt;(pénzzel, kóddal, fordítással)&lt;/i&gt;, segít abban, hogy a projekt tovább éljen és gyarapodjon, továbbá Ön jogosulttá válik a &lt;strong&gt;téma&lt;/strong&gt;feloldásának lehetősége.</string>
-    <string name="html_text_dev_feature">Ez a funkció &lt;strong&gt;fejlesztés alatt áll&lt;/strong&gt;, és az Ön &lt;strong&gt;támogatására&lt;/strong&gt; van szükség, hogy hamarosan elérhető legyen.</string>
+    <string name="html_text_dev_feature">Ez a funkció &lt;strong&gt;fejlesztés alatt áll&lt;/strong&gt;, és az Ön &lt;strong&gt;közreműködésére&lt;/strong&gt; van szükség, hogy hamarosan elérhető legyen.</string>
     <string name="html_text_dev_feature_buy_pro">A &lt;strong&gt;pro&lt;/strong&gt; verzió megvásárlásával,</string>
-    <string name="html_text_dev_feature_contibute">A &lt;strong&gt;támogatással&lt;/strong&gt;</string>
-    <string name="html_text_dev_feature_encourage">arra ösztönzi a fejlesztőket, hogy &lt;strong&gt;új funkciókat&lt;/strong&gt; készítsenek, és &lt;strong&gt;hibákat javítsanak&lt;/strong&gt; az észrevételei alapján.</string>
-    <string name="html_text_dev_feature_thanks">Köszönjük a támogatását.</string>
+    <string name="html_text_dev_feature_contibute">A &lt;strong&gt;közreműködésével&lt;/strong&gt;,</string>
+    <string name="html_text_dev_feature_encourage">arra ösztönzi a fejlesztőket, hogy &lt;strong&gt;új funkciókat&lt;/strong&gt; hozzanak létre, és &lt;strong&gt;hibákat javítsanak&lt;/strong&gt; az észrevételei alapján.</string>
+    <string name="html_text_dev_feature_thanks">Köszönjük a közreműködését.</string>
     <string name="html_text_dev_feature_work_hard">Keményen dolgozunk, hogy gyorsan kiadjuk ezt a funkciót.</string>
     <string name="html_text_dev_feature_upgrade">Ne felejtse naprakészen tartani az alkalmazást az új verziók telepítésével.</string>
     <string name="download">Letöltés</string>
@@ -315,7 +313,7 @@
     <string name="clear_clipboard_notification_title">Zárolás bezáráskor</string>
     <string name="lock_database_show_button_summary">Megjeleníti a zárolás gombot a felhasználói felületen</string>
     <string name="lock_database_show_button_title">Zárolás gomb megjelenítése</string>
-    <string name="lock_database_back_root_summary">Az adatbázis zárolása, ha a felhasználó a vissza gombra kattint az indítóképernyőn</string>
+    <string name="lock_database_back_root_summary">Nyomja meg a „Vissza” gombot az adatbázis zárolásához, ha az adatbázis indítóképernyőjén tartózkodik</string>
     <string name="autofill_preference_title">Automatikus kitöltés beállításai</string>
     <string name="warning_database_link_revoked">A fájlhoz történő hozzáférést visszavonta a fájlkezelő</string>
     <string name="warning_database_read_only">Fájlírási-hozzáférés megadása az adatbázis-változások mentéséhez</string>
@@ -330,7 +328,7 @@
     <string name="auto_focus_search_summary">Keresés kérése az adatbázis megnyitásakor</string>
     <string name="error_create_database">Az adatbázisfájl létrehozása sikertelen.</string>
     <string name="error_label_exists">Ez a címke már létezik.</string>
-    <string name="html_about_contribution">A &lt;strong&gt;szabadságunk megtartása&lt;/strong&gt;, a &lt;strong&gt;hibák javítása&lt;/strong&gt;, a &lt;strong&gt;funkciók hozzáadása&lt;/strong&gt; és az &lt;strong&gt;állandó aktivitás&lt;/strong&gt; érdekében számítunk a &lt;strong&gt;támogatására&lt;/strong&gt;.</string>
+    <string name="html_about_contribution">A &lt;strong&gt;szabadságunk megtartása&lt;/strong&gt;, a &lt;strong&gt;hibák javítása&lt;/strong&gt;, a &lt;strong&gt;funkciók hozzáadása&lt;/strong&gt; és az &lt;strong&gt;állandó aktivitás&lt;/strong&gt; érdekében számítunk a &lt;strong&gt;közreműködésére&lt;/strong&gt;.</string>
     <string name="entry_add_attachment">Melléklet hozzáadása</string>
     <string name="entry_add_field">Mező hozzáadása</string>
     <string name="entry_password_generator">Jelszógenerátor</string>
@@ -355,7 +353,7 @@
     <string name="enable_auto_save_database_summary">Az adatbázis mentése minden fontos művelet után („Módosítható” módban)</string>
     <string name="enable_auto_save_database_title">Adatbázis automatikus mentése</string>
     <string name="recycle_bin_group_title">Kuka csoportja</string>
-    <string name="keystore_not_accessible">Az kulcstár nincs helyesen előkészítve.</string>
+    <string name="keystore_not_accessible">A KeyStore nincs helyesen előkészítve.</string>
     <string name="warning_permanently_delete_nodes">Biztos, hogy végleg törli a kiválasztott csomópontokat\?</string>
     <string name="command_execution">Parancs végrehajtása…</string>
     <string name="menu_empty_recycle_bin">Kuka ürítése</string>
@@ -393,7 +391,7 @@
     <string name="error_otp_counter">A számlálónak %1$d és %2$d között kell lennie.</string>
     <string name="error_otp_secret_key">A titkos kulcsnak Base32 formátumban kell lennie.</string>
     <string name="error_copy_group_here">Csoport nem másolható ide.</string>
-    <string name="error_disallow_no_credentials">Legalább egy hitelesíti módot be kell állítani.</string>
+    <string name="error_disallow_no_credentials">Legalább egy hitelesítési módot be kell állítani.</string>
     <string name="error_invalid_OTP">Érvénytelen OTP titok.</string>
     <string name="entry_otp">OTP</string>
     <string name="otp_algorithm">Algoritmus</string>
@@ -421,7 +419,7 @@
     <string name="content_description_password_length">Jelszó hossza</string>
     <string name="content_description_entry_icon">Bejegyzésikon</string>
     <string name="content_description_repeat_toggle_password_visibility">Jelszó láthatóságának átváltásának megismétlése</string>
-    <string name="content_description_node_children">Csomópont gyermekei</string>
+    <string name="content_description_node_children">Alárendelt csomópontok</string>
     <string name="delete_entered_password_summary">Törli a beírt jelszót az adatbázishoz való kapcsolódási kísérlet után</string>
     <string name="delete_entered_password_title">Jelszó törlése</string>
     <string name="keyboard_selection_entry_summary">A Mágikus billentyűzet kitöltése azzal a bejegyzéssel, amelyet megtekint a KeePassDX-ben</string>
@@ -430,7 +428,7 @@
     <string name="lock_database_back_root_title">Nyomja meg a „Vissza” gombot a zároláshoz</string>
     <string name="do_not_kill_app">Ne lője ki az alkalmazást…</string>
     <string name="selection_mode">Kiválasztási mód</string>
-    <string name="keyboard_previous_database_credentials_title">Adatbázis-hitelesítőadatok képernyője</string>
+    <string name="keyboard_previous_database_credentials_title">Adatbázis-hitelesítő képernyő</string>
     <string name="keyboard_change">Billentyűzet váltása</string>
     <string name="keyboard_save_search_info_title">Megosztott információk mentése</string>
     <string name="notification">Értesítés</string>
@@ -438,7 +436,7 @@
     <string name="database_data_remove_unlinked_attachments_title">Nem összekapcsolt adatok eltávolítása</string>
     <string name="data">Adatok</string>
     <string name="biometric_security_update_required">Biometrikus biztonsági frissítés szükséges.</string>
-    <string name="configure_biometric">Nincs biometrikus vagy eszközazonosító beállítva.</string>
+    <string name="configure_biometric">Nincs biometrikus vagy eszközhitelesítési adat beállítva.</string>
     <string name="warning_empty_keyfile_explanation">A kulcsfájl tartalmának sosem szabad megváltoznia, és a legjobb esetben véletlenszerűen előállított adatokat kellene tartalmaznia.</string>
     <string name="warning_empty_keyfile">Nem ajánlott, hogy üres kulcsfájl adjon hozzá.</string>
     <string name="warning_sure_remove_data">Mindenképp törli ezeket az adatokat\?</string>
@@ -456,7 +454,7 @@
     <string name="subdomain_search_title">Aldomain keresés</string>
     <string name="error_registration_read_only">Az új elem mentése nem engedélyezett írásvédett adatbázisban.</string>
     <string name="error_string_type">A szöveg nem egyezik a kért elemmel.</string>
-    <string name="content_description_credentials_information">Hitelesítő adatok információi</string>
+    <string name="content_description_credentials_information">Hitelesítési adatok információi</string>
     <string name="content_description_add_item">Elem hozzáadása</string>
     <string name="export_app_properties_summary">Fájl létrehozása az alkalmazásbeállítások exportálásához</string>
     <string name="export_app_properties_title">Alkalmazásbeállítások exportálása</string>
@@ -473,7 +471,7 @@
     <string name="error_rebuild_list">A lista újbóli összeállítása sikertelen.</string>
     <string name="error_database_uri_null">Az adatbázis URI nem kérhető le.</string>
     <string name="error_field_name_already_exists">A mezőnév már létezik.</string>
-    <string name="error_otp_type">A meglévő OTP típus nem ismert ebben a formában, a kiértékelése nem biztos, hogy helyes tokent fog előállítani.</string>
+    <string name="error_otp_type">A meglévő OTP típus nem felismerhető ebben az űrlapban, és érvényesítése már nem biztosítja a token helyes generálását.</string>
     <string name="error_word_reserved">Ez egy foglalt szó, és nem használható.</string>
     <string name="version">Verzió</string>
     <string name="template">Sablon</string>
@@ -518,25 +516,25 @@
     <string name="autofill_select_entry">Válasszon bejegyzést…</string>
     <string name="warning_database_info_changed_options">Adatok egyesítése, majd a külső módosítások felülírása az adatbázis mentésével, vagy újratöltés a legfrissebb változtatásokkal.</string>
     <string name="device_unlock_prompt_store_credential_title">Hivatkozás az eszköz feloldásához</string>
-    <string name="device_unlock_prompt_store_credential_message">Továbbra is meg kell jegyeznie a széf fő jelszavát, ha az eszköz feloldásfelismerését használja.</string>
-    <string name="device_unlock_prompt_extract_credential_message">Adatbázis hitelesítő adatainak kinyerése az eszköz adatfeloldásával</string>
+    <string name="device_unlock_prompt_store_credential_message">Ha az eszköz feloldásának felismerését használja, akkor is meg kell jegyeznie a széf fő hitelesítési adatait.</string>
+    <string name="device_unlock_prompt_extract_credential_message">Adatbázis hitelesítési adatainak kinyerése az eszköz feloldási adatok alapján</string>
     <string name="device_unlock_invalid_key">Az eszközfeloldási kulcs nem olvasható. Törölje, és ismételje meg a feloldásfelismerési folyamatot.</string>
     <string name="device_unlock_not_recognized">Az eszközfeloldási ujjlenyomat nem ismerhető fel</string>
     <string name="device_unlock_prompt_not_initialized">Az eszközfeloldási képernyő előkészítése sikertelen.</string>
     <string name="properties">Tulajdonságok</string>
-    <string name="device_credential">Eszköz hitelesítő adatai</string>
+    <string name="device_credential">Eszköz hitelesítési adatai</string>
     <string name="temp_device_unlock_enable_summary">Ne tároljon semmilyen titkosított tartalmat az eszközfeloldás használatához</string>
     <string name="temp_device_unlock_timeout_title">Eszközfeloldás lejárati ideje</string>
     <string name="warning_database_revoked">A fájl elérését visszavonta a fájlkezelő, zárja be az adatbázist és nyissa meg újra a helyéről.</string>
     <string name="warning_exact_alarm">Nem engedélyezte az alkalmazásnak, hogy pontos riasztást használjon. Ezért az időzítőt használó funkciók nem a pontos időt fogják használni.</string>
-    <string name="device_unlock_prompt_extract_credential_title">Eszköz feloldásfelismerése</string>
+    <string name="device_unlock_prompt_extract_credential_title">Eszköz feloldásának felismerése</string>
     <string name="credential_before_click_device_unlock_button">Írja be a jelszót, majd kattintson erre a gombra.</string>
     <string name="temp_device_unlock_enable_title">Ideiglenes eszközfeloldás</string>
     <string name="permission">Engedély</string>
     <string name="content">Tartalom</string>
     <string name="device_unlock_tap_delete">Koppintson az eszközfeloldási kulcsok törléséhez</string>
-    <string name="device_credential_unlock_enable_title">Eszköz hitelesítő adataival történő feloldás</string>
-    <string name="device_credential_unlock_enable_summary">Lehetővé teszi, hogy az eszköz hitelesítő adataival nyissa meg az adatbázist</string>
+    <string name="device_credential_unlock_enable_title">Eszköz hitelesítési adataival történő feloldás</string>
+    <string name="device_credential_unlock_enable_summary">Lehetővé teszi, hogy az eszköz hitelesítési adataival nyissa meg az adatbázist</string>
     <string name="autofill_application_id_blocklist_title">Letiltott alkalmazások</string>
     <string name="menu_merge_database">Adatok egyesítése</string>
     <string name="autofill_close_database_title">Adatbázis bezárása</string>
@@ -576,7 +574,7 @@
     <string name="show_uuid_summary">Megjeleníti a bejegyzéshez vagy csoporthoz tartozó UUID-t</string>
     <string name="show_otp_token_title">OTP token megjelenítése</string>
     <string name="device_unlock_delete_all_key_warning">Törli az összes, az eszközfeloldás-felismeréshez tartozó titkosítási kulcsot\?</string>
-    <string name="keyboard_save_search_info_summary">A könnyebb jövőbeli használat érdekében próbálja menteni a megosztott információkat a kézi bejegyzéskiválasztásnál</string>
+    <string name="keyboard_save_search_info_summary">A könnyebb jövőbeli használat érdekében próbálja menteni a megosztott információkat a kézi bejegyzés kiválasztásánál</string>
     <string name="custom_fields">Egyéni mezők</string>
     <string name="back_to_previous_keyboard">Vissza az előző billentyűzethez</string>
     <string name="upload_attachment">%1$s feltöltése</string>
@@ -587,10 +585,10 @@
     <string name="autofill_web_domain_blocklist_title">Letiltott webes domainek</string>
     <string name="autofill_ask_to_save_data_title">Adatok mentésének kérése</string>
     <string name="education_device_unlock_title">Eszközadatbázis feloldása</string>
-    <string name="education_device_unlock_summary">A jelszó összekötése a leolvasott biometrikus adatokkal vagy eszköz-hitelesítőadatokkal, hogy gyorsan feloldhassa az adatbázist.</string>
+    <string name="education_device_unlock_summary">A jelszó összekapcsolása a leolvasott biometrikus adatokkal vagy eszközhitelesítő adatokkal, hogy gyorsan feloldhassa az adatbázist.</string>
     <string name="show_otp_token_summary">Megjeleníti az OTP tokeneket a bejegyzések között</string>
     <string name="education_add_attachment_title">Melléklet hozzáadása</string>
-    <string name="keyboard_previous_database_credentials_summary">Automatikus visszaváltás az előző billentyűzetre az adatbázis-hitelesítőadatok képernyőn</string>
+    <string name="keyboard_previous_database_credentials_summary">Automatikus visszaváltás az előző billentyűzetre az adatbázis-hitelesítő adatok képernyőjén</string>
     <string name="warning_database_info_reloaded">Az adatbázis újratöltése törli a helyileg módosított adatokat.</string>
     <string name="templates">Sablonok</string>
     <string name="error_no_response_from_challenge">Nem kérhető le a válasz a kihívásból.</string>
@@ -625,19 +623,19 @@
     <string name="navigation_drawer_close">A navigációs tálca bezárása</string>
     <string name="html_about_privacy">&lt;strong&gt;Nincsenek felhasználói adatok lekérve&lt;/strong&gt;, az alkalmazás nem kapcsolódik semmilyen külső kiszolgálóhoz, csak helyben működik, és teljes mértékben tiszteletben tartja a felhasználók adatvédelmét.</string>
     <string name="enable_keep_screen_on_summary">Képernyő bekapcsolva tartása egy bejegyzés megtekintésekor vagy szerkesztésekor</string>
-    <string name="title_case">Nagy Kezdőbetűs</string>
+    <string name="title_case">Nagy kezdőbetűs</string>
     <string name="navigation_drawer_open">A navigációs tálca kinyitása</string>
     <string name="content_description_hardware_key_checkbox">Hardverkulcs jelölőnégyzete</string>
     <string name="at_least_one_char">Legalább egy karakter mindegyikből</string>
     <string name="lower_case">kisbetűk</string>
     <string name="screenshot_mode_banner_text">Képernyőképmodul</string>
-    <string name="case_sensitive">Kis- és nagybetű eltérő</string>
+    <string name="case_sensitive">Kis- és nagybetűk megkülönböztetése</string>
     <string name="error_location_unknown">Az adatbázis helye ismeretlen, az adatbázis-művelet nem hajtható végre.</string>
     <string name="content_description_passphrase_word_count">A jelmondat szószáma</string>
     <string name="regex">Reguláris kifejezés</string>
     <string name="show_entry_colors_title">Bejegyzésszínek</string>
     <string name="passphrase">Jelmondat</string>
-    <string name="menu_appearance_settings_summary">Témák, színek, attribútumok</string>
+    <string name="menu_appearance_settings_summary">Témák, színek, ikonok, betűkészletek, attribútumok</string>
     <string name="expired">Lejárt</string>
     <string name="error_response_already_provided">A válasz már megérkezett.</string>
     <string name="colorize_password_summary">A jelszó karaktereinek színezése típus szerint</string>
@@ -652,7 +650,7 @@
     <string name="wireless">Wi-Fi</string>
     <string name="error_hardware_key_unsupported">A hardverkulcs nem támogatott.</string>
     <string name="colorize_password_title">Jelszavak színezése</string>
-    <string name="menu_device_unlock_settings_summary">Biometrikus adatok, eszköz-hitelesítőadatok</string>
+    <string name="menu_device_unlock_settings_summary">Biometrikus adatok, eszközhitelesítési adatok</string>
     <string name="error_XML_malformed">Hibásan formázott XML.</string>
     <string name="remember_hardware_key_summary">Követi a használt hardverkulcsokat</string>
     <string name="warning_database_already_opened">Egy adatbázis már nyitva van, előbb zárja be, hogy újat nyisson meg</string>
@@ -662,11 +660,7 @@
     <string name="warning_database_notification_permission">Az értesítési engedély lehetővé teszi az adatbázis állapotának megjelenítését, és az egyszerű ikonnal történő zárolást.
 \n
 \nHa nem aktiválja az engedélyt, akkor a háttérben nyitott adatbázis nem lesz látható, ha egy másik alkalmazás van előtérben.</string>
-    <string name="device_unlock_keystore_warning">A funkció eltárolja a titkosított hitelesítőadatokat az eszköz biztonságos kulcstárában.
-\n
-\nAz operációs rendszer natív API megvalósításától függően lehet, hogy nem lesz teljes értékű.
-\n
-\nEllenőrizze a kulcstár kompatibilitását és biztonságát az eszköz gyártójánál és a használt ROM készítőjénél.</string>
+    <string name="device_unlock_keystore_warning">A funkció eltárolja a titkosított hitelesítési adatokat az eszköz biztonságos KeyStore-jában. \n \nAz operációs rendszer natív API megvalósításától függően lehet, hogy nem lesz teljes értékű. \n \nEllenőrizze a KeyStore kompatibilitását és biztonságát az eszköz gyártójánál, valamint a használt ROM készítőjénél.</string>
     <string name="show_entry_colors_summary">Megjeleníti egy bejegyzés előtér- és háttérszínét</string>
     <string name="unlock_and_link_biometric">Eszközfeloldási hivatkozás</string>
     <string name="warning_copy_permission">Az értesítési engedély szükséges a vágólap-értesítési funkció használatához.</string>
@@ -704,4 +698,45 @@
     <string name="generate_keyfile">Kulcsfájl előállítása</string>
     <string name="hide_templates_title">Sablonok elrejtése</string>
     <string name="error_otp_secret_length">A titkos kulcsnak legalább %1$d karakterből kell állnia.</string>
+    <string name="entry_application_id">Alkalmazásazonosító</string>
+    <string name="warning_overwrite_data_title">Felülírja a meglévő adatokat?</string>
+    <string name="warning_overwrite_data_description">Ez a művelet felülírja a bejegyzésben található meglévő adatokat. Ha a előzmények funkció engedélyezve van, akkor a régi adatokat vissza lehet állítani.</string>
+    <string name="credential_provider">Hitelesítési adatok szolgáltatója</string>
+    <string name="passkeys">Hozzáférési kulcsok</string>
+    <string name="passkeys_explanation_summary">Hozzáférési kulcsok beállítása a gyors és biztonságos jelszó nélküli bejelentkezéshez</string>
+    <string name="passkeys_preference_title">Hozzáférési kulcsok beállításai</string>
+    <string name="passkeys_close_database_title">Adatbázis bezárása</string>
+    <string name="passkeys_close_database_summary">Adatbázis bezárása a hozzáférési kulcs kiválasztása után</string>
+    <string name="passkeys_privileged_apps_title">Emelt jogosultságú alkalmazások</string>
+    <string name="passkeys_privileged_apps_summary">A böngészők kezelése az emelt jogosultságú alkalmazások egyéni listájában</string>
+    <string name="passkeys_privileged_apps_explanation">FIGYELEM: Az emelt jogosultságú alkalmazás kapuként szolgál a hitelesítés eredetének lekéréséhez. Biztonsági okokból győződjön meg annak jogszerűségéről.</string>
+    <string name="passkeys_privileged_apps_ask_title">Az alkalmazás nem ismerhető fel</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s megkísérli végrehajtani a hozzáférési kulcsműveletet.\n\nHozzáadja az emelt jogosultságú alkalmazások listájához?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Aláírás hiányzik</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">FIGYELEM: A hozzáférési kulcsot egy másik kliens hozta létre, vagy az aláírás törölve lett. A biztonsági problémák elkerülése érdekében győződjön meg arról, hogy az azonosítani kívánt alkalmazás ugyanahhoz a szolgáltatáshoz tartozik, és jogszerű.\nHa az alkalmazás egy böngésző, ne adja hozzá az aláírását a bejegyzéshez, hanem a beállítások emelt jogosultságú alkalmazások listájához.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s nem ismerhető fel, és hitelesíteni próbál egy meglévő hozzáférési kulccsal.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Alkalmazás-aláírás hozzáadása a hozzáférési kulcs bejegyzéséhez?</string>
+    <string name="passkeys_auto_select_title">Automatikus kiválasztás</string>
+    <string name="passkeys_auto_select_summary">Automatikus kiválasztás, ha csak egy bejegyzés szerepel, és az adatbázis nyitva van, csak akkor, ha a kérő alkalmazás kompatibilis</string>
+    <string name="passkeys_backup_eligibility_title">Biztonsági mentéshez való jogosultság</string>
+    <string name="passkeys_backup_eligibility_summary">A biztonsági mentés létrehozáskor határozza meg, hogy a nyilvános kulcs hitelesítési adatforrása jogosult-e visszaállítani a biztonsági mentést</string>
+    <string name="passkeys_backup_state_title">Biztonsági mentés állapota</string>
+    <string name="passkeys_backup_state_summary">Jelzi, hogy a hitelesítési adatokról biztonsági másolat lett létrehozva, és azok egyetlen eszköz elvesztése esetén is védve vannak</string>
+    <string name="credential_provider_service_subtitle">Biztonsági kulcsok, automatikus kitöltés hitelesítési adat szolgáltató</string>
+    <string name="passkey">Hozzáférési kulcs</string>
+    <string name="passkey_service_name">KeePassDX hitelesítési adatok szolgáltató</string>
+    <string name="passkey_creation_description">Hozzáférési kulcs mentése új bejegyzésben</string>
+    <string name="passkey_update_description">Hozzáférési kulcs frissítése a(z) %1$s fájlban</string>
+    <string name="passkey_selection_username">Nem található hozzáférési kulcs</string>
+    <string name="passkey_selection_description">Válasszon egy meglévő hozzáférési kulcsot</string>
+    <string name="passkey_database_username">KeePassDX adatbázis</string>
+    <string name="passkey_locked_database_description">Válassza a feloldáshoz</string>
+    <string name="passkey_username">Hozzáférési kulcs felhasználóneve</string>
+    <string name="passkey_private_key">Hozzáférési kulcs privát kulcsa</string>
+    <string name="passkey_credential_id">Hozzáférési kulcs hitelesítési azonosítója</string>
+    <string name="passkey_user_handle">Hozzáférési kulcs felhasználói kezelője</string>
+    <string name="passkey_relying_party">Hozzáférési kulcs megbízható fele</string>
+    <string name="passkey_backup_eligibility">Hozzáférési kulcs mentésének jogosultsága</string>
+    <string name="passkey_backup_state">Hozzáférési kulcs mentésének állapota</string>
+    <string name="error_passkey_result">A hozzáférési kulcs visszaadása nem lehetséges</string>
 </resources>

app/src/main/res/values-in/strings.xml

@@ -659,7 +659,7 @@
     <string name="education_validate_entry_summary">Ingat untuk memvalidasi entri Anda dan simpan basis data Anda.
 \n
 \nJika penguncian otomatis diaktifkan dan Anda lupa bahwa Anda sedang membuat perubahan, Anda berisiko kehilangan data Anda.</string>
-    <string name="menu_appearance_settings_summary">Tema, warna, atribut</string>
+    <string name="menu_appearance_settings_summary">Tema, warna, ikon, fon, atribut</string>
     <string name="unlock">Buka kunci</string>
     <string name="education_validate_entry_title">Validasi entri</string>
     <string name="style_name_moon">Bulan</string>

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

@@ -180,7 +180,7 @@
     <string name="autofill">Autocompletamento</string>
     <string name="autofill_sign_in_prompt">Accedi con KeePassDX</string>
     <string name="set_credential_provider_service_title">Servizio predefinito di autocompletamento</string>
-    <string name="autofill_explanation_summary">Attiva l\'autocompletamento per riempire velocemente i campi in altre app</string>
+    <string name="autofill_explanation_summary">Configura l\'autocompletamento per riempire velocemente i campi in altre app</string>
     <string name="password_size_title">Dimensione password generata</string>
     <string name="password_size_summary">Imposta la dimensione predefinita delle password generate</string>
     <string name="list_password_generator_options_title">Caratteri password</string>
@@ -304,7 +304,7 @@
     <string name="selection_mode">Modalità selezione</string>
     <string name="do_not_kill_app">Non terminare l\'app…</string>
     <string name="lock_database_back_root_title">Premere \'\'Indietro\'\' per bloccare</string>
-    <string name="lock_database_back_root_summary">Blocca il database quando l\'utente preme il pulsante Indietro nella schermata principale</string>
+    <string name="lock_database_back_root_summary">Premi \'Indietro\' per bloccare il database se sei nella schermata principale del database</string>
     <string name="clear_clipboard_notification_title">Pulisci alla chiusura</string>
     <string name="clear_clipboard_notification_summary">Blocca il database quando scade la durata degli appunti o la notifica viene chiusa dopo che inizi ad usarlo</string>
     <string name="recycle_bin">Cestino</string>
@@ -522,7 +522,7 @@
     <string name="warning_database_info_changed_options">Unisci i dati, sovrascrivi le modifiche esterne salvando il database o ricaricalo con le ultime modifiche.</string>
     <string name="warning_database_info_changed">I dati nel tuo database sono stati modificati al di fuori di questa app.</string>
     <string name="menu_reload_database">Ricarica dati</string>
-    <string name="error_otp_type">Il tipo di OTP esistente non è riconosciuto da questo modulo, la sua convalida potrebbe non generare più correttamente il token.</string>
+    <string name="error_otp_type">Il tipo di OTP esistente non è riconosciuto da questo modulo e la sua convalida potrebbe non generare più il token correttamente.</string>
     <string name="download_canceled">Annullato!</string>
     <string name="unit_gibibyte">GiB</string>
     <string name="unit_mebibyte">MiB</string>
@@ -678,7 +678,7 @@
     <string name="ask">Chiedi</string>
     <string name="configure">Configura</string>
     <string name="unlock_and_link_biometric">Collegamento sblocco con dispositivo</string>
-    <string name="menu_appearance_settings_summary">Temi, colori, attributi</string>
+    <string name="menu_appearance_settings_summary">Temi, colori, icone, caratteri, attributi</string>
     <string name="unlock">Sblocca</string>
     <string name="education_validate_entry_title">Conferma la voce</string>
     <string name="education_validate_entry_summary">Ricordati di confermare la voce e salvare il tuo database.
@@ -707,4 +707,45 @@
     <string name="recursive_number_entries_summary">Calcola in modo ricorsivo il numero di voci in un gruppo</string>
     <string name="hide_templates_summary">I template non vengono mostrati</string>
     <string name="error_otp_secret_length">La chiave segreta deve essere lunga almeno %1$d caratteri.</string>
+    <string name="entry_application_id">ID app</string>
+    <string name="warning_overwrite_data_title">Sovrascrivere i dati esistenti?</string>
+    <string name="warning_overwrite_data_description">Questa azione sostituirà i dati esistenti nella voce, puoi recuperare i vecchi dati se la cronologia è attiva.</string>
+    <string name="credential_provider">Fornitore di credenziali</string>
+    <string name="passkeys">Passkey</string>
+    <string name="passkeys_explanation_summary">Configura una passkey per un accesso veloce e sicuro senza password</string>
+    <string name="passkeys_preference_title">Impostazioni passkey</string>
+    <string name="passkeys_close_database_title">Chiudi database</string>
+    <string name="passkeys_close_database_summary">Chiudi il database dopo la selezione di una passkey</string>
+    <string name="passkeys_privileged_apps_title">App privilegiate</string>
+    <string name="passkeys_privileged_apps_summary">Gestisci i browser nell\'elenco personalizzato di app privilegiate</string>
+    <string name="passkeys_privileged_apps_explanation">ATTENZIONE: Un\'app privilegiata funge da gateway per recuperare l\'origine di un\'autenticazione. Assicurati della sua legittimità per evitare problemi di sicurezza.</string>
+    <string name="passkeys_privileged_apps_ask_title">App non riconosciuta</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s tentativi di eseguire un\'azione passkey.\n\nAggiungerla alla lista delle app privilegiate?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Firma mancante</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">ATTENZIONE: la passkey è stata creata da un altro client o la firma è stata eliminata. Assicurati che l\'app che vuoi autenticare sia parte dello stesso servizio e che sia legittima per evitare problemi di sicurezza.\nSe l\'app è un browser, non aggiungere la sua firma alla voce, ma all\'elenco delle app privilegiate nelle impostazioni.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s non è riconosciuto e tenta di autenticarsi con un passkey esistente.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Aggiungere la firma dell\'app alla voce della passkey?</string>
+    <string name="passkeys_auto_select_title">Selezione automatica</string>
+    <string name="passkeys_auto_select_summary">Selezionare automaticamente se una sola voce e il database è aperto, solo se l\'app richiesta è compatibile</string>
+    <string name="passkeys_backup_eligibility_title">Ammissibilità del backup</string>
+    <string name="passkeys_backup_eligibility_summary">Determina al momento della creazione se l\'origine delle credenziali della chiave pubblica sia consentita per il backup</string>
+    <string name="passkeys_backup_state_title">Stato del backup</string>
+    <string name="passkeys_backup_state_summary">Indica che le credenziali sono dietro backup e protette contro la perdita di un singolo dispositivo</string>
+    <string name="credential_provider_service_subtitle">Passkey, fornitore di autocompletamento credenziali</string>
+    <string name="passkey">Passkey</string>
+    <string name="passkey_service_name">Fornitore di credenziali KeePassDX</string>
+    <string name="passkey_creation_description">Salva la passkey in una nuova voce</string>
+    <string name="passkey_update_description">Aggiorna la passkey in %1$s</string>
+    <string name="passkey_selection_username">Nessuna passkey trovata</string>
+    <string name="passkey_selection_description">Seleziona una passkey esistente</string>
+    <string name="passkey_database_username">Database di KeePassDX</string>
+    <string name="passkey_locked_database_description">Seleziona per sbloccare</string>
+    <string name="passkey_username">Nome utente passkey</string>
+    <string name="passkey_private_key">Chiave privata passkey</string>
+    <string name="passkey_credential_id">ID credenziali passkey</string>
+    <string name="passkey_user_handle">Handle utente passkey</string>
+    <string name="passkey_relying_party">Parte affidabile passkey</string>
+    <string name="passkey_backup_eligibility">Ammissibilità backup passkey</string>
+    <string name="passkey_backup_state">Stato backup passkey</string>
+    <string name="error_passkey_result">Impossibile ritornare la passkey</string>
 </resources>

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

@@ -273,7 +273,7 @@
     <string name="general">全般</string>
     <string name="autofill">自動入力</string>
     <string name="autofill_sign_in_prompt">KeePassDX でログイン</string>
-    <string name="autofill_explanation_summary">自動入力を有効にして、他のアプリ内のフォームにすばやく入力します</string>
+    <string name="autofill_explanation_summary">自動入力を設定し、他のアプリ内のフォームにすばやく入力します</string>
     <string name="set_credential_provider_service_title">デフォルトの自動入力サービスに設定</string>
     <string name="autofill_preference_title">自動入力の設定</string>
     <string name="password_size_title">生成されるパスワードの長さ</string>
@@ -290,7 +290,7 @@
     <string name="lock_database_screen_off_title">画面ロック</string>
     <string name="lock_database_screen_off_summary">画面がオフになった数秒後に、データベースをロックします</string>
     <string name="lock_database_back_root_title">[戻る] を押してロック</string>
-    <string name="lock_database_back_root_summary">ユーザーがルート画面上で戻るボタンをタップしたとき、データベースをロックします</string>
+    <string name="lock_database_back_root_summary">データベースのルート画面にいる場合、‘戻る‘ を押してデータベースをロックしてください</string>
     <string name="lock_database_show_button_title">ロックボタンを表示</string>
     <string name="lock_database_show_button_summary">ユーザー インターフェースにロックボタンを表示します</string>
     <string name="device_unlock">デバイスのロック解除</string>
@@ -671,8 +671,8 @@
     <string name="ask">権限を要求する</string>
     <string name="merge_success">マージが正常に完了しました</string>
     <string name="configure">設定する</string>
-    <string name="menu_appearance_settings_summary">テーマ、色、属性</string>
-    <string name="unlock">ロックを解除します</string>
+    <string name="menu_appearance_settings_summary">テーマ、色、アイコン、フォント、属性</string>
+    <string name="unlock">ロックを解除</string>
     <string name="style_name_moon">ムーン</string>
     <string name="style_name_dark">ダーク</string>
     <string name="style_name_light">ライト</string>
@@ -695,4 +695,45 @@
     <string name="hide_templates_title">テンプレートを非表示にする</string>
     <string name="hide_templates_summary">テンプレートは表示されません</string>
     <string name="error_otp_secret_length">秘密鍵は少なくとも %1$d 文字以上でないといけません。</string>
+    <string name="entry_application_id">アプリID</string>
+    <string name="warning_overwrite_data_title">既存データを上書きしますか？</string>
+    <string name="warning_overwrite_data_description">この操作でエントリの既存データが上書きされ、履歴機能が有効ならば古いデータから復元できます。</string>
+    <string name="credential_provider">認証プロバイダ</string>
+    <string name="passkeys">パスキー</string>
+    <string name="passkeys_explanation_summary">パスキーを設定し、迅速・安全なパスワード不要ログインを実現</string>
+    <string name="passkeys_preference_title">パスキーの設定</string>
+    <string name="passkeys_close_database_title">データベースを選択</string>
+    <string name="passkeys_close_database_summary">パスキー選択後にデータベースを閉じる</string>
+    <string name="passkeys_privileged_apps_title">特権アプリ</string>
+    <string name="passkeys_privileged_apps_summary">特権アプリのカスタム一覧でブラウザを管理</string>
+    <string name="passkeys_privileged_apps_explanation">警告: 特権アプリは認証起源を取得するためのゲートウェイとして機能します。セキュリティ上の問題回避の為に正当性を確認下さい。</string>
+    <string name="passkeys_privileged_apps_ask_title">アプリが認識されません</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s がパスキー操作を行おうとしています。\n\n特権アプリ一覧に追加しますか？</string>
+    <string name="passkeys_missing_signature_app_ask_title">署名がありません</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">警告: パスキーは別なクライアントから作成されたか署名が削除されています。セキュリティ上の問題を避ける為に認証対象のアプリが同一サービスに属した正しいものかを確認してください。\nアプリがブラウザなら、当該署名をエントリへ追加せずに、設定内の特権アプリ一覧へ追加してください。</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s は認識されなかったので既存パスキーでの認証を試みます。</string>
+    <string name="passkeys_missing_signature_app_ask_question">アプリ署名をパスキーエントリへ追加しますか？</string>
+    <string name="passkeys_auto_select_title">自動選択</string>
+    <string name="passkeys_auto_select_summary">データベースが開いていて要求元アプリに互換性がある場合に限り、エントリを１つだけ自動選択します</string>
+    <string name="passkeys_backup_eligibility_title">バックアップ資格</string>
+    <string name="passkeys_backup_eligibility_summary">作成時に公開鍵認証情報ソースのバックアップが許可されているか判定する</string>
+    <string name="passkeys_backup_state_title">バックアップの状態</string>
+    <string name="passkeys_backup_state_summary">認証情報がバックアップされ単一デバイスの紛失から保護されている事を示します</string>
+    <string name="credential_provider_service_subtitle">パスキー、自動入力認証情報プロバイダー</string>
+    <string name="passkey">パスキー</string>
+    <string name="passkey_service_name">KeePassDX 認証情報プロバイダー</string>
+    <string name="passkey_creation_description">新しいエントリにパスキーを保存</string>
+    <string name="passkey_update_description">%1$s のパスキーを更新</string>
+    <string name="passkey_selection_username">パスキーが見つかりません</string>
+    <string name="passkey_selection_description">既存のパスキーを選択</string>
+    <string name="passkey_database_username">KeePassDX データベース</string>
+    <string name="passkey_locked_database_description">選択してロックを解除</string>
+    <string name="passkey_username">パスキーのユーザー名</string>
+    <string name="passkey_private_key">パスキーのプライベートキー</string>
+    <string name="passkey_credential_id">パスキーの認証ID</string>
+    <string name="passkey_user_handle">パスキーのユーザーハンドル</string>
+    <string name="passkey_relying_party">パスキーの信頼者</string>
+    <string name="passkey_backup_eligibility">パスキーのバックアップ資格</string>
+    <string name="passkey_backup_state">パスキーのバックアップ状態</string>
+    <string name="error_passkey_result">パスキーを復元できません</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -19,7 +19,7 @@
 --><resources>
     <string name="feedback">피드백</string>
     <string name="homepage">홈페이지</string>
-    <string name="about_description">KeePass 암호 관리자의 Android 구현본</string>
+    <string name="about_description">KeePass 암호 관리자의 Android 구현체.</string>
     <string name="accept">확인</string>
     <string name="add_entry">항목 추가</string>
     <string name="edit_entry">항목 수정</string>
@@ -40,14 +40,13 @@
     <string name="clipboard_error_clear">클립보드를 비울 수 없음</string>
     <string name="clipboard_timeout">클립보드 시간 초과</string>
     <string name="clipboard_timeout_summary">클립보드 저장이 유지될 시간 (장치가 지원한다면)</string>
-    <string name="select_to_copy">%1$s 을(를) 클립보드에 복사하려면 선택하십시오.</string>
+    <string name="select_to_copy">%1$s 을(를) 클립보드에 복사하기</string>
     <string name="retrieving_db_key">데이터베이스 키를 검색하는 중…</string>
     <string name="database">데이터베이스</string>
     <string name="decrypting_db">데이터베이스 컨텐츠 암호 해독 중…</string>
     <string name="default_checkbox">기본 데이터베이스로 사용</string>
     <string name="digits">단위</string>
-    <string name="html_about_licence">KeePassDX © %1$d Kunzisoft는 보증이 적용되지 않습니다; 이것은 자유 소프트웨어이며, 광고가 없습니다.
-\n이 것은 보증 없이 있는 그대로, GPL 버전 3하에 제공됩니다.</string>
+    <string name="html_about_licence">KeePassDX © %1$d Kunzisoft는 보증이 적용되지 않습니다; 이것은 &lt;strong&gt;자유 소프트웨어&lt;/strong&gt;이며, &lt;strong&gt;광고가 없습니다&lt;/strong&gt;. \n이 것은 보증 없이 있는 그대로, &lt;strong&gt;GPL 버전 3&lt;/strong&gt; 라이선스로 제공됩니다.</string>
     <string name="entry_accessed">접근됨</string>
     <string name="entry_cancel">취소</string>
     <string name="entry_notes">노트</string>
@@ -81,22 +80,22 @@
     <string name="field_name">필드 이름</string>
     <string name="field_value">필드 값</string>
     <string name="file_not_found_content">파일을 찾을 수 없습니다. 파일 탐색기에서 열리는지 확인해 주세요.</string>
-    <string name="file_browser">파일 탐색기</string>
+    <string name="file_browser">파일 관리자</string>
     <string name="generate_password">비밀번호 생성</string>
-    <string name="hint_conf_pass">비밀번호 확인</string>
-    <string name="hint_generated_password">생성된 비밀번호</string>
+    <string name="hint_conf_pass">패스워드 확인</string>
+    <string name="hint_generated_password">생성된 패스워드</string>
     <string name="hint_group_name">그룹 이름</string>
     <string name="hint_keyfile">키 파일</string>
     <string name="hint_length">길이</string>
-    <string name="hint_pass">비밀번호</string>
+    <string name="hint_pass">패스워드</string>
     <string name="password">비밀번호</string>
-    <string name="invalid_credentials">비밀번호나 키 파일을 읽을 수 없습니다.</string>
+    <string name="invalid_credentials">패스워드나 키 파일을 읽을 수 없습니다.</string>
     <string name="invalid_algorithm">잘못된 알고리즘입니다.</string>
     <string name="invalid_db_sig">데이터베이스 형식을 인식할 수 없습니다.</string>
     <string name="keyfile_is_empty">이 키 파일은 비어 있습니다.</string>
     <string name="length">길이</string>
     <string name="list_entries_show_username_title">아이디 보이기</string>
-    <string name="list_entries_show_username_summary">엔트리 목록에 아이디 보이기</string>
+    <string name="list_entries_show_username_summary">항목 리스트에 사용자 이름을 표시합니다</string>
     <string name="list_size_title">리스트 항목 크기</string>
     <string name="list_size_summary">요소 목록 텍스트 크기</string>
     <string name="loading_database">데이터베이스 로딩 중…</string>
@@ -105,7 +104,7 @@
     <string name="hide_password_summary">기본 비밀번호를 (***) 로 가리기</string>
     <string name="about">정보</string>
     <string name="menu_change_key_settings">마스터 키 바꾸기</string>
-    <string name="copy_field">%1$s 복사됨</string>
+    <string name="copy_field">%1$s의 사본</string>
     <string name="settings">설정</string>
     <string name="menu_app_settings">앱 설정</string>
     <string name="menu_form_filling_settings">폼 채우기</string>
@@ -129,8 +128,8 @@
     <string name="never">절대 하지 않음</string>
     <string name="no_results">검색 결과가 없음</string>
     <string name="no_url_handler">이 URL을 열기 위해 웹 브라우저를 설치하십시오.</string>
-    <string name="select_database_file">가지고 있는 데이터베이스 열기</string>
-    <string name="create_keepass_file">새 데이터베이스 생성</string>
+    <string name="select_database_file">기존 저장소 열기</string>
+    <string name="create_keepass_file">새 저장소 생성</string>
     <string name="progress_create">새 데이터베이스 생성 중…</string>
     <string name="progress_title">작업 중…</string>
     <string name="protection">보호</string>
@@ -138,7 +137,7 @@
     <string name="read_only_warning">KeePassDX는 데이터베이스를 수정하기 위해 쓰기 권한이 필요합니다.</string>
     <string name="content_description_remove_from_list">삭제</string>
     <string name="root">루트</string>
-    <string name="encryption_explanation">데이터베이스 암호화 알고리즘이 모든 데이터에 적용됩니다.</string>
+    <string name="encryption_explanation">데이터베이스 암호화 알고리즘이 모든 데이터에 적용됩니다</string>
     <string name="memory_usage">메모리 사용량</string>
     <string name="memory_usage_explanation">바이너리 바이트 단위의 메모리 용량이 키 파생 기능에 사용됩니다.</string>
     <string name="saving_database">데이터베이스 저장 중…</string>
@@ -250,10 +249,10 @@
     <string name="error_field_name_already_exists">그 필드 이름은 이미 존재합니다.</string>
     <string name="inherited">상속</string>
     <string name="auto_type">자동입력</string>
-    <string name="warning_database_already_opened">데이터베이스가 이미 열려있습니다. 새 것을 열려면 지금 것을 먼저 닫아주세요.</string>
+    <string name="warning_database_already_opened">데이터베이스가 이미 열려있습니다. 새 것을 열려면 지금 것을 먼저 닫아주세요</string>
     <string name="hide_broken_locations_summary">최근 데이터베이스 목록에서 파손된 링크를 감춤</string>
-    <string name="import_app_properties_summary">앱 속성을 내보낼 파일을 선택</string>
-    <string name="success_import_app_properties">앱 속성을 가져왔습니다.</string>
+    <string name="import_app_properties_summary">가져올 앱 설정 파일 선택</string>
+    <string name="success_import_app_properties">앱 설정 가져옴</string>
     <string name="kdf_explanation">암호화 알고리즘 용 키를 생성하기 위해, 마스터키는 임의의 솔트(salt) 키 파생 함수를 사용하여 변환됩니다.</string>
     <string name="warning">경고</string>
     <string name="error_challenge_already_requested">이미 요청된 시도입니다.</string>
@@ -262,14 +261,14 @@
     <string name="error_response_already_provided">이미 응답했습니다.</string>
     <string name="error_location_unknown">데이터 베이스 위치를 알 수 없어 데이터 베이스 액션을 수행할 수 없습니다.</string>
     <string name="error_driver_required">%1$s 를 위한 드라이버가 요구됩니다.</string>
-    <string name="error_unable_merge_database_kdb">데이터베이스 V1로부터 병합할 수 없습니다.</string>
+    <string name="error_unable_merge_database_kdb">kdb 데이터베이스 파일과 병합할 수 없습니다.</string>
     <string name="error_hardware_key_unsupported">하드웨어 키는 지원하지 않습니다.</string>
     <string name="error_empty_key">키는 반드시 입력해야 합니다.</string>
     <string name="hint_icon_name">아이콘명</string>
     <string name="passphrase">암호문</string>
     <string name="colorize_password_title">비밀번호에 색상 부여</string>
     <string name="colorize_password_summary">타입에 따라 비밀번호 문자에 색상을 부여</string>
-    <string name="export_app_properties_title">앱 속성을 내보내기</string>
+    <string name="export_app_properties_title">앱 설정 내보내기</string>
     <string name="uppercase">대문자</string>
     <string name="menu_security_settings">보안 설정</string>
     <string name="menu_reload_database">데이터 다시 읽기</string>
@@ -280,7 +279,7 @@
     <string name="save_mode">저장 모드</string>
     <string name="selection_mode">선택 모드</string>
     <string name="remember_hardware_key_title">하드웨어 키를 기억</string>
-    <string name="export_app_properties_summary">앱 속성을 내보낼 파일을 생성</string>
+    <string name="export_app_properties_summary">앱 설정을 내보내기 위해 파일 생성</string>
     <string name="error_import_app_properties">앱 속성을 가져오던 중 오류 발생.</string>
     <string name="contains_duplicate_uuid">데이터베이스가 중복된 UUID를 포함하고 있습니다.</string>
     <string name="remember_database_locations_summary">데이터 베이스가 저장된 곳을 추적</string>
@@ -311,7 +310,7 @@
     <string name="menu_restore_entry_history">이력을 복구</string>
     <string name="subdomain_search_summary">보조 도메인 제한하에 웹 도메인을 검색</string>
     <string name="contains_duplicate_uuid_procedure">중복에 대해 새로운 UUID를 생성하여 문제를 해결하고 진행할까요\?</string>
-    <string name="success_export_app_properties">앱 속성을 내보냈습니다.</string>
+    <string name="success_export_app_properties">앱 설정 내보냄</string>
     <string name="parallelism">병렬 처리</string>
     <string name="command_execution">명령 실행중…</string>
     <string name="menu_master_key_settings">마스터 키 설정</string>
@@ -321,14 +320,14 @@
     <string name="menu_device_unlock_settings">고급 잠금 해제</string>
     <string name="search_mode">검색 모드</string>
     <string name="rounds_explanation">추가적인 암호화 차수를 설정함으로써 무차별 대입 공격(brute force attack)에 대한 방어를 강화할 수 있습니다. 대신 읽기/저장시 느려질 수 있습니다.</string>
-    <string name="do_not_kill_app">앱을 강제 종료하지 마세요.</string>
+    <string name="do_not_kill_app">앱을 강제 종료하지 마세요…</string>
     <string name="sort_recycle_bin_bottom">휴지통을 바닥에</string>
-    <string name="warning_database_link_revoked">파일에 대한 접근이 파일 관리자에 의해 철회되었습니다.</string>
+    <string name="warning_database_link_revoked">파일에 대한 접근이 파일 관리자에 의해 철회되었습니다</string>
     <string name="hide_broken_locations_title">파손된 데이터페이스 링크를 감춤</string>
-    <string name="import_app_properties_title">앱 속성을 가져오기</string>
+    <string name="import_app_properties_title">앱 설정 가져오기</string>
     <string name="error_export_app_properties">앱 속성을 내보내던 중 오류 발생.</string>
     <string name="rounds">변환 차수</string>
-    <string name="parallelism_explanation">키 파생 함수에 사용되는 병렬 처리 수준 (즉, 스레드의 갯수)</string>
+    <string name="parallelism_explanation">키 파생 함수에 사용되는 병렬 처리 수준(즉, 스레드의 갯수).</string>
     <string name="html_about_privacy">&lt;strong&gt;사용자 데이터를 받아오지 않습니다.&lt;/strong&gt; 어떤 서버에도 연결하지 않고 로컬로만 동작하며 사용자의 사생활(프라이버시)를 최우선시합니다.</string>
     <string name="error_rebuild_list">목록 재구축을 알맞게 할 수 없습니다.</string>
     <string name="error_file_to_big">업로드하려는 파일이 너무 큽니다.</string>
@@ -339,50 +338,50 @@
     <string name="show_otp_token_summary">항목 목록에서 OTP 토큰을 표시</string>
     <string name="show_uuid_title">UUID를 표시</string>
     <string name="show_uuid_summary">항목이나 그룹에 연결된 UUID를 표시</string>
-    <string name="creating_database">데이터 베이스를 생성</string>
+    <string name="creating_database">데이터베이스 생성중…</string>
     <string name="menu_merge_database">데이터 병합</string>
-    <string name="menu_merge_from">... 로부터 병합</string>
-    <string name="menu_save_copy_to">... 에 복사본 저장</string>
-    <string name="menu_keystore_remove_key">고급 잠금 해제 키를 삭제</string>
+    <string name="menu_merge_from">…로부터 병합</string>
+    <string name="menu_save_copy_to">…에 복사본 저장</string>
+    <string name="menu_keystore_remove_key">디바이스 잠금 해제 키 삭제</string>
     <string name="sort_last_access_time">접근</string>
     <string name="invalid_db_same_uuid">%1$s 와 동일한 UUID %2$s 가 이미 존재합니다.</string>
     <string name="underline">밑줄</string>
     <string name="unsupported_db_version">지원하지 않는 데이터베이스 버전입니다.</string>
-    <string name="permission">허용</string>
+    <string name="permission">권한</string>
     <string name="menu_appearance_settings">테마</string>
     <string name="biometric">생체 인증</string>
     <string name="device_credential">기기 자격 증명</string>
     <string name="generate_keyfile">키 파일 생성하기</string>
     <string name="menu_form_filling_settings_summary">키보드, 자동 완성, 클립보드</string>
     <string name="menu_app_settings_summary">검색, 잠금, 기록, 속성</string>
-    <string name="merge_success">병합을 성공했습니다</string>
+    <string name="merge_success">병합이 성공적으로 완료되었습니다</string>
     <string name="version_label">버전 %1$s</string>
     <string name="encrypted_value_stored">암호화된 비밀번호가 저장되었습니다</string>
     <string name="info">정보</string>
     <string name="build_label">빌드 %1$s</string>
     <string name="configure_biometric">생체 인식 또는 장치 자격 증명이 등록되지 않았습니다.</string>
     <string name="properties">속성</string>
-    <string name="menu_appearance_settings_summary">테마, 색상, 속성</string>
+    <string name="menu_appearance_settings_summary">테마, 색상, 아이콘, 글꼴, 속성</string>
     <string name="autofill">자동 입력</string>
-    <string name="credential_before_click_device_unlock_button">비밀번호 입력 후 이 버튼을 눌러주세요</string>
-    <string name="unavailable">사용할 수 없습니다</string>
-    <string name="database_history">기록</string>
+    <string name="credential_before_click_device_unlock_button">비밀번호 입력 후 이 버튼을 눌러주세요.</string>
+    <string name="unavailable">사용 불가</string>
+    <string name="database_history">이력</string>
     <string name="type">유형</string>
     <string name="configure">설정</string>
     <string name="biometric_security_update_required">등록된 생체정보를 업데이트해 주세요.</string>
-    <string name="autofill_select_entry">항목을 선택하세요</string>
+    <string name="autofill_select_entry">항목 선택…</string>
     <string name="clipboard">클립보드</string>
     <string name="clipboard_notifications_title">클립보드 알림</string>
-    <string name="lock_database_screen_off_summary">화면이 꺼지면 몇 초 후에 데이터베이스를 잠급니다.</string>
+    <string name="lock_database_screen_off_summary">화면이 꺼지면 몇 초 후에 데이터베이스를 잠급니다</string>
     <string name="lock_database_back_root_title">\'­뒤로가기\'를 눌러 잠금</string>
     <string name="unavailable_feature_text">이 기능을 사용할 수 없습니다.</string>
     <string name="lock_database_show_button_summary">UI에 잠금버튼을 표시합니다</string>
-    <string name="lock_database_back_root_summary">사용자가 뒤로 가기 버튼을 누르면 데이터베이스를 잠급니다</string>
+    <string name="lock_database_back_root_summary">데이터베이스 루트 화면에 있는 경우 \'뒤로\' 버튼을 눌러 데이터베이스를 잠그십시오</string>
     <string name="lock_database_show_button_title">잠금 버튼 표시</string>
     <string name="unlock">잠금 해제</string>
     <string name="lock">잠금</string>
     <string name="autofill_sign_in_prompt">KeePassDX로 로그인</string>
-    <string name="password_size_title">생성된 비밀번호 크기</string>
+    <string name="password_size_title">생성된 패스워드 길이</string>
     <string name="autofill_preference_title">자동 완성 설정</string>
     <string name="set_credential_provider_service_title">기본 자동완성 서비스 설정</string>
     <string name="lock_database_screen_off_title">화면 꺼짐 시 잠금</string>

app/src/main/res/values-mr/strings.xml

@@ -6,7 +6,12 @@
     <string name="contact">संपर्क</string>
     <string name="accept">स्वीकार करा</string>
     <string name="about_description">किपास सांकेतांक व्यवस्थापनाचे अँड्रॉइड अंतर्भूतीकरण</string>
-    <string name="master_key">राणी चावी</string>
+    <string name="master_key">मास्टर की</string>
     <string name="add_group">गट जोडा</string>
     <string name="security">सुरक्षा</string>
+    <string name="info">माहिती</string>
+    <string name="add_entry">नोंद जोडा</string>
+    <string name="edit_entry">नोंद संपादित करा</string>
+    <string name="encryption">एन्क्रिप्शन</string>
+    <string name="encryption_algorithm">एन्क्रिप्शन अल्गोरिदम</string>
 </resources>

app/src/main/res/values-nb/strings.xml

@@ -90,7 +90,7 @@
     <string name="hint_length">Lengde</string>
     <string name="hint_pass">Passord</string>
     <string name="password">Passord</string>
-    <string name="invalid_credentials">Kunne ikke lese autentiseringsopplysningene.</string>
+    <string name="invalid_credentials">Kunne ikke lese påloggingsdata.</string>
     <string name="invalid_algorithm">Ugyldig algoritme.</string>
     <string name="invalid_db_sig">Fremmed databaseformat.</string>
     <string name="keyfile_is_empty">Nøkkelfilen er tom.</string>
@@ -175,7 +175,7 @@
     <string name="autofill">Autofyll</string>
     <string name="autofill_sign_in_prompt">Logg inn med KeePassDX</string>
     <string name="set_credential_provider_service_title">Sett forvalgt autofyll-tjeneste</string>
-    <string name="autofill_explanation_summary">Skru på tjenesten for å fylle ut skjema fra andre programmer</string>
+    <string name="autofill_explanation_summary">Konfigurer tjenesten for å fylle ut skjema fra andre programmer</string>
     <string name="password_size_title">Passordsstørrelse</string>
     <string name="password_size_summary">Sett forvalgt størrelse for generert passord</string>
     <string name="list_password_generator_options_title">Passordtegn</string>
@@ -216,7 +216,7 @@
     <string name="magic_keyboard_title">Magikeyboard</string>
     <string name="magic_keyboard_explanation_summary">Aktiver et egendefinert tastatur som fyller inn passordene og alle identitetsfelter</string>
     <string name="allow_no_password_title">Tillat ingen hovednøkkel</string>
-    <string name="allow_no_password_summary">Tillater å trykke på \"Åpne\"-knappen hvis ingen legitimasjon er valgt</string>
+    <string name="allow_no_password_summary">Tillater å trykke på «Åpne»-knappen hvis ingen opplysninger er valgt</string>
     <string name="enable_education_screens_title">Lærerike tips</string>
     <string name="enable_education_screens_summary">Fremhev elementer for å finne ut hvordan appen fungerer</string>
     <string name="reset_education_screens_title">Tilbakestill lærerike tips</string>
@@ -291,7 +291,7 @@
     <string name="selection_mode">Valgmodus</string>
     <string name="do_not_kill_app">Ikke drep programmet…</string>
     <string name="lock_database_back_root_title">Trykk «Tilbake» for å låse</string>
-    <string name="lock_database_back_root_summary">Lås databasen når brukeren klikker tilbakeknappen på root-skjermen</string>
+    <string name="lock_database_back_root_summary">Trykk «Tilbake» for å låse databasen hvis du er ved rotskjermen til databasen</string>
     <string name="clear_clipboard_notification_title">Tøm ved lukking</string>
     <string name="clear_clipboard_notification_summary">Lås databasen når utklippstavlens varighet utløper eller varselet lukkes etter at du begynner å bruke den</string>
     <string name="recycle_bin">Papirkurv</string>
@@ -340,7 +340,7 @@
     <string name="content_description_password_checkbox">Passordsavkryssningsboks</string>
     <string name="content_description_keyfile_checkbox">Avkrysningsrute for nøkkelfil</string>
     <string name="biometric">Biometrisk</string>
-    <string name="error_disallow_no_credentials">Minst én identitetsdetalj må angis.</string>
+    <string name="error_disallow_no_credentials">Minst én påloggingsdetalj må angis.</string>
     <string name="error_copy_group_here">Du kan ikke kopiere en gruppe hit.</string>
     <string name="error_otp_secret_key">Hemmelig nøkkel må være i Base32-format.</string>
     <string name="error_otp_digits">Symbolet må inneholde %1$d til %2$d siffer.</string>
@@ -428,7 +428,7 @@
     <string name="autofill_block_restart">Start appen på nytt som inneholder skjemaet for å aktivere blokkeringen.</string>
     <string name="error_save_read_only">Datalagring er ikke tillatt for en database som er skrivebeskyttet.</string>
     <string name="autofill_inline_suggestions_keyboard">Forslag til autofyll er lagt til.</string>
-    <string name="education_device_unlock_summary">Koble passordet ditt til den skannede biometriske eller enhetslegitimasjonen for å raskt låse opp databasen din.</string>
+    <string name="education_device_unlock_summary">Koble passordet ditt til den skannede biometriske eller påloggingsinformasjonen på enheten din for å raskt låse opp databasen din.</string>
     <string name="education_setup_OTP_title">Sett opp OTP</string>
     <string name="download_canceled">Avbrutt!</string>
     <string name="error_string_type">Denne teksten samsvarer ikke med det valgte elementet.</string>
@@ -479,7 +479,7 @@
     <string name="holder">Innehaver</string>
     <string name="content_description_otp_information">Éngangspassordsinfo</string>
     <string name="template_group_name">Maler</string>
-    <string name="content_description_credentials_information">Identitetdetaljsinfo</string>
+    <string name="content_description_credentials_information">Påloggingsinformasjon</string>
     <string name="templates_group_enable_summary">Bruk dynamiske maler for å fylle inn feltene for en oppføring</string>
     <string name="templates">Maler</string>
     <string name="error_word_reserved">Dette ordet er reservert og kan ikke brukes.</string>
@@ -527,11 +527,11 @@
     <string name="device_unlock_prompt_store_credential_message">Du må fortsatt huske hovedlegitimasjonen for hvelvet selv om du bruker enhetens opplåsingsgjenkjenning.</string>
     <string name="device_unlock_not_recognized">Kunne ikke gjenkjenne enhetens oppåsningsmetode</string>
     <string name="credential_before_click_device_unlock_button">Skriv inn passordet, og klikk deretter på denne knappen.</string>
-    <string name="device_credential">Enhets-identitetsdetalj</string>
+    <string name="device_credential">Enhetens påloggingsinformasjon</string>
     <string name="autofill_select_entry">Velg oppføring …</string>
     <string name="temp_device_unlock_enable_title">Midlertidig enhets opplåsing</string>
     <string name="temp_device_unlock_timeout_title">Utløpsdato for opplåsing av enhet</string>
-    <string name="device_credential_unlock_enable_summary">Lar deg bruke din enhets-identitetsdetalj for å åpne databasen</string>
+    <string name="device_credential_unlock_enable_summary">Lar deg bruke påloggingsinformasjonen på enheten din for å åpne databasen</string>
     <string name="temp_device_unlock_timeout_summary">Varigheten av enhetens opplåsingsbruk før innholdet blir slettet</string>
     <string name="device_unlock_explanation_summary">Bruk enhetsopplåsing for å åpne en database enklere</string>
     <string name="device_credential_unlock_enable_title">Opplåsing av enhetslegitimasjon</string>
@@ -539,8 +539,8 @@
     <string name="templates_group_enable_title">Mal-bruk</string>
     <string name="database_data_remove_unlinked_attachments_summary">Fjerner vedlegg som er å finne i databasen, men som ikke er lenket til en oppføring</string>
     <string name="keyboard_save_search_info_summary">Prøv å lagre delt informasjon når du foretar en manuell oppføring for enklere fremtidig bruk</string>
-    <string name="keyboard_previous_database_credentials_title">Skjem for database-identitetsdetaljer</string>
-    <string name="keyboard_previous_database_credentials_summary">Bytt tilbake til forrige tastatur atuomatisk på skjermen for database-identitetsdetaljer</string>
+    <string name="keyboard_previous_database_credentials_title">Skjerm for påloggingsinformasjon til database</string>
+    <string name="keyboard_previous_database_credentials_summary">Bytt tilbake til forrige tastatur automatisk på skjermen for påloggingsinformasjonen til databasen</string>
     <string name="autofill_inline_suggestions_title">Forslag på linjen</string>
     <string name="autofill_inline_suggestions_summary">Prøv å vise autofullføringsforslag direkte fra et kompatibelt tastatur</string>
     <string name="autofill_manual_selection_title">Manuellt utvalg</string>
@@ -562,7 +562,7 @@
     <string name="biometric_auto_open_prompt_summary">Forespør opplasting automatisk hvis databasen er satt opp til å bruke det</string>
     <string name="menu_external_icon">Eksternt ikon</string>
     <string name="subdomain_search_title">Underdomenesøk</string>
-    <string name="error_otp_type">Eksisterende OTP-type gjenkjennes ikke av dette skjemaet og valideringen kan derfor ikke lenger generere tokenet.</string>
+    <string name="error_otp_type">Den eksisterende OTP-typen gjenkjennes ikke av dette skjemaet og valideringen kan derfor ikke lenger generere tokenet.</string>
     <string name="error_start_database_action">En feil inntraff under utføring av en databasehandling.</string>
     <string name="temp_device_unlock_enable_summary">Ikke lagre noe kryptert innhold for å bruke enhets opplåsing</string>
     <string name="subdomain_search_summary">Søk i vev-domener med underdomene-begrensninger</string>
@@ -661,7 +661,7 @@
     <string name="ask">Spør</string>
     <string name="merge_success">Sammenslåingen er fullført</string>
     <string name="configure">Konfigurer</string>
-    <string name="menu_appearance_settings_summary">Drakter, farger, attributter</string>
+    <string name="menu_appearance_settings_summary">Drakter, farger, ikoner, skrifttyper, attributter</string>
     <string name="enable_screenshot_mode_title">Skjermbilde-modus</string>
     <string name="consider_chars_filter">Vurder karakterer</string>
     <string name="entropy_calculate">Entropi: Beregn…</string>
@@ -694,4 +694,45 @@
     <string name="warning_large_keyfile">Det anbefales ikke å legge til en stor nøkkelfil, siden dette kan hindre databasen i å åpnes.</string>
     <string name="hide_templates_title">Skjul maler</string>
     <string name="hide_templates_summary">Maler vises ikke</string>
+    <string name="entry_application_id">App-ID</string>
+    <string name="warning_overwrite_data_title">Overskriv eksisterende data?</string>
+    <string name="warning_overwrite_data_description">Denne handlingen vil erstatte de eksisterende dataene i feltet, og du kan hente frem de gamle i historikken hvis det er skrudd på.</string>
+    <string name="passkeys">Passnøkler</string>
+    <string name="passkeys_explanation_summary">Konfigurer passnøkler for rask og sikker passordløs innlogging</string>
+    <string name="passkeys_preference_title">Passnøkkel-innstillinger</string>
+    <string name="passkeys_close_database_title">Lukk database</string>
+    <string name="passkeys_close_database_summary">Lukk databasen etter å ha valgt en passnøkkel</string>
+    <string name="passkeys_privileged_apps_title">Privilegerte apper</string>
+    <string name="passkeys_privileged_apps_summary">Håndter nettlesere i den brukerdefinerte listen over privilegerte apper</string>
+    <string name="passkeys_privileged_apps_explanation">ADVARSEL: En priveligert app fungerer som mellommann for å hente opphavet til en autentisering. Bekreft at den er legitim for å unngå sikkerhetsproblemer.</string>
+    <string name="passkeys_privileged_apps_ask_title">App kjennes ikke igjen</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s prøver i gjøre noe med en passnøkkel.\n\nLegg den til listen over privilegerte apper?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Mangler signatur</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">ADVARSEL: Denne passnøkkelen ble laget av en annen klient eller så har signaturen blitt slettet. Pass på at appen du vil autentisere er en del av samme tjeneste og er legitim for å unngå sikkerhetsproblemer.\nHvis appen er en nettleser, så ikke legg til dens signatur til feltet, men legg den til som en privilegert app i innstillingene.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s kjennes ikke igjen og prøver å autentisere seg med en eksisterende passnøkkel.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Legg til appsignaturen til passnøkkelen?</string>
+    <string name="passkeys_auto_select_title">Automatisk valg</string>
+    <string name="passkeys_auto_select_summary">Velg automatisk hvis det bare er en oppføring og databasen er åpen, bare hvis appen er kompatibel</string>
+    <string name="passkeys_backup_eligibility_title">Mulighet til å ta sikkerhetskopi</string>
+    <string name="passkeys_backup_eligibility_summary">Sjekk ved opprettelse om den offentlige nøkkelen kan sikkerhetskopieres</string>
+    <string name="passkeys_backup_state_title">Status til sikkerhetskopi</string>
+    <string name="passkeys_backup_state_summary">Indikerer at oppføringen er sikkerhetskopiert og beskyttet mot tap av én enkel enhet</string>
+    <string name="credential_provider_service_subtitle">Passnøkler, fyll inn automatisk leverandør</string>
+    <string name="passkey">Passnøkkel</string>
+    <string name="passkey_creation_description">Lagre passnøkkel i ny oppføring</string>
+    <string name="passkey_update_description">Oppdater passnøkkel i %1$s</string>
+    <string name="passkey_selection_username">Ingen passnøkkel funnet</string>
+    <string name="passkey_selection_description">Velg en eksisterende passnøkkel</string>
+    <string name="passkey_database_username">KeePassDX-database</string>
+    <string name="passkey_locked_database_description">Velg for å låse opp</string>
+    <string name="passkey_username">Passnøkkel-brukernavn</string>
+    <string name="passkey_private_key">Passnøkkel-privatnøkkel</string>
+    <string name="passkey_user_handle">Passnøkkel-brukernavn</string>
+    <string name="error_passkey_result">Kunne ikke returnere passnøkkelen</string>
+    <string name="credential_provider">Påloggingsinformasjons-leverandør</string>
+    <string name="passkey_service_name">Påloggingsleverandør til KeePassDX</string>
+    <string name="passkey_credential_id">Passnøkkel-ID</string>
+    <string name="passkey_relying_party">Passnøkkelens tillitspart</string>
+    <string name="passkey_backup_eligibility">Mulighet for sikkerhetskopiering av passnøkkelen</string>
+    <string name="passkey_backup_state">Tilstand til sikkerhetskopien til passnøkkelen</string>
 </resources>

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

@@ -186,8 +186,8 @@
     <string name="general">Algemeen</string>
     <string name="autofill">Automatisch aanvullen</string>
     <string name="autofill_sign_in_prompt">Inloggen met KeePassDX</string>
-    <string name="set_credential_provider_service_title">Dienst automatisch aanvullen</string>
-    <string name="autofill_explanation_summary">Schakel de dienst in om formulieren in andere apps in te vullen</string>
+    <string name="set_credential_provider_service_title">Dienst Automatisch aanvullen</string>
+    <string name="autofill_explanation_summary">Dienst Automatisch aanvullen configureren om formulieren in andere apps in te vullen</string>
     <string name="password_size_title">Gegenereerde wachtwoordlengte</string>
     <string name="password_size_summary">Stel de standaardlengte van gegenereerde wachtwoorden in</string>
     <string name="list_password_generator_options_title">Wachtwoordtekens</string>
@@ -305,7 +305,7 @@
     <string name="selection_mode">Selectiemodus</string>
     <string name="do_not_kill_app">App niet afsluiten…</string>
     <string name="lock_database_back_root_title">Druk \'Terug\' om te vergrendelen</string>
-    <string name="lock_database_back_root_summary">Vergrendel de database wanneer de gebruiker in het hoofdscherm op de knop Terug klikt</string>
+    <string name="lock_database_back_root_summary">Druk in het hoofdscherm van de database op \'Terug\' om de database te vergrendelen</string>
     <string name="clear_clipboard_notification_title">Wissen bij afsluiten</string>
     <string name="clear_clipboard_notification_summary">Vergrendel de database wanneer het klembord verlopen is of wanneer de melding wordt gesloten nadat u deze hebt gebruikt</string>
     <string name="recycle_bin">Prullenbak</string>
@@ -526,7 +526,7 @@
     <string name="menu_reload_database">Gegevens opnieuw laden</string>
     <string name="error_rebuild_list">Kan de lijst niet correct opnieuw opbouwen.</string>
     <string name="error_database_uri_null">Database-URI kan niet worden opgehaald.</string>
-    <string name="error_otp_type">Het bestaande OTP-type wordt niet herkend door dit formulier, de validatie ervan genereert het token mogelijk niet langer.</string>
+    <string name="error_otp_type">Het bestaande OTP-type wordt niet herkend door dit formulier en de validatie ervan genereert het token mogelijk niet meer correct.</string>
     <string name="icon_section_custom">Aangepast</string>
     <string name="icon_section_standard">Standaard</string>
     <string name="style_brightness_summary">Selecteer lichte of donkere thema\'s</string>
@@ -672,7 +672,7 @@
     <string name="later">Later</string>
     <string name="ask">Vragen</string>
     <string name="configure">Configureren</string>
-    <string name="menu_appearance_settings_summary">Thema\'s, kleuren, attributen</string>
+    <string name="menu_appearance_settings_summary">Thema\'s, kleuren, pictogrammen, lettertypen, attributen</string>
     <string name="menu_app_settings_summary">Zoeken, vergrendelen, geschiedenis, eigenschappen</string>
     <string name="menu_form_filling_settings_summary">Toetsenbord, automatisch aanvullen, klembord</string>
     <string name="info">Informatie</string>
@@ -706,4 +706,45 @@
     <string name="recursive_number_entries_summary">Berekent recursief het aantal items in een groep</string>
     <string name="warning_large_keyfile">Het is niet verstandig om een groot sleutelbestand toe te voegen, aangezien dit het openen van de database kan belemmeren.</string>
     <string name="error_otp_secret_length">Geheime sleutel moet minimaal %1$d tekens bevatten.</string>
+    <string name="entry_application_id">App-ID</string>
+    <string name="warning_overwrite_data_title">Bestaande gegevens overschrijven?</string>
+    <string name="warning_overwrite_data_description">Deze actie vervangt de bestaande gegevens van het item. Je kunt de oude gegevens ophalen als de geschiedenis is ingeschakeld.</string>
+    <string name="credential_provider">Dienst Automatisch aanvullen</string>
+    <string name="credential_provider_service_subtitle">Passkeys, Dienst Automatisch aanvullen</string>
+    <string name="passkey_service_name">KeePassDX Dienst Automatisch aanvullen</string>
+    <string name="passkeys">Passkeys</string>
+    <string name="passkeys_explanation_summary">Configureer Passkeys voor snelle en veilige wachtwoordloze login</string>
+    <string name="passkeys_preference_title">Instellingen voor passkeys</string>
+    <string name="passkeys_close_database_title">Database sluiten</string>
+    <string name="passkeys_close_database_summary">Database sluiten na selectie van passkey</string>
+    <string name="passkeys_privileged_apps_title">Bevoorrechte apps</string>
+    <string name="passkeys_privileged_apps_summary">Browsers beheren in de aangepaste lijst met bevoorrechte apps</string>
+    <string name="passkeys_privileged_apps_explanation">WAARSCHUWING: Een bevoorrechte app fungeert als toegangspoort om de oorsprong van een authenticatie op te halen. Zorg voor de legitimiteit ervan om veiligheidsproblemen te voorkomen.</string>
+    <string name="passkeys_privileged_apps_ask_title">App niet herkend</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s probeert een Passkey-actie uit te voeren.\n\nToevoegen aan de lijst met bevoorrechte apps?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Handtekening ontbreekt</string>
+    <string name="passkeys_missing_signature_app_ask_question">App-handtekening toevoegen aan passkey-item?</string>
+    <string name="passkeys_auto_select_title">Autom. selecteren</string>
+    <string name="passkeys_auto_select_summary">Automatisch selecteren bij slechts één item, een geopende database en alleen als de aanvragende app compatibel is</string>
+    <string name="passkeys_backup_eligibility_summary">Bepaal bij het aanmaken of een back-up mag worden gemaakt van de bron van de publieke sleutel</string>
+    <string name="passkeys_backup_eligibility_title">Geschikt voor back-up</string>
+    <string name="passkeys_backup_state_title">Back-upstatus</string>
+    <string name="passkeys_backup_state_summary">Aangeven dat er een back-up van de inloggegevens wordt gemaakt en beschermd tegen het verlies van een enkel apparaat</string>
+    <string name="passkey">Passkey</string>
+    <string name="passkey_creation_description">Passkey opslaan in nieuw item</string>
+    <string name="passkey_update_description">Passkey in %1$s bijwerken</string>
+    <string name="passkey_selection_username">Geen passkey gevonden</string>
+    <string name="passkey_selection_description">Bestaande passkey selecteren</string>
+    <string name="passkey_database_username">KeePassDX-database</string>
+    <string name="passkey_locked_database_description">Selecteren voor ontgrendeling</string>
+    <string name="passkey_username">Passkey Gebruikersnaam</string>
+    <string name="passkey_private_key">Passkey Privésleutel</string>
+    <string name="passkey_credential_id">Passkey Inlog-ID</string>
+    <string name="passkey_user_handle">Passkey Gebruikershandvat</string>
+    <string name="passkey_relying_party">Passkey Vertrouwde partij</string>
+    <string name="passkey_backup_eligibility">Passkey Back-upgeschiktheid</string>
+    <string name="passkey_backup_state">Passkey Back-upstatus</string>
+    <string name="error_passkey_result">Kan de passkey niet retourneren</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s wordt niet herkend en probeert te authenticeren met een bestaande passkey.</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">WAARSCHUWING: De passkey is aangemaakt door een andere client of de handtekening is verwijderd. Zorg ervoor dat de app die je wilt authenticeren deel uitmaakt van dezelfde service en legitiem is om beveiligingsproblemen te voorkomen.\nAls de app een browser is, voeg dan niet de handtekening toe aan het item, maar aan de lijst met bevoorrechte apps in de instellingen.</string>
 </resources>

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

@@ -135,7 +135,7 @@
     <string name="error_load_database">Nie można załadować bazy danych.</string>
     <string name="error_load_database_KDF_memory">Nie można załadować klucza. Spróbuj zmniejszyć „Użycie pamięci” KDF.</string>
     <string name="error_string_key">Każdy ciąg musi mieć nazwę pola.</string>
-    <string name="error_autofill_enable_service">Nie można włączyć usługi autouzupełniania.</string>
+    <string name="error_autofill_enable_service">Nie można włączyć usługi automatycznego wypełniania.</string>
     <string name="field_name">Nazwa pola</string>
     <string name="field_value">Wartość pola</string>
     <string name="file_not_found_content">Nie znaleziono pliku. Spróbuj ponownie otworzyć go w przeglądarce plików.</string>
@@ -182,7 +182,7 @@
     <string name="autofill">Wypełnij automatycznie</string>
     <string name="autofill_sign_in_prompt">Zaloguj się za pomocą KeePassDX</string>
     <string name="set_credential_provider_service_title">Ustaw domyślną usługę autouzupełniania</string>
-    <string name="autofill_explanation_summary">Włącz autouzupełnianie, aby móc szybko wypełniać formularze w innych aplikacjach</string>
+    <string name="autofill_explanation_summary">Skonfiguruj funkcję automatycznego wypełniania, aby szybko wypełniać formularze w innych aplikacjach</string>
     <string name="password_size_title">Wygenerowany rozmiar hasła</string>
     <string name="password_size_summary">Ustawia domyślny rozmiar wygenerowanych haseł</string>
     <string name="list_password_generator_options_title">Znaki hasła</string>
@@ -296,7 +296,7 @@
     <string name="keyboard_key_sound_title">Dźwięk przy naciskaniu klawiszy</string>
     <string name="do_not_kill_app">Nie zamykaj aplikacji…</string>
     <string name="lock_database_back_root_title">Naciśnij „Wstecz”, aby zablokować</string>
-    <string name="lock_database_back_root_summary">Zablokuj bazę danych, gdy użytkownik kliknie przycisk „Wstecz” na ekranie głównym</string>
+    <string name="lock_database_back_root_summary">Naciśnij „Wstecz”, aby zablokować bazę danych, jeśli znajdujesz się na ekranie głównym bazy danych</string>
     <string name="clear_clipboard_notification_title">Wyczyść po zamknięciu</string>
     <string name="clear_clipboard_notification_summary">Blokowanie bazy danych po wygaśnięciu czasu trwania schowka lub zamknięciu powiadomienia po rozpoczęciu korzystania z niej</string>
     <string name="recycle_bin">Kosz</string>
@@ -423,11 +423,11 @@
     <string name="validate">Walidacja</string>
     <string name="lock_database_show_button_summary">Wyświetla przycisk blokady w interfejsie użytkownika</string>
     <string name="lock_database_show_button_title">Pokaż przycisk blokady</string>
-    <string name="autofill_preference_title">Ustawienia autouzupełniania</string>
+    <string name="autofill_preference_title">Ustawienia automatycznego wypełniania</string>
     <string name="warning_database_link_revoked">Dostęp do pliku anulowany przez menedżer plików</string>
     <string name="error_label_exists">Ta etykieta już istnieje.</string>
     <string name="autofill_block_restart">Zrestartuj aplikację zawierającą formularz, aby aktywować blokadę.</string>
-    <string name="autofill_block">Blokowanie autouzupełniania</string>
+    <string name="autofill_block">Blokowanie automatycznego wypełniania</string>
     <string name="autofill_application_id_blocklist_summary">Lista zablokowanych, która uniemożliwia automatyczne wypełnianie aplikacji</string>
     <string name="filter">Filtr</string>
     <string name="subdomain_search_title">Wyszukiwanie subdomen</string>
@@ -463,7 +463,7 @@
     <string name="autofill_ask_to_save_data_title">Pytaj o zapisanie danych</string>
     <string name="autofill_save_search_info_summary">Staraj się zapisywać informacje wyszukiwania podczas dokonywania ręcznego wyboru wpisu, aby ułatwić sobie przyszłe użycie</string>
     <string name="autofill_save_search_info_title">Zapisz informacje wyszukiwania</string>
-    <string name="autofill_close_database_summary">Zamknij bazę danych po wybraniu autouzupełniania</string>
+    <string name="autofill_close_database_summary">Zamknij bazę danych po wybraniu automatycznego wypełniania</string>
     <string name="autofill_close_database_title">Zamknij bazę danych</string>
     <string name="keyboard_previous_lock_summary">Automatycznie przełącz z powrotem do poprzedniej klawiatury po zablokowaniu bazy danych</string>
     <string name="keyboard_previous_lock_title">Zablokuj bazę danych</string>
@@ -504,9 +504,9 @@
     <string name="device_unlock_prompt_extract_credential_title">Rozpoznawanie odblokowania urządzenia</string>
     <string name="error_rebuild_list">Nie można poprawnie odbudować listy.</string>
     <string name="error_database_uri_null">Nie można pobrać identyfikatora URI bazy danych.</string>
-    <string name="autofill_inline_suggestions_keyboard">Dodano sugestie autouzupełniania.</string>
+    <string name="autofill_inline_suggestions_keyboard">Dodano sugestie automatycznego wypełniania.</string>
     <string name="autofill_inline_suggestions_title">Sugestie wbudowane</string>
-    <string name="autofill_inline_suggestions_summary">Spróbuj wyświetlić sugestie autouzupełniania bezpośrednio z kompatybilnej klawiatury</string>
+    <string name="autofill_inline_suggestions_summary">Spróbuj wyświetlić sugestie automatycznego wypełniania bezpośrednio z kompatybilnej klawiatury</string>
     <string name="temp_device_unlock_enable_title">Odblokowywanie tymczasowe urządzenia</string>
     <string name="device_unlock_prompt_not_initialized">Nie można zainicjować monitu o odblokowanie urządzenia.</string>
     <string name="warning_database_revoked">Dostęp do pliku odwołany przez menedżera plików, zamknij bazę danych i otwórz ją ponownie z jej lokalizacji.</string>
@@ -517,7 +517,7 @@
     <string name="unit_mebibyte">MiB</string>
     <string name="unit_kibibyte">KiB</string>
     <string name="unit_byte">B</string>
-    <string name="error_otp_type">Istniejący typ OTP nie jest rozpoznawany przez ten formularz, jego walidacja może już nie generować poprawnie tokenu.</string>
+    <string name="error_otp_type">Istniejący typ OTP nie jest rozpoznawany przez ten formularz, a jego walidacja może już nie generować poprawnie tokenu.</string>
     <string name="download_canceled">Anulowano!</string>
     <string name="icon_section_custom">Niestandardowy</string>
     <string name="icon_section_standard">Standardowy</string>
@@ -655,7 +655,7 @@
     <string name="merge_success">Scalanie zostało pomyślnie zakończone</string>
     <string name="info">Informacje</string>
     <string name="menu_app_settings_summary">Wyszukiwanie, blokada, historia, właściwości</string>
-    <string name="menu_form_filling_settings_summary">Klawiatura, autouzupełnianie, schowek</string>
+    <string name="menu_form_filling_settings_summary">Klawiatura, automatyczne wypełnianie, schowek</string>
     <string name="menu_database_settings_summary">Metadane, kosz, szablony, historia</string>
     <string name="menu_security_settings_summary">Szyfrowanie, funkcja wyprowadzania klucza</string>
     <string name="master_key_settings_summary">Zmiana, odnowienie</string>
@@ -664,7 +664,7 @@
     <string name="ask">Zapytaj</string>
     <string name="configure">Skonfiguruj</string>
     <string name="unlock_and_link_biometric">Łącze do odblokowania urządzenia</string>
-    <string name="menu_appearance_settings_summary">Motywy, kolory, atrybuty</string>
+    <string name="menu_appearance_settings_summary">Motywy, kolory, ikony, czcionki, atrybuty</string>
     <string name="unlock">Odblokuj</string>
     <string name="education_validate_entry_title">Sprawdź poprawność wpisu</string>
     <string name="menu_device_unlock_settings_summary">Biometria, poświadczenie urządzenia</string>
@@ -694,4 +694,45 @@
     <string name="hide_templates_title">Ukryj szablony</string>
     <string name="hide_templates_summary">Szablony nie są wyświetlane</string>
     <string name="error_otp_secret_length">Klucz tajny musi składać się z co najmniej %1$d znaków.</string>
+    <string name="entry_application_id">Identyfikator aplikacji</string>
+    <string name="warning_overwrite_data_title">Nadpisać istniejące dane?</string>
+    <string name="warning_overwrite_data_description">Ta czynność spowoduje zastąpienie istniejących danych we wpisie. Możesz odzyskać stare dane, jeśli historia jest włączona.</string>
+    <string name="credential_provider">Dostawca poświadczeń</string>
+    <string name="passkeys">Klucze dostępu</string>
+    <string name="passkeys_explanation_summary">Skonfiguruj klucze dostępu, aby zapewnić szybkie i bezpieczne logowanie bez hasła</string>
+    <string name="passkeys_preference_title">Ustawienia kluczy dostępu</string>
+    <string name="passkeys_close_database_title">Zamknij bazę danych</string>
+    <string name="passkeys_close_database_summary">Zamknij bazę danych po wybraniu klucza dostępu</string>
+    <string name="passkeys_privileged_apps_title">Aplikacje uprzywilejowane</string>
+    <string name="passkeys_privileged_apps_summary">Zarządzaj przeglądarkami na liście niestandardowej aplikacji uprzywilejowanych</string>
+    <string name="passkeys_privileged_apps_explanation">OSTRZEŻENIE: aplikacja uprzywilejowana działa jako brama do pobierania źródła uwierzytelnienia. Upewnij się, że jest właściwa, aby uniknąć problemów z bezpieczeństwem.</string>
+    <string name="passkeys_privileged_apps_ask_title">Aplikacja nie została rozpoznana</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s próbuje wykonać czynność klucza dostępu.\n\nDodać ją do listy aplikacji uprzywilejowanych?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Brak podpisu</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">OSTRZEŻENIE: klucz dostępu został utworzony z innego klienta lub podpis został usunięty. Upewnij się, że aplikacja, którą chcesz uwierzytelnić, jest częścią tej samej usługi i jest właściwa, aby uniknąć problemów z bezpieczeństwem.\nJeśli aplikacja jest przeglądarką, nie dodawaj jej podpisu do wpisu, ale do listy aplikacji uprzywilejowanych w ustawieniach.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s nie został rozpoznany i próbuje uwierzytelnić się przy użyciu istniejącego klucza dostępu.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Dodać podpis aplikacji do wpisu klucza dostępu?</string>
+    <string name="passkeys_auto_select_title">Wybór automatyczny</string>
+    <string name="passkeys_auto_select_summary">Wybierz automatycznie, jeśli otwarty jest tylko jeden wpis i baza danych, a także tylko wtedy, gdy żądająca aplikacja jest zgodna</string>
+    <string name="passkeys_backup_eligibility_title">Uprawnienia do tworzenia kopii zapasowych</string>
+    <string name="passkeys_backup_eligibility_summary">Określ w momencie tworzenia, czy można wykonać kopię zapasową źródła poświadczeń klucza publicznego</string>
+    <string name="passkeys_backup_state_title">Stan kopii zapasowej</string>
+    <string name="passkeys_backup_state_summary">Oznaczaj, że dane uwierzytelniające są tworzone w kopii zapasowej i chronione przed utratą na pojedynczym urządzeniu</string>
+    <string name="credential_provider_service_subtitle">Dostawca poświadczeń automatycznego wypełniania, kluczy dostępu</string>
+    <string name="passkey">Klucz dostępu</string>
+    <string name="passkey_service_name">Dostawca poświadczeń KeePassDX</string>
+    <string name="passkey_creation_description">Zapisz klucz dostępu w nowym wpisie</string>
+    <string name="passkey_update_description">Zaktualizuj klucz dostępu w %1$s</string>
+    <string name="passkey_selection_username">Nie znaleziono klucza dostępu</string>
+    <string name="passkey_selection_description">Wybierz istniejący klucz dostępu</string>
+    <string name="passkey_database_username">Baza danych KeePassDX</string>
+    <string name="passkey_locked_database_description">Wybierz, aby odblokować</string>
+    <string name="passkey_username">Nazwa użytkownika klucza dostępu</string>
+    <string name="passkey_private_key">Klucz prywatny klucza dostępu</string>
+    <string name="passkey_credential_id">Identyfikator poświadczenia klucza dostępu</string>
+    <string name="passkey_user_handle">Identyfikator użytkownika klucza dostępu</string>
+    <string name="passkey_relying_party">Strona ufająca kluczu dostępu</string>
+    <string name="passkey_backup_eligibility">Uprawnienie do utworzenia kopii zapasowej klucza dostępu</string>
+    <string name="passkey_backup_state">Stan kopii zapasowej klucza dostępu</string>
+    <string name="error_passkey_result">Nie można zwrócić klucza dostępu</string>
 </resources>

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

@@ -19,7 +19,7 @@
 --><resources>
     <string name="feedback">Comentários</string>
     <string name="homepage">Página inicial</string>
-    <string name="about_description">Implementação para Android do gerenciador de senhas KeePass</string>
+    <string name="about_description">Implementação para Android do gerenciador de senhas KeePass.</string>
     <string name="accept">Aceitar</string>
     <string name="add_entry">Adicionar entrada</string>
     <string name="add_group">Adicionar grupo</string>
@@ -180,7 +180,7 @@
     <string name="autofill">Preenchimento automático</string>
     <string name="autofill_sign_in_prompt">Entre com o KeePassDX</string>
     <string name="set_credential_provider_service_title">Definir serviço padrão de preenchimento automático</string>
-    <string name="autofill_explanation_summary">Habilite o serviço para rapidamente preencher formulários em outros aplicativos</string>
+    <string name="autofill_explanation_summary">Configure o serviço para rapidamente preencher formulários em outros aplicativos</string>
     <string name="password_size_title">Comprimento da senha gerada</string>
     <string name="password_size_summary">Define o tamanho padrão para senhas geradas</string>
     <string name="list_password_generator_options_title">Caracteres da senha</string>
@@ -303,7 +303,7 @@
     <string name="selection_mode">Modo seleção</string>
     <string name="do_not_kill_app">Não feche o aplicativo…</string>
     <string name="lock_database_back_root_title">Pressionar \'Voltar\' para bloquear</string>
-    <string name="lock_database_back_root_summary">Tranca o banco de dados quando o usuário pressiona o botão \"Voltar\" na tela inicial</string>
+    <string name="lock_database_back_root_summary">Se estiver na tela raiz da base de dados, o botão \"Voltar\" irá trancá-la</string>
     <string name="clear_clipboard_notification_title">Limpar ao fechar</string>
     <string name="clear_clipboard_notification_summary">Bloquear o banco de dados quando a duração da área de transferência expirar ou a notificação for fechada depois do início do uso</string>
     <string name="recycle_bin">Lixeira</string>
@@ -673,7 +673,7 @@
     <string name="ask">Perguntar</string>
     <string name="configure">Configurar</string>
     <string name="unlock_and_link_biometric">Link de desbloqueio do dispositivo</string>
-    <string name="menu_appearance_settings_summary">Temas, cores, atributos</string>
+    <string name="menu_appearance_settings_summary">Temas, cores, ícones, fontes, atributos</string>
     <string name="unlock">Desbloquear</string>
     <string name="education_validate_entry_title">Validar a entrada</string>
     <string name="menu_app_settings_summary">Pesquisar, bloquear, histórico, propriedades</string>
@@ -703,4 +703,24 @@
     <string name="warning_large_keyfile">Não é recomendável adicionar um arquivo-chave grande, pois isso pode impedir a abertura do banco de dados.</string>
     <string name="hide_templates_title">Ocultar modelos</string>
     <string name="hide_templates_summary">Os modelos não são exibidos</string>
+    <string name="entry_application_id">Id do App</string>
+    <string name="error_otp_secret_length">Chave secreta deve ter pelo menos %1$d caracteres.</string>
+    <string name="warning_overwrite_data_title">Sobrescrever dados existentes?</string>
+    <string name="warning_overwrite_data_description">Esta ação irá substituir os dados existentes na entrada, você pode recuperar os dados antigos se o histórico estiver habilitado.</string>
+    <string name="credential_provider">Provedor da credencial</string>
+    <string name="passkeys_privileged_apps_summary">Gerencie navegadores na lista customizada de aplicações privilegiadas</string>
+    <string name="passkeys_privileged_apps_explanation">AVISO: Um aplicativo privilegiado age como portão para obter a origem de uma autenticação. Certifique sua legitimidade para evitar problemas de segurança.</string>
+    <string name="passkeys_privileged_apps_ask_title">App não reconhecido</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s tenta fazer uma ação de Passkey.\n\nAdicionar à lista de aplicativos privilegiados?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Assinatura faltando</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">AVISO: A Passkey foi criada de outro cliente ou a assinatura foi deletada. Certifique que o aplicativo que você quer autenticar é parte do mesmo serviço e é legítimo para evitar problemas de segurança.\nSe o aplicativo é um navegador, não adicione sua assinatura à entrada, mas à lista de aplicativos privilegiados nas configurações.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s não é reconhecido e tenta autenticar com uma Passkey existente.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Adicionar assinatura de app à entrada de Passkey?</string>
+    <string name="passkeys_auto_select_title">Auto selecionar</string>
+    <string name="passkeys_auto_select_summary">Auto selecionar se só uma entrada e a base de dados estiverem abertas, apenas se o app solicitante for compatível</string>
+    <string name="passkeys_backup_eligibility_title">Elegibilidade de Backup</string>
+    <string name="passkeys_backup_eligibility_summary">Determine no tempo de criação se é permitido que seja feito o backup da fonte da credencial de chaves públicas</string>
+    <string name="passkeys_backup_state_title">Estado do Backup</string>
+    <string name="passkey">Passkey</string>
+    <string name="passkey_service_name">Provedor de Credenciais KeePassDX</string>
 </resources>

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

@@ -182,7 +182,7 @@
     <string name="general">Общие</string>
     <string name="autofill">Автозаполнение</string>
     <string name="autofill_sign_in_prompt">Войти с помощью KeePassDX</string>
-    <string name="autofill_explanation_summary">Включите службу для быстрого заполнения форм в других приложениях</string>
+    <string name="autofill_explanation_summary">Настройте службу для быстрого заполнения форм в других приложениях</string>
     <string name="set_credential_provider_service_title">Использовать службу автозаполнения</string>
     <string name="password_size_title">Длина создаваемого пароля</string>
     <string name="password_size_summary">Настройка длины создаваемых паролей по умолчанию</string>
@@ -300,7 +300,7 @@
     <string name="keyboard_key_sound_title">Звук при нажатии</string>
     <string name="do_not_kill_app">Не закрывайте приложение…</string>
     <string name="lock_database_back_root_title">Блокировка нажатием \"Назад\"</string>
-    <string name="lock_database_back_root_summary">Блокировка базы нажатием кнопки \"Назад\" на начальном экране</string>
+    <string name="lock_database_back_root_summary">Блокировка базы нажатием кнопки \"Назад\", если открыт её корневой раздел</string>
     <string name="clear_clipboard_notification_title">Очищать при закрытии</string>
     <string name="clear_clipboard_notification_summary">Блокировать базу при закрытии уведомления после использования или истечения времени ожидания</string>
     <string name="recycle_bin">Корзина</string>
@@ -475,7 +475,7 @@
     <string name="autofill_ask_to_save_data_summary">Запрашивать сохранение данных после завершения заполнения формы</string>
     <string name="autofill_ask_to_save_data_title">Запрос сохранения данных</string>
     <string name="autofill_close_database_summary">Закрывать базу после выбора автозаполнения</string>
-    <string name="autofill_close_database_title">Закрыть базу</string>
+    <string name="autofill_close_database_title">Закрывать базу</string>
     <string name="notification">Уведомление</string>
     <string name="biometric_security_update_required">Требуется обновление биометрической системы безопасности.</string>
     <string name="warning_empty_recycle_bin">Удалить всё содержимое корзины безвозвратно\?</string>
@@ -519,7 +519,7 @@
     <string name="warning_database_info_changed_options">Объединить данные, перезаписав внешние изменения, или перезагрузить её с последними изменениями.</string>
     <string name="warning_database_info_changed">Информация, содержащаяся в файле базы, была изменена вне этого приложения.</string>
     <string name="menu_reload_database">Перезагрузить данные</string>
-    <string name="error_otp_type">Существующий тип OTP не распознаётся данной формой, его проверка больше не может корректно генерировать токен.</string>
+    <string name="error_otp_type">Существующий тип OTP не распознаётся данной формой и его проверка больше не может корректно генерировать токен.</string>
     <string name="unit_gibibyte">ГиБ</string>
     <string name="unit_mebibyte">МиБ</string>
     <string name="unit_kibibyte">КиБ</string>
@@ -585,7 +585,7 @@
     <string name="show_otp_token_summary">Показывать токены OTP в списке записей</string>
     <string name="menu_external_icon">Внешний значок</string>
     <string name="autofill_select_entry">Выбор записи…</string>
-    <string name="autofill_manual_selection_summary">Показывать функцию, позволяющую пользователю вручную выбирать запись из базы</string>
+    <string name="autofill_manual_selection_summary">Показывать элемент управления для ручного выбора пользователем записи из базы</string>
     <string name="autofill_manual_selection_title">Ручной выбор</string>
     <string name="hint_icon_name">Название значка</string>
     <string name="permission">Разрешение</string>
@@ -677,7 +677,7 @@
     <string name="info">Информация</string>
     <string name="master_key_settings_summary">Изменение, обновление</string>
     <string name="warning_copy_permission">Разрешение необходимо для использования функции уведомления буфера обмена.</string>
-    <string name="menu_appearance_settings_summary">Темы, цвета, атрибуты</string>
+    <string name="menu_appearance_settings_summary">Темы, цвета, значки, шрифты, атрибуты</string>
     <string name="configure">Настройка</string>
     <string name="education_validate_entry_title">Проверка записи</string>
     <string name="unlock_and_link_biometric">Настройка разблокировки устройства</string>
@@ -704,4 +704,45 @@
     <string name="hide_templates_title">Скрывать шаблоны</string>
     <string name="hide_templates_summary">Не показывать шаблоны</string>
     <string name="error_otp_secret_length">Секретный ключ должен содержать не менее %1$d символов.</string>
+    <string name="entry_application_id">ID приложения</string>
+    <string name="warning_overwrite_data_title">Перезаписать существующие данные?</string>
+    <string name="warning_overwrite_data_description">Будут заменены существующие данные в записи. Если включена история, там могут оказаться старые данные.</string>
+    <string name="credential_provider">Поставщик учётных данных</string>
+    <string name="passkeys_explanation_summary">Настройка ключей доступа для быстрого и безопасного входа без ввода пароля</string>
+    <string name="passkeys">Ключи доступа</string>
+    <string name="passkeys_preference_title">Настройки ключей доступа</string>
+    <string name="passkeys_close_database_title">Закрыть базу</string>
+    <string name="passkeys_close_database_summary">Закрыть базу после выбора ключа доступа</string>
+    <string name="passkeys_privileged_apps_title">Привилегированные приложения</string>
+    <string name="passkeys_privileged_apps_summary">Управление пользовательским списком привилегированных приложений</string>
+    <string name="passkeys_privileged_apps_explanation">ВНИМАНИЕ: привилегированное приложение действует как шлюз для получения информации о происхождении аутентификации. Убедитесь в его легитимности, чтобы избежать проблем с безопасностью.</string>
+    <string name="passkeys_privileged_apps_ask_title">Приложение не распознано</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s пытается взаимодействовать с ключом доступа.\n\nДобавить его в список привилегированных приложений?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Отсутствует подпись</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">ВНИМАНИЕ: ключ доступа был создан в другом клиенте или подпись была удалена. Убедитесь, что приложение, которое вы хотите аутентифицировать, является частью той же службы и является легитимным, чтобы избежать проблем с безопасностью.\nЕсли приложение является браузером, добавьте его в список привилегированных приложений в настройках, но не добавляйте его подпись к записи ключа доступа.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s не распознано и пытается пройти аутентификацию с помощью существующего ключа доступа.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Добавить подпись приложения к записи ключа доступа?</string>
+    <string name="passkeys_auto_select_title">Автовыбор</string>
+    <string name="passkeys_auto_select_summary">Автоматический выбор, если открыта одна запись в единственной отрытой базе и при условии совместимости запрашивающего приложения</string>
+    <string name="passkeys_backup_eligibility_title">Возможность резервирования</string>
+    <string name="passkeys_backup_eligibility_summary">Настройка разрешения резервного копирования источника учётных данных открытого ключа при создании</string>
+    <string name="passkeys_backup_state_title">Статус резервирования</string>
+    <string name="passkeys_backup_state_summary">Указывает, резервируются ли учётные данные и защищены ли они от потери одного устройства</string>
+    <string name="credential_provider_service_subtitle">Ключи доступа, поставщик учётных данных для автозаполнения</string>
+    <string name="passkey">Ключ доступа</string>
+    <string name="passkey_service_name">Поставщик учётных данных KeePassDX</string>
+    <string name="passkey_creation_description">Сохранить ключ доступа в новой записи</string>
+    <string name="passkey_update_description">Обновить ключ доступа в %1$s</string>
+    <string name="passkey_selection_username">Ключ доступа не найден</string>
+    <string name="passkey_selection_description">Выберите существующий ключ доступа</string>
+    <string name="passkey_database_username">База KeePassDX</string>
+    <string name="passkey_locked_database_description">Выберите для разблокировки</string>
+    <string name="passkey_username">Пользователь ключа доступа</string>
+    <string name="passkey_private_key">Закрытый ключ доступа</string>
+    <string name="passkey_credential_id">ID учётных данных ключа доступа</string>
+    <string name="passkey_user_handle">Идентификатор пользователя ключа доступа</string>
+    <string name="passkey_relying_party">Доверяющая сторона ключа доступа</string>
+    <string name="passkey_backup_eligibility">Возможность резервирования ключа доступа</string>
+    <string name="passkey_backup_state">Статус резервирования ключа доступа</string>
+    <string name="error_passkey_result">Невозможно вернуть ключ доступа</string>
 </resources>

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

@@ -345,7 +345,7 @@
     <string name="error_XML_malformed">XML e keqformuar.</string>
     <string name="autofill_block">Blloko vetëplotësim</string>
     <string name="allow_no_password_summary">Lejon prekjen e butoni “Hape”, nëse s’janë përzgjedhur kredenciale</string>
-    <string name="about_description">Sendërtim për Android i përgjegjësit KeePass të fjalëkalimeve</string>
+    <string name="about_description">Sendërtim për Android i përgjegjësit KeePass të fjalëkalimeve.</string>
     <string name="auto_focus_search_summary">Kërko një kërkim, kur hapet një bazë të dhënash</string>
     <string name="warning_replace_file">Ngarkimi i kësaj kartele do të zëvendësojë atë ekzistuesen.</string>
     <string name="autofill">Vetëplotësoje</string>
@@ -364,7 +364,7 @@
     <string name="style_name_simple">E thjeshtë</string>
     <string name="style_name_reply">Përgjigju</string>
     <string name="content_description_hardware_key_checkbox">Kutizë kyçi hardware</string>
-    <string name="content_description_repeat_toggle_password_visibility"/>
+    <string name="content_description_repeat_toggle_password_visibility">Përsërit ndryshim dukshmërie fjalëkalimi</string>
     <string name="content_description_entry_foreground_color">Ngjyrë e përparme e zërit</string>
     <string name="content_description_entry_background_color">Ngjyrë sfondi e zërit</string>
     <string name="navigation_drawer_open">Panel lëvizjesh i hapur</string>
@@ -382,14 +382,14 @@
     <string name="menu_form_filling_settings">Plotësim formularësh</string>
     <string name="menu_open_file_read_and_write">E ndryshueshme</string>
     <string name="search_mode">Mënyra kërkim</string>
-    <string name="save_mode"/>
+    <string name="save_mode">Mënyra Kursim</string>
     <string name="remember_keyfile_locations_summary">Ndjek se ku depozitohen kartela kyç</string>
     <string name="remember_hardware_key_title">Mbaj mend kyçe hardware</string>
     <string name="remember_hardware_key_summary">Ndjek kyçet hardware të përdorur</string>
     <string name="hide_broken_locations_summary">Fshihi lidhjen e dëmtuara te lista e bazave të të dhënave së fundi</string>
     <string name="export_app_properties_summary">Krijoni një kartelë ku të eksportohen rregullime aplikacioni</string>
     <string name="success_import_app_properties">Rregullimet e aplikacionit u importuan</string>
-    <string name="error_import_app_properties">Gabim gjatë importimit të rregullimeve të aplikacionit</string>
+    <string name="error_import_app_properties">Gabim gjatë importimit të rregullimeve të aplikacionit.</string>
     <string name="success_export_app_properties">Rregullimet e aplikacionit u eksportuan</string>
     <string name="encryption_explanation">Algoritëm fshehtëzimi të dhënash i përdorur për krejt të dhënat</string>
     <string name="rounds_explanation">Më tepër raunde fshehtëzimi furnizojnë mbrojtje më të madhe kundër sulmesh hyrjeje me zor, por mund të ngadalësojnë vërtet ngarkimin dhe ruajtjen e gjërave.</string>
@@ -428,7 +428,7 @@
     <string name="temp_device_unlock_enable_title">Shkyçje e përkohshme pajisjeje</string>
     <string name="file_manager_install_description">Që të krijohen, hapen dhe ruhen kartela bazash të dhënash, lypset një përgjegjës kartelash që pranon veprime ACTION_CREATE_DOCUMENT dhe ACTION_OPEN_DOCUMENT.</string>
     <string name="content_description_keyfile_checkbox">Kutizë për kartelë kyçi</string>
-    <string name="content_description_nav_header"/>
+    <string name="content_description_nav_header">Krye lëvizjesh</string>
     <string name="navigation_drawer_close">Panel lëvizjesh i mbyllur</string>
     <string name="searchable"/>
     <string name="search_filters">Filtra kërkimesh</string>
@@ -476,9 +476,9 @@
     <string name="error_load_database_KDF_memory">S’u ngarkua dot kyçi. Provoni të ulni “Përdorim Kujtese” KDF.</string>
     <string name="error_pass_gen_type">Duhet përzgjedhur të paktën një lloj prodhimi fjalëkalimi.</string>
     <string name="error_create_database_file">S’arrihet të krijohet bazë të dhënash me këtë fjalëkalim dhe kartelë kyç.</string>
-    <string name="error_registration_read_only">Në baza të dhënash që janë vetëm-për-lexim s’lejohet ruajtja e një objekti të ri</string>
+    <string name="error_registration_read_only">Në baza të dhënash që janë vetëm-për-lexim s’lejohet ruajtja e një objekti të ri.</string>
     <string name="error_database_uri_null">S’mund të merret URI baze të dhënash.</string>
-    <string name="error_challenge_already_requested">Sfida është kërkuar tashmë</string>
+    <string name="error_challenge_already_requested">Sfida është kërkuar tashmë.</string>
     <string name="error_response_already_provided">Përgjigja është dhënë tashmë.</string>
     <string name="error_no_response_from_challenge">S’arrihet të merret përgjigja nga sfida.</string>
     <string name="error_driver_required">Përudhësi për %1$s është i domosdoshëm.</string>
@@ -487,13 +487,13 @@
     <string name="menu_database_settings_summary">Tejtëdhëna, kosh ricklimesh, gjedhe, historik</string>
     <string name="menu_security_settings_summary">Fshehtëzim, funksion derivimi kyçesh</string>
     <string name="master_key_settings_summary">Ndryshojeni, rinovim</string>
-    <string name="menu_move"/>
+    <string name="menu_move">Lëvize</string>
     <string name="menu_merge_database">Përzieni të dhëna</string>
     <string name="menu_keystore_remove_key">Fshi kyç shkyçjeje pajisjeje</string>
     <string name="subdomain_search_title">Kërkim nënpërkatësie</string>
     <string name="read_only_warning">Në varësi të përgjegjësit tuaj të kartelave, KeePassDX-i mund të mos lejojë të shkruhet në depozitën tuaj.</string>
     <string name="remember_database_locations_summary">Ndjek se ku depozitohen bazat e të dhënave</string>
-    <string name="error_export_app_properties">Gabim gjatë eksportimit të rregullimeve të aplikacionit</string>
+    <string name="error_export_app_properties">Gabim gjatë eksportimit të rregullimeve të aplikacionit.</string>
     <string name="memory_usage_explanation">Sasi kujtese për t’u përdorur nga funksioni i derivimit të kyçeve.</string>
     <string name="command_execution">Po përmbushet urdhri…</string>
     <string name="sort_ascending">Më i ulti së pari ↓</string>
@@ -522,7 +522,7 @@
     <string name="clipboard_notifications_title">Njoftime mbi të papastrën</string>
     <string name="clipboard_notifications_summary">Shfaq njoftime të papastre te fusha kopjimi, kur shihet një zë</string>
     <string name="lock_database_back_root_title">Shtypni “Mbrapsht”, që të kyçet</string>
-    <string name="lock_database_back_root_summary">Kyçe bazën e të dhënave, kur përdoruesi klikon butonin “Mbrapsht” te skena e rrënjës</string>
+    <string name="lock_database_back_root_summary">Shtypni “Mbrapsht” për kyçje të bazës së të dhënave, nëse gjendeni te skena rrënjë e bazës së të dhënave</string>
     <string name="lock_database_show_button_summary">Bën shfaqjen të butonit të kyçjeve te ndërfaqja e përdoruesit</string>
     <string name="device_unlock_explanation_summary">Përdorni shkyçjen e pajisjes, për ta hapur më kollaj bazën e të dhënave</string>
     <string name="device_unlock_timeout">Mbarim kohe shkyçjeje pajisjeje</string>
@@ -569,7 +569,7 @@
     <string name="icon_pack_choose_summary">Paketë ikonash të përdorura te aplikacioni</string>
     <string name="hide_expired_entries_summary">Zërat e skaduar nuk shfaqen</string>
     <string name="set_credential_provider_service_title">Caktoni shërbim parazgjedhje vetëplotësimesh</string>
-    <string name="autofill_explanation_summary">Aktivizoni vetëplotësimet, për të plotësuar shpejt formularë në aplikacione të tjerë</string>
+    <string name="autofill_explanation_summary">Formësoni vetëplotësimet, për të plotësuar shpejt formularë në aplikacione të tjerë</string>
     <string name="autofill_preference_title">Rregullime vetëplotësimi</string>
     <string name="password_size_summary">Cakton madhësinë parazgjedhje për fjalëkalimet e prodhuar</string>
     <string name="list_password_generator_options_summary">Caktoni shenja të lejuara për prodhuesin e fjalëkalimeve</string>
@@ -623,14 +623,14 @@
     <string name="education_field_copy_summary">Ç’kopjohet te fusha, mund të ngjitet kudo.\n\nPërdorni metodën mbushje formularësh, nëse parapëlqeni.</string>
     <string name="education_donation_summary">Ndihmoni të shtohet qëndrueshmëria, siguria dhe në shtimin e më tepër veçorive.</string>
     <string name="html_text_ad_free">Ndryshe nga shumë aplikacione administrimi fjalëkalimesh, ky është &lt;strong&gt;pa reklama&lt;/strong&gt;, &lt;strong&gt;<em>software</em> i lirë në <em>copylef</em>&lt;/strong&gt; dhe s’grumbullon të dhëna personale në shërbyesit e tij, pavarësisht versionit që përdorni.</string>
-    <string name="html_text_buy_pro">Duke blerë versionin Pro, do të mund të përdorni këtë &lt;strong&gt;stil pamor&lt;/strong&gt; dhe do të ndihmoni veçanërisht në &lt;strong&gt;realizimin e projekteve të bashkësisë.&lt;strong&gt;</string>
+    <string name="html_text_buy_pro">Duke blerë versionin Pro, do të mund të përdorni këtë &lt;strong&gt;stil pamor&lt;/strong&gt; dhe do të ndihmoni veçanërisht në &lt;strong&gt;realizimin e projekteve të bashkësisë.&lt;/strong&gt;</string>
     <string name="error_arc4">S’mbulohet shifër “Arcfour stream”.</string>
     <string name="warning_file_too_big">Një bazë të dhënash KeePass supozohet se përmban vetëm kartela të vockla mjetesh (b.f., kartela kyçesh PGP).\n\nMe këtë ngarkim baza juaj e të dhënave mund të bëhet shumë e madhe dhe të ulet funksionimi i saj.</string>
     <string name="education_read_only_summary">Ndryshoni mënyrë hapjeje për këtë sesion. \n \n“Mbrojtur nga shkimi” parandalon ndryshime të paqëllimta te baza e të dhënave. \n“E ndryshueshme” ju lejon të shtoni, fshini ose ndryshoni krejt elementët, sipas dëshirës.</string>
     <string name="html_text_dev_feature_encourage">po i nxisni zhvilluesit të krijojnë &lt;strong&gt;veçori të reja&lt;/strong&gt; dhe të &lt;strong&gt;ndreqin të meta&lt;/strong&gt; në përputhje me sugjerimet tuaja.</string>
     <string name="warning_large_keyfile">Nuk rekomandohet të shtohet një kartelë kyç e madhe, kjo mund të pengojë hapjen e bazës së të dhënave.</string>
     <string name="education_entry_edit_summary">Përpunojeni zërin tuaj me fusha vetjake. Pool data can be referenced between different entry fields.</string>
-    <string name="error_otp_type">Lloji OTP ekzistues s’njihet nga ky formular, vlerësimi i tij mund të mos prodhojë më saktë token-in.</string>
+    <string name="error_otp_type">Lloji OTP ekzistues s’njihet nga ky formular dhe vlerësimi i tij mund të mos prodhojë më saktë token-in.</string>
     <string name="warning_database_read_only">Akordo hyrje për shkrim kartelash, që të ruhen ndryshimet e bazës së të dhënave</string>
     <string name="warning_database_info_changed_options">Përzieni të dhënat, mbishkruani ndryshimet që nga jashtë duke e ruajtur bazën e të dhënave, ose duke e ringarkuar me ndryshimet më të reja.</string>
     <string name="warning_database_revoked">Hyrja te kartela e shfuqizuar nga përgjegjësi i kartelave, mbylleni bazën e të dhënave dhe rihapeni që prej vendndodhjes së saj.</string>
@@ -653,4 +653,5 @@
     <string name="education_device_unlock_summary">Lidheni fjalëkalimin tuaj me hollësi biometrike të skanuara, ose kredenciale pajisjeje, për të shkyçur shpejt bazën tuaj të dhënave.</string>
     <string name="warning_empty_password">Të vazhdohet pa mbrojtje shkyçjeje fjalëkalimesh?</string>
     <string name="device_unlock_prompt_not_initialized">S’arrihet të bëhet gati hapi i shkyçjes së pajisjes.</string>
+    <string name="error_otp_secret_length">Kyçi i fshehtë duhet të jetë të paktën %1$d shenja.</string>
 </resources>

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

@@ -32,7 +32,7 @@
     <string name="application">Uygulama</string>
     <string name="brackets">Parantez</string>
     <string name="extended_ASCII">Genişletilmiş ASCII</string>
-    <string name="file_manager_install_description">Veritabanı dosyalarını oluşturmak, açmak ve kaydetmek için ACTION_CREATE_DOCUMENT ve ACTION_OPEN_DOCUMENT intent eylemlerini kabul eden bir dosya yöneticisi gereklidir.</string>
+    <string name="file_manager_install_description">Veri tabanı dosyalarını oluşturmak, açmak ve kaydetmek için ACTION_CREATE_DOCUMENT ve ACTION_OPEN_DOCUMENT intent eylemlerini kabul eden bir dosya yöneticisi gereklidir.</string>
     <string name="allow">İzin ver</string>
     <string name="clipboard_cleared">Pano temizlendi</string>
     <string name="clipboard_error_title">Pano hatası</string>
@@ -174,9 +174,9 @@
     <string name="menu_appearance_settings">Görünüm</string>
     <string name="general">Genel</string>
     <string name="autofill">Otomatik Doldurma</string>
-    <string name="autofill_sign_in_prompt">KeePassDX ile giriş yap</string>
+    <string name="autofill_sign_in_prompt">KeePassDX ile oturum aç</string>
     <string name="set_credential_provider_service_title">Öntanımlı otomatik doldurma hizmetini ayarla</string>
-    <string name="autofill_explanation_summary">Diğer uygulamalardaki formları hızlı doldurmak için otomatik doldurmayı etkinleştirin</string>
+    <string name="autofill_explanation_summary">Diğer uygulamalardaki formları hızlı doldurmak için otomatik doldurmayı yapılandırın</string>
     <string name="password_size_title">Oluşturulan parola boyutu</string>
     <string name="password_size_summary">Oluşturulan parolaların öntanımlı boyutunu ayarlar</string>
     <string name="list_password_generator_options_title">Parola karakterleri</string>
@@ -188,11 +188,11 @@
     <string name="lock">Kilit</string>
     <string name="lock_database_screen_off_title">Ekran kilidi</string>
     <string name="lock_database_screen_off_summary">Ekran kapandığında birkaç saniye sonra veri tabanını kilitle</string>
-    <string name="device_unlock">Cihaz kilidini aç</string>
+    <string name="device_unlock">Aygıt kilidini aç</string>
     <string name="biometric_unlock_enable_title">Biyometrik kilit açma</string>
     <string name="biometric_unlock_enable_summary">Veri tabanını açmak için biyometriklerinizi taramanızı sağlar</string>
     <string name="biometric_delete_all_key_title">Şifreleme anahtarlarını silin</string>
-    <string name="biometric_delete_all_key_summary">Cihaz kilit açma tanımayla ilgili tüm şifreleme anahtarlarını silin</string>
+    <string name="biometric_delete_all_key_summary">Aygıt kilidi açma tanımayla ilgili tüm şifreleme anahtarlarını silin</string>
     <string name="unavailable_feature_text">Bu özellik başlatılamadı.</string>
     <string name="unavailable_feature_version">Aygıtta Android %1$s çalışıyor, ancak %2$s veya sonraki bir sürüm gerekli.</string>
     <string name="unavailable_feature_hardware">İlgili donanım bulunamadı.</string>
@@ -294,7 +294,7 @@
     <string name="icon_pack_choose_summary">Uygulamada kullanılan simge paketi</string>
     <string name="selection_mode">Seçim modu</string>
     <string name="do_not_kill_app">Uygulamayı sonlandırmayın…</string>
-    <string name="lock_database_back_root_summary">Kullanıcı kök ekranda geri düğmesine tıkladığında veri tabanını kilitle</string>
+    <string name="lock_database_back_root_summary">Veri tabanının kök ekranındaysanız, \'Geri\' düğmesine basarak veri tabanını kilitleyin</string>
     <string name="clear_clipboard_notification_title">Kapanışta temizle</string>
     <string name="clear_clipboard_notification_summary">Panonun süresi dolduğunda veya kullanmaya başladıktan sonra bildirim kapatıldığında veri tabanını kilitle</string>
     <string name="content_description_open_file">Dosya aç</string>
@@ -317,7 +317,7 @@
     <string name="lock_database_back_root_title">Kilitlemek için \'Geri\'ye basın</string>
     <string name="recycle_bin">Geri dönüşüm kutusu</string>
     <string name="keyboard_selection_entry_title">Girdi seçimi</string>
-    <string name="keyboard_selection_entry_summary">Bir girdiyi görüntülerken Magikeyboard\'da giriş alanlarını göster</string>
+    <string name="keyboard_selection_entry_summary">Bir girdiyi görüntülerken Magikeyboard\'da o girdiyi göster</string>
     <string name="delete_entered_password_title">Parolayı sil</string>
     <string name="delete_entered_password_summary">Veri tabanına bağlantı denemesinden sonra girilen parolayı siler</string>
     <string name="content_description_node_children">Alt düğüm</string>
@@ -326,10 +326,10 @@
     <string name="content_description_update_from_list">Güncelle</string>
     <string name="content_description_keyboard_close_fields">Alanları kapat</string>
     <string name="error_create_database_file">Bu parola ve anahtar dosyası ile veri tabanı oluşturulamıyor.</string>
-    <string name="menu_device_unlock_settings">Cihaz kilidini aç</string>
+    <string name="menu_device_unlock_settings">Aygıt kilidini aç</string>
     <string name="biometric">Biyometrik</string>
     <string name="biometric_auto_open_prompt_title">Otomatik açma istemi</string>
-    <string name="biometric_auto_open_prompt_summary">Veritabanı onu kullanacak şekilde ayarlanmışsa cihazın kilidini otomatik olarak talep et</string>
+    <string name="biometric_auto_open_prompt_summary">Veri tabanı onu kullanacak şekilde ayarlanmışsa aygıt kilidini otomatik olarak talep et</string>
     <string name="enable">Etkinleştir</string>
     <string name="disable">Devre dışı</string>
     <string name="master_key">Ana anahtar</string>
@@ -358,7 +358,7 @@
     <string name="contains_duplicate_uuid_procedure">Tekrarlananlar için yeni UUID\'ler oluşturarak sorunu çöz ve devam et\?</string>
     <string name="database_opened">Veri tabanı açıldı</string>
     <string name="clipboard_explanation_summary">Aygıtınızın panosunu kullanarak girdi alanlarını kopyalayın</string>
-    <string name="device_unlock_explanation_summary">Bir veritabanını daha kolay açmak için cihazın kilidini açmayı kullanın</string>
+    <string name="device_unlock_explanation_summary">Bir veri tabanını daha kolay açmak için aygıt kilidini açmayı kullanın</string>
     <string name="database_data_compression_title">Veri sıkıştırma</string>
     <string name="database_data_compression_summary">Veri sıkıştırma veri tabanı boyutunu azaltır</string>
     <string name="max_history_items_title">Azami sayı</string>
@@ -461,13 +461,13 @@
     <string name="error_save_read_only">Salt okunur olarak açılan bir veri tabanı için veri kaydına izin verilmiyor.</string>
     <string name="autofill_ask_to_save_data_summary">Form doldurma işlemi tamamlandığında verileri kaydetmek için sor</string>
     <string name="autofill_ask_to_save_data_title">Verileri kaydetmek için sor</string>
-    <string name="autofill_save_search_info_summary">Gelecekteki daha kolay kullanımlar için el ile giriş seçimi yaparken arama bilgilerini kaydetmeyi deneyin</string>
+    <string name="autofill_save_search_info_summary">Gelecekteki daha kolay kullanımlar için el ile girdi seçimi yaparken arama bilgilerini kaydetmeyi deneyin</string>
     <string name="autofill_save_search_info_title">Arama bilgilerini kaydet</string>
     <string name="autofill_close_database_summary">Otomatik doldurma seçiminden sonra veri tabanını kapat</string>
     <string name="autofill_close_database_title">Veri tabanını kapat</string>
     <string name="keyboard_previous_lock_summary">Veri tabanını kilitledikten sonra otomatik olarak önceki klavyeye dön</string>
     <string name="keyboard_previous_lock_title">Veri tabanını kilitle</string>
-    <string name="keyboard_save_search_info_summary">Gelecekteki daha kolay kullanımlar için el ile giriş seçimi yaparken paylaşılan bilgileri kaydetmeyi deneyin</string>
+    <string name="keyboard_save_search_info_summary">Gelecekteki daha kolay kullanımlar için el ile girdi seçimi yaparken paylaşılan bilgileri kaydetmeyi deneyin</string>
     <string name="keyboard_save_search_info_title">Paylaşılan bilgileri kaydet</string>
     <string name="notification">Bildirim</string>
     <string name="biometric_security_update_required">Biyometrik güvenlik güncellemesi gerekli.</string>
@@ -477,33 +477,33 @@
     <string name="search_mode">Arama modu</string>
     <string name="error_registration_read_only">Salt okunur bir veri tabanında yeni bir öge kaydetmeye izin verilmiyor.</string>
     <string name="error_field_name_already_exists">Alan adı zaten var.</string>
-    <string name="device_unlock_delete_all_key_warning">Cihaz kilit açma tanımayla ilgili tüm şifreleme anahtarları silinsin mi\?</string>
+    <string name="device_unlock_delete_all_key_warning">Aygıt kilidi açma tanımayla ilgili tüm şifreleme anahtarları silinsin mi?</string>
     <string name="device_credential_unlock_enable_summary">Veri tabanını açmak için aygıt kimlik bilgilerinizi kullanmanıza olanak tanır</string>
     <string name="device_credential_unlock_enable_title">Aygıt kimlik bilgisiyle kilit açma</string>
     <string name="device_credential">Aygıt kimlik bilgileri</string>
     <string name="credential_before_click_device_unlock_button">Parolayı yazın ve ardından bu düğmeye tıklayın.</string>
-    <string name="device_unlock_prompt_not_initialized">Cihaz kilit açma istemi başlatılamıyor.</string>
+    <string name="device_unlock_prompt_not_initialized">Aygıt kilit açma istemi başlatılamıyor.</string>
     <string name="unavailable">Kullanım dışı</string>
-    <string name="device_unlock_not_recognized">Cihaz kilit açma parmak izi tanınamadı</string>
-    <string name="device_unlock_invalid_key">Cihazın kilit açma anahtarı okunamıyor. Lütfen silin ve kilit açma tanıma prosedürünü tekrarlayın.</string>
-    <string name="device_unlock_prompt_extract_credential_message">Cihaz kilit açma verileriyle veritabanı kimlik bilgilerini çıkarın</string>
-    <string name="device_unlock_prompt_extract_credential_title">Cihaz kilidini tanıma</string>
-    <string name="device_unlock_prompt_store_credential_message">Cihaz kilit açma tanımayı kullanıyorsanız kasa ana kimlik bilgilerinizi yine de hatırlamanız gerekir.</string>
-    <string name="device_unlock_prompt_store_credential_title">Cihaz kilidini açma bağlantısı</string>
-    <string name="menu_keystore_remove_key">Cihaz kilit açma anahtarını sil</string>
+    <string name="device_unlock_not_recognized">Aygıt kilit açma parmak izi tanınamadı</string>
+    <string name="device_unlock_invalid_key">Aygıtın kilit açma anahtarı okunamıyor. Lütfen silin ve kilit açma tanıma işlemini tekrarlayın.</string>
+    <string name="device_unlock_prompt_extract_credential_message">Aygıt kilit açma verileriyle veri tabanı kimlik bilgilerini çıkarın</string>
+    <string name="device_unlock_prompt_extract_credential_title">Aygıt kilidini tanıma</string>
+    <string name="device_unlock_prompt_store_credential_message">Aygıt kilit açma tanımayı kullanıyorsanız kasa ana kimlik bilgilerinizi yine de hatırlamanız gerekir.</string>
+    <string name="device_unlock_prompt_store_credential_title">Aygıt kilidini açma bağlantısı</string>
+    <string name="menu_keystore_remove_key">Aygıt kilit açma anahtarını sil</string>
     <string name="enter">Enter</string>
     <string name="backspace">Backspace</string>
     <string name="select_entry">Girdi seç</string>
     <string name="back_to_previous_keyboard">Önceki klavyeye geri dön</string>
     <string name="custom_fields">Özel alanlar</string>
     <string name="education_device_unlock_summary">Veri tabanınızın kilidini hızlı bir şekilde açmak için parolanızı taranmış biyometrik veya aygıt kimlik bilgilerinize bağlayın.</string>
-    <string name="education_device_unlock_title">Cihaz veritabanı kilidini açma</string>
-    <string name="device_unlock_timeout">Cihaz kilidini açma zaman aşımı</string>
-    <string name="temp_device_unlock_timeout_summary">İçeriğini silmeden önce cihazın kilit açma kullanım süresi</string>
-    <string name="temp_device_unlock_timeout_title">Cihaz kilidini açma süresi doldu</string>
-    <string name="temp_device_unlock_enable_summary">Cihaz kilidini açmak için şifrelenmiş içerik saklamayın</string>
+    <string name="education_device_unlock_title">Aygıt veri tabanı kilidini açma</string>
+    <string name="device_unlock_timeout">Aygıt kilidini açma zaman aşımı</string>
+    <string name="temp_device_unlock_timeout_summary">İçeriğini silmeden önce aygıt kilidi açma kullanım süresi</string>
+    <string name="temp_device_unlock_timeout_title">Aygıt kilidini açma süresi doldu</string>
+    <string name="temp_device_unlock_enable_summary">Aygıt kilidini açmak için şifreli içerik saklamayın</string>
     <string name="temp_device_unlock_enable_title">Geçici kilit açma</string>
-    <string name="device_unlock_tap_delete">Cihaz kilit açma anahtarlarını silmek için dokunun</string>
+    <string name="device_unlock_tap_delete">Aygıt kilit açma anahtarlarını silmek için dokunun</string>
     <string name="content">İçerik</string>
     <string name="error_rebuild_list">Liste düzgün şekilde yeniden oluşturulamıyor.</string>
     <string name="error_database_uri_null">Veri tabanı URI\'si alınamıyor.</string>
@@ -518,7 +518,7 @@
     <string name="unit_mebibyte">MiB</string>
     <string name="unit_kibibyte">KiB</string>
     <string name="unit_byte">B</string>
-    <string name="error_otp_type">Mevcut OTP türü bu form tarafından tanınmıyor, doğrulaması artık belirteci doğru şekilde oluşturmayabilir.</string>
+    <string name="error_otp_type">Var olan OTP türü bu form tarafından tanınmıyor ve doğrulaması artık belirteci doğru şekilde oluşturmayabilir.</string>
     <string name="download_canceled">İptal edildi!</string>
     <string name="icon_section_custom">Özel</string>
     <string name="icon_section_standard">Standart</string>
@@ -595,7 +595,7 @@
     <string name="enable_keep_screen_on_title">Ekranı açık tut</string>
     <string name="show_entry_colors_title">Girdi renkleri</string>
     <string name="show_entry_colors_summary">Bir girdi için ön plan ve arka plan renklerini görüntüler</string>
-    <string name="enable_keep_screen_on_summary">Bir girişi izlerken veya düzenlerken ekranı açık tutun</string>
+    <string name="enable_keep_screen_on_summary">Bir girdiyi izlerken veya düzenlerken ekranı açık tutun</string>
     <string name="content_description_nav_header">Gezinme başlığı</string>
     <string name="navigation_drawer_open">Gezinme çekmecesi açık</string>
     <string name="navigation_drawer_close">Gezinme çekmecesi kapalı</string>
@@ -661,20 +661,16 @@
     <string name="unlock">Kilidi aç</string>
     <string name="master_key_settings_summary">Değişim, yenilenme</string>
     <string name="info">Bilgi</string>
-    <string name="education_validate_entry_title">Girişi doğrula</string>
+    <string name="education_validate_entry_title">Girdiyi doğrula</string>
     <string name="ask">Sor</string>
     <string name="menu_form_filling_settings_summary">Klavye, otomatik doldur, pano</string>
     <string name="configure">Yapılandır</string>
-    <string name="menu_appearance_settings_summary">Temalar, renkler, öznitellikler</string>
+    <string name="menu_appearance_settings_summary">Temalar, renkler, simgeler, yazı tipleri, öznitellikler</string>
     <string name="menu_security_settings_summary">Şifreleme, anahtar türetme işlevi</string>
-    <string name="menu_device_unlock_settings_summary">Biyometri, cihaz kimlik bilgisi</string>
-    <string name="education_validate_entry_summary">Girişinizi doğrulamayı ve veritabanınızı kaydetmeyi unutmayın.
-\n
-\nOtomatik kilitleme etkinleştirilirse ve değişiklik yaptığınızı unutursanız verilerinizi kaybetme riskiyle karşı karşıya kalırsınız.</string>
-    <string name="warning_database_notification_permission">Bildirim izni, veritabanının durumunu görüntülemenize ve kolayca erişilebilen bir düğmeyle kilitlemenize olanak tanır.
-\n
-\nBu izni aktifleştirmezseniz arka planda açık olan veritabanı, ön planda başka bir uygulama varken görünmeyecektir.</string>
-    <string name="unlock_and_link_biometric">Cihaz kilit açma bağlantısı</string>
+    <string name="menu_device_unlock_settings_summary">Biyometri, aygıt kimlik bilgisi</string>
+    <string name="education_validate_entry_summary">Girdinizi doğrulamayı ve veri tabanınızı kaydetmeyi unutmayın. \n \nOtomatik kilitleme etkinleştirilirse ve değişiklik yaptığınızı unutursanız verilerinizi kaybetme riskiyle karşı karşıya kalırsınız.</string>
+    <string name="warning_database_notification_permission">Bildirim izni, veri tabanının durumunu görüntülemenize ve kolayca erişilebilen bir düğmeyle kilitlemenize olanak tanır. \n \nBu izni etkinleştirmezseniz arka planda açık olan veri tabanı, ön planda başka bir uygulama varken görünmeyecektir.</string>
+    <string name="unlock_and_link_biometric">Aygıt kilit açma bağlantısı</string>
     <string name="warning_copy_permission">Pano bildirim özelliğini kullanmak için bildirim izni gereklidir.</string>
     <string name="menu_database_settings_summary">Meta veriler, geri dönüşüm kutusu, şablonlar, geçmiş</string>
     <string name="menu_app_settings_summary">Ara, kilit, geçmiş, özellikler</string>
@@ -693,10 +689,51 @@
     <string name="warning_database_info_changed_options_read_only">Veri tabanını en son değişikliklerle yeniden yükle.</string>
     <string name="generate_keyfile">Anahtar dosyası oluştur</string>
     <string name="nodes">Düğümler</string>
-    <string name="recursive_number_entries_title">Yinelenen giriş sayısı</string>
-    <string name="recursive_number_entries_summary">Bir gruptaki girişlerin sayısını yinelemeli olarak hesaplar</string>
+    <string name="recursive_number_entries_title">Yinelenen girdi sayısı</string>
+    <string name="recursive_number_entries_summary">Bir gruptaki girdilerin sayısını yinelemeli olarak hesaplar</string>
     <string name="warning_large_keyfile">Büyük bir anahtar dosya eklenmesi önerilmez, bu durum veri tabanının açılmasını engelleyebilir.</string>
     <string name="hide_templates_title">Şablonları gizle</string>
     <string name="hide_templates_summary">Şablonlar gösterilmiyor</string>
     <string name="error_otp_secret_length">Gizli anahtar en az %1$d karakter uzunluğunda olmalıdır.</string>
+    <string name="entry_application_id">Uygulama Kimliği</string>
+    <string name="warning_overwrite_data_title">Var olan verilerin üzerine yazılsın mı?</string>
+    <string name="warning_overwrite_data_description">Bu işlem, girdideki var olan verileri değiştirecektir. Geçmiş etkinleştirildiyse eski verileri geri alabilirsiniz.</string>
+    <string name="credential_provider">Kimlik bilgisi sağlayıcısı</string>
+    <string name="passkeys_close_database_title">Veri tabanını kapat</string>
+    <string name="passkeys_privileged_apps_title">Ayrıcalıklı uygulamalar</string>
+    <string name="passkeys_privileged_apps_summary">Ayrıcalıklı uygulamaların özel listesindeki tarayıcıları yönetin</string>
+    <string name="passkeys_privileged_apps_explanation">UYARI: Ayrıcalıklı bir uygulama, kimlik doğrulamanın kaynağını almak için bir ağ geçidi görevi görür. Güvenlik sorunlarını önlemek için uygulamanın doğruluğundan emin olun.</string>
+    <string name="passkeys_privileged_apps_ask_title">Uygulama tanınmıyor</string>
+    <string name="passkeys_missing_signature_app_ask_title">İmza eksik</string>
+    <string name="passkeys_auto_select_title">Otomatik seç</string>
+    <string name="passkeys_auto_select_summary">Yalnızca bir girdi varsa ve veri tabanı açıksa, yalnızca isteyen uygulama uyumluysa otomatik seç</string>
+    <string name="passkeys_backup_eligibility_summary">Oluşturma sırasında, ortak anahtar kimlik bilgisi kaynağının yedeklenmesine izin verilip verilmeyeceğini belirleyin</string>
+    <string name="passkeys_backup_state_title">Yedekleme Durumu</string>
+    <string name="passkeys_backup_state_summary">Kimlik bilgilerinin yedeklendiğini ve tek bir aygıtın kaybolmasına karşı korunduğunu belirtir</string>
+    <string name="passkey_service_name">KeePassDX Kimlik Bilgisi Sağlayıcısı</string>
+    <string name="passkey_database_username">KeePassDX Veri Tabanı</string>
+    <string name="passkey_locked_database_description">Kilidini açmak için seçin</string>
+    <string name="passkeys">Geçiş anahtarları</string>
+    <string name="passkeys_explanation_summary">Hızlı ve güvenli parolasız oturum açma için geçiş anahtarlarını yapılandırın</string>
+    <string name="passkeys_preference_title">Geçiş anahtarı ayarları</string>
+    <string name="passkeys_close_database_summary">Geçiş anahtarı seçildikten sonra veri tabanını kapatın</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s, geçiş anahtarı eylemi gerçekleştirmeye çalışıyor.\n\nAyrıcalıklı uygulamalar listesine eklemek ister misiniz?</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">UYARI: Geçiş anahtarı başka bir istemciden oluşturuldu veya imza silindi. Güvenlik sorunlarını önlemek için, kimlik doğrulamasını yapmak istediğiniz uygulamanın aynı hizmetin parçası ve güvenilir olduğundan emin olun.\nUygulama bir tarayıcıysa, imzasını girdiye değil, ayarlardaki ayrıcalıklı uygulamalar listesine ekleyin.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s tanınmıyor ve var olan bir geçiş anahtarıyla kimlik doğrulaması yapmaya çalışıyor.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Uygulama imzası geçiş anahtarı girdisine eklensin mi?</string>
+    <string name="passkeys_backup_eligibility_title">Yedekleme Uygunluğu</string>
+    <string name="credential_provider_service_subtitle">Geçiş anahtarları, Otomatik doldurma kimlik bilgisi sağlayıcısı</string>
+    <string name="passkey">Geçiş anahtarı</string>
+    <string name="passkey_creation_description">Geçiş anahtarını yeni girdiye kaydet</string>
+    <string name="passkey_update_description">%1$s içindeki geçiş anahtarını güncelle</string>
+    <string name="passkey_selection_username">Geçiş anahtarı bulunamadı</string>
+    <string name="passkey_selection_description">Var olan bir geçiş anahtarı seçin</string>
+    <string name="passkey_username">Geçiş Anahtarı Kullanıcı Adı</string>
+    <string name="passkey_private_key">Geçiş Anahtarı Özel Anahtarı</string>
+    <string name="passkey_credential_id">Geçiş Anahtarı Kimlik Bilgisi</string>
+    <string name="passkey_user_handle">Geçiş Anahtarı Kullanıcı Kimliği</string>
+    <string name="passkey_relying_party">Geçiş Anahtarı Güvenilen Taraf</string>
+    <string name="passkey_backup_eligibility">Geçiş Anahtarı Yedekleme Uygunluğu</string>
+    <string name="passkey_backup_state">Geçiş Anahtarı Yedekleme Durumu</string>
+    <string name="error_passkey_result">Geçiş anahtarı döndürülemiyor</string>
 </resources>

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

@@ -29,7 +29,7 @@
     <string name="application">Застосунок</string>
     <string name="menu_app_settings">Налаштування застосунку</string>
     <string name="brackets">Дужки</string>
-    <string name="file_manager_install_description">Для створення, відкриття та збереження файлів баз даних потрібен файловий менеджер, який приймає дії Intent ACTION_CREATE_DOCUMENT та ACTION_OPEN_DOCUMENT.</string>
+    <string name="file_manager_install_description">Для створення, відкриття та збереження файлів бази даних необхідний файловий менеджер, який підтримує дії ACTION_CREATE_DOCUMENT та ACTION_OPEN_DOCUMENT.</string>
     <string name="clipboard_cleared">Буфер обміну очищено</string>
     <string name="clipboard_timeout">Час до очищення буфера обміну</string>
     <string name="clipboard_timeout_summary">Тривалість зберігання в буфері обміну (якщо підтримується пристроєм)</string>
@@ -187,7 +187,7 @@
     <string name="menu_paste">Вставити</string>
     <string name="menu_move">Перемістити</string>
     <string name="menu_copy">Скопіювати</string>
-    <string name="content_description_keyfile_checkbox">Поле файла ключа</string>
+    <string name="content_description_keyfile_checkbox">Прапорець «Ключ файл»</string>
     <string name="menu_master_key_settings">Налаштування головного ключа</string>
     <string name="menu_security_settings">Налаштування безпеки</string>
     <string name="menu_device_unlock_settings">Розблокування пристрою</string>
@@ -244,7 +244,7 @@
     <string name="validate">Перевірити</string>
     <string name="content_description_entry_icon">Піктограма запису</string>
     <string name="content_description_repeat_toggle_password_visibility">Повторне перемикання видимості пароля</string>
-    <string name="content_description_password_checkbox">Поле пароля</string>
+    <string name="content_description_password_checkbox">Прапорець «Пароль»</string>
     <string name="content_description_add_node">Додати вузол</string>
     <string name="content_description_node_children">Дочірні вузли</string>
     <string name="unavailable_feature_hardware">Не вдалося знайти відповідне обладнання.</string>
@@ -378,7 +378,7 @@
     <string name="device_unlock">Розблокування пристрою</string>
     <string name="lock_database_show_button_summary">Показувати кнопку блокування в інтерфейсі користувача</string>
     <string name="lock_database_show_button_title">Показувати кнопку блокування</string>
-    <string name="lock_database_back_root_summary">Блокувати базу даних, коли користувач натисне кнопку назад на головному екрані</string>
+    <string name="lock_database_back_root_summary">Натисніть «Назад», щоб заблокувати базу даних, якщо ви перебуваєте на головному екрані бази дани</string>
     <string name="lock_database_back_root_title">Натисніть \'Назад\', щоб заблокувати</string>
     <string name="lock_database_screen_off_summary">Блокувати базу даних за кілька секунд після вимкнення екрана</string>
     <string name="lock_database_screen_off_title">Блокування екрана</string>
@@ -395,7 +395,7 @@
     <string name="password_size_title">Довжина створюваного пароля</string>
     <string name="autofill_preference_title">Налаштування автозаповнення</string>
     <string name="set_credential_provider_service_title">Встановити типовою службою автозаповнення</string>
-    <string name="autofill_explanation_summary">Увімкнути автозаповнення для швидкого заповнення форм в інших застосунках</string>
+    <string name="autofill_explanation_summary">Налаштуйте автозаповнення для швидкого заповнення форм в інших застосунках</string>
     <string name="autofill_sign_in_prompt">Увійти за допомогою KeePassDX</string>
     <string name="autofill">Автозаповнення</string>
     <string name="general">Загальні</string>
@@ -523,7 +523,7 @@
     <string name="unit_mebibyte">МіБ</string>
     <string name="unit_kibibyte">КіБ</string>
     <string name="unit_byte">Б</string>
-    <string name="error_otp_type">Ця форма не розпізнає наявний тип OTP, його перевірка може надалі створювати не дійсний токен.</string>
+    <string name="error_otp_type">Наявний тип OTP не розпізнається цією формою, і його перевірка може більше не генерувати токен правильно.</string>
     <string name="download_canceled">Скасовано!</string>
     <string name="icon_section_custom">Власні</string>
     <string name="icon_section_standard">Стандартні</string>
@@ -639,7 +639,7 @@
     <string name="title_case">Регістр Заголовка</string>
     <string name="word_separator">Роздільник</string>
     <string name="upper_case">ВЕРХНІЙ РЕГІСТР</string>
-    <string name="content_description_hardware_key_checkbox">Прапорець апаратного ключа</string>
+    <string name="content_description_hardware_key_checkbox">Прапорець «Апаратний ключ»</string>
     <string name="hardware_key">Апаратний ключ</string>
     <string name="error_XML_malformed">Хибний XML.</string>
     <string name="error_response_already_provided">Відповідь уже надана.</string>
@@ -674,7 +674,7 @@
     <string name="ask">Запитувати</string>
     <string name="configure">Сконфігурувати</string>
     <string name="unlock_and_link_biometric">Посилання для розблокування пристрою</string>
-    <string name="menu_appearance_settings_summary">Теми, кольори, атрибути</string>
+    <string name="menu_appearance_settings_summary">Теми, кольори, піктограми, шрифти, атрибути</string>
     <string name="unlock">Розблокувати</string>
     <string name="education_validate_entry_title">Перевірте запис</string>
     <string name="education_validate_entry_summary">Не забувайте перевірити свій запис і зберегти базу даних.
@@ -704,4 +704,45 @@
     <string name="hide_templates_summary">Шаблони не показано</string>
     <string name="warning_large_keyfile">Не рекомендується додавати великий файл ключа, це може завадити створенню бази даних.</string>
     <string name="error_otp_secret_length">Секретний ключ повинен містити не менше %1$d символів.</string>
+    <string name="entry_application_id">ID застосунку</string>
+    <string name="warning_overwrite_data_title">Перезаписати наявні дані?</string>
+    <string name="warning_overwrite_data_description">Ця дія замінить наявні дані у записі. Ви можете відновити старі дані, якщо ввімкнено історію.</string>
+    <string name="credential_provider">Постачальник облікових даних</string>
+    <string name="passkeys">Ключі доступу</string>
+    <string name="passkeys_explanation_summary">Налаштуйте ключі доступу для швидкого та безпечного входу без пароля</string>
+    <string name="passkeys_preference_title">Налаштування ключів доступу</string>
+    <string name="passkeys_close_database_title">Закрити базу даних</string>
+    <string name="passkeys_close_database_summary">Закрити базу даних після вибору ключа доступу</string>
+    <string name="passkeys_privileged_apps_title">Привілейовані програми</string>
+    <string name="passkeys_privileged_apps_summary">Керуйте браузерами у спеціальному списку привілейованих програм</string>
+    <string name="passkeys_privileged_apps_explanation">ПОПЕРЕДЖЕННЯ: Привілейована програма діє як шлюз для отримання інформації про походження автентифікації. Переконайтеся в її легітимності, щоб уникнути проблем із безпекою.</string>
+    <string name="passkeys_privileged_apps_ask_title">Програма не розпізнається</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s намагається виконати дію з ключем доступу.\n\nДодати до списку привілейованих програм?</string>
+    <string name="passkeys_missing_signature_app_ask_title">Відсутній підпис</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">ПОПЕРЕДЖЕННЯ: Ключ доступу було створено з іншого клієнта або підпис було видалено. Щоб уникнути проблем із безпекою, переконайтеся, що програма, яку ви хочете автентифікувати, є частиною тієї самої служби та є легітимною.\nЯкщо ця програма є браузером, не додавайте її підпис до запису, а додайте до списку привілейованих програм у налаштуваннях.</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s не розпізнається і намагається пройти автентифікацію за допомогою наявного ключа доступу.</string>
+    <string name="passkeys_missing_signature_app_ask_question">Додати підпис програми до запису ключа доступу?</string>
+    <string name="passkeys_auto_select_title">Автоматичний вибір</string>
+    <string name="passkeys_auto_select_summary">Автоматичний вибір, якщо є лише один запис і база даних відкрита, лише якщо застосунок, що запитує це, сумісний</string>
+    <string name="passkeys_backup_eligibility_title">Право на резервне копіювання</string>
+    <string name="passkeys_backup_eligibility_summary">Визначити під час створення, чи дозволено створювати резервні копії джерела облікових даних відкритого ключа</string>
+    <string name="passkeys_backup_state_title">Стан резервного копіювання</string>
+    <string name="passkeys_backup_state_summary">Показувати, що облікові дані резервно копіюються та захищені від втрати одного пристрою</string>
+    <string name="credential_provider_service_subtitle">Ключі доступу, постачальник даних для автозаповнення</string>
+    <string name="passkey">Ключ доступу</string>
+    <string name="passkey_service_name">Постачальник облікових даних KeePassDX</string>
+    <string name="passkey_creation_description">Зберегти ключ доступу у новому записі</string>
+    <string name="passkey_update_description">Оновити ключ доступу в %1$s</string>
+    <string name="passkey_selection_username">Ключ доступу не знайдено</string>
+    <string name="passkey_selection_description">Вибрати наявний ключ доступу</string>
+    <string name="passkey_database_username">База даних KeePassDX</string>
+    <string name="passkey_locked_database_description">Виберіть, щоб розблокувати</string>
+    <string name="passkey_username">Ім\'я користувача ключа доступу</string>
+    <string name="passkey_private_key">Приватний ключ ключа доступу</string>
+    <string name="passkey_credential_id">Ідентифікатор облікового запису ключа доступу</string>
+    <string name="passkey_user_handle">Ідентифікатор користувача ключа доступу</string>
+    <string name="passkey_relying_party">Сторона, що покладається на ключ доступу</string>
+    <string name="passkey_backup_eligibility">Право на резервне копіювання ключа доступу</string>
+    <string name="passkey_backup_state">Стан резервного копіювання ключа доступу</string>
+    <string name="error_passkey_result">Не вдалося повернути ключ доступу</string>
 </resources>

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

@@ -205,14 +205,14 @@
     <string name="build_label">构建 %1$s</string>
     <string name="encrypted_value_stored">加密密码已保存</string>
     <string name="unavailable">不可用</string>
-    <string name="set_credential_provider_service_title">设为默认自动填充服务</string>
-    <string name="autofill_explanation_summary">启用自动填充功能，以快速填写其他应用中的表单</string>
+    <string name="set_credential_provider_service_title">凭据提供程序服务</string>
+    <string name="autofill_explanation_summary">配置自动填充功能以快速填写其他应用中的表单</string>
     <string name="password_size_title">密码生成长度</string>
     <string name="password_size_summary">设置生成密码的默认长度</string>
     <string name="list_password_generator_options_title">密码字符集</string>
     <string name="list_password_generator_options_summary">设置密码生成时所允许的字符集</string>
     <string name="clipboard_notifications_summary">显示剪贴板通知，以便在查看条目时复制字段</string>
-    <string name="clipboard_warning">如自动清空剪切板失败，则请手动清空。</string>
+    <string name="clipboard_warning">如果自动删除剪贴板失败，请手动删除其历史记录。</string>
     <string name="lock_database_screen_off_title">锁定屏幕</string>
     <string name="lock_database_screen_off_summary">屏幕关闭几秒钟后锁定数据库</string>
     <string name="biometric_unlock_enable_title">生物识别解锁</string>
@@ -250,7 +250,7 @@
     <string name="keyboard_key_vibrate_title">按键震动</string>
     <string name="keyboard_key_sound_title">按键声音</string>
     <string name="allow_no_password_title">允许主密钥为空</string>
-    <string name="allow_no_password_summary">如果没有凭证被选中，允许轻按“打开”按钮</string>
+    <string name="allow_no_password_summary">如果未选择任何凭据，仍可点按“打开”按钮</string>
     <string name="enable_education_screens_title">新手引导</string>
     <string name="enable_education_screens_summary">高亮界面元素来学习本应用工作方式</string>
     <string name="reset_education_screens_title">重置新手引导</string>
@@ -301,8 +301,8 @@
     <string name="html_text_dev_feature_upgrade">别忘了通过安装新版本来保持你的应用是最新的。</string>
     <string name="selection_mode">选择模式</string>
     <string name="do_not_kill_app">不要终止应用…</string>
-    <string name="lock_database_back_root_title">按返回键以锁定</string>
-    <string name="lock_database_back_root_summary">当用户单击根屏幕上的返回按钮时锁定数据库</string>
+    <string name="lock_database_back_root_title">按“返回”锁定</string>
+    <string name="lock_database_back_root_summary">如果您位于数据库的根屏幕，请按“返回”锁定数据库</string>
     <string name="clear_clipboard_notification_title">关闭应用时清空剪贴板</string>
     <string name="clear_clipboard_notification_summary">剪贴板持续时间过期或通知在您开始使用后关闭时，锁定数据库</string>
     <string name="recycle_bin">回收站</string>
@@ -324,7 +324,7 @@
     <string name="content_description_password_length">密码长度</string>
     <string name="entry_add_field">添加字段</string>
     <string name="content_description_remove_field">删除字段</string>
-    <string name="entry_UUID">UUID，通用唯一识别码（Universally Unique Identifier）</string>
+    <string name="entry_UUID">UUID</string>
     <string name="error_move_entry_here">你不能将条目移到此处。</string>
     <string name="error_copy_entry_here">您不能将条目复制到此处。</string>
     <string name="list_groups_show_number_entries_title">显示条目数量</string>
@@ -341,7 +341,7 @@
     <string name="disable">禁用</string>
     <string name="master_key">主密钥</string>
     <string name="security">安全</string>
-    <string name="entry_history">修改历史</string>
+    <string name="entry_history">历史</string>
     <string name="entry_setup_otp">设置 OTP</string>
     <string name="otp_type">OTP 类型</string>
     <string name="otp_secret">OTP 密钥</string>
@@ -431,10 +431,10 @@
     <string name="error_label_exists">该标签已经存在。</string>
     <string name="autofill_block_restart">重新启动包含该表单的应用以激活拦截。</string>
     <string name="autofill_block">阻止自动填充</string>
-    <string name="autofill_web_domain_blocklist_summary">禁止在下列域名中自动填充凭证</string>
-    <string name="autofill_web_domain_blocklist_title">网址域名黑名单</string>
-    <string name="autofill_application_id_blocklist_summary">禁止应用自动填充的黑名单</string>
-    <string name="autofill_application_id_blocklist_title">应用拦截列表</string>
+    <string name="autofill_web_domain_blocklist_summary">用于阻止网络域名自动填充的阻止名单</string>
+    <string name="autofill_web_domain_blocklist_title">网络域名阻止名单</string>
+    <string name="autofill_application_id_blocklist_summary">用于阻止应用自动填充的阻止名单</string>
+    <string name="autofill_application_id_blocklist_title">应用阻止名单</string>
     <string name="filter">过滤器</string>
     <string name="subdomain_search_summary">搜索带有子域约束的网址域名</string>
     <string name="subdomain_search_title">子域搜索</string>
@@ -453,7 +453,7 @@
     <string name="warning_file_too_big">KeePass 数据库应该只包含小的实用程序文件（例如 PGP 密钥文件）。
 \n
 \n上传大文件会使增大数据库体积并降低性能。</string>
-    <string name="content_description_credentials_information">凭证信息</string>
+    <string name="content_description_credentials_information">凭据信息</string>
     <string name="warning_remove_unlinked_attachment">删除未链接的数据可能会减少数据库的大小，但也可能会删除用于 KeePass 插件的数据。</string>
     <string name="warning_sure_remove_data">无论如何要删除这些数据\?</string>
     <string name="warning_empty_keyfile">不推荐添加一个空的密钥文件。</string>
@@ -476,7 +476,7 @@
     <string name="keyboard_save_search_info_title">保存分享的信息</string>
     <string name="notification">通知</string>
     <string name="biometric_security_update_required">需要生物识别安全更新。</string>
-    <string name="configure_biometric">未登记生物识别或设备凭证。</string>
+    <string name="configure_biometric">未注册生物识别或设备凭据。</string>
     <string name="warning_empty_recycle_bin">从回收站永久删除所有节点？</string>
     <string name="save_mode">保存模式</string>
     <string name="search_mode">搜索模式</string>
@@ -507,7 +507,7 @@
     <string name="temp_device_unlock_timeout_title">设备解锁过期</string>
     <string name="temp_device_unlock_enable_summary">使用设备解锁但不存储任何加密内容</string>
     <string name="temp_device_unlock_enable_title">临时性设备解锁</string>
-    <string name="device_unlock_tap_delete">轻按删除设备解锁密钥</string>
+    <string name="device_unlock_tap_delete">点按删除设备解锁密钥</string>
     <string name="content">内容</string>
     <string name="error_rebuild_list">无法正确地重建列表。</string>
     <string name="error_database_uri_null">无法检索数据库 URI 。</string>
@@ -522,7 +522,7 @@
     <string name="unit_mebibyte">兆字节</string>
     <string name="unit_kibibyte">千位字节</string>
     <string name="unit_byte">字节</string>
-    <string name="error_otp_type">现有的 OTP 类型未被此表单所识别，其验证可能不再正确生成令牌。</string>
+    <string name="error_otp_type">现有的 OTP 类型未被此表单所识别，并且其验证可能不再正确生成令牌。</string>
     <string name="download_canceled">已取消！</string>
     <string name="icon_section_custom">自定义</string>
     <string name="icon_section_standard">标准</string>
@@ -671,7 +671,7 @@
     <string name="later">以后再说</string>
     <string name="configure">配置</string>
     <string name="unlock_and_link_biometric">设备解锁链接</string>
-    <string name="menu_appearance_settings_summary">主题、颜色、属性</string>
+    <string name="menu_appearance_settings_summary">主题、颜色、图标、字体、属性</string>
     <string name="unlock">解锁</string>
     <string name="education_validate_entry_title">验证条目</string>
     <string name="info">信息</string>
@@ -703,4 +703,45 @@
     <string name="nodes">节点</string>
     <string name="recursive_number_entries_title">条目的递归数</string>
     <string name="error_otp_secret_length">密钥长度至少为 %1$d 个字符。</string>
+    <string name="passkeys_missing_signature_app_ask_message">%1$s 未被识别，并尝试使用现有通行密钥进行身份验证。</string>
+    <string name="entry_application_id">应用 ID</string>
+    <string name="warning_overwrite_data_title">覆盖现有数据？</string>
+    <string name="warning_overwrite_data_description">此操作将替换条目中的现有数据，如果启用了历史记录，您可以检索旧数据。</string>
+    <string name="passkeys">通行密钥‌</string>
+    <string name="passkeys_explanation_summary">配置通行密钥以实现快速安全的无密码登录‌</string>
+    <string name="passkeys_preference_title">通行密钥设置</string>
+    <string name="passkeys_close_database_title">关闭数据库‌</string>
+    <string name="passkeys_close_database_summary">在选择通行密钥后关闭数据库</string>
+    <string name="passkeys_privileged_apps_title">特权应用</string>
+    <string name="passkey">通行密钥‌</string>
+    <string name="passkey_creation_description">在新条目中保存通行密钥‌</string>
+    <string name="passkey_update_description">在 %1$s 中更新通行密钥‌</string>
+    <string name="passkey_selection_username">未找到通行密钥‌</string>
+    <string name="passkey_selection_description">选择现有通行密钥‌</string>
+    <string name="passkey_database_username">KeePassDX 数据库</string>
+    <string name="passkey_username">通行密钥用户名</string>
+    <string name="passkey_private_key">通行密钥私钥‌</string>
+    <string name="passkey_credential_id">通行密钥凭据 ID‌</string>
+    <string name="passkey_relying_party">通行密钥依赖方</string>
+    <string name="passkey_backup_eligibility">通行密钥备份资格‌</string>
+    <string name="passkey_backup_state">通行密钥备份状态‌</string>
+    <string name="error_passkey_result">无法返回通行密钥</string>
+    <string name="passkeys_backup_eligibility_title">备份资格‌</string>
+    <string name="passkeys_backup_state_title">备份状态‌</string>
+    <string name="passkeys_auto_select_title">自动选择</string>
+    <string name="passkeys_missing_signature_app_ask_title">签名缺失</string>
+    <string name="passkey_user_handle">通行密钥用户句柄‌</string>
+    <string name="passkey_locked_database_description">选择以解锁</string>
+    <string name="credential_provider">凭据提供程序</string>
+    <string name="passkey_service_name">KeePassDX 凭据提供程序</string>
+    <string name="credential_provider_service_subtitle">通行密钥、自动填充凭据提供程序‌</string>
+    <string name="passkeys_privileged_apps_summary">管理自定义特权应用列表中的浏览器</string>
+    <string name="passkeys_privileged_apps_ask_title">应用未被识别</string>
+    <string name="passkeys_privileged_apps_ask_message">%1$s 尝试执行通行密钥操作。\n\n是否将其添加到特权应用列表？</string>
+    <string name="passkeys_privileged_apps_explanation">警告：特权应用充当检索身份验证来源的网关。请确保其合法性以避免安全问题。</string>
+    <string name="passkeys_auto_select_summary">仅当请求的应用兼容时，如果只有一个条目且数据库打开，则自动选择</string>
+    <string name="passkeys_backup_eligibility_summary">在创建时确定是否允许备份公钥凭据来源</string>
+    <string name="passkeys_backup_state_summary">指示凭据已备份并受到保护，防止单设备丢失的影响</string>
+    <string name="passkeys_missing_signature_app_ask_explanation">警告：通行密钥是从其他客户端创建的，或者签名已被删除。请确保您要验证的应用属于同一服务并且合法，以避免安全问题。\n如果应用是浏览器，请勿将其签名添加到条目中，而是添加到设置中的特权应用列表中。</string>
+    <string name="passkeys_missing_signature_app_ask_question">是否将应用签名添加到通行密钥条目？‌</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -192,7 +192,7 @@
     <string name="error_otp_counter">Counter must be between %1$d and %2$d.</string>
     <string name="error_otp_period">Period must be between %1$d and %2$d seconds.</string>
     <string name="error_otp_digits">Token must contain %1$d to %2$d digits.</string>
-    <string name="error_otp_type">The existing OTP type is not recognized by this form, its validation may no longer correctly generate the token.</string>
+    <string name="error_otp_type">The existing OTP type is not recognized by this form, and its validation may no longer correctly generate the token.</string>
     <string name="error_string_type">This text does not match the requested item.</string>
     <string name="error_registration_read_only">Saving a new item is not allowed in a read-only database.</string>
     <string name="error_field_name_already_exists">The field name already exists.</string>
@@ -461,7 +461,7 @@
     <string name="lock_database_screen_off_title">Screen lock</string>
     <string name="lock_database_screen_off_summary">Lock the database after a few seconds once the screen is off</string>
     <string name="lock_database_back_root_title">Press \'Back\' to lock</string>
-    <string name="lock_database_back_root_summary">Lock the database when the user clicks the back button on the root screen</string>
+    <string name="lock_database_back_root_summary">Press \'Back\' to lock the database if you\'re at the root screen of the database</string>
     <string name="lock_database_show_button_title">Show lock button</string>
     <string name="lock_database_show_button_summary">Displays the lock button in the user interface</string>
     <string name="content">Content</string>

app/src/main/res/xml/dataset_service.xml

@@ -55,7 +55,7 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
         android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="com.brave.browser"
-        android:maxLongVersionCode="10000000000" />
+        android:maxLongVersionCode="427912623" />
     <compatibility-package
         android:name="com.brave.browser_beta"
         android:maxLongVersionCode="10000000000" />
@@ -263,6 +263,9 @@ Settings Activity. This is pointed to in the service's meta-data in the applicat
     <compatibility-package
         android:name="org.ironfoxoss.ironfox"
         android:maxLongVersionCode="10000000000" />
+    <compatibility-package
+        android:name="org.ironfoxoss.ironfox.nightly"
+        android:maxLongVersionCode="10000000000" />
     <compatibility-package
         android:name="org.mozilla.fenix"
         android:maxLongVersionCode="10000000000" />

database/src/main/java/com/kunzisoft/keepass/database/element/DateInstant.kt

@@ -224,6 +224,10 @@ class DateInstant : Parcelable {
         return this.mInstant.isAfter(dateInstant.mInstant)
     }
 
+    fun isEquals(dateInstant: DateInstant): Boolean {
+        return this.mInstant.isEqual(dateInstant.mInstant)
+    }
+
     fun compareTo(other: DateInstant): Int {
         return mInstant.compareTo(other.mInstant)
     }

database/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt

@@ -433,6 +433,32 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
         }
     }
 
+    /**
+     * Return the real parent in database from a group defined as parent
+     * If the parent is null, simply return the root group
+     * Guaranteed that a return group is linked to the database tree through its ancestors
+     */
+    private fun getAttachedParent(
+        group: GroupKDBX?
+    ): GroupKDBX {
+        var realParent: GroupKDBX = database.rootGroup!!
+        group?.let { parent ->
+            val parentInDatabase = database.getGroupById(parent.nodeId)
+            if (parentInDatabase == null) {
+                realParent = GroupKDBX().apply {
+                    updateWith(parent, updateParents = false)
+                }
+                database.addGroupTo(
+                    realParent,
+                    getAttachedParent(parent.parent)
+                )
+            } else {
+                realParent = parentInDatabase
+            }
+        }
+        return realParent
+    }
+
     /**
      * Utility method to merge a KDBX entry
      */
@@ -443,10 +469,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
 
         databaseToMerge.getEntryById(entryId)?.let { srcEntryToMerge ->
             // Retrieve parent in current database
-            var parentEntryToMerge: GroupKDBX? = null
-            srcEntryToMerge.parent?.nodeId?.let {
-                parentEntryToMerge = database.getGroupById(it)
-            }
+            val parentEntryToMerge: GroupKDBX = getAttachedParent(srcEntryToMerge.parent)
             val entryToMerge = EntryKDBX().apply {
                 updateWith(srcEntryToMerge, copyHistory = true, updateParents = false)
             }
@@ -478,57 +501,55 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
                 // If it's a deleted object, but another instance was updated
                 // If entry parent to add exists and in current database
                 if ((deletedObject == null
-                    || deletedObject.deletionTime.isBefore(entryToMerge.lastModificationTime))
-                    && parentEntryToMerge != null) {
+                    || deletedObject.deletionTime.isBefore(entryToMerge.lastModificationTime))) {
                     database.addEntryTo(entryToMerge, parentEntryToMerge)
                 }
             } else {
                 // Merge independently custom data
                 mergeCustomData(entry.customData, entryToMerge.customData)
                 // Merge by modification time
-                if (entry.lastModificationTime.isBefore(entryToMerge.lastModificationTime)
-                ) {
-                    addHistory(entry, entryToMerge)
-                    if (parentEntryToMerge == entry.parent) {
-                        entry.updateWith(entryToMerge, copyHistory = true, updateParents = false)
-                    } else {
-                        // Update entry with databaseEntryToMerge and merge history
-                        database.removeEntryFrom(entry, entry.parent)
-                        if (parentEntryToMerge != null) {
-                            database.addEntryTo(entryToMerge, parentEntryToMerge)
-                        }
-                    }
-                } else if (entry.lastModificationTime.isAfter(entryToMerge.lastModificationTime)
-                ) {
-                    addHistory(entryToMerge, entry)
+                if (entry.lastModificationTime.isBefore(entryToMerge.lastModificationTime)) {
+                    // Update entry with databaseEntryToMerge and merge history
+                    entryToMerge.addHistoryFrom(entry)
+                    entry.updateWith(entryToMerge, copyHistory = true, updateParents = false)
+                    // Move the current entry to the verified location
+                    database.removeEntryFrom(entry, entry.parent)
+                    database.addEntryTo(entry, parentEntryToMerge)
+                } else if (entry.lastModificationTime.isAfter(entryToMerge.lastModificationTime)) {
+                    // Don't touch the location but update the entry history
+                    entry.addHistoryFrom(entryToMerge)
+                } else if (entry.lastModificationTime.isEquals(entryToMerge.lastModificationTime)) {
+                    // If it's the same modification time, simply move entry to the right location,
+                    // Current entry and entry to merge are normally the same
+                    database.removeEntryFrom(entry, entry.parent)
+                    database.addEntryTo(entry, parentEntryToMerge)
                 }
             }
         }
     }
 
     /**
-     * Utility method to merge an history from an [entryA] to an [entryB],
-     * [entryB] is modified
+     * Utility method to merge an history from an [entryA]
      */
-    private fun addHistory(entryA: EntryKDBX, entryB: EntryKDBX) {
+    private fun EntryKDBX.addHistoryFrom(entryA: EntryKDBX) {
         // Keep entry as history if already not present
         entryA.history.forEach { history ->
             // If history not present
-            if (!entryB.history.any {
+            if (!this.history.any {
                     it.lastModificationTime == history.lastModificationTime
                 }) {
-                entryB.addEntryToHistory(history)
+                this.addEntryToHistory(history)
             }
         }
         // Last entry not present
-        if (entryB.history.find {
+        if (this.history.find {
                 it.lastModificationTime == entryA.lastModificationTime
             } == null) {
             val history = EntryKDBX().apply {
                 updateWith(entryA, copyHistory = false, updateParents = false)
                 parent = null
             }
-            entryB.addEntryToHistory(history)
+            this.addEntryToHistory(history)
         }
     }
 
@@ -542,10 +563,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
 
         databaseToMerge.getGroupById(groupId)?.let { srcGroupToMerge ->
             // Retrieve parent in current database
-            var parentGroupToMerge: GroupKDBX? = null
-            srcGroupToMerge.parent?.nodeId?.let {
-                parentGroupToMerge = database.getGroupById(it)
-            }
+            val parentGroupToMerge: GroupKDBX = getAttachedParent(srcGroupToMerge.parent)
             val groupToMerge = GroupKDBX().apply {
                 updateWith(srcGroupToMerge, updateParents = false)
             }
@@ -553,24 +571,24 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
             if (group == null) {
                 // If group parent to add exists and in current database
                 if ((deletedObject == null
-                    || deletedObject.deletionTime.isBefore(groupToMerge.lastModificationTime))
-                    && parentGroupToMerge != null) {
+                    || deletedObject.deletionTime.isBefore(groupToMerge.lastModificationTime))) {
                     database.addGroupTo(groupToMerge, parentGroupToMerge)
                 }
             } else {
                 // Merge independently custom data
                 mergeCustomData(group.customData, groupToMerge.customData)
                 // Merge by modification time
-                if (group.lastModificationTime.isBefore(groupToMerge.lastModificationTime)
-                ) {
-                    if (parentGroupToMerge == group.parent) {
-                        group.updateWith(groupToMerge, false)
-                    } else {
-                        database.removeGroupFrom(group, group.parent)
-                        if (parentGroupToMerge != null) {
-                            database.addGroupTo(groupToMerge, parentGroupToMerge)
-                        }
-                    }
+                if (group.lastModificationTime.isBefore(groupToMerge.lastModificationTime)) {
+                    group.updateWith(groupToMerge, updateParents = false)
+                    // Update the current group location to the verified one
+                    database.removeGroupFrom(group, group.parent)
+                    database.addGroupTo(group, parentGroupToMerge)
+                } else if (group.lastModificationTime.isAfter(group.lastModificationTime)) {
+                    // Don't touch the location
+                } else if (group.lastModificationTime.isEquals(groupToMerge.lastModificationTime)) {
+                    // If it's the same modification time, simply move group to the right location
+                    database.removeGroupFrom(group, group.parent)
+                    database.addGroupTo(group, parentGroupToMerge)
                 }
             }
         }

database/src/main/java/com/kunzisoft/keepass/model/AppOriginEntryField.kt

@@ -71,7 +71,7 @@ object AppOriginEntryField {
     /**
      * Useful to detect if an other KeePass compatibility app already add a web domain or an app id
      */
-    private fun EntryInfo.containsDomainOrApplicationId(search: String): Boolean {
+    fun EntryInfo.containsDomainOrApplicationId(search: String): Boolean {
         if (url.contains(search))
             return true
         return customFields.find {
@@ -159,5 +159,7 @@ object AppOriginEntryField {
      */
     fun Field.isWebDomain(): Boolean {
         return this.name.startsWith(WEB_DOMAIN_FIELD_NAME)
+                || this.name.contains("_$WEB_DOMAIN_FIELD_NAME")
+                || this.name.contains("${WEB_DOMAIN_FIELD_NAME}_")
     }
 }

database/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt

@@ -27,6 +27,7 @@ import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.database.element.Field
 import com.kunzisoft.keepass.database.element.Tags
 import com.kunzisoft.keepass.database.element.entry.AutoType
+import com.kunzisoft.keepass.model.AppOriginEntryField.containsDomainOrApplicationId
 import com.kunzisoft.keepass.model.AppOriginEntryField.setAppOrigin
 import com.kunzisoft.keepass.model.AppOriginEntryField.setApplicationId
 import com.kunzisoft.keepass.model.AppOriginEntryField.setWebDomain
@@ -183,6 +184,18 @@ class EntryInfo : NodeInfo {
         }
     }
 
+    /**
+     * True if this entry contains domain or applicationId,
+     * OTP is ignored and considered not present
+     */
+    fun containsSearchInfo(searchInfo: SearchInfo): Boolean {
+        return searchInfo.webDomain?.let { webDomain ->
+            containsDomainOrApplicationId(webDomain)
+        } ?: searchInfo.applicationId?.let { applicationId ->
+            containsDomainOrApplicationId(applicationId)
+        } ?: false
+    }
+
     /**
      * Add searchInfo to current EntryInfo
      */

database/src/main/java/com/kunzisoft/keepass/utils/ParcelableUtil.kt

@@ -82,6 +82,13 @@ inline fun <reified E : Parcelable> Bundle.getParcelableList(key: String?): Muta
     else -> @Suppress("DEPRECATION", "UNCHECKED_CAST") (getParcelableArray(key) as? Array<E>)?.toMutableList()
 }
 
+inline fun <reified T : Enum<T>> Bundle.putEnum(key: String?, value: T?) =
+    putString(key, value?.name)
+
+inline fun <reified T : Enum<T>> Bundle.getEnum(key: String?): T? {
+    return getString(key)?.let { enumValueOf<T>(it) }
+}
+
 // -------- Parcel --------
 
 inline fun <reified T : Parcelable> Parcel.readParcelableCompat(): T? = when {

fastlane/metadata/android/ar/short_description.txt

@@ -1 +1 @@
-مدير وحافظة كلمات سر آمنة ومفتوحة المصدر
+أدر كلمات السر / Passkey في مخزن محلي ومفتوح المصدر

fastlane/metadata/android/ar/title.txt

@@ -1 +1 @@
-KeePassDX - مدير كلمات سر مفتوح المصدر
+KeePassDX

fastlane/metadata/android/cs-CZ/full_description.txt

@@ -1,19 +1,21 @@
-KeePassDX je <b>trezor a správce hesel</b>, který umožňuje upravovat <b>šifrovaná data v jednom souboru</b> v otevřeném formátu KeePass a <b>bezpečně vyplňovat formuláře</b>, <b>nevyžaduje připojení k internetu</b> a integruje standardy designu systému Android. Aplikace je <b>open source a bez reklam</b>.
+KeePassDX je open-source <b>trezor a správce hesel a přístupových klíčů</b>, který umožňuje upravovat <b>šifrovaná data v jednom souboru</b> v otevřeném formátu KeePass a <b>bezpečně vyplňovat formuláře</b>, <b>nevyžaduje připojení k internetu</b> a integruje standardy designu systému Android. Aplikace je <b>open source a bez reklam</b>.
 
 <b>Funkce</b>
 
-- Vytváření databázových souborů / záznamů a skupin.
-- Podpora souborů .kdb a .kdbx (verze 1 až 4) s algoritmy AES - Twofish - ChaCha20 - Argon2.
-- Kompatibilní s většinou alternativních programů (KeePass, KeePassXC, KeeWeb, …).
-- Umožňuje rychlé otevírání a kopírování polí URI / URL.
-- Biometrické rozpoznávání pro rychlé odemykání (otisk prstu / rozpoznání obličeje / …).
+- Přístupové klíče pro přihlašování a lokální ukládání soukromých klíčů.
+- Biometrické rozpoznávání pro rychlé odemykání (otisk prstu / odemykání obličejem / …).
 - Správa jednorázových hesel (HOTP / TOTP) pro dvoufaktorové ověřování (2FA).
-- Material Design s motivy.
-- Automatické vyplňování a integrace.
-- Klávesnice pro vyplňování polí.
-- Dynamické šablony.
+- Automatické vyplňování pro snadné vyplňování formulářů s hesly. 
+- Magikeyboard pro efektivní vyplňování libovolných polí.
+- Vytváření šifrovaných databázových souborů.
+- Organizace přihlašovacích údajů podle záznamů a ve skupinových stromech.
+- Umožňuje rychlé otevírání a kopírování polí URI / URL.
+- Dynamické šablony pro každý typ záznamu.
 - Historie každého záznamu.
-- Přesná správa nastavení.
+- Přesná správa nastavení. 
+- Material Design s motivy.
+- Podpora souborů .kdb a .kdbx (verze 1 až 4) s algoritmem AES - Twofish - ChaCha20 - Argon2.
+- Kompatibilní s většinou alternativních programů (KeePass, KeePassXC, KeeWeb, …).
 - Kód napsaný v nativních jazycích (Kotlin / Java / JNI / C).
 
 Můžete přispět nebo si koupit profesionální verzi pro lepší služby a rychlejší vývoj funkcí, které si přejete: <a href="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro">https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro</a>

fastlane/metadata/android/cs-CZ/short_description.txt

@@ -1 +1 @@
-Bezpečný open-source trezor a správce hesel
+Spravujte přístupové klíče a hesla v lokálním a open-source trezoru

fastlane/metadata/android/cs-CZ/title.txt

@@ -1 +1 @@
-KeePassDX – FOSS trezor hesel
+KeePassDX – Trezor pro hesla

fastlane/metadata/android/de-DE/full_description.txt

@@ -1,23 +1,25 @@
-KeePassDX ist ein <b>Passwort-Safe und -Manager</b>, der es ermöglicht, verschlüsselte <b>Daten in einer einzigen Datei</b> im offenen KeePass-Format zu bearbeiten und <b>die Formulare auf sichere Weise auszufüllen</b>, <b>erfordert keine Internetverbindung</b> und integriert Android-Designstandards. Die App ist <b>Open Source, ohne Werbung</b>.
+KeePassDX ist ein Open-Source-<b>Passwort-Tresor und -Manager</b>, der es ermöglicht, verschlüsselte <b>Daten in einer einzigen Datei</b> im offenen KeePass-Format zu bearbeiten und <b>die Formulare auf sichere Weise auszufüllen</b>, <b>erfordert keine Internetverbindung</b> und integriert Android-Designstandards. Die App ist <b>Open Source, ohne Werbung</b>.
 
 <b>Funktionalitäten</b>
 
-- Erstellung von Datenbanken / Einträgen und Gruppen.
-- Unterstützung von .kdb- und .kdbx-Dateien (Version 1 bis 4) mit AES - Twofish - ChaCha20 - Argon2 Algorithmus.
-- Kompatibel mit den meisten alternativen Programmen (KeePass, KeePassXC, KeeWeb, ...).
-- Ermöglicht das schnelle Kopieren von Feldern und das Öffnen von URIs /URLs.
-- Biometrische Erkennung für eine schnelle Entsperrung (Fingerabdrücke / Entsperrung durch Gesicht / ...).
-- Verwaltung von Einmalpasswörtern (One-Time Password HOTP / TOTP) für die Zwei-Faktor-Authentifizierung (2FA).
-- Material Design mit Themen.
-- Automatisches Ausfüllen von Feldern.
-- Tastatur zum Ausfüllen von Feldern.
-- Dynamische Schablonen.
-- Historie jedes Eintrags.
-- Präzise Verwaltung der Parameter.
+- Passkeys für die Authentifizierung und lokales Speichern privater Schlüssel.
+- Biometrische Erkennung für schnelles Entsperren (Fingerabdruck / Entsperren durch Gesicht / …).
+- Verwaltung von Einmalpasswörtern (HOTP / TOTP) für die Zwei-Faktor-Authentifizierung (2FA).
+- Automatisches Ausfüllen von Formularen mit Passwörtern.
+- Magikeyboard zum effizienten Ausfüllen beliebiger Felder.
+- Erstellen verschlüsselter Datenbankdateien.
+- Organisation von Anmeldedaten nach Einträgen und in Gruppenbäumen.
+- Ermöglicht das schnelle Öffnen und Kopieren von URI-/URL-Feldern.
+- Dynamische Vorlagen für jeden Eintragstyp.
+- Verlauf jedes Eintrags.
+- Präzise Verwaltung der Einstellungen.
+- Material Design.
+- Unterstützung von .kdb- und .kdbx-Dateien (Version 1 bis 4) mit AES – Twofish – ChaCha20 – Argon2-Algorithmus.
+- Kompatibel mit den meisten alternativen Programmen (KeePass, KeePassXC, KeeWeb, …).
 - In nativen Sprachen geschriebener Code (Kotlin / Java / JNI / C).
 
 Sie können spenden oder die Pro-Version kaufen, um einen besseren Service und eine schnelle Entwicklung der von Ihnen gewünschten Funktionen zu erhalten: <a href="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro">https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro</a>
 
 Das Projekt wird ständig weiterentwickelt. Zögern Sie nicht, den Entwicklungsstand der nächsten Updates zu überprüfen: <a href="https://github.com/Kunzisoft/KeePassDX/projects">https://github.com/Kunzisoft/KeePassDX/projects</a>
 
-Sie haben einen Bug : <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>
+Sie haben einen Bug : <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>

fastlane/metadata/android/de-DE/short_description.txt

@@ -1 +1 @@
-Sicherer Open-Source-Passwort-Tresor und -Manager
+Passkey/Passwort in einem lokalen Open-Source-Tresor verwalten

fastlane/metadata/android/de-DE/title.txt

@@ -1 +1 @@
-KeePassDX – FOSS-Passworttresor
+KeePassDX Pass(key-worttresor)

fastlane/metadata/android/en-US/changelogs/146.txt

@@ -0,0 +1,5 @@
+ * Fix Magikeyboard autosearch #2233
+ * Fix database merge #2223
+ * Fix dialog database action #2234
+ * Fix autofill selection #2238 #2235
+ * Small fixes

fastlane/metadata/android/en-US/changelogs/147.txt

@@ -0,0 +1,4 @@
+ * Fix database merge algorithm #2223
+ * Fix save search info #2243
+ * Fix Play Service as privileged app for Passkey Cross Device Authentication #2244
+ * Small fixes

fastlane/metadata/android/en-US/changelogs/148.txt

@@ -0,0 +1,4 @@
+ * Fix multiple Passkey selection #2253
+ * Fix database dialog subtitle #2254
+ * Fix save search info if URL present #2255
+ * Small fixes

fastlane/metadata/android/en-US/changelogs/149.txt

@@ -0,0 +1 @@
+ * Fix remembering database location #2262

fastlane/metadata/android/en-US/full_description.txt

@@ -22,4 +22,4 @@ You can donate or buy the pro version for better service and a quick development
 
 The project is constantly evolving. Do not hesitate to check the development status of the next updates: <a href="https://github.com/Kunzisoft/KeePassDX/projects">https://github.com/Kunzisoft/KeePassDX/projects</a>
 
-Send issues to: <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>
+Send issues to: <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>

fastlane/metadata/android/en-US/title.txt

@@ -1 +1 @@
-KeePassDX - Pass(key/word) Vault
+KeePassDX Pass(key/word) Vault

fastlane/metadata/android/es-ES/title.txt

@@ -1 +1 @@
-KeePassDX - Contraseñas FOSS
+KeePassDX Pass(key/word) Vault

fastlane/metadata/android/et/full_description.txt

@@ -1,23 +1,25 @@
-KeePassDX on <b>salasõnalaegas ja -haldur</b>, mis võimaldab <b>muuta krüptitud andmeid avatud KeePass vormingus ühes failis</b> ja <b>täita vorme turvaliselt</b>, ei vaja <b>internetiühendust</b> ning järgib Androidi kujundus-standardeid. Rakendus on <b>avatud lähtekoodiga ja reklaamivaba</b>.
+KeePassDX on avatud lähtekoodiga <b>salavõtmete ja salasõnade laegas ja -haldur</b>, mis võimaldab <b>muuta krüptitud andmeid avatud KeePass vormingus ühe failina</b> ja <b>täita vorme turvaliselt</b>, ei vaja <b>internetiühendust</b> ning järgib Androidi kujundus-standardeid. Rakendus on <b>avatud lähtekoodiga ja reklaamivaba</b>.
 
-<b>Funktsionaaldus</b>
+<b>Funktsionaalsus</b>
 
-- Andmebaasi failide, kirjete ja gruppide loomine.
+- Autentimiseks kasutatavad salavõtmed ja privaatvõtmete salvestamine kohalikus andmeruumis.
 - .kdb ja .kdbx failide tugi (versioonid 1 kuni 4) AES - Twofish - ChaCha20 - Argon2 algoritmidega.
-- Ühildub enamiku alternatiivsete prakendustega (KeePass, KeePassXC, KeeWeb, …).
-- Kiire võrguaadresside (URI / URL) väljade avamine ja kopeerimine.
 - Biomeetriline autentimine kiireks lukustuse eemaldamiseks (sõrmejälg / näotuvastus / …).
-- Ühekordsete slasõnade haldus (HOTP / TOTP) kahefaktorilise autentimise (2FA) jaoks.
-- MD kujunduskeel koos kujundustega.
-- Automaattäide ja lõiming.
-- Klahvistik väljade täitmiseks.
-- Dünaamilised mallid.
+- Ühekordsete salasõnade haldus (HOTP / TOTP) kahefaktorilise autentimise (2FA) jaoks.
+- Automaattäide ja lõiming sisestusvormide mugavaks täitmiseks.
+- Maagiline klahvistik kõikide väljade tõhusaks täitmiseks.
+- Krüptitud andmebaasifailide loomine.
+- Andmed on kirjete kaupa ja neid saad rühmitada gruppidena,
+- Kiire võrguaadresside (URI / URL) väljade avamine ja kopeerimine.
+- Dünaamilised mallid iga sisestustüübi jaoks.
 - Iga kirje ajalugu.
 - Täpne seadistuste haldus.
-- Lähtekood on kirjutatud platvormiomases keeltes (Kotlin / Java / JNI / C).
+- MD kujunduskeel koos erinevate kujundustega.
+- .kdb ja .kdbx failide tugi (versioonid 1 kuni 4), kui kasutusel on AES - Twofish - ChaCha20 - Argon2 algoritmid.
+- Ühildub enamiku alternatiivsete rakendustega (KeePass, KeePassXC, KeeWeb, …).- Lähtekood on kirjutatud platvormiomases keeltes (Kotlin / Java / JNI / C).
 
 Parema teenuse ja kiirema arendustöö huvides saad sa annetada või osta pro versiooni: <a href="https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro">https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro</a>
 
-Projekt areneb pidevalt. Ära kõhkle kontrollimast järgmiste arenduste olekut: <a href="https://github.com/Kunzisoft/KeePassDX/projects">https://github.com/Kunzisoft/KeePassDX/projects</a>
+Projekt areneb pidevalt. Ära kõhkle kontrollimast järgmiste uuenduste ja arenduste olekut: <a href="https://github.com/Kunzisoft/KeePassDX/projects">https://github.com/Kunzisoft/KeePassDX/projects</a>
 
 Veateated lisa palun siia: <a href="https://github.com/Kunzisoft/KeePassDX/issues">https://github.com/Kunzisoft/KeePassDX/issues</a>

fastlane/metadata/android/et/short_description.txt

@@ -1 +1 @@
-Turvaline avatud lähtekoodiga salasõnalaegas ja -haldur
+Halda salasõnu ja -võtmeid avatud lähtekoodiga kohalikus salasõnalaekas

fastlane/metadata/android/et/title.txt

@@ -1 +1 @@
-KeePassDX: sinu salasõnalaegas
+KeePassDX: sinu salasõnalaegas

fastlane/metadata/android/fr-FR/changelogs/134.txt

@@ -1,8 +1,8 @@
- * Correction de la recherche URL #1940 #1946 #2003 #2040 #2044
+* Correction de la recherche URL #1940 #1946 #2003 #2040 #2044
  * Correction de la boite de dialogue de remplissage automatique #2054
  * Correction des notes de groupes #2053
  * Correction du fond de boite de dialogue #2005 #2004 (Thx @codokie)
  * Correction configuration OTP #2042 #2065 (Thx @Dev-ClayP)
  * Correction de petits éléments graphiques #1987 #2007 (Thx @ymcx)
  * Support des vues RTL #2021 (Thx @codokie)
- * Metadonnées de l'app en traduction #1823
+ * Metadonnées de l'app en traduction #1823

fastlane/metadata/android/fr-FR/changelogs/135.txt

@@ -1,5 +1,5 @@
- * Correction de l'enregistrement pour le remplissage automatique #2089
+* Correction de l'enregistrement pour le remplissage automatique #2089
  * Correction des erreurs biométriques #2081
  * Correction du timestamp dans le fichier de copie #1981 #1983
  * Correction des gabaris Email #1986
- * Correction de la recherche #2096
+ * Correction de la recherche #2096

fastlane/metadata/android/fr-FR/changelogs/136.txt

@@ -1,3 +1,3 @@
- * Correction UnlockManager #2098 #2101
+* Correction UnlockManager #2098 #2101
  * Invite de déverrouillage automatique de l'appareil #2105
- * Petites corrections ##2066
+ * Petites corrections ##2066

fastlane/metadata/android/fr-FR/changelogs/137.txt

@@ -1 +1 @@
- * Correction invite de commande auto #2111
+* Correction invite de commande auto #2111

fastlane/metadata/android/fr-FR/changelogs/138.txt

@@ -1,3 +1,3 @@
- * Ouverture auto de la prompt biometrique depuis la liste des bases #2113
+* Ouverture auto de la prompt biometrique depuis la liste des bases #2113
  * Correction d'erreurs du Keystore #2114 #2115
- * Refactoring complet de l'invite biométrique pour une meilleure compatibilité
+ * Refactoring complet de l'invite biométrique pour une meilleure compatibilité

fastlane/metadata/android/fr-FR/changelogs/139.txt

@@ -1 +1 @@
- * Correction du CipherDatabase pour les états biométriques #2119
+* Correction du CipherDatabase pour les états biométriques #2119

fastlane/metadata/android/fr-FR/changelogs/140.txt

@@ -1,4 +1,4 @@
- * Mise à jour vers API 35 minimum SDK 19 #2073 #2138 #2067 #2133 (Thx @Dev-ClayP)
+* Mise à jour vers API 35 minimum SDK 19 #2073 #2138 #2067 #2133 (Thx @Dev-ClayP)
  * Gestion des Passkeys #1421 #2097 (Thx @cali-95)
  * Garde en mémoire la lecture seule #2099 #2100 (Thx @rmacklin)
- * Petites corrections
+ * Petites corrections

fastlane/metadata/android/fr-FR/changelogs/141.txt

@@ -1,6 +1,6 @@
- * Mise à jour vers API 35 minimum SDK 19 #2073 #2138 #2067 #2133 #1687 (Thx @Dev-ClayP)
+* Mise à jour vers API 35 minimum SDK 19 #2073 #2138 #2067 #2133 #1687 (Thx @Dev-ClayP)
  * Sauvegarde du dernier état lecture seule #2099 #2100 (Thx @rmacklin)
  * Correction de la suppression lors d'un merge #1516
  * Correction des espaces dans la recherche #175
  * Correction de la poubelle supprimable #2163
- * Petites corrections
+ * Petites corrections

fastlane/metadata/android/fr-FR/changelogs/142.txt

@@ -1,6 +1,6 @@
- * Gestion des Passkeys #1421 #2097 (Thx @cali-95)
+* Gestion des Passkeys #1421 #2097 (Thx @cali-95)
  * Confirmation de l'usage de passkey #2165
  * Dialogue pour gérer les signatures manquantes #2152 #2155 #2161 #2160
  * Capture des erreurs #2159
  * Changement des paramètres Backup Eligibility & Backup State #2135 #2150
- * Petites corrections #2157 #2164
+ * Petites corrections #2157 #2164

fastlane/metadata/android/fr-FR/changelogs/143.txt

@@ -1,3 +1,3 @@
- * Correction de l'interface en paysage #2198 #2200 (@chenxiaolong)
+* Correction de l'interface en paysage #2198 #2200 (@chenxiaolong)
  * Correction du démarrage en boucle et de l'écran clignotant #2201
- * Petites corrections
+ * Petites corrections

fastlane/metadata/android/fr-FR/changelogs/144.txt

@@ -1,6 +1,6 @@
- * Gestion de Passkeys #1421 (Thx @cali-95)
+* Gestion de Passkeys #1421 (Thx @cali-95)
  * Paramètres de recherche #2112 #2181
  * Paramètre de fermeture de la base après une sélection de Passkey #2187
  * Mise en garde lors de l'écrasement d'un Passkey existant #21124
  * Refonte du remplissage automatique #765 #2196
- * Petites corrections #2171 #2150 #2159 #2122 #2180 #2209
+ * Petites corrections #2171 #2150 #2159 #2122 #2180 #2209

fastlane/metadata/android/fr-FR/changelogs/145.txt

@@ -1,8 +1,8 @@
- * Gestion de Passkeys #1421 #2097 (@cali-95)
+* Gestion de Passkeys #1421 #2097 (@cali-95)
  * Confirmation de l'usage de Passkey #2165 #2124
  * Dialogue pour la gestion des signatures manquantes #2152 #2155 #2161 #2160
  * Capture des erreurs #2159 #2215
  * Configuration de Passkey Backup Eligibility & Backup State #2135 #2150 #2212
  * Paramètres de recherche #2112 #2181 #2187 #2204
  * Refactorisation du remplissage automatique #765 #2196
- * Corrections mineures #2157 #2164 #2171 #2122 #2180 #2209 #2214
+ * Corrections mineures #2157 #2164 #2171 #2122 #2180 #2209 #2214

fastlane/metadata/android/fr-FR/changelogs/146.txt

@@ -0,0 +1,5 @@
+ * Correction de la recherche auto pour le Magikeyboard #2233
+ * Correction de la fusion de bases de données #2223
+ * Correction de l'action de la base de données #2234
+ * Correction de la selection du remplissage automatique #2238 #2235
+ * Petites corrections

fastlane/metadata/android/fr-FR/changelogs/147.txt

@@ -0,0 +1,4 @@
+ * Correction de l'algorithme de fusion des bases de données #2223
+ * Correction de la sauvegarde des infos de recherche #2243
+ * Correction Play Service comme appli privilégiée pour l'authentification Passkey multi-appareils #2244
+ * Small fixes