Index: mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties
===================================================================
RCS file: /cvsroot/mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties,v
retrieving revision 1.19
diff -u -p -r1.19 pippki.properties
--- mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties	20 Apr 2008 18:14:30 -0000	1.19
+++ mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties	11 Jul 2008 14:07:55 -0000
@@ -158,20 +158,18 @@ crlNextUpdateMsg2=The certificate revoca
 NoUpdateFailure=None
 lastFetchUrlLabel=URL originally fetched from
 advertisedUrlLabel=URL advertised by the CA
-crlAutoUpdateDayCntError=Number of days before next update must be a number greater than zero.
-crlAutoUpdtaeFreqCntError=Frequency of update must be a number greater than zero.
-disabledStatement=Automatic Update is not enabled for this CRL.
-enabledStatement=Automatic Update is enabled for this CRL.
-crlAutoupdateQuestion1=Would you like to enable automatic update?
-crlAutoupdateQuestion2=Would you like to view the automatic update settings?
-undefinedValStr=<Not Defined>
-undefinedURL=Auto update URL is not defined.
+disabledStatement=CRL will not be updated automatically.
+enabledStatement=CRL will be updated automatically.
+crlAutoupdateQuestion1=Enable automatic updates?
+crlAutoupdateQuestion2=View update settings?
+undefinedValStr=Not specified
+undefinedURL=No update URL defined.
 yesButton=Yes
 noButton=No
 resetPasswordConfirmationTitle=Reset Master Password
 resetPasswordConfirmationMessage=Your password has been reset.
-crlAutoupdateEnabled=Enabled
-crlAutoupdateNotEnabled=Not Enabled
+crlAutoupdateEnabled=On
+crlAutoupdateNotEnabled=Off
 crlAutoupdateOk=OK
 crlAutoupdateFailed=Failed
 crlImportNewCRLTitle=Import Certificate Revocation List
Index: mozilla/security/manager/locales/en-US/chrome/pippki/pref-validation.dtd
===================================================================
RCS file: /cvsroot/mozilla/security/manager/locales/en-US/chrome/pippki/pref-validation.dtd,v
retrieving revision 1.7
diff -u -p -r1.7 pref-validation.dtd
--- mozilla/security/manager/locales/en-US/chrome/pippki/pref-validation.dtd	27 Nov 2007 02:44:48 -0000	1.7
+++ mozilla/security/manager/locales/en-US/chrome/pippki/pref-validation.dtd	11 Jul 2008 14:07:55 -0000
@@ -47,7 +47,7 @@
 <!ENTITY  validation.crllastupdate.label          "Last Update">
 <!ENTITY  validation.crlnextupdate.label          "Next Update">
 <!ENTITY  validation.crlautoupdateenabled.label   "Auto Update">
-<!ENTITY  validation.crlautoupdatestatus.label    "Auto Update Status">
+<!ENTITY  validation.crlautoupdatestatus.label    "Update Status">
 <!ENTITY  validation.deletecrl.label              "Delete">
 <!ENTITY  validation.deletecrl.accesskey          "D">
 <!ENTITY  validation.updatecrl.label              "Update">
@@ -55,21 +55,22 @@
 <!ENTITY  validation.advanced.label               "Settings">
 <!ENTITY  validation.advanced.accesskey           "S">
 
-<!ENTITY  validation.crl.autoupdate.title         "Automatic CRL Update Preferences">
-<!ENTITY  validation.crl.autoupdate.enable.label  "Enable Automatic Update for this CRL">
+<!ENTITY  validation.crl.autoupdate.title         "CRL Update Settings">
+<!ENTITY  validation.crl.autoupdate.enable.label  "Automatically update this CRL">
 <!ENTITY  validation.crl.autoupdate.time.label1   "Update">
-<!ENTITY  validation.crl.autoupdate.time.label2   "Day(s) before Next Update date">
+<!ENTITY  validation.crl.autoupdate.time.label2   "day(s) before date of Next Update">
 <!ENTITY  validation.crl.autoupdate.freq.label1   "Update every">
