Pontoon: Update English (Great Britain) (en-GB) localization of Firefox
authorIan Neal <iann_bugzilla@blueyonder.co.uk>
Sat, 10 Oct 2020 15:15:27 +0000
changeset 1412 a979e58dd0b9a96bb97b22435274a7c1f555c1cb
parent 1411 500032db7be661c3d354fac404cfa80a9907562f
child 1413 3741e92398f67cadc084b3c8f8e553f9242c6ced
push id564
push userpontoon@mozilla.com
push dateSat, 10 Oct 2020 15:15:30 +0000
Pontoon: Update English (Great Britain) (en-GB) localization of Firefox Co-authored-by: Jack Comer <jackcomer01@gmail.com> Co-authored-by: Ian Neal <iann_bugzilla@blueyonder.co.uk>
browser/browser/preferences/preferences.ftl
browser/browser/webrtcIndicator.ftl
browser/defaultagent/defaultagent_localized.ini
dom/chrome/dom/dom.properties
dom/chrome/security/security.properties
dom/dom/media.ftl
security/manager/security/certificates/certManager.ftl
toolkit/chrome/global/aboutWebrtc.properties
toolkit/toolkit/about/aboutAddons.ftl
toolkit/toolkit/about/aboutNetworking.ftl
toolkit/toolkit/featuregates/features.ftl
toolkit/toolkit/payments/payments.ftl
--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -24,16 +24,18 @@ pref-page-title =
 search-input-box =
     .style = width: 15.4em
     .placeholder =
         { PLATFORM() ->
             [windows] Find in Options
            *[other] Find in Preferences
         }
 managed-notice = Your browser is being managed by your organisation.
+category-list =
+    .aria-label = Categories
 pane-general-title = General
 category-general =
     .tooltiptext = { pane-general-title }
 pane-home-title = Home
 category-home =
     .tooltiptext = { pane-home-title }
 pane-search-title = Search
 category-search =
@@ -484,16 +486,18 @@ choose-bookmark =
 
 home-prefs-content-header = Firefox Home Content
 home-prefs-content-description = Choose what content you want on your Firefox Home screen.
 home-prefs-search-header =
     .label = Web Search
 home-prefs-topsites-header =
     .label = Top Sites
 home-prefs-topsites-description = The sites you visit most
+home-prefs-topsites-by-option-sponsored =
+    .label = Sponsored Top Sites
 
 ## Variables:
 ##  $provider (String): Name of the corresponding content provider, e.g "Pocket".
 
 home-prefs-recommended-by-header =
     .label = Recommended by { $provider }
 home-prefs-recommended-by-description-update = Exceptional content from across the web, curated by { $provider }
 
@@ -555,16 +559,17 @@ search-show-suggestions-url-bar-option =
 # (appearing before).
 search-show-suggestions-above-history-option =
     .label = Show search suggestions ahead of browsing history in address bar results
 search-show-suggestions-private-windows =
     .label = Show search suggestions in Private Windows
 suggestions-addressbar-settings-generic = Change preferences for other address bar suggestions
 search-suggestions-cant-show = Search suggestions will not be shown in location bar results because you have configured { -brand-short-name } to never remember history.
 search-one-click-header = One-Click Search Engines
+search-one-click-header2 = Search Shortcuts
 search-one-click-desc = Choose the alternative search engines that appear below the address bar and search bar when you start to enter a keyword.
 search-choose-engine-column =
     .label = Search Engine
 search-choose-keyword-column =
     .label = Keyword
 search-restore-default =
     .label = Restore Default Search Engines
     .accesskey = D
--- a/browser/browser/webrtcIndicator.ftl
+++ b/browser/browser/webrtcIndicator.ftl
@@ -24,8 +24,17 @@ webrtc-microphone-unmuted =
 webrtc-microphone-muted =
     .title = Turn microphone on
 webrtc-camera-unmuted =
     .title = Turn camera off
 webrtc-camera-muted =
     .title = Turn camera on
 webrtc-minimize =
     .title = Minimise indicator
+# This string will display as a tooltip on supported systems where we show
+# device sharing state in the OS notification area. We do not use these strings
+# on macOS, as global menu bar items do not have native tooltips.
+webrtc-camera-system-menu =
+    .label = You are sharing your camera. Click to control sharing.
+webrtc-microphone-system-menu =
+    .label = You are sharing your microphone. Click to control sharing.
+webrtc-screen-system-menu =
+    .label = You are sharing a window or a screen. Click to control sharing.
--- a/browser/defaultagent/defaultagent_localized.ini
+++ b/browser/defaultagent/defaultagent_localized.ini
@@ -1,7 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This file is in the UTF-8 encoding
 [Strings]
 DefaultBrowserAgentTaskDescription=The Default Browser Agent task checks when the default changes from %MOZ_APP_DISPLAYNAME% to another browser. If the change happens under suspicious circumstances, it will prompt users to change back to %MOZ_APP_DISPLAYNAME% no more than two times. This task is installed automatically by %MOZ_APP_DISPLAYNAME%, and is reinstalled when %MOZ_APP_DISPLAYNAME% updates. To disable this task, update the “default-browser-agent.enabled” preference on the about:config page or the %MOZ_APP_DISPLAYNAME% enterprise policy setting “DisableDefaultBrowserAgent”.
+
+DefaultBrowserNotificationTitle=Make %MOZ_APP_DISPLAYNAME% your default browser
+DefaultBrowserNotificationText=%MOZ_APP_DISPLAYNAME% is no longer your default browser. Make it your default?
+DefaultBrowserNotificationYesButtonText=Yes
+DefaultBrowserNotificationNoButtonText=No
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -345,17 +345,16 @@ RegisterProtocolHandlerPrivateBrowsingWarning=Can’t use registerProtocolHandler inside private browsing mode.
 MotionEventWarning=Use of the motion sensor is deprecated.
 OrientationEventWarning=Use of the orientation sensor is deprecated.
 ProximityEventWarning=Use of the proximity sensor is deprecated.
 AmbientLightEventWarning=Use of the ambient light sensor is deprecated.
 # LOCALIZATION NOTE: Do not translate "storage", "indexedDB.open" and "navigator.storage.persist()".
 IDBOpenDBOptions_StorageTypeWarning=The ‘storage’ attribute in options passed to indexedDB.open is deprecated and will soon be removed. To get persistent storage, please use navigator.storage.persist() instead.
 UnsupportedEntryTypesIgnored=Ignoring unsupported entryTypes: %S.
 AllEntryTypesIgnored=No valid entryTypes; aborting registration.
