diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-27 14:12:59 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-27 14:12:59 +0200 |
| commit | 12a5b2174f79d93e8531fa4e0b3fc0def3796ca9 (patch) | |
| tree | b643a132e6db1f16ebd78845aef0d5032a761ad7 /OpenKeychain/src/main/res | |
| parent | 86a05033aedc965c1842db45094c744094a906af (diff) | |
| download | open-keychain-12a5b2174f79d93e8531fa4e0b3fc0def3796ca9.tar.gz open-keychain-12a5b2174f79d93e8531fa4e0b3fc0def3796ca9.tar.bz2 open-keychain-12a5b2174f79d93e8531fa4e0b3fc0def3796ca9.zip | |
Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
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 2eb9f2b97..d8c73bd9e 100644 --- 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> |