aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-01-19 00:00:56 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-01-19 00:00:56 +0100
commit1bac2849b8ed8c5ab05e846c1e4b2e1aff5269aa (patch)
tree71942ca163848aea3462834f713bdd39da518167 /OpenPGP-Keychain/res
parent12c7e219c81e919fd532d6fea255c446d7ef381f (diff)
downloadopen-keychain-1bac2849b8ed8c5ab05e846c1e4b2e1aff5269aa.tar.gz
open-keychain-1bac2849b8ed8c5ab05e846c1e4b2e1aff5269aa.tar.bz2
open-keychain-1bac2849b8ed8c5ab05e846c1e4b2e1aff5269aa.zip
improve performance of adapter implementations by caching index, use data uri where possible in ViewKeyActivity
Diffstat (limited to 'OpenPGP-Keychain/res')
-rw-r--r--OpenPGP-Keychain/res/menu/key_list_secret_multi.xml2
-rw-r--r--OpenPGP-Keychain/res/values/strings.xml8
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml b/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml
index a10d1e2fa..8cd181e16 100644
--- a/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml
+++ b/OpenPGP-Keychain/res/menu/key_list_secret_multi.xml
@@ -3,7 +3,7 @@
<item
android:id="@+id/menu_key_list_public_multi_delete"
- android:icon="@android:drawable/ic_menu_delete"
+ android:icon="@drawable/ic_action_discard"
android:title="@string/menu_delete_key"/>
</menu> \ No newline at end of file
diff --git a/OpenPGP-Keychain/res/values/strings.xml b/OpenPGP-Keychain/res/values/strings.xml
index 2a18c6a8d..28741d90a 100644
--- a/OpenPGP-Keychain/res/values/strings.xml
+++ b/OpenPGP-Keychain/res/values/strings.xml
@@ -183,10 +183,10 @@
<string name="enter_passphrase_twice">Enter the passphrase twice.</string>
<string name="select_encryption_key">Select at least one encryption key.</string>
<string name="select_encryption_or_signature_key">Select at least one encryption key or a signature key.</string>
- <string name="specify_file_to_encrypt_to">Please specify which file to encrypt to.\nWARNING! File will be overwritten if it exists.</string>
- <string name="specify_file_to_decrypt_to">Please specify which file to decrypt to.\nWARNING! File will be overwritten if it exists.</string>
- <string name="specify_file_to_export_to">Please specify which file to export to.\nWARNING! File will be overwritten if it exists.</string>
- <string name="specify_file_to_export_secret_keys_to">Please specify which file to export to.\nWARNING! You are about to export SECRET keys.\nWARNING! File will be overwritten if it exists.</string>
+ <string name="specify_file_to_encrypt_to">Please specify which file to encrypt to.\nWARNING: File will be overwritten if it exists.</string>
+ <string name="specify_file_to_decrypt_to">Please specify which file to decrypt to.\nWARNING: File will be overwritten if it exists.</string>
+ <string name="specify_file_to_export_to">Please specify which file to export to.\nWARNING: File will be overwritten if it exists.</string>
+ <string name="specify_file_to_export_secret_keys_to">Please specify which file to export to.\nWARNING: You are about to export SECRET keys.\nWARNING: File will be overwritten if it exists.</string>
<string name="key_deletion_confirmation">Do you really want to delete the key \'%s\'?\nYou can\'t undo this!</string>
<string name="key_deletion_confirmation_multi">Do you really want to delete all selected keys?\nYou can\'t undo this!</string>
<string name="secret_key_deletion_confirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string>