moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

Improve file deletion strings

Browse Source
This commit is contained in:
Dominik Schürmann 2015-03-12 13:18:31 +01:00
parent 4de978bccb
commit dae48e84c8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java
View File

@ -75,7 +75,8 @@ public class DeleteFileDialogFragment extends DialogFragment {
CustomAlertDialogBuilder alert = new CustomAlertDialogBuilder(activity); 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() { 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... // Note: We can't delete every file...
failedFileNameList.add(deleteFileNameMap.get(deleteUri)); 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 // NOTE: Use Toasts, not Snackbars. When sharing to another application snackbars
// would not show up! // would not show up!
Toast.makeText(getActivity(), getActivity().getString(R.string.file_delete_successful, 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(); Toast.LENGTH_LONG).show();
if (onDeletedListener != null) { if (onDeletedListener != null) {

7
OpenKeychain/src/main/res/values/strings.xml
View File

@ -222,7 +222,8 @@
<string name="pin_for">"Enter PIN for '%s'"</string> <string name="pin_for">"Enter PIN for '%s'"</string>
<string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string> <string name="yubikey_pin_for">"Enter PIN to access YubiKey for '%s'"</string>
<string name="nfc_text">"Hold YubiKey against the back of your device."</string> <string name="nfc_text">"Hold YubiKey against the back of your device."</string>
<string name="file_delete_confirmation">"Are you sure you want to delete the following files?%s"</string> <string name="file_delete_confirmation_title">"Delete original files?"</string>
<string name="file_delete_confirmation">"The following files will be deleted:%s"</string>
<string name="file_delete_successful">"%1$d out of %2$d files have been deleted.%3$s"</string> <string name="file_delete_successful">"%1$d out of %2$d files have been deleted.%3$s"</string>
<string name="no_file_selected">"Select a file first."</string> <string name="no_file_selected">"Select a file first."</string>
<string name="encrypt_sign_successful">"Successfully signed and/or encrypted."</string> <string name="encrypt_sign_successful">"Successfully signed and/or encrypted."</string>
@ -264,8 +265,8 @@
no punctuation, all lowercase, no punctuation, all lowercase,
they will be put after "error_message", e.g. "Error: file not found" they will be put after "error_message", e.g. "Error: file not found"
--> -->
<string name="error_file_delete_failed">"are not deleted."</string> <string name="error_file_delete_failed">"have not been deleted. Delete them manually!"</string>
<string name="error_file_added_already">%s has been added already.</string> <string name="error_file_added_already">%s has already been added.</string>
<string name="error_file_not_found">"file not found"</string> <string name="error_file_not_found">"file not found"</string>
<string name="error_no_secret_key_found">"no suitable secret key found"</string> <string name="error_no_secret_key_found">"no suitable secret key found"</string>
<string name="error_external_storage_not_ready">"external storage not ready"</string> <string name="error_external_storage_not_ready">"external storage not ready"</string>