diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-12 18:05:28 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-12 18:05:28 +0100 |
| commit | 69f5bf6b577234053e700a43a4a7ba721e827c6a (patch) | |
| tree | 65ebb2ab3a40508e3d97c10ac9ca87aa43da7691 /OpenPGP-Keychain/src/main/res/values/strings.xml | |
| parent | a9e5619a14f5cef4e0211d56c000b0e853120f1d (diff) | |
| parent | be558944b52ac038c40bdf84a3d52c9ae2e7a218 (diff) | |
| download | open-keychain-69f5bf6b577234053e700a43a4a7ba721e827c6a.tar.gz open-keychain-69f5bf6b577234053e700a43a4a7ba721e827c6a.tar.bz2 open-keychain-69f5bf6b577234053e700a43a4a7ba721e827c6a.zip | |
Merge branch 'unified-keylist'
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
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 9babeb3f2..ca54db266 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -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> |