diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 19:52:59 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-04-11 19:52:59 +0200 |
| commit | 305b8c1858247a0c0a1f73a405d4c2cf0733e818 (patch) | |
| tree | fa379e6572f8a772653990222ebfadcf550456f5 /OpenKeychain/src/main/res | |
| parent | 45b450e78a4aab5bac6fa61c78388b64f75b3b69 (diff) | |
| download | open-keychain-305b8c1858247a0c0a1f73a405d4c2cf0733e818.tar.gz open-keychain-305b8c1858247a0c0a1f73a405d4c2cf0733e818.tar.bz2 open-keychain-305b8c1858247a0c0a1f73a405d4c2cf0733e818.zip | |
Simplify and fix delete key dialog
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml | 24 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 5 |
2 files changed, 2 insertions, 27 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml index ef31f7690..bbc723bfa 100644 --- a/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" @@ -12,27 +11,4 @@ android:layout_margin="4dp" android:textAppearance="?android:textAppearanceMedium" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:weightSum="1" - android:id="@+id/deleteSecretKeyView"> - - <CheckBox - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="0.1" - android:layout_margin="4dp" - android:id="@+id/checkDeleteSecret" /> - - <TextView - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:textAppearance="?android:textAppearanceMedium" - android:layout_weight="0.9" - android:text="@string/secret_key_delete_text" /> - - </LinearLayout> - </LinearLayout>
\ 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 a58e3a484..71340f6ec 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -220,12 +220,11 @@ <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="key_deletion_confirmation_multi">Do you really want to delete all selected keys (including secret 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> <string name="ask_save_changed_key">You have made changes to the keyring, would you like to save it?</string> <string name="ask_empty_id_ok">"You have added an empty user ID, are you sure you want to continue?"</string> - <string name="public_key_deletetion_confirmation">Do you really want to delete the PUBLIC key \'%s\'?\nYou can\'t undo this!</string> - <string name="secret_key_delete_text">Delete Secret Keys ?</string> + <string name="public_key_deletetion_confirmation">Do you really want to delete the public key \'%s\'?\nYou can\'t undo this!</string> <string name="also_export_secret_keys">Also export secret keys?</string> <plurals name="keys_added_and_updated_1"> |