diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 21:57:03 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 21:57:03 +0200 |
commit | 0594d9156ef148e3dd4ad7301cb4c036893dd383 (patch) | |
tree | e66926059fcacd286f9e2c216fbe483ed15d6dab /OpenKeychain/src/main/res/values/strings.xml | |
parent | 9dd40b7238826ec05dc3162c58cfa90909b1c5ad (diff) | |
download | open-keychain-0594d9156ef148e3dd4ad7301cb4c036893dd383.tar.gz open-keychain-0594d9156ef148e3dd4ad7301cb4c036893dd383.tar.bz2 open-keychain-0594d9156ef148e3dd4ad7301cb4c036893dd383.zip |
canonicalize: filter out future and local certificates
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c57347055..1f0cf0c4e 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -561,15 +561,20 @@ <string name="msg_kc">Canonicalizing keyring %s</string> <string name="msg_kc_master">Processing master key</string> <string name="msg_kc_master_success">OK</string> - <string name="msg_kc_revoke_bad_err">Removing bad keyring revocation key</string> - <string name="msg_kc_revoke_bad">Removing bad keyring revocation key</string> - <string name="msg_kc_revoke_dup">Removing redundant keyring revocation key</string> + <string name="msg_kc_revoke_bad_err">Removing bad keyring revocation certificate</string> + <string name="msg_kc_revoke_bad_local">Removing keyring revocation certificate with "local" flag</string> + <string name="msg_kc_revoke_bad_time">Removing keyring revocation certificate with future timestamp</string> + <string name="msg_kc_revoke_bad_type">Removing master key certificate of unknown type (%s)</string> + <string name="msg_kc_revoke_bad">Removing bad keyring revocation certificate</string> + <string name="msg_kc_revoke_dup">Removing redundant keyring revocation certificate</string> <string name="msg_kc_sub">Processing subkey %s</string> <string name="msg_kc_sub_bad">Removing invalid subkey binding certificate</string> - <string name="msg_kc_sub_bad_err">Removing bad subkey binding certificate!</string> + <string name="msg_kc_sub_bad_err">Removing bad subkey binding certificate</string> + <string name="msg_kc_sub_bad_local">Removing subkey binding certificate with "local" flag</string> <string name="msg_kc_sub_bad_keyid">Subkey binding issuer id mismatch</string> + <string name="msg_kc_sub_bad_time">Removing subkey binding certificate with future timestamp</string> <string name="msg_kc_sub_bad_type">Unknown subkey certificate type: %s</string> - <string name="msg_kc_sub_no_cert">No valid certificate found for %s, removing from ring!</string> + <string name="msg_kc_sub_no_cert">No valid certificate found for %s, removing from ring</string> <string name="msg_kc_sub_revoke_bad_err">Removing bad subkey revocation key</string> <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation key</string> <string name="msg_kc_sub_revoke_dup">Removing redundant keyring revocation key</string> @@ -577,11 +582,13 @@ <string name="msg_kc_success">Keyring canonicalization successful</string> <string name="msg_kc_success_removed">Keyring canonicalization successful, removed %s certificates</string> <string name="msg_kc_uid_bad_err">Removing bad self certificate for user id %s</string> + <string name="msg_kc_uid_bad_local">Removing user id certificate with "local" flag</string> + <string name="msg_kc_uid_bad_time">Removing user id with future timestamp</string> + <string name="msg_kc_uid_bad_type">Removing user id certificate of unknown type (%s)</string> <string name="msg_kc_uid_bad">Removing bad self certificate for user id "%s"</string> <string name="msg_kc_uid_dup">Removing outdated self certificate for user id "%s"</string> <string name="msg_kc_uid_revoke_dup">Removing redundant revocation certificate for user id "%s"</string> <string name="msg_kc_uid_revoke_old">Removing outdated revocation certificate for user id "%s"</string> - <string name="msg_kc_uid_unknown_cert">Removing unknown certificate of type 0x%1$s from user id "%2$s"</string> <!-- unsorted --> <string name="section_certifier_id">Certifier</string> |