Merging upstream version 126.0.

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

6 files changed, 52 insertions, 131 deletions

diff --git a/l10n-en-GB/security/manager/chrome/pipnss/nsserrors.properties b/l10n-en-GB/security/manager/chrome/pipnss/nsserrors.properties
index 84a6c85ea2..541705938e 100644
--- a/l10n-en-GB/security/manager/chrome/pipnss/nsserrors.properties
+++ b/l10n-en-GB/security/manager/chrome/pipnss/nsserrors.properties
@@ -6,13 +6,13 @@ SSL_ERROR_EXPORT_ONLY_SERVER=Unable to communicate securely. Peer does not suppo
 SSL_ERROR_US_ONLY_SERVER=Unable to communicate securely. Peer requires high-grade encryption which is not supported.
 SSL_ERROR_NO_CYPHER_OVERLAP=Cannot communicate securely with peer: no common encryption algorithm(s).
 SSL_ERROR_NO_CERTIFICATE=Unable to find the certificate or key necessary for authentication.
-SSL_ERROR_BAD_CERTIFICATE=Unable to communicate securely with peer: peers's certificate was rejected.
+SSL_ERROR_BAD_CERTIFICATE=Unable to communicate securely with peer: peers’s certificate was rejected.
 SSL_ERROR_BAD_CLIENT=The server has encountered bad data from the client.
 SSL_ERROR_BAD_SERVER=The client has encountered bad data from the server.
 SSL_ERROR_UNSUPPORTED_CERTIFICATE_TYPE=Unsupported certificate type.
 SSL_ERROR_UNSUPPORTED_VERSION=Peer using unsupported version of security protocol.
 SSL_ERROR_WRONG_CERTIFICATE=Client authentication failed: private key in key database does not match public key in certificate database.
-SSL_ERROR_BAD_CERT_DOMAIN=Unable to communicate securely with peer: requested domain name does not match the server's certificate.
+SSL_ERROR_BAD_CERT_DOMAIN=Unable to communicate securely with peer: requested domain name does not match the server’s certificate.
 SSL_ERROR_POST_WARNING=Unrecognised SSL error code.
 SSL_ERROR_SSL2_DISABLED=Peer only supports SSL version 2, which is locally disabled.
 SSL_ERROR_BAD_MAC_READ=SSL received a record with an incorrect Message Authentication Code.
@@ -67,7 +67,7 @@ SSL_ERROR_UNSUPPORTED_CERT_ALERT=SSL peer does not support certificates of the t
 SSL_ERROR_CERTIFICATE_UNKNOWN_ALERT=SSL peer had some unspecified issue with the certificate it received.
 SSL_ERROR_GENERATE_RANDOM_FAILURE=SSL experienced a failure of its random number generator.
 SSL_ERROR_SIGN_HASHES_FAILURE=Unable to digitally sign data required to verify your certificate.
-SSL_ERROR_EXTRACT_PUBLIC_KEY_FAILURE=SSL was unable to extract the public key from the peer's certificate.
+SSL_ERROR_EXTRACT_PUBLIC_KEY_FAILURE=SSL was unable to extract the public key from the peer’s certificate.
 SSL_ERROR_SERVER_KEY_EXCHANGE_FAILURE=Unspecified failure while processing SSL Server Key Exchange handshake.
 SSL_ERROR_CLIENT_KEY_EXCHANGE_FAILURE=Unspecified failure while processing SSL Client Key Exchange handshake.
 SSL_ERROR_ENCRYPTION_FAILURE=Bulk data encryption algorithm failed in selected cipher suite.
@@ -90,7 +90,7 @@ SSL_ERROR_HANDSHAKE_NOT_COMPLETED=Cannot initiate another SSL handshake until cu
 SSL_ERROR_BAD_HANDSHAKE_HASH_VALUE=Received incorrect handshakes hash values from peer.
 SSL_ERROR_CERT_KEA_MISMATCH=The certificate provided cannot be used with the selected key exchange algorithm.
 SSL_ERROR_NO_TRUSTED_SSL_CLIENT_CA=No certificate authority is trusted for SSL client authentication.
