Show duplicate UUID message and fix cancel string

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

@@ -44,6 +44,7 @@ import android.view.inputmethod.EditorInfo.IME_ACTION_DONE
 import android.widget.*
 import androidx.biometric.BiometricManager
 import com.kunzisoft.keepass.R
+import com.kunzisoft.keepass.activities.dialogs.DuplicateUuidDialog
 import com.kunzisoft.keepass.activities.dialogs.FingerPrintExplanationDialog
 import com.kunzisoft.keepass.activities.dialogs.PasswordEncodingDialogFragment
 import com.kunzisoft.keepass.activities.helpers.EntrySelectionHelper
@@ -413,7 +414,8 @@ class PasswordActivity : StylishActivity() {
         checkboxPasswordView?.isChecked = false
     }
 
-    private fun loadDatabase(password: String?, keyFile: Uri?, cipherDatabaseEntity: CipherDatabaseEntity? = null) {
+    private fun loadDatabase(password: String?, keyFile: Uri?,
+                             cipherDatabaseEntity: CipherDatabaseEntity? = null) {
 
         runOnUiThread {
             if (PreferencesUtil.deletePasswordAfterConnexionAttempt(this)) {
@@ -437,7 +439,7 @@ class PasswordActivity : StylishActivity() {
                                 this@PasswordActivity.contentResolver,
                                 this@PasswordActivity.filesDir,
                                 SearchDbHelper(PreferencesUtil.omitBackup(this@PasswordActivity)),
-                                true,
+                                false,
                                 progressTaskUpdater,
                                 AfterLoadingDatabase(database, password, cipherDatabaseEntity))
                     },
@@ -507,7 +509,7 @@ class PasswordActivity : StylishActivity() {
     }
 
     private fun showLoadDatabaseDuplicateUuidMessage() {
-        // TODO duplicate UUID message
+        DuplicateUuidDialog().show(supportFragmentManager, "duplicateUUIDDialog")
     }
 
     private fun saveKeyFileData(databaseUri: Uri, keyUri: Uri?) {

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/AssignMasterKeyDialogFragment.kt

@@ -104,7 +104,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                     .setTitle(R.string.assign_master_key)
                     // Add action buttons
                     .setPositiveButton(android.R.string.ok) { _, _ -> }
-                    .setNegativeButton(R.string.cancel) { _, _ -> }
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
 
             passwordCheckBox = rootView?.findViewById(R.id.password_checkbox)
             passwordView = rootView?.findViewById(R.id.pass_password)
@@ -223,7 +223,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                             this@AssignMasterKeyDialogFragment.dismiss()
                         }
                     }
-                    .setNegativeButton(R.string.cancel) { _, _ -> }
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
             builder.create().show()
         }
     }
@@ -238,7 +238,7 @@ class AssignMasterKeyDialogFragment : DialogFragment() {
                                 keyFileCheckBox!!.isChecked, mKeyFile)
                         this@AssignMasterKeyDialogFragment.dismiss()
                     }
-                    .setNegativeButton(R.string.cancel) { _, _ -> }
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
             builder.create().show()
         }
     }

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/BrowserDialogFragment.kt

@@ -36,7 +36,7 @@ class BrowserDialogFragment : DialogFragment() {
             // Get the layout inflater
             val root = activity.layoutInflater.inflate(R.layout.fragment_browser_install, null)
             builder.setView(root)
-                    .setNegativeButton(R.string.cancel) { _, _ -> }
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
 
             val textDescription = root.findViewById<TextView>(R.id.file_manager_install_description)
             textDescription.text = getString(R.string.file_manager_install_description)

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DuplicateUuidDialog.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019 Jeremy Jamet / Kunzisoft.
+ *
+ * This file is part of KeePass DX.
+ *
+ *  KeePass DX 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.
+ *
+ *  KeePass DX 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 KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.kunzisoft.keepass.activities.dialogs
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import com.kunzisoft.keepass.R
+
+class DuplicateUuidDialog : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        activity?.let { activity ->
+            // Use the Builder class for convenient dialog construction
+            val builder = androidx.appcompat.app.AlertDialog.Builder(activity).apply {
+                val message = getString(R.string.contains_duplicate_uuid) +
+                        "\n\n" + getString(R.string.contains_duplicate_uuid_procedure)
+                setMessage(message)
+                setPositiveButton(getString(android.R.string.ok)) { _, _ -> dismiss() }
+                setNegativeButton(getString(android.R.string.cancel)) { _, _ -> dismiss() }
+            }
+            // Create the AlertDialog object and return it
+            return builder.create()
+        }
+        return super.onCreateDialog(savedInstanceState)
+    }
+}

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GeneratePasswordDialogFragment.kt

