bug 102269: Cookie Manager: Server Secure is unclear. r=mvl, sr=alecf

2004-03-07 08:25:59 +00:00 · 2004-03-07 08:25:59 +00:00 · 3a2f576189
--- a/extensions/cookie/resources/content/cookieAcceptDialog.js
+++ b/extensions/cookie/resources/content/cookieAcceptDialog.js
@ -137,7 +137,7 @@ function onload()
        document.getElementById('ifl_path').setAttribute("value",cookie.path);
        document.getElementById('ifl_isSecure').setAttribute("value",
                                                                 cookie.isSecure ?
-                                                                    cookieBundle.getString("yes") : cookieBundle.getString("no")
+                                                                    cookieBundle.getString("forSecureOnly") : cookieBundle.getString("forAnyConnection")
                                                          );
        document.getElementById('ifl_expires').setAttribute("value",GetExpiresString(cookie.expires));
        document.getElementById('ifl_isDomain').setAttribute("value",
--- a/extensions/cookie/resources/locale/en-US/cookieAcceptDialog.dtd
+++ b/extensions/cookie/resources/locale/en-US/cookieAcceptDialog.dtd
@ -1,20 +0,0 @@
-<!ENTITY     props.box.label                "About this cookie">
-<!ENTITY     props.name.label               "Name:">
-<!ENTITY     props.value.label              "Content:">
-<!ENTITY     props.domain.label             "Host:">
-<!ENTITY     props.path.label               "Path:">
-<!ENTITY     props.secure.label             "Server Secure:">
-<!ENTITY     props.expires.label            "Expires:">
-<!ENTITY     props.policy.label             "Policy:"> 
-
-<!ENTITY     button.allow.label             "Allow">
-<!ENTITY     button.allow.accesskey         "A">
-<!ENTITY     button.session.label           "Allow for Session">
-<!ENTITY     button.session.accesskey       "S">
-<!ENTITY     button.deny.label              "Deny">
-<!ENTITY     button.deny.accesskey          "D">
-
-<!ENTITY     dialog.title                   "Confirm">
-<!ENTITY     dialog.remember.label          "Use my choice for all cookies from this site">
-<!ENTITY     dialog.remember.accesskey      "U">
-
--- a/extensions/cookie/resources/locale/en-US/cookieAcceptDialog.properties
+++ b/extensions/cookie/resources/locale/en-US/cookieAcceptDialog.properties
@ -1,17 +0,0 @@
-hostColon=Host:
-domainColon=Domain:
-yes=yes
-no=no
-atEndOfSession=at end of session
-
-showDetails=Show Details
-hideDetails=Hide Details
-detailsAccessKey=T
-
-permissionToSetACookie = The site %S wants to set a cookie.
-permissionToSetSecondCookie = The site %S wants to set a second cookie.
-#  LOCALIZATION NOTE (PermissionToSetAnotherCookie): First %S: sitename, second %S: number of cookies already present for that site
-permissionToSetAnotherCookie = The site %S wants to set another cookie.\nYou already have %S cookies from this site.
-permissionToModifyCookie = The site %S wants to modify an existing cookie.
-permissionToAcceptImage = The site %S wants to load an image.
-rememberThisDecision = Remember this decision
--- a/extensions/help/resources/locale/en-US/using_priv_help.html
+++ b/extensions/help/resources/locale/en-US/using_priv_help.html
@ -304,8 +304,8 @@ Using the Cookie Manager</h1>
 </tr>

 <tr>
-<td valign="top">Server Secure</td>
-<td valign="top">When this field is &quot;Yes&quot; it means that the browser checks the connection whenever the server asks for a cookie and will not send it unless the connection is encrypted (HTTPS).</td>
+<td valign="top">Send For</td>
+<td valign="top">When this field is &quot;For encrypted connections only&quot; it means that the browser checks the connection whenever the server asks for a cookie and will not send it unless the connection is encrypted (HTTPS).</td>
 </tr>

 <tr>
--- a/extensions/wallet/cookieviewer/resources/content/CookieViewer.js
+++ b/extensions/wallet/cookieviewer/resources/content/CookieViewer.js
@ -332,7 +332,8 @@ function CookieSelected() {
    {id: "ifl_path", value: cookies[idx].path},
    {id: "ifl_isSecure",
     value: cookies[idx].isSecure ?
-            cookieBundle.getString("yes") : cookieBundle.getString("no")},
+            cookieBundle.getString("forSecureOnly") : 
+            cookieBundle.getString("forAnyConnection")},
    {id: "ifl_expires", value: GetExpiresString(cookies[idx].expires)},
    {id: "ifl_policy", value: GetPolicyString(cookies[idx].policy)}
  ];
