aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/values
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-05-25 13:55:29 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-05-25 13:55:29 +0200
commit13d4a6d902d61a0a85db3bdc07996b317f5ecaad (patch)
tree9b2baff477a5b9b58e366a05633f6c4e8642b174 /OpenKeychain/src/main/res/values
parent8a2ffd8f90e9653ed69f945a94f6b9702dbdfff4 (diff)
parent58da3d12b0a59a32054478c53e6c5a219b71f61f (diff)
downloadopen-keychain-13d4a6d902d61a0a85db3bdc07996b317f5ecaad.tar.gz
open-keychain-13d4a6d902d61a0a85db3bdc07996b317f5ecaad.tar.bz2
open-keychain-13d4a6d902d61a0a85db3bdc07996b317f5ecaad.zip
Merge pull request #632 from timbray/master
Refactor server query exceptions again
Diffstat (limited to 'OpenKeychain/src/main/res/values')
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 4d39b6273..1ba8a6d2d 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -295,9 +295,9 @@
<string name="error_jelly_bean_needed">You need Android 4.1 to use Android\'s NFC Beam feature!</string>
<string name="error_nfc_needed">NFC is not available on your device!</string>
<string name="error_nothing_import">Nothing to import!</string>
- <string name="error_keyserver_insufficient_query">Insufficient server query</string>
- <string name="error_keyserver_query">Querying keyserver failed</string>
- <string name="error_keyserver_too_many_responses">Too many possible keys. Please refine your query!</string>
+ <string name="error_keyserver_insufficient_query">Key search query too short</string>
+ <string name="error_searching_keys">Unrecoverable error searching for keys at server</string>
+ <string name="error_keyserver_too_many_responses">Key search query returned too many candidates; Please refine query</string>
<string name="error_import_file_no_content">File has no content</string>
<string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string>
<plurals name="error_import_non_pgp_part">