diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 23:10:44 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 23:10:44 +0200 |
| commit | 073433fa747d698c6666081b2ee312062ecf2115 (patch) | |
| tree | 94bd3296058659d1349226614648579c94173fdd /OpenKeychain/src/main/res/values/strings.xml | |
| parent | 79131be5f09c9ebaaa9c76ef717b2bd68c9b49db (diff) | |
| download | open-keychain-073433fa747d698c6666081b2ee312062ecf2115.tar.gz open-keychain-073433fa747d698c6666081b2ee312062ecf2115.tar.bz2 open-keychain-073433fa747d698c6666081b2ee312062ecf2115.zip | |
canonicalize: require primary key binding certificates for signing subkeys
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 29bcdd679..b415c6d42 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -514,8 +514,8 @@ <string name="msg_ip_fail_op_ex">Operation failed due to database error</string> <string name="msg_ip_fail_remote_ex">Operation failed due to internal error</string> <string name="msg_ip">Importing public keyring %s</string> - <string name="msg_ip_insert_keyring">Inserting keyring data</string> - <string name="msg_ip_insert_subkeys">Inserting subkeys</string> + <string name="msg_ip_insert_keyring">Encoding keyring data</string> + <string name="msg_ip_insert_subkeys">Evaluating subkeys</string> <string name="msg_ip_prepare">Preparing database operations</string> <string name="msg_ip_prepare_success">OK</string> <string name="msg_ip_preserving_secret">Preserving available secret key</string> @@ -570,6 +570,9 @@ <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_primary_bad">Removing subkey binding certificate due to invalid primary binding certificate</string> + <string name="msg_kc_sub_primary_bad_err">Removing subkey binding certificate due to bad primary binding certificate</string> + <string name="msg_kc_sub_primary_none">Removing subkey binding certificate due to missing primary binding certificate</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> |