-
 # LOCALIZATION NOTE: do not localize key=“%S” modifiers=“%S” id=“%S”
 GTK2Conflict2=Key event not available on GTK2: key=“%S” modifiers=“%S” id=“%S”
 WinConflict2=Key event not available on some keyboard layouts: key=“%S” modifiers=“%S” id=“%S”
 # LOCALIZATION NOTE: do not trnaslated "document.domain"
 DocumentSetDomainNotAllowedWarning=Setting document.domain in a cross-origin isolated environment is not allowed.
 
 #LOCALIZATION NOTE(DeprecatedTestingInterfaceWarning): Do not translate this message. It's just testing only.
 DeprecatedTestingInterfaceWarning=TestingDeprecatedInterface is a testing-only interface and this is its testing deprecation message.
@@ -393,24 +392,30 @@ MathML_DeprecatedMfencedElement=MathML e
 # LOCALIZATION NOTE: Do not translate MathML, subscriptshift and superscriptshift.
 MathML_DeprecatedScriptShiftAttributes=MathML attributes “subscriptshift” and “superscriptshift” are deprecated and may be removed at a future date.
 # LOCALIZATION NOTE: Do not translate MathML, background, color, fontfamily, fontsize, fontstyle and fontweight.
 MathML_DeprecatedStyleAttributeWarning=MathML attributes “background”, “color”, “fontfamily”, “fontsize”, “fontstyle” and “fontweight” are deprecated and will be removed at a future date.
 # LOCALIZATION NOTE: Do not translate MathML and XLink.
 MathML_DeprecatedXLinkAttributeWarning=XLink attributes “href”, “type”, “show” and “actuate” are deprecated on MathML elements and will be removed at a future date.
 # LOCALIZATION NOTE: Do not translate MathML and STIXGeneral. %S is a documentation URL.
 MathML_DeprecatedStixgeneralOperatorStretchingWarning=Support for rendering stretched MathML operators with STIXGeneral fonts is deprecated and may be removed at a future date. For details about newer fonts that will continue to be supported, see %S
+# LOCALIZATION NOTE: Do not translate MathML and scriptminsize.
+MathML_DeprecatedScriptminsizeAttributeWarning=MathML attribute “scriptminsize” is deprecated and will be removed at a future date.
+# LOCALIZATION NOTE: Do not translate MathML and scriptsizemultiplier.
+MathML_DeprecatedScriptsizemultiplierAttributeWarning=MathML attribute “scriptsizemultiplier” is deprecated and will be removed at a future date.
 WebShareAPI_Failed=The share operation has failed.
 WebShareAPI_Aborted=The share operation was aborted.
 # LOCALIZATION NOTE (UnknownProtocolNavigationPrevented): %1$S is the destination URL.
 UnknownProtocolNavigationPrevented=Prevented navigation to “%1$S” due to an unknown protocol.
 PostMessageSharedMemoryObjectToCrossOriginWarning=Cannot post message containing a shared memory object to a cross-origin window.
 # LOCALIZATION NOTE: %S is the URL of the resource in question
 UnusedLinkPreloadPending=The resource at “%S” preloaded with link preload was not used within a few seconds. Make sure all attributes of the preload tag are set correctly.
 
 # LOCALIZATION NOTE: Do not translate document.requestStorageAccess(), iframe, allow-same-origin and sandbox (though you may translate "sandboxed").
 RequestStorageAccessNullPrincipal=document.requestStorageAccess() may not be called on a document with an opaque origin, such as a sandboxed iframe without allow-same-origin in its sandbox attribute.
 # LOCALIZATION NOTE: Do not translate document.requestStorageAccess(), iframe, allow-storage-access-by-user-activation and sandbox (though you may translate "sandboxed").
 RequestStorageAccessSandboxed=document.requestStorageAccess() may not be called in a sandboxed iframe without allow-storage-access-by-user-activation in its sandbox attribute.
 # LOCALIZATION NOTE: Do not translate document.requestStorageAccess() and iframe.
 RequestStorageAccessNested=document.requestStorageAccess() may not be called in a nested iframe.
 # LOCALIZATION NOTE: Do not translate document.requestStorageAccess(). In some locales it may be preferable to not translate "event handler", either.
 RequestStorageAccessUserGesture=document.requestStorageAccess() may only be requested from inside a short running user-generated event handler.
+# LOCALIZATION NOTE: Do not translate "Location" and "History".
+LocChangeFloodingPrevented=Too many calls to Location or History APIs within a short timeframe.
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -18,17 +18,16 @@ CORSMissingAllowOrigin=Cross-Origin Requ
 CORSMultipleAllowOriginNotAllowed=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: Multiple CORS header ‘Access-Control-Allow-Origin’ not allowed).
 CORSAllowOriginNotMatchingOrigin=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header 'Access-Control-Allow-Origin' does not match '%2$S').
 CORSNotSupportingCredentials=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at ‘%1$S’. (Reason: Credential is not supported if the CORS header ‘Access-Control-Allow-Origin’ is ‘*’).
 CORSMethodNotFound=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: Did not find method in CORS header 'Access-Control-Allow-Methods').
 CORSMissingAllowCredentials=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: expected 'true' in CORS header 'Access-Control-Allow-Credentials').
 CORSPreflightDidNotSucceed2=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS preflight response did not succeed).
 CORSInvalidAllowMethod=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: invalid token '%2$S' in CORS header 'Access-Control-Allow-Methods').
 CORSInvalidAllowHeader=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: invalid token '%2$S' in CORS header 'Access-Control-Allow-Headers').
-
 CORSMissingAllowHeaderFromPreflight2=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: header ‘%2$S’ is not allowed according to header ‘Access-Control-Allow-Headers’ from CORS preflight response).
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security", "HSTS", "max-age" or "includeSubDomains"
 STSUnknownError=Strict-Transport-Security: An unknown error occurred processing the header specified by the site.
 STSUntrustworthyConnection=Strict-Transport-Security: The connection to the site is untrustworthy, so the specified header was ignored.
 STSCouldNotParseHeader=Strict-Transport-Security: The site specified a header that could not be parsed successfully.
 STSNoMaxAge=Strict-Transport-Security: The site specified a header that did not include a 'max-age' directive.
 STSMultipleMaxAges=Strict-Transport-Security: The site specified a header that included multiple 'max-age' directives.
