Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 8 insertions, 41 deletions

diff --git a/l10n-en-CA/security/manager/chrome/pipnss/nsserrors.properties b/l10n-en-CA/security/manager/chrome/pipnss/nsserrors.properties
index 0d28ca43f5..49fecc65d1 100644
--- a/l10n-en-CA/security/manager/chrome/pipnss/nsserrors.properties
+++ b/l10n-en-CA/security/manager/chrome/pipnss/nsserrors.properties
@@ -293,7 +293,7 @@ SEC_ERROR_INCOMPATIBLE_PKCS11=PKCS #11 driver violates the spec in an incompatib
 SEC_ERROR_NO_EVENT=No new slot event is available at this time.
 SEC_ERROR_CRL_ALREADY_EXISTS=CRL already exists.
 SEC_ERROR_NOT_INITIALIZED=NSS is not initialized.
-SEC_ERROR_TOKEN_NOT_LOGGED_IN=The operation failed because the PKCS#11 token is not signed in.
+SEC_ERROR_TOKEN_NOT_LOGGED_IN=The operation failed because the PKCS#11 token is not logged in.
 SEC_ERROR_OCSP_RESPONDER_CERT_INVALID=Configured OCSP responder’s certificate is invalid.
 SEC_ERROR_OCSP_BAD_SIGNATURE=OCSP response has an invalid signature.
 SEC_ERROR_OUT_OF_SEARCH_LIMITS=Certificate validation search is out of search limits
@@ -314,7 +314,7 @@ SEC_ERROR_EXPIRED_PASSWORD=The password expired.
 SEC_ERROR_LOCKED_PASSWORD=The password is locked.
 SEC_ERROR_UNKNOWN_PKCS11_ERROR=Unknown PKCS #11 error.
 SEC_ERROR_BAD_CRL_DP_URL=Invalid or unsupported URL in CRL distribution point name.
-SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=The certificate was signed using an signature algorithm that is disabled because it is not secure.
+SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=The certificate was signed using a signature algorithm that is disabled because it is not secure.
 MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=The server uses key pinning (HPKP) but no trusted certificate chain could be constructed that matches the pinset. Key pinning violations cannot be overridden.
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=The server uses a certificate with a basic constraints extension identifying it as a certificate authority. For a properly-issued certificate, this should not be the case.
 MOZILLA_PKIX_ERROR_INADEQUATE_KEY_SIZE=The server presented a certificate with a key size that is too small to establish a secure connection.
diff --git a/l10n-en-CA/security/manager/security/certificates/certManager.ftl b/l10n-en-CA/security/manager/security/certificates/certManager.ftl
index 5cdc64e8e5..3dd92adbb6 100644
--- a/l10n-en-CA/security/manager/security/certificates/certManager.ftl
+++ b/l10n-en-CA/security/manager/security/certificates/certManager.ftl
@@ -130,7 +130,7 @@ delete-ssl-override-confirm = Are you sure you want to delete this server except
 delete-ssl-override-impact = If you delete a server exception, you restore the usual security checks for that server and require it uses a valid certificate.
 delete-ca-cert-title =
     .title = Delete or Distrust CA Certificates
-delete-ca-cert-confirm = You have asked 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?
+delete-ca-cert-confirm = 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?
 delete-ca-cert-impact = If you delete or distrust a certificate authority (CA) certificate, this application will no longer trust any certificates issued by that CA.
 delete-email-cert-title =
     .title = Delete Email Certificates
diff --git a/l10n-en-CA/security/manager/security/certificates/deviceManager.ftl b/l10n-en-CA/security/manager/security/certificates/deviceManager.ftl
index def53c8623..2e994efaa1 100644
--- a/l10n-en-CA/security/manager/security/certificates/deviceManager.ftl
+++ b/l10n-en-CA/security/manager/security/certificates/deviceManager.ftl
@@ -8,40 +8,30 @@
 devmgr-window =
     .title = Device Manager
     .style = min-width: 67em; min-height: 32em;
-
 devmgr-devlist =
     .label = Security Modules and Devices
-
 devmgr-header-details =
     .label = Details
-
 devmgr-header-value =
     .label = Value
-
 devmgr-button-login =
     .label = Log In
     .accesskey = n
-
 devmgr-button-logout =
     .label = Log Out
     .accesskey = O
