From da53b1e310d6956ae03a47424abdbbf8ffdce1e0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 5 Mar 2022 11:43:12 +0100
Subject: [PATCH] Allow deleting existing accounts on import

---
 app/src/main/res/layout/dialog_import.xml | 2 --
 app/src/main/res/values/strings.xml       | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/dialog_import.xml b/app/src/main/res/layout/dialog_import.xml
index 4acb2e4464..b28762c196 100644
--- a/app/src/main/res/layout/dialog_import.xml
+++ b/app/src/main/res/layout/dialog_import.xml
@@ -63,7 +63,6 @@
             android:layout_marginTop="6dp"
             android:text="@string/title_setup_import_do"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
-
             android:textStyle="italic"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbAccounts" />
@@ -75,7 +74,6 @@
             android:layout_marginStart="24dp"
             android:layout_marginTop="12dp"
             android:text="@string/title_setup_import_delete"
-            android:visibility="gone"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvImportHint" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 566a12ee6c..db8bfcea65 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -262,7 +262,7 @@
     <string name="title_setup_password_different">Passwords don\'t match</string>
     <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_import_accounts">Import accounts and identities</string>
-    <string name="title_setup_import_delete" translatable="false">Delete existing accounts</string>
+    <string name="title_setup_import_delete">Delete existing accounts first</string>
     <string name="title_setup_import_rules">Import filter rules</string>
     <string name="title_setup_import_contacts">Import local contacts</string>
     <string name="title_setup_import_answers">Import reply templates</string>