Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696

2014-08-27 14:12:59 +02:00
parent 86a05033ae
commit 12a5b2174f
3 changed files with 34 additions and 9 deletions
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -626,6 +626,7 @@
    <string name="msg_mg_new_subkey">Adding new subkey %s</string>
    <string name="msg_mg_found_new">Found %s new certificates in keyring</string>
    <string name="msg_mg_unchanged">No new certificates</string>
+    <string name="msg_mg_no_secret_keyring">No secret keyring to add subkey to</string>

    <!-- createSecretKeyRing -->
    <string name="msg_cr">Generating new master key</string>