aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-29 21:20:30 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-29 21:20:30 +0200
commitf7fe236bd535e62f60a7f76768b7455ef102255e (patch)
treec1d7411395a41c2804957657938c492c2fd7f867 /OpenKeychain/src/main/res
parent654d98ac2a2df847df15c72cde4af0dd99d3c180 (diff)
parentc34a159cae783178b692022a584e1f937cc652ca (diff)
downloadopen-keychain-f7fe236bd535e62f60a7f76768b7455ef102255e.tar.gz
open-keychain-f7fe236bd535e62f60a7f76768b7455ef102255e.tar.bz2
open-keychain-f7fe236bd535e62f60a7f76768b7455ef102255e.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml2
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 14d0eba9b..f9ae6f029 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -684,6 +684,8 @@
<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_sub_algo_bad_encrpyt">"Subkey has encryption usage flag, but algorithm is not suitable for encryption."</string>
+ <string name="msg_kc_sub_algo_bad_sign">"Subkey has signing usage flag, but algorithm is not suitable for signing."</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>