-
 devmgr-button-changepw =
     .label = Change Password
     .accesskey = P
-
 devmgr-button-load =
     .label = Load
     .accesskey = L
-
 devmgr-button-unload =
     .label = Unload
     .accesskey = U
-
 devmgr-button-enable-fips =
     .label = Enable FIPS
     .accesskey = F
-
 devmgr-button-disable-fips =
     .label = Disable FIPS
     .accesskey = F
@@ -50,20 +40,15 @@ devmgr-button-disable-fips =
 
 load-device =
     .title = Load PKCS#11 Device Driver
-
 load-device-info = Enter the information for the module you want to add.
-
 load-device-modname =
     .value = Module Name
     .accesskey = M
-
 load-device-modname-default =
     .value = New PKCS#11 Module
-
 load-device-filename =
     .value = Module filename
     .accesskey = f
-
 load-device-browse =
     .label = Browse…
     .accesskey = B
@@ -72,62 +57,44 @@ load-device-browse =
 
 devinfo-status =
     .label = Status
-
 devinfo-status-disabled =
     .label = Disabled
-
 devinfo-status-not-present =
     .label = Not Present
-
 devinfo-status-uninitialized =
     .label = Uninitialized
-
 devinfo-status-not-logged-in =
-    .label = Not Signed In
-
+    .label = Not Logged In
 devinfo-status-logged-in =
-    .label = Signed In
-
+    .label = Logged In
 devinfo-status-ready =
     .label = Ready
-
 devinfo-desc =
     .label = Description
-
 devinfo-man-id =
     .label = Manufacturer
-
 devinfo-hwversion =
     .label = HW Version
 devinfo-fwversion =
     .label = FW Version
-
 devinfo-modname =
     .label = Module
-
 devinfo-modpath =
     .label = Path
-
-login-failed = Failed to Sign in
-
+login-failed = Failed to Log in
 devinfo-label =
     .label = Label
-
 devinfo-serialnum =
     .label = Serial Number
-
 fips-nonempty-primary-password-required = FIPS mode requires that you have a Primary Password set for each security device. Please set the password before trying to enable FIPS mode.
 unable-to-toggle-fips = Unable to change the FIPS mode for the security device. It is recommended that you exit and restart this application.
 load-pk11-module-file-picker-title = Choose a PKCS#11 device driver to load
-
 # Load Module Dialog
 load-module-help-empty-module-name =
     .value = The module name cannot be empty.
-
 # Do not translate 'Root Certs'
 load-module-help-root-certs-module-name =
     .value = “Root Certs” is reserved and cannot be used as the module name.
-
 add-module-failure = Unable to add module
 del-module-warning = Are you sure you want to delete this security module?
 del-module-error = Unable to delete module
diff --git a/l10n-en-CA/security/manager/security/pippki/pippki.ftl b/l10n-en-CA/security/manager/security/pippki/pippki.ftl
index a46fb6c57c..a3f569bb5e 100644
--- a/l10n-en-CA/security/manager/security/pippki/pippki.ftl
+++ b/l10n-en-CA/security/manager/security/pippki/pippki.ftl
@@ -29,7 +29,7 @@ reset-primary-password-window2 =
     .style = min-width: 40em
 reset-password-button-label =
     .label = Reset
-reset-primary-password-text = If you reset your Primary Password, all your stored web and e-mail passwords, personal certificates, and private keys will be forgotten. Are you sure you want to reset your Primary Password?
+reset-primary-password-text = If you reset your Primary Password, all your stored web and email passwords, personal certificates, and private keys will be forgotten. Are you sure you want to reset your Primary Password?
 pippki-reset-password-confirmation-title = Reset Primary Password
 pippki-reset-password-confirmation-message = Your Primary Password has been reset.
 
@@ -75,7 +75,7 @@ client-auth-cert-details-serial-number = Serial number: { $serialNumber }
 client-auth-cert-details-validity-period = Valid from { $notBefore } to { $notAfter }
 # Variables:
 # $keyUsages (String) - A list of already-localized key usages for which the certificate may be used
-client-auth-cert-details-key-usages = Key Usages: { $keyUsages }
+client-auth-cert-details-key-usages = Key usages: { $keyUsages }
 # Variables:
 # $emailAddresses (String) - A list of email addresses present in the certificate
 client-auth-cert-details-email-addresses = Email addresses: { $emailAddresses }