-SSL_ERROR_SESSION_NOT_FOUND=Client's SSL session ID not found in server's session cache.
+SSL_ERROR_SESSION_NOT_FOUND=Client’s SSL session ID not found in server’s session cache.
 SSL_ERROR_DECRYPTION_FAILED_ALERT=Peer was unable to decrypt an SSL record it received.
 SSL_ERROR_RECORD_OVERFLOW_ALERT=Peer received an SSL record that was longer than is permitted.
 SSL_ERROR_UNKNOWN_CA_ALERT=Peer does not recognise and trust the CA that issued your certificate.
@@ -148,29 +148,29 @@ SEC_ERROR_INVALID_ALGORITHM=security library: invalid algorithm.
 SEC_ERROR_INVALID_AVA=security library: invalid AVA.
 SEC_ERROR_INVALID_TIME=Improperly formatted time string.
 SEC_ERROR_BAD_DER=security library: improperly formatted DER-encoded message.
-SEC_ERROR_BAD_SIGNATURE=Peer's certificate has an invalid signature.
-SEC_ERROR_EXPIRED_CERTIFICATE=Peer's Certificate has expired.
-SEC_ERROR_REVOKED_CERTIFICATE=Peer's Certificate has been revoked.
-SEC_ERROR_UNKNOWN_ISSUER=Peer's Certificate issuer is not recognised.
-SEC_ERROR_BAD_KEY=Peer's public key is invalid.
+SEC_ERROR_BAD_SIGNATURE=Peer’s certificate has an invalid signature.
+SEC_ERROR_EXPIRED_CERTIFICATE=Peer’s Certificate has expired.
+SEC_ERROR_REVOKED_CERTIFICATE=Peer’s Certificate has been revoked.
+SEC_ERROR_UNKNOWN_ISSUER=Peer’s Certificate issuer is not recognised.
+SEC_ERROR_BAD_KEY=Peer’s public key is invalid.
 SEC_ERROR_BAD_PASSWORD=The security password entered is incorrect.
 SEC_ERROR_RETRY_PASSWORD=New password entered incorrectly. Please try again.
 SEC_ERROR_NO_NODELOCK=security library: no nodelock.
 SEC_ERROR_BAD_DATABASE=security library: bad database.
 SEC_ERROR_NO_MEMORY=security library: memory allocation failure.
-SEC_ERROR_UNTRUSTED_ISSUER=Peer's certificate issuer has been marked as not trusted by the user.
-SEC_ERROR_UNTRUSTED_CERT=Peer's certificate has been marked as not trusted by the user.
+SEC_ERROR_UNTRUSTED_ISSUER=Peer’s certificate issuer has been marked as not trusted by the user.
+SEC_ERROR_UNTRUSTED_CERT=Peer’s certificate has been marked as not trusted by the user.
 SEC_ERROR_DUPLICATE_CERT=Certificate already exists in your database.
-SEC_ERROR_DUPLICATE_CERT_NAME=Downloaded certificate's name duplicates one already in your database.
+SEC_ERROR_DUPLICATE_CERT_NAME=Downloaded certificate’s name duplicates one already in your database.
 SEC_ERROR_ADDING_CERT=Error adding certificate to database.
 SEC_ERROR_FILING_KEY=Error refiling the key for this certificate.
 SEC_ERROR_NO_KEY=The private key for this certificate cannot be found in key database
 SEC_ERROR_CERT_VALID=This certificate is valid.
 SEC_ERROR_CERT_NOT_VALID=This certificate is not valid.
 SEC_ERROR_CERT_NO_RESPONSE=Cert Library: No Response
-SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE=The certificate issuer's certificate has expired. Check your system date and time.
-SEC_ERROR_CRL_EXPIRED=The CRL for the certificate's issuer has expired. Update it or check your system date and time.
-SEC_ERROR_CRL_BAD_SIGNATURE=The CRL for the certificate's issuer has an invalid signature.
+SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE=The certificate issuer’s certificate has expired. Check your system date and time.
+SEC_ERROR_CRL_EXPIRED=The CRL for the certificate’s issuer has expired. Update it or check your system date and time.
+SEC_ERROR_CRL_BAD_SIGNATURE=The CRL for the certificate’s issuer has an invalid signature.
 SEC_ERROR_CRL_INVALID=New CRL has an invalid format.
 SEC_ERROR_EXTENSION_VALUE_INVALID=Certificate extension value is invalid.
 SEC_ERROR_EXTENSION_NOT_FOUND=Certificate extension not found.
