From 9d9d71f3db93302483f1142851462b989270abd8 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 23 Sep 2014 01:35:49 +0200
Subject: reject keys with duplicate subkeys altogether

closes #870
---
 OpenKeychain/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenKeychain/src/main/res/values/strings.xml')

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>
-- 
cgit v1.2.3