@@ -76,17 +75,16 @@ WeakCipherSuiteWarning=This site uses th
 
 DeprecatedTLSVersion2=This site uses a deprecated version of TLS. Please upgrade to TLS 1.2 or 1.3.
 
 #XCTO: nosniff
 # LOCALIZATION NOTE: Do not translate "X-Content-Type-Options: nosniff".
 MimeTypeMismatch2=The resource from “%1$S” was blocked due to MIME type (“%2$S”) mismatch (X-Content-Type-Options: nosniff).
 # LOCALIZATION NOTE: Do not translate "X-Content-Type-Options" and also do not translate "nosniff".
 XCTOHeaderValueMissing=X-Content-Type-Options header warning: value was “%1$S”; did you mean to send “nosniff”?
-
 # LOCALIZATION NOTE: Do not translate "X-Content-Type-Options" and also do not translate "nosniff".
 XTCOWithMIMEValueMissing=The resource from “%1$S” was not rendered due to an unknown, incorrect or missing MIME type (X-Content-Type-Options: nosniff).
 
 BlockScriptWithWrongMimeType2=Script from “%1$S” was blocked because of a disallowed MIME type (“%2$S”).
 WarnScriptWithWrongMimeType=The script from “%1$S” was loaded even though its MIME type (“%2$S”) is not a valid JavaScript MIME type.
 # LOCALIZATION NOTE: Do not translate "importScripts()"
 BlockImportScriptsWithWrongMimeType=Loading script from “%1$S” with importScripts() was blocked because of a disallowed MIME type (“%2$S”).
 BlockWorkerWithWrongMimeType=Loading Worker from “%1$S” was blocked because of a disallowed MIME type (“%2$S”).
@@ -139,8 +137,14 @@ XFrameOptionsDeny=The loading of “%2$S” in a frame is denied by “X-Frame-Options“ directive set to “%1$S“.
 HTTPSOnlyUpgradeRequest = Upgrading insecure request “%1$S” to use “%2$S”.
 # LOCALIZATION NOTE: %1$S is the URL of request.
 HTTPSOnlyNoUpgradeException = Not upgrading insecure request “%1$S” because it is exempt.
 # LOCALIZATION NOTE: %1$S is the URL of the failed request; %2$S is an error-code.
 HTTPSOnlyFailedRequest = Upgrading insecure request “%1$S” failed. (%2$S)
 
 # LOCALIZATION NOTE: %S is the URL of the blocked request;
 IframeSandboxBlockedDownload = Download of “%S” was blocked because the triggering iframe has the sandbox flag set.
+
+# Sanitizer API
+# LOCALIZATION NOTE: Please do not localize "DocumentFragment". It's the name of an API.
+SanitizerRcvdNoInput = Received empty or no input. Returning an empty DocumentFragment.
+# LOCALIZATION NOTE: "Sanitizer" is the name of the API. Please do not localize.
+SanitizerOptionsDiscarded = Options for the Sanitizer constructor are not yet supported. Please note this is experimental behaviour.
new file mode 100644
--- /dev/null
+++ b/dom/dom/media.ftl
@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+mediastatus-fallback-title = { -brand-short-name } is playing media
--- a/security/manager/security/certificates/certManager.ftl
+++ b/security/manager/security/certificates/certManager.ftl
@@ -1,191 +1,136 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 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-servers = You have certificates on file that identify these servers
+certmgr-server = These entries identify server certificate error exceptions
 certmgr-ca = You have certificates on file that identify these certificate authorities
-
 certmgr-detail-general-tab-title =
     .label = General
     .accesskey = G
-
 certmgr-detail-pretty-print-tab-title =
     .label = Details
     .accesskey = D
-
 certmgr-pending-label =
     .value = Currently verifying certificate…
-
 certmgr-subject-label = Issued To
-
 certmgr-issuer-label = Issued By
-
 certmgr-period-of-validity = Period of Validity
-
 certmgr-fingerprints = Fingerprints
-
 certmgr-cert-detail =
     .title = Certificate Detail
     .buttonlabelaccept = Close
     .buttonaccesskeyaccept = C
-
 certmgr-cert-detail-commonname = Common Name (CN)
-
 certmgr-cert-detail-org = Organisation (O)
-
 certmgr-cert-detail-orgunit = Organisational Unit (OU)
-
 certmgr-cert-detail-serial-number = Serial Number
-
 certmgr-cert-detail-sha-256-fingerprint = SHA-256 Fingerprint
-
 certmgr-cert-detail-sha-1-fingerprint = SHA1 Fingerprint
-
 certmgr-edit-ca-cert =
     .title = Edit CA certificate trust settings
     .style = 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-cert =
     .title = Delete Certificate
     .style = width: 48em; height: 24em;
-
 certmgr-cert-host =
     .label = Host
-
 certmgr-cert-name =
     .label = Certificate Name
-
 certmgr-cert-server =
     .label = Server
-
 certmgr-override-lifetime =
     .label = Lifetime
-
 certmgr-token-name =
     .label = Security Device
-
 certmgr-begins-on = Begins On
-
 certmgr-begins-label =
     .label = Begins On
-
 certmgr-expires-on = Expires On
-
 certmgr-expires-label =
     .label = Expires On
-
 certmgr-email =
     .label = Email Address
-
 certmgr-serial =
     .label = Serial Number
-
 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-details =
     .value = Certificate Fields
     .accesskey = F
-
 certmgr-fields =
     .value = Field Value
     .accesskey = V
-
 certmgr-hierarchy =
     .value = Certificate Hierarchy
     .accesskey = H
-
 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.
 pkcs12-unknown-err-backup = Failed to create the PKCS #12 backup file for unknown reasons.
 pkcs12-unknown-err = The PKCS #12 operation failed for unknown reasons.
 pkcs12-info-no-smartcard-backup = It is not possible to back up certificates from a hardware security device such as a smart card.
 pkcs12-dup-data = The certificate and private key already exist on the security device.
 
@@ -208,84 +153,80 @@ import-email-cert-prompt = Select File c
 edit-trust-ca = The certificate "{ $certName }" represents a Certificate Authority.
 
 ## For Deleting Certificates
 
 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-cert-title =
     .title = Delete Server Certificate Exceptions
 delete-ssl-cert-confirm = Are you sure you want to delete these server exceptions?
 delete-ssl-cert-impact = If you delete a server exception, you restore the usual security checks for that server and require it uses a valid certificate.