@@ -195,11 +195,11 @@ XP_SEC_FORTEZZA_MORE_INFO=Please select a personality to get more info on
 XP_SEC_FORTEZZA_PERSON_NOT_FOUND=Personality not found
 XP_SEC_FORTEZZA_NO_MORE_INFO=No more information on that Personality
 XP_SEC_FORTEZZA_BAD_PIN=Invalid Pin
-XP_SEC_FORTEZZA_PERSON_ERROR=Couldn't initialise Fortezza personalities.
-SEC_ERROR_NO_KRL=No KRL for this site's certificate has been found.
-SEC_ERROR_KRL_EXPIRED=The KRL for this site's certificate has expired.
-SEC_ERROR_KRL_BAD_SIGNATURE=The KRL for this site's certificate has an invalid signature.
-SEC_ERROR_REVOKED_KEY=The key for this site's certificate has been revoked.
+XP_SEC_FORTEZZA_PERSON_ERROR=Couldn’t initialise Fortezza personalities.
+SEC_ERROR_NO_KRL=No KRL for this site’s certificate has been found.
+SEC_ERROR_KRL_EXPIRED=The KRL for this site’s certificate has expired.
+SEC_ERROR_KRL_BAD_SIGNATURE=The KRL for this site’s certificate has an invalid signature.
+SEC_ERROR_REVOKED_KEY=The key for this site’s certificate has been revoked.
 SEC_ERROR_KRL_INVALID=New KRL has an invalid format.
 SEC_ERROR_NEED_RANDOM=security library: need random data.
 SEC_ERROR_NO_MODULE=security library: no security module can perform the requested operation.
@@ -210,9 +210,9 @@ SEC_ERROR_CERT_NICKNAME_COLLISION=A certificate with the same nickname already e
 SEC_ERROR_KEY_NICKNAME_COLLISION=A key with the same nickname already exists.
 SEC_ERROR_SAFE_NOT_CREATED=error while creating safe object
 SEC_ERROR_BAGGAGE_NOT_CREATED=error while creating baggage object
-XP_JAVA_REMOVE_PRINCIPAL_ERROR=Couldn't remove the principal
-XP_JAVA_DELETE_PRIVILEGE_ERROR=Couldn't delete the privilege
-XP_JAVA_CERT_NOT_EXISTS_ERROR=This principal doesn't have a certificate
+XP_JAVA_REMOVE_PRINCIPAL_ERROR=Couldn’t remove the principal
+XP_JAVA_DELETE_PRIVILEGE_ERROR=Couldn’t delete the privilege
+XP_JAVA_CERT_NOT_EXISTS_ERROR=This principal doesn’t have a certificate
 SEC_ERROR_BAD_EXPORT_ALGORITHM=Required algorithm is not allowed.
 SEC_ERROR_EXPORTING_CERTIFICATES=Error attempting to export certificates.
 SEC_ERROR_IMPORTING_CERTIFICATES=Error attempting to import certificates.
@@ -254,7 +254,7 @@ SEC_ERROR_CERT_NOT_IN_NAME_SPACE=The Certifying Authority for this certificate i
 SEC_ERROR_KRL_NOT_YET_VALID=The key revocation list for this certificate is not yet valid.
 SEC_ERROR_CRL_NOT_YET_VALID=The certificate revocation list for this certificate is not yet valid.
 SEC_ERROR_UNKNOWN_CERT=The requested certificate could not be found.
-SEC_ERROR_UNKNOWN_SIGNER=The signer's certificate could not be found.
+SEC_ERROR_UNKNOWN_SIGNER=The signer’s certificate could not be found.
 SEC_ERROR_CERT_BAD_ACCESS_LOCATION=The location for the certificate status server has invalid format.
 SEC_ERROR_OCSP_UNKNOWN_RESPONSE_TYPE=The OCSP response cannot be fully decoded; it is of an unknown type.
 SEC_ERROR_OCSP_BAD_HTTP_RESPONSE=The OCSP server returned unexpected/invalid HTTP data.
