aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-11 02:05:17 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-11 02:05:17 +0200
commitb76aa7fe11f953d10688fbc01daa65676448c78a (patch)
treea84591dd4a96f3da40cb77cc5dddf985f829a693 /OpenKeychain/src/main/res/values
parent9d97d37c06f22354c124bd6cedd989d9ca4ff53e (diff)
downloadopen-keychain-b76aa7fe11f953d10688fbc01daa65676448c78a.tar.gz
open-keychain-b76aa7fe11f953d10688fbc01daa65676448c78a.tar.bz2
open-keychain-b76aa7fe11f953d10688fbc01daa65676448c78a.zip
never import secret keys from keyserver (OKC-01-001)
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index f11114830..d55d128d3 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -1278,8 +1278,9 @@
</plurals>
<string name="msg_import_fetch_error_decode">"Error decoding retrieved keyring!"</string>
<string name="msg_import_fetch_error">"Key could not be retrieved! (Network problems?)"</string>
+ <string name="msg_import_fetch_error_keyserver">"Could not retrieve key from keyservers: %s"</string>
+ <string name="msg_import_fetch_error_keyserver_secret">"Cannot import secret key from keyserver!"</string>
<string name="msg_import_fetch_keybase">"Retrieving from keybase.io: %s"</string>
- <string name="msg_import_fetch_keyserver_error">"Could not retrieve key from keyservers: %s"</string>
<string name="msg_import_fetch_keyserver">"Retrieving from keyserver: %s"</string>
<string name="msg_import_fetch_keyserver_ok">"Key retrieval successful"</string>
<string name="msg_import_keyserver">"Using keyserver %s"</string>