-
+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-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.
-
 # 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 }
 
 ## Cert Viewer
 
 # Title used for the Certificate Viewer.
 #
 # Variables:
 #   $certificate : a string representative of the certificate being viewed.
 cert-viewer-title =
     .title = Certificate Viewer: “{ $certName }”
-
 not-present =
     .value = <Not Part Of Certificate>
-
 # Cert verification
 cert-verified = This certificate has been verified for the following uses:
-
 # Add usage
 verify-ssl-client =
     .value = SSL Client Certificate
-
 verify-ssl-server =
     .value = SSL Server Certificate
-
 verify-ssl-ca =
     .value = SSL Certificate Authority
-
 verify-email-signer =
     .value = Email Signer Certificate
-
 verify-email-recip =
     .value = Email Recipient Certificate
-
 # Cert verification
 cert-not-verified-cert-revoked = Could not verify this certificate because it has been revoked.
 cert-not-verified-cert-expired = Could not verify this certificate because it has expired.
 cert-not-verified-cert-not-trusted = Could not verify this certificate because it is not trusted.
 cert-not-verified-issuer-not-trusted = Could not verify this certificate because the issuer is not trusted.
 cert-not-verified-issuer-unknown = Could not verify this certificate because the issuer is unknown.
 cert-not-verified-ca-invalid = Could not verify this certificate because the CA certificate is invalid.
 cert-not-verified_algorithm-disabled = Could not verify this certificate because it was signed using a signature algorithm that was disabled because that algorithm is not secure.
 cert-not-verified-unknown = Could not verify this certificate for unknown reasons.
-
 # 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)
+
+## Used to show whether an override is temporary or permanent
+
+permanent-override = Permanent
+temporary-override = Temporary
 
 ## Add Security Exception dialog
 
 add-exception-branded-warning = You are about to override how { -brand-short-name } identifies this site.
 add-exception-invalid-header = This site attempts to identify itself with invalid information.
 add-exception-domain-mismatch-short = Wrong Site
 add-exception-domain-mismatch-long = The certificate belongs to a different site, which could mean that someone is trying to impersonate this site.
 add-exception-expired-short = Outdated Information
--- a/toolkit/chrome/global/aboutWebrtc.properties
+++ b/toolkit/chrome/global/aboutWebrtc.properties
@@ -159,18 +159,33 @@ estimated_framerate = Estimated Framerat
 rotation_degrees = Rotation (degrees)
 first_frame_timestamp = First Frame Reception Timestamp
 last_frame_timestamp = Last Frame Reception Timestamp
 # SSRCs are identifiers that represent endpoints in an RTP stream
 # This is an SSRC on the local side of the connection that is receiving RTP
 local_receive_ssrc = Local Receiving SSRC
 # This is an SSRC on the remote side of the connection that is sending RTP
 remote_send_ssrc = Remote Sending SSRC
-
 # An option whose value will not be displayed but instead noted as having been
 # provided
 configuration_element_provided = Provided
 # An option whose value will not be displayed but instead noted as having not
 # been provided
 configuration_element_not_provided = Not Provided
 # The options set by the user in about:config that could impact a WebRTC call
 custom_webrtc_configuration_heading = User Set WebRTC Preferences
 
+# Section header for estimated bandwidths of WebRTC media flows
+bandwidth_stats_heading = Estimated Bandwidth
+# The ID of the MediaStreamTrack
+track_identifier = Track Identifier
+# The estimated bandwidth available for sending WebRTC media in bytes per second
+send_bandwidth_bytes_sec = Send Bandwidth (bytes/sec)
+# The estimated bandwidth available for receiving WebRTC media in bytes per second
+receive_bandwidth_bytes_sec = Receive Bandwidth (bytes/sec)
+# Maximum number of bytes per second that will be padding zeros at the ends of packets
+max_padding_bytes_sec = Maximum Padding (bytes/sec)
+# The amount of time inserted between packets to keep them spaced out
+pacer_delay_ms = Pacer Delay ms
+# The amount of time it takes for a packet to travel from the local machine to the remote machine,
+# and then have a packet return
+round_trip_time_ms = RTT ms
+
--- a/toolkit/toolkit/about/aboutAddons.ftl
+++ b/toolkit/toolkit/about/aboutAddons.ftl
@@ -1,209 +1,160 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 addons-window =
     .title = Add-ons Manager
 addons-page-title = Add-ons Manager
-
 search-header =
     .placeholder = Search addons.mozilla.org
     .searchbuttonlabel = Search
-
 search-header-shortcut =
     .key = f
-
 list-empty-installed =
     .value = You don't have any add-ons of this type installed
-
 list-empty-available-updates =
     .value = No updates found
-
 list-empty-recent-updates =
     .value = You haven't recently updated any add-ons
-
 list-empty-find-updates =
     .label = Check For Updates
-
 list-empty-button =
     .label = Learn more about add-ons
-
 help-button = Add-ons Support
 sidebar-help-button-title =
     .title = Add-ons Support
-
 preferences =
     { PLATFORM() ->
         [windows] { -brand-short-name } Options
        *[other] { -brand-short-name } Preferences
     }
 sidebar-preferences-button-title =
     .title =
         { PLATFORM() ->
             [windows] { -brand-short-name } Options
            *[other] { -brand-short-name } Preferences
         }
-
 show-unsigned-extensions-button =
     .label = Some extensions could not be verified
-
 show-all-extensions-button =
     .label = Show all extensions
-
 cmd-show-details =
     .label = Show More Information
     .accesskey = S
-
 cmd-find-updates =
     .label = Find Updates
     .accesskey = F
-
 cmd-preferences =
     .label =
         { PLATFORM() ->
             [windows] Options
            *[other] Preferences
         }
     .accesskey =
         { PLATFORM() ->
             [windows] O
            *[other] P
         }
-
 cmd-enable-theme =
     .label = Wear Theme
     .accesskey = W
-
 cmd-disable-theme =
     .label = Stop Wearing Theme
     .accesskey = W
-
 cmd-install-addon =
     .label = Install
     .accesskey = I
-
 cmd-contribute =
     .label = Contribute
     .accesskey = C
     .tooltiptext = Contribute to the development of this add-on
-
 detail-version =
     .label = Version
-
 detail-last-updated =
     .label = Last Updated