@@ -283,18 +283,18 @@ SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE=Unsupported elliptic curve.
 SEC_ERROR_UNSUPPORTED_EC_POINT_FORM=Unsupported elliptic curve point form.
 SEC_ERROR_UNRECOGNIZED_OID=Unrecognised Object Identifier.
 SEC_ERROR_OCSP_INVALID_SIGNING_CERT=Invalid OCSP signing certificate in OCSP response.
-SEC_ERROR_REVOKED_CERTIFICATE_CRL=Certificate is revoked in issuer's certificate revocation list.
-SEC_ERROR_REVOKED_CERTIFICATE_OCSP=Issuer's OCSP responder reports certificate is revoked.
-SEC_ERROR_CRL_INVALID_VERSION=Issuer's Certificate Revocation List has an unknown version number.
-SEC_ERROR_CRL_V1_CRITICAL_EXTENSION=Issuer's V1 Certificate Revocation List has a critical extension.
-SEC_ERROR_CRL_UNKNOWN_CRITICAL_EXTENSION=Issuer's V2 Certificate Revocation List has an unknown critical extension.
+SEC_ERROR_REVOKED_CERTIFICATE_CRL=Certificate is revoked in issuer’s certificate revocation list.
+SEC_ERROR_REVOKED_CERTIFICATE_OCSP=Issuer’s OCSP responder reports certificate is revoked.
+SEC_ERROR_CRL_INVALID_VERSION=Issuer’s Certificate Revocation List has an unknown version number.
+SEC_ERROR_CRL_V1_CRITICAL_EXTENSION=Issuer’s V1 Certificate Revocation List has a critical extension.
+SEC_ERROR_CRL_UNKNOWN_CRITICAL_EXTENSION=Issuer’s V2 Certificate Revocation List has an unknown critical extension.
 SEC_ERROR_UNKNOWN_OBJECT_TYPE=Unknown object type specified.
 SEC_ERROR_INCOMPATIBLE_PKCS11=PKCS #11 driver violates the spec in an incompatible way.
 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 initialised.
 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_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
 SEC_ERROR_INVALID_POLICY_MAPPING=Policy mapping contains anypolicy
@@ -314,13 +314,13 @@ 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.
-MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=An X.509 version 1 certificate that is not a trust anchor was used to issue the server's certificate. X.509 version 1 certificates are deprecated and should not be used to sign other certificates.
+MOZILLA_PKIX_ERROR_V1_CERT_USED_AS_CA=An X.509 version 1 certificate that is not a trust anchor was used to issue the server’s certificate. X.509 version 1 certificates are deprecated and should not be used to sign other certificates.
 MOZILLA_PKIX_ERROR_NOT_YET_VALID_CERTIFICATE=The server presented a certificate that is not yet valid.
-MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=A certificate that is not yet valid was used to issue the server's certificate.
+MOZILLA_PKIX_ERROR_NOT_YET_VALID_ISSUER_CERTIFICATE=A certificate that is not yet valid was used to issue the server’s certificate.
 MOZILLA_PKIX_ERROR_SIGNATURE_ALGORITHM_MISMATCH=The signature algorithm in the signature field of the certificate does not match the algorithm in its signatureAlgorithm field.
 MOZILLA_PKIX_ERROR_OCSP_RESPONSE_FOR_CERT_MISSING=The OCSP response does not include a status for the certificate being verified.
 MOZILLA_PKIX_ERROR_VALIDITY_TOO_LONG=The server presented a certificate that is valid for too long.
diff --git a/l10n-en-GB/security/manager/chrome/pipnss/pipnss.properties b/l10n-en-GB/security/manager/chrome/pipnss/pipnss.properties
index 8953a410c3..1a0cd0a3c8 100644
--- a/l10n-en-GB/security/manager/chrome/pipnss/pipnss.properties
+++ b/l10n-en-GB/security/manager/chrome/pipnss/pipnss.properties
@@ -71,7 +71,7 @@ Fips140TokenDescription=Software Security Device (FIPS)
 Fips140SlotDescription=FIPS 140 Cryptographic, Key and Certificate Services
 
 # LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
-nick_template=%1$s's %2$s ID
+nick_template=%1$s’s %2$s ID
 
 CertDumpKUSign=Signing
 CertDumpKUNonRep=Non-repudiation
