aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-09 18:59:15 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-09 18:59:15 +0100
commitcc66435e38248880fee3af795619b5794b65d222 (patch)
tree4ae61704436f8fc54e12a2d666dc6484054b68f0 /OpenKeychain/src/main/res
parent7c22fc843b7f00f63c0f85cbd3565700b5e73698 (diff)
downloadopen-keychain-cc66435e38248880fee3af795619b5794b65d222.tar.gz
open-keychain-cc66435e38248880fee3af795619b5794b65d222.tar.bz2
open-keychain-cc66435e38248880fee3af795619b5794b65d222.zip
Some fixes for delete after encryption
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/layout/file_list_entry_add.xml34
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml4
2 files changed, 19 insertions, 19 deletions
diff --git a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
index f2ee4079e..d7f4513d9 100644
--- a/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
+++ b/OpenKeychain/src/main/res/layout/file_list_entry_add.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:padding="4dp"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:clickable="true"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ style="?android:attr/borderlessButtonStyle">
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:padding="4dp"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:clickable="true"
- style="@style/SelectableItem">
<TextView
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="center"
- android:text="@string/btn_add_files"
- android:drawableLeft="@drawable/ic_folder_grey_24dp"
- android:drawablePadding="8dp"
- android:gravity="center"/>
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:text="@string/btn_add_files"
+ android:drawableLeft="@drawable/ic_folder_grey_24dp"
+ android:drawablePadding="8dp"
+ android:gravity="center" />
</FrameLayout> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 39af9ca28..2c83ac070 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -220,7 +220,7 @@
<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="file_delete_confirmation">"Are you sure you want to delete\n%s?"</string>
- <string name="file_delete_successful">"Successfully deleted."</string>
+ <string name="file_delete_successful">"'%s' has been deleted."</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_clipboard_successful">"Successfully signed and/or encrypted to clipboard."</string>
@@ -261,7 +261,7 @@
no punctuation, all lowercase,
they will be put after "error_message", e.g. "Error: file not found"
-->
- <string name="error_file_delete_failed">"deleting '%s' failed"</string>
+ <string name="error_file_delete_failed">"Deleting '%s' failed. Please do this manually!"</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_external_storage_not_ready">"external storage not ready"</string>