From 8944ab68652d4518136c1b8b9c02bde779f4e8b7 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Mon, 3 May 2010 13:34:41 +0200
Subject: [PATCH] Bug 173729, Deleting a builtin cert should behave better
 Improve wording to reduce confusion r=rrelyea

---
 .../manager/locales/en-US/chrome/pippki/certManager.dtd   | 6 ++++--
 .../manager/locales/en-US/chrome/pippki/pippki.properties | 6 +++---
 security/manager/pki/resources/content/CAOverlay.xul      | 8 ++++----
 security/manager/pki/resources/content/OthersOverlay.xul  | 4 ++--
 .../manager/pki/resources/content/WebSitesOverlay.xul     | 4 ++--
 security/manager/pki/resources/content/deletecert.js      | 6 +++---
 6 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/security/manager/locales/en-US/chrome/pippki/certManager.dtd b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
index 7081200a91d0..08f2f6673d20 100644
--- a/security/manager/locales/en-US/chrome/pippki/certManager.dtd
+++ b/security/manager/locales/en-US/chrome/pippki/certManager.dtd
@@ -105,8 +105,8 @@
 <!ENTITY certmgr.close.accesskey              "C">
 <!ENTITY certmgr.view2.label                  "View…">
 <!ENTITY certmgr.view2.accesskey              "V">
-<!ENTITY certmgr.edit2.label                  "Edit…">
-<!ENTITY certmgr.edit2.accesskey              "E">
+<!ENTITY certmgr.edit3.label                  "Edit Trust…">
+<!ENTITY certmgr.edit3.accesskey              "E">
 <!ENTITY certmgr.editca.label                 "Edit CA Trust">
 <!ENTITY certmgr.editca.accesskey             "d">
 <!ENTITY certmgr.add.label                    "Add">
@@ -115,6 +115,8 @@
 <!ENTITY certmgr.export.accesskey             "x">
 <!ENTITY certmgr.delete2.label                "Delete…">
 <!ENTITY certmgr.delete2.accesskey            "D">
+<!ENTITY certmgr.delete_builtin.label         "Delete or Distrust…">
+<!ENTITY certmgr.delete_builtin.accesskey     "D">
 <!ENTITY certmgr.backup2.label                "Backup…">
 <!ENTITY certmgr.backup2.accesskey            "B">
 <!ENTITY certmgr.backupall2.label             "Backup All…">
diff --git a/security/manager/locales/en-US/chrome/pippki/pippki.properties b/security/manager/locales/en-US/chrome/pippki/pippki.properties
index 9eafccd68d65..17d3c7845188 100644
--- a/security/manager/locales/en-US/chrome/pippki/pippki.properties
+++ b/security/manager/locales/en-US/chrome/pippki/pippki.properties
@@ -62,9 +62,9 @@ deleteUserCertConfirm=Are you sure you want to delete these certificates?
 deleteUserCertImpact=If you delete one of your own certificates, you can no longer use it to identify yourself.
 deleteUserCertTitle=Delete your Certificates
 
-deleteCaCertConfirm=Are you sure you want to delete these CA certificates?
-deleteCaCertImpactX=If you delete a certificate authority (CA) certificate, this application will no longer trust any certificates issued by that CA.
-deleteCaCertTitle=Delete CA Certificates
+deleteCaCertConfirm2=You have requested to delete these CA certificates. For built-in certificates all trust will be removed, which has the same effect. Are you sure you want to delete or distrust?
+deleteCaCertImpactX2=If you delete or distrust a certificate authority (CA) certificate, this application will no longer trust any certificates issued by that CA.
+deleteCaCertTitle2=Delete or Distrust CA Certificates
 
 deleteEmailCertConfirm=Are you sure you want to delete these people's e-mail certificates?
 deleteEmailCertImpactDesc=If you delete a person's e-mail certificate, you will no longer be able to send encrypted e-mail to that person.
