diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-21 09:59:19 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-21 09:59:19 +0100 |
commit | 8fead6fddb52095db5250eead82661138492e5ae (patch) | |
tree | 149a252fd33da0924f76696e8b92b7aa968a89fe /OpenPGP-Keychain/src/main/res | |
parent | a7ea9d4ecacfd6a9cca2338adc8ba08f0aa7bbf3 (diff) | |
parent | 4e6325a14068c173ed4372f60a3fae968b676e51 (diff) | |
download | open-keychain-8fead6fddb52095db5250eead82661138492e5ae.tar.gz open-keychain-8fead6fddb52095db5250eead82661138492e5ae.tar.bz2 open-keychain-8fead6fddb52095db5250eead82661138492e5ae.zip |
Merge pull request #458 from hav3n/branch-delete-fix
New Fix for #410
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
-rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml | 38 | ||||
-rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 2 |
2 files changed, 40 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml new file mode 100644 index 000000000..ef31f7690 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml @@ -0,0 +1,38 @@ +<?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" + android:layout_height="match_parent"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/mainMessage" + 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/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 3383174cb..11e3028f3 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -220,6 +220,8 @@ <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> + <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="also_export_secret_keys">Also export secret keys?</string> <plurals name="keys_added_and_updated_1"> |