cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser
2015-03-24 15:29:02 +01:00
parent fe32e7bff4 8b4388e1a2
commit f9ef1160ca
136 changed files with 1910 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
View File

@@ -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>

8
OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
View File

@@ -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>

2
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -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