Bug 583408 - Notify user when the certificate attribute check fails. r=dtownsend ui-r=beltzner a=blocking

toolkit/locales/en-US/chrome/mozapps/update/updates.dtd

@@ -52,16 +52,22 @@
 
 <!ENTITY  details.link                    "Details">
 
+<!ENTITY  error.title                     "Update Failed">
+
 <!ENTITY  error.label                     "There were problems checking for, downloading, or installing this 
                                            update. &brandShortName; could not be updated because:">
                                            
 <!ENTITY  errorManual.label               "You can update &brandShortName; manually by visiting this link
                                            and downloading the latest version:">
                                            
-<!ENTITY  errorpatching.title             "Update Failed">
 <!ENTITY  errorpatching.intro             "The partial Update could not be applied. 
                                            &brandShortName; will try again by downloading a complete Update.">
 
+<!ENTITY  errorCertAttrNoUpdate.label     "Something is preventing &brandShortName; from updating securely.
+                                           Please check you have the latest version of &brandShortName; at:">
+<!ENTITY  errorCertAttrHasUpdate.label    "Something is trying to trick &brandShortName; into accepting an
+                                           insecure update. Please contact your network provider and seek help.">
+
 <!ENTITY  finishedPage.title              "Update Ready to Install">
 <!ENTITY  finishedPage.text               "The update will be installed the next time &brandShortName; starts. You 
                                            can restart &brandShortName; now, or continue working and restart later.">

toolkit/locales/en-US/chrome/mozapps/update/updates.properties

@@ -32,7 +32,6 @@ updateType_minor=Security Update
 
 # LOCALIZATION NOTE: When present %S is brandShortName
 verificationError=%S could not confirm the integrity of the update package.
-errorsPageHeader=Update Failed
 licenseContentNotFound=The license file for this version could not be found. Please visit the %S homepage for more information.
 updateMoreInfoContentNotFound=Additional details about this version could not be found. Please visit the %S homepage for more information.
 resumePausedAfterCloseTitle=Software Update

toolkit/mozapps/update/content/updates.js

@@ -1579,9 +1579,6 @@ var gErrorsPage = {
     gUpdates.setButtons(null, null, "okButton", true);
     gUpdates.wiz.getButton("finish").focus();
 
-    var errorsTitle = gUpdates.getAUSString("errorsPageHeader");
-    document.getElementById("errorsHeader").setAttribute("label", errorsTitle);
-
     var statusText = gUpdates.update.statusText;
     LOG("gErrorsPage" , "onPageShow - update.statusText: " + statusText);
 

toolkit/mozapps/update/content/updates.xul

@@ -215,7 +215,7 @@
   
   <wizardpage id="errors" pageid="errors" object="gErrorsPage"
               onpageshow="gErrorsPage.onPageShow();">
-    <updateheader id="errorsHeader" label=""/>
+    <updateheader label="&error.title;"/>
     <vbox class="update-content" flex="1">
       <label id="errorIntro">&error.label;</label>
       <separator/>
@@ -233,7 +233,7 @@
   <wizardpage id="errorpatching" pageid="errorpatching" next="downloading"
               object="gErrorPatchingPage"
               onpageshow="gErrorPatchingPage.onPageShow();">
-    <updateheader label="&errorpatching.title;"/>
+    <updateheader label="&error.title;"/>
     <vbox class="update-content" flex="1">
       <label>&errorpatching.intro;</label>
     </vbox>