diff --git a/mozilla/security/manager/locales/en-US/chrome/pipnss/pipnss.properties b/mozilla/security/manager/locales/en-US/chrome/pipnss/pipnss.properties index 958aa98bfc8..621f1a08bde 100644 --- a/mozilla/security/manager/locales/en-US/chrome/pipnss/pipnss.properties +++ b/mozilla/security/manager/locales/en-US/chrome/pipnss/pipnss.properties @@ -344,8 +344,7 @@ CertInfoTo=to CertInfoPurposes=Purposes CertInfoStoredIn=Stored in: P12DefaultNickname=Imported Certificate -CrlImportSuccess=The browser successfully imported the certificate revocation list (CRL). -CrlImportFailure1=The browser cannot import the Certificate Revocation List (CRL). +CrlImportFailure1x=The application cannot import the Certificate Revocation List (CRL). CrlImportFailureExpired=A more recent version of this CRL is available. CrlImportFailureBadSignature=CRL has an invalid Signature. CrlImportFailureInvalid=New CRL has an invalid format. @@ -354,7 +353,7 @@ CrlImportFailureNotYetValid=The CRL is not yet valid. You might want to check yo CrlImportFailureNetworkProblem=Download of the CRL failed due to Network problems. CrlImportFailureReasonUnknown=Error Importing CRL to local Database. Error Code: CrlImportFailure2=Please ask your system administrator for assistance. -NSSInitProblem=Could not initialize the browser's security component. The most likely cause is problems with files in your browser's profile directory. Please check that this directory has no read/write restrictions and your hard disk is not full or close to full. It is recommended that you exit the browser and fix the problem. If you continue to use this browser session, you might see incorrect browser behaviour when accessing security features. +NSSInitProblemX=Could not initialize the application's security component. The most likely cause is problems with files in your application's profile directory. Please check that this directory has no read/write restrictions and your hard disk is not full or close to full. It is recommended that you exit the application and fix the problem. If you continue to use this session, you might see incorrect application behaviour when accessing security features. ProfileSwitchSocketsStillActive=The operation can not be completed because of an internal failure. A secure network communication has not been cleaned up correctly. ProfileSwitchCryptoUIActive=This operation is impossible at the current time. Please complete the operation that requests your attention in one of the other open windows. VerifyExpired= diff --git a/mozilla/security/manager/locales/en-US/chrome/pippki/newserver.dtd b/mozilla/security/manager/locales/en-US/chrome/pippki/newserver.dtd index 693905532e0..d88d5ac5b50 100644 --- a/mozilla/security/manager/locales/en-US/chrome/pippki/newserver.dtd +++ b/mozilla/security/manager/locales/en-US/chrome/pippki/newserver.dtd @@ -39,7 +39,7 @@ - + diff --git a/mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties b/mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties index 1ca9576881a..a1a0ab29bb2 100644 --- a/mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties +++ b/mozilla/security/manager/locales/en-US/chrome/pippki/pippki.properties @@ -63,7 +63,7 @@ deleteUserCertImpact=If you delete one of your own certificates, you can no long deleteUserCertTitle=Delete your Certificates deleteCaCertConfirm=Are you sure you want to delete these CA certificates? -deleteCaCertImpact=If you delete a certificate authority (CA) certificate, your browser will no longer trust any certificates issued by that CA. +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 deleteEmailCertConfirm=Are you sure you want to delete these people's e-mail certificates? @@ -168,7 +168,6 @@ crlNextUpdateMsg2=The certificate revocation list (CRL) from "%S" needs to be up NoUpdateFailure=None lastFetchUrlLabel=URL originally fetched from advertisedUrlLabel=URL advertised by the CA -CrlUpdatePrefsSetConfirmation=Automatic update preferences will take effect when you restart the browser. 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. diff --git a/mozilla/security/manager/pki/resources/content/deletecert.js b/mozilla/security/manager/pki/resources/content/deletecert.js index 2f9335c1ebe..6f5069821dc 100644 --- a/mozilla/security/manager/pki/resources/content/deletecert.js +++ b/mozilla/security/manager/pki/resources/content/deletecert.js @@ -82,7 +82,7 @@ function setWindowName() { title = bundle.GetStringFromName("deleteCaCertTitle"); confirm = bundle.GetStringFromName("deleteCaCertConfirm"); - impact = bundle.GetStringFromName("deleteCaCertImpact"); + impact = bundle.GetStringFromName("deleteCaCertImpactX"); } else if(typeFlag == "others_tab") { diff --git a/mozilla/security/manager/pki/resources/content/newserver.xul b/mozilla/security/manager/pki/resources/content/newserver.xul index a6d391ebcfa..2f17f4c1306 100644 --- a/mozilla/security/manager/pki/resources/content/newserver.xul +++ b/mozilla/security/manager/pki/resources/content/newserver.xul @@ -72,7 +72,7 @@ &newserver.reasons; - &newserver.reason1; + &newserver.reason1x; &newserver.reason2; diff --git a/mozilla/security/manager/ssl/src/nsCRLManager.cpp b/mozilla/security/manager/ssl/src/nsCRLManager.cpp index 1c3de426f59..c9c1422c2d5 100644 --- a/mozilla/security/manager/ssl/src/nsCRLManager.cpp +++ b/mozilla/security/manager/ssl/src/nsCRLManager.cpp @@ -188,7 +188,7 @@ done: nsCOMPtr prompter; if (wwatch){ wwatch->GetNewPrompter(0, getter_AddRefs(prompter)); - nssComponent->GetPIPNSSBundleString("CrlImportFailure1", message); + nssComponent->GetPIPNSSBundleString("CrlImportFailure1x", message); message.Append(NS_LITERAL_STRING("\n").get()); message.Append(errorMessage); nssComponent->GetPIPNSSBundleString("CrlImportFailure2", temp); diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp index fac2a08a99d..dc2fdb30496 100644 --- a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp @@ -2070,7 +2070,7 @@ void nsNSSComponent::ShowAlert(AlertIdentifier ai) switch (ai) { case ai_nss_init_problem: - rv = GetPIPNSSBundleString("NSSInitProblem", message); + rv = GetPIPNSSBundleString("NSSInitProblemX", message); break; case ai_sockets_still_active: rv = GetPIPNSSBundleString("ProfileSwitchSocketsStillActive", message); @@ -2764,7 +2764,7 @@ PSMContentDownloader::handleContentDownloadError(nsresult errCode) nsCOMPtr prompter; if (wwatch){ wwatch->GetNewPrompter(0, getter_AddRefs(prompter)); - nssComponent->GetPIPNSSBundleString("CrlImportFailure1", message); + nssComponent->GetPIPNSSBundleString("CrlImportFailure1x", message); message.Append(NS_LITERAL_STRING("\n").get()); message.Append(tmpMessage); nssComponent->GetPIPNSSBundleString("CrlImportFailure2", tmpMessage);