diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-30 17:00:58 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-30 17:00:58 +0200 |
| commit | 5ff3043903456e4c626053bd918c9f61b84b100c (patch) | |
| tree | 3a630f4512ae554f279ef45aedca118a8e9a3533 /OpenKeychain/src/main/res/values | |
| parent | ac080b21efd61467a592d8560abe056bc0aa29a1 (diff) | |
| download | open-keychain-5ff3043903456e4c626053bd918c9f61b84b100c.tar.gz open-keychain-5ff3043903456e4c626053bd918c9f61b84b100c.tar.bz2 open-keychain-5ff3043903456e4c626053bd918c9f61b84b100c.zip | |
canonicalize: add check for algorithm type
closes #797
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index d31a08081..8eb452df6 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -520,7 +520,6 @@ <!-- Import Public log entries --> <string name="msg_ip_apply_batch">Applying insert batch operation.</string> <string name="msg_ip_bad_type_secret">Tried to import secret keyring as public. This is a bug, please file a report!</string> - <string name="msg_kc_v3_key">This key is an OpenPGP version 3 key and thus insecure. It has not been imported.</string> <string name="msg_ip_delete_old_fail">No old key deleted (creating a new one?)</string> <string name="msg_ip_delete_old_ok">Deleted old key from database</string> <string name="msg_ip_encode_fail">Operation failed due to encoding error</string> @@ -589,7 +588,9 @@ <!-- Keyring Canonicalization log entries --> <string name="msg_kc_public">Canonicalizing public keyring %s</string> <string name="msg_kc_secret">Canonicalizing secret keyring %s</string> - <string name="msg_kc_fatal_no_uid">Keyring canonicalization failed: Keyring has no valid user ids</string> + <string name="msg_kc_error_v3">This is an OpenPGP version 3 key, which have been deprecated and are no longer supported!</string> + <string name="msg_kc_error_no_uid">Keyring has no valid user ids!</string> + <string name="msg_kc_error_master_algo">The master key uses an unknown (%s) algorithm!</string> <string name="msg_kc_master">Processing master 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> @@ -613,6 +614,7 @@ <string name="msg_kc_sub_revoke_bad_err">Removing bad subkey revocation certificate</string> <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation certificate</string> <string name="msg_kc_sub_revoke_dup">Removing redundant subkey revocation certificate</string> + <string name="msg_kc_sub_unknown_algo">Subkey uses an unknown algorithm, not importing…</string> <string name="msg_kc_success">Keyring canonicalization successful, no changes</string> <plurals name="msg_kc_success_bad"> <item quantity="one">Keyring canonicalization successful, removed one erroneous certificate</item> |