-
 detail-contributions-description = The developer of this add-on asks that you help support its continued development by making a small contribution.
-
 detail-contributions-button = Contribute
     .title = Contribute to the development of this add-on
     .accesskey = C
-
 detail-update-type =
     .value = Automatic Updates
-
 detail-update-default =
     .label = Default
     .tooltiptext = Automatically install updates only if that's the default
-
 detail-update-automatic =
     .label = On
     .tooltiptext = Automatically install updates
-
 detail-update-manual =
     .label = Off
     .tooltiptext = Don't automatically install updates
-
 # Used as a description for the option to allow or block an add-on in private windows.
 detail-private-browsing-label = Run in Private Windows
-
 # Some add-ons may elect to not run in private windows by setting incognito: not_allowed in the manifest.  This
 # cannot be overridden by the user.
 detail-private-disallowed-label = Not Allowed in Private Windows
 detail-private-disallowed-description2 = This extension does not run while private browsing. <a data-l10n-name="learn-more">Learn more</a>
-
 # Some special add-ons are privileged, run in private windows automatically, and this permission can't be revoked
 detail-private-required-label = Requires Access to Private Windows
 detail-private-required-description2 = This extension has access to your online activities while private browsing. <a data-l10n-name="learn-more">Learn more</a>
-
 detail-private-browsing-on =
     .label = Allow
     .tooltiptext = Enable in Private Browsing
-
 detail-private-browsing-off =
     .label = Don’t Allow
     .tooltiptext = Disable in Private Browsing
-
 detail-home =
     .label = Homepage
-
 detail-home-value =
     .value = { detail-home.label }
-
 detail-repository =
     .label = Add-on Profile
-
 detail-repository-value =
     .value = { detail-repository.label }
-
 detail-check-for-updates =
     .label = Check for Updates
     .accesskey = f
     .tooltiptext = Check for updates for this add-on
-
 detail-show-preferences =
     .label =
         { PLATFORM() ->
             [windows] Options
            *[other] Preferences
         }
     .accesskey =
         { PLATFORM() ->
             [windows] O
            *[other] P
         }
     .tooltiptext =
         { PLATFORM() ->
             [windows] Change this add-on's options
            *[other] Change this add-on's preferences
         }
-
 detail-rating =
     .value = Rating
-
 addon-restart-now =
     .label = Restart now
-
 disabled-unsigned-heading =
     .value = Some add-ons have been disabled
-
 disabled-unsigned-description = The following add-ons have not been verified for use in { -brand-short-name }. You can <label data-l10n-name="find-addons">find replacements</label> or ask the developer to get them verified.
-
 disabled-unsigned-learn-more = Learn more about our efforts to help keep you safe online.
-
 disabled-unsigned-devinfo = Developers interested in getting their add-ons verified can continue by reading our <label data-l10n-name="learn-more">manual</label>.
-
 plugin-deprecation-description = Missing something? Some plugins are no longer supported by { -brand-short-name }. <label data-l10n-name="learn-more">Learn More.</label>
-
 legacy-warning-show-legacy = Show legacy extensions
-
 legacy-extensions =
     .value = Legacy Extensions
-
 legacy-extensions-description = These extensions do not meet current { -brand-short-name } standards so they have been deactivated. <label data-l10n-name="legacy-learn-more">Learn about the changes to add-ons</label>
-
 private-browsing-description2 =
     { -brand-short-name } is changing how extensions work in private browsing. Any new extensions you add to
     { -brand-short-name } won’t run by default in Private Windows. Unless you allow it in settings, the
     extension won’t work while private browsing, and won’t have access to your online activities
     there. We’ve made this change to keep your private browsing private.
     <label data-l10n-name="private-browsing-learn-more">Learn how to manage extension settings</label>
-
 addon-category-discover = Recommendations
 addon-category-discover-title =
     .title = Recommendations
 addon-category-extension = Extensions
 addon-category-extension-title =
     .title = Extensions
 addon-category-theme = Themes
 addon-category-theme-title =
@@ -229,17 +180,16 @@ addon-category-recent-updates-title =
 extensions-warning-safe-mode = All add-ons have been disabled by safe mode.
 extensions-warning-check-compatibility = Add-on compatibility checking is disabled. You may have incompatible add-ons.
 extensions-warning-check-compatibility-button = Enable
     .title = Enable add-on compatibility checking
 extensions-warning-update-security = Add-on update security checking is disabled. You may be compromised by updates.
 extensions-warning-update-security-button = Enable
     .title = Enable add-on update security checking
 
-
 ## Strings connected to add-on updates
 
 addon-updates-check-for-updates = Check for Updates
     .accesskey = C
 addon-updates-view-updates = View Recent Updates
     .accesskey = V
 
 # This menu item is a checkbox that toggles the default global behavior for
@@ -275,90 +225,77 @@ addon-install-from-file-filter-name = Ad
 addon-open-about-debugging = Debug Add-ons
     .accesskey = b
 
 ## Extension shortcut management
 
 # This is displayed in the page options menu
 addon-manage-extensions-shortcuts = Manage Extension Shortcuts
     .accesskey = S
-
 shortcuts-no-addons = You don’t have any extensions enabled.
 shortcuts-no-commands = The following extensions do not have shortcuts:
 shortcuts-input =
     .placeholder = Type a shortcut
-
 shortcuts-browserAction2 = Activate toolbar button
 shortcuts-pageAction = Activate page action
 shortcuts-sidebarAction = Toggle the sidebar
-
 shortcuts-modifier-mac = Include Ctrl, Alt, or ⌘
 shortcuts-modifier-other = Include Ctrl or Alt
 shortcuts-invalid = Invalid combination
 shortcuts-letter = Type a letter
 shortcuts-system = Can’t override a { -brand-short-name } shortcut
-
 # String displayed in warning label when there is a duplicate shortcut
 shortcuts-duplicate = Duplicate shortcut
-
 # String displayed when a keyboard shortcut is already assigned to more than one add-on
 # Variables:
 #   $shortcut (string) - Shortcut string for the add-on
 shortcuts-duplicate-warning-message = { $shortcut } is being used as a shortcut in more than one case. Duplicate shortcuts may cause unexpected behaviour.
-
 # String displayed when a keyboard shortcut is already used by another add-on
 # Variables:
 #   $addon (string) - Name of the add-on
 shortcuts-exists = Already in use by { $addon }
-
 shortcuts-card-expand-button =
     { $numberToShow ->
        *[other] Show { $numberToShow } More
     }
