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

Merge branch 'unified-keylist'

Browse Source 
Conflicts:
	OpenPGP-Keychain/src/main/AndroidManifest.xml
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
	OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
	OpenPGP-Keychain/src/main/res/menu/key_list.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
This commit is contained in:
Vincent Breitmoser
2014-03-12 18:05:28 +01:00
parent a9e5619a14 be558944b5
commit 69f5bf6b57
27 changed files with 600 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenPGP-Keychain/src/main/res/values/strings.xml
View File

@@ -155,6 +155,11 @@
<string name="revoked">revoked</string>
<string name="user_id">User ID</string>
<plurals name="n_contacts">
<item quantity="one">1 contact</item>
<item quantity="other">%d contacts</item>
</plurals>
<plurals name="n_key_servers">
<item quantity="one">%d keyserver</item>
<item quantity="other">%d keyservers</item>
@@ -438,6 +443,7 @@
<string name="key_list_empty_button_import">importing keys.</string>
<!-- Key view -->
<string name="key_view_action_edit">Edit this key</string>
<string name="key_view_action_encrypt">Encrypt to this contact</string>
<string name="key_view_action_certify">Certify this contact\'s key</string>
<string name="key_view_tab_main">Info</string>
@@ -452,5 +458,10 @@
<string name="nav_apps">Registered Apps</string>
<string name="drawer_open">Open navigation drawer</string>
<string name="drawer_close">Close navigation drawer</string>
<string name="edit">Edit</string>
<string name="my_keys">My Keys</string>
<string name="label_secret_key">Secret Key</string>
<string name="secret_key_yes">available</string>
<string name="secret_key_no">unavailable</string>
</resources>