@@ -81,8 +81,8 @@ CertDumpKUKA=Key Agreement
 CertDumpKUCertSign=Certificate Signer
 CertDumpKUCRLSigner=CRL Signer
 
-PSMERR_SSL_Disabled=Can't connect securely because the SSL protocol has been disabled.
-PSMERR_SSL2_Disabled=Can't connect securely because the site uses an older, insecure version of the SSL protocol.
+PSMERR_SSL_Disabled=Can’t connect securely because the SSL protocol has been disabled.
+PSMERR_SSL2_Disabled=Can’t connect securely because the site uses an older, insecure version of the SSL protocol.
 PSMERR_HostReusedIssuerSerial=You have received an invalid certificate.  Please contact the server administrator or email correspondent and give them the following information:\n\nYour certificate contains the same serial number as another certificate issued by the certificate authority.  Please get a new certificate containing a unique serial number.
 
 # LOCALIZATION NOTE (SSLConnectionErrorPrefix2): %1$S is the host string, %2$S is more detailed information (localized as well).
@@ -127,8 +127,8 @@ P12DefaultNickname=Imported Certificate
 CertUnknown=Unknown
 CertNoEmailAddress=(no email address)
 CaCertExists=This certificate is already installed as a certificate authority.
-NotACACert=This is not a certificate authority certificate, so it can't be imported into the certificate authority list.
-UserCertIgnoredNoPrivateKey=This personal certificate can't be installed because you do not own the corresponding private key which was created when the certificate was requested.
+NotACACert=This is not a certificate authority certificate, so it can’t be imported into the certificate authority list.
+UserCertIgnoredNoPrivateKey=This personal certificate can’t be installed because you do not own the corresponding private key which was created when the certificate was requested.
 UserCertImported=Your personal certificate has been installed. You should keep a backup copy of this certificate.
 CertOrgUnknown=(Unknown)
 CertNotStored=(Not Stored)
diff --git a/l10n-en-GB/security/manager/chrome/pippki/pippki.properties b/l10n-en-GB/security/manager/chrome/pippki/pippki.properties
index 9a79994ed8..78f6fd9a7f 100644
--- a/l10n-en-GB/security/manager/chrome/pippki/pippki.properties
+++ b/l10n-en-GB/security/manager/chrome/pippki/pippki.properties
@@ -5,7 +5,7 @@
 # Download Cert dialog
 # LOCALIZATION NOTE(newCAMessage1):
 # %S is a string representative of the certificate being downloaded/imported.
-newCAMessage1=Do you want to trust "%S" for the following purposes?
+newCAMessage1=Do you want to trust “%S” for the following purposes?
 unnamedCA=Certificate Authority (unnamed)
 
 getPKCS12FilePasswordMessage=Please enter the password that was used to encrypt this certificate backup:
@@ -23,10 +23,10 @@ clientAuthNickAndSerial=%1$S [%2$S]
 clientAuthHostnameAndPort=%1$S:%2$S
 # LOCALIZATION NOTE(clientAuthMessage1): %S is the Organization of the server
 # cert.
-clientAuthMessage1=Organisation: "%S"
+clientAuthMessage1=Organisation: “%S”
 # LOCALIZATION NOTE(clientAuthMessage2): %S is the Organization of the issuer
 # cert of the server cert.
-clientAuthMessage2=Issued Under: "%S"
+clientAuthMessage2=Issued Under: “%S”
 # LOCALIZATION NOTE(clientAuthIssuedTo): %1$S is the Distinguished Name of the
 # currently selected client cert, such as "CN=John Doe,OU=Example" (without
 # quotes).
@@ -54,7 +54,7 @@ clientAuthStoredOn=Stored on: %1$S
 # Page Info
 pageInfo_NoEncryption=Connection Not Encrypted
 pageInfo_Privacy_None1=The web site %S does not support encryption for the page you are viewing.
-pageInfo_Privacy_None2=Information sent over the Internet without encryption can be seen by other people while it is in transit. 
+pageInfo_Privacy_None2=Information sent over the Internet without encryption can be seen by other people while it is in transit.
 pageInfo_Privacy_None4=The page you are viewing was not encrypted before being transmitted over the Internet.
 # LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
 # %1$S is the name of the encryption standard,