diff --git a/security/manager/pki/resources/content/CAOverlay.xul b/security/manager/pki/resources/content/CAOverlay.xul
index 4c3e85e52489..f099fa3d48da 100644
--- a/security/manager/pki/resources/content/CAOverlay.xul
+++ b/security/manager/pki/resources/content/CAOverlay.xul
@@ -69,8 +69,8 @@
               accesskey="&certmgr.view2.accesskey;"
               disabled="true" oncommand="viewCerts();"/>
       <button id="ca_editButton"
-              label="&certmgr.edit2.label;"
-              accesskey="&certmgr.edit2.accesskey;"
+              label="&certmgr.edit3.label;"
+              accesskey="&certmgr.edit3.accesskey;"
               disabled="true" oncommand="editCerts();"/>
       <button id="ca_addButton"
               label="&certmgr.restore2.label;"
@@ -81,8 +81,8 @@
               accesskey="&certmgr.export.accesskey;"
               disabled="true" oncommand="exportCerts();"/>
       <button id="ca_deleteButton"
-              label="&certmgr.delete2.label;"
-              accesskey="&certmgr.delete2.accesskey;"
+              label="&certmgr.delete_builtin.label;"
+              accesskey="&certmgr.delete_builtin.accesskey;"
               disabled="true" oncommand="deleteCerts();"/>
     </hbox>
   </vbox>
diff --git a/security/manager/pki/resources/content/OthersOverlay.xul b/security/manager/pki/resources/content/OthersOverlay.xul
index ac85d36aa844..b38c3573544e 100644
--- a/security/manager/pki/resources/content/OthersOverlay.xul
+++ b/security/manager/pki/resources/content/OthersOverlay.xul
@@ -70,8 +70,8 @@
               accesskey="&certmgr.view2.accesskey;"
               disabled="true" oncommand="viewCerts();"/>
       <button id="email_editButton"
-              label="&certmgr.edit2.label;"
-              accesskey="&certmgr.edit2.accesskey;"
+              label="&certmgr.edit3.label;"
+              accesskey="&certmgr.edit3.accesskey;"
               disabled="true" oncommand="editCerts();"/>
       <button id="email_addButton"
               label="&certmgr.restore2.label;"
diff --git a/security/manager/pki/resources/content/WebSitesOverlay.xul b/security/manager/pki/resources/content/WebSitesOverlay.xul
index 7af782cbee68..281db5db4fd6 100644
--- a/security/manager/pki/resources/content/WebSitesOverlay.xul
+++ b/security/manager/pki/resources/content/WebSitesOverlay.xul
@@ -76,8 +76,8 @@
               accesskey="&certmgr.view2.accesskey;"
               disabled="true" oncommand="viewCerts();"/>
       <button id="websites_editButton"
-              label="&certmgr.edit2.label;"
-              accesskey="&certmgr.edit2.accesskey;"
+              label="&certmgr.edit3.label;"
+              accesskey="&certmgr.edit3.accesskey;"
               disabled="true" oncommand="editCerts();"/>
       <button id="websites_addButton"
               label="&certmgr.restore2.label;"
diff --git a/security/manager/pki/resources/content/deletecert.js b/security/manager/pki/resources/content/deletecert.js
index 26715ef476aa..00b9d7d1ca1c 100644
--- a/security/manager/pki/resources/content/deletecert.js
+++ b/security/manager/pki/resources/content/deletecert.js
@@ -70,9 +70,9 @@ function setWindowName()
   }
   else if(typeFlag == "ca_tab")
   {
-     title = bundle.GetStringFromName("deleteCaCertTitle");
-     confirm = bundle.GetStringFromName("deleteCaCertConfirm");
-     impact = bundle.GetStringFromName("deleteCaCertImpactX");
+     title = bundle.GetStringFromName("deleteCaCertTitle2");
+     confirm = bundle.GetStringFromName("deleteCaCertConfirm2");
+     impact = bundle.GetStringFromName("deleteCaCertImpactX2");
   }
   else if(typeFlag == "others_tab")
   {