diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-21 15:11:59 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-21 15:11:59 +0200 |
| commit | 2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a (patch) | |
| tree | 7fe90c2f2004de54ecd6ce0706d6b2408149c26d /OpenKeychain/src/main/res/values/strings.xml | |
| parent | 976b232946a7777ce746c10d9a727a8722440df4 (diff) | |
| parent | f560bc9317357a755b5862c1eec142b7c4665c0a (diff) | |
| download | open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.tar.gz open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.tar.bz2 open-keychain-2f5c73746d2ac8a0394995d2f3cd41dae2e80b7a.zip | |
Merge branch 'master' into yubikey
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c1c18effe..55ecf3ae0 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -592,6 +592,7 @@ <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_type_uid">Removing user id certification in bad position</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> @@ -629,6 +630,7 @@ <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_no_cert">No valid self-certificate found for user id %s, removing from ring</string> + <string name="msg_kc_uid_remove">Removing invalid user id %s</string> <!-- Keyring merging log entries --> <string name="msg_mg_public">Merging into public keyring %s</string> |