Bug 185662: In SMTP prefs, make it clear what 'use secure connection (SSL)' really means, patch by Magnus Melin <mkmelin+mozilla@iki.fi>, r+sr=bienvenu

mail/locales/en-US/chrome/messenger/smtpEditOverlay.dtd

@@ -13,11 +13,11 @@
 <!ENTITY isSecure.label "Use secure connection:">
 <!ENTITY neverSecure.label "No">
 <!ENTITY neverSecure.accesskey "N">
-<!ENTITY sometimesSecure.label "TLS, if available">
-<!ENTITY sometimesSecure.accesskey "a">
-<!ENTITY alwaysSecure.label "TLS">
-<!ENTITY alwaysSecure.accesskey "T">
-<!ENTITY alwaysSmtpS.label "SSL">
-<!ENTITY alwaysSmtpS.accesskey "L">
+<!ENTITY sometimesSTARTTLS.label "STARTTLS, if available">
+<!ENTITY sometimesSTARTTLS.accesskey "a">
+<!ENTITY alwaysSTARTTLS.label "STARTTLS">
+<!ENTITY alwaysSTARTTLS.accesskey "T">
+<!ENTITY alwaysSMTPOverSSL.label "SMTP-over-SSL">
+<!ENTITY alwaysSMTPOverSSL.accesskey "L">
 <!ENTITY smtpEditTitle.label "SMTP Server">
 <!ENTITY serverPortDefault.label "Default:">

mailnews/base/prefs/resources/content/smtpEditOverlay.xul

@@ -118,12 +118,12 @@
             <hbox class="indent">
                 <radio value="0" id="smtp.neverSecure"
                        label="&neverSecure.label;" accesskey="&neverSecure.accesskey;"/>
-                <radio value="1" id="smtp.sometimesSecure"
-                       label="&sometimesSecure.label;" accesskey="&sometimesSecure.accesskey;"/>
-                <radio value="2" id="smtp.alwaysSecure"
-                       label="&alwaysSecure.label;" accesskey="&alwaysSecure.accesskey;"/>
-                <radio value="3" id="smtp.alwaysSmtpSSL"
-                       label="&alwaysSmtpS.label;" accesskey="&alwaysSmtpS.accesskey;"/>
+                <radio value="1" id="smtp.sometimesSTARTTLS"
+                       label="&sometimesSTARTTLS.label;" accesskey="&sometimesSTARTTLS.accesskey;"/>
+                <radio value="2" id="smtp.alwaysSTARTTLS"
+                       label="&alwaysSTARTTLS.label;" accesskey="&alwaysSTARTTLS.accesskey;"/>
+                <radio value="3" id="smtp.alwaysSMTPOverSSL"
+                       label="&alwaysSMTPOverSSL.label;" accesskey="&alwaysSMTPOverSSL.accesskey;"/>
             </hbox>
         </radiogroup>
     </groupbox>

mailnews/base/prefs/resources/locale/en-US/smtpEditOverlay.dtd

@@ -1,23 +0,0 @@
-<!ENTITY settings.caption "Settings">
-<!ENTITY security.caption "Security and Authentication">
-<!ENTITY serverName.label "Server Name:">
-<!ENTITY serverName.accesskey "S">
-<!ENTITY serverDescription.label "Description:">
-<!ENTITY serverDescription.accesskey "D">
-<!ENTITY serverPort.label "Port:">
-<!ENTITY serverPort.accesskey "P">
-<!ENTITY alwaysUseUsername.label "Use name and password">
-<!ENTITY alwaysUseUsername.accesskey "U">
-<!ENTITY userName.label "User Name:">
-<!ENTITY userName.accesskey "m">
-<!ENTITY isSecure.label "Use secure connection:">
-<!ENTITY neverSecure.label "No">
-<!ENTITY neverSecure.accesskey "N">
-<!ENTITY sometimesSecure.label "TLS, if available">
-<!ENTITY sometimesSecure.accesskey "a">
-<!ENTITY alwaysSecure.label "TLS">
-<!ENTITY alwaysSecure.accesskey "T">
-<!ENTITY alwaysSmtpS.label "SSL">
-<!ENTITY alwaysSmtpS.accesskey "L">
-<!ENTITY smtpEditTitle.label "SMTP Server">
-<!ENTITY serverPortDefault.label "Default:">

suite/locales/en-US/chrome/common/help/mail_help.xhtml

@@ -4337,20 +4337,19 @@ to filter unwanted mail, and how phishing detection works.</p>
     The first time you send mail, you will be prompted for your password. At
     that time you can instruct &brandShortName; to save your password for
     future sessions.</li>
-  <li><strong>Use secure connection</strong>: If your outgoing server is
-    configured to support an encrypted connection, choose one of the following
-    (if you make a choice for which your server is not configured, you will
-    get an error message when sending mail):
+  <li><strong>Use secure connection</strong>: There are two methods for
+    establishing a secure connection to your outgoing server. Pick the one your
+    server supports (if you make a choice for which your server is not configured,
+    you will get an error message when sending mail).
     <ul>
-      <li><strong>No</strong>: If you don&apos;t want to use an encrypted
-        link.</li>
-      <li><strong>TLS, if available</strong>: &brandShortName; will try to use
-        a TLS encrypted connection. If the server doesn&apos;t support it, an
-        unencrypted connection is used.</li>
-      <li><strong>TLS</strong>: Require a TLS encrypted connection. This
-        mechanism will mostly run on the standard SMTP port 25.</li>
-      <li><strong>SSL</strong>: Require a SSL encrypted connection. The default
-        port for this is 465.</li>
+      <li><strong>STARTTLS, if available</strong>: &brandShortName; will try to
+        negotiate encryption using the STARTTLS method. If the server doesn&apos;t
+        support it, an unencrypted connection is used.</li>
+      <li><strong>STARTTLS</strong>: Require an encrypted connection, use the STARTTLS
+        method. This mechanism will mostly run on the standard SMTP port 25.</li>
+      <li><strong>SMTP-over-SSL</strong>: Require an encrypted connection, use the
+        SMTP-over-SSL (also known as SMTPS) method. The default port for this is 465.
+     </li>
     </ul>
   </li>
   <li><strong>Advanced</strong>: Click this button to set up additional SMTP