-
 shortcuts-card-collapse-button = Show Less
-
 header-back-button =
     .title = Go back
 
 ## Recommended add-ons page
 
 # Explanatory introduction to the list of recommended add-ons. The action word
 # ("recommends") in the final sentence is a link to external documentation.
 discopane-intro =
     Extensions and themes are like apps for your browser, and they let you
     protect passwords, download videos, find deals, block annoying ads, change
     how your browser looks, and much more. These small software programmes are
     often developed by a third party. Here’s a selection { -brand-product-name }
     <a data-l10n-name="learn-more-trigger">recommends</a> for exceptional
     security, performance, and functionality.
-
 # Notice to make user aware that the recommendations are personalized.
 discopane-notice-recommendations =
     Some of these recommendations are personalised. They are based on other
     extensions you’ve installed, profile preferences, and usage statistics.
 discopane-notice-learn-more = Learn more
-
 privacy-policy = Privacy Policy
-
 # Refers to the author of an add-on, shown below the name of the add-on.
 # Variables:
 #   $author (string) - The name of the add-on developer.
 created-by-author = by <a data-l10n-name="author">{ $author }</a>
 # Shows the number of daily users of the add-on.
 # Variables:
 #   $dailyUsers (number) - The number of daily users.
 user-count = Users: { $dailyUsers }
 install-extension-button = Add to { -brand-product-name }
 install-theme-button = Install Theme
 # The label of the button that appears after installing an add-on. Upon click,
 # the detailed add-on view is opened, from where the add-on can be managed.
 manage-addon-button = Manage
 find-more-addons = Find more add-ons
-
 # This is a label for the button to open the "more options" menu, it is only
 # used for screen readers.
 addon-options-button =
     .aria-label = More Options
 
 ## Add-on actions
 
 report-addon-button = Report
@@ -374,119 +311,109 @@ extension-enable-addon-button-label =
 preferences-addon-button =
     { PLATFORM() ->
         [windows] Options
        *[other] Preferences
     }
 details-addon-button = Details
 release-notes-addon-button = Release Notes
 permissions-addon-button = Permissions
-
 extension-enabled-heading = Enabled
 extension-disabled-heading = Disabled
-
 theme-enabled-heading = Enabled
 theme-disabled-heading = Disabled
-
 plugin-enabled-heading = Enabled
 plugin-disabled-heading = Disabled
-
 dictionary-enabled-heading = Enabled
 dictionary-disabled-heading = Disabled
-
 locale-enabled-heading = Enabled
 locale-disabled-heading = Disabled
-
 ask-to-activate-button = Ask to Activate
 always-activate-button = Always Activate
 never-activate-button = Never Activate
-
 addon-detail-author-label = Author
 addon-detail-version-label = Version
 addon-detail-last-updated-label = Last Updated
 addon-detail-homepage-label = Homepage
 addon-detail-rating-label = Rating
-
 # Message for add-ons with a staged pending update.
 install-postponed-message = This extension will be updated when { -brand-short-name } restarts.
 install-postponed-button = Update Now
-
 # The average rating that the add-on has received.
 # Variables:
 #   $rating (number) - A number between 0 and 5. The translation should show at most one digit after the comma.
 five-star-rating =
     .title = Rated { NUMBER($rating, maximumFractionDigits: 1) } out of 5
-
 # This string is used to show that an add-on is disabled.
 # Variables:
 #   $name (string) - The name of the add-on
 addon-name-disabled = { $name } (disabled)
-
 # The number of reviews that an add-on has received on AMO.
 # Variables:
 #   $numberOfReviews (number) - The number of reviews received
 addon-detail-reviews-link =
     { $numberOfReviews ->
         [one] { $numberOfReviews } review
        *[other] { $numberOfReviews } reviews
     }
 
 ## Pending uninstall message bar
 
 # Variables:
 #   $addon (string) - Name of the add-on
 pending-uninstall-description = <span data-l10n-name="addon-name">{ $addon }</span> has been removed.
 pending-uninstall-undo-button = Undo
-
 addon-detail-updates-label = Allow automatic updates
 addon-detail-updates-radio-default = Default
 addon-detail-updates-radio-on = On
 addon-detail-updates-radio-off = Off
 addon-detail-update-check-label = Check for Updates
 install-update-button = Update
-
 # This is the tooltip text for the private browsing badge in about:addons. The
 # badge is the private browsing icon included next to the extension's name.
 addon-badge-private-browsing-allowed2 =
     .title = Allowed in private windows
     .aria-label = { addon-badge-private-browsing-allowed2.title }
 addon-detail-private-browsing-help = When allowed, the extension will have access to your online activities while private browsing. <a data-l10n-name="learn-more">Learn more</a>
 addon-detail-private-browsing-allow = Allow
 addon-detail-private-browsing-disallow = Don’t Allow
 
-# This is the tooltip text for the recommended badge for an extension in about:addons. The
-# badge is a small icon displayed next to an extension when it is recommended on AMO.
+## This is the tooltip text for the recommended badges for an extension in about:addons. The
+## badge is a small icon displayed next to an extension when it is recommended on AMO.
+
 addon-badge-recommended2 =
     .title = { -brand-product-name } only recommends extensions that meet our standards for security and performance
     .aria-label = { addon-badge-recommended2.title }
+addon-badge-line =
+    .title = This extension was created by the makers of { -brand-product-name }
+    .aria-label = { addon-badge-line.title }
+addon-badge-verified =
+    .title = This extension has been code-reviewed for safety
+    .aria-label = { addon-badge-verified.title }
+
+##
 
 available-updates-heading = Available Updates
 recent-updates-heading = Recent Updates
-
 release-notes-loading = Loading…
 release-notes-error = Sorry, but there was an error loading the release notes.
-
 addon-permissions-empty = This extension doesn't require any permissions
-
 recommended-extensions-heading = Recommended Extensions
 recommended-themes-heading = Recommended Themes
-
 # A recommendation for the Firefox Color theme shown at the bottom of the theme
 # list view. The "Firefox Color" name itself should not be translated.
 recommended-theme-1 = Feeling creative? <a data-l10n-name="link">Build your own theme with Firefox Colour.</a>
 
 ## Page headings
 
 extension-heading = Manage Your Extensions
 theme-heading = Manage Your Themes
 plugin-heading = Manage Your Plugins
 dictionary-heading = Manage Your Dictionaries
 locale-heading = Manage Your Languages
 updates-heading = Manage Your Updates
 discover-heading = Personalise Your { -brand-short-name }
 shortcuts-heading = Manage Extension Shortcuts
