diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:02 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-24 15:29:58 +0100 |
| commit | f9ef1160ca764d508dafcb45fbf65f18911fff9c (patch) | |
| tree | 816564326b238848669d7a0713f48c84791cd13b /OpenKeychain/src/main/res/menu | |
| parent | fe32e7bff4e724d37903d07cd3b4f0287ec85879 (diff) | |
| parent | 8b4388e1a2d5cb2b7f0524c18ad3383e3375ba7b (diff) | |
| download | open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.gz open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.tar.bz2 open-keychain-f9ef1160ca764d508dafcb45fbf65f18911fff9c.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/res/menu')
| -rw-r--r-- | OpenKeychain/src/main/res/menu/encrypt_file_activity.xml | 24 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/menu/encrypt_text_activity.xml | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/menu/key_list.xml | 2 |
3 files changed, 29 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml index f4aeb76c9..d6ed726fa 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_file_activity.xml @@ -18,17 +18,33 @@ android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true" /> - <item - android:id="@+id/check_use_armor" - android:title="@string/label_file_ascii_armor" - android:checkable="true" /> + <item android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" android:checkable="true" /> + <item android:id="@+id/check_enable_compression" android:title="@string/label_enable_compression" android:checked="true" android:checkable="true" /> + + <item + android:id="@+id/check_encrypt_filenames" + android:title="@string/label_encrypt_filenames" + android:checked="true" + android:checkable="true" /> + + <item + android:id="@+id/check_use_armor" + android:title="@string/label_file_ascii_armor" + android:checkable="true" /> + + <!--<item--> + <!--android:id="@+id/check_hidden_recipients"--> + <!--android:title="@string/label_hidden_recipients"--> + <!--android:checked="false"--> + <!--android:checkable="true" />--> + </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml index bb9f4058a..5a262fdd8 100644 --- a/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/menu/encrypt_text_activity.xml @@ -18,9 +18,17 @@ android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true" /> + <item android:id="@+id/check_enable_compression" android:title="@string/label_enable_compression" android:checked="true" android:checkable="true" /> + + <!--<item--> + <!--android:id="@+id/check_hidden_recipients"--> + <!--android:title="@string/label_hidden_recipients"--> + <!--android:checked="false"--> + <!--android:checkable="true" />--> + </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml index 386a9d46e..15e098138 100644 --- a/OpenKeychain/src/main/res/menu/key_list.xml +++ b/OpenKeychain/src/main/res/menu/key_list.xml @@ -16,7 +16,7 @@ <item android:id="@+id/menu_key_list_create" - android:title="@string/menu_create_key" + android:title="@string/menu_manage_keys" app:showAsAction="never" /> <item |