aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-09-23 01:35:49 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2014-09-23 01:36:46 +0200
commit9d9d71f3db93302483f1142851462b989270abd8 (patch)
treef577aaa0bae8adf4a6f737b48403c786e3c07627 /OpenKeychain/src/main/res/values/strings.xml
parent3759d74ac857ee434ec7b0f8c5dd0b371c621a93 (diff)
downloadopen-keychain-9d9d71f3db93302483f1142851462b989270abd8.tar.gz
open-keychain-9d9d71f3db93302483f1142851462b989270abd8.tar.bz2
open-keychain-9d9d71f3db93302483f1142851462b989270abd8.zip
reject keys with duplicate subkeys altogether
closes #870
Diffstat (limited to 'OpenKeychain/src/main/res/values/strings.xml')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 28a1507f5..ea55a8932 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -643,6 +643,7 @@
<string name="msg_kc_error_v3">"This is an OpenPGP version 3 key, which has been deprecated and is 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_error_dup_key">"Subkey %s occurs twice in keyring. Keyring is malformed, not importing!"</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>