1.) Edit > Prefs > Privacy/Security > SSL. Note that there is no UI to set the pref "Leaving a site that supports encryption".

Milestone 2.0

-> p2

nifty, r=db48x

cc'ing blake for sr=

cc'ing mpt/cotter to take a look at the wording.

Mass reassigning target to 2.1

Looks ok to me, except that `Redirection' should be `Redirecting'.

+<!ENTITY warn.insecurepost "Sending form data from an insecure page to an insecure page"> +<!ENTITY warn.leavingsecure "Leaving a site that supports encryption"> +<!ENTITY warn.secureredirect "Redirecting from one secure site to another"> +<!ENTITY warn.secureredirecttoinsecure "Redirecting from a secure site to an insecure site"> Use non-secure instead of insecure. Fix that and r=ddrinan.

<!ENTITY warn.enteringsecure "Entering a site that supports encryption"> <!ENTITY warn.enteringweak "Entering a site that uses low-grade encryption"> +<!ENTITY warn.insecurepost "Sending form data from a non-secure page to a non-secure page"> +<!ENTITY warn.leavingsecure "Leaving a site that supports encryption"> +<!ENTITY warn.secureredirect "Redirecting from one secure site to another"> +<!ENTITY warn.secureredirecttoinsecure "Redirecting from a secure site to a non-secure site"> I believe it would be more consistent (and accurate) to avoid the word "secure" altogether, and also to describe things in terms of "pages" rather than "sites." This can be done as follows: Loading a page that supports encryption Loading a page that uses low-grade encryption Sending form data from an unencrypted page to an unencrypted page Leaving a page that supports encryption Redirecting from one encrypted page to another Redirecting from an encrypted page to an unencrypted page The above changes would also be consistent with my proposed patch for bug 44042. Question: Is this patch destined for the trunk only, which I assume means PSM 2.1? If it's destined for the branch it will require changes in the UI translations, something I thought was no longer possible. It will also require changes to help, which is still (barely) possible for 2.0.

r=ddrinan.

sr=blizzard

Patch checked in.

Verified fixed on the trunk.