Pontoon: Update English (Canada) (en-CA) localization of Firefox
authorKohei Yoshino <kohei.yoshino@gmail.com>
Tue, 04 Aug 2020 19:19:56 +0000
changeset 1489 bb30e8468b3953353bf8dd7e2ba68f8fe19cf586
parent 1488 9f8157bf3b05391ae94614f3d9cd3ed1392f957c
child 1490 7f0d84eeda3a9632207136a4cb2d7797909366ab
push id451
push userpontoon@mozilla.com
push dateTue, 04 Aug 2020 19:20:01 +0000
Pontoon: Update English (Canada) (en-CA) localization of Firefox Co-authored-by: Kohei Yoshino <kohei.yoshino@gmail.com>
browser/browser/browserSets.ftl
devtools/client/accessibility.properties
dom/chrome/layout/htmlparser.properties
security/manager/security/certificates/certManager.ftl
toolkit/toolkit/about/aboutAddons.ftl
toolkit/toolkit/printing/printUI.ftl
--- a/browser/browser/browserSets.ftl
+++ b/browser/browser/browserSets.ftl
@@ -76,16 +76,18 @@ nav-fwd-shortcut-alt =
     .key = ]
 nav-reload-shortcut =
     .key = r
 # Shortcut available only on macOS.
 nav-stop-shortcut =
     .key = .
 history-show-all-shortcut =
     .key = H
+history-show-all-shortcut-mac =
+    .key = Y
 history-sidebar-shortcut =
     .key = h
 full-screen-shortcut =
     .key = f
 reader-mode-toggle-shortcut-windows =
     .keycode = VK_F9
 reader-mode-toggle-shortcut-other =
     .key = R
@@ -112,21 +114,16 @@ bookmark-show-all-shortcut =
 # of each platform for your locale.
 bookmark-show-sidebar-shortcut =
     .key = b
 
 ## All `-alt*` messages are alternative acceleration keys for zoom.
 ## If shift key is needed with your locale popular keyboard for them,
 ## you can use these alternative items. Otherwise, their values should be empty.
 
-
-# If in keyboard layouts popular for your locale you need to use the shift key
-# to access the original shortcuts, the following shortcuts can be used.
-# Otherwise their values should remain empty.
-
 full-zoom-reduce-shortcut =
     .key = -
 # If in keyboard layouts popular for your locale you need to use the shift key
 # to access the original shortcuts, the following shortcuts can be used.
 # Otherwise their values should remain empty.
 full-zoom-reduce-shortcut-alt =
     .key = { "" }
 full-zoom-reduce-shortcut-alt-a =
--- a/devtools/client/accessibility.properties
+++ b/devtools/client/accessibility.properties
@@ -305,8 +305,12 @@ accessibility.simulation.tritanopia=Trit
 # in the "Simulate" menu in the accessibility panel and represent the tritanomaly simulation option.
 accessibility.simulation.tritanomaly=Tritanomaly (low blue)
 
 # LOCALIZATION NOTE (accessibility.simulation.contrastLoss): This label is shown
 # in the "Simulate" menu in the accessibility panel and represent the contrast loss simulation option.
 # It is also shown in the simulation menu button in the accessibility panel and represent the
 # contrast loss simulation option currently selected.
 accessibility.simulation.contrastLoss=Contrast loss
+
+# LOCALIZATION NOTE (accessibility.simulation.achromatopsia): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the achromatopsia simulation option.
+accessibility.simulation.achromatopsia=Achromatopsia (no colour)
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -99,18 +99,20 @@ errNonSpaceAfterBody=Non-space character
 errNonSpaceInColgroupInFragment=Non-space in “colgroup” when parsing fragment.
 errNonSpaceInNoscriptInHead=Non-space character inside “noscript” inside “head”.
 errFooBetweenHeadAndBody=“%1$S” element between “head” and “body”.
 errStartTagWithoutDoctype=Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
 errNoSelectInTableScope=No “select” in table scope.
 errStartSelectWhereEndSelectExpected=“select” start tag where end tag expected.
 errStartTagWithSelectOpen=“%1$S” start tag with “select” open.
 errBadStartTagInHead2=Bad start tag “%1$S” in “head”.
