mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-30 19:56:10 +00:00
Code Issues Releases Wiki Activity

Allow deleting existing accounts on import

Browse source
This commit is contained in:
M66B 2022-03-05 11:43:12 +01:00
parent 8c3d9e62e4
commit da53b1e310
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/dialog_import.xml
View file

@ -63,7 +63,6 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:text="@string/title_setup_import_do" android:text="@string/title_setup_import_do"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic" android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbAccounts" /> app:layout_constraintTop_toBottomOf="@id/cbAccounts" />
@ -75,7 +74,6 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:text="@string/title_setup_import_delete" android:text="@string/title_setup_import_delete"
android:visibility="gone"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImportHint" /> app:layout_constraintTop_toBottomOf="@id/tvImportHint" />

2
app/src/main/res/values/strings.xml
View file

@ -262,7 +262,7 @@
<string name="title_setup_password_different">Passwords don\'t match</string> <string name="title_setup_password_different">Passwords don\'t match</string>
<string name="title_setup_password_invalid">Password invalid</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_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_rules">Import filter rules</string>
<string name="title_setup_import_contacts">Import local contacts</string> <string name="title_setup_import_contacts">Import local contacts</string>
<string name="title_setup_import_answers">Import reply templates</string> <string name="title_setup_import_answers">Import reply templates</string>