-
 default-heading-search-label = Find more add-ons
 addons-heading-search-input =
     .placeholder = Search addons.mozilla.org
-
 addon-page-options-button =
     .title = Tools for all add-ons
--- a/toolkit/toolkit/about/aboutNetworking.ftl
+++ b/toolkit/toolkit/about/aboutNetworking.ftl
@@ -2,16 +2,17 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 about-networking-title = About Networking
 about-networking-http = HTTP
 about-networking-sockets = Sockets
 about-networking-dns = DNS
 about-networking-dns-clear-cache-button = Clear DNS Cache
+about-networking-dns-trr-url = DoH URL
 about-networking-dns-suffix = DNS suffix
 about-networking-websockets = WebSockets
 about-networking-refresh = Refresh
 about-networking-auto-refresh = Autorefresh every 3 seconds
 about-networking-hostname = Hostname
 about-networking-port = Port
 about-networking-http-version = HTTP Version
 about-networking-ssl = SSL
--- a/toolkit/toolkit/featuregates/features.ftl
+++ b/toolkit/toolkit/featuregates/features.ftl
@@ -2,110 +2,104 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-css-masonry2 =
     .label = CSS: Masonry Layout
 experimental-features-css-masonry-description = Enables support for the experimental CSS Masonry Layout feature. See the <a data-l10n-name="explainer">explainer</a> for a high level description of the feature. To provide feedback, please comment in <a data-l10n-name="w3c-issue">this GitHub issue</a> or <a data-l10n-name="bug">this bug</a>.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-web-gpu2 =
     .label = Web API: WebGPU
 experimental-features-web-gpu-description2 = This new API provides low-level support for performing computation and graphics rendering using the <a data-l10n-name="wikipedia">Graphics Processing Unit (GPU)</a> of the user’s device or computer. The <a data-l10n-name="spec">specification</a> is still a work-in-progress. See <a data-l10n-name="bugzilla">bug 1602129</a> for more details.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-media-avif =
     .label = Media: AVIF
 experimental-features-media-avif-description = With this feature enabled, { -brand-short-name } supports the AV1 Image File (AVIF) format. This is a still image file format that leverages the capabilities of the AV1 video compression algorithms to reduce image size. See <a data-l10n-name="bugzilla">bug 1443863</a> for more details.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-web-api-inputmode =
     .label = Web API: inputmode
 # "inputmode" and "contenteditable" are technical terms and shouldn't be translated.
 experimental-features-web-api-inputmode-description = Our implementation of the <a data-l10n-name="mdn-inputmode">inputmode</a> global attribute has been updated as per <a data-l10n-name="whatwg">the WHATWG specification</a>, but we still need to make other changes too, like making it available on contenteditable content. See <a data-l10n-name="bugzilla">bug 1205133</a> for more details.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-web-api-link-preload =
     .label = Web API: <link rel="preload">
 # Do not translate "rel", "preload" or "link" here, as they are all HTML spec
 # values that do not get translated.
 experimental-features-web-api-link-preload-description = The <a data-l10n-name="rel">rel</a> attribute with value <code>"preload"</code> on a <a data-l10n-name="link">&lt;link&gt;</a> element is intended to help provide performance gains by letting you download resources earlier in the page lifecycle, ensuring that they’re available earlier and are less likely to block page rendering. Read <a data-l10n-name="readmore">“Preloading content with <code>rel="preload"</code>”</a> or see <a data-l10n-name="bugzilla">bug 1583604</a> for more details.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-css-focus-visible =
     .label = CSS: Pseudo-class: :focus-visible
 experimental-features-css-focus-visible-description = Allows focus styles to be applied to elements like buttons and form controls, only when they are focused using the keyboard (e.g. when tabbing between elements), and not when they are focused using a mouse or other pointing device. See <a data-l10n-name="bugzilla">bug 1617600</a> for more details.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-web-api-beforeinput =
     .label = Web API: beforeinput Event
 # The terms "beforeinput", "input", "textarea", and "contenteditable" are technical terms
 # and shouldn't be translated.
 experimental-features-web-api-beforeinput-description = The global <a data-l10n-name="mdn-beforeinput">beforeinput</a> event is fired on an <a data-l10n-name="mdn-input">&lt;input&gt;</a> and <a data-l10n-name="mdn-textarea">&lt;textarea&gt;</a> elements, or any element whose <a data-l10n-name="mdn-contenteditable">contenteditable</a> attribute is enabled, immediately before the element’s value changes. The event allows web apps to override the browser’s default behaviour for user interaction, e.g., web apps can cancel user input only for specific characters or can modify pasting styled text only with approved styles.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-css-constructable-stylesheets =
     .label = CSS: Constructable Stylesheets
 experimental-features-css-constructable-stylesheets-description = The addition of a constructor to the <a data-l10n-name="mdn-cssstylesheet">CSSStyleSheet</a> interface as well as a variety of related changes makes it possible to directly create new stylesheets without having to add the sheet to the HTML. This makes it much easier to create reusable stylesheets for use with <a data-l10n-name="mdn-shadowdom">Shadow DOM</a>. See <a data-l10n-name="bugzilla">bug 1520690</a> for more details.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-media-session-api =
     .label = Web API: Media Session API
 experimental-features-media-session-api-description = The entire { -brand-short-name } implementation of the Media Session API is currently experimental. This API is used to customise the handling of media-related notifications, to manage events and data useful for presenting a user interface for managing media playback, and to obtain media file metadata. See <a data-l10n-name="bugzilla">bug 1112032</a> for more details.
-
 experimental-features-devtools-color-scheme-simulation =
     .label = Developer Tools: Colour Scheme Simulation
 experimental-features-devtools-color-scheme-simulation-description = Adds an option to simulate different colour schemes allowing you to test <a data-l10n-name="mdn-preferscolorscheme">@prefers-color-scheme</a> media queries. Using this media query lets your stylesheet respond to whether the user prefers a light or dark user interface. This feature lets you test your code without having to change settings in your browser (or operating system, if the browser follows a system-wide colour scheme setting). See <a data-l10n-name="bugzilla1">bug 1550804</a> and <a data-l10n-name="bugzilla2">bug 1137699</a> for more details.