+errBadStartTagInNoscriptInHead=Bad start tag “%1$S” in “noscript” in “head”.
 errImage=Saw a start tag “image”.
 errFooSeenWhenFooOpen=An “%1$S” start tag seen but an element of the same type was already open.
+errFooSeenWhenFooOpen2=Start tag “%1$S” seen but an element of the same type was already open.
 errHeadingWhenHeadingOpen=Heading cannot be a child of another heading.
 errFramesetStart=“frameset” start tag seen.
 errNoCellToClose=No cell to close.
 errStartTagInTable=Start tag “%1$S” seen in “table”.
 errFormWhenFormOpen=Saw a “form” start tag, but there was already an active “form” element. Nested forms are not allowed. Ignoring the tag.
 errTableSeenWhileTableOpen=Start tag for “table” seen but the previous “table” is still open.
 errStartTagInTableBody=“%1$S” start tag in table body.
 errEndTagSeenWithoutDoctype=End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
--- a/security/manager/security/certificates/certManager.ftl
+++ b/security/manager/security/certificates/certManager.ftl
@@ -1,191 +1,135 @@
 # 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 organizations that identify you
 certmgr-remembered = These certificates are used to identify you to websites
 certmgr-people = You have certificates on file that identify these people
 certmgr-servers = You have certificates on file that identify these servers
 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 = Organization (O)
-
 certmgr-cert-detail-orgunit = Organizational 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 websites.
-
 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,81 +152,69 @@ import-email-cert-prompt = Select File containing somebody’s Email certificate to import
 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-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
 
 ## 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/toolkit/about/aboutAddons.ftl
+++ b/toolkit/toolkit/about/aboutAddons.ftl
@@ -1,255 +1,190 @@
 # 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
-
 loading-label =
     .value = Loading…
-
 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
-
 install-addon-from-file =
     .label = Install Add-on From File…
     .accesskey = I
-
 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
     }
-
 tools-menu =
     .tooltiptext = Tools for all add-ons
-
 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
-
 debug-addons =
     .label = Debug Add-ons
     .accesskey = b
-
 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
-
 discover-title = What are Add-ons?
-
 discover-description =
     Add-ons are applications that let you personalize { -brand-short-name } with
     extra functionality or style. Try a time-saving sidebar, a weather notifier, or a themed look to make { -brand-short-name }
     your own.
-
 discover-footer =
     When you’re connected to the internet, this pane will feature
     some of the best and most popular add-ons for you to try out.
-
 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
-
 detail-private-browsing-description2 = When allowed, the extension will have access to your online activities while private browsing. <label data-l10n-name="detail-private-browsing-learn-more">Learn more</label>
-
 # 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-description = This extension does not run while private browsing. <label data-l10n-name="detail-private-browsing-learn-more">Learn more</label>
-
 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-description = This extension has access to your online activities while private browsing. <label data-l10n-name="detail-private-browsing-learn-more">Learn more</label>
-
 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>
-
 extensions-view-discopane =
     .name = Recommendations
     .tooltiptext = { extensions-view-discopane.name }
-
 extensions-view-recent-updates =
     .name = Recent Updates
     .tooltiptext = { extensions-view-recent-updates.name }
-
 extensions-view-available-updates =
     .name = Available Updates
     .tooltiptext = { extensions-view-available-updates.name }
-
 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 =
@@ -271,83 +206,72 @@ addon-category-recent-updates-title =
     .title = Recent Updates
 
 ## These are global warnings
 
 extensions-warning-safe-mode-label =
     .value = All add-ons have been disabled by safe mode.
 extensions-warning-safe-mode-container =
     .tooltiptext = { extensions-warning-safe-mode-label.value }
-
 extensions-warning-check-compatibility-label =
     .value = Add-on compatibility checking is disabled. You may have incompatible add-ons.
 extensions-warning-check-compatibility-container =
     .tooltiptext = { extensions-warning-check-compatibility-label.value }
-
 extensions-warning-check-compatibility-enable =
     .label = Enable
     .tooltiptext = Enable add-on compatibility checking
