Merge branch 'Kunzisoft:develop' into develop

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "com.kunzisoft.keepass"
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode = 84
-        versionName = "3.0.0"
+        versionCode = 85
+        versionName = "3.0.0_beta02"
         multiDexEnabled true
 
         testApplicationId = "com.kunzisoft.keepass.tests"

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

@@ -125,13 +125,6 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
             }
         }
         mAdapterDatabaseHistory?.setOnFileDatabaseHistoryDeleteListener { fileDatabaseHistoryToDelete ->
-            // Remove from app database
-            fileDatabaseHistoryToDelete.databaseUri?.let { databaseUri ->
-                UriUtil.releaseUriPermission(
-                    contentResolver,
-                    databaseUri
-                )
-            }
             databaseFilesViewModel.deleteDatabaseFile(fileDatabaseHistoryToDelete)
             true
         }

app/src/main/java/com/kunzisoft/keepass/adapters/NodeAdapter.kt

@@ -415,14 +415,12 @@ class NodeAdapter (private val context: Context,
     private fun populateOtpView(holder: NodeViewHolder?, otpElement: OtpElement?) {
         when (otpElement?.type) {
             OtpType.HOTP -> {
-                holder?.otpCounter?.text = otpElement.counter.toString()
                 holder?.otpProgress?.apply {
                     max = 100
                     progress = 100
                 }
             }
             OtpType.TOTP -> {
-                holder?.otpCounter?.text = otpElement.secondsRemaining.toString()
                 holder?.otpProgress?.apply {
                     max = otpElement.period
                     progress = otpElement.secondsRemaining
@@ -474,7 +472,6 @@ class NodeAdapter (private val context: Context,
         var meta: TextView = itemView.findViewById(R.id.node_meta)
         var otpContainer: ViewGroup? = itemView.findViewById(R.id.node_otp_container)
         var otpProgress: ProgressBar? = itemView.findViewById(R.id.node_otp_progress)
-        var otpCounter: TextView? = itemView.findViewById(R.id.node_otp_counter)
         var otpToken: TextView? = itemView.findViewById(R.id.node_otp_token)
         var otpRunnable: OtpRunnable = OtpRunnable(otpContainer)
         var numberChildren: TextView? = itemView.findViewById(R.id.node_child_numbers)

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

@@ -189,26 +189,36 @@ class FileDatabaseHistoryAction(private val applicationContext: Context) {
         ).execute()
     }
 
-    fun deleteKeyFileByDatabaseUri(databaseUri: Uri) {
+    fun deleteKeyFileByDatabaseUri(databaseUri: Uri,
+                                   result: (() ->Unit)? = null) {
         IOActionTask(
                 {
                     databaseFileHistoryDao.deleteKeyFileByDatabaseUri(databaseUri.toString())
+                },
+                {
+                    result?.invoke()
                 }
         ).execute()
     }
 
-    fun deleteAllKeyFiles() {
+    fun deleteAllKeyFiles(result: (() ->Unit)? = null) {
         IOActionTask(
                 {
                     databaseFileHistoryDao.deleteAllKeyFiles()
+                },
+                {
+                    result?.invoke()
                 }
         ).execute()
     }
 
-    fun deleteAll() {
+    fun deleteAll(result: (() ->Unit)? = null) {
         IOActionTask(
                 {
                     databaseFileHistoryDao.deleteAll()
+                },
+                {
+                    result?.invoke()
                 }
         ).execute()
     }

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

@@ -81,14 +81,18 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
         activity?.let { activity ->
             findPreference<Preference>(getString(R.string.remember_database_locations_key))?.setOnPreferenceChangeListener { _, newValue ->
                 if (!(newValue as Boolean)) {
-                    FileDatabaseHistoryAction.getInstance(activity.applicationContext).deleteAll()
+                    FileDatabaseHistoryAction.getInstance(activity.applicationContext).deleteAll {
+                        UriUtil.releaseAllUnnecessaryPermissionUris(activity.applicationContext)
+                    }
                 }
                 true
             }
 
             findPreference<Preference>(getString(R.string.remember_keyfile_locations_key))?.setOnPreferenceChangeListener { _, newValue ->
                 if (!(newValue as Boolean)) {
-                    FileDatabaseHistoryAction.getInstance(activity.applicationContext).deleteAllKeyFiles()
+                    FileDatabaseHistoryAction.getInstance(activity.applicationContext).deleteAllKeyFiles {
+                        UriUtil.releaseAllUnnecessaryPermissionUris(activity.applicationContext)
+                    }
                 }
                 true
             }

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

@@ -30,7 +30,6 @@ import android.content.IntentFilter
 import android.os.Build
 import android.util.Log
 import com.kunzisoft.keepass.R
-import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import com.kunzisoft.keepass.database.element.Database
 import com.kunzisoft.keepass.magikeyboard.MagikeyboardService
 import com.kunzisoft.keepass.services.ClipboardEntryNotificationService
@@ -142,19 +141,5 @@ fun Context.closeDatabase(database: Database?) {
     database?.clearAndClose(this)
 
     // Release not useful URI permission
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-        applicationContext?.let { appContext ->
-            val fileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(appContext)
-            fileDatabaseHistoryAction.getDatabaseFileList { databaseFileList ->
-                val listToNotRemove = databaseFileList.map { it.databaseUri }
-                // Remove URI permission for not database files
-                val resolver = appContext.contentResolver
-                resolver.persistedUriPermissions.forEach { uriPermission ->
-                    val uri = uriPermission.uri
-                    if (!listToNotRemove.contains(uri))
-                        UriUtil.releaseUriPermission(resolver, uri)
-                }
-            }
-        }
-    }
+    UriUtil.releaseAllUnnecessaryPermissionUris(applicationContext)
 }

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

@@ -29,6 +29,7 @@ import android.util.Log
 import android.widget.Toast
 import androidx.documentfile.provider.DocumentFile
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
 import java.io.*
 import java.util.*
 
@@ -187,6 +188,32 @@ object UriUtil {
         persistUriPermission(contentResolver, uri, release = true, readOnly = false)
     }
 
+    fun releaseAllUnnecessaryPermissionUris(applicationContext: Context?) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            applicationContext?.let { appContext ->
+                val fileDatabaseHistoryAction = FileDatabaseHistoryAction.getInstance(appContext)
+                fileDatabaseHistoryAction.getDatabaseFileList { databaseFileList ->
+                    val listToNotRemove = mutableListOf<Uri>()
+                    databaseFileList.forEach {
+                        it.databaseUri?.let { databaseUri ->
+                            listToNotRemove.add(databaseUri)
+                        }
+                        it.keyFileUri?.let { keyFileUri ->
+                            listToNotRemove.add(keyFileUri)
+                        }
+                    }
+                    // Remove URI permission for not database files
+                    val resolver = appContext.contentResolver
+                    resolver.persistedUriPermissions.forEach { uriPermission ->
+                        val uri = uriPermission.uri
+                        if (!listToNotRemove.contains(uri))
+                            releaseUriPermission(resolver, uri)
+                    }
+                }
+            }
+        }
+    }
+
     fun getUriFromIntent(intent: Intent, key: String): Uri? {
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {

app/src/main/java/com/kunzisoft/keepass/view/TemplateAbstractView.kt

@@ -59,8 +59,8 @@ abstract class TemplateAbstractView<
         entryIconView = findViewById(R.id.template_icon_button)
         titleContainerView = findViewById(R.id.template_title_container)
         templateContainerView = findViewById(R.id.template_fields_container)
-        // To fix card view margin in KitKat-
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+        // To fix card view margin below Marshmallow
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             val paddingVertical = resources.getDimensionPixelSize(R.dimen.card_view_margin_vertical)
             val paddingHorizontal = resources.getDimensionPixelSize(R.dimen.card_view_margin_horizontal)
             templateContainerView.setPadding(paddingHorizontal, paddingVertical, paddingHorizontal, paddingVertical)

app/src/main/java/com/kunzisoft/keepass/view/TemplateEditView.kt

@@ -62,7 +62,8 @@ class TemplateEditView @JvmOverloads constructor(context: Context,
                                      field: Field): TextEditFieldView? {
         return context?.let {
             TextEditFieldView(it).apply {
-                setProtection(field.protectedValue.isProtected, mHideProtectedValue)
+                // hiddenProtectedValue (mHideProtectedValue) don't work with TextInputLayout
+                setProtection(field.protectedValue.isProtected)
                 setMaxChars(templateAttribute.options.getNumberChars())
                 setMaxLines(templateAttribute.options.getNumberLines())
                 setActionClick(templateAttribute, field, this)

app/src/main/java/com/kunzisoft/keepass/view/TextEditFieldView.kt

@@ -161,8 +161,7 @@ class TextEditFieldView @JvmOverloads constructor(context: Context,
         }
     }
 
-    fun setProtection(protection: Boolean, hiddenProtectedValue: Boolean) {
-        // hiddenProtectedValue don't work with TextInputLayout
+    fun setProtection(protection: Boolean) {
         if (protection) {
             labelView.endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
             valueView.inputType = valueView.inputType or InputType.TYPE_TEXT_VARIATION_PASSWORD

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

@@ -110,6 +110,21 @@ class DatabaseFilesViewModel(application: Application) : AndroidViewModel(applic
     fun deleteDatabaseFile(databaseFileToDelete: DatabaseFile) {
         mFileDatabaseHistoryAction?.deleteDatabaseFile(databaseFileToDelete) { databaseFileDeleted ->
             databaseFileDeleted?.let { _ ->
+                // Release database and keyfile URIs permissions
+                val contentResolver = getApplication<App>().applicationContext.contentResolver
+                databaseFileDeleted.databaseUri?.let { databaseUri ->
+                    UriUtil.releaseUriPermission(
+                        contentResolver,
+                        databaseUri
+                    )
+                }
+                databaseFileDeleted.keyFileUri?.let { keyFileUri ->
+                    UriUtil.releaseUriPermission(
+                        contentResolver,
+                        keyFileUri
+                    )
+                }
+                // Call the feedback
                 databaseFilesLoaded.value = getDatabaseFilesLoadedValue().apply {
                     databaseFileAction = DatabaseFileAction.DELETE
                     databaseFileToActivate = databaseFileDeleted

app/src/main/res/layout/item_list_nodes_entry.xml

@@ -146,15 +146,6 @@
                         android:layout_gravity="center"
                         android:max="100"
                         android:progress="60" />
-                    <TextView
-                        android:id="@+id/node_otp_counter"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        style="@style/KeepassDXStyle.TextAppearance.Entry.Info"
-                        android:textSize="11sp"
-                        tools:text="70" />
-
                 </FrameLayout>
             </LinearLayout>
 
@@ -173,5 +164,15 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="?android:attr/listDivider"
+            android:layout_marginLeft="72dp"
+            android:layout_marginStart="72dp"
+            android:layout_marginRight="48dp"
+            android:layout_marginEnd="48dp"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -19,8 +19,8 @@
     Catalan translation by Oriol Garrote
 --><resources>
     <string name="feedback">Comentaris</string>
-    <string name="homepage">Pàgina d\'inici</string>
-    <string name="about_description">KeePassDX és una implementació per a Android de KeePass password manager</string>
+    <string name="homepage">Lloc web</string>
+    <string name="about_description">Implementació per a l’Android del gestor de contrasenyes KeePass</string>
     <string name="accept">Accepta</string>
     <string name="add_entry">Afegeix entrada</string>
     <string name="add_group">Afegeix grup</string>
@@ -30,12 +30,12 @@
     <string name="application">Aplicació</string>
     <string name="menu_app_settings">Configuració de l\'aplicació</string>
     <string name="brackets">Parèntesis</string>
-    <string name="file_manager_install_description">L\'exploració d\'arxius necessita l\'aplicació Open Intents File Manager, clica a sota per instal·lar-la. Degut a peculiaritats de l\'explorador d\'arxius pot ser que no funcioni correctament la primera execució.</string>
+    <string name="file_manager_install_description">Un gestor de fitxers que accepta les intencions ACTION_CREATE_DOCUMENT i ACTION_OPEN_DOCUMENT, que us calen per a crear, obrir i desar fitxers de base de dades.</string>
     <string name="clipboard_cleared">Porta-retalls netejat.</string>
     <string name="clipboard_timeout">Temps d\'espera del porta-retalls</string>
     <string name="clipboard_timeout_summary">Temps abans de netejar el porta-retalls (si el teu dispositiu ho suporta)</string>
     <string name="select_to_copy">Selecciona per copiar %1$s al porta-retalls</string>
-    <string name="retrieving_db_key">Creant clau de base de dades…</string>
+    <string name="retrieving_db_key">Es recupera la clau de base de dades…</string>
     <string name="database">Base de dades</string>
     <string name="decrypting_db">Es desxifra el contingut de la base de dades…</string>
     <string name="default_checkbox">Utilitza com a base de dades per defecte</string>
@@ -48,26 +48,26 @@
     <string name="entry_confpassword">Confirma contrasenya</string>
     <string name="entry_created">Creada</string>
     <string name="entry_expires">Expira</string>
-    <string name="entry_keyfile">Arxiu clau</string>
+    <string name="entry_keyfile">Fitxer de clau</string>
     <string name="entry_modified">Modificada</string>
     <string name="entry_password">Contrasenya</string>
     <string name="save">Guarda</string>
     <string name="entry_title">Nom</string>
     <string name="entry_url">URL</string>
-    <string name="entry_user_name">Usuari</string>
-    <string name="error_arc4">L\'encriptació Arcfour no està suportada.</string>
-    <string name="error_can_not_handle_uri">KeePassDX no pot manejar aquesta URI.</string>
-    <string name="error_file_not_create">No s\'ha pogut crear l\'arxiu</string>
-    <string name="error_invalid_db">No s\'ha pogut llegir la base de dades.</string>
-    <string name="error_invalid_path">Assegureu-vos que el camí eś correcte.</string>
+    <string name="entry_user_name">Nom d’usuari</string>
+    <string name="error_arc4">No s’admet el xifratge de flux Arcfour.</string>
+    <string name="error_can_not_handle_uri">El KeePassDX no pot gestionar aquest URI.</string>
+    <string name="error_file_not_create">No s’ha pogut crear el fitxer</string>
+    <string name="error_invalid_db">No s’ha pogut llegir la base de dades.</string>
+    <string name="error_invalid_path">Assegureu-vos que el camí és correcte.</string>
     <string name="error_no_name">Introduïu-hi un nom.</string>
-    <string name="error_nokeyfile">Selecciona un fitxer clau.</string>
+    <string name="error_nokeyfile">Seleccioneu un fitxer de clau.</string>
     <string name="error_out_of_memory">No hi ha prou memòria per a carregar la base de dades sencera.</string>
-    <string name="error_pass_gen_type">Has de seleccionar almenys un tipus de generador de contrasenyes.</string>
+    <string name="error_pass_gen_type">Heu de seleccionar com a mínim un tipus de generació de contrasenyes.</string>
     <string name="error_pass_match">Les contrasenyes no coincideixen.</string>
     <string name="error_rounds_too_large">Massa passades. Establint a 2147483648.</string>
-    <string name="error_wrong_length">Inseriu un enter positiu al camp longitud.</string>
-    <string name="file_browser">Explorador d\'arxius</string>
+    <string name="error_wrong_length">Inseriu un enter positiu al camp «Longitud».</string>
+    <string name="file_browser">Gestor de fitxers</string>
     <string name="generate_password">Genera contrasenya</string>
     <string name="hint_conf_pass">Confirma contrasenya</string>
     <string name="hint_generated_password">Contrasenya generada</string>
@@ -115,13 +115,15 @@
     <string name="search_label">Cerca</string>
     <string name="sort_db">Ordre natural</string>
     <string name="special">Especial</string>
-    <string name="search">Cercar</string>
-    <string name="search_results">Resultats de cerca</string>
+    <string name="search">Cerca</string>
+    <string name="search_results">Resultats de la cerca</string>
     <string name="underline">Subratllat</string>
     <string name="unsupported_db_version">Versió de la base de dades no suportada.</string>
     <string name="uppercase">Majúscules</string>
     <string name="version_label">Versió %1$s</string>
-    <string name="education_unlock_summary">Introdueix una contrasenya i/o un arxiu clau per desbloquejar la base de dades.</string>
+    <string name="education_unlock_summary">Introduïu una contrasenya i/o un fitxer de clau per a desblocar la base de dades.
+\n
+\nFeu una còpia de seguretat del fitxer de base de dades en un lloc segur després de cada modificació.</string>
     <string-array name="list_size_options">
         <item>Petita</item>
         <item>Mitjana</item>
@@ -134,7 +136,7 @@
     <string name="contribution">Contribució</string>
     <string name="contact">Contacte</string>
     <string name="extended_ASCII">ASCII estès</string>
-    <string name="sort_username">Nom d\'usuari</string>
+    <string name="sort_username">Nom d’usuari</string>
     <string name="sort_title">Títol</string>
     <string name="sort_menu">Ordena</string>
     <string name="allow">Permet</string>
@@ -182,7 +184,7 @@
     <string name="database_history">Història</string>
     <string name="encrypted_value_stored">Contrasenya xifrada desada</string>
     <string name="warning_permanently_delete_nodes">Voleu suprimir definitivament els nodes seleccionats\?</string>
-    <string name="warning_no_encryption_key">Voleu continuar sense contrasenya de xifrat\?</string>
+    <string name="warning_no_encryption_key">Voleu continuar sense contrasenya de xifratge\?</string>
     <string name="warning_database_link_revoked">L\'accés al fitxer ha estat revocat pel gestor de fitxers</string>
     <string name="warning">Advertència</string>
     <string name="sort_last_access_time">Accés</string>
@@ -241,12 +243,12 @@
     <string name="error_otp_counter">El comptador ha d\'estar entre %1$d i %2$d.</string>
     <string name="error_otp_secret_key">La clau secreta ha d\'estar en format Base32.</string>
     <string name="error_save_database">No s\'ha pogut desar la base de dades.</string>
-    <string name="error_create_database">No s\'ha pogut crear el fitxer de la base de dades.</string>
+    <string name="error_create_database">No s’ha pogut crear el fitxer de la base de dades.</string>
     <string name="error_copy_group_here">No és possible copiar cap grup aquí.</string>
     <string name="error_copy_entry_here">No és possible copiar cap entrada aquí.</string>
     <string name="error_move_entry_here">No és possible moure cap entrada aquí.</string>
     <string name="error_label_exists">Aquesta etiqueta ja existeix.</string>
-    <string name="error_load_database">No s\'ha pogut carregar la vostra base de dades.</string>
+    <string name="error_load_database">No s’ha pogut carregar la vostra base de dades.</string>
     <string name="entry_otp">OTP</string>
     <string name="otp_algorithm">Algorisme</string>
     <string name="otp_digits">Dígits</string>
@@ -270,10 +272,10 @@
     <string name="discard">Descarta</string>
     <string name="discard_changes">Voleu descartar els canvis\?</string>
     <string name="validate">Valida</string>
-    <string name="content_description_entry_icon">Icona de l\'entrada</string>
+    <string name="content_description_entry_icon">Icona de l’entrada</string>
     <string name="content_description_file_information">Informació del fitxer</string>
-    <string name="content_description_add_group">Afegeix grup</string>
-    <string name="content_description_add_entry">Afegeix entrada</string>
+    <string name="content_description_add_group">Afegeix un grup</string>
+    <string name="content_description_add_entry">Afegeix una entrada</string>
     <string name="content_description_add_node">Afegeix node</string>
     <string name="content_description_open_file">Obre fitxer</string>
     <string name="content_description_background">Fons</string>
@@ -287,8 +289,45 @@
     <string name="error_registration_read_only">No es permet desar un element nou en una base de dades de només lectura</string>
     <string name="error_string_type">Aquest text no coincideix amb l\'element sol·licitat.</string>
     <string name="error_otp_type">L\'OTP existent no està reconegut per aquest formulari, la seva validació ja no pot generar correctament el token.</string>
-    <string name="error_create_database_file">No s\'ha pogut crear una base de dades amb aquesta contrasenya i arxiu de clau.</string>
-    <string name="error_autofill_enable_service">No s\'ha pogut habilitar el servei d\'autocompletat.</string>
+    <string name="error_create_database_file">No s’ha pogut crear una base de dades amb aquesta contrasenya i fitxer de clau.</string>
+    <string name="error_autofill_enable_service">No s’ha pogut habilitar el servei de compleció automàtica.</string>
     <string name="content_description_node_children">Nodes fill</string>
     <string name="key_derivation_function">Funció de derivació de clau</string>
+    <string name="error_disallow_no_credentials">S’ha de definir com a mínim una credencial.</string>
+    <string name="warning_empty_keyfile">No és recomanable afegir un fitxer de clau buit.</string>
+    <string name="warning_sure_add_file">Voleu afegir el fitxer igualment\?</string>
+    <string name="warning_empty_password">Voleu continuar sense la protecció contra desblocatge amb contrasenya\?</string>
+    <string name="error_move_group_here">No és possible moure cap grup aquí.</string>
+    <string name="error_load_database_KDF_memory">No s’ha pogut carregar la clau. Proveu de reduir l’«Ús de memòria» del KDF.</string>
+    <string name="error_word_reserved">Aquesta paraula està reservada i no es pot usar.</string>
+    <string name="error_invalid_OTP">El secret OTP no és vàlid.</string>
+    <string name="education_read_only_title">Protecció contra escriptura de la base de dades</string>
+    <string name="education_donation_summary">Ajudeu a augmentar l’estabilitat i la seguretat i a crear més funcionalitats.</string>
+    <string name="education_donation_title">Participació</string>
+    <string name="html_text_dev_feature_buy_pro">En comprar la versió <strong>professional</strong>,</string>
+    <string name="html_text_dev_feature_contibute">En <strong>col·laborar-hi</strong>,</string>
+    <string name="content_description_keyfile_checkbox">Casella del fitxer de la clau</string>
+    <string name="content_description_password_checkbox">Casella de la contrasenya</string>
+    <string name="content_description_otp_information">Informació de la contrasenya d’un sol ús</string>
+    <string name="content_description_credentials_information">Informació de les dades d’accés</string>
+    <string name="content_description_add_item">Afegeix un element</string>
+    <string name="education_lock_title">Bloca la base de dades</string>
+    <string name="html_text_feature_generosity">Aquest <strong>estil visual</strong> és disponible gràcies a la vostra generositat.</string>
+    <string name="html_text_dev_feature_upgrade">No us oblideu de mantenir l’aplicació actualitzada instal·lant les versions noves.</string>
+    <string name="icon_section_standard">Estàndard</string>
+    <string name="show_uuid_title">Mostra l’UUID</string>
+    <string name="hide_expired_entries_summary">No es mostren les entrades expirades</string>
+    <string name="hide_expired_entries_title">Amaga les entrades expirades</string>
+    <string name="contribute">Contribuïu-hi</string>
+    <string name="download">Baixa</string>
+    <string name="unit_kibibyte">KiB</string>
+    <string name="unit_byte">B</string>
+    <string name="style_brightness_title">Brillantor del tema</string>
+    <string name="style_choose_summary">El tema que s’utilitza a l’aplicació</string>
+    <string name="style_choose_title">Tema de l’aplicació</string>
+    <string name="unit_gibibyte">GiB</string>
+    <string name="unit_mebibyte">MiB</string>
+    <string name="icon_pack_choose_summary">El paquet d’icones que s’utilitza a l’aplicació</string>
+    <string name="icon_pack_choose_title">Paquet d’icones</string>
+    <string name="icon_section_custom">Personalitzat</string>
 </resources>

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

@@ -111,7 +111,7 @@
     <string name="no_url_handler">Pro otevření tohoto URL nainstalujte webový prohlížeč.</string>
     <string name="omit_backup_search_title">Neprohledávat položky v záloze</string>
     <string name="omit_backup_search_summary">Vynechat skupiny „Záloha“ a \"Koš\" z výsledků vyhledávání</string>
-    <string name="progress_create">Zakládání nové databáze…</string>
+    <string name="progress_create">Vytváření nové databáze…</string>
     <string name="progress_title">Pracuji…</string>
     <string name="protection">Ochrana</string>
     <string name="read_only_warning">Ke změně v databáze potřebuje KeePassDX oprávnění pro zápis.</string>
@@ -235,7 +235,7 @@
     <string name="reset_education_screens_title">Nastavit vzdělávací nápovědy do výchozího stavu</string>
     <string name="reset_education_screens_summary">Opět zobrazit všechny vzdělávací informace</string>
     <string name="reset_education_screens_text">Nastavit vzdělávací nápovědy do výchozího stavu</string>
-    <string name="education_create_database_title">Založte svůj databázový soubor</string>
+    <string name="education_create_database_title">Vytvořit databázový soubor</string>
     <string name="education_create_database_summary">Založte svůj první soubor pro správu hesel.</string>
     <string name="education_select_database_title">Otevřít existující databázi</string>
     <string name="education_select_database_summary">Otevřete svou dříve používanou databázi ze správce souborů a pokračujte v jejím používání.</string>
@@ -311,7 +311,7 @@
     <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>
     <string name="keyboard_selection_entry_title">Výběr záznamu</string>
-    <string name="keyboard_selection_entry_summary">Při prohlížení záznamu ukázat na Magikeyboard kolonky</string>
+    <string name="keyboard_selection_entry_summary">Při prohlížení záznamu v KeePassDX zadat záznam do Magikeyboard</string>
     <string name="delete_entered_password_title">Smazat heslo</string>
     <string name="delete_entered_password_summary">Smaže heslo zadané po pokusu o připojení k databázi</string>
     <string name="content_description_open_file">Otevřít soubor</string>
@@ -440,7 +440,7 @@
     <string name="autofill_preference_title">Nastavení samovyplnění</string>
     <string name="warning_database_link_revoked">Přístup k souboru zrušenému správcem souborů</string>
     <string name="error_label_exists">Tento štítek již existuje.</string>
-    <string name="keyboard_search_share_summary">Automaticky vyhledat sdílené informace pro naplnění klávesnice</string>
+    <string name="keyboard_search_share_summary">Při sdílení URL s KeePassDX filtrovat záznamy podle URL domény</string>
     <string name="keyboard_search_share_title">Prohledat sdílené info</string>
     <string name="autofill_block_restart">Aktivovat zamezení restartováním aplikace obsahující formulář.</string>
     <string name="autofill_block">Zamezit samovyplnění</string>
@@ -485,7 +485,7 @@
     <string name="autofill_close_database_title">Zavřít databázi</string>
     <string name="keyboard_previous_lock_summary">Po uzamknutí databáze automaticky přepnout zpět na předchozí klávesnici</string>
     <string name="keyboard_previous_lock_title">Uzamknout databázi</string>
-    <string name="keyboard_save_search_info_summary">Pokuste se uložit sdílené info, když manuálné vybíráte položku</string>
+    <string name="keyboard_save_search_info_summary">Je-li po sdílení URL s KeePassDX vybrán záznam, pokusit se zapamatovat onen záznam pro další použití</string>
     <string name="keyboard_save_search_info_title">Uložit sdílené info</string>
     <string name="notification">Oznámení</string>
     <string name="biometric_security_update_required">Vyžadována aktualizace biometrického zabezpečení.</string>
@@ -563,4 +563,37 @@
     <string name="error_duplicate_file">Datový soubor již existuje.</string>
     <string name="error_move_group_here">Sem skupinu přesunout nemůžete.</string>
     <string name="error_word_reserved">Toto slovo je rezervováno a nelze je použít.</string>
+    <string name="templates">Předlohy</string>
+    <string name="templates_group_uuid_title">Skupina předloh</string>
+    <string name="templates_group_enable_summary">K vyplnění polí záznamu použijte dynamické předlohy</string>
+    <string name="templates_group_enable_title">Využití předloh</string>
+    <string name="version">Verze</string>
+    <string name="template">Předloha</string>
+    <string name="standard">Standard</string>
+    <string name="membership">Členství</string>
+    <string name="secure_note">Bezpečná poznámka</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Jméno banky</string>
+    <string name="bank">Banka</string>
+    <string name="account">Účet</string>
+    <string name="seed">Seed</string>
+    <string name="private_key">Privátní klíč</string>
+    <string name="public_key">Veřejný klíč</string>
+    <string name="token">Token</string>
+    <string name="cryptocurrency">Kryptoměnová peněženka</string>
+    <string name="type">Typ</string>
+    <string name="ssid">SSID</string>
+    <string name="email_address">E-mailová adresa</string>
+    <string name="email">E-mail</string>
+    <string name="date_of_issue">Datum vydání</string>
+    <string name="place_of_issue">Místo vydání</string>
+    <string name="name">Jméno</string>
+    <string name="id_card">Občanský průkaz</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">Číslo</string>
+    <string name="holder">Majitel</string>
+    <string name="debit_credit_card">Debitní / Kreditní karta</string>
+    <string name="template_group_name">Předlohy</string>
 </resources>

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

@@ -325,7 +325,7 @@
     <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>
-    <string name="keyboard_selection_entry_summary">Eingabefelder beim Betrachten eines Eintrags im Magikeyboard anzeigen</string>
+    <string name="keyboard_selection_entry_summary">Beim Betrachten eines Eintrags in KeePassDX diesen Eintrag im Magikeyboard einpflegen</string>
     <string name="delete_entered_password_title">Passwort löschen</string>
     <string name="delete_entered_password_summary">Löscht das eingegebene Passwort nach einem Verbindungsversuch zu einer Datenbank</string>
     <string name="content_description_open_file">Datei öffnen</string>
@@ -456,7 +456,7 @@
     <string name="autofill_preference_title">Einstellungen für automatisches Ausfüllen</string>
     <string name="warning_database_link_revoked">Zugriff auf die Datei durch den Dateimanager widerrufen</string>
     <string name="error_label_exists">Diese Bezeichnung existiert bereits.</string>
-    <string name="keyboard_search_share_summary">Automatische Suche nach gemeinsam genutzten Informationen zur Belegung der Tastatur</string>
+    <string name="keyboard_search_share_summary">Beim Teilen einer URL mit KeePassDX die Einträge nach dieser URL filtern</string>
     <string name="keyboard_search_share_title">Gemeinsame Infos durchsuchen</string>
     <string name="autofill_block_restart">Starten Sie die Anwendung, die das Formular enthält, neu, um die Sperrung zu aktivieren.</string>
     <string name="autofill_block">Automatisches Ausfüllen sperren</string>
@@ -508,7 +508,7 @@
     <string name="autofill_ask_to_save_data_title">Speichern von Daten abfragen</string>
     <string name="autofill_save_search_info_title">Suchinformationen speichern</string>
     <string name="autofill_close_database_summary">Datenbank nach Auswahl eines Eintrags zum automatischen Ausfüllen schließen</string>
-    <string name="keyboard_save_search_info_summary">Versuche bei manueller Eingabeauswahl gemeinsam genutzte Informationen zu speichern</string>
+    <string name="keyboard_save_search_info_summary">Nachdem eine URL mit KeePassDX geteilt und ein Eintrag gewählt wurde, wird versucht sich diesen Eintrag für weitere Nutzungen zu merken</string>
     <string name="keyboard_save_search_info_title">Gemeinsam genutzte Informationen speichern</string>
     <string name="warning_empty_recycle_bin">Sollen alle ausgewählten Knoten wirklich aus dem Papierkorb gelöscht werden\?</string>
     <string name="error_field_name_already_exists">Der Feldname existiert bereits.</string>
@@ -545,7 +545,7 @@
     <string name="error_rebuild_list">Die Liste kann nicht ordnungsgemäß neu erstellt werden.</string>
     <string name="error_database_uri_null">Datenbank-URI kann nicht abgerufen werden.</string>
     <string name="menu_reload_database">Datenbank neu laden</string>
-    <string name="warning_database_info_changed_options">Überschreiben Sie die externen Änderungen, indem Sie die Datenbank speichern, oder laden Sie sie mit den neuesten Änderungen neu.</string>
+    <string name="warning_database_info_changed_options">Überschreiben Sie die externen Änderungen durch Speichern der Datenbank oder laden Sie sie mit den neuesten Änderungen neu.</string>
     <string name="error_file_to_big">Die Datei, die hochgeladen werden soll, ist zu groß.</string>
     <string name="warning_database_info_changed">Die in Ihrer Datenbank enthaltenen Informationen wurden außerhalb der App geändert.</string>
     <string name="error_remove_file">Beim Löschen der Datei trat ein Fehler auf.</string>
@@ -579,4 +579,35 @@
     <string name="autofill_inline_suggestions_summary">Wenn möglich unmittelbar Vorschläge zum automatischen Ausfüllen auf einer kompatiblen Tastatur anzeigen</string>
     <string name="properties">Eigenschaften</string>
     <string name="description_app_properties">KeePassDX-Eigenschaften zur Verwaltung der App-Einstellungen</string>
+    <string name="secure_note">Sicherer Hinweis</string>
+    <string name="type">Typ</string>
+    <string name="date_of_issue">Ausgabedatum</string>
+    <string name="place_of_issue">Ausstellungsort</string>
+    <string name="name">Name</string>
+    <string name="id_card">Personalausweis</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="debit_credit_card">Debit- / Kreditkarte</string>
+    <string name="template_group_name">Vorlagen</string>
+    <string name="templates">Vorlagen</string>
+    <string name="templates_group_uuid_title">Vorlagengruppe</string>
+    <string name="templates_group_enable_summary">Dynamische Vorlagen zum Ausfüllen der Felder eines Eintrags verwenden</string>
+    <string name="templates_group_enable_title">Verwendung von Vorlagen</string>
+    <string name="version">Version</string>
+    <string name="template">Vorlage</string>
+    <string name="standard">Standard</string>
+    <string name="membership">Mitgliedschaft</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Name der Bank</string>
+    <string name="bank">Bank</string>
+    <string name="account">Konto</string>
+    <string name="seed">Seed</string>
+    <string name="private_key">Privater Schlüssel</string>
+    <string name="public_key">Öffentlicher Schlüssel</string>
+    <string name="token">Token</string>
+    <string name="cryptocurrency">Kryptowährungsbörse</string>
+    <string name="ssid">SSID</string>
+    <string name="wireless">WLAN</string>
+    <string name="email_address">E-Mail-Adresse</string>
+    <string name="email">E-Mail</string>
 </resources>

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

@@ -303,7 +303,7 @@
     <string name="clear_clipboard_notification_summary">Κλείδωμα της βάσης δεδομένων όταν λήξει η διάρκεια του προχείρου ή η ειδοποίηση κλείσει αφού αρχίσετε να την χρησιμοποιείτε</string>
     <string name="recycle_bin">Κάδος ανακύκλωσης</string>
     <string name="keyboard_selection_entry_title">Επιλογή καταχώρισης</string>
-    <string name="keyboard_selection_entry_summary">Εμφάνιση πεδίων εισαγωγής στο Magikeyboard κατά την προβολή μιας καταχώρησης</string>
+    <string name="keyboard_selection_entry_summary">Κατά την προβολή μιας καταχώρησης στο KeePassDX, συμπληρώστε το Magikeyboard με αυτήν την καταχώρηση</string>
     <string name="delete_entered_password_title">Διαγραφή κωδικού πρόσβασης</string>
     <string name="delete_entered_password_summary">Διαγράφει τον κωδικό πρόσβασης που εισήχθη μετά από μια προσπάθεια σύνδεσης σε μια βάση δεδομένων</string>
     <string name="content_description_open_file">Άνοιγμα αρχείου</string>
@@ -454,7 +454,7 @@
     <string name="keyboard_previous_database_credentials_title">Οθόνη διαπιστευτηρίων βάσης δεδομένων</string>
     <string name="keyboard_change">Εναλλαγή πληκτρολογίου</string>
     <string name="keyboard_search_share_title">Αναζήτηση κοινών πληροφοριών</string>
-    <string name="keyboard_search_share_summary">Αυτόματη αναζήτηση κοινών πληροφοριών για τη συμπλήρωση του πληκτρολογίου</string>
+    <string name="keyboard_search_share_summary">Κατά την κοινή χρήση ενός URL στο KeePassDX, φιλτράρετε τις καταχωρήσεις χρησιμοποιώντας αυτόν τον τομέα URL</string>
     <string name="database_data_remove_unlinked_attachments_summary">Καταργεί συνημμένα που περιέχονται στη βάση δεδομένων, αλλά δεν συνδέονται με μια καταχώριση</string>
     <string name="database_data_remove_unlinked_attachments_title">Κατάργηση αποσυνδεδεμένων δεδομένων</string>
     <string name="data">Δεδομένα</string>
@@ -484,7 +484,7 @@
     <string name="autofill_close_database_title">Κλείσιμο βάσης δεδομένων</string>
     <string name="keyboard_previous_lock_summary">Επιστρέψτε αυτόματα στο προηγούμενο πληκτρολόγιο μετά το κλείδωμα της βάσης δεδομένων</string>
     <string name="keyboard_previous_lock_title">Κλείδωμα βάσης δεδομένων</string>
-    <string name="keyboard_save_search_info_summary">Προσπαθήστε να αποθηκεύσετε κοινόχρηστες πληροφορίες όταν κάνετε μια χειροκίνητη επιλογή καταχώρησης</string>
+    <string name="keyboard_save_search_info_summary">Μετά την κοινή χρήση ενός URL στο KeePassDX , όταν έχει επιλεγεί μια καταχώρηση, προσπαθήστε να θυμηθείτε αυτήν την καταχώρηση για περαιτέρω χρήσεις</string>
     <string name="keyboard_save_search_info_title">Αποθήκευση κοινόχρηστων πληροφοριών</string>
     <string name="notification">Ειδοποίηση</string>
     <string name="biometric_security_update_required">Απαιτείται ενημέρωση βιομετρικής ασφάλειας.</string>
@@ -562,4 +562,38 @@
     <string name="error_start_database_action">Παρουσιάστηκε σφάλμα κατά την εκτέλεση μιας ενέργειας στη βάση δεδομένων.</string>
     <string name="error_move_group_here">Δεν μπορείτε να μετακινήσετε μια ομάδα εδώ.</string>
     <string name="error_word_reserved">Αυτή η λέξη είναι δεσμευμένη και δεν μπορεί να χρησιμοποιηθεί.</string>
+    <string name="templates">Πρότυπα</string>
+    <string name="templates_group_uuid_title">Ομάδα προτύπων</string>
+    <string name="templates_group_enable_summary">Χρησιμοποιήστε δυναμικά πρότυπα για να συμπληρώσετε τα πεδία μιας καταχώρησης</string>
+    <string name="templates_group_enable_title">Χρήση προτύπων</string>
+    <string name="version">Έκδοση</string>
+    <string name="template">Πρότυπο</string>
+    <string name="standard">Standard</string>
+    <string name="membership">Μέλος</string>
+    <string name="secure_note">Ασφαλής Σημείωση</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Όνομα τράπεζας</string>
+    <string name="bank">Τράπεζα</string>
+    <string name="account">Λογαριασμός</string>
+    <string name="seed">Seed</string>
+    <string name="private_key">Ιδιωτικό κλειδί</string>
+    <string name="public_key">Δημόσιο κλειδί</string>
+    <string name="token">Token</string>
+    <string name="cryptocurrency">Πορτοφόλι κρυπτονομισμάτων</string>
+    <string name="type">Τύπος</string>
+    <string name="ssid">SSID</string>
+    <string name="wireless">Wifi</string>
+    <string name="email_address">Διεύθυνση ηλεκτρονικού ταχυδρομείου</string>
+    <string name="email">Email</string>
+    <string name="date_of_issue">Ημερομηνία έκδοσης</string>
+    <string name="place_of_issue">Τόπος έκδοσης</string>
+    <string name="name">Όνομα</string>
+    <string name="id_card">Ταυτότητα</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">Αριθμός</string>
+    <string name="holder">Κάτοχος</string>
+    <string name="debit_credit_card">Χρεωστική / Πιστωτική Κάρτα</string>
+    <string name="template_group_name">Πρότυπα</string>
 </resources>

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

@@ -247,15 +247,15 @@
     <string name="education_sort_summary">Ordenar registros y grupos de acuerdo a parámetros específicos.</string>
     <string name="education_donation_title">Participar</string>
     <string name="education_donation_summary">Participe para aumentar la estabilidad, la seguridad y agregar más funciones.</string>
-    <string name="html_text_ad_free">A diferencia de muchas aplicaciones de administración de contraseñas, esta es &lt;strong&gt;sin publicidad&lt;/strong&gt;, &lt;strong&gt;software libre con copyleft&lt;/strong&gt; y no recopila datos personales en sus servidores, sin importar la versión que use.</string>
+    <string name="html_text_ad_free">A diferencia de muchas aplicaciones de gestión de contraseñas, esta <strong>no tiene publicidad</strong>, es <strong>libre, con licencia «copyleft»</strong> y no recopila datos personales en sus servidores, sin importar la versión que use.</string>
     <string name="html_text_buy_pro">Al comprar la versión pro, tendrá acceso al &lt;strong&gt;estilo visual &lt;/strong&gt;y ayudará especialmente a &lt;strong&gt;la realización de proyectos comunitarios.&lt;/strong&gt;</string>
-    <string name="html_text_feature_generosity">Este &lt;strong&gt;estilo visual &lt;/strong&gt;está disponible gracias a tu generosidad.</string>
+    <string name="html_text_feature_generosity">Este <strong>estilo visual</strong> está disponible gracias a su generosidad.</string>
     <string name="html_text_donation">Para mantener nuestra libertad y estar siempre vigente, contamos con tu &lt;strong&gt;contribución.&lt;/strong&gt;</string>
     <string name="html_text_dev_feature">Esta función está &lt;strong&gt;en desarrollo&lt;/strong&gt; y requiere de tu &lt;strong&gt;contribución&lt;/strong&gt; para estar disponible dentro de poco.</string>
     <string name="html_text_dev_feature_buy_pro">Al comprar la versión &lt;strong&gt;pro&lt;/strong&gt;,</string>
     <string name="html_text_dev_feature_contibute">Al &lt;strong&gt;contribuir&lt;/strong&gt;,</string>
     <string name="html_text_dev_feature_encourage">anima a los desarrolladores a crear &lt;strong&gt;nuevas funciones&lt;/strong&gt; y a &lt;strong&gt;corregir errores&lt;/strong&gt; de acuerdo con sus comentarios.</string>
-    <string name="html_text_dev_feature_thanks">Muchas gracias por tu contribución.</string>
+    <string name="html_text_dev_feature_thanks">Muchas gracias por su contribución.</string>
     <string name="html_text_dev_feature_work_hard">Estamos trabajando duro para lanzar esta característica rápidamente.</string>
     <string name="html_text_dev_feature_upgrade">Recuerde mantener su aplicación actualizada instalando nuevas versiones.</string>
     <string name="download">Descargar</string>
@@ -310,7 +310,7 @@
     <string name="clear_clipboard_notification_summary">Bloquear la base de datos cuando expire la duración del portapapeles o cuando se cierre la notificación después de empezar a utilizarla</string>
     <string name="recycle_bin">Papelera de reciclaje</string>
     <string name="keyboard_selection_entry_title">Selección de entrada</string>
-    <string name="keyboard_selection_entry_summary">Mostrar campos de entrada en el Teclado mágico al ver una entrada</string>
+    <string name="keyboard_selection_entry_summary">Al ver una entrada en KeePassDX, rellenar con esta el teclado mágico</string>
     <string name="delete_entered_password_title">Eliminar contraseña</string>
     <string name="delete_entered_password_summary">Elimina la contraseña introducida tras un intento de conexión a una bse de datos</string>
     <string name="content_description_open_file">Abrir archivo</string>
@@ -369,7 +369,7 @@
     <string name="content_description_add_item">Añadir elemento</string>
     <string name="download_complete">¡Completado!</string>
     <string name="download_finalization">Finalizando…</string>
-    <string name="download_progression">En progreso: %1$d%%</string>
+    <string name="download_progression">En curso: %1$d %%</string>
     <string name="download_initialization">Inicializando…</string>
     <string name="download_attachment">Descargar %1$s</string>
     <string name="enable_auto_save_database_summary">Guardar la base de datos después de cada acción importante (en modo \"Modificable\")</string>
@@ -436,11 +436,11 @@
     <string name="database_opened">Base de datos abierta</string>
     <string name="education_add_attachment_title">Adjuntar</string>
     <string name="education_add_attachment_summary">Cargue un archivo adjunto a la entrada para guardar datos externos importantes.</string>
-    <string name="hide_expired_entries_summary">Las entradas caducadas no se están mostrando</string>
+    <string name="hide_expired_entries_summary">No se muestran las entradas caducadas</string>
     <string name="warning_remove_unlinked_attachment">La eliminación de datos no vinculados puede disminuir el tamaño de su base de datos, pero también puede eliminar los datos usados por los complementos de KeePass.</string>
-    <string name="warning_file_too_big">Se supone que una base de datos KeePass contiene solo pequeños archivos de utilidad (como archivos de clave PGP).
+    <string name="warning_file_too_big">Una base de datos de KeePass está pensada para contener solamente archivos utilitarios pequeños (como las claves de PGP).
 \n
-\nLa base de datos puede volverse muy grande y reducir su rendimiento con esta subida.</string>
+\nSi procede con esta carga, la base de datos podría crecer mucho y afectar el rendimiento.</string>
     <string name="recycle_bin_group_title">Grupo de la papelera de reciclaje</string>
     <string name="filter">Filtrar</string>
     <string name="database_data_remove_unlinked_attachments_summary">Elimina los archivos adjuntos contenidos en la base de datos pero no vinculados a una entrada</string>
@@ -491,7 +491,7 @@
     <string name="notification">Notificación</string>
     <string name="hide_expired_entries_title">Ocultar las entradas expiradas</string>
     <string name="keyboard_search_share_title">Buscar información compartida</string>
-    <string name="upload_attachment">Subir %1$s</string>
+    <string name="upload_attachment">Cargar %1$s</string>
     <string name="education_setup_OTP_summary">Configurar la gestión de contraseñas de un solo uso (HOTP / TOTP) para generar un token solicitado para la autenticación de dos factores (2FA).</string>
     <string name="education_setup_OTP_title">Establecer la contaseña de un solo uso</string>
     <string name="education_advanced_unlock_summary">Vincule su contraseña con su credencial biométrica o del dispositivo escaneada para desbloquear rápidamente su base de datos.</string>
@@ -522,9 +522,9 @@
     <string name="keyboard_previous_database_credentials_summary">Cambiar automáticamente al teclado anterior en la pantalla de credenciales de la base de datos</string>
     <string name="keyboard_previous_database_credentials_title">Pantalla de credenciales de la base de datos</string>
     <string name="keyboard_auto_go_action_title">Acción de la tecla automática</string>
-    <string name="keyboard_save_search_info_summary">Intentar guardar la información compartida cuando hagas una selección de entrada manual</string>
+    <string name="keyboard_save_search_info_summary">Luego de compartir un URL con KeePassDX, cuando se selecciona una entrada, intentar recordarla para futuros usos</string>
     <string name="keyboard_save_search_info_title">Guardar información compartida</string>
-    <string name="keyboard_search_share_summary">Buscar automáticamente la información compartida para llenar el teclado</string>
+    <string name="keyboard_search_share_summary">Al compartir un URL con KeePassDX, filtrar las entradas utilizando el dominio de ese URL</string>
     <string name="show_uuid_summary">Muestra el UUID vinculado a una entrada</string>
     <string name="show_uuid_title">Mostrar UUID</string>
     <string name="error_rebuild_list">No es posible reconstruir adecuadamente la lista.</string>
@@ -543,7 +543,7 @@
     <string name="error_otp_type">El tipo de OTP existente no es reconocido por este formulario, su validación ya no puede generar correctamente el token.</string>
     <string name="download_canceled">¡Cancelado!</string>
     <string name="error_duplicate_file">Los datos del archivo ya existen.</string>
-    <string name="error_upload_file">Error al subir datos del archivo.</string>
+    <string name="error_upload_file">Se produjo un error al cargar los datos del archivo.</string>
     <string name="description_app_properties">Propiedades de KeePassDX para gestionar la configuración de la aplicación</string>
     <string name="content_description_otp_information">Información de contraseña de un solo uso</string>
     <string name="icon_section_custom">Personalizado</string>
@@ -564,4 +564,38 @@
     <string name="error_file_to_big">El archivo que está tratando de cargar es demasiado grande.</string>
     <string name="error_move_group_here">No puede mover un grupo aquí.</string>
     <string name="error_word_reserved">Esta palabra está reservada y no se puede usar.</string>
+    <string name="templates">Plantillas</string>
+    <string name="templates_group_uuid_title">Grupo de plantillas</string>
+    <string name="templates_group_enable_summary">Utilice plantillas dinámicas para completar los campos de una entrada</string>
+    <string name="templates_group_enable_title">Uso de plantillas</string>
+    <string name="version">Versión</string>
+    <string name="template">Plantilla</string>
+    <string name="standard">Estándar</string>
+    <string name="membership">Membresía</string>
+    <string name="secure_note">Nota Segura</string>
+    <string name="bank_name">Nombre del banco</string>
+    <string name="bank">Banco</string>
+    <string name="account">Cuenta</string>
+    <string name="seed">Semilla</string>
+    <string name="private_key">Clave privada</string>
+    <string name="public_key">Clave pública</string>
+    <string name="cryptocurrency">Billetera de criptomonedas</string>
+    <string name="type">Tipo</string>
+    <string name="wireless">Wi-Fi</string>
+    <string name="email_address">Dirección de correo electrónico</string>
+    <string name="email">Correo electrónico</string>
+    <string name="date_of_issue">Fecha de emisión</string>
+    <string name="place_of_issue">Lugar de emisión</string>
+    <string name="name">Nombre</string>
+    <string name="id_card">Tarjeta de Identificación</string>
+    <string name="number">Número</string>
+    <string name="holder">Titular</string>
+    <string name="debit_credit_card">Tarjeta de Crédito / Débito</string>
+    <string name="template_group_name">Plantillas</string>
+    <string name="international_bank_account_number">Número Internacional de Cuenta Bancaria</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="token">Token</string>
+    <string name="ssid">SSID</string>
+    <string name="personal_identification_number">Número de Identificación Personal</string>
+    <string name="card_verification_value">CVV</string>
 </resources>

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

@@ -200,7 +200,7 @@
     <string name="monospace_font_fields_enable_summary">Change la fonte utilisée dans les champs pour une meilleure visibilité des caractères</string>
     <string name="allow_copy_password_title">Faire confiance au presse-papier</string>
     <string name="allow_copy_password_summary">Autorise la copie du mot de passe de l’entrée et des champs protégés dans le presse-papier</string>
-    <string name="allow_copy_password_warning">Attention : Le presse-papier est partagé par toutes les applications. Si des données sensibles sont copiées, d’autres logiciels peuvent les récupérer.</string>
+    <string name="allow_copy_password_warning">Attention : le presse-papier est partagé par toutes les applications. Si des données sensibles sont copiées, d’autres logiciels peuvent les récupérer.</string>
     <string name="database_name_title">Nom de la base de données</string>
     <string name="database_description_title">Description de la base de données</string>
     <string name="database_version_title">Version de la base de données</string>
@@ -513,12 +513,12 @@
     <string name="device_credential">Déverouillage de l\'appareil</string>
     <string name="credential_before_click_advanced_unlock_button">Tapez le mot de passe, puis cliquez sur ce bouton.</string>
     <string name="advanced_unlock_prompt_not_initialized">Impossible d\'initialiser l\'invite de déverrouillage avancé.</string>
-    <string name="advanced_unlock_scanning_error">Erreur de déverrouillage avancé : %1$s</string>
+    <string name="advanced_unlock_scanning_error">Erreur de déverrouillage avancé : %1$s</string>
     <string name="advanced_unlock_not_recognized">Impossible de reconnaître l\'empreinte de déverrouillage avancé</string>
     <string name="advanced_unlock_invalid_key">Impossible de lire la clé de déverrouillage avancé. Veuillez la supprimer et répéter la procédure de reconnaissance de déverrouillage.</string>
     <string name="advanced_unlock_prompt_extract_credential_message">Extraire les identifiants de la base de données avec des données de déverrouillage avancées</string>
     <string name="advanced_unlock_prompt_extract_credential_title">Ouvrir la base de données avec la reconnaissance de déverrouillage avancée</string>
-    <string name="advanced_unlock_prompt_store_credential_message">Attention : Vous devez toujours vous souvenir de votre mot de passe principal si vous utilisez la reconnaissance de déverrouillage avancée.</string>
+    <string name="advanced_unlock_prompt_store_credential_message">Attention : vous devez toujours vous souvenir de votre mot de passe principal si vous utilisez le déverrouillage avancé.</string>
     <string name="advanced_unlock_prompt_store_credential_title">Reconnaissance de déverrouillage avancée</string>
     <string name="open_advanced_unlock_prompt_store_credential">Ouvrez l\'invite de déverrouillage avancé pour stocker les informations d\'identification</string>
     <string name="open_advanced_unlock_prompt_unlock_database">Ouvrez l\'invite de déverrouillage avancé pour déverrouiller la base de données</string>
@@ -574,4 +574,33 @@
     <string name="error_start_database_action">Une erreur s\'est produite lors de l\'exécution d\'une action sur la base de données.</string>
     <string name="error_move_group_here">Vous ne pouvez pas déplacer un groupe ici.</string>
     <string name="error_word_reserved">Ce mot est réservé et ne peut pas être utilisé.</string>
+    <string name="templates">Modèles</string>
+    <string name="templates_group_uuid_title">Groupe de modèles</string>
+    <string name="templates_group_enable_summary">Utiliser les modèles dynamiques pour remplir les champs d\'une entrée</string>
+    <string name="templates_group_enable_title">Utilisation des modèles</string>
+    <string name="version">Version</string>
+    <string name="template">Modèle</string>
+    <string name="standard">Standard</string>
+    <string name="membership">Adhésion</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Nom de la banque</string>
+    <string name="bank">Banque</string>
+    <string name="account">Compte</string>
+    <string name="seed">Graine</string>
+    <string name="private_key">Clé privée</string>
+    <string name="public_key">Clé publique</string>
+    <string name="token">Jeton</string>
+    <string name="cryptocurrency">Portefeuille de cryptomonnaies</string>
+    <string name="type">Type</string>
+    <string name="ssid">SSID</string>
+    <string name="email_address">Adresse courriel</string>
+    <string name="email">Courriel</string>
+    <string name="date_of_issue">Date d\'émission</string>
+    <string name="place_of_issue">Lieu d\'émission</string>
+    <string name="name">Nom</string>
+    <string name="id_card">Carte d\'identité</string>
+    <string name="debit_credit_card">Carte de crédit</string>
+    <string name="template_group_name">Modèles</string>
+    <string name="secure_note">Note sécurisée</string>
 </resources>

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

@@ -414,9 +414,9 @@
     <string name="education_setup_OTP_title">Postavi jednokratnu lozinku</string>
     <string name="content_description_add_item">Dodaj element</string>
     <string name="html_text_dev_feature_buy_pro">Kupnjom &lt;strong&gt;pro&lt;/strong&gt; verzije,</string>
-    <string name="keyboard_selection_entry_summary">Prikaži polja unosa u Magikeyboardu prilikom prikaza unosa</string>
+    <string name="keyboard_selection_entry_summary">Prilikom prikaza unosa u KeePassDX-u, popuni Magikeyboard s tim unosom</string>
     <string name="education_new_node_title">Dodaj elemente u bazu podataka</string>
-    <string name="keyboard_search_share_summary">Automatski traži dijeljene informacije radi punjenja tipkovnice</string>
+    <string name="keyboard_search_share_summary">Prilikom dijeljenja URL-a u KeePassDX-u, filtriraj unose koristeći tu domenu URL-a</string>
     <string name="education_donation_summary">Pomogni povećati stabilnost i sigurnost dodavanjem dodatnih funkcija.</string>
     <string name="error_string_type">Ovaj se tekst ne poklapa sa zatraženim elementom.</string>
     <string name="html_text_buy_pro">Kupnjom pro verzije imat ćaš pristup ovom &lt;strong&gt;vizualnom stilu&lt;/strong&gt; i k tome ćeš pomoći &lt;strong&gt;u realizaciji projekata zajednice.&lt;/strong&gt;</string>
@@ -482,7 +482,7 @@
     <string name="autofill_close_database_title">Zatvori bazu podataka</string>
     <string name="keyboard_previous_lock_summary">Automatski prebaci na prethodnu tipkovnicu nakon zaključavanja baze podataka</string>
     <string name="keyboard_previous_lock_title">Zaključaj bazu podataka</string>
-    <string name="keyboard_save_search_info_summary">Pokušaj spremiti dijeljene informacije prilikom odabira ručnog unosa</string>
+    <string name="keyboard_save_search_info_summary">Nakon dijeljenja URL-a s KeePassDX-om, kad je unos odabran, pokušaj zapamtiti taj unos za daljnje korištenje</string>
     <string name="keyboard_save_search_info_title">Spremi dijeljene informacije</string>
     <string name="warning_empty_recycle_bin">Trajno izbrisati sve čvorove iz smeća\?</string>
     <string name="biometric_security_update_required">Potrebno je aktualizirati biometrijsku zaštitu.</string>
@@ -557,4 +557,37 @@
     <string name="error_start_database_action">Došlo je do greške tijekom izvođenja radnje u bazi podataka.</string>
     <string name="error_move_group_here">Grupa se ne može ovdje premjestiti.</string>
     <string name="error_word_reserved">Ova je riječ rezervirana i ne može se koristiti.</string>
+    <string name="templates_group_uuid_title">Grupa predložaka</string>
+    <string name="templates_group_enable_summary">Koristi dinamičke predloške za ispunjavanje polja unosa</string>
+    <string name="templates_group_enable_title">Korištenje predložaka</string>
+    <string name="templates">Predlošci</string>
+    <string name="version">Verzija</string>
+    <string name="template">Predložak</string>
+    <string name="standard">Standardno</string>
+    <string name="membership">Članstvo</string>
+    <string name="secure_note">Sigurna napomena</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Ime banke</string>
+    <string name="bank">Banka</string>
+    <string name="account">Račun</string>
+    <string name="private_key">Privatni ključ</string>
+    <string name="public_key">Javni ključ</string>
+    <string name="token">Token</string>
+    <string name="cryptocurrency">Novčanik za kriptovalute</string>
+    <string name="type">Vrsta</string>
+    <string name="ssid">SSID</string>
+    <string name="wireless">Wifi</string>
+    <string name="email_address">E-mail adresa</string>
+    <string name="email">E-mail</string>
+    <string name="date_of_issue">Datum izdavanja</string>
+    <string name="place_of_issue">Mjesto izdavanja</string>
+    <string name="name">Ime</string>
+    <string name="id_card">Osobna iskaznica</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">Broj</string>
+    <string name="holder">Vlasnik</string>
+    <string name="debit_credit_card">Debitna / kreditna kartica</string>
+    <string name="template_group_name">Predlošci</string>
 </resources>

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

@@ -213,7 +213,7 @@
     <string name="sort_menu">Urutan</string>
     <string name="underline">Garis bawah</string>
     <string name="sort_db">Pengurutan alami</string>
-    <string name="sort_recycle_bin_bottom">Recycle bin dibawah</string>
+    <string name="sort_recycle_bin_bottom">Tong Sampah di bawah</string>
     <string name="sort_groups_before">Grup sebelumnya</string>
     <string name="build_label">Build %1$s</string>
     <string name="version_label">Versi %1$s</string>
@@ -231,7 +231,7 @@
     <string name="search_label">Cari</string>
     <string name="do_not_kill_app">Jangan tutup aplikasi…</string>
     <string name="command_execution">Menjalankan perintah…</string>
-    <string name="saving_database">Menyimpan database…</string>
+    <string name="saving_database">Menyimpan basisdata…</string>
     <string name="error_rebuild_list">Tidak dapat membangun ulang daftar.</string>
     <string name="magic_keyboard_title">Magikeyboard</string>
     <string name="keyboard">Papan tik</string>
@@ -398,4 +398,47 @@
     <string name="education_field_copy_title">Salin bidang</string>
     <string name="education_setup_OTP_title">Atur OTP</string>
     <string name="education_donation_title">Partisipasi</string>
+    <string name="advanced_unlock_prompt_extract_credential_title">Buka basisdata dengan pengenalan pembuka kunci tingkat lanjut</string>
+    <string name="advanced_unlock_prompt_store_credential_message">Peringatan: Anda tetap harus mengingat kata sandi induk Anda jika Anda menggunakan pengenalan pembukaan kunci tingkat lanjut.</string>
+    <string name="warning_database_revoked">Akses ke berkas dicabut oleh pengelola berkas, tutup basisdata dan buka kembali dari lokasi tempatnya.</string>
+    <string name="warning_database_info_changed_options">Timpa modifikasi eksternal dengan cara menyimpan basisdata atau muat balik dengan perubahan terakhir.</string>
+    <string name="warning_database_info_changed">Informasi yang tersimpan di berkas basisdata Anda sudah diubah di luar aplikasi.</string>
+    <string name="warning_no_encryption_key">Lanjut tanpa kunci enkripsi\?</string>
+    <string name="warning_empty_password">Lanjut tanpa proteksi buka kunci dengan kata sandi\?</string>
+    <string name="warning_database_link_revoked">Akses ke berkas dicabut oleh pengelola berkas</string>
+    <string name="warning_database_read_only">Berikan akses tulis berkas untuk menyimpan perubahan basisdata</string>
+    <string name="properties">Setelan</string>
+    <string name="error_export_app_properties">Galat ketika mengekspor setelan aplikasi</string>
+    <string name="success_export_app_properties">Setelan aplikasi diekspor</string>
+    <string name="error_import_app_properties">Galat ketika mengimpor setelan aplikasi</string>
+    <string name="success_import_app_properties">Setelan aplikasi diimpor</string>
+    <string name="description_app_properties">Setelan KeePassDX untuk mengelola pengaturan aplikasi</string>
+    <string name="export_app_properties_summary">Buat sebuah berkas untuk mengekspor setelan aplikasi</string>
+    <string name="export_app_properties_title">Ekspor setelan aplikasi</string>
+    <string name="import_app_properties_summary">Pilih sebuah berkas untuk mengimpor setelan aplikasi</string>
+    <string name="import_app_properties_title">Impor setelan aplikasi</string>
+    <string name="error_start_database_action">Timbul galat ketika melaksanakan sebuah aksi di basisdata.</string>
+    <string name="error_move_group_here">Anda tidak bisa memindahkan sebuah grup ke sini.</string>
+    <string name="device_credential_unlock_enable_title">Membuka kredensial perangkat</string>
+    <string name="biometric_unlock_enable_summary">Memperbolehkan pengguna memindai biometrik pengguna untuk membuka database”</string>
+    <string name="biometric_unlock_enable_title">Membuka kunci biometrik</string>
+    <string name="advanced_unlock_explanation_summary">Gunakan buka kunci lanjutan untuk membuka database dengan lebih mudah</string>
+    <string name="no_credentials_stored">Basis data ini belum menyimpan kredensial.</string>
+    <string name="advanced_unlock_not_recognized">Tidak dapat mengenali cetakan buka kunci lanjutan</string>
+    <string name="advanced_unlock_invalid_key">Tidak dapat membaca kunci pembuka lanjutan. Harap hapus dan ulangi prosedur pengenalan buka kunci.</string>
+    <string name="advanced_unlock_prompt_extract_credential_message">Ekstrak kredensial basis data dengan membuka data lanjutan</string>
+    <string name="error_word_reserved">Kata ini telah dipakai dan tidak bisa digunakan</string>
+    <string name="credential_before_click_advanced_unlock_button">Ketik kata sandi, lalu klik tombol ini.</string>
+    <string name="autofill_service_name">Isi formulir KeePassDX otomatis</string>
+    <string name="autofill_preference_title">Pengaturan isi otomatis</string>
+    <string name="set_autofill_service_title">Setel layanan isi otomatis secara default</string>
+    <string name="autofill_explanation_summary">Aktifkan pengisian otomatis untuk mengisi formulir dengan cepat di aplikasi lain</string>
+    <string name="autofill_sign_in_prompt">Masuk dengan KeePassDX</string>
+    <string name="autofill">Isi otomatis</string>
+    <string name="general">Umum</string>
+    <string name="device_credential">Kredensial perangkat</string>
+    <string name="biometric">Biometrik</string>
+    <string name="menu_appearance_settings">Tampilan</string>
+    <string name="database_history">Riwayat</string>
+    <string name="encrypted_value_stored">Enkripsi password telah disimpan.</string>
 </resources>

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

@@ -139,7 +139,7 @@
     <string name="version_label">Versione %1$s</string>
     <string name="encrypted_value_stored">Password criptata salvata</string>
     <string name="no_credentials_stored">Questo database non contiene alcuna credenziale.</string>
-    <string name="education_unlock_summary">Inserisci la password o il file chiave per sbloccare la base di dati.
+    <string name="education_unlock_summary">Inserisci la password e/o il file chiave per sbloccare il database.
 \n
 \nEseguire il backup del file del database in un luogo sicuro dopo ogni modifica.</string>
     <string-array name="list_size_options">
@@ -253,7 +253,7 @@
     <string name="education_read_only_title">Proteggi da scrittura il tuo database</string>
     <string name="education_read_only_summary">Cambia la modalità di apertura per la sessione.
 \n
-\n«Sola lettura» impedisce modifiche accidentali al databae.
+\n«Sola lettura» impedisce modifiche accidentali al database.
 \n«Modificabile» permette di aggiungere, eliminare o modificare tutti gli elementi.</string>
     <string name="education_field_copy_title">Copia un campo</string>
     <string name="education_field_copy_summary">I campi copiati possono essere incollati ovunque. 
@@ -316,7 +316,7 @@
     <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>
     <string name="keyboard_selection_entry_title">Selezione elemento</string>
-    <string name="keyboard_selection_entry_summary">Mostra i campi di input nella Magitastiera durante la visualizzazione di un elemento</string>
+    <string name="keyboard_selection_entry_summary">Durante la visualizzazione di una voce in KeePassDX, inseriscila nella Magitastiera</string>
     <string name="delete_entered_password_title">Elimina password</string>
     <string name="delete_entered_password_summary">Elimina la password immessa dopo un tentativo di connessione al database</string>
     <string name="content_description_open_file">Apri il file</string>
@@ -448,7 +448,7 @@
     <string name="autofill_web_domain_blocklist_title">Lista di blocco per domini web</string>
     <string name="autofill_application_id_blocklist_title">Lista di blocco per app</string>
     <string name="autofill_application_id_blocklist_summary">La lista di blocco impedisce l\'auto riempimento nelle app</string>
-    <string name="keyboard_search_share_summary">Cerca automaticamente le informazioni condivise per compilare la tastiera</string>
+    <string name="keyboard_search_share_summary">Durante la condivisione di una URL a KeePassDX, filtra le voci che usano quel dominio</string>
     <string name="keyboard_search_share_title">Cerca informazioni condivise</string>
     <string name="filter">Filtro</string>
     <string name="error_string_type">Questo testo non soddisfa l\'elemento richiesto.</string>
@@ -478,7 +478,7 @@
     <string name="content_description_credentials_information">Info credenziali</string>
     <string name="show_uuid_summary">Visualizza l\'UUID collegato a una voce</string>
     <string name="show_uuid_title">Mostra UUID</string>
-    <string name="autofill_read_only_save">Il salvataggio dei dati non è consentito per una base du dati aperta in sola lettura.</string>
+    <string name="autofill_read_only_save">Il salvataggio dei dati non è consentito per un database aperto in sola lettura.</string>
     <string name="autofill_ask_to_save_data_summary">Chiedi di salvare i dati quando un modulo viene convalidato</string>
     <string name="autofill_ask_to_save_data_title">Chiedi di salvare i dati</string>
     <string name="autofill_save_search_info_summary">Prova a salvare le informazioni di ricerca quando effettui una selezione di immissione manuale</string>
@@ -487,7 +487,7 @@
     <string name="autofill_close_database_title">Chiudi database</string>
     <string name="keyboard_previous_lock_summary">Torna automaticamente alla tastiera precedente dopo aver bloccato il database</string>
     <string name="keyboard_previous_lock_title">Blocca il database</string>
-    <string name="keyboard_save_search_info_summary">Prova a salvare le informazioni condivise quando effettui una selezione di immissione manuale</string>
+    <string name="keyboard_save_search_info_summary">Dopo la una URL in KeePassDX, quando viene selezionata una voce, prova a salvare quella voce per usi futuri</string>
     <string name="keyboard_save_search_info_title">Salva le informazioni condivise</string>
     <string name="notification">Notifica</string>
     <string name="biometric_security_update_required">È necessario un aggiornamento della sicurezza biometrica.</string>
@@ -565,4 +565,38 @@
     <string name="import_app_properties_title">Importa le proprietà dell\'app</string>
     <string name="error_word_reserved">Questa parola è riservata e non può essere usata.</string>
     <string name="error_move_group_here">Non è possibile spostare un gruppo qui.</string>
+    <string name="templates">Modelli</string>
+    <string name="templates_group_uuid_title">Gruppo di modelli</string>
+    <string name="templates_group_enable_summary">Usa modelli dinamici per riempire i campi di una voce</string>
+    <string name="templates_group_enable_title">Utilizzo dei modelli</string>
+    <string name="version">Versione</string>
+    <string name="template">Modello</string>
+    <string name="standard">Standard</string>
+    <string name="membership">Abbonamento</string>
+    <string name="secure_note">Nota sicura</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Nome banca</string>
+    <string name="bank">Banca</string>
+    <string name="account">Profilo</string>
+    <string name="seed">Seme</string>
+    <string name="private_key">Chiave privata</string>
+    <string name="public_key">Chiave pubblica</string>
+    <string name="token">Token</string>
+    <string name="cryptocurrency">Portafoglio di criptovaluta</string>
+    <string name="type">Tipo</string>
+    <string name="ssid">SSID</string>
+    <string name="wireless">Wifi</string>
+    <string name="email_address">Indirizzo email</string>
+    <string name="email">Email</string>
+    <string name="date_of_issue">Data di emissione</string>
+    <string name="place_of_issue">Luogo di emissione</string>
+    <string name="name">Nome</string>
+    <string name="id_card">Carta d\'identità</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">Numero</string>
+    <string name="holder">Titolare</string>
+    <string name="debit_credit_card">Carta di debito / credito</string>
+    <string name="template_group_name">Modelli</string>
 </resources>

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

@@ -561,4 +561,31 @@
     <string name="error_start_database_action">データベースに対するアクションの実行中にエラーが発生しました。</string>
     <string name="error_word_reserved">この単語は予約語のため使用できません。</string>
     <string name="error_move_group_here">グループをここに移動できません。</string>
+    <string name="templates_group_enable_title">テンプレートの使用方法</string>
+    <string name="templates_group_enable_summary">エントリのフィールドの記入にダイナミックテンプレートを用います</string>
+    <string name="ssid">SSID</string>
+    <string name="templates">Templates</string>
+    <string name="secure_note">セキュアメモ</string>
+    <string name="bank_identifier_code">SWIFTコード</string>
+    <string name="international_bank_account_number"></string>
+    <string name="bank_name">銀行名</string>
+    <string name="bank">銀行</string>
+    <string name="account">口座</string>
+    <string name="seed">シード</string>
+    <string name="private_key">秘密鍵</string>
+    <string name="public_key">公開鍵</string>
+    <string name="token">トークン</string>
+    <string name="cryptocurrency">暗号通貨ウォレット</string>
+    <string name="email_address">メールアドレス</string>
+    <string name="email">Email</string>
+    <string name="date_of_issue">発行日</string>
+    <string name="place_of_issue">発行地</string>
+    <string name="name">名前</string>
+    <string name="id_card">IDカード</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">カード番号</string>
+    <string name="holder">所有者</string>
+    <string name="template_group_name">Templates</string>
+    <string name="debit_credit_card">クレジットカード/デビットカード</string>
 </resources>

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

@@ -317,7 +317,7 @@
     <string name="clear_clipboard_notification_summary">Vergrendel de database wanneer de duur van het klembord verloopt of de melding wordt gesloten nadat u deze bent gaan gebruiken</string>
     <string name="recycle_bin">Prullenmand</string>
     <string name="keyboard_selection_entry_title">Itemselectie</string>
-    <string name="keyboard_selection_entry_summary">Invoervelden in Magikeyboard tonen bij het bekijken van een item</string>
+    <string name="keyboard_selection_entry_summary">Vul, bij het bekijken van een item in KeePassDX, Magikeyboard met dat item</string>
     <string name="delete_entered_password_title">Wachtwoord wissen</string>
     <string name="delete_entered_password_summary">Wis het ingevoerde wachtwoord na een verbindingspoging met een database</string>
     <string name="content_description_open_file">Bestand openen</string>
@@ -439,7 +439,7 @@
     <string name="validate">Valideren</string>
     <string name="contribution">Bijdragen</string>
     <string name="contact">Contact</string>
-    <string name="keyboard_search_share_summary">Zoek automatisch naar gedeelde informatie om het toetsenbord te vullen</string>
+    <string name="keyboard_search_share_summary">Filter, wanneer een URL met KeePassDX is gedeeld, de items met dat URL-domein</string>
     <string name="keyboard_search_share_title">Gedeelde informatie zoeken</string>
     <string name="autofill_block_restart">Start de app met het formulier opnieuw op om de blokkering te activeren.</string>
     <string name="autofill_block">Blokkering van automatisch invullen</string>
@@ -486,7 +486,7 @@
     <string name="autofill_close_database_title">Database sluiten</string>
     <string name="keyboard_previous_lock_summary">Schakel na het vergrendelen van de database automatisch terug naar het vorige toetsenbord</string>
     <string name="keyboard_previous_lock_title">Database vergrendelen</string>
-    <string name="keyboard_save_search_info_summary">Probeer gedeelde informatie op te slaan bij een handmatige invoerselectie</string>
+    <string name="keyboard_save_search_info_summary">Probeer, wanneer een URL met KeePassDX is gedeeld en een item is geselecteerd, dat item te onthouden voor verder gebruik</string>
     <string name="keyboard_save_search_info_title">Gedeelde info opslaan</string>
     <string name="notification">Melding</string>
     <string name="biometric_security_update_required">Biometrische beveiligingsupdate vereist.</string>

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

@@ -18,7 +18,7 @@
     along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 --><resources>
     <string name="feedback">Informacje zwrotne</string>
-    <string name="homepage">Strona domowa</string>
+    <string name="homepage">Strona główna</string>
     <string name="about_description">Implementacja Android dla menedżera haseł KeePass</string>
     <string name="accept">Akceptuj</string>
     <string name="add_entry">Dodaj wpis</string>
@@ -129,10 +129,10 @@
     <string name="encryption">Szyfrowanie</string>
     <string name="key_derivation_function">Funkcja generująca klucz</string>
     <string name="extended_ASCII">Rozszerzone ASCII</string>
-    <string name="allow">Zezwalaj</string>
+    <string name="allow">Zezwól</string>
     <string name="clipboard_error_title">Błąd schowka</string>
     <string name="clipboard_error">Niektóre urządzenia nie pozwalają aplikacjom korzystać ze schowka.</string>
-    <string name="clipboard_error_clear">Nie można wyczyścić schowka</string>
+    <string name="clipboard_error_clear">Nie udało się wyczyścić schowka</string>
     <string name="html_about_licence">KeePassDX © %1$d Kunzisoft jest &lt;strong&gt;open source&lt;/strong&gt; i &lt;strong&gt;bez reklam&lt;/strong&gt;.
 \nJest on dostarczany w stanie, zgodnie z licencją &lt;strong&gt;GPLv3&lt;/strong&gt; bez żadnych gwarancji.</string>
     <string name="entry_not_found">Nie znaleziono danych wejściowych.</string>
@@ -312,7 +312,7 @@
     <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>
     <string name="keyboard_selection_entry_title">Wybór wpisu</string>
-    <string name="keyboard_selection_entry_summary">Pokaż pola wprowadzania w Magikeyboard podczas przeglądania wpisu</string>
+    <string name="keyboard_selection_entry_summary">Podczas przeglądania wpisu w KeePassDX zapełnij Magikeyboard tym wpisem</string>
     <string name="delete_entered_password_title">Usuń hasło</string>
     <string name="delete_entered_password_summary">Usuwa hasło wprowadzone po próbie połączenia z bazą danych</string>
     <string name="content_description_open_file">Otwórz plik</string>
@@ -439,7 +439,7 @@
     <string name="autofill_preference_title">Ustawienia autouzupełniania</string>
     <string name="warning_database_link_revoked">Dostęp do pliku anulowany przez menedżera plików</string>
     <string name="error_label_exists">Ta etykieta już istnieje.</string>
-    <string name="keyboard_search_share_summary">Automatyczne wyszukiwanie udostępnionych informacji w celu zapełnienia klawiatury</string>
+    <string name="keyboard_search_share_summary">Udostępniając KeePassDX adres URL, filtruj wpisy przy użyciu tej domeny adresu URL</string>
     <string name="keyboard_search_share_title">Wyszukaj udostępnione informacje</string>
     <string name="autofill_block_restart">Zrestartuj aplikację zawierającą formularz, aby aktywować blokadę.</string>
     <string name="autofill_block">Blokowanie autouzupełniania</string>
@@ -484,7 +484,7 @@
     <string name="autofill_close_database_title">Zamknij bazę danych</string>
     <string name="keyboard_previous_lock_summary">Automatycznie przełącz się z powrotem do poprzedniej klawiatury po zablokowaniu bazy danych</string>
     <string name="keyboard_previous_lock_title">Zablokuj bazę danych</string>
-    <string name="keyboard_save_search_info_summary">Spróbuj zapisać udostępnione informacje podczas ręcznego wybierania pozycji</string>
+    <string name="keyboard_save_search_info_summary">Po udostępnieniu KeePassDX adresu URL, kiedy wpis jest wybrany, spróbuj zapamiętać ten wpis do dalszych zastosowań</string>
     <string name="keyboard_save_search_info_title">Zapisz udostępnione informacje</string>
     <string name="notification">Powiadomienia</string>
     <string name="biometric_security_update_required">Wymagana aktualizacja zabezpieczeń biometrycznych.</string>
@@ -562,4 +562,38 @@
     <string name="error_start_database_action">Wystąpił błąd podczas wykonywania akcji w bazie danych.</string>
     <string name="error_move_group_here">Nie możesz przenieść tutaj grupy.</string>
     <string name="error_word_reserved">To słowo jest zastrzeżone i nie może być używane.</string>
+    <string name="name">Imię i nazwisko</string>
+    <string name="standard">Standardowe</string>
+    <string name="seed">Fraza seed</string>
+    <string name="id_card">Dowód osobisty</string>
+    <string name="templates">Szablony</string>
+    <string name="templates_group_uuid_title">Grupa szablonów</string>
+    <string name="templates_group_enable_summary">Użyj dynamicznych szablonów, aby wypełnić pola wpisu</string>
+    <string name="templates_group_enable_title">Wykorzystanie szablonów</string>
+    <string name="version">Wersja</string>
+    <string name="template">Szablon</string>
+    <string name="membership">Członkostwo</string>
+    <string name="secure_note">Bezpieczna notatka</string>
+    <string name="international_bank_account_number">Numer IBAN</string>
+    <string name="bank_identifier_code">Kod SWIFT / BIC</string>
+    <string name="bank_name">Nazwa banku</string>
+    <string name="bank">Bank</string>
+    <string name="account">Konto</string>
+    <string name="private_key">Klucz prywatny</string>
+    <string name="public_key">Klucz publiczny</string>
+    <string name="token">Token</string>
+    <string name="cryptocurrency">Portfel kryptowalut</string>
+    <string name="type">Typ</string>
+    <string name="ssid">Nazwa SSID</string>
+    <string name="wireless">Wi-Fi</string>
+    <string name="email_address">Adres e-mail</string>
+    <string name="email">E-mail</string>
+    <string name="date_of_issue">Data wydania</string>
+    <string name="place_of_issue">Miejsce wydania</string>
+    <string name="personal_identification_number">Kod PIN</string>
+    <string name="card_verification_value">Kod CVV</string>
+    <string name="number">Numer</string>
+    <string name="holder">Posiadacz</string>
+    <string name="debit_credit_card">Karta debetowa / kredytowa</string>
+    <string name="template_group_name">Szablony</string>
 </resources>

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

@@ -269,8 +269,8 @@
     <string name="education_sort_summary">Выберите критерий сортировки записей и групп.</string>
     <string name="education_donation_title">Участвуйте</string>
     <string name="education_donation_summary">Примите участие в проекте для повышения стабильности, безопасности и добавления новых возможностей.</string>
-    <string name="html_text_ad_free">В отличие от многих приложений управления паролями, это &lt;strong&gt;без рекламы&lt;/strong&gt; и &lt;strong&gt;свободно от лицензирования&lt;/strong&gt;. Оно не собирает ваши личные данные на своих серверах независимо от того, какую версию вы используете.</string>
-    <string name="html_text_buy_pro">При покупке Pro-версии вы будете иметь доступ к этим &lt;strong&gt;визуальным стилям&lt;/strong&gt; и особенно поможете &lt;strong&gt;реализации общественных проектов&lt;/strong&gt;.</string>
+    <string name="html_text_ad_free">В отличие от многих других приложений управления паролями, здесь <strong>нет рекламы</strong>, и оно <strong>свободно от лицензирования</strong>. Приложение не собирает ваши личные данные на своих серверах независимо от версии, которую вы используете.</string>
+    <string name="html_text_buy_pro">Купив Pro-версию, у вас появится доступ к данным <strong>визуальным стилям</strong>, а также вы внесёте вклад в <strong>реализацию общественных проектов</strong>.</string>
     <string name="html_text_feature_generosity">Эти &lt;strong&gt;визуальные стили&lt;/strong&gt; доступны благодаря вашей щедрости.</string>
     <string name="html_text_donation">Для того, чтобы сохранить нашу независимость и быть всегда активными, мы рассчитываем на вашу <strong>поддержку</strong>.</string>
     <string name="html_text_dev_feature">Эта функция находится &lt;strong&gt;в разработке&lt;/strong&gt; и требует вашего &lt;strong&gt;участия&lt;/strong&gt;, чтобы стать доступной в ближайшее время.</string>
@@ -312,7 +312,7 @@
     <string name="clear_clipboard_notification_summary">Блокировать базу при закрытии уведомления после использования или истечения времени ожидания</string>
     <string name="recycle_bin">Корзина</string>
     <string name="keyboard_selection_entry_title">Выбор записи</string>
-    <string name="keyboard_selection_entry_summary">Показывать поля ввода в Magikeyboard при просмотре записи</string>
+    <string name="keyboard_selection_entry_summary">При отображении записи в KeePassDX подставлять её данные в Magikeyboard</string>
     <string name="delete_entered_password_title">Удалять пароль</string>
     <string name="delete_entered_password_summary">Забывать введённый пароль после попытки входа в базу</string>
     <string name="content_description_open_file">Открыть файл</string>
@@ -439,7 +439,7 @@
     <string name="warning_database_link_revoked">Доступ к файлу отменён файловым менеджером</string>
     <string name="autofill_auto_search_title">Автопоиск</string>
     <string name="autofill_preference_title">Настройки автозаполнения</string>
-    <string name="keyboard_search_share_summary">Выполнять автоматический поиск общедоступной информации для подстановки в клавиатуру</string>
+    <string name="keyboard_search_share_summary">При отправке URL в KeePassDX отфильтровать записи по домену этого URL</string>
     <string name="keyboard_search_share_title">Поиск доступной информации</string>
     <string name="subdomain_search_title">Поиск поддоменов</string>
     <string name="subdomain_search_summary">Выполнять поиск доменов с некоторыми поддоменами</string>
@@ -476,7 +476,7 @@
     <string name="configure_biometric">Отсутствует зарегистрированный биометрический ключ или учётные данные устройства.</string>
     <string name="autofill_save_search_info_summary">Сохранять поисковую информацию при ручном выборе записи</string>
     <string name="autofill_save_search_info_title">Сохранять данные поиска</string>
-    <string name="keyboard_save_search_info_summary">Сохранять общую информацию при ручном выборе записи</string>
+    <string name="keyboard_save_search_info_summary">При отправке URL в KeePassDX, если выбрана запись, постараться запомнить её для дальнейшего использования</string>
     <string name="keyboard_save_search_info_title">Сохранять общие данные</string>
     <string name="keyboard_previous_lock_title">Блокировка базы</string>
     <string name="keyboard_previous_lock_summary">Автоматически переключаться на предыдущую клавиатуру после блокировки базы</string>
@@ -562,4 +562,38 @@
     <string name="error_start_database_action">Произошла ошибка при выполнении действия с базой.</string>
     <string name="error_move_group_here">Сюда группу переместить невозможно.</string>
     <string name="error_word_reserved">Это слово зарезервировано и не может быть использовано.</string>
+    <string name="templates_group_enable_summary">Используйте динамические шаблоны для заполнения полей записи</string>
+    <string name="standard">Стандарт</string>
+    <string name="membership">Членство</string>
+    <string name="secure_note">Защищённая заметка</string>
+    <string name="email">Электронная почта</string>
+    <string name="id_card">Идентификационная карта</string>
+    <string name="date_of_issue">Дата выдачи</string>
+    <string name="place_of_issue">Место выдачи</string>
+    <string name="templates">Шаблоны</string>
+    <string name="templates_group_uuid_title">Группа шаблонов</string>
+    <string name="templates_group_enable_title">Использование шаблонов</string>
+    <string name="version">Версия</string>
+    <string name="template">Шаблон</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Название банка</string>
+    <string name="seed">Секретная фраза</string>
+    <string name="account">Счёт</string>
+    <string name="bank">Банк</string>
+    <string name="private_key">Закрытый ключ</string>
+    <string name="public_key">Открытый ключ</string>
+    <string name="token">Токен</string>
+    <string name="cryptocurrency">Криптовалютный кошелёк</string>
+    <string name="type">Тип</string>
+    <string name="ssid">SSID</string>
+    <string name="wireless">WiFi</string>
+    <string name="email_address">Адрес эл. почты</string>
+    <string name="name">Имя</string>
+    <string name="personal_identification_number">PIN-код</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">Номер</string>
+    <string name="holder">Владелец</string>
+    <string name="debit_credit_card">Банковская карта</string>
+    <string name="template_group_name">Шаблоны</string>
 </resources>

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

@@ -169,7 +169,7 @@
     <string name="uppercase">Büyük harf</string>
     <string name="warning">Uyarı</string>
     <string name="warning_password_encoding">Veri tabanı dosyasındaki metin kodlama biçiminin dışındaki parola karakterlerinden kaçın (tanınmayan karakterler aynı harfe dönüştürülür).</string>
-    <string name="warning_empty_password">Parola kilidi koruması olmadan devam edilsin mi\?</string>
+    <string name="warning_empty_password">Şifre koruması olmadan devam edilsin mi\?</string>
     <string name="warning_no_encryption_key">Şifreleme anahtarı olmadan devam edilsin mi\?</string>
     <string name="version_label">Sürüm %1$s</string>
     <string name="build_label">Yapı %1$s</string>
@@ -283,7 +283,7 @@
     <string name="education_donation_title">Katılın</string>
     <string name="education_donation_summary">Daha fazla özellik ekleyerek istikrarı, güvenliği artırmaya yardımcı olun.</string>
     <string name="html_text_ad_free">Birçok parola yönetimi uygulamasının aksine, bu uygulama &lt;strong&gt;reklam içermez&lt;/strong&gt;, &lt;strong&gt; copyleft lisanslı özgür yazılımdır&lt;/strong&gt; ve hangi sürümü kullanırsanız kullanın, sunucularında kişisel veri toplamaz.</string>
-    <string name="html_text_buy_pro">Profesyonel sürümü satın alarak, bu &lt;strong&gt;görsel stile&lt;/strong&gt; erişebilecek ve özellikle &lt;strong&gt;topluluk projelerinin gerçekleştirilmesine&lt;/strong&gt; yardımcı olacaksınız.</string>
+    <string name="html_text_buy_pro">Pro sürümü satın alarak, bu <strong>görsel stile</strong> erişebilecek ve özellikle <strong>topluluk projelerinin gerçekleştirilmesine yardımcı olacaksınız.</strong></string>
     <string name="html_text_feature_generosity">Bu &lt;strong&gt;görsel stil&lt;/strong&gt;, cömertliğiniz sayesinde kullanılabilir.</string>
     <string name="html_text_donation">Özgürlüğümüzü korumak ve daima aktif olmak için &lt;strong&gt;katkılarınıza&lt;/strong&gt; güveniyoruz</string>
     <string name="html_text_dev_feature">Bu özellik &lt;strong&gt;geliştirme aşamasındadır&lt;/strong&gt; ve &lt;strong&gt;katkılarınızın&lt;/strong&gt; yakında kullanıma sunulmasını gerektirir.</string>
@@ -392,7 +392,7 @@
     <string name="keystore_not_accessible">Anahtar deposu düzgün bir şekilde başlatılmadı.</string>
     <string name="recycle_bin_group_title">Geri dönüşüm kutusu grubu</string>
     <string name="enable_auto_save_database_title">Veri tabanını otomatik kaydet</string>
-    <string name="enable_auto_save_database_summary">Her önemli işlemden sonra veri tabanını kaydet (\"Değiştirilebilir\" modda)</string>
+    <string name="enable_auto_save_database_summary">Her önemli işlemden sonra veri tabanını kaydet (\"Değiştirilebilir\" mod için geçerli)</string>
     <string name="entry_attachments">Ekler</string>
     <string name="menu_restore_entry_history">Geçmişi geri yükle</string>
     <string name="menu_delete_entry_history">Geçmişi sil</string>
@@ -433,7 +433,7 @@
     <string name="autofill_preference_title">Otomatik doldurma ayarları</string>
     <string name="warning_database_link_revoked">Dosyaya erişim dosya yöneticisi tarafından iptal edildi</string>
     <string name="error_label_exists">Bu etiket zaten var.</string>
-    <string name="keyboard_search_share_summary">Klavyeyi doldurmak için paylaşılan bilgileri otomatik olarak ara</string>
+    <string name="keyboard_search_share_summary">Bir URL\'yi KeePassDX ile paylaşırken o URL domainini kullananları filtrele</string>
     <string name="keyboard_search_share_title">Paylaşılan bilgileri ara</string>
     <string name="filter">Filtre</string>
     <string name="autofill_block_restart">Engellemeyi etkinleştirmek için formu içeren uygulamayı yeniden başlatın.</string>
@@ -478,7 +478,7 @@
     <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">Elle girdi seçimi yaparken paylaşılan bilgileri kaydetmeyi dene</string>
+    <string name="keyboard_save_search_info_summary">Bir URL\'yi KeePassDX ile paylaştıktan sonra, eğer bir girdi seçiliyse, o girdiyi sonraki kullanımlar için hatırla</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>
@@ -557,4 +557,38 @@
     <string name="error_start_database_action">Veri tabanında bir eylem gerçekleştirilirken bir hata oluştu.</string>
     <string name="error_move_group_here">Bir grubu buraya taşıyamazsınız.</string>
     <string name="error_word_reserved">Bu sözcük ayrılmıştır ve kullanılamaz.</string>
+    <string name="templates">Şablonlar</string>
+    <string name="templates_group_uuid_title">Şablonlar grubu</string>
+    <string name="templates_group_enable_summary">Bir girdinin alanlarını doldurmak için dinamik şablonlar kullanın</string>
+    <string name="templates_group_enable_title">Şablon kullanımı</string>
+    <string name="version">Sürüm</string>
+    <string name="template">Şablon</string>
+    <string name="standard">Standart</string>
+    <string name="membership">Üyelik</string>
+    <string name="secure_note">Güvenli Not</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Banka adı</string>
+    <string name="bank">Banka</string>
+    <string name="account">Hesap</string>
+    <string name="seed">Tohum</string>
+    <string name="private_key">Özel anahtar</string>
+    <string name="public_key">Ortak anahtar</string>
+    <string name="token">Belirteç</string>
+    <string name="cryptocurrency">Kripto para cüzdanı</string>
+    <string name="type">Tür</string>
+    <string name="ssid">SSID</string>
+    <string name="wireless">Wi-Fi</string>
+    <string name="email_address">E-posta adresi</string>
+    <string name="email">E-posta</string>
+    <string name="date_of_issue">Verildiği tarih</string>
+    <string name="place_of_issue">Verildiği yer</string>
+    <string name="name">Ad</string>
+    <string name="id_card">Kimlik Kartı</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">Numara</string>
+    <string name="holder">Sahip</string>
+    <string name="debit_credit_card">Banka / Kredi Kartı</string>
+    <string name="template_group_name">Şablonlar</string>
 </resources>

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

@@ -27,7 +27,7 @@
     <string name="app_timeout">Час очікування</string>
     <string name="app_timeout_summary">Час бездіяльности до блокування бази даних</string>
     <string name="application">Застосунок</string>
-    <string name="menu_app_settings">Параметри застосунку</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="clipboard_cleared">Буфер обміну очищено</string>
@@ -87,8 +87,8 @@
     <string name="hide_password_summary">Типово приховувати паролі за (***)</string>
     <string name="about">Про KeePassDX</string>
     <string name="menu_change_key_settings">Змінити головний ключ</string>
-    <string name="settings">Параметри</string>
-    <string name="menu_database_settings">Параметри бази даних</string>
+    <string name="settings">Налаштування</string>
+    <string name="menu_database_settings">Налаштування бази даних</string>
     <string name="menu_delete">Видалити</string>
     <string name="menu_donate">Допомогти</string>
     <string name="menu_edit">Змінити</string>
@@ -192,7 +192,7 @@
     <string name="menu_copy">Скопіювати</string>
     <string name="content_description_keyfile_checkbox">Поле файла ключа</string>
     <string name="menu_master_key_settings">Налаштування головного ключа</string>
-    <string name="menu_security_settings">Параметри безпеки</string>
+    <string name="menu_security_settings">Налаштування безпеки</string>
     <string name="menu_advanced_unlock_settings">Розширене розблокування</string>
     <string name="menu_form_filling_settings">Заповнення форм</string>
     <string name="copy_field">Скопійовано %1$s</string>
@@ -305,7 +305,7 @@
     <string name="education_new_node_summary">Створюйте записи для керування вашими обліковими записами.
 \n
 \nСтворюйте групи (~теки) для впорядкування записів у вашій базі даних.</string>
-    <string name="device_keyboard_setting_title">Параметри клавіатури пристрою</string>
+    <string name="device_keyboard_setting_title">Налаштування клавіатури пристрою</string>
     <string name="education_new_node_title">Додавайте елементи до вашої бази даних</string>
     <string name="education_select_database_title">Відкрийте наявну базу даних</string>
     <string name="education_select_database_summary">Відкрийте файл раніше створеної бази даних з файлового менеджера, щоб продовжити користуватися ним.</string>
@@ -341,10 +341,10 @@
     <string name="keyboard_notification_entry_clear_close_title">Очищати під час закриття</string>
     <string name="keyboard_notification_entry_summary">Показувати сповіщення, коли запис доступний</string>
     <string name="keyboard_notification_entry_title">Інформаційне сповіщення</string>
-    <string name="keyboard_selection_entry_summary">Показувати поля введення в Magikeyboard під час перегляду запису</string>
+    <string name="keyboard_selection_entry_summary">Під час перегляду запису в KeePassDX заповнювати Magikeyboard цим записом</string>
     <string name="keyboard_selection_entry_title">Вибір запису</string>
     <string name="keyboard_entry_category">Запис</string>
-    <string name="keyboard_setting_label">Параметри Magikeyboard</string>
+    <string name="keyboard_setting_label">Налаштування Magikeyboard</string>
     <string name="keyboard_label">Magikeyboard (KeePassDX)</string>
     <string name="keyboard_name">Magikeyboard</string>
     <string name="magic_keyboard_explanation_summary">Увімкнути власну клавіатуру для заповнення ваших паролів та інших полів ідентифікації</string>
@@ -359,8 +359,8 @@
     <string name="settings_database_force_changing_master_key_next_time_title">Примусова зміна наступного разу</string>
     <string name="settings_database_force_changing_master_key_summary">Вимагати змінити головний ключ (днів)</string>
     <string name="settings_database_force_changing_master_key_title">Примусова зміна</string>
-    <string name="settings_database_recommend_changing_master_key_summary">Рекомендувати змінити головний ключ (днів)</string>
-    <string name="settings_database_recommend_changing_master_key_title">Рекомендувати змінити</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Радити змінити головний ключ (днів)</string>
+    <string name="settings_database_recommend_changing_master_key_title">Радити змінити</string>
     <string name="max_history_size_summary">Обмежити об\'єм історії кожного запису</string>
     <string name="max_history_size_title">Максимальний об\'єм</string>
     <string name="max_history_items_summary">Обмежити кількість елементів історії кожного запису</string>
@@ -400,7 +400,7 @@
     <string name="list_password_generator_options_title">Символи пароля</string>
     <string name="password_size_summary">Встановити типову довжину створюваних паролів</string>
     <string name="password_size_title">Довжина створюваного пароля</string>
-    <string name="autofill_preference_title">Параметри автозаповнення</string>
+    <string name="autofill_preference_title">Налаштування автозаповнення</string>
     <string name="set_autofill_service_title">Встановити типовою службою автозаповнення</string>
     <string name="autofill_explanation_summary">Увімкнути автозаповнення для швидкого заповнення форм в інших застосунках</string>
     <string name="autofill_sign_in_prompt">Увійти за допомогою KeePassDX</string>
@@ -439,7 +439,7 @@
     <string name="parallelism">Паралельність</string>
     <string name="memory_usage">Використання пам\'яті</string>
     <string name="encryption_explanation">Алгоритм шифрування бази даних, застосований для всіх даних.</string>
-    <string name="keyboard_search_share_summary">Автоматично шукати загальнодоступні дані для заповнення клавіатури</string>
+    <string name="keyboard_search_share_summary">Коли надано спільний доступ до URL-адреси у KeePassDX, фільтрувати записи, що застосовують домен з цією URL-адресою</string>
     <string name="keyboard_search_share_title">Пошук доступних даних</string>
     <string name="autofill_block_restart">Перезапустіть застосунок, який містить форму, для застосування блокування.</string>
     <string name="autofill_block">Блокування автозаповнення</string>
@@ -484,7 +484,7 @@
     <string name="autofill_close_database_title">Закриття бази даних</string>
     <string name="keyboard_previous_lock_summary">Автоматичне повернення до попередньої клавіатури після блокування бази даних</string>
     <string name="keyboard_previous_lock_title">Блокування бази даних</string>
-    <string name="keyboard_save_search_info_summary">Намагатися зберегти спільні відомості під час вибору запису власноруч</string>
+    <string name="keyboard_save_search_info_summary">Після надання спільного доступу до URL-адреси KeePassDX, коли запис вибрано, пробувати запам\'ятати цей запис для подальшого застосування</string>
     <string name="keyboard_save_search_info_title">Збереження спільних відомостей</string>
     <string name="notification">Сповіщення</string>
     <string name="biometric_security_update_required">Необхідно оновити біометричний захист.</string>
@@ -554,7 +554,7 @@
     <string name="success_export_app_properties">Властивості застосунку експортовано</string>
     <string name="error_import_app_properties">Помилка під час імпортування властивостей застосунку</string>
     <string name="success_import_app_properties">Властивості застосунку імпортовано</string>
-    <string name="description_app_properties">Властивості KeePassDX для керування параметрами застосунку</string>
+    <string name="description_app_properties">Властивості KeePassDX для керування налаштування застосунку</string>
     <string name="export_app_properties_summary">Створити файл для експорту властивостей застосунку</string>
     <string name="export_app_properties_title">Експорт властивостей застосунку</string>
     <string name="import_app_properties_summary">Виберіть файл для імпорту властивостей застосунку</string>
@@ -562,4 +562,38 @@
     <string name="error_start_database_action">Під час виконання дії з базою даних сталася помилка.</string>
     <string name="error_move_group_here">Ви не можете перемістити групу сюди.</string>
     <string name="error_word_reserved">Це слово зарезервоване, його не можна використовувати.</string>
+    <string name="templates">Шаблони</string>
+    <string name="templates_group_uuid_title">Група «Шаблони»</string>
+    <string name="templates_group_enable_summary">Застосування динамічних шаблонів для заповнення полів запису</string>
+    <string name="templates_group_enable_title">Застосування шаблонів</string>
+    <string name="version">Версія</string>
+    <string name="template">Шаблон</string>
+    <string name="standard">Стандарт</string>
+    <string name="membership">Членство</string>
+    <string name="secure_note">Захищена примітка</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">Назва банку</string>
+    <string name="bank">Банк</string>
+    <string name="account">Рахунок</string>
+    <string name="seed">Фраза відновлення</string>
+    <string name="private_key">Приватний ключ</string>
+    <string name="public_key">Відкритий ключ</string>
+    <string name="token">Токен</string>
+    <string name="cryptocurrency">Криптовалютний гаманець</string>
+    <string name="type">Тип</string>
+    <string name="ssid">SSID</string>
+    <string name="wireless">Wi-Fi</string>
+    <string name="email_address">Адреса е-пошти</string>
+    <string name="email">Е-пошта</string>
+    <string name="date_of_issue">Дата випуску</string>
+    <string name="place_of_issue">Місце випуску</string>
+    <string name="name">Ім\'я</string>
+    <string name="id_card">ID-картка</string>
+    <string name="personal_identification_number">PIN-код</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">Номер</string>
+    <string name="holder">Власник</string>
+    <string name="debit_credit_card">Дебетова / кредитна картка</string>
+    <string name="template_group_name">Шаблони</string>
 </resources>

app/src/main/res/values-v21/styles_classic.xml

@@ -18,9 +18,9 @@
   along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Clear.v21" >
+    <style name="KeepassDXStyle.Clear.v21" parent="KeepassDXStyle.Clear.Base" >
         <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:statusBarColor">@color/grey_dark</item>
         <item name="android:navigationBarColor">@color/grey_dark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Clear.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Clear.DateTime.Dialog</item>

app/src/main/res/values-v21/styles_divine.xml

@@ -18,9 +18,9 @@
   along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <resources>
-    <style name="KeepassDXStyle.White" parent="KeepassDXStyle.White.v21" >
+    <style name="KeepassDXStyle.White.v21" parent="KeepassDXStyle.White.Base" >
         <item name="preferenceTheme">@style/KeepassDXStyle.Preference.v21</item>
-        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:statusBarColor">@color/grey_dark</item>
         <item name="android:navigationBarColor">@color/grey_dark</item>
         <item name="android:timePickerDialogTheme">@style/KeepassDXStyle.Clear.DateTime.Dialog</item>
         <item name="android:datePickerDialogTheme">@style/KeepassDXStyle.Clear.DateTime.Dialog</item>

app/src/main/res/values-v23/styles_classic.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Jeremy Jamet / Kunzisoft.
+
+ This file is part of KeePassDX.
+
+  KeePassDX is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDX is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<resources>
+    <style name="KeepassDXStyle.Clear.v23" parent="KeepassDXStyle.Clear.v21" >
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>

app/src/main/res/values-v23/styles_divine.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2021 Jeremy Jamet / Kunzisoft.
+
+ This file is part of KeePassDX.
+
+  KeePassDX is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  KeePassDX is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with KeePassDX.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<resources>
+    <style name="KeepassDXStyle.White.v23" parent="KeepassDXStyle.White.v21" >
+        <item name="android:statusBarColor">?attr/colorPrimaryDark</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>

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

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="file_manager_install_description">Cần có một trình duyệt tập tin chấp nhận hành động chủ đích ACTION_CREATE_DOCUMENT và ACTION_OPEN_DOCUMENT để tạo, mở, và lưu tệp tin chứa cơ sở dữ liệu.</string>
+    <string name="error_load_database">Không thể tải cơ sở dữ liệu của bạn.</string>
+    <string name="error_out_of_memory">Không đủ bộ nhớ để tải toàn bộ cơ sở dữ liệu của bạn.</string>
+    <string name="error_nokeyfile">Chọn một tệp chứa khoá.</string>
+    <string name="error_no_name">Nhập tên.</string>
+    <string name="error_invalid_OTP">Bí mật cho mật khẩu dùng một lần không hợp lệ.</string>
+    <string name="error_invalid_path">Chắc chắn đường dẫn chính xác.</string>
+    <string name="error_invalid_db">Không thể đọc cơ sở dữ liệu.</string>
+    <string name="error_file_not_create">Không thể tạo tệp tin</string>
+    <string name="entry_user_name">Tên người dùng</string>
+    <string name="entry_url">URL</string>
+    <string name="entry_otp">Mật khẩu dùng một lần</string>
+    <string name="otp_algorithm">Thuật toán</string>
+    <string name="otp_digits">Chữ số</string>
+    <string name="otp_counter">Đồng hồ đếm ngược</string>
+    <string name="otp_period">Thời gian (giây)</string>
+    <string name="otp_secret">Bí mật</string>
+    <string name="otp_type">Loại mật khẩu dùng một lần</string>
+    <string name="entry_setup_otp">Thiết lập mật khẩu dùng một lần</string>
+    <string name="entry_title">Tiêu đề</string>
+    <string name="save">Lưu</string>
+    <string name="entry_password">Mật khẩu</string>
+    <string name="entry_not_found">Không thể tìm thấy dữ liệu của mục.</string>
+    <string name="entry_modified">Đã sửa</string>
+    <string name="entry_keyfile">Tệp tin chứa khoá</string>
+    <string name="entry_attachments">Tệp đính kèm</string>
+    <string name="entry_history">Lịch sử</string>
+    <string name="entry_UUID">UUID</string>
+    <string name="entry_expires">Hết hạn</string>
+    <string name="entry_created">Đã được tạo</string>
+    <string name="entry_confpassword">Xác nhận mật khẩu</string>
+    <string name="entry_notes">Ghi chú</string>
+    <string name="entry_cancel">Huỷ bỏ</string>
+    <string name="entry_accessed">Đã truy cập</string>
+    <string name="html_about_contribution">Để có thể <strong>duy trì sự tự do</strong>, <strong>sửa lỗi</strong>, <strong>thêm tính năng</strong> và <strong>luôn hoạt động</strong>, chúng tôi dựa vào <strong>sự đóng góp</strong> của bạn.</string>
+    <string name="html_about_licence">KeePassDX © %1$d Kunzisoft là <strong>mã nguồn mở</strong> và <strong>không có quảng cáo</strong>.
+\nĐược cung cấp nguyên trạng, với điều khoản của giấy phép <strong>GPLv3</strong>, không có bất cứ bảo đảm nào.</string>
+    <string name="digits">Chữ số</string>
+    <string name="default_checkbox">Dùng làm cơ sở dữ liệu mặc định</string>
+    <string name="decrypting_db">Đang giải mã nội dung cơ sở dữ liệu…</string>
+    <string name="database">Cơ sở dữ liệu</string>
+    <string name="retrieving_db_key">Đang lấy khoá của cơ sở dữ liệu…</string>
+    <string name="select_to_copy">Sao chép %1$s vào bảng nháp</string>
+    <string name="content_description_keyboard_close_fields">Đóng trường</string>
+    <string name="content_description_remove_from_list">Xoá</string>
+    <string name="content_description_update_from_list">Cập nhật</string>
+    <string name="content_description_remove_field">Xoá trường</string>
+    <string name="entry_add_attachment">Thêm tệp đính kèm</string>
+    <string name="entry_add_field">Thêm trường</string>
+    <string name="content_description_password_length">Độ dài mật khẩu</string>
+    <string name="entry_password_generator">Trình tạo mật khẩu</string>
+    <string name="discard">Huỷ bỏ</string>
+    <string name="discard_changes">Huỷ thay đổi\?</string>
+    <string name="validate">Xác nhận</string>
+    <string name="content_description_entry_icon">Biểu tượng của mục</string>
+    <string name="content_description_keyfile_checkbox">Ô đánh dấu tệp tin chứa khoá</string>
+    <string name="content_description_password_checkbox">Ô đánh dấu mật khẩu</string>
+    <string name="content_description_otp_information">Thông tin về mật khẩu dùng một lần</string>
+    <string name="content_description_credentials_information">Thông tin định danh</string>
+    <string name="content_description_file_information">Thông tin tệp tin</string>
+    <string name="content_description_add_group">Thêm nhóm</string>
+    <string name="content_description_add_entry">Thêm mục</string>
+    <string name="content_description_add_node">Thêm nút</string>
+    <string name="content_description_node_children">Nút con</string>
+    <string name="content_description_open_file">Mở tệp tin</string>
+    <string name="content_description_background">Nền</string>
+    <string name="clipboard_timeout_summary">Thời gian lưu bảng nháp (nếu được hỗ trợ bởi thiết bị)</string>
+    <string name="clipboard_error_clear">Không thể xoá bảng nháp</string>
+    <string name="clipboard_error">Một số thiết bị không cho phép ứng dụng dùng bảng nháp.</string>
+    <string name="clipboard_error_title">Lỗi bảng nháp</string>
+    <string name="clipboard_cleared">Bảng nháp đã được xoá</string>
+    <string name="allow">Cho phép</string>
+    <string name="extended_ASCII">ASCII mở rộng</string>
+    <string name="brackets">Dấu ngoặc</string>
+    <string name="application">Ứng dụng</string>
+    <string name="app_timeout_summary">Thời gian không hoạt động trước khi khoá cơ sở dữ liệu</string>
+    <string name="key_derivation_function">Hàm tạo khoá</string>
+    <string name="encryption_algorithm">Thuật toánmã hoá</string>
+    <string name="encryption">Mã hoá</string>
+    <string name="security">Bảo mật</string>
+    <string name="master_key">Khoá chủ</string>
+    <string name="add_group">Thêm nhóm</string>
+    <string name="edit_entry">Sửa mục</string>
+    <string name="add_entry">Thêm mục</string>
+    <string name="accept">Đồng ý</string>
+    <string name="about_description">Phiên bản Android của phần mềm quản lý mật khẩu KeePass</string>
+    <string name="homepage">Trang chủ</string>
+    <string name="feedback">Phản hồi</string>
+    <string name="contribution">Đóng góp</string>
+    <string name="contact">Liên hệ</string>
+</resources>

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

@@ -210,7 +210,7 @@
     <string name="sort_recycle_bin_bottom">回收站在末尾</string>
     <string name="warning_empty_password">确定不使用密码保护？</string>
     <string name="warning_no_encryption_key">确认不使用加密密钥吗？</string>
-    <string name="build_label">Build %1$s</string>
+    <string name="build_label">构建 %1$s</string>
     <string name="encrypted_value_stored">加密密码已保存</string>
     <string name="no_credentials_stored">当前数据库无密码。</string>
     <string name="set_autofill_service_title">设为默认的填充服务</string>
@@ -315,7 +315,7 @@
     <string name="clear_clipboard_notification_summary">剪贴板持续时间过期或通知在您开始使用后关闭时，锁定数据库</string>
     <string name="recycle_bin">回收站</string>
     <string name="keyboard_selection_entry_title">条目选择</string>
-    <string name="keyboard_selection_entry_summary">在查看条目时，在专用键盘中显示输入字段</string>
+    <string name="keyboard_selection_entry_summary">在KeePass DX中查看条目时，用该条目填充 Magikeyboard</string>
     <string name="delete_entered_password_title">删除密码</string>
     <string name="delete_entered_password_summary">在尝试连接数据库后删除输入的密码</string>
     <string name="content_description_open_file">打开文件</string>
@@ -439,7 +439,7 @@
     <string name="autofill_preference_title">自动填充设置</string>
     <string name="warning_database_link_revoked">访问文件管理器撤消访问权限的文件</string>
     <string name="error_label_exists">该标签已经存在。</string>
-    <string name="keyboard_search_share_summary">自动搜索共享信息以填充键盘</string>
+    <string name="keyboard_search_share_summary">将 URL 共享给 KeePassDX 时，使用该 URL 域过滤条目</string>
     <string name="keyboard_search_share_title">搜索分享的信息</string>
     <string name="autofill_block_restart">重新启动包含该表单的应用程序以激活拦截。</string>
     <string name="autofill_block">阻止自动填充</string>
@@ -484,7 +484,7 @@
     <string name="autofill_close_database_title">关闭数据库</string>
     <string name="keyboard_previous_lock_summary">锁定数据库后自动切换回上一个键盘</string>
     <string name="keyboard_previous_lock_title">锁定数据库</string>
-    <string name="keyboard_save_search_info_summary">手动选择条目时，尝试保存共享信息</string>
+    <string name="keyboard_save_search_info_summary">将URL共享到KeePassDX后，选中一个条目时，请尝试记住那个条目以备日后使用</string>
     <string name="keyboard_save_search_info_title">保存分享的信息</string>
     <string name="notification">通知</string>
     <string name="biometric_security_update_required">需要生物识别安全更新。</string>
@@ -562,4 +562,38 @@
     <string name="error_start_database_action">对数据库执行操作时发生了一个错误。</string>
     <string name="error_move_group_here">你不能把一个组移动到此处。</string>
     <string name="error_word_reserved">这个单词是保留的，不能使用。</string>
+    <string name="templates">模板</string>
+    <string name="templates_group_uuid_title">模板组</string>
+    <string name="templates_group_enable_summary">使用动态模板填写条目的字段</string>
+    <string name="templates_group_enable_title">模板使用</string>
+    <string name="version">版本号</string>
+    <string name="template">模板</string>
+    <string name="standard">标准</string>
+    <string name="membership">会员身份</string>
+    <string name="secure_note">安全笔记</string>
+    <string name="international_bank_account_number">IBAN</string>
+    <string name="bank_identifier_code">SWIFT / BIC</string>
+    <string name="bank_name">银行名称</string>
+    <string name="bank">银行</string>
+    <string name="account">账户</string>
+    <string name="seed">种子</string>
+    <string name="private_key">私钥</string>
+    <string name="public_key">公钥</string>
+    <string name="token">令牌</string>
+    <string name="cryptocurrency">加密货币钱包</string>
+    <string name="type">类型</string>
+    <string name="ssid">SSID</string>
+    <string name="wireless">Wifi</string>
+    <string name="email_address">电子邮件地址</string>
+    <string name="email">电子邮件</string>
+    <string name="date_of_issue">发行日期</string>
+    <string name="place_of_issue">发行地</string>
+    <string name="name">姓名</string>
+    <string name="id_card">ID 卡</string>
+    <string name="personal_identification_number">PIN</string>
+    <string name="card_verification_value">CVV</string>
+    <string name="number">卡号</string>
+    <string name="holder">持卡人</string>
+    <string name="debit_credit_card">借记卡/信用卡</string>
+    <string name="template_group_name">模板</string>
 </resources>

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

@@ -19,8 +19,10 @@
 -->
 <resources>
     <!-- Classic Clear Style -->
-    <style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Clear.v21" />
-    <style name="KeepassDXStyle.Clear.v21" parent="KeepassDXStyle.Light.WhiteBar.v23" >
+    <style name="KeepassDXStyle.Clear" parent="KeepassDXStyle.Clear.v23" />
+    <style name="KeepassDXStyle.Clear.v23" parent="KeepassDXStyle.Clear.v21" />
+    <style name="KeepassDXStyle.Clear.v21" parent="KeepassDXStyle.Clear.Base" />
+    <style name="KeepassDXStyle.Clear.Base" parent="KeepassDXStyle.Light" >
         <item name="colorPrimary">@color/white_grey_lighter</item>
         <item name="colorPrimaryDark">@color/white_grey_light</item>
         <item name="colorAccent">@color/cyan_lighter</item>

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

@@ -19,8 +19,10 @@
 -->
 <resources>
     <!-- White Style -->
-    <style name="KeepassDXStyle.White" parent="KeepassDXStyle.White.v21" />
-    <style name="KeepassDXStyle.White.v21" parent="KeepassDXStyle.Light.WhiteBar.v23" >
+    <style name="KeepassDXStyle.White" parent="KeepassDXStyle.White.v23" />
+    <style name="KeepassDXStyle.White.v23" parent="KeepassDXStyle.White.v21" />
+    <style name="KeepassDXStyle.White.v21" parent="KeepassDXStyle.White.Base" />
+    <style name="KeepassDXStyle.White.Base" parent="KeepassDXStyle.Light" >
         <item name="colorPrimary">@color/white</item>
         <item name="colorPrimaryDark">@color/white</item>
         <item name="colorSecondary">@color/orange</item>