ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Clean up SSL/TLS option text"

Browse Source
This commit is contained in:
Marc Blank 2011-08-16 16:55:38 -07:00 committed by Android (Google) Code Review
commit 8790f09a99
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
res/values/strings.xml
View File

@ -638,18 +638,26 @@ save attachment.</string>
<string name="account_setup_incoming_port_label">Port</string> <string name="account_setup_incoming_port_label">Port</string>
<!-- "Incoming server settings" screen, label for pop-up menu --> <!-- "Incoming server settings" screen, label for pop-up menu -->
<string name="account_setup_incoming_security_label">Security type</string> <string name="account_setup_incoming_security_label">Security type</string>
<!-- "Incoming server settings" screen, options for "Security type" pop-up menu --> <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
the desire for an unencrypted session -->
<string name="account_setup_incoming_security_none_label">None</string> <string name="account_setup_incoming_security_none_label">None</string>
<!-- "Incoming server settings" screen, options for "Security type" pop-up menu --> <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
the desire for an encrypted session on the selected port, accepting all SSL certificates -->
<string name="account_setup_incoming_security_ssl_trust_certificates_label"> <string name="account_setup_incoming_security_ssl_trust_certificates_label">
SSL (Accept all certificates)</string> SSL/TLS (Accept all certificates)</string>
<!-- "Incoming server settings" screen, options for "Security type" pop-up menu --> <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
<string name="account_setup_incoming_security_ssl_label">SSL</string> the desire for an encrypted session on the selected port, including SSL certificate
<!-- "Incoming server settings" screen, options for "Security type" pop-up menu --> checks -->
<string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
<!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
the desire for an encrypted session overlaid on a plain text session using the selected
port, accepting all SSL certificates -->
<string name="account_setup_incoming_security_tls_trust_certificates_label"> <string name="account_setup_incoming_security_tls_trust_certificates_label">
TLS (Accept all certificates)</string> STARTTLS (Accept all certificates)</string>
<!-- "Incoming server settings" screen, options for "Security type" pop-up menu --> <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
<string name="account_setup_incoming_security_tls_label">TLS</string> the desire for an encrypted session overlaid on a plain text session on the selected
port, including SSL certificate checks -->
<string name="account_setup_incoming_security_tls_label">STARTTLS</string>
<!-- "Incoming server settings" screen, label for pop-up menu --> <!-- "Incoming server settings" screen, label for pop-up menu -->
<string name="account_setup_incoming_delete_policy_label">Delete email from server</string> <string name="account_setup_incoming_delete_policy_label">Delete email from server</string>
<!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: --> <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->