diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
index bd506f648..7737523e3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
@@ -75,7 +75,8 @@ public class DeleteFileDialogFragment extends DialogFragment {
CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity);
- alert.setMessage(this.getString(R.string.file_delete_confirmation, deleteFileNames.toString()));
+ alert.setTitle(getString(R.string.file_delete_confirmation_title));
+ alert.setMessage(getString(R.string.file_delete_confirmation, deleteFileNames.toString()));
alert.setPositiveButton(R.string.btn_delete, new DialogInterface.OnClickListener() {
@@ -112,7 +113,6 @@ public class DeleteFileDialogFragment extends DialogFragment {
}
// Note: We can't delete every file...
-
failedFileNameList.add(deleteFileNameMap.get(deleteUri));
}
@@ -127,7 +127,7 @@ public class DeleteFileDialogFragment extends DialogFragment {
// NOTE: Use Toasts, not Snackbars. When sharing to another application snackbars
// would not show up!
Toast.makeText(getActivity(), getActivity().getString(R.string.file_delete_successful,
- deleteUris.length - failedFileNameList.size(), deleteUris.length, failedFileNames.toString()),
+ deleteUris.length - failedFileNameList.size(), deleteUris.length, failedFileNames.toString()),
Toast.LENGTH_LONG).show();
if (onDeletedListener != null) {
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index c5dfdcaa1..0affa9073 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -222,7 +222,8 @@
"Enter PIN for '%s'"
"Enter PIN to access YubiKey for '%s'"
"Hold YubiKey against the back of your device."
- "Are you sure you want to delete the following files?%s"
+ "Delete original files?"
+ "The following files will be deleted:%s"
"%1$d out of %2$d files have been deleted.%3$s"
"Select a file first."
"Successfully signed and/or encrypted."
@@ -264,8 +265,8 @@
no punctuation, all lowercase,
they will be put after "error_message", e.g. "Error: file not found"
-->
- "are not deleted."
- %s has been added already.
+ "have not been deleted. Delete them manually!"
+ %s has already been added.
"file not found"
"no suitable secret key found"
"external storage not ready"