aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-06-12 18:17:35 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-06-12 21:12:21 +0200
commit9dd40b7238826ec05dc3162c58cfa90909b1c5ad (patch)
treefb7c10b8bd6118b9a2ab3898d85d42a8a9812bb2 /OpenKeychain/src/main/res/values/strings.xml
parent59701250ba442b12d98f7b328a4cc61db1fe9158 (diff)
downloadopen-keychain-9dd40b7238826ec05dc3162c58cfa90909b1c5ad.tar.gz
open-keychain-9dd40b7238826ec05dc3162c58cfa90909b1c5ad.tar.bz2
open-keychain-9dd40b7238826ec05dc3162c58cfa90909b1c5ad.zip
import-log: more minor improvements
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml14
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 41cf0d246..c57347055 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -534,14 +534,12 @@
<string name="msg_ip_subkey_future">Subkey creation date lies in the future! (%s)</string>
<string name="msg_ip_success">Successfully imported public keyring</string>
<string name="msg_ip_reinsert_secret">Re-inserting secret key</string>
- <string name="msg_ip_trust_retrieve">Retrieving trusted keys</string>
- <string name="msg_ip_trust_using">Using %s trusted keys</string>
<string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string>
<string name="msg_ip_uid_cert_error">Error processing certificate!</string>
<string name="msg_ip_uid_cert_good">Found good certificate from %1$s (%2$s)</string>
- <string name="msg_ip_uid_certs_unknown">Ignored %s certificates from unknown pubkeys</string>
- <string name="msg_ip_uid_classifying">Classifying user ids</string>
- <string name="msg_ip_uid_insert">Inserting user ids</string>
+ <string name="msg_ip_uid_certs_unknown">Ignoring %s certificates from unknown pubkeys</string>
+ <string name="msg_ip_uid_classifying">Classifying user ids, using %s trusted signatures</string>
+ <string name="msg_ip_uid_reorder">Re-ordering user ids</string>
<string name="msg_ip_uid_processing">Processing user id %s</string>
<string name="msg_ip_uid_revoked">Found uid revocation certificate</string>
<string name="msg_ip_uid_self_bad">Bad self certificate encountered!</string>
@@ -567,15 +565,15 @@
<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_sub">Processing subkey %s</string>
- <string name="msg_kc_sub_bad">Subkey binding certificate verification failed!</string>
- <string name="msg_kc_sub_bad_err">Subkey binding certificate verification failed with an error!</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_keyid">Subkey binding issuer id mismatch</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_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>
- <string name="msg_kc_sub_success">OK</string>
+ <string name="msg_kc_sub_success">Subkey binding OK</string>
<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>