diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-31 20:54:30 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-05-31 20:54:30 +0200 |
| commit | 39997a802ec2a56039d216cd44c3ec89ab75c1a2 (patch) | |
| tree | ed4fdb4110b8d96f3655e18714d9f4869953481c /OpenKeychain/src/main/res | |
| parent | 6d1369be56af0d61678d1632fd98f7a4ff41b11f (diff) | |
| parent | 13d4a6d902d61a0a85db3bdc07996b317f5ecaad (diff) | |
| download | open-keychain-39997a802ec2a56039d216cd44c3ec89ab75c1a2.tar.gz open-keychain-39997a802ec2a56039d216cd44c3ec89ab75c1a2.tar.bz2 open-keychain-39997a802ec2a56039d216cd44c3ec89ab75c1a2.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 6 |
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"> |