diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-02 18:49:24 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-02 18:49:24 +0200 |
| commit | 4a47126f05ee53c9d09f46b9445918230937ccf2 (patch) | |
| tree | 8560088fe57ab8454fa8c35e21bbff7591085fb5 /OpenKeychain/src/main/res/values | |
| parent | 80779defb1c9d48d5c05cb18fbaa97a3d008e9d3 (diff) | |
| parent | 39997a802ec2a56039d216cd44c3ec89ab75c1a2 (diff) | |
| download | open-keychain-4a47126f05ee53c9d09f46b9445918230937ccf2.tar.gz open-keychain-4a47126f05ee53c9d09f46b9445918230937ccf2.tar.bz2 open-keychain-4a47126f05ee53c9d09f46b9445918230937ccf2.zip | |
Merge remote-tracking branch 'origin/master' into edit-key-rewrite
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -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 194984062..eeb6b3742 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"> |