-
 experimental-features-devtools-execution-context-selector =
     .label = Developer Tools: Execution Context Selector
 experimental-features-devtools-execution-context-selector-description = This feature displays a button on the console’s command line that lets you change the context in which the expression you enter will be executed. See <a data-l10n-name="bugzilla1">bug 1605154</a> and <a data-l10n-name="bugzilla2">bug 1605153</a> for more details.
-
 experimental-features-devtools-compatibility-panel =
     .label = Developer Tools: Compatibility Panel
 experimental-features-devtools-compatibility-panel-description = A side panel for the Page Inspector that shows you information detailing your app’s cross-browser compatibility status. See <a data-l10n-name="bugzilla">bug 1584464</a> for more details.
-
 # Do not translate 'SameSite', 'Lax' and 'None'.
 experimental-features-cookie-samesite-lax-by-default2 =
     .label = Cookies: SameSite=Lax by default
 experimental-features-cookie-samesite-lax-by-default2-description = Treat cookies as “SameSite=Lax” by default if no “SameSite” attribute is specified. Developers must opt-in to the current status quo of unrestricted use by explicitly asserting “SameSite=None”.
-
 # Do not translate 'SameSite', 'Lax' and 'None'.
 experimental-features-cookie-samesite-none-requires-secure2 =
     .label = Cookies: SameSite=None requires secure attribute
 experimental-features-cookie-samesite-none-requires-secure2-description = Cookies with “SameSite=None” attribute require the secure attribute. This feature requires “Cookies: SameSite=Lax by default”.
-
 # about:home should be kept in English, as it refers to the the URI for
 # the internal default home page.
 experimental-features-abouthome-startup-cache =
     .label = about:home startup cache
 experimental-features-abouthome-startup-cache-description = A cache for the initial about:home document that is loaded by default at startup. The purpose of the cache is to improve startup performance.
-
 experimental-features-print-preview-tab-modal =
     .label = Print Preview Redesign
 experimental-features-print-preview-tab-modal-description = Introduces the redesigned print preview and makes print preview available on macOS. This potentially introduces breakage and does not include all print-related settings. To access all print-related settings, select “Print using the system dialog…” from within the Print panel.
-
 # The title of the experiment should be kept in English as it may be referenced
 # by various online articles and is technical in nature.
 experimental-features-cookie-samesite-schemeful =
     .label = Cookies: Schemeful SameSite
 experimental-features-cookie-samesite-schemeful-description = Treat cookies from the same domain, but with different schemes (e.g. http://example.com and https://example.com) as cross-site instead of same-site. Improves security, but potentially introduces breakage.
-
 # "Service Worker" is an API name and is usually not translated.
 experimental-features-devtools-serviceworker-debugger-support =
     .label = Developer Tools: Service Worker debugging
 # "Service Worker" is an API name and is usually not translated.
 experimental-features-devtools-serviceworker-debugger-support-description = Enables experimental support for Service Workers in the Debugger panel. This feature may slow the Developer Tools down and increase memory consumption.
-
 # Desktop zooming experiment
 experimental-features-graphics-desktop-zooming =
     .label = Graphics: Smooth Pinch Zoom
 experimental-features-graphics-desktop-zooming-description = Enable support for smooth pinch zooming on touchscreens and precision touch pads.
+# WebRTC global mute toggle controls
+experimental-features-webrtc-global-mute-toggles =
+    .label = WebRTC Global Mute Toggles
+experimental-features-webrtc-global-mute-toggles-description = Add controls to the WebRTC global sharing indicator that allow users to globally mute their microphone and camera feeds.
+# JS JIT Warp project
+experimental-features-js-warp =
+    .label = JavaScript JIT: Warp
+experimental-features-js-warp-description = Enable Warp, a project to improve JavaScript performance and memory usage.
+# Fission is the name of the feature and should not be translated.
+experimental-features-fission =
+    .label = Fission (Site Isolation)
+experimental-features-fission-description = Fission (site isolation) is an experimental feature in { -brand-short-name } to provide an additional layer of defense against security bugs. By isolating each site into a separate process, Fission makes it harder for malicious web sites to get access to information from other pages you are visiting. This is a major architectural change in { -brand-short-name } and we appreciate you testing and reporting any issues you might encounter. For more details, see <a data-l10n-name="wiki">the wiki</a>.
--- a/toolkit/toolkit/payments/payments.ftl
+++ b/toolkit/toolkit/payments/payments.ftl
@@ -1,13 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 # This value isn't used directly, but is defined to avoid duplication
 # in the "credit-card-label-*" strings.
 #
 # Variables:
 #   $month (String): Numeric month the credit card expires
 #   $year (String): Four-digit year the credit card expires
 credit-card-expiration = Expires on { $month }/{ $year }
 
@@ -16,28 +15,55 @@ credit-card-expiration = Expires on { $m
 ## include a cardholder name, an expiration date, or both, so we have
 ## four variations.
 
 # Label for a credit card with a number only
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 credit-card-label-number = { $number }
-
 # Label for a credit card with a number and name
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 #   $name (String): Cardholder name
 credit-card-label-number-name = { $number }, { $name }
-
 # Label for a credit card with a number and expiration date
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 credit-card-label-number-expiration = { $number }, { credit-card-expiration }
-
 # Label for a credit card with a number, name, and expiration date
 #
 # Variables:
 #   $number (String): Partially-redacted credit card number
 #   $name (String): Cardholder name
 credit-card-label-number-name-expiration = { $number }, { $name }, { credit-card-expiration }
+# Label for a credit card with a number only
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $type (String): Credit card type
+credit-card-label-number-2 = { $number }
+    .aria-label = { $type } { credit-card-label-number-2 }
+# Label for a credit card with a number and name
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $name (String): Cardholder name
+#   $type (String): Credit card type
+credit-card-label-number-name-2 = { $number }, { $name }
+    .aria-label = { $type } { credit-card-label-number-name-2 }
+# Label for a credit card with a number and expiration date
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $type (String): Credit card type
+credit-card-label-number-expiration-2 = { $number }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-expiration-2 }
+# Label for a credit card with a number, name, and expiration date
+#
+# Variables:
+#   $number (String): Partially-redacted credit card number
+#   $name (String): Cardholder name
+#   $type (String): Credit card type
+credit-card-label-number-name-expiration-2 = { $number }, { $name }, { credit-card-expiration }
+    .aria-label = { $type } { credit-card-label-number-name-expiration-2 }