aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorThialfihar <thialfihar@gmail.com>2010-09-10 20:36:38 +0000
committerThialfihar <thialfihar@gmail.com>2010-09-10 20:36:38 +0000
commitbc50ca00930a0b65bd49ea758283efa1c1644036 (patch)
treefad471bddeced3bee1fbe49df387c19393909814 /res/values
parentc4489dc31e79c48400f8c1fcfe00b1bb530ab4a0 (diff)
downloadopen-keychain-bc50ca00930a0b65bd49ea758283efa1c1644036.tar.gz
open-keychain-bc50ca00930a0b65bd49ea758283efa1c1644036.tar.bz2
open-keychain-bc50ca00930a0b65bd49ea758283efa1c1644036.zip
catch null pointer exceptions when the private key cannot be extracted, also prevent such keys from getting imported, so the error message should never be encountered anyway
Fixes issue 66
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1e83bb7bd..104b81251 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -210,6 +210,7 @@
<string name="keysFound">Found %s key(s).</string>
<string name="unknownSignatureKeyTouchToLookUp">Unknown signature, touch to look up key.</string>
<string name="keyEditingIsBeta">Key editing is still kind of beta.</string>
+ <string name="badKeysEncountered">%s bad secret key(s) ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</string>
<!-- error_lowerCase: phrases, no punctuation, all lowercase,
they will be put after "errorMessage", e.g. "Error: file not found" -->
@@ -240,6 +241,7 @@
<string name="error_noSymmetricEncryptionPacket">couldn\'t find a packet with symmetric encryption</string>
<string name="error_wrongPassPhrase">wrong pass phrase</string>
<string name="error_savingKeys">error saving some key(s)</string>
+ <string name="error_couldNotExtractPrivateKey">could not extract private key</string>
<!-- progress_lowerCase: lowercase, phrases, usually ending in '...' -->
<string name="progress_done">done.</string>