--- a/extensions/wallet/cookieviewer/resources/locale/en-US/CookieViewer.dtd
+++ b/extensions/wallet/cookieviewer/resources/locale/en-US/CookieViewer.dtd
@ -13,7 +13,7 @@
 <!ENTITY     props.value.label              "Content:">
 <!ENTITY     props.domain.label             "Host:">
 <!ENTITY     props.path.label               "Path:">
-<!ENTITY     props.secure.label             "Server Secure:">
+<!ENTITY     props.secure.label             "Send For:">
 <!ENTITY     props.expires.label            "Expires:">
 <!ENTITY     props.policy.label             "Policy:"> 

--- a/extensions/wallet/cookieviewer/resources/locale/en-US/CookieViewer.properties
+++ b/extensions/wallet/cookieviewer/resources/locale/en-US/CookieViewer.properties
@ -33,8 +33,8 @@ imageTitle=Image Manager
 popupTitle=Pop-up Manager
 hostColon=Host:
 domainColon=Domain:
-yes=yes
-no=no
+forSecureOnly=Encrypted connections only
+forAnyConnection=Any type of connection
 AtEndOfSession = at end of session
 tabBannedImages=Image Sites
 tabBannedPopups=Pop-up Sites
--- a/toolkit/components/cookie/content/cookieAcceptDialog.js
+++ b/toolkit/components/cookie/content/cookieAcceptDialog.js
@ -137,7 +137,7 @@ function onload()
        document.getElementById('ifl_path').setAttribute("value",cookie.path);
        document.getElementById('ifl_isSecure').setAttribute("value",
                                                                 cookie.isSecure ?
-                                                                    cookieBundle.getString("yes") : cookieBundle.getString("no")
+                                                                    cookieBundle.getString("forSecureOnly") : cookieBundle.getString("forAnyConnection")
                                                          );
        document.getElementById('ifl_expires').setAttribute("value",GetExpiresString(cookie.expires));
        document.getElementById('ifl_isDomain').setAttribute("value",
--- a/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd
+++ b/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd
@ -3,7 +3,7 @@
 <!ENTITY     props.value.label              "Content:">
 <!ENTITY     props.domain.label             "Host:">
 <!ENTITY     props.path.label               "Path:">
-<!ENTITY     props.secure.label             "Server Secure:">
+<!ENTITY     props.secure.label             "Send For:">
 <!ENTITY     props.expires.label            "Expires:">
 <!ENTITY     props.policy.label             "Policy:"> 

@ -14,7 +14,7 @@
 <!ENTITY     button.deny.label              "Deny">
 <!ENTITY     button.deny.accesskey          "D">

-<!ENTITY     dialog.title                   "Confirm">
+<!ENTITY     dialog.title                   "Confirm setting cookie">
 <!ENTITY     dialog.remember.label          "Use my choice for all cookies from this site">
 <!ENTITY     dialog.remember.accesskey      "U">

--- a/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties
+++ b/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties
@ -1,7 +1,7 @@
 hostColon=Host:
 domainColon=Domain:
-yes=yes
-no=no
+forSecureOnly=Encrypted connections only
+forAnyConnection=Any type of connection
 atEndOfSession=at end of session

 showDetails=Show Details
--- a/xpfe/components/permissions/content/cookieViewer.js
+++ b/xpfe/components/permissions/content/cookieViewer.js
@ -332,7 +332,8 @@ function CookieSelected() {
    {id: "ifl_path", value: cookies[idx].path},
    {id: "ifl_isSecure",
     value: cookies[idx].isSecure ?
-            cookieBundle.getString("yes") : cookieBundle.getString("no")},
+            cookieBundle.getString("forSecureOnly") : 
+            cookieBundle.getString("forAnyConnection")},
    {id: "ifl_expires", value: GetExpiresString(cookies[idx].expires)},
    {id: "ifl_policy", value: GetPolicyString(cookies[idx].policy)}
  ];
--- a/xpfe/components/permissions/locale/en-US/cookieViewer.dtd
+++ b/xpfe/components/permissions/locale/en-US/cookieViewer.dtd
@ -13,7 +13,7 @@
 <!ENTITY     props.value.label              "Content:">
 <!ENTITY     props.domain.label             "Host:">
 <!ENTITY     props.path.label               "Path:">
-<!ENTITY     props.secure.label             "Server Secure:">
+<!ENTITY     props.secure.label             "Send For:">
 <!ENTITY     props.expires.label            "Expires:">
 <!ENTITY     props.policy.label             "Policy:"> 

--- a/xpfe/components/permissions/locale/en-US/cookieViewer.properties
+++ b/xpfe/components/permissions/locale/en-US/cookieViewer.properties
@ -33,8 +33,8 @@ imageTitle=Image Manager
 popupTitle=Pop-up Manager
 hostColon=Host:
 domainColon=Domain:
-yes=yes
-no=no
+forSecureOnly=Encrypted connections only
+forAnyConnection=Any type of connection
 AtEndOfSession = at end of session
 tabBannedImages=Image Sites
 tabBannedPopups=Pop-up Sites