-
 extensions-warning-update-security-label =
     .value = Add-on update security checking is disabled. You may be compromised by updates.
 extensions-warning-update-security-container =
     .tooltiptext = { extensions-warning-update-security-label.value }
-
 extensions-warning-update-security-enable =
     .label = Enable
     .tooltiptext = Enable add-on update security checking
-
 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
 
 extensions-updates-check-for-updates =
     .label = Check for Updates
     .accesskey = C
-
 extensions-updates-view-updates =
     .label = View Recent Updates
     .accesskey = V
-
 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
 # add-on update checking.
 
 extensions-updates-update-addons-automatically =
     .label = Update Add-ons Automatically
     .accesskey = A
-
 addon-updates-update-addons-automatically = Update Add-ons Automatically
     .accesskey = A
 
 ## Specific add-ons can have custom update checking behaviors ("Manually",
 ## "Automatically", "Use default global behavior"). These menu items reset the
 ## update checking behavior for all add-ons to the default global behavior
 ## (which itself is either "Automatically" or "Manually", controlled by the
 ## extensions-updates-update-addons-automatically.label menu item).
 
 extensions-updates-reset-updates-to-automatic =
     .label = Reset All Add-ons to Update Automatically
     .accesskey = R
-
 extensions-updates-reset-updates-to-manual =
     .label = Reset All Add-ons to Update Manually
     .accesskey = R
-
 addon-updates-reset-updates-to-automatic = Reset All Add-ons to Update Automatically
     .accesskey = R
 addon-updates-reset-updates-to-manual = Reset All Add-ons to Update Manually
     .accesskey = R
 
 ## Status messages displayed when updating add-ons
 
 extensions-updates-updating =
@@ -360,17 +284,16 @@ extensions-updates-restart =
     .label = Restart now to complete installation
 extensions-updates-none-found =
     .value = No updates found
 extensions-updates-manual-updates-found =
     .label = View Available Updates
 extensions-updates-update-selected =
     .label = Install Updates
     .tooltiptext = Install available updates in this list
-
 addon-updates-updating = Updating add-ons
 addon-updates-installed = Your add-ons have been updated.
 addon-updates-none-found = No updates found
 addon-updates-manual-updates-found = View Available Updates
 
 ## Add-on install/debug strings for page options menu
 
 addon-install-from-file = Install Add-on From File…
@@ -380,99 +303,83 @@ addon-install-from-file-filter-name = Ad
 addon-open-about-debugging = Debug Add-ons
     .accesskey = b
 
 ## Extension shortcut management
 
 manage-extensions-shortcuts =
     .label = Manage Extension Shortcuts
     .accesskey = S
-
 # 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-browserAction = Activate extension
-
 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
-
 go-back-button =
     .tooltiptext = Go back
-
 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 programs 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 personalized. 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
@@ -489,129 +396,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
-
 addons-enabled-heading = Enabled
 addons-disabled-heading = Disabled
-
 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-allowed =
     .title = Allowed in private windows
-
 # 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.
 addon-badge-recommended =
     .title = Recommended
     .alt = Recommended
-
 # 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.
 addon-badge-recommended2 =
     .title = { -brand-product-name } only recommends extensions that meet our standards for security and performance
     .aria-label = { addon-badge-recommended2.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 Color.</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 = Personalize 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/printing/printUI.ftl
+++ b/toolkit/toolkit/printing/printUI.ftl
@@ -26,11 +26,15 @@ printui-portrait = Portrait
 printui-destination-label = Destination
 printui-more-settings = More settings
 printui-less-settings = Fewer settings
 # Section title (noun) for the print scaling options
 printui-scale = Scale
 printui-scale-fit-to-page = Fit to page
 # Label for input control where user can set the scale percentage
 printui-scale-pcent = Scale
+# Section title for miscellaneous print options
+printui-options = Options
+printui-headers-footers-checkbox = Print headers and footers
+printui-backgrounds-checkbox = Print backgrounds
 printui-system-dialog-link = Print using the system dialog…
 printui-primary-button = Print
 printui-cancel-button = Cancel