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

Merge remote-tracking branch 'origin/master' into external-test

Browse Source 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
This commit is contained in:
Vincent Breitmoser
2014-07-11 20:21:19 +02:00
parent d4fa2bbf47 9fcc0a8816
commit 54bc874ce5
9 changed files with 296 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -480,6 +480,11 @@
<item>Change to Primary Identity</item>
<item>Revoke Identity</item>
</string-array>
<string name="edit_key_edit_subkey_title">Select an action!</string>
<string-array name="edit_key_edit_subkey">
<item>Change Expiry</item>
<item>Revoke Subkey</item>
</string-array>
<!-- Navigation Drawer -->
<string name="nav_keys">Keys</string>