diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-15 18:34:20 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-03-15 18:34:20 +0100 |
| commit | 6bacb5ff51f2c284fdc931cb5e82f8310035d8dc (patch) | |
| tree | e968dc6404974aa321bfc77e7b7e974c9c0f467f /OpenPGP-Keychain/src/main/res/values/strings.xml | |
| parent | a73e91c49c96f950bcd1892a738558cbbb523741 (diff) | |
| parent | 8fbd77fb15fda5d8984d6e39c1ebbce9696b0ae5 (diff) | |
| download | open-keychain-6bacb5ff51f2c284fdc931cb5e82f8310035d8dc.tar.gz open-keychain-6bacb5ff51f2c284fdc931cb5e82f8310035d8dc.tar.bz2 open-keychain-6bacb5ff51f2c284fdc931cb5e82f8310035d8dc.zip | |
Merge branch 'certify' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
OpenPGP-Keychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenPGP-Keychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 7461dbaf7..c1057e9b6 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -465,6 +465,8 @@ <string name="label_secret_key">Secret Key</string> <string name="secret_key_yes">available</string> <string name="secret_key_no">unavailable</string> + + <!-- unsorted --> <string name="show_unknown_signatures">Show unknown signatures</string> <string name="section_signer_id">Signer</string> <string name="section_cert">Certificate Details</string> @@ -476,5 +478,7 @@ <string name="label_subkey_rank">Subkey Rank</string> <string name="unknown_uid"><![CDATA[<unknown>]]></string> <string name="empty_certs">No certificates for this key</string> + <string name="section_uids_to_sign">User IDs to sign</string> + <string name="progress_re_adding_certs">Reapplying certificates</string> </resources> |