@@ -114,7 +114,7 @@ class GeneratePasswordDialogFragment : DialogFragment() {
 
                         dismiss()
                     }
-                    .setNegativeButton(R.string.cancel) { _, _ ->
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
                         val bundle = Bundle()
                         mListener?.cancelPassword(bundle)
 

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/GroupEditDialogFragment.kt

@@ -122,7 +122,7 @@ class GroupEditDialogFragment : DialogFragment(), IconPickerDialogFragment.IconP
             val builder = AlertDialog.Builder(activity)
             builder.setView(root)
                     .setPositiveButton(android.R.string.ok, null)
-                    .setNegativeButton(R.string.cancel) { _, _ ->
+                    .setNegativeButton(android.R.string.cancel) { _, _ ->
                         editGroupListener?.cancelEditGroup(
                                 editGroupDialogAction,
                                 nameTextView?.text?.toString(),

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/IconPickerDialogFragment.kt

@@ -77,7 +77,7 @@ class IconPickerDialogFragment : DialogFragment() {
                 dismiss()
             }
 
-            builder.setNegativeButton(R.string.cancel) { _, _ -> this@IconPickerDialogFragment.dialog?.cancel() }
+            builder.setNegativeButton(android.R.string.cancel) { _, _ -> this@IconPickerDialogFragment.dialog?.cancel() }
 
             return builder.create()
         }

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/PasswordEncodingDialogFragment.kt

@@ -35,7 +35,7 @@ class PasswordEncodingDialogFragment : DialogFragment() {
             val builder = AlertDialog.Builder(activity)
             builder.setMessage(activity.getString(R.string.warning_password_encoding)).setTitle(R.string.warning)
             builder.setPositiveButton(android.R.string.ok, positiveButtonClickListener)
-            builder.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.cancel() }
+            builder.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.cancel() }
 
             return builder.create()
         }

app/src/main/java/com/kunzisoft/keepass/activities/dialogs/SortDialogFragment.kt

@@ -83,7 +83,7 @@ class SortDialogFragment : DialogFragment() {
                     // Add action buttons
                     .setPositiveButton(android.R.string.ok
                     ) { _, _ -> mListener?.onSortSelected(mSortNodeEnum, mAscending, mGroupsBefore, mRecycleBinBottom) }
-                    .setNegativeButton(R.string.cancel) { _, _ -> }
+                    .setNegativeButton(android.R.string.cancel) { _, _ -> }
 
             val ascendingView = rootView.findViewById<CompoundButton>(R.id.sort_selection_ascending)
             // Check if is ascending or descending

app/src/main/java/com/kunzisoft/keepass/database/file/load/ImporterV4.kt

@@ -57,7 +57,7 @@ import javax.crypto.NoSuchPaddingException
 import kotlin.math.min
 
 class ImporterV4(private val streamDir: File,
-                 val fixDuplicateUUID: Boolean) : Importer<PwDatabaseV4>() {
+                 private val fixDuplicateUUID: Boolean = false) : Importer<PwDatabaseV4>() {
 
     private var randomStream: StreamCipher? = null
     private lateinit var mDatabase: PwDatabaseV4

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

@@ -27,7 +27,6 @@
     <string name="beta_dontask">لا تظهر مرة أخرى</string>
     <string name="brackets">أقواس</string>
     <string name="extended_ASCII">تمديد ASCII</string>
-    <string name="cancel">إلغاء</string>
     <string name="allow">السماح</string>
     <string name="clipboard_cleared">مُسِحت الحافظة</string>
     <string name="clipboard_error_title">خطأ في الحافظة</string>

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

@@ -34,7 +34,6 @@
     <string name="menu_app_settings">Paràmetres 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="cancel">Cancel·la</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 després de copiar un usuari o contrasenya</string>

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

@@ -34,7 +34,6 @@
     <string name="beta_dontask">Znovu neukázat</string>
     <string name="brackets">Závorky</string>
     <string name="file_manager_install_description">Instalace správce souborů OpenIntents k procházení souborů</string>
-    <string name="cancel">Storno</string>
     <string name="clipboard_cleared">Schránka vyčištěna</string>
     <string name="clipboard_error_title">Chyba schránky</string>
     <string name="clipboard_error">Některé Android telefony od Samsungu nedovolují aplikacím používat schránku.</string>

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

@@ -34,7 +34,6 @@
     <string name="beta_dontask">Vis ikke igen</string>
     <string name="brackets">Parenteser</string>
     <string name="file_manager_install_description">Installer OpenIntents Fil Manager for at gennemse filer</string>
-    <string name="cancel">Annuller</string>
     <string name="clipboard_cleared">Udklipsholder ryddet</string>
     <string name="clipboard_error_title">Udklipsfejl</string>
     <string name="clipboard_error">Nogle Samsung Android-telefoner, vil ikke lade programmer bruge udklipsholderen.</string>

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

@@ -36,7 +36,6 @@
     <string name="beta_dontask">Nicht mehr anzeigen</string>
     <string name="brackets">Klammern</string>
     <string name="file_manager_install_description">Durchsuchen Sie Ihre Dateien, indem Sie den OpenIntents File Manager installieren</string>
-    <string name="cancel">Abbrechen</string>
     <string name="clipboard_cleared">Zwischenablage geleert</string>
     <string name="clipboard_error_title">Zwischenablagefehler</string>
     <string name="clipboard_error">Einige Samsung Android-Smartphones lassen keine Nutzung der Zwischenablage durch Apps zu.</string>

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

@@ -32,7 +32,6 @@
     <string name="beta_dontask">Να μην ερωτηθώ ξανά</string>
     <string name="brackets">Αγκύλες</string>
     <string name="file_manager_install_description">Η αναζήτηση αρχείων απαιτεί τον Διαχειριστή Αρχείων Open Intents, πατήστε παρακάτω για να τον εγκαταστήσετε. Λόγω μερικών ιδιορρυθμιών στον διαχειριστή αρχείων, η περιήγηση μπορεί να μην λειτουργεί σωστά την πρώτη φορά που θα περιηγηθείτε.</string>
-    <string name="cancel">Ακύρωση</string>
     <string name="clipboard_cleared">Το πρόχειρο καθαρίστηκε.</string>
     <string name="clipboard_error_title">Σφάλμα προχείρου</string>
     <string name="clipboard_error">Μερικά Android κινητά τηλέφωνα της Samsung έχουν ένα σφάλμα στην εφαρμογή του προχείρου που προκαλεί την αντιγραφή από εφαρμογές να αποτυγχάνει. Για περισσότερες πληροφορίες πηγαίνετε:</string>

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

@@ -33,7 +33,6 @@
     <string name="menu_app_settings">Configuración de la aplicación</string>
     <string name="brackets">Paréntesis</string>
     <string name="file_manager_install_description">Explora ficheros con OpenIntents File Manager</string>
-    <string name="cancel">Cancelar</string>
     <string name="clipboard_cleared">Portapapeles limpiado</string>
     <string name="clipboard_timeout">Portapapeles caducado</string>
     <string name="clipboard_timeout_summary">Duración de almacemiento en el portapapeles</string>

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

@@ -33,7 +33,6 @@
     <string name="beta_dontask">Ez erakutsi berriro</string>
     <string name="brackets">Brackets</string>
     <string name="file_manager_install_description">Fitxategietan nabigatzeak Open Intents Fitxategi Kudeatzailea behar du. Klik egin azpian instalatzeko. Fitxategien kudeatzailaren arazo batzuk direla eta, izan daiteke nabigazioak ondo ez funtzionatzea lehenengo aldian.</string>
-    <string name="cancel">Utzi</string>
     <string name="clipboard_cleared">Arbela ezabatuta.</string>
     <string name="clipboard_error_title">Arbelean errorea</string>
     <string name="clipboard_error">Samsung Android telefono batzuek akats bat daukate arbelaren inplementazioan, eta honen ondorioz aplikazioetatik kopiatzeak huts egiten du. Xehetasun gehiagotarako ondokora joan:</string>

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

@@ -32,7 +32,6 @@
     <string name="beta_dontask">Älä näytä enää uudelleen</string>
     <string name="brackets">Hakasulkeet</string>
     <string name="file_manager_install_description">Tiedostojen selaus vaatii Open Intents File Manager -tiedostonhallintaohjelman, klikkaa alla olevaa linkkiä asentaaksesi sen. Joidenkin ominaisuuksien takia se ei ehkä toimi oikein ensimmäisellä käynnistyksellä.</string>
-    <string name="cancel">Peruuta</string>
     <string name="clipboard_cleared">Leikepöytä tyhjennetty.</string>
     <string name="clipboard_error_title">Leikepöytävirhe</string>
 	<string name="clipboard_error">Joissakin Android-puhelimissa on virhe leikepöydän toteutuksessa, mikä aiheuttaa kopioinnin epäonnistumisen. Lisätietoa:</string>

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

@@ -36,7 +36,6 @@
     <string name="brackets">Crochets</string>
     <string name="extended_ASCII">ASCII étendu</string>
     <string name="file_manager_install_description">Parcourir les fichiers en installant le gestionnaire de fichiers OpenIntents</string>
-    <string name="cancel">Annuler</string>
     <string name="allow">Autoriser</string>
     <string name="clipboard_cleared">Presse-papier vidé</string>
     <string name="clipboard_error_title">Erreur de presse-papier</string>

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

@@ -14,7 +14,6 @@
     <string name="beta_dontask">Non amosar de novo</string>
     <string name="brackets">Parénteses</string>
     <string name="extended_ASCII">ASCII extendido</string>
-    <string name="cancel">Cancelar</string>
     <string name="allow">Permitir</string>
     <string name="clipboard_cleared">Portapapeis limpo</string>
     <string name="clipboard_error_title">Erro do portapapeis</string>

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

@@ -32,7 +32,6 @@
     <string name="beta_dontask">"Ne mutassa többet"</string>
     <string name="brackets">Zárójelek</string>
     <string name="file_manager_install_description">Fájlok böngészése az OpenIntents fájlkezelő telepítésével</string>
-    <string name="cancel">Mégse</string>
     <string name="clipboard_cleared">Vágólap törölve</string>
     <string name="clipboard_error_title">Vágólap hiba</string>
     <string name="clipboard_error">Egyes androidos Samsung telefonok nem engedik, hogy az alkalmazások használják a vágólapot.</string>

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

@@ -33,7 +33,6 @@
     <string name="menu_app_settings">Impostazioni app</string>
     <string name="brackets">Parentesi</string>
     <string name="file_manager_install_description">Sfoglia i file installando il Gestore File di OpenIntents</string>
-    <string name="cancel">Annulla</string>
     <string name="clipboard_cleared">Appunti eliminati</string>
     <string name="clipboard_error_title">Errore negli appunti</string>
     <string name="clipboard_error">Alcuni telefoni Android di Samsung non permettono alle app di usare gli appunti.</string>

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

@@ -31,7 +31,6 @@
     <string name="beta_dontask">אל תציג שוב</string>
     <string name="brackets">סוגריים</string>
     <string name="file_manager_install_description">סייר הקבצים דורש את סייר הקבצים Open Intents, לחץ למטע כדי להתקין. בגלל מספר בעיות בסייר, ייתכן ויהיו בעיות בהפעלה הראשונה.</string>
-    <string name="cancel">בטל</string>
     <string name="clipboard_cleared">לוח ההעתקה נוקה.</string>
     <string name="clipboard_error_title">שגיאת לוח ההעתקה</string>
     <string name="clipboard_error">במספר מכשירי אנרואיד מסמסונג קיים באג במימוש לוח ההעתקה שיכול לגרום לבעיות בהעתקה מהיישום. לעוד מידע עבור אל:</string>

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

@@ -30,7 +30,6 @@
     <string name="menu_app_settings">アプリケーション設定</string>
     <string name="brackets">カッコ</string>
     <string name="file_manager_install_description">ファイルを検索するには OI File Manager が必要です。</string>
-    <string name="cancel">キャンセル</string>
     <string name="clipboard_cleared">クリップボードを消去しました。</string>
     <string name="clipboard_timeout">クリップボード タイムアウト</string>
     <string name="clipboard_timeout_summary">コピーした情報をクリップボードから消去する時間</string>

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

@@ -35,7 +35,6 @@
     <string name="brackets">브라켓</string>
     <string name="extended_ASCII">확장 ASCII</string>
     <string name="file_manager_install_description">OpenIntents File Manager를 설치하여 파일 찾아보기</string>
-    <string name="cancel">취소</string>
     <string name="allow">허가</string>
     <string name="clipboard_cleared">클립보드 비워짐</string>
     <string name="clipboard_error_title">클립보드 오류</string>

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

@@ -14,7 +14,6 @@
     <string name="menu_app_settings">Programėlės nustatymai</string>
     <string name="beta_dontask">Daugiau neberodyti</string>
     <string name="brackets">Skliaustai</string>
-    <string name="cancel">Atšaukti</string>
     <string name="database">Duomenų bazė</string>
     <string name="digits">Skaitmenys</string>
     <string name="entry_cancel">Atšaukti</string>

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

@@ -14,7 +14,6 @@
     <string name="beta_dontask">Turpmāk nerādīt</string>
     <string name="brackets">Iekavas</string>
     <string name="file_manager_install_description">Failu pārlūkošanai nepieciešams pārlūks.</string>
-    <string name="cancel">Atcelt</string>
     <string name="clipboard_cleared">Starpliktuve notīrīta</string>
     <string name="clipboard_error_title">Starpliktuves kļūda</string>
     <string name="clipboard_error">Dažiem Samsung tālruņiem ir problēmas ar starpliktuves lietošanu. Lai saņemtu sīkāku informāciju, dodieties uz:</string>

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

@@ -35,7 +35,6 @@
     <string name="brackets">Parenteser</string>
     <string name="extended_ASCII">Utvidet ASCII</string>
     <string name="file_manager_install_description">Utforsk filer ved å installere OpenIntents-filbehandleren</string>
-    <string name="cancel">Avbryt</string>
     <string name="allow">Tillat</string>
     <string name="clipboard_cleared">Utklippstavle tømt</string>
     <string name="clipboard_error_title">Utklippstavlefeil</string>

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

@@ -33,7 +33,6 @@
     <string name="menu_app_settings">App-instellingen</string>
     <string name="brackets">Haakjes</string>
     <string name="file_manager_install_description">Zoek een bestand op door het installeren van de OpenIntents File Manager</string>
-    <string name="cancel">Annuleren</string>
     <string name="clipboard_cleared">Klembord gewist</string>
     <string name="clipboard_timeout">Klembordtime-out</string>
     <string name="clipboard_timeout_summary">Tijd van opslag op het klembord</string>

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

@@ -31,7 +31,6 @@
     <string name="menu_app_settings">Programinnstillingar</string>
     <string name="brackets">Parentesar</string>
     <string name="file_manager_install_description">Du må ha Open Intents filbehandlar for å kunna bla i filer. Klikk nedanfor for å installera han. Grunna nokre småfeil i programmet kan det vera at det ikkje fungerer heilt den første gongen du bruker det.</string>
-    <string name="cancel">Avbryt</string>
     <string name="clipboard_cleared">Utklippstavla er tømt.</string>
     <string name="clipboard_timeout">Tidsavbrot på utklippstavla</string>
     <string name="clipboard_timeout_summary">Tid før utklippstavla blir tømt etter at brukarnamnet eller passordet er kopiert.</string>

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

@@ -31,7 +31,6 @@
     <string name="menu_app_settings">Ustawienia aplikacji</string>
     <string name="brackets">Nawiasy</string>
     <string name="file_manager_install_description">Przeglądaj pliki, instalując Menedżera plików OpenIntents</string>
-    <string name="cancel">Anuluj</string>
     <string name="clipboard_cleared">Schowek został wyczyszczony</string>
     <string name="clipboard_timeout">Czas wygaśnięcia schowka</string>
     <string name="clipboard_timeout_summary">Czas przechowywania w schowku</string>

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

@@ -33,7 +33,6 @@
     <string name="menu_app_settings">Configurações do aplicativo</string>
     <string name="brackets">Parênteses</string>
     <string name="file_manager_install_description">Procure arquivos instalando o OpenIntents File Manager</string>
-    <string name="cancel">Cancelar</string>
     <string name="clipboard_cleared">Área de transferência limpa</string>
     <string name="clipboard_timeout">Tempo limite para o clipboard</string>
     <string name="clipboard_timeout_summary">Duração do armazenamento na área de transferência</string>

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

@@ -32,7 +32,6 @@
     <string name="beta_dontask">Não mostrar novamente</string>
     <string name="brackets">Parênteses</string>
     <string name="file_manager_install_description">Explore ficheiros instalando o gestor de ficheiros OpenIntents</string>
-    <string name="cancel">Cancelar</string>
     <string name="clipboard_cleared">Área de transferência limpa</string>
     <string name="clipboard_error_title">Erro na área de transferência</string>
     <string name="clipboard_error">Alguns dispositivos Samsung Android não deixam as apps usarem a área de transferência.</string>

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

@@ -32,7 +32,6 @@
     <string name="beta_dontask">Не показывать снова</string>
     <string name="brackets">{[(Скобки)]}</string>
     <string name="file_manager_install_description">Для обзора файлов установите OpenIntents File Manager</string>
-    <string name="cancel">Отмена</string>
     <string name="clipboard_cleared">Буфер обмена очищен</string>
     <string name="clipboard_error_title">Ошибка буфера обмена</string>
     <string name="clipboard_error">Некоторые устройства Samsung не дают приложению использовать буфер обмена.</string>

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

@@ -30,7 +30,6 @@
     <string name="menu_app_settings">Nastavenia aplikácie</string>
     <string name="brackets">Konzoly</string>
     <string name="file_manager_install_description">Prezeranie súborov vyžaduje otvorenie Správcu súborov, kliknite nižšie pre inštalovanie. Kôli chybám v správcovi súborov, prehľadávanie nemusí pracovať správne, ak prehľadávate prvý krát.</string>
-    <string name="cancel">Zrušiť</string>
     <string name="clipboard_cleared">Schránka vyčistená.</string>
     <string name="clipboard_timeout">Timeout Schránky</string>
     <string name="clipboard_timeout_summary">Čas uchovania v schránke</string>

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

@@ -33,7 +33,6 @@
     <string name="beta_dontask">Visa inte igen</string>
     <string name="brackets">Parenteser</string>
     <string name="file_manager_install_description">Filhantering kräver Open Intents File Manager, klicka nedan för att installera. Filhanteraren kanske inte fungerar korrekt vid första användningen.</string>
-    <string name="cancel">Avbryt</string>
     <string name="clipboard_cleared">Urklippet är rensat.</string>
     <string name="clipboard_error_title">Urklippsfel</string>
     <string name="clipboard_error">Vissa Samsung-telefoner har en bugg som gör att applikationer inte kan kopiera till urklipp. För mer detaljer, gå till:</string>

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

@@ -35,7 +35,6 @@
     <string name="brackets">Parantez</string>
     <string name="extended_ASCII">Genişletilmiş ASCII</string>
     <string name="file_manager_install_description">OpenIntents Dosya Yöneticisi\'ni yükleyerek dosyalara göz atın</string>
-    <string name="cancel">İptal</string>
     <string name="allow">İzin ver</string>
     <string name="clipboard_cleared">Pano temizlendi</string>
     <string name="clipboard_error_title">Pano hatası</string>

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

@@ -31,7 +31,6 @@
     <string name="menu_app_settings">Налаштування програми</string>
     <string name="brackets">Дужки</string>
     <string name="file_manager_install_description">Для перегляду файла необхідно Open Intents File Manager, натисніть нижче для його інсталяції. У зв’язку з деякими недоробками у менеджері файлів перегляд може працювати некоректно при запуску перший раз.</string>
-    <string name="cancel">Відміна</string>
     <string name="clipboard_cleared">Буфер обміну очищено.</string>
     <string name="clipboard_timeout">Тайм-аут буфера обміну</string>
     <string name="clipboard_timeout_summary">Час через який буде очищено буфер обміну після копіювання ім’я користувача чи пароля</string>

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

@@ -31,7 +31,6 @@
     <string name="menu_app_settings">应用设置</string>
     <string name="brackets">括号</string>
     <string name="file_manager_install_description">安装 OpenIntents File Manager 应用来选取文件</string>
-    <string name="cancel">取消</string>
     <string name="clipboard_cleared">剪贴板已清空</string>
     <string name="clipboard_timeout">剪贴板清空延时</string>
     <string name="clipboard_timeout_summary">剪贴板保存时间</string>

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

@@ -30,7 +30,6 @@
     <string name="menu_app_settings">應用程式設定</string>
     <string name="brackets">括弧</string>
     <string name="file_manager_install_description">流覽檔需要安裝Open Intents File Manager軟體，點下面安裝。由於一些檔管理軟體的差異，在你第一次瀏覽時可能無法正常工作。</string>
-    <string name="cancel">取消</string>
     <string name="clipboard_cleared">剪貼板已清除</string>
     <string name="clipboard_timeout">剪貼板超時</string>
     <string name="clipboard_timeout_summary">複製用戶名或密碼到剪貼板後清除的時間</string>

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

@@ -37,7 +37,6 @@
     <string name="brackets">Brackets</string>
     <string name="extended_ASCII">Extended ASCII</string>
     <string name="file_manager_install_description">Create, Open and Save a database file requires installing a file manager that accepts the Intent action ACTION_CREATE_DOCUMENT and ACTION_OPEN_DOCUMENT</string>
-    <string name="cancel">Cancel</string>
     <string name="allow">Allow</string>
     <string name="clipboard_cleared">Clipboard cleared</string>
     <string name="clipboard_error_title">Clipboard error</string>
@@ -182,6 +181,8 @@
     <string name="read_only">Write-protected</string>
     <string name="read_only_warning">KeePass DX needs write permission in order to change anything in your database.</string>
     <string name="read_only_kitkat_warning">Starting with Android KitKat, some devices no longer allow apps to write to the SD card.</string>
+    <string name="contains_duplicate_uuid">The database contains duplicate UUIDs.</string>
+    <string name="contains_duplicate_uuid_procedure">When closing this dialog, KeePass DX will fix the problem (by generating new UUIDs for duplicates) and continue.</string>
     <string name="selection_mode">Selection mode</string>
     <string name="recentfile_title">Recent file history</string>
     <string name="recentfile_summary">Remember recent filenames</string>