-<!ENTITY  validation.crl.autoupdate.freq.label2   "Day(s)">
-<!ENTITY  validation.crl.autoupdate.url.label     "CRL would be imported From:">
+<!ENTITY  validation.crl.autoupdate.freq.label2   "day(s)">
+<!ENTITY  validation.crl.autoupdate.url.label     "Import CRL updates from:">
+<!ENTITY  crl.autoupdate.fail.cnt.label           "Recent failed updates: ">
+<!ENTITY  crl.autoupdate.fail.reason.label        "Last update failed because:">
+
 <!ENTITY  crl.import.status.title                 "CRL Import Status">
 <!ENTITY  crl.import.success.message              "The Certificate Revocation List (CRL) was successfully imported.">
 <!ENTITY  crl.issuer.label                        "CRL Issued By:">
 <!ENTITY  crl.issuer.org.label                    "Organization: ">
 <!ENTITY  crl.issuer.orgunit.label                "Unit: ">
 <!ENTITY  crl.import.nextupdate.label             "Next Update On: ">
-<!ENTITY  crl.autoupdate.fail.cnt.label           "Previous Consecutive Update Failures: ">
-<!ENTITY  crl.autoupdate.fail.reason.label        "Details of Last Update Failure: ">
 <!ENTITY  edit.button                             "Settings">
 
 <!ENTITY validation.ocsp.caption                  "OCSP">
Index: mozilla/security/manager/pki/resources/content/pref-crlupdate.js
===================================================================
RCS file: /cvsroot/mozilla/security/manager/pki/resources/content/pref-crlupdate.js,v
retrieving revision 1.10
diff -u -p -r1.10 pref-crlupdate.js
--- mozilla/security/manager/pki/resources/content/pref-crlupdate.js	13 Jul 2006 18:59:37 -0000	1.10
+++ mozilla/security/manager/pki/resources/content/pref-crlupdate.js	11 Jul 2008 14:07:55 -0000
@@ -212,9 +212,6 @@ function onCancel()
 
 function onAccept()
 {
-   if(!validatePrefs())
-     return false;
-
    //set enable pref
    prefBranch.setBoolPref(autoupdateEnabledString, enabledCheckBox.checked );
    
@@ -246,23 +243,3 @@ function onAccept()
    //Close dialog by returning true
    return true;
 }
-
-function validatePrefs()
-{
-   var dayCnt = (document.getElementById("nextUpdateDay")).value;
-   var freqCnt = (document.getElementById("nextUpdateFreq")).value;
-
-   var tmp = parseFloat(dayCnt);
-   if(!(tmp > 0.0)){
-     alert(bundle.GetStringFromName("crlAutoUpdateDayCntError"));
-     return false;
-   }
-   
-   tmp = parseFloat(freqCnt);
-   if(!(tmp > 0.0)){
-     alert(bundle.GetStringFromName("crlAutoUpdtaeFreqCntError"));
-     return false;
-   }
-   
-   return true;
-}
Index: mozilla/security/manager/pki/resources/content/pref-crlupdate.xul
===================================================================
RCS file: /cvsroot/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul,v
retrieving revision 1.8
diff -u -p -r1.8 pref-crlupdate.xul
--- mozilla/security/manager/pki/resources/content/pref-crlupdate.xul	13 Jul 2006 18:59:37 -0000	1.8
+++ mozilla/security/manager/pki/resources/content/pref-crlupdate.xul	11 Jul 2008 14:07:55 -0000
@@ -62,14 +62,20 @@
         <hbox align="center" id="timeBasedBox">
           <radio label="&validation.crl.autoupdate.time.label1;"
                  id="timeBasedRadio" value="1" group="autoUpdateType"/>
-          <textbox width="20" value="1" id="nextUpdateDay" />
+          <textbox min="1" type="number"
+                   width="36"
+                   value="1"
+                   id="nextUpdateDay" />
           <text value="&validation.crl.autoupdate.time.label2;" />
         </hbox>
         
         <hbox align="center" id="freqBasedBox">
           <radio label="&validation.crl.autoupdate.freq.label1;"
                  id="freqBasedRadio" value="2" group="autoUpdateType"/>
-          <textbox width="20" value="1" id="nextUpdateFreq" />
+          <textbox min="1" type="number"
+                   width="36"
+                   value="1"
+                   id="nextUpdateFreq" />
           <text value="&validation.crl.autoupdate.freq.label2;" />
         </hbox>
       </radiogroup>