@@ -66,10 +66,10 @@ pageInfo_Privacy_Encrypted1=The page you are viewing was encrypted before being
 pageInfo_Privacy_Encrypted2=Encryption makes it difficult for unauthorised people to view information travelling between computers. It is therefore unlikely that anyone read this page as it travelled across the network.
 pageInfo_MixedContent=Connection Partially Encrypted
 pageInfo_MixedContent2=Parts of the page you are viewing were not encrypted before being transmitted over the Internet.
-pageInfo_WeakCipher=Your connection to this web site uses weak encryption and is not private. Other people can view your information or modify the site's behaviour.
+pageInfo_WeakCipher=Your connection to this web site uses weak encryption and is not private. Other people can view your information or modify the web site’s behaviour.
 pageInfo_CertificateTransparency_Compliant=This web site complies with the Certificate Transparency policy.
 
 # Token Manager
-password_not_set=(not set) 
+password_not_set=(not set)
 enable_fips=Enable FIPS
 
diff --git a/l10n-en-GB/security/manager/security/certificates/certManager.ftl b/l10n-en-GB/security/manager/security/certificates/certManager.ftl
index 3945de1f59..c77916d830 100644
--- a/l10n-en-GB/security/manager/security/certificates/certManager.ftl
+++ b/l10n-en-GB/security/manager/security/certificates/certManager.ftl
@@ -4,131 +4,94 @@
 
 certmgr-title =
     .title = Certificate Manager
-
 certmgr-tab-mine =
     .label = Your Certificates
-
 certmgr-tab-remembered =
     .label = Authentication Decisions
-
 certmgr-tab-people =
     .label = People
-
 certmgr-tab-servers =
     .label = Servers
-
 certmgr-tab-ca =
     .label = Authorities
-
 certmgr-mine = You have certificates from these organisations that identify you
 certmgr-remembered = These certificates are used to identify you to web sites
 certmgr-people = You have certificates on file that identify these people
 certmgr-server = These entries identify server certificate error exceptions
 certmgr-ca = You have certificates on file that identify these certificate authorities
-
 certmgr-edit-ca-cert2 =
     .title = Edit CA certificate trust settings
     .style = min-width: 48em;
-
 certmgr-edit-cert-edit-trust = Edit trust settings:
-
 certmgr-edit-cert-trust-ssl =
     .label = This certificate can identify web sites.
-
 certmgr-edit-cert-trust-email =
     .label = This certificate can identify mail users.
-
 certmgr-delete-cert2 =
     .title = Delete Certificate
     .style = min-width: 48em; min-height: 24em;
-
 certmgr-cert-host =
     .label = Host
-
 certmgr-cert-name =
     .label = Certificate Name
-
 certmgr-cert-server =
     .label = Server
-
 certmgr-token-name =
     .label = Security Device
-
 certmgr-begins-label =
     .label = Begins On
-
 certmgr-expires-label =
     .label = Expires On
-
 certmgr-email =
     .label = Email Address
-
 certmgr-serial =
     .label = Serial Number
-
 certmgr-fingerprint-sha-256 =
     .label = SHA-256 Fingerprint
-
 certmgr-view =
     .label = View…
     .accesskey = V
-
 certmgr-edit =
     .label = Edit Trust…
     .accesskey = E
-
 certmgr-export =
     .label = Export…
     .accesskey = x
-
 certmgr-delete =
     .label = Delete…
     .accesskey = D
-
 certmgr-delete-builtin =
     .label = Delete or Distrust…
     .accesskey = D
-
 certmgr-backup =
     .label = Backup…
     .accesskey = B
-
 certmgr-backup-all =
     .label = Backup All…
     .accesskey = k
-
 certmgr-restore =
     .label = Import…
     .accesskey = m
-
 certmgr-add-exception =
     .label = Add Exception…
     .accesskey = x
-
 exception-mgr =
     .title = Add Security Exception
-
 exception-mgr-extra-button =
     .label = Confirm Security Exception
     .accesskey = C
-
 exception-mgr-supplemental-warning = Legitimate banks, stores, and other public sites will not ask you to do this.
-
 exception-mgr-cert-location-url =
     .value = Location:
-
 exception-mgr-cert-location-download =
     .label = Get Certificate
     .accesskey = G
-
 exception-mgr-cert-status-view-cert =
     .label = View…
     .accesskey = V
