diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-20 22:42:50 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-20 22:42:50 +0200 |
| commit | 0b181743a3d6b1423e112b17a400b5ac4ac09bcb (patch) | |
| tree | ca4c54fe004f1dde0a0b0a62ee10db4231d9f443 /OpenKeychain/src/main/res/values | |
| parent | 4c1d48bd951cbc302bdb2821bdfd501405f3abe0 (diff) | |
| download | open-keychain-0b181743a3d6b1423e112b17a400b5ac4ac09bcb.tar.gz open-keychain-0b181743a3d6b1423e112b17a400b5ac4ac09bcb.tar.bz2 open-keychain-0b181743a3d6b1423e112b17a400b5ac4ac09bcb.zip | |
Keyservers: Dont follow redirects, pin pgp.mit.edu, check for pinned cert on add (OKC-01-018)
Diffstat (limited to 'OpenKeychain/src/main/res/values')
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 62083cbb4..c83b598ed 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -172,8 +172,9 @@ <string name="label_encrypt_filenames">"Encrypt filenames"</string> <string name="label_hidden_recipients">"Hide recipients"</string> - <string name="label_verify_keyserver">"Verify keyserver"</string> - <string name="label_enter_keyserver_url">"Enter keyserver URL"</string> + <string name="label_verify_keyserver_connection">"Test connection"</string> + <string name="label_only_trusted_keyserver">"Only trusted keyserver"</string> + <string name="label_enter_keyserver_url">"URL"</string> <string name="label_keyserver_dialog_delete">"Delete keyserver"</string> <string name="label_theme">"Theme"</string> @@ -445,7 +446,7 @@ <string name="progress_con_saving">"consolidate: saving to cache…"</string> <string name="progress_con_reimport">"consolidate: reimporting…"</string> - <string name="progress_verifying_keyserver_url">"verifying keyserver…"</string> + <string name="progress_verifying_keyserver_connection">"verifying connection…"</string> <string name="progress_starting_orbot">"Starting Orbot…"</string> @@ -778,9 +779,10 @@ <!-- Add/Edit keyserver --> <string name="add_keyserver_dialog_title">"Add keyserver"</string> <string name="edit_keyserver_dialog_title">"Edit keyserver"</string> - <string name="add_keyserver_verified">"Keyserver verified!"</string> + <string name="add_keyserver_connection_verified">"Connection verified!"</string> <string name="add_keyserver_without_verification">"Keyserver added without verification."</string> <string name="add_keyserver_invalid_url">"Invalid URL!"</string> + <string name="add_keyserver_keyserver_not_trusted">"Keyserver is not one of the trusted ones (no pinned certificate available)!"</string> <string name="add_keyserver_connection_failed">"Failed to connect to keyserver. Please check the URL and your Internet connection."</string> <string name="keyserver_preference_deleted">"%s deleted"</string> <string name="keyserver_preference_cannot_delete_last">"Cannot delete last keyserver. At least one is required!"</string> |