Bug 173729, Deleting a builtin cert should behave better

Improve wording to reduce confusion
r=rrelyea
This commit is contained in:
Kai Engert 2010-05-03 13:34:41 +02:00
parent 2eae427786
commit 8944ab6865
6 changed files with 18 additions and 16 deletions

View File

@ -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…">

View File

@ -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.

View File

@ -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>

View File

@ -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;"

View File

@ -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;"

View File

@ -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")
{