-
 exception-mgr-permanent =
     .label = Permanently store this exception
     .accesskey = P
-
 pk11-bad-password = The password entered was incorrect.
 pkcs12-decode-err = Failed to decode the file.  Either it is not in PKCS #12 format, has been corrupted, or the password you entered was incorrect.
 pkcs12-unknown-err-restore = Failed to restore the PKCS #12 file for unknown reasons.
@@ -147,13 +110,13 @@ choose-p12-restore-file-dialog = Certificate File to Import
 
 file-browse-certificate-spec = Certificate Files
 import-ca-certs-prompt = Select File containing CA certificate(s) to import
-import-email-cert-prompt = Select File containing somebody's Email certificate to import
+import-email-cert-prompt = Select File containing somebody’s Email certificate to import
 
 ## For editing certificates trust
 
 # Variables:
 #   $certName: the name of certificate
-edit-trust-ca = The certificate "{ $certName }" represents a Certificate Authority.
+edit-trust-ca = The certificate “{ $certName }” represents a Certificate Authority.
 
 ## For Deleting Certificates
 
@@ -161,37 +124,28 @@ delete-user-cert-title =
     .title = Delete your Certificates
 delete-user-cert-confirm = Are you sure you want to delete these certificates?
 delete-user-cert-impact = If you delete one of your own certificates, you can no longer use it to identify yourself.
-
-
 delete-ssl-override-title =
     .title = Delete Server Certificate Exception
 delete-ssl-override-confirm = Are you sure you want to delete this server exception?
 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
-delete-email-cert-confirm = Are you sure you want to delete these people's email certificates?
-delete-email-cert-impact = If you delete a person's email certificate, you will no longer be able to send encrypted email to that person.
-
+delete-email-cert-confirm = Are you sure you want to delete these people’s email certificates?
+delete-email-cert-impact = If you delete a person’s email certificate, you will no longer be able to send encrypted email to that person.
 # Used for semi-uniquely representing a cert.
 #
 # Variables:
 #   $serialNumber : the serial number of the cert in AA:BB:CC hex format.
 cert-with-serial =
     .value = Certificate with serial number: { $serialNumber }
-
 # Used to indicate that the user chose not to send a client authentication certificate to a server that requested one in a TLS handshake.
 send-no-client-certificate = Send no client certificate
-
 # Used when no cert is stored for an override
 no-cert-stored-for-override = (Not Stored)
-
 # When a certificate is unavailable (for example, it has been deleted or the token it exists on has been removed).
 certificate-not-available = (Unavailable)
 
@@ -209,7 +163,7 @@ add-exception-domain-mismatch-long = The certificate belongs to a different site
 add-exception-expired-short = Outdated Information
 add-exception-expired-long = The certificate is not currently valid. It may have been stolen or lost, and could be used by someone to impersonate this site.
 add-exception-unverified-or-bad-signature-short = Unknown Identity
-add-exception-unverified-or-bad-signature-long = The certificate is not trusted because it hasn't been verified as issued by a trusted authority using a secure signature.
+add-exception-unverified-or-bad-signature-long = The certificate is not trusted because it hasn’t been verified as issued by a trusted authority using a secure signature.
 add-exception-valid-short = Valid Certificate
 add-exception-valid-long = This site provides valid, verified identification.  There is no need to add an exception.
 add-exception-checking-short = Checking Information
diff --git a/l10n-en-GB/security/manager/security/certificates/deviceManager.ftl b/l10n-en-GB/security/manager/security/certificates/deviceManager.ftl
index a464fa2a58..6698cb6d66 100644
--- a/l10n-en-GB/security/manager/security/certificates/deviceManager.ftl
+++ b/l10n-en-GB/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 = Uninitialised
-
 devinfo-status-not-logged-in =
     .label = Not Logged In
-
 devinfo-status-logged-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 Login
-
+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-GB/security/manager/security/pippki/pippki.ftl b/l10n-en-GB/security/manager/security/pippki/pippki.ftl
index 8170d7dbf7..b9906bc86f 100644
--- a/l10n-en-GB/security/manager/security/pippki/pippki.ftl
+++ b/l10n-en-GB/security/manager/security/pippki/pippki.ftl
@@ -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 }