cross-channel content for 2022-05-17 11:02
authortrybld
Tue, 17 May 2022 11:07:10 +0000
changeset 14761 f2435cb180564f2a14b8ddea49fae369a58cb0e1
parent 14760 87db5b091902bbf27e7aa52c2574071c2aefc4e2
child 14762 d0735139812dc3dd7304535f878410ebf88bc53a
push id377
push userflodolo@mozilla.com
push dateTue, 17 May 2022 12:45:27 +0000
cross-channel content for 2022-05-17 11:02 X-Task-ID: H8y2Ky76TA2d-RPwk80EJg X-Channel-Repo: mozilla-central X-Channel-Revision: fe9a9b667b38146755750aeb58cd424491360235 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 5d336bc94813968feb1ef8f26af1f24a2f97904e X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 0422c631e21c5d3524ec67392c2bba22b8f4953b X-Channel-Repo: releases/mozilla-esr102 X-Channel-Revision: 602b3a8c1061e920f33c4c39773b4412192e7ce6 X-Channel-Repo: comm-central X-Channel-Revision: 319d44983d68264287a496c7a8a1c9eb7aa1e8e0 X-Channel-Repo: releases/comm-beta X-Channel-Revision: 4a59ef4aee6db8f2b53db151c90e823642366d43 X-Channel-Repo: releases/comm-esr102 X-Channel-Revision: f81fcbcfce4186eb9b069b0b5fb054c00019231f
browser/branding/official/brand.dtd
browser/branding/official/brand.properties
browser/browser/aboutCertError.ftl
browser/browser/aboutLogins.ftl
browser/browser/aboutPrivateBrowsing.ftl
browser/browser/aboutRestartRequired.ftl
browser/browser/appmenu.ftl
browser/browser/browser.ftl
browser/browser/customizeMode.ftl
browser/browser/downloads.ftl
browser/browser/menubar.ftl
browser/browser/migration.ftl
browser/browser/newtab/newtab.ftl
browser/browser/newtab/onboarding.ftl
browser/browser/places.ftl
browser/browser/policies/policies-descriptions.ftl
browser/browser/preferences/preferences.ftl
browser/browser/preferences/siteDataSettings.ftl
browser/browser/protections.ftl
browser/browser/sanitize.ftl
browser/browser/screenshots.ftl
browser/browser/tabContextMenu.ftl
browser/browser/upgradeDialog.ftl
browser/chrome/browser-region/region.properties
browser/chrome/browser/app-extension-fields.properties
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/customizableui/customizableWidgets.properties
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/tabbrowser.properties
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/profile/bookmarks.inc
calendar/calendar/preferences.ftl
calendar/chrome/calendar/calendar.dtd
calendar/chrome/calendar/calendar.properties
chat/accounts.dtd
chat/dateFormat.properties
chat/imtooltip.properties
chat/matrix.properties
devtools/client/accessibility.properties
devtools/client/compatibility.ftl
devtools/client/debugger.properties
devtools/client/netmonitor.properties
devtools/client/performance.dtd
devtools/client/perftools.ftl
devtools/client/sourceeditor.dtd
devtools/client/startup.properties
devtools/client/toolbox.properties
devtools/client/tooltips.ftl
devtools/client/webconsole.properties
devtools/shared/highlighters.properties
devtools/startup/aboutDevTools.ftl
devtools/startup/key-shortcuts.properties
devtools/startup/startup.properties
dom/chrome/appstrings.properties
dom/chrome/dom/dom.properties
dom/chrome/layout/htmlparser.properties
dom/chrome/layout/layout_errors.properties
dom/chrome/netError.dtd
dom/chrome/plugins.properties
dom/chrome/security/security.properties
mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
mail/chrome/messenger/AccountManager.dtd
mail/chrome/messenger/AccountWizard.dtd
mail/chrome/messenger/FilterEditor.dtd
mail/chrome/messenger/activity.dtd
mail/chrome/messenger/addressbook/abCard.dtd
mail/chrome/messenger/am-smime.dtd
mail/chrome/messenger/app-extension-fields.properties
mail/chrome/messenger/fieldMapImport.dtd
mail/chrome/messenger/filter.properties
mail/chrome/messenger/importDialog.dtd
mail/chrome/messenger/junkMailInfo.dtd
mail/chrome/messenger/messenger.dtd
mail/chrome/messenger/messengercompose/askSendFormat.dtd
mail/chrome/messenger/messengercompose/askSendFormat.properties
mail/chrome/messenger/messengercompose/composeMsgs.properties
mail/chrome/messenger/messengercompose/messengercompose.dtd
mail/chrome/messenger/migration/migration.properties
mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
mail/chrome/messenger/newmailaccount/accountProvisioner.properties
mail/chrome/messenger/preferences/preferences.properties
mail/messenger/aboutAddonsExtra.ftl
mail/messenger/aboutRights.ftl
mail/messenger/accountCentral.ftl
mail/messenger/accountManager.ftl
mail/messenger/accountcreation/accountSetup.ftl
mail/messenger/addressbook/abCardDAVDialog.ftl
mail/messenger/addressbook/aboutAddressBook.ftl
mail/messenger/addressbook/fieldMapImport.ftl
mail/messenger/menubar.ftl
mail/messenger/messenger.ftl
mail/messenger/messengercompose/messengercompose.ftl
mail/messenger/openpgp/keyWizard.ftl
mail/messenger/openpgp/oneRecipientStatus.ftl
mail/messenger/openpgp/openpgp.ftl
mail/messenger/otr/add-finger.ftl
mail/messenger/otr/am-im-otr.ftl
mail/messenger/otr/finger.ftl
mail/messenger/otr/otrUI.ftl
mail/messenger/preferences/connection.ftl
mail/messenger/preferences/dock-options.ftl
mail/messenger/preferences/preferences.ftl
mail/messenger/preferences/sendoptions.ftl
mobile/chrome/region.properties
mobile/overrides/appstrings.properties
mobile/overrides/netError.dtd
netwerk/necko.properties
suite/chatzilla/chrome/chatzilla.properties
suite/chatzilla/chrome/networks.dtd
suite/chrome/browser/navigator.properties
suite/chrome/common/notification.properties
suite/chrome/common/pref/pref-advanced.dtd
suite/chrome/common/pref/pref-content.dtd
suite/chrome/common/pref/pref-masterpass.dtd
suite/chrome/common/pref/pref-navigator.dtd
suite/chrome/common/pref/pref-scripts.dtd
suite/chrome/common/pref/preferences.dtd
suite/chrome/common/sitePermissions.properties
suite/chrome/mailnews/FilterEditor.dtd
suite/chrome/mailnews/FilterListDialog.dtd
suite/chrome/mailnews/fieldMapImport.dtd
suite/chrome/mailnews/filter.properties
suite/chrome/mailnews/messenger.dtd
suite/chrome/mailnews/msgHdrViewOverlay.dtd
suite/chrome/mailnews/pref/mailPrefsOverlay.dtd
suite/chrome/mailnews/pref/pref-mailnews.dtd
suite/chrome/mailnews/start.dtd
toolkit/chrome/global/extensions.properties
toolkit/chrome/global/global-extension-fields.properties
toolkit/chrome/global/narrate.properties
toolkit/chrome/global/textcontext.dtd
toolkit/chrome/mozapps/downloads/unknownContentType.dtd
toolkit/chrome/mozapps/extensions/extensions.properties
toolkit/chrome/mozapps/profile/profileSelection.properties
toolkit/toolkit/about/aboutAddons.ftl
toolkit/toolkit/about/aboutHttpsOnlyError.ftl
toolkit/toolkit/about/aboutNetworking.ftl
toolkit/toolkit/about/aboutProcesses.ftl
toolkit/toolkit/about/aboutTelemetry.ftl
toolkit/toolkit/about/aboutWebrtc.ftl
toolkit/toolkit/featuregates/features.ftl
toolkit/toolkit/global/processTypes.ftl
--- a/browser/branding/official/brand.dtd
+++ b/browser/branding/official/brand.dtd
@@ -1,11 +1,7 @@
 <!-- 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/. -->
 
 <!ENTITY  brandShorterName      "Firefox">
 <!ENTITY  brandShortName        "Firefox">
 <!ENTITY  brandFullName         "Mozilla Firefox">
-<!-- LOCALIZATION NOTE (brandProductName):
-   This brand name can be used in messages where the product name needs to
-   remain unchanged across different versions (Nightly, Beta, etc.). -->
-<!ENTITY  brandProductName      "Firefox">
--- a/browser/branding/official/brand.properties
+++ b/browser/branding/official/brand.properties
@@ -1,12 +1,7 @@
 # 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/.
 
 brandShorterName=Firefox
 brandShortName=Firefox
 brandFullName=Mozilla Firefox
-# LOCALIZATION NOTE(brandProductName):
-# This brand name can be used in messages where the product name needs to
-# remain unchanged across different versions (Nightly, Beta, etc.).
-brandProductName=Firefox
-vendorShortName=Mozilla
--- a/browser/browser/aboutCertError.ftl
+++ b/browser/browser/aboutCertError.ftl
@@ -112,17 +112,16 @@ netTimeout-title = The connection has ti
 unknownProtocolFound-title = The address wasn’t understood
 proxyConnectFailure-title = The proxy server is refusing connections
 proxyResolveFailure-title = Unable to find the proxy server
 redirectLoop-title = The page isn’t redirecting properly
 unknownSocketType-title = Unexpected response from server
 nssFailure2-title = Secure Connection Failed
 csp-xfo-error-title = { -brand-short-name } Can’t Open This Page
 corruptedContentError-title = Corrupted Content Error
-remoteXUL-title = Remote XUL
 sslv3Used-title = Unable to Connect Securely
 inadequateSecurityError-title = Your connection is not secure
 blockedByPolicy-title = Blocked Page
 clockSkewError-title = Your Computer Clock is Wrong
 networkProtocolError-title = Network Protocol Error
 nssBadCert-title = Warning: Potential Security Risk Ahead
 nssBadCert-sts-title = Did Not Connect: Potential Security Issue
 certerror-mitm-title = Software is Preventing { -brand-short-name } From Safely Connecting to This Site
--- a/browser/browser/aboutLogins.ftl
+++ b/browser/browser/aboutLogins.ftl
@@ -54,33 +54,30 @@ about-logins-login-list-empty-search-tit
 about-logins-login-list-empty-search-description = There are no results matching your search.
 login-list-item-title-new-login = New Login
 login-list-item-subtitle-new-login = Enter your login credentials
 login-list-item-subtitle-missing-username = (no username)
 about-logins-list-item-breach-icon =
   .title = Breached website
 about-logins-list-item-vulnerable-password-icon =
   .title = Vulnerable password
-
 about-logins-list-section-breach = Breached websites
 about-logins-list-section-vulnerable = Vulnerable passwords
 about-logins-list-section-nothing = No alert
 about-logins-list-section-today = Today
 about-logins-list-section-yesterday = Yesterday
 about-logins-list-section-week = Last 7 days
 
 ## Introduction screen
 
 about-logins-login-intro-heading-logged-out2 = Looking for your saved logins? Turn on sync or import them.
 about-logins-login-intro-heading-logged-in = No synced logins found.
 login-intro-description = If you saved your logins to { -brand-product-name } on a different device, here’s how to get them here:
 login-intro-instructions-fxa = Create or sign in to your { -fxaccount-brand-name(capitalization: "sentence") } on the device where your logins are saved.
 login-intro-instructions-fxa-settings = Go to Settings > Sync > Turn on syncing… Select the Logins and passwords checkbox.
-login-intro-instructions-fxa-help = Visit <a data-l10n-name="help-link">{ -lockwise-brand-short-name } Support</a> for more help.
-about-logins-intro-import = If your logins are saved in another browser, you can <a data-l10n-name="import-link">import them into { -lockwise-brand-short-name }</a>
 login-intro-instructions-fxa-passwords-help = Visit <a data-l10n-name="passwords-help-link">passwords support</a> for more help.
 about-logins-intro-browser-only-import = If your logins are saved in another browser, you can <a data-l10n-name="import-link">import them into { -brand-product-name }</a>
 about-logins-intro-import2 = If your logins are saved outside of { -brand-product-name }, you can <a data-l10n-name="import-browser-link">import them from another browser</a> or <a data-l10n-name="import-file-link">from a file</a>
 
 ## Login
 
 login-item-new-login-title = Create New Login
 login-item-edit-button = Edit
--- a/browser/browser/aboutPrivateBrowsing.ftl
+++ b/browser/browser/aboutPrivateBrowsing.ftl
@@ -1,35 +1,29 @@
 # 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/.
 
 privatebrowsingpage-open-private-window-label = Open a Private Window
     .accesskey = P
 about-private-browsing-search-placeholder = Search the web
 about-private-browsing-info-title = You’re in a Private Window
-about-private-browsing-info-myths = Common myths about private browsing
 about-private-browsing-search-btn =
     .title = Search the web
 # Variables
 #  $engine (String): the name of the user's default search engine
 about-private-browsing-handoff =
     .title = Search with { $engine } or enter address
 about-private-browsing-handoff-no-engine =
     .title = Search or enter address
 # Variables
 #  $engine (String): the name of the user's default search engine
 about-private-browsing-handoff-text = Search with { $engine } or enter address
 about-private-browsing-handoff-text-no-engine = Search or enter address
 about-private-browsing-not-private = You are currently not in a private window.
-about-private-browsing-info-description = { -brand-short-name } clears your search and browsing history when you quit the app or close all Private Browsing tabs and windows. While this doesn’t make you anonymous to websites or your internet service provider, it makes it easier to keep what you do online private from anyone else who uses this computer.
-
-about-private-browsing-need-more-privacy = Need more privacy?
-about-private-browsing-turn-on-vpn = Try { -mozilla-vpn-brand-name }
-
 about-private-browsing-info-description-private-window = Private window: { -brand-short-name } clears your search and browsing history when you close all private windows. This doesn’t make you anonymous.
 about-private-browsing-info-description-simplified = { -brand-short-name } clears your search and browsing history when you close all private windows, but this doesn’t make you anonymous.
 about-private-browsing-learn-more-link = Learn more
 
 about-private-browsing-hide-activity = Hide your activity and location, everywhere you browse
 about-private-browsing-get-privacy = Get privacy protections everywhere you browse
 about-private-browsing-hide-activity-1 = Hide browsing activity and location with { -mozilla-vpn-brand-name }. One click creates a secure connection, even on public Wi-Fi.
 about-private-browsing-prominent-cta = Stay private with { -mozilla-vpn-brand-name }
--- a/browser/browser/aboutRestartRequired.ftl
+++ b/browser/browser/aboutRestartRequired.ftl
@@ -1,14 +1,10 @@
 # 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/.
 
 restart-required-title = Restart Required
-restart-required-header = Sorry. We just need to do one small thing to keep going.
-restart-required-intro-brand = { -brand-short-name } has just been updated in the background. Click Restart { -brand-short-name } to complete the update.
-restart-required-description = We will restore all your pages, windows and tabs afterwards, so you can be on your way quickly.
-
 restart-required-heading = Restart to Keep Using { -brand-short-name }
 restart-required-intro = An update to { -brand-short-name } started in the background. You’ll need to restart to finish the update.
 window-restoration-info = Your windows and tabs will be quickly restored, but private ones will not.
 
 restart-button-label = Restart { -brand-short-name }
--- a/browser/browser/appmenu.ftl
+++ b/browser/browser/appmenu.ftl
@@ -1,23 +1,14 @@
 # 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/.
 
 ## App Menu
 
-appmenuitem-update-banner3 =
-    .label-update-downloading = Downloading { -brand-shorter-name } update
-    .label-update-available = Update available — download now
-    .label-update-manual = Update available — download now
-    .label-update-unsupported = Unable to update — system incompatible
-    .label-update-restart = Update available — restart now
-
-appmenuitem-protection-dashboard-title = Protections dashboard
-
 appmenuitem-banner-update-downloading =
     .label = Downloading { -brand-shorter-name } update
 
 appmenuitem-banner-update-available =
     .label = Update available — download now
 
 appmenuitem-banner-update-manual =
     .label = Update available — download now
@@ -117,17 +108,16 @@ appmenu-fxa-header2 = { -fxaccount-brand
 # $time (string) - Localized relative time since last sync (e.g. 1 second ago,
 # 3 hours ago, etc.)
 appmenu-fxa-last-sync = Last synced { $time }
     .label = Last synced { $time }
 appmenu-fxa-sync-and-save-data2 = Sync and save data
 appmenu-fxa-signed-in-label = Sign In
 appmenu-fxa-setup-sync =
     .label = Turn On Syncing…
-appmenu-fxa-show-more-tabs = Show More Tabs
 
 appmenuitem-save-page =
     .label = Save page as…
 
 ## What's New panel in App menu.
 
 whatsnew-panel-header = What’s New
 
@@ -160,42 +150,28 @@ profiler-popup-reveal-description-button
   .aria-label = Reveal more information
 
 profiler-popup-description-title =
   .value = Record, analyze, share
 
 profiler-popup-description =
   Collaborate on performance issues by publishing profiles to share with your team.
 
-profiler-popup-learn-more = Learn more
-
 profiler-popup-learn-more-button =
   .label = Learn more
 
 profiler-popup-settings =
   .value = Settings
 
 # This link takes the user to about:profiling, and is only visible with the Custom preset.
-profiler-popup-edit-settings = Edit Settings…
-
-profiler-popup-disabled =
-  The profiler is currently disabled, most likely due to a Private Browsing window
-  being open.
-
-# This link takes the user to about:profiling, and is only visible with the Custom preset.
 profiler-popup-edit-settings-button =
   .label = Edit Settings…
 
 profiler-popup-recording-screen = Recording…
 
-# The profiler presets list is generated elsewhere, but the custom preset is defined
-# here only.
-profiler-popup-presets-custom =
-  .label = Custom
-
 profiler-popup-start-recording-button =
   .label = Start Recording
 
 profiler-popup-discard-button =
   .label = Discard
 
 profiler-popup-capture-button =
   .label = Capture
@@ -268,20 +244,16 @@ appmenu-about =
 appmenu-get-help =
     .label = Get help
     .accesskey = h
 appmenu-help-more-troubleshooting-info =
     .label = More troubleshooting information
     .accesskey = t
 appmenu-help-report-site-issue =
     .label = Report site issue…
-appmenu-help-feedback-page =
-    .label = Submit feedback…
-    .accesskey = S
-
 appmenu-help-share-ideas =
     .label = Share ideas and feedback…
     .accesskey = S
 
 ## appmenu-help-enter-troubleshoot-mode and appmenu-help-exit-troubleshoot-mode
 ## are mutually exclusive, so it's possible to use the same accesskey for both.
 
 appmenu-help-enter-troubleshoot-mode2 =
@@ -300,14 +272,12 @@ appmenu-help-report-deceptive-site =
 appmenu-help-not-deceptive =
     .label = This isn’t a deceptive site…
     .accesskey = d
 
 ## More Tools
 
 appmenu-customizetoolbar =
     .label = Customize toolbar…
-appmenu-taskmanager =
-    .label = Task Manager
 
 appmenu-developer-tools-subheader = Browser tools
 appmenu-developer-tools-extensions =
     .label = Extensions for developers
--- a/browser/browser/browser.ftl
+++ b/browser/browser/browser.ftl
@@ -676,22 +676,16 @@ toolbar-addons-themes-button =
 #  $shortcut (String): keyboard shortcut to open settings (only on macOS)
 toolbar-settings-button =
   .label = Settings
   .tooltiptext = { PLATFORM() ->
       [macos] Open settings ({ $shortcut })
      *[other] Open settings
   }
 
-## More items
-
-more-menu-go-offline =
-  .label = Work Offline
-  .accesskey = k
-
 toolbar-overflow-customize-button =
   .label = Customize toolbar…
   .accesskey = C
 
 toolbar-button-email-link =
   .label = Email link
   .tooltiptext = Email a link to this page
 
@@ -732,22 +726,16 @@ panel-save-update-password = Password
 
 ## Add-on removal warning
 
 # Variables:
 #  $name (String): The name of the addon that will be removed.
 addon-removal-title = Remove { $name }?
 addon-removal-abuse-report-checkbox = Report this extension to { -vendor-short-name }
 
-## Remote / Synced tabs
-
-remote-tabs-manage-account =
-  .label = Manage Account
-remote-tabs-sync-now = Sync Now
-
 ##
 
 # "More" item in macOS share menu
 menu-share-more =
     .label = More…
 ui-tour-info-panel-close =
     .tooltiptext = Close
 
--- a/browser/browser/customizeMode.ftl
+++ b/browser/browser/customizeMode.ftl
@@ -5,44 +5,34 @@
 customize-mode-restore-defaults =
     .label = Restore Defaults
 customize-mode-menu-and-toolbars-header = Drag your favorite items into the toolbar or overflow menu.
 customize-mode-overflow-list-title = Overflow Menu
 customize-mode-uidensity =
     .label = Density
 customize-mode-done =
     .label = Done
-customize-mode-lwthemes-menu-manage =
-    .label = Manage
-    .accesskey = M
 customize-mode-toolbars =
     .label = Toolbars
 customize-mode-titlebar =
     .label = Title Bar
 customize-mode-uidensity-menu-touch =
     .label = Touch
     .accesskey = T
     .tooltiptext = Touch
 customize-mode-uidensity-auto-touch-mode-checkbox =
     .label = Use Touch for Tablet Mode
-customize-mode-lwthemes =
-    .label = Themes
 customize-mode-overflow-list-description = Drag and drop items here to keep them within reach but out of your toolbar…
 customize-mode-uidensity-menu-normal =
     .label = Normal
     .accesskey = N
     .tooltiptext = Normal
 customize-mode-uidensity-menu-compact-unsupported =
     .label = Compact (not supported)
     .accesskey = C
     .tooltiptext = Compact (not supported)
-customize-mode-lwthemes-menu-get-more =
-    .label = Get More Themes
-    .accesskey = G
 customize-mode-undo-cmd =
     .label = Undo
-customize-mode-lwthemes-my-themes =
-    .value = My Themes
 customize-mode-lwthemes-link = Manage Themes
 customize-mode-touchbar-cmd =
     .label = Customize Touch Bar…
 customize-mode-downloads-button-autohide =
     .label = Hide button when empty
--- a/browser/browser/downloads.ftl
+++ b/browser/browser/downloads.ftl
@@ -24,70 +24,41 @@ downloads-cmd-pause =
 downloads-cmd-resume =
     .label = Resume
     .accesskey = R
 downloads-cmd-cancel =
     .tooltiptext = Cancel
 downloads-cmd-cancel-panel =
     .aria-label = Cancel
 
-# This message is only displayed on Windows and Linux devices
-downloads-cmd-show-menuitem =
-  .label = Open Containing Folder
-  .accesskey = F
-
-# This message is only displayed on macOS devices
-downloads-cmd-show-menuitem-mac =
-  .label = Show In Finder
-  .accesskey = F
-
 downloads-cmd-show-menuitem-2 =
   .label = { PLATFORM() ->
       [macos] Show in Finder
      *[other] Show in Folder
   }
   .accesskey = F
 
 ## Displayed in the downloads context menu for files that can be opened.
 ## Variables:
 ##   $handler (String) - The name of the mime type's default file handler.
 ##   Example: "Notepad", "Acrobat Reader DC", "7-Zip File Manager"
 
 downloads-cmd-use-system-default =
   .label = Open In System Viewer
   .accesskey = I
-
 # This version is shown when the download's mime type has a valid file handler.
 downloads-cmd-use-system-default-named =
   .label = Open In { $handler }
   .accesskey = I
 
 # We can use the same accesskey as downloads-cmd-always-open-similar-files.
 # Both should not be visible in the downloads context menu at the same time.
 downloads-cmd-always-use-system-default =
   .label = Always Open In System Viewer
   .accesskey = w
-
-downloads-cmd-show-button =
-  .tooltiptext = { PLATFORM() ->
-      [macos] Show In Finder
-     *[other] Open Containing Folder
-  }
-
-downloads-cmd-show-panel =
-  .aria-label = { PLATFORM() ->
-      [macos] Show In Finder
-     *[other] Open Containing Folder
-  }
-downloads-cmd-show-description =
-  .value = { PLATFORM() ->
-      [macos] Show In Finder
-     *[other] Open Containing Folder
-  }
-
 # We can use the same accesskey as downloads-cmd-always-open-similar-files.
 # Both should not be visible in the downloads context menu at the same time.
 # This version is shown when the download's mime type has a valid file handler.
 downloads-cmd-always-use-system-default-named =
   .label = Always Open In { $handler }
   .accesskey = w
 
 ##
@@ -131,17 +102,16 @@ downloads-cmd-remove-from-history =
     .label = Remove From History
     .accesskey = e
 downloads-cmd-clear-list =
     .label = Clear Preview Panel
     .accesskey = a
 downloads-cmd-clear-downloads =
     .label = Clear Downloads
     .accesskey = C
-
 downloads-cmd-delete-file =
     .label = Delete
     .accesskey = D
 
 # This command is shown in the context menu when downloads are blocked.
 downloads-cmd-unblock =
     .label = Allow Download
     .accesskey = o
@@ -189,17 +159,16 @@ downloads-open-file =
 ##   $seconds (number) - Amount of seconds left till the file opens.
 ##   $minutes (number) - Amount of minutes till the file opens.
 
 downloading-file-opens-in-hours-and-minutes = Opening in { $hours }h { $minutes }m…
 downloading-file-opens-in-minutes = Opening in { $minutes }m…
 downloading-file-opens-in-minutes-and-seconds = Opening in { $minutes }m { $seconds }s…
 downloading-file-opens-in-seconds = Opening in { $seconds }s…
 downloading-file-opens-in-some-time = Opening when completed…
-
 downloading-file-click-to-open =
   .value = Open when completed
 
 ##
 
 # Displayed when hovering a download which is able to be retried by users,
 # indicates that it's possible to download this file again.
 downloads-retry-download =
--- a/browser/browser/menubar.ftl
+++ b/browser/browser/menubar.ftl
@@ -36,25 +36,16 @@ menu-quit =
             [windows] x
            *[other] Q
         }
 
 # This menu-quit-mac string is only used on macOS.
 menu-quit-mac =
     .label = Quit { -brand-shorter-name }
 
-# This menu-quit-button string is only used on Linux.
-menu-quit-button =
-    .label = { menu-quit.label }
-
-# This menu-quit-button-win string is only used on Windows.
-menu-quit-button-win =
-    .label = { menu-quit.label }
-    .tooltip = Exit { -brand-shorter-name }
-
 menu-about =
     .label = About { -brand-shorter-name }
     .accesskey = A
 
 ## File Menu
 
 menu-file =
     .label = File
@@ -74,19 +65,16 @@ menu-file-new-private-window =
 # "Open Location" is only displayed on macOS, and only on windows
 # that aren't main browser windows, or when there are no windows
 # but Firefox is still running.
 menu-file-open-location =
     .label = Open Location…
 menu-file-open-file =
     .label = Open File…
     .accesskey = O
-menu-file-close =
-    .label = Close
-    .accesskey = C
 # Variables:
 #  $tabCount (Number): the number of tabs that are affected by the action.
 menu-file-close-tab =
     .label =
         { $tabCount ->
             [1] Close Tab
            *[other] Close { $tabCount } Tabs
         }
@@ -101,19 +89,16 @@ menu-file-email-link =
     .label = Email Link…
     .accesskey = E
 menu-file-share-url =
     .label = Share
     .accesskey = h
 menu-file-print-setup =
     .label = Page Setup…
     .accesskey = u
-menu-file-print-preview =
-    .label = Print Preview
-    .accesskey = v
 menu-file-print =
     .label = Print…
     .accesskey = P
 menu-file-import-from-another-browser =
     .label = Import From Another Browser…
     .accesskey = I
 menu-file-go-offline =
     .label = Work Offline
@@ -315,19 +300,16 @@ menu-help =
 menu-get-help =
     .label = Get Help
     .accesskey = H
 menu-help-more-troubleshooting-info =
     .label = More Troubleshooting Information
     .accesskey = T
 menu-help-report-site-issue =
     .label = Report Site Issue…
-menu-help-feedback-page =
-    .label = Submit Feedback…
-    .accesskey = S
 menu-help-share-ideas =
     .label = Share Ideas and Feedback…
     .accesskey = S
 menu-help-enter-troubleshoot-mode2 =
     .label = Troubleshoot Mode…
     .accesskey = M
 menu-help-exit-troubleshoot-mode =
     .label = Turn Troubleshoot Mode Off
--- a/browser/browser/migration.ftl
+++ b/browser/browser/migration.ftl
@@ -76,33 +76,19 @@ import-select-profile-page-title = Selec
 import-select-profile-description = The following profiles are available to import from:
 
 import-done-page-title = Import Complete
 
 import-done-description = The following items were successfully imported:
 
 import-close-source-browser = Please ensure the selected browser is closed before continuing.
 
-# Displays which browser the bookmarks are being imported from
-#
-# Variables:
-#   $source (String): The browser the user has chosen to import bookmarks from.
-imported-bookmarks-source = From { $source }
-
 source-name-ie = Internet Explorer
 source-name-edge = Microsoft Edge
-source-name-edge-beta = Microsoft Edge Beta
-source-name-safari = Safari
-source-name-canary = Google Chrome Canary
 source-name-chrome = Google Chrome
-source-name-chrome-beta = Google Chrome Beta
-source-name-chrome-dev = Google Chrome Dev
-source-name-chromium = Chromium
-source-name-firefox = Mozilla Firefox
-source-name-360se = 360 Secure Browser
 
 imported-safari-reading-list = Reading List (From Safari)
 imported-edge-reading-list = Reading List (From Edge)
 
 ## Browser data types
 ## All of these strings get a $browser variable passed in.
 ## You can use the browser variable to differentiate the name of items,
 ## which may have different labels in different browsers.
--- a/browser/browser/newtab/newtab.ftl
+++ b/browser/browser/newtab/newtab.ftl
@@ -30,30 +30,24 @@ newtab-search-box-handoff-input =
     .placeholder = Search with { $engine } or enter address
     .title = Search with { $engine } or enter address
     .aria-label = Search with { $engine } or enter address
 newtab-search-box-handoff-input-no-engine =
     .placeholder = Search or enter address
     .title = Search or enter address
     .aria-label = Search or enter address
 
-newtab-search-box-search-the-web-input =
-    .placeholder = Search the Web
-    .title = Search the Web
-    .aria-label = Search the Web
-
 newtab-search-box-text = Search the web
 newtab-search-box-input =
     .placeholder = Search the web
     .aria-label = Search the web
 
 ## Top Sites - General form dialog.
 
 newtab-topsites-add-search-engine-header = Add Search Engine
-newtab-topsites-add-topsites-header = New Top Site
 newtab-topsites-add-shortcut-header = New Shortcut
 newtab-topsites-edit-topsites-header = Edit Top Site
 newtab-topsites-edit-shortcut-header = Edit Shortcut
 newtab-topsites-title-label = Title
 newtab-topsites-title-input =
     .placeholder = Enter a title
 
 newtab-topsites-url-label = URL
@@ -203,17 +197,16 @@ newtab-section-menu-privacy-notice = Pri
 newtab-section-collapse-section-label =
     .aria-label = Collapse Section
 newtab-section-expand-section-label =
     .aria-label = Expand Section
 
 ## Section Headers.
 
 newtab-section-header-topsites = Top Sites
-newtab-section-header-highlights = Highlights
 newtab-section-header-recent-activity = Recent activity
 # Variables:
 #  $provider (String): Name of the corresponding content provider.
 newtab-section-header-pocket = Recommended by { $provider }
 
 ## Empty Section States: These show when there are no more items in a section. Ex. When there are no more Pocket story recommendations, in the space where there would have been stories, this is shown instead.
 
 newtab-empty-section-highlights = Start browsing, and we’ll show some of the great articles, videos, and other pages you’ve recently visited or bookmarked here.
@@ -236,17 +229,16 @@ newtab-discovery-empty-section-topstorie
 
 # This is shown at the bottom of the trending stories section and precedes a list of links to popular topics.
 newtab-pocket-read-more = Popular Topics:
 newtab-pocket-new-topics-title = Want even more stories? See these popular topics from { -pocket-brand-name }
 newtab-pocket-more-recommendations = More Recommendations
 newtab-pocket-learn-more = Learn more
 newtab-pocket-cta-button = Get { -pocket-brand-name }
 newtab-pocket-cta-text = Save the stories you love in { -pocket-brand-name }, and fuel your mind with fascinating reads.
-
 newtab-pocket-pocket-firefox-family = { -pocket-brand-name } is part of the { -brand-product-name } family
 
 # A save to Pocket button that shows over the card thumbnail on hover.
 newtab-pocket-save-to-pocket = Save to { -pocket-brand-name }
 newtab-pocket-saved-to-pocket = Saved to { -pocket-brand-name }
 
 # This is a button shown at the bottom of the Pocket section that loads more stories when clicked.
 newtab-pocket-load-more-stories-button = Load more stories
--- a/browser/browser/newtab/onboarding.ftl
+++ b/browser/browser/newtab/onboarding.ftl
@@ -1,16 +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/.
 
-### UI strings for the simplified onboarding / multistage about:welcome
-### Various strings use a non-breaking space to avoid a single dangling /
-### widowed word, so test on various window sizes if you also want this.
-
 ### UI strings for the MR1 onboarding / multistage about:welcome
 ### Various strings use a non-breaking space to avoid a single dangling /
 ### widowed word, so test on various window sizes if you also want this.
 
 ## Welcome page strings
 
 onboarding-welcome-header = Welcome to { -brand-short-name }
 onboarding-start-browsing-button-label = Start Browsing
@@ -20,81 +16,27 @@ onboarding-not-now-button-label = Not no
 
 return-to-amo-subtitle = Great, you’ve got { -brand-short-name }
 # <img data-l10n-name="icon"/> will be replaced with the icon belonging to the extension
 #
 # Variables:
 #   $addon-name (String) - Name of the add-on
 return-to-amo-addon-title = Now let’s get you <img data-l10n-name="icon"/> <b>{ $addon-name }</b>.
 return-to-amo-add-extension-label = Add the Extension
-
-## Multistage 3-screen onboarding flow strings (about:welcome pages)
-
-# The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
-# automatically added to the text inside it. { -brand-short-name } should stay inside the span.
-onboarding-multistage-welcome-header = Welcome to <span data-l10n-name="zap">{ -brand-short-name }</span>
-onboarding-multistage-welcome-subtitle = The fast, safe, and private browser that’s backed by a non-profit.
-onboarding-multistage-welcome-primary-button-label = Start Setup
-onboarding-multistage-welcome-secondary-button-label = Sign in
-onboarding-multistage-welcome-secondary-button-text = Have an account?
-
-# The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
-# automatically added to the text inside it. "default" should stay inside the span.
-onboarding-multistage-set-default-header = Make { -brand-short-name } your <span data-l10n-name="zap">default</span>
-onboarding-multistage-set-default-subtitle = Speed, safety, and privacy every time you browse.
-onboarding-multistage-set-default-primary-button-label = Make Default
-onboarding-multistage-set-default-secondary-button-label = Not now
-
-# The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
-# automatically added to the text inside it. { -brand-short-name } should stay inside the span.
-onboarding-multistage-pin-default-header = Start by making <span data-l10n-name="zap">{ -brand-short-name }</span> a click away
-onboarding-multistage-pin-default-subtitle = Fast, safe, and private browsing every time you use the web.
-# The "settings" here refers to "Windows 10 Settings App" and not the browser's
-onboarding-multistage-pin-default-waiting-subtitle = Choose { -brand-short-name } under Web browser when your settings open
-# The "settings" here refers to "Windows 10 Settings App" and not the browser's
-onboarding-multistage-pin-default-help-text = This will pin { -brand-short-name } to taskbar and open settings
-onboarding-multistage-pin-default-primary-button-label = Make { -brand-short-name } My Primary Browser
-
-# The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
-# automatically added to the text inside it. "more" should stay inside the span.
-onboarding-multistage-import-header = Import your passwords, <br/>bookmarks, and <span data-l10n-name="zap">more</span>
-onboarding-multistage-import-subtitle = Coming from another browser? It’s easy to bring everything to { -brand-short-name }.
-onboarding-multistage-import-primary-button-label = Start Import
-onboarding-multistage-import-secondary-button-label = Not now
-
-# Info displayed in the footer of import settings screen during onboarding flow.
-# This supports welcome screen showing top sites imported from the user's default browser.
-onboarding-import-sites-disclaimer = The sites listed here were found on this device. { -brand-short-name } does not save or sync data from another browser unless you choose to import it.
-
 return-to-amo-add-theme-label = Add the Theme
 
 ## Multistage onboarding strings (about:welcome pages)
 
 # Aria-label to make the "steps" of multistage onboarding visible to screen readers.
 # Variables:
 #   $current (Int) - Number of the current page
 #   $total (Int) - Total number of pages
 onboarding-welcome-steps-indicator =
   .aria-label = Getting started: screen { $current } of { $total }
 
-# The <span data-l10n-name="zap"></span> in this string allows a "zap" underline style to be
-# automatically added to the text inside it. "look" should stay inside the span.
-onboarding-multistage-theme-header = Choose a <span data-l10n-name="zap">look</span>
-onboarding-multistage-theme-subtitle = Personalize { -brand-short-name } with a theme.
-onboarding-multistage-theme-primary-button-label2 = Done
-onboarding-multistage-theme-secondary-button-label = Not now
-
-# Automatic theme uses operating system color settings
-onboarding-multistage-theme-label-automatic = Automatic
-
-onboarding-multistage-theme-label-light = Light
-onboarding-multistage-theme-label-dark = Dark
-# "Firefox Alpenglow" here is the name of the theme, and should be kept in English.
-onboarding-multistage-theme-label-alpenglow = Firefox Alpenglow
-
 # "Hero Text" displayed on left side of welcome screen.
 # The "Fire" in "Fire starts here" plays on the "Fire" in "Firefox".
 # It also signals the passion users bring to Firefox, how they use
 # Firefox to pursue those passions, as well as the boldness in their
 # choice to use Firefox over a larger competitor browser.
 # An alternative title for localization is: "It starts here".
 # This text can be formatted to span multiple lines as needed.
 mr1-welcome-screen-hero-text =
@@ -194,71 +136,16 @@ mr1-onboarding-theme-label-dark = Dark
 # "Alpenglow" here is the name of the theme, and should be kept in English.
 mr1-onboarding-theme-label-alpenglow = Alpenglow
 
 ## Please make sure to split the content of the title attribute into lines whose
 ## width corresponds to about 40 Latin characters, to ensure that the tooltip
 ## doesn't become too long. Line breaks will be preserved when displaying the
 ## tooltip.
 
-## Please make sure to split the content of the title attribute into lines whose
-## width corresponds to about 40 Latin characters, to ensure that the tooltip
-## doesn't become too long. Line breaks will be preserved when displaying the
-## tooltip.
-
-# Tooltip displayed on hover of automatic theme
-onboarding-multistage-theme-tooltip-automatic-2 =
-  .title =
-    Inherit the appearance of your operating
-    system for buttons, menus, and windows.
-
-# Input description for automatic theme
-onboarding-multistage-theme-description-automatic-2 =
-  .aria-description =
-    Inherit the appearance of your operating
-    system for buttons, menus, and windows.
-
-# Tooltip displayed on hover of light theme
-onboarding-multistage-theme-tooltip-light-2 =
-  .title =
-    Use a light appearance for buttons,
-    menus, and windows.
-
-# Input description for light theme
-onboarding-multistage-theme-description-light =
-  .aria-description =
-    Use a light appearance for buttons,
-    menus, and windows.
-
-# Tooltip displayed on hover of dark theme
-onboarding-multistage-theme-tooltip-dark-2 =
-  .title =
-    Use a dark appearance for buttons,
-    menus, and windows.
-
-# Input description for dark theme
-onboarding-multistage-theme-description-dark =
-  .aria-description =
-    Use a dark appearance for buttons,
-    menus, and windows.
-
-# Tooltip displayed on hover of Alpenglow theme
-onboarding-multistage-theme-tooltip-alpenglow-2 =
-  .title =
-    Use a colorful appearance for buttons,
-    menus, and windows.
-
-# Input description for Alpenglow theme
-onboarding-multistage-theme-description-alpenglow =
-  .aria-description =
-    Use a colorful appearance for buttons,
-    menus, and windows.
-
-## Multistage MR1 onboarding strings (MR1 about:welcome pages)
-
 # Tooltip displayed on hover of system theme
 mr1-onboarding-theme-tooltip-system =
   .title =
     Follow the operating system theme
     for buttons, menus, and windows.
 
 # Input description for system theme
 mr1-onboarding-theme-description-system =
--- a/browser/browser/places.ftl
+++ b/browser/browser/places.ftl
@@ -71,27 +71,16 @@ places-sortby-name =
   .accesskey = r
 # places-edit-bookmark and places-edit-generic will show one or the other and can have the same access key.
 places-edit-bookmark =
   .label = Edit Bookmark…
   .accesskey = E
 places-edit-generic =
   .label = Edit…
   .accesskey = E
-places-edit-folder =
-  .label = Rename Folder…
-  .accesskey = e
-places-remove-folder =
-  .label =
-      { $count ->
-          [1] Remove Folder
-         *[other] Remove Folders
-      }
-  .accesskey = m
-
 places-edit-folder2 =
   .label = Edit Folder…
   .accesskey = E
 places-delete-folder =
   .label =
       { $count ->
           [1] Delete Folder
          *[other] Delete Folders
@@ -104,26 +93,16 @@ managed-bookmarks =
 # This label is used when a managed bookmarks folder doesn't have a name.
 managed-bookmarks-subfolder =
   .label = Subfolder
 
 # This label is used for the "Other Bookmarks" folder that appears in the bookmarks toolbar.
 other-bookmarks-folder =
   .label = Other Bookmarks
 
-# Variables:
-# $count (number) - The number of elements being selected for removal.
-places-remove-bookmark =
-  .label =
-      { $count ->
-          [1] Remove Bookmark
-         *[other] Remove Bookmarks
-      }
-  .accesskey = e
-
 places-show-in-folder =
   .label = Show in Folder
   .accesskey = F
 
 # Variables:
 # $count (number) - The number of elements being selected for removal.
 places-delete-bookmark =
   .label =
--- a/browser/browser/policies/policies-descriptions.ftl
+++ b/browser/browser/policies/policies-descriptions.ftl
@@ -10,16 +10,18 @@
 ## in the documentation section in about:policies.
 
 policy-3rdparty = Set policies that WebExtensions can access via chrome.storage.managed.
 
 policy-AllowedDomainsForApps = Define domains allowed to access Google Workspace.
 
 policy-AppAutoUpdate = Enable or disable automatic application update.
 
+policy-AppUpdatePin = Prevent { -brand-short-name } from being updated beyond the specified version.
+
 policy-AppUpdateURL = Set custom app update URL.
 
 policy-Authentication = Configure integrated authentication for websites that support it.
 
 policy-AutoLaunchProtocolsFromOrigins = Define a list of external protocols that can be used from listed origins without prompting the user.
 
 policy-BackgroundAppUpdate2 = Enable or disable the background updater.
 
--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -84,36 +84,16 @@ restart-later = Restart Later
 ##
 ## <img data-l10n-name="icon"/> is going to be replaced by the extension icon.
 ##
 ## Variables:
 ##   $name (String): name of the extension
 
 # This string is shown to notify the user that the password manager setting
 # is being controlled by an extension
-extension-controlled-password-saving = An extension, <img data-l10n-name="icon"/> { $name }, is controlling this setting.
-
-# This string is shown to notify the user that their notifications permission
-# is being controlled by an extension.
-extension-controlled-web-notifications= An extension, <img data-l10n-name="icon"/> { $name }, is controlling this setting.
-
-# This string is shown to notify the user that Container Tabs
-# are being enabled by an extension.
-extension-controlled-privacy-containers = An extension, <img data-l10n-name="icon"/> { $name }, requires Container Tabs.
-
-# This string is shown to notify the user that their content blocking "All Detected Trackers"
-# preferences are being controlled by an extension.
-extension-controlled-websites-content-blocking-all-trackers = An extension, <img data-l10n-name="icon"/> { $name }, is controlling this setting.
-
-# This string is shown to notify the user that their proxy configuration preferences
-# are being controlled by an extension.
-extension-controlled-proxy-config = An extension, <img data-l10n-name="icon"/> { $name }, is controlling how { -brand-short-name } connects to the internet.
-
-# This string is shown to notify the user that the password manager setting
-# is being controlled by an extension
 extension-controlling-password-saving = <img data-l10n-name="icon"/> <strong>{ $name }</strong> controls this setting.
 
 # This string is shown to notify the user that their notifications permission
 # is being controlled by an extension.
 extension-controlling-web-notifications = <img data-l10n-name="icon"/> <strong>{ $name }</strong> controls this setting.
 
 # This string is shown to notify the user that Container Tabs
 # are being enabled by an extension.
@@ -154,20 +134,16 @@ always-check-default =
 
 is-default = { -brand-short-name } is currently your default browser
 is-not-default = { -brand-short-name } is not your default browser
 
 set-as-my-default-browser =
     .label = Make Default…
     .accesskey = D
 
-startup-restore-previous-session =
-    .label = Restore previous session
-    .accesskey = s
-
 startup-restore-windows-and-tabs =
     .label = Open previous windows and tabs
     .accesskey = s
 
 startup-restore-warn-on-quit =
     .label = Warn you when quitting the browser
 
 disable-extension =
@@ -178,20 +154,16 @@ tabs-group-header = Tabs
 ctrl-tab-recently-used-order =
     .label = Ctrl+Tab cycles through tabs in recently used order
     .accesskey = T
 
 open-new-link-as-tabs =
     .label = Open links in tabs instead of new windows
     .accesskey = w
 
-warn-on-close-multiple-tabs =
-    .label = Warn you when closing multiple tabs
-    .accesskey = m
-
 confirm-on-close-multiple-tabs =
     .label = Confirm before closing multiple tabs
     .accesskey = m
 
 # This string is used for the confirm before quitting preference.
 # Variables:
 #   $quitKey (String) - the quit keyboard shortcut, and formatted
 #                       in the same manner as it would appear,
@@ -248,18 +220,16 @@ containers-remove-alert-msg =
 
 containers-remove-ok-button = Remove this Container
 containers-remove-cancel-button = Don’t remove this Container
 
 ## General Section - Language & Appearance
 
 language-and-appearance-header = Language and Appearance
 
-fonts-and-colors-header = Fonts and Colors
-
 preferences-web-appearance-header = Website appearance
 
 preferences-web-appearance-description = Some websites adapt their color scheme based on your preferences. Choose which color scheme you’d like to use for those sites.
 
 preferences-web-appearance-choice-browser = { -brand-short-name } theme
 preferences-web-appearance-choice-system = System theme
 preferences-web-appearance-choice-light = Light
 preferences-web-appearance-choice-dark = Dark
@@ -307,20 +277,16 @@ default-font = Default font
     .accesskey = D
 default-font-size = Size
     .accesskey = S
 
 advanced-fonts =
     .label = Advanced…
     .accesskey = A
 
-colors-settings =
-    .label = Colors…
-    .accesskey = C
-
 # Zoom is a noun, and the message is used as header for a group of options
 preferences-zoom-header = Zoom
 
 preferences-default-zoom = Default zoom
     .accesskey = z
 
 preferences-default-zoom-value =
     .label = { $percentage }%
@@ -703,45 +669,35 @@ choose-bookmark =
 
 ## Home Section - Firefox Home Content Customization
 
 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
 home-prefs-shortcuts-header =
     .label = Shortcuts
 home-prefs-shortcuts-description = Sites you save or visit
 home-prefs-shortcuts-by-option-sponsored =
     .label = Sponsored shortcuts
 
 ## 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 }
 home-prefs-recommended-by-description-new = Exceptional content curated by { $provider }, part of the { -brand-product-name } family
 
 ##
 
 home-prefs-recommended-by-learn-more = How it works
 home-prefs-recommended-by-option-sponsored-stories =
     .label = Sponsored Stories
 
-home-prefs-highlights-header =
-    .label = Highlights
-home-prefs-highlights-description = A selection of sites that you’ve saved or visited
-
 home-prefs-highlights-option-visited-pages =
     .label = Visited Pages
 home-prefs-highlights-options-bookmarks =
     .label = Bookmarks
 home-prefs-highlights-option-most-recent-download =
     .label = Most Recent Download
 home-prefs-highlights-option-saved-to-pocket =
     .label = Pages Saved to { -pocket-brand-name }
@@ -751,17 +707,16 @@ home-prefs-recent-activity-header =
 home-prefs-recent-activity-description = A selection of recent sites and content
 
 # For the "Snippets" feature traditionally on about:home.
 # Alternative translation options: "Small Note" or something that
 # expresses the idea of "a small message, shortened from something else,
 # and non-essential but also not entirely trivial and useless.
 home-prefs-snippets-header =
     .label = Snippets
-home-prefs-snippets-description = Updates from { -vendor-short-name } and { -brand-product-name }
 
 home-prefs-snippets-description-new = Tips and news from { -vendor-short-name } and { -brand-product-name }
 
 home-prefs-sections-rows-option =
     .label =
         { $num ->
             [one] { $num } row
            *[other] { $num } rows
@@ -1151,24 +1106,16 @@ sitedata-disallow-cookies-option =
 
 # This label means 'type of content that is blocked', and is followed by a drop-down list with content types below.
 # The list items are the strings named sitedata-block-*-option*.
 sitedata-block-desc = Type blocked
     .accesskey = T
 
 sitedata-option-block-cross-site-trackers =
     .label = Cross-site trackers
-sitedata-option-block-cross-site-and-social-media-trackers =
-    .label = Cross-site and social media trackers
-sitedata-option-block-cross-site-tracking-cookies-including-social-media =
-    .label = Cross-site tracking cookies — includes social media cookies
-sitedata-option-block-cross-site-cookies-including-social-media =
-    .label = Cross-site cookies — includes social media cookies
-sitedata-option-block-cross-site-and-social-media-trackers-plus-isolate =
-    .label = Cross-site and social media trackers, and isolate remaining cookies
 sitedata-option-block-cross-site-tracking-cookies =
     .label = Cross-site tracking cookies
 sitedata-option-block-cross-site-cookies =
     .label = Cross-site tracking cookies, and isolate other cross-site cookies
 sitedata-option-block-unvisited =
     .label = Cookies from unvisited websites
 sitedata-option-block-all-third-party =
     .label = All third-party cookies (may cause websites to break)
@@ -1265,17 +1212,16 @@ content-blocking-etp-standard-tcp-rollou
   .label = Test pilot our most powerful privacy feature ever
   .accesskey = T
 
 # "Contains" here means "isolates", "limits".
 content-blocking-etp-standard-tcp-rollout-description = Total Cookie Protection contains cookies to the site you’re on, so trackers can’t use them to follow you between sites.
 content-blocking-etp-standard-tcp-rollout-learn-more = Learn more
 
 content-blocking-warning-title = Heads up!
-content-blocking-and-isolating-etp-warning-description = Blocking trackers and isolating cookies could impact the functionality of some sites. Reload a page with trackers to load all content.
 content-blocking-and-isolating-etp-warning-description-2 = This setting may cause some websites to not display content or work correctly. If a site seems broken, you may want to turn off tracking protection for that site to load all content.
 content-blocking-warning-learn-how = Learn how
 
 content-blocking-reload-description = You will need to reload your tabs to apply these changes.
 content-blocking-reload-tabs-button =
   .label = Reload All Tabs
   .accesskey = R
 
@@ -1353,20 +1299,16 @@ permissions-autoplay = Autoplay
 permissions-autoplay-settings =
     .label = Settings…
     .accesskey = t
 
 permissions-block-popups =
     .label = Block pop-up windows
     .accesskey = B
 
-permissions-block-popups-exceptions =
-    .label = Exceptions…
-    .accesskey = E
-
 # "popup" is a misspelling that is more popular than the correct spelling of
 # "pop-up" so it's included as a search keyword, not displayed in the UI.
 permissions-block-popups-exceptions-button =
     .label = Exceptions…
     .accesskey = E
     .searchkeywords = popups
 
 permissions-addon-install-warning =
--- a/browser/browser/preferences/siteDataSettings.ftl
+++ b/browser/browser/preferences/siteDataSettings.ftl
@@ -53,14 +53,13 @@ site-data-remove-shown =
 
 site-data-removing-dialog =
     .title = { site-data-removing-header }
     .buttonlabelaccept = Remove
 
 site-data-removing-header = Removing Cookies and Site Data
 
 site-data-removing-desc = Removing cookies and site data may log you out of websites. Are you sure you want to make the changes?
-
 # Variables:
 #   $baseDomain (String) - The single domain for which data is being removed
 site-data-removing-single-desc = Removing cookies and site data may log you out of websites. Are you sure you want to remove cookies and site data for <strong>{ $baseDomain }</strong>?
 
 site-data-removing-table = Cookies and site data for the following websites will be removed
--- a/browser/browser/protections.ftl
+++ b/browser/browser/protections.ftl
@@ -66,29 +66,19 @@ protections-close-button2 =
   .aria-label = Close
   .title = Close
 
 mobile-app-title = Block ad trackers across more devices
 mobile-app-card-content = Use the mobile browser with built-in protection against ad tracking.
 mobile-app-links = { -brand-product-name } Browser for <a data-l10n-name="android-mobile-inline-link">Android</a> and <a data-l10n-name="ios-mobile-inline-link">iOS</a>
 
 lockwise-title = Never forget a password again
-lockwise-title-logged-in2 = Password Management
-lockwise-header-content = { -lockwise-brand-name } securely stores your passwords in your browser.
 passwords-title-logged-in = Manage your passwords
 passwords-header-content = { -brand-product-name } securely stores your passwords in your browser.
 lockwise-header-content-logged-in = Securely store and sync your passwords to all your devices.
-protection-report-save-passwords-button = Save Passwords
-  .title = Save Passwords on { -lockwise-brand-short-name }
-protection-report-manage-passwords-button = Manage Passwords
-  .title = Manage Passwords on { -lockwise-brand-short-name }
-lockwise-mobile-app-title = Take your passwords everywhere
-lockwise-no-logins-card-content = Use passwords saved in { -brand-short-name } on any device.
-lockwise-app-links = { -lockwise-brand-name } for <a data-l10n-name="lockwise-android-inline-link">Android</a> and <a data-l10n-name="lockwise-ios-inline-link">iOS</a>
-
 protection-report-passwords-save-passwords-button = Save Passwords
   .title = Save Passwords
 protection-report-passwords-manage-passwords-button = Manage Passwords
   .title = Manage Passwords
 
 
 # Variables:
 # $count (Number) - Number of passwords exposed in data breaches.
--- a/browser/browser/sanitize.ftl
+++ b/browser/browser/sanitize.ftl
@@ -73,20 +73,16 @@ item-cache =
     .accesskey = a
 
 item-form-search-history =
     .label = Form & search history
     .accesskey = F
 
 data-section-label = Data
 
-item-site-preferences =
-    .label = Site Preferences
-    .accesskey = S
-
 item-site-settings =
     .label = Site settings
     .accesskey = S
 
 item-offline-apps =
     .label = Offline website data
     .accesskey = O
 
--- a/browser/browser/screenshots.ftl
+++ b/browser/browser/screenshots.ftl
@@ -12,17 +12,16 @@ screenshot-shortcut =
 screenshots-instructions = Drag or click on the page to select a region. Press ESC to cancel.
 screenshots-cancel-button = Cancel
 screenshots-save-visible-button = Save visible
 screenshots-save-page-button = Save full page
 screenshots-download-button = Download
 screenshots-download-button-tooltip = Download screenshot
 screenshots-copy-button = Copy
 screenshots-copy-button-tooltip = Copy screenshot to clipboard
-
 screenshots-download-button-title =
   .title = Download screenshot
 screenshots-copy-button-title =
   .title = Copy screenshot to clipboard
 screenshots-cancel-button-title =
   .title = Cancel
 screenshots-retry-button-title =
   .title = Retry screenshot
--- a/browser/browser/tabContextMenu.ftl
+++ b/browser/browser/tabContextMenu.ftl
@@ -70,36 +70,27 @@ move-to-new-window =
     .label = Move to New Window
     .accesskey = W
 tab-context-close-multiple-tabs =
     .label = Close Multiple Tabs
     .accesskey = M
 tab-context-share-url =
     .label = Share
     .accesskey = h
-tab-context-share-more =
-    .label = More…
 
 ## Variables:
 ##  $tabCount (Number): the number of tabs that are affected by the action.
 
 tab-context-reopen-closed-tabs =
     .label =
         { $tabCount ->
             [1] Reopen Closed Tab
            *[other] Reopen Closed Tabs
         }
     .accesskey = o
-tab-context-close-tabs =
-    .label =
-        { $tabCount ->
-            [1] Close Tab
-           *[other] Close Tabs
-        }
-    .accesskey = C
 tab-context-close-n-tabs =
     .label =
         { $tabCount ->
             [1] Close Tab
            *[other] Close { $tabCount } Tabs
         }
     .accesskey = C
 tab-context-move-tabs =
--- a/browser/browser/upgradeDialog.ftl
+++ b/browser/browser/upgradeDialog.ftl
@@ -1,73 +1,14 @@
 # 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/.
 
 ### Strings for the upgrade dialog that can be displayed on major version change.
 
-## New changes screen
-
-# This title can be explicitly wrapped to control which words are on which line.
-upgrade-dialog-new-title =
-    Say hello to a new { -brand-short-name }
-upgrade-dialog-new-subtitle = Designed to get you where you want to go, faster
-upgrade-dialog-new-item-menu-title = Streamlined toolbar and menus
-upgrade-dialog-new-item-menu-description = Prioritize the important things so you find what you need.
-upgrade-dialog-new-item-tabs-title = Modern tabs
-upgrade-dialog-new-item-tabs-description = Neatly contain information, supporting focus and flexible movement.
-upgrade-dialog-new-item-icons-title = Fresh icons and clearer messages
-upgrade-dialog-new-item-icons-description = Help you find your way with a lighter touch.
-upgrade-dialog-new-primary-default-button = Make { -brand-short-name } my default browser
-upgrade-dialog-new-primary-theme-button = Choose a theme
-upgrade-dialog-new-secondary-button = Not now
-# This string is only shown on Windows 7, where we intentionally suppress the
-# theme selection screen.
-upgrade-dialog-new-primary-win7-button = Okay, got it!
-
-## Pin Firefox screen
-##
-## These title, subtitle and button strings differ between platforms as they
-## match the OS' application context menu item action where Windows uses "pin"
-## and "taskbar" while macOS "keep" and "Dock" (proper noun).
-
-# This title can be explicitly wrapped to control which words are on which line.
-upgrade-dialog-pin-title = { PLATFORM() ->
-    [macos] Keep { -brand-short-name } in your Dock
-   *[other] Pin { -brand-short-name } to your taskbar
-}
-# The English macOS string avoids repeating "Keep" a third time, so if your
-# translations don't repeat anyway, the same string can be used cross-platform.
-upgrade-dialog-pin-subtitle = { PLATFORM() ->
-    [macos] Get easy access to the freshest { -brand-short-name } yet.
-   *[other] Keep the freshest { -brand-short-name } yet within reach.
-}
-upgrade-dialog-pin-primary-button = { PLATFORM() ->
-    [macos] Keep in Dock
-   *[other] Pin to taskbar
-}
-upgrade-dialog-pin-secondary-button = Not now
-
-## Default browser screen
-
-# This title can be explicitly wrapped to control which words are on which line.
-upgrade-dialog-default-title-2 =
-    Make { -brand-short-name } your default
-upgrade-dialog-default-subtitle-2 = Put speed, safety, and privacy on autopilot.
-upgrade-dialog-default-primary-button-2 = Make default browser
-upgrade-dialog-default-secondary-button = Not now
-
-## Theme selection screen
-
-# This title can be explicitly wrapped to control which words are on which line.
-upgrade-dialog-theme-title-2 =
-    Get a clean start with a crisp theme
-upgrade-dialog-theme-system = System theme
-    .title = Follow the operating system theme for buttons, menus, and windows
-
 ## Start screen
 
 # This title can be explicitly wrapped to control which words are on which line.
 upgrade-dialog-start-title = Life in color
 upgrade-dialog-start-subtitle = Vibrant new colorways. Available for a limited time.
 upgrade-dialog-start-primary-button = Explore colorways
 upgrade-dialog-start-secondary-button = Not now
 
@@ -87,22 +28,16 @@ upgrade-dialog-colorway-colorway-tooltip
 upgrade-dialog-colorway-default-theme = Default
 # "Auto" is short for "Automatic"
 upgrade-dialog-colorway-theme-auto = Auto
     .title = Follow the operating system theme for buttons, menus, and windows
 upgrade-dialog-theme-light = Light
     .title = Use a light theme for buttons, menus, and windows
 upgrade-dialog-theme-dark = Dark
     .title = Use a dark theme for buttons, menus, and windows
-upgrade-dialog-theme-alpenglow = Alpenglow
-    .title = Use a dynamic, colorful theme for buttons, menus, and windows
-upgrade-dialog-theme-keep = Keep previous
-    .title = Use the theme you had installed before updating { -brand-short-name }
-upgrade-dialog-theme-primary-button = Save theme
-upgrade-dialog-theme-secondary-button = Not now
 upgrade-dialog-colorway-variation-soft = Soft
     .title = Use this colorway
 upgrade-dialog-colorway-variation-balanced = Balanced
     .title = Use this colorway
 # "Bold" is used in the sense of bravery or courage, not in the sense of
 # emphasized text.
 upgrade-dialog-colorway-variation-bold = Bold
     .title = Use this colorway
deleted file mode 100644
--- a/browser/chrome/browser-region/region.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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/.
-
-# increment this number when anything gets changed in the list below.  This will
-# cause Firefox to re-read these prefs and inject any new handlers into the
-# profile database.  Note that "new" is defined as "has a different URL"; this
-# means that it's not possible to update the name of existing handler, so
-# don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=4
-
-# The default set of protocol handlers for mailto:
-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-
-# The default set of protocol handlers for irc:
-gecko.handlerService.schemes.irc.0.name=Mibbit
-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
-
-# The default set of protocol handlers for ircs:
-gecko.handlerService.schemes.ircs.0.name=Mibbit
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
deleted file mode 100644
--- a/browser/chrome/browser/app-extension-fields.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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/.
-
-# LOCALIZATION NOTE (extension.firefox-compact-light@mozilla.org.name): This is displayed in about:addons -> Appearance
-extension.firefox-compact-light@mozilla.org.name=Light
-extension.firefox-compact-light@mozilla.org.description=A theme with a light color scheme.
-
-# LOCALIZATION NOTE (extension.firefox-compact-dark@mozilla.org.name): This is displayed in about:addons -> Appearance
-extension.firefox-compact-dark@mozilla.org.name=Dark
-extension.firefox-compact-dark@mozilla.org.description=A theme with a dark color scheme.
-
-# LOCALIZATION NOTE (extension.firefox-alpenglow@mozilla.org.name): This is displayed in about:addons -> Appearance
-extension.firefox-alpenglow@mozilla.org.name=Firefox Alpenglow
-extension.firefox-alpenglow@mozilla.org.description=Use a colorful appearance for buttons, menus, and windows.
deleted file mode 100644
--- a/browser/chrome/browser/browser.dtd
+++ /dev/null
@@ -1,156 +0,0 @@
-<!-- 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/. -->
-
-<!-- LOCALIZATION NOTE : FILE This file contains the browser main menu items -->
-<!-- LOCALIZATION NOTE : FILE Do not translate commandkeys -->
-
-<!ENTITY navbarOverflow.label                "More tools…">
-
-<!-- Tab context menu -->
-
-<!ENTITY  listAllTabs.label      "List all tabs">
-
-<!ENTITY tabCmd.label "New Tab">
-<!ENTITY openFileCmd.label "Open File…">
-<!ENTITY printCmd.label "Print…">
-
-<!ENTITY menubarCmd.label "Menu Bar">
-<!ENTITY menubarCmd.accesskey "M">
-<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
-include the word "toolbar" or such, because screen readers already know that
-this container is a toolbar. This avoids double-speaking. -->
-<!ENTITY navbar.accessibleLabel "Navigation">
-<!ENTITY fullScreenCmd.label "Full Screen">
-
-<!ENTITY pictureInPictureHideToggle.label "Hide Picture-in-Picture Toggle">
-<!ENTITY pictureInPictureHideToggle.accesskey "H">
-
-<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
-     for the Firefox Account toolbar menu screen. The `Signed in as` text is
-     followed by the user's email. -->
-<!ENTITY fxa.menu.signin.label "Sign in to &brandProductName;">
-
-<!-- LOCALIZATION NOTE (fxa.service) Used to define the different FxA services
-     for the Firefox Account toolbar menu screen.  -->
-<!ENTITY fxa.service.sendTab.description "Send a tab instantly to any device you’re signed in on.">
-
-<!ENTITY printButton.label            "Print">
-<!ENTITY printButton.tooltip          "Print this page">
-
-<!ENTITY searchItem.title             "Search">
-
-<!-- Toolbar items -->
-<!ENTITY homeButton.label             "Home">
-<!ENTITY homeButton.defaultPage.tooltip "&brandShortName; Home Page">
-
-<!ENTITY historyButton.label            "History">
-
-<!ENTITY downloads.label              "Downloads">
-<!-- LOCALIZATION NOTE (libraryDownloads.label): This label is similar to
-  -  downloads.label, but used in the Library panel. -->
-<!ENTITY libraryDownloads.label       "Downloads">
-
-<!ENTITY webDeveloperMenu.label       "Web Developer">
-
-<!ENTITY newNavigatorCmd.label        "New Window">
-<!ENTITY newPrivateWindow.label     "New Private Window">
-
-<!ENTITY editMenu.label         "Edit">
-<!ENTITY preferencesCmd2.label       "Options">
-<!ENTITY preferencesCmdUnix.label       "Preferences">
-<!ENTITY logins.label                           "Logins and Passwords">
-
-<!ENTITY overflowCustomizeToolbar.label       "Customize Toolbar…">
-<!ENTITY overflowCustomizeToolbar.accesskey   "C">
-
-<!ENTITY historyMenu.label "History">
-
-<!ENTITY appMenuHelp.label "Help">
-
-<!-- LOCALIZATION NOTE (appMenuRemoteTabs.notabs.label): This is shown beneath
-     the name of a device when that device has no open tabs -->
-<!ENTITY appMenuRemoteTabs.notabs.label "No open tabs">
-<!-- LOCALIZATION NOTE (appMenuRemoteTabs.showMore.tooltip):
-     This is shown after the tabs list if we can display more tabs by clicking on the button -->
-<!ENTITY appMenuRemoteTabs.showMore.tooltip "Show more tabs from this device">
-<!-- LOCALIZATION NOTE (appMenuRemoteTabs.showAll.label, appMenuRemoteTabs.showAll.tooltip):
-     This is shown after the tabs list if we can all the remaining tabs by clicking on the button -->
-<!ENTITY appMenuRemoteTabs.showAll.label "Show All">
-<!ENTITY appMenuRemoteTabs.showAll.tooltip "Show all tabs from this device">
-<!-- LOCALIZATION NOTE (appMenuRemoteTabs.tabsnotsyncing.label): This is shown
-     when Sync is configured but syncing tabs is disabled. -->
-<!ENTITY appMenuRemoteTabs.tabsnotsyncing.label "Turn on tab syncing to view a list of tabs from your other devices.">
-<!-- LOCALIZATION NOTE (appMenuRemoteTabs.noclients.subtitle): This is shown
-     when Sync is configured but this appears to be the only device attached to
-     the account. We also show links to download Firefox for android/ios. -->
-<!ENTITY appMenuRemoteTabs.noclients.subtitle "Want to see your tabs from other devices here?">
-<!ENTITY appMenuRemoteTabs.opensyncprefs.label "Open Sync Preferences">
-<!ENTITY appMenuRemoteTabs.welcome.label "View a list of tabs from your other devices.">
-<!ENTITY appMenuRemoteTabs.unverified.label "Your account needs to be verified.">
-<!ENTITY appMenuRemoteTabs.connectdevice.label "Connect Another Device">
-
-<!ENTITY customizeMenu.addToToolbar.label "Add to Toolbar">
-<!ENTITY customizeMenu.addToToolbar.accesskey "A">
-<!-- LOCALIZATION NOTE (customizeMenu.addToOverflowMenu.label,
-     customizeMenu.unpinFromOverflowMenu.label)
-     The overflow menu is the menu that appears if you click the chevron (>> button)
-     in the location bar. -->
-<!ENTITY customizeMenu.addToOverflowMenu.label "Add to Overflow Menu">
-<!ENTITY customizeMenu.addToOverflowMenu.accesskey "M">
-<!ENTITY customizeMenu.unpinFromOverflowMenu.label "Unpin from Overflow Menu">
-<!ENTITY customizeMenu.unpinFromOverflowMenu.accesskey "U">
-<!ENTITY customizeMenu.addMoreItems.label "Add More Items…">
-<!ENTITY customizeMenu.addMoreItems.accesskey "A">
-
-<!-- LOCALIZATION NOTE (moreMenu.label) This label is used in the new Photon
-    app (hamburger) menu. When clicked, it opens a subview that contains
-    secondary commands. -->
-<!ENTITY moreMenu.label "More">
-
-<!ENTITY contentSearchSubmit.tooltip  "Submit search">
-
-<!-- LOCALIZATION NOTE (searchInput.placeholder):
-     This string is displayed in the search box when the input field is empty. -->
-<!ENTITY searchInput.placeholder      "Search">
-<!ENTITY searchIcon.tooltip           "Search">
-
-<!ENTITY openLinkCmdInTab.accesskey   "T">
-
-<!ENTITY fullZoom.label                 "Zoom">
-
-<!ENTITY sidebarCloseButton.tooltip     "Close sidebar">
-
-<!ENTITY allowPopups.accesskey "p">
-<!-- On Windows we use the term "Options" to describe settings, but
-     on Linux and Mac OS X we use "Preferences" - carry that distinction
-     over into this string, which is used in the "popup blocked" info bar . -->
-<!ENTITY editPopupSettingsUnix.label "Edit Pop-up Blocker Preferences…">
-<!ENTITY editPopupSettings.label "Edit Pop-up Blocker Options…">
-<!ENTITY editPopupSettings.accesskey "E">
-<!ENTITY dontShowMessage.accesskey "D">
-
-<!ENTITY findOnCmd.label     "Find in This Page…">
-
-<!ENTITY spellAddDictionaries.label "Add Dictionaries…">
-<!ENTITY spellAddDictionaries.accesskey "A">
-
-<!-- Name for the tabs toolbar as spoken by screen readers.
-     The word "toolbar" is appended automatically and should not be contained below! -->
-<!ENTITY tabsToolbar.label "Browser tabs">
-
-<!ENTITY uiTour.infoPanel.close "Close">
-
-<!ENTITY panicButton.thankyou.msg1                "Your recent history is cleared.">
-<!ENTITY panicButton.thankyou.msg2                "Safe browsing!">
-<!ENTITY panicButton.thankyou.buttonlabel         "Thanks!">
-
-<!ENTITY sendToDevice.syncNotReady.label "Syncing Devices…">
-
-<!ENTITY libraryButton.tooltip "View history, saved bookmarks, and more">
-
-<!-- LOCALIZATION NOTE: (accessibilityIndicator.tooltip): This is used to
-     display a tooltip for accessibility indicator in toolbar/tabbar. It is also
-     used as a textual label for the indicator used by assistive technology
-     users. -->
-<!ENTITY accessibilityIndicator.tooltip "Accessibility Features Enabled">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -276,19 +276,16 @@ popupWarning.message=#1 prevented this s
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The singular form is left empty for English, since the number of blocked pop-ups is always greater than 1.
 # #1 is brandShortName and #2 is the number of pop-ups blocked.
 popupWarning.exceeded.message=;#1 prevented this site from opening more than #2 pop-up windows.
 popupWarningButton=Options
 popupWarningButton.accesskey=O
 popupWarningButtonUnix=Preferences
 popupWarningButtonUnix.accesskey=P
-popupAllow=Allow pop-ups for %S
-popupBlock=Block pop-ups for %S
-popupWarningDontShowFromMessage=Don’t show this message when pop-ups are blocked
 popupShowPopupPrefix=Show ‘%S’
 
 # LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
 geolocationLastAccessIndicatorText=Last access %S
 
 # LOCALIZATION NOTE (openProtocolHandlerPermissionEntryLabel): %S is the scheme of the protocol the site may open an application for. For example: mailto
 openProtocolHandlerPermissionEntryLabel=%S:// links
 
@@ -383,23 +380,16 @@ refreshBlocked.redirectLabel=%S prevente
 # %S is the keyboard shortcut for "Show All Bookmarks"
 bookmarksMenuButton.tooltip=Show your bookmarks (%S)
 
 # Downloads button tooltip
 # LOCALIZATION NOTE (downloads.tooltip):
 # %S is the keyboard shortcut for "Downloads"
 downloads.tooltip=Display the progress of ongoing downloads (%S)
 
-# Print button tooltip on OS X
-# LOCALIZATION NOTE (printButton.tooltip):
-# Use the unicode ellipsis char, \u2026,
-# or use "..." if \u2026 doesn't suit traditions in your locale.
-# %S is the keyboard shortcut for "Print"
-printButton.tooltip=Print this page… (%S)
-
 # New Window button tooltip
 # LOCALIZATION NOTE (newWindowButton.tooltip):
 # %S is the keyboard shortcut for "New Window"
 newWindowButton.tooltip=Open a new window (%S)
 
 # New Tab button tooltip
 # LOCALIZATION NOTE (newTabButton.tooltip):
 # %S is the keyboard shortcut for "New Tab"
@@ -422,27 +412,16 @@ canvas.block=Block
 canvas.block.accesskey=B
 canvas.allow2=Allow
 canvas.allow2.accesskey=A
 canvas.remember2=Remember this decision
 
 # WebAuthn prompts
 # LOCALIZATION NOTE (webauthn.registerPrompt2): %S is hostname
 webauthn.registerPrompt2=%S wants to register an account with one of your security keys. You can connect and authorize one now, or cancel.
-# LOCALIZATION NOTE (webauthn.registerDirectPrompt2):
-# %1$S is hostname. %2$S is brandShortName.
-# The website is asking for extended information about your
-# hardware authenticator that shouldn't be generally necessary. Permitting
-# this is safe if you only use one account at this website. If you have
-# multiple accounts at this website, and you use the same hardware
-# authenticator, then the website could link those accounts together.
-# And this is true even if you use a different profile / browser (or even Tor
-# Browser). To avoid this, you should use different hardware authenticators
-# for different accounts on this website.
-webauthn.registerDirectPrompt2=%1$S is requesting extended information about your security key, which may affect your privacy.\n\n%2$S can anonymize this for you, but the website might decline this key. If declined, you can try again.
 # LOCALIZATION NOTE (webauthn.registerDirectPrompt3):
 # %S is hostname.
 # The website is asking for extended information about your
 # hardware authenticator that shouldn't be generally necessary. Permitting
 # this is safe if you only use one account at this website. If you have
 # multiple accounts at this website, and you use the same hardware
 # authenticator, then the website could link those accounts together.
 # And this is true even if you use a different profile / browser (or even Tor
@@ -689,21 +668,16 @@ troubleshootModeRestartButton=Restart
 # Encoding" menu in the main Firefox button on Windows. Any other value will
 # hide it. Regardless of the value of this setting, the "Text Encoding"
 # menu will always be accessible via the "Web Developer" menu.
 # This is not a string to translate; it just controls whether the menu shows
 # up in the Firefox button. If users frequently use the "Text Encoding"
 # menu, set this to "true". Otherwise, you can leave it as "false".
 browser.menu.showCharacterEncoding=false
 
-# Mozilla data reporting notification (Telemetry, Firefox Health Report, etc)
-dataReportingNotification.message       = %1$S automatically sends some data to %2$S so that we can improve your experience.
-dataReportingNotification.button.label  = Choose What I Share
-dataReportingNotification.button.accessKey  = C
-
 # Process hang reporter
 # LOCALIZATION NOTE (processHang.selected_tab.label): %1$S is the name of the product (e.g., Firefox)
 processHang.selected_tab.label = This page is slowing down %1$S. To speed up your browser, stop this page.
 # LOCALIZATION NOTE (processHang.nonspecific_tab.label): %1$S is the name of the product (e.g., Firefox)
 processHang.nonspecific_tab.label = A web page is slowing down %1$S. To speed up your browser, stop that page.
 # LOCALIZATION NOTE (processHang.specific_tab.label): %1$S is the title of the tab.
 # %2$S is the name of the product (e.g., Firefox)
 processHang.specific_tab.label = “%1$S” is slowing down %2$S. To speed up your browser, stop that page.
@@ -921,35 +895,29 @@ userContextPersonal.accesskey = P
 userContextWork.accesskey = W
 userContextBanking.accesskey = B
 userContextShopping.accesskey = S
 userContextNone.accesskey = N
 
 userContext.aboutPage.label = Manage Containers
 userContext.aboutPage.accesskey = O
 
-userContextOpenLink.label = Open Link in New %S Tab
-
 muteTab.label = Mute Tab
 muteTab.accesskey = M
 unmuteTab.label = Unmute Tab
 unmuteTab.accesskey = m
-playTab.label = Play Tab
-playTab.accesskey = l
 
 muteSelectedTabs2.label = Mute Tabs
 # LOCALIZATION NOTE (muteSelectedTabs2.accesskey): The accesskey should
 # match the accesskey for muteTab.accesskey
 muteSelectedTabs2.accesskey = M
 unmuteSelectedTabs2.label = Unmute Tabs
 # LOCALIZATION NOTE (unmuteSelectedTabs2.accesskey): The accesskey should
 # match the accesskey for unmuteTab.accesskey
 unmuteSelectedTabs2.accesskey = m
-playTabs.label = Play Tabs
-playTabs.accesskey = y
 
 # LOCALIZATION NOTE (sendTabsToDevice.label):
 # Semi-colon list of plural forms.
 # See: https://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of tabs sent to the device.
 sendTabsToDevice.label = Send tab to device;Send #1 tabs to device
 sendTabsToDevice.accesskey = n
 
@@ -1010,44 +978,31 @@ midi.shareSysexWithFile = Allow this loc
 # LOCALIZATION NOTE (midi.shareSysexWithSite): %S is the name of the site URL (https://...) requesting MIDI access
 midi.shareSysexWithSite = Allow %S to access your MIDI devices and send/receive SysEx messages?
 
 # LOCALIZATION NOTE (panel.back):
 # This is used by screen readers to label the "back" button in various browser
 # popup panels, including the sliding subviews of the main menu.
 panel.back = Back
 
-storageAccess.Allow.label = Allow Access
-storageAccess.Allow.accesskey = A
-storageAccess.DontAllow.label = Block Access
-storageAccess.DontAllow.accesskey = B
-# LOCALIZATION NOTE (storageAccess3.message, storageAccess.hintText):
-# %1$S and %3$S are both the name of the site URL (www.site1.example) trying to track the user's activity.
-# %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
-storageAccess3.message = Will you allow %1$S to use cookies and site data on %2$S? Allowing this may let %3$S track what you do on this site.
-storageAccess.hintText = You should block access if you don’t trust or recognize %1$S.
-
-
-
 storageAccess1.Allow.label = Allow
 storageAccess1.Allow.accesskey = A
 storageAccess1.DontAllow.label = Block
 storageAccess1.DontAllow.accesskey = B
 # LOCALIZATION NOTE (storageAccess4.message, storageAccess1.hintText):
 # %1$S is the name of the site URL (www.site1.example) trying to track the user's activity.
 # %2$S is the name of the site URL (www.site2.example) that the user is visiting.  This is the same domain name displayed in the address bar.
 storageAccess4.message = Allow %1$S to use its cookies on %2$S?
 storageAccess1.hintText = You may want to block access if it’s not clear why %1$S needs this data.
 
 
 
 confirmationHint.sendToDevice.label = Sent!
 confirmationHint.copyURL.label = Copied to clipboard!
 confirmationHint.pageBookmarked2.label = Saved to bookmarks
-confirmationHint.addSearchEngine.label = Search engine added!
 confirmationHint.pinTab.label = Pinned!
 confirmationHint.pinTab.description = Right-click the tab to unpin it.
 confirmationHint.passwordSaved.label = Password saved!
 confirmationHint.loginRemoved.label = Login removed!
 confirmationHint.breakageReport.label = Report sent. Thank you!
 
 # LOCALIZATION NOTE (gnomeSearchProviderSearch):
 # Used for search by Gnome Shell activity screen, %S is a searched string.
--- a/browser/chrome/browser/customizableui/customizableWidgets.properties
+++ b/browser/chrome/browser/customizableui/customizableWidgets.properties
@@ -1,42 +1,24 @@
 # 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/.
 
 history-panelmenu.label = History
 # LOCALIZATION NOTE(history-panelmenu.tooltiptext2): %S is the keyboard shortcut
 history-panelmenu.tooltiptext2 = Show your history (%S)
 
-remotetabs-panelmenu.label = Synced Tabs
-remotetabs-panelmenu.tooltiptext2 = Show tabs from other devices
-
-privatebrowsing-button.label = New Private Window
-# LOCALIZATION NOTE(privatebrowsing-button.tooltiptext): %S is the keyboard shortcut
-privatebrowsing-button.tooltiptext = Open a new Private Browsing window (%S)
-
-save-page-button.label = Save Page
-# LOCALIZATION NOTE(save-page-button.tooltiptext3): %S is the keyboard shortcut
-save-page-button.tooltiptext3 = Save this page (%S)
-
 find-button.label = Find
 # LOCALIZATION NOTE(find-button.tooltiptext3): %S is the keyboard shortcut.
 find-button.tooltiptext3 = Find in this page (%S)
 
-open-file-button.label = Open File
-# LOCALIZATION NOTE (open-file-button.tooltiptext3): %S is the keyboard shortcut.
-open-file-button.tooltiptext3 = Open a file (%S)
-
 developer-button.label = Developer
 # LOCALIZATION NOTE(developer-button.tooltiptext): %S is the keyboard shortcut
 developer-button.tooltiptext2 = Open Web developer tools (%S)
 
-profiler-button.label = Profiler
-profiler-button.tooltiptext = Record a performance profile
-
 sidebar-button.label = Sidebars
 sidebar-button.tooltiptext2 = Show sidebars
 
 zoom-controls.label = Zoom Controls
 zoom-controls.tooltiptext2 = Zoom controls
 
 zoom-out-button.label = Zoom out
 # LOCALIZATION NOTE(zoom-out-button.tooltiptext2): %S is the keyboard shortcut.
@@ -59,17 +41,14 @@ cut-button.tooltiptext2 = Cut (%S)
 copy-button.label = Copy
 # LOCALIZATION NOTE(copy-button.tooltiptext2): %S is the keyboard shortcut.
 copy-button.tooltiptext2 = Copy (%S)
 
 paste-button.label = Paste
 # LOCALIZATION NOTE(paste-button.tooltiptext2): %S is the keyboard shortcut.
 paste-button.tooltiptext2 = Paste (%S)
 
-email-link-button.label = Email Link
-email-link-button.tooltiptext3 = Email a link to this page
-
 panic-button.label = Forget
 panic-button.tooltiptext = Forget about some browsing history
 
 toolbarspring.label = Flexible Space
 toolbarseparator.label = Separator
 toolbarspacer.label = Space
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -75,29 +75,8 @@ sizeUnknown=Unknown size
 # "Canceled - 222.net", "1.1 MB - website2.com", or "Paused -  1.1 MB".  Note
 # that we use a wider space after the separator when it is followed by a number,
 # just to avoid visually confusing it with with a minus sign with some fonts.
 # If you use a different separator, this might not be necessary.  However, there
 # is usually no need to change the separator or the order of the substitutions,
 # even for right-to-left languages, unless the defaults are not suitable.
 statusSeparator=%1$S \u2014 %2$S
 statusSeparatorBeforeNumber=%1$S \u2014  %2$S
-
-# LOCALIZATION NOTE (otherDownloads3):
-# This is displayed in an item at the bottom of the Downloads Panel when
-# there are more downloads than can fit in the list in the panel. Use a
-# semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/Localization_and_Plurals
-otherDownloads3=%1$S file downloading;%1$S files downloading
-
-# LOCALIZATION NOTE (showLabel, showMacLabel):
-# This is displayed when you hover a download item in the Library widget view.
-# showMacLabel is only shown on Mac OSX.
-showLabel=Open Containing Folder
-showMacLabel=Open In Finder
-# LOCALIZATION NOTE (openFileLabel):
-# Displayed when hovering a complete download, indicates that it's possible to
-# open the file using an app available in the system.
-openFileLabel=Open File
-# LOCALIZATION NOTE (retryLabel):
-# Displayed when hovering a download which is able to be retried by users,
-# indicates that it's possible to download this file again.
-retryLabel=Retry Download
deleted file mode 100644
--- a/browser/chrome/browser/places/places.dtd
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- 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/. -->
-
-<!-- LOCALIZATION NOTE (places.library.title): use "Library", "Archive" or "Repository" -->
-<!ENTITY places.library.title  "Library">
-<!ENTITY places.library.width  "700">
-<!ENTITY places.library.height "500">
-<!ENTITY organize.label        "Organize">
-<!ENTITY organize.accesskey    "O">
-<!ENTITY organize.tooltip      "Organize your bookmarks">
-
-<!ENTITY file.close.label               "Close">
-<!ENTITY file.close.accesskey           "C">
-<!ENTITY cmd.close.key                  "w">
-<!ENTITY views.label                    "Views">
-<!ENTITY views.accesskey                "V">
-<!ENTITY views.tooltip                  "Change your view">
-<!ENTITY view.columns.label             "Show Columns">
-<!ENTITY view.columns.accesskey         "C">
-<!ENTITY view.sort.label                "Sort">
-<!ENTITY view.sort.accesskey            "S">
-<!ENTITY view.unsorted.label            "Unsorted">
-<!ENTITY view.unsorted.accesskey        "U">
-<!ENTITY view.sortAscending.label       "A > Z Sort Order">
-<!ENTITY view.sortAscending.accesskey   "A">
-<!ENTITY view.sortDescending.label      "Z > A Sort Order">
-<!ENTITY view.sortDescending.accesskey  "Z">
-
-<!ENTITY importBookmarksFromHTML.label     "Import Bookmarks from HTML…">
-<!ENTITY importBookmarksFromHTML.accesskey "I">
-<!ENTITY exportBookmarksToHTML.label       "Export Bookmarks to HTML…">
-<!ENTITY exportBookmarksToHTML.accesskey   "E">
-<!ENTITY importOtherBrowser.label          "Import Data from Another Browser…">
-<!ENTITY importOtherBrowser.accesskey      "A">
-
-<!ENTITY cmd.backup.label               "Backup…">
-<!ENTITY cmd.backup.accesskey           "B">
-<!ENTITY cmd.restore2.label             "Restore">
-<!ENTITY cmd.restore2.accesskey         "R">
-<!ENTITY cmd.restoreFromFile.label      "Choose File…">
-<!ENTITY cmd.restoreFromFile.accesskey  "C">
-
-<!ENTITY col.name.label          "Name">
-<!ENTITY col.tags.label          "Tags">
-<!ENTITY col.url.label           "Location">
-<!ENTITY col.mostrecentvisit.label "Most Recent Visit">
-<!ENTITY col.visitcount.label    "Visit Count">
-<!ENTITY col.dateadded.label     "Added">
-<!ENTITY col.lastmodified.label  "Last Modified">
-
-<!ENTITY cmd.find.key  "f">
-
-<!ENTITY maintenance.label      "Import and Backup">
-<!ENTITY maintenance.accesskey  "I">
-<!ENTITY maintenance.tooltip    "Import and backup your bookmarks">
-
-<!ENTITY backButton.tooltip  "Go back">
-
-<!ENTITY forwardButton.tooltip  "Go forward">
-
-<!ENTITY detailsPane.selectAnItemText.description "Select an item to view and edit its properties">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -47,20 +47,16 @@ detailsPane.noItems=No items
 # LOCALIZATION NOTE (detailsPane.itemsCountLabel): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 number of items
 # example: 111 items
 detailsPane.itemsCountLabel=One item;#1 items
 
 # LOCALIZATION NOTE (lockPrompt.text)
 # %S will be replaced with the application name.
-lockPrompt.title=Browser Startup Error
-
-# LOCALIZATION NOTE (lockPrompt.text)
-# %S will be replaced with the application name.
 lockPrompt.text=The bookmarks and history system will not be functional because one of %S’s files is in use by another application. Some security software can cause this problem.
 
 # LOCALIZATION NOTE (cmd.deleteSinglePage.accesskey,
 # cmd.deleteMultiplePages.accesskey): these accesskeys can use the same
 # character, since they're never displayed at the same time
 cmd.deleteSinglePage.label=Delete Page
 cmd.deleteSinglePage.accesskey=D
 cmd.deleteMultiplePages.label=Delete Pages
--- a/browser/chrome/browser/tabbrowser.properties
+++ b/browser/chrome/browser/tabbrowser.properties
@@ -1,80 +1,27 @@
 # 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/.
 
 tabs.emptyTabTitle=New Tab
 tabs.emptyPrivateTabTitle=Private Browsing
 tabs.closeTab=Close Tab
 tabs.close=Close
-tabs.closeTitleTabs=Close tabs?
-tabs.closeTabsAndQuitTitle=Close tabs and quit?
-tabs.closeTabsAndQuitTitleWin=Close tabs and exit?
-# LOCALIZATION NOTE (tabs.closeWarningMultipleTabs):
-# Semicolon-separated list of plural forms. See:
-# http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# The singular form is not considered since this string is used only for
-# multiple tabs.
-tabs.closeWarningMultipleTabs=;You are about to close #1 tabs.
-# LOCALIZATION NOTE (tabs.closeWarningMultipleTabsSessionRestore):
-# Semicolon-separated list of plural forms. See:
-# http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# The forms for 0 or 1 items are not considered since this string is used only
-# for multiple tabs.
-# If
-#   "Tabs in non-private windows will be restored when you restart"
-# is difficult to translate, you could translate
-#   "Tabs (except those in private windows) will be restored when you restart"
-# instead.
-tabs.closeWarningMultipleTabsSessionRestore=;You are about to close #1 tabs. Tabs in non-private windows will be restored when you restart.
 
 # This section applies when closing a window with more than one tab open,
 # or when quitting when only one window is open.
 # LOCALIZATION NOTE (tabs.closeTabsTitle):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The singular form is not considered since this string is used only for
 # multiple tabs.
 tabs.closeTabsTitle=;Close #1 tabs?
 tabs.closeTabsConfirmCheckbox=Confirm before closing multiple tabs
 tabs.closeButtonMultiple=Close tabs
-tabs.closeWarningPrompt=Warn when closing multiple tabs
-
-# LOCALIZATION NOTE (tabs.closeWarningMultipleWindows2):
-# Semicolon-separated list of plural forms. See:
-# http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# The forms for 0 or 1 items are not considered since this string is used only for
-# multiple windows. The %S replacement form will be replaced with the contents
-# of tabs.closeWarningMultipleWindowsTabSnippet, which will contain the number
-# of tabs in these windows.
-# Note that every one of these plural forms must contain one instance of '%S'.
-tabs.closeWarningMultipleWindows2=;You are about to close #1 windows %S.
-# LOCALIZATION NOTE (tabs.closeWarningMultipleWindowsSessionRestore3):
-# Semicolon-separated list of plural forms. See:
-# http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# The forms for 0 or 1 items are not considered since this string is used only for
-# multiple windows. The %S replacement form will be replaced with the contents
-# of tabs.closeWarningMultipleWindowsTabSnippet, which will contain the number
-# of tabs in these windows.
-# If
-#   "Tabs in non-private windows will be restored when you restart"
-# is difficult to translate, you could translate
-#   "Tabs (except those in private windows) will be restored when you restart"
-# instead.
-# Note that every one of these plural forms must contain one instance of '%S'.
-tabs.closeWarningMultipleWindowsSessionRestore3=;You are about to close #1 windows %S. Tabs in non-private windows will be restored when you restart.
-
-# LOCALIZATION NOTE (tabs.closeWarningMultipleWindowsTabSnippet):
-# Semicolon-separated list of plural forms. See:
-# http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# The singular form is not considered since this string is used only for
-# multiple windows which must contain multiple tabs (in total).
-# This string will be inserted in tabs.closeWarningMultipleWindows2
-tabs.closeWarningMultipleWindowsTabSnippet=;with #1 tabs
 
 # This section applies when quitting using the menu and multiple windows are open.
 # LOCALIZATION NOTE (tabs.closeTitleTabs):
 # Semicolon-separated list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # The forms for 0 or 1 items are not considered since this string is used only for
 # multiple windows. The %S replacement form will be replaced with the contents
 tabs.closeWindowsTitle=;Close #1 windows?
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -32,14 +32,13 @@ externalProtocolChkMsg=Remember my choic
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 harmfulBlocked=The site at %S has been reported as a potentially harmful site and has been blocked based on your security preferences.
 unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 xfoBlocked=This page has an X-Frame-Options policy that prevents it from being loaded in this context.
 corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
-remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
 ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
 sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
 inadequateSecurityError=The website tried to negotiate an inadequate level of security.
 blockedByPolicy=Your organization has blocked access to this page or website.
 networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired.
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -168,18 +168,16 @@ was trying to connect. -->
 
 <!ENTITY corruptedContentErrorv2.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 <!ENTITY securityOverride.exceptionButton1Label "Accept the Risk and Continue">
 
 <!ENTITY errorReporting.automatic2 "Report errors like this to help Mozilla identify and block malicious sites">
 <!ENTITY errorReporting.learnMore "Learn more…">
 
-<!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the website owners to inform them of this problem.</li></ul></p>">
-
 <!-- LOCALIZATION NOTE (sslv3Used.longDesc2) - Do not translate
      "SSL_ERROR_UNSUPPORTED_VERSION". -->
 <!ENTITY sslv3Used.longDesc2 "Advanced info: SSL_ERROR_UNSUPPORTED_VERSION">
 
 <!ENTITY certerror.pagetitle2  "Warning: Potential Security Risk Ahead">
 <!ENTITY certerror.sts.pagetitle  "Did Not Connect: Potential Security Issue">
 <!ENTITY certerror.whatShouldIDo.badStsCertExplanation1 "<span class='hostname'></span> has a security policy called HTTP Strict Transport Security (HSTS), which means that &brandShortName; can only connect to it securely. You can’t add an exception to visit this site.">
 <!ENTITY certerror.copyToClipboard.label "Copy text to clipboard">
@@ -196,13 +194,9 @@ was trying to connect. -->
 <!ENTITY certerror.mitm.whatCanYouDoAboutIt3 "If you are not familiar with <span class='mitm-name'/>, then this could be an attack and you should not continue to the site.">
 <!ENTITY certerror.mitm.sts.whatCanYouDoAboutIt3 "If you are not familiar with <span class='mitm-name'/>, then this could be an attack, and there is nothing you can do to access the site.">
 
 <!ENTITY clockSkewError.longDesc "Your computer thinks it is <span id='wrongSystemTime_systemDate1'/>, which prevents &brandShortName; from connecting securely. To visit <span class='hostname'></span>, update your computer clock in your system settings to the current date, time, and time zone, and then refresh <span class='hostname'></span>.">
 
 <!ENTITY prefReset.longDesc "It looks like your network security settings might be causing this. Do you want the default settings to be restored?">
 <!ENTITY prefReset.label "Restore default settings">
 
-<!ENTITY enableTls10.longDesc "This website might not support the TLS 1.2 protocol, which is the minimum version supported by &brandShortName;. Enabling TLS 1.0 and TLS 1.1 might allow this connection to succeed.">
-<!ENTITY enableTls10.note "TLS 1.0 and TLS 1.1 will be permanently disabled in a future release.">
-<!ENTITY enableTls10.label "Enable TLS 1.0 and 1.1">
-
 <!ENTITY networkProtocolError.longDesc "<p>The page you are trying to view cannot be shown because an error in the network protocol was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
deleted file mode 100644
--- a/browser/profile/bookmarks.inc
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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/.
-#filter emptyLines
-
-# LOCALIZATION NOTE: The 'en-US' strings in the URLs will be replaced with
-# your locale code, and link to your translated pages as soon as they're
-# live.
-
-#define bookmarks_title Bookmarks
-#define bookmarks_heading Bookmarks
-
-#define bookmarks_toolbarfolder Bookmarks Toolbar Folder
-#define bookmarks_toolbarfolder_description Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
-
-# LOCALIZATION NOTE (getting_started):
-# link title for https://www.mozilla.org/en-US/firefox/central/
-#define getting_started Getting Started
-
-# LOCALIZATION NOTE (firefox_heading):
-# Firefox links folder name
-#define firefox_heading Mozilla Firefox
-
-# LOCALIZATION NOTE (firefox_get_help):
-# link title for https://www.mozilla.org/en-US/firefox/help/
-#define firefox_get_help Get Help
-
-# LOCALIZATION NOTE (firefox_customize):
-# link title for https://www.mozilla.org/en-US/firefox/customize/
-#define firefox_customize Customize Firefox
-
-# LOCALIZATION NOTE (firefox_community):
-# link title for https://www.mozilla.org/en-US/contribute/
-#define firefox_community Get Involved
-
-# LOCALIZATION NOTE (firefox_about):
-# link title for https://www.mozilla.org/en-US/about/
-#define firefox_about About Us
-
-# LOCALIZATION NOTE (nightly_heading):
-# Firefox Nightly links folder name
-#define nightly_heading Firefox Nightly Resources
-
-# LOCALIZATION NOTE (nightly_blog):
-# Nightly builds only, link title for https://blog.nightly.mozilla.org/
-#define nightly_blog Firefox Nightly blog
-
-# LOCALIZATION NOTE (bugzilla):
-# Nightly builds only, link title for https://bugzilla.mozilla.org/
-#define bugzilla Mozilla Bug Tracker
-
-# LOCALIZATION NOTE (mdn):
-# Nightly builds only, link title for https://developer.mozilla.org/
-#define mdn Mozilla Developer Network
-
-# LOCALIZATION NOTE (nightly_tester_tools):
-# Nightly builds only, link title for https://addons.mozilla.org/en-US/firefox/addon/nightly-tester-tools/
-#define nightly_tester_tools Nightly Tester Tools
-
-# LOCALIZATION NOTE (crashes):
-# Nightly builds only, link title for about:crashes
-#define crashes All your crashes
-
-# LOCALIZATION NOTE (planet):
-# Nightly builds only, link title for https://planet.mozilla.org/
-#define planet Planet Mozilla
-
-#unfilter emptyLines
--- a/calendar/calendar/preferences.ftl
+++ b/calendar/calendar/preferences.ftl
@@ -118,23 +118,16 @@ week-6-label =
     .label = 6 weeks
 
 previous-weeks-label =
     .value = Previous weeks to show:
     .accesskey = P
 
 todaypane-legend = Today Pane
 
-# Note: "Upcoming" is the name of a section and the translation must match the
-# translation of that section name (calendar.upcoming.button.label). Also,
-# it should be upper case (as a proper name) if the target language permits.
-soon-label =
-    .value = The Upcoming section shows:
-    .accesskey = U
-
 agenda-days =
     .value = The agenda shows:
     .accesskey = g
 
 event-task-legend = Events and Tasks
 
 default-length-label =
     .value = Default Event and Task Length:
--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -8,17 +8,16 @@
 
 <!ENTITY calendar.newevent.button.tooltip         "Create a new event" >
 <!ENTITY calendar.newtask.button.tooltip          "Create a new task" >
 
 <!ENTITY calendar.unifinder.showcompletedtodos.label "Show completed Tasks">
 
 <!ENTITY calendar.today.button.label          "Today">
 <!ENTITY calendar.tomorrow.button.label       "Tomorrow">
-<!ENTITY calendar.upcoming.button.label       "Upcoming">
 
 <!ENTITY calendar.events.filter.all.label "All Events">
 <!ENTITY calendar.events.filter.today.label "Today's Events">
 <!ENTITY calendar.events.filter.future.label "All Future Events">
 <!ENTITY calendar.events.filter.current.label "Currently Selected Day">
 <!ENTITY calendar.events.filter.currentview.label "Events in Current View">
 <!ENTITY calendar.events.filter.next7Days.label "Events in the Next 7 Days">
 <!ENTITY calendar.events.filter.next14Days.label "Events in the Next 14 Days">
@@ -365,18 +364,16 @@
 <!ENTITY calendarproperties.unsubscribe.accesskey          "U">
 
 <!-- Calendar Publish Dialog -->
 <!ENTITY calendar.publish.dialog.title              "Publish Calendar">
 <!ENTITY calendar.publish.url.label                 "Publishing URL">
 <!ENTITY calendar.publish.publish.button      "Publish">
 <!ENTITY calendar.publish.close.button      "Close">
 
-<!ENTITY calendar.publish.example.url.description   "Something like http://www.myserver.com/webdav/test.ics">
-
 <!-- Select Calendar Dialog -->
 <!ENTITY calendar.select.dialog.title    "Select Calendar">
 
 <!-- Error reporting -->
 <!ENTITY calendar.error.detail "Details…">
 <!ENTITY calendar.error.code "Error code:">
 <!ENTITY calendar.error.description "Description:">
 <!ENTITY calendar.error.title "An error has occurred">
--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -187,19 +187,17 @@ tooltipCompleted=Completed:
 New=New
 Open=Open
 filepickerTitleImport=Import
 filepickerTitleExport=Export
 
 # Filters for export/import/open file picker.  %1$S will be replaced with
 # wildmat used to filter files by extension, such as (*.html; *.htm).
 filterIcs=iCalendar (%1$S)
-filterXml=XML Document (%1$S)
 filterHtml=Web Page (%1$S)
-filterOutlookCsv=Outlook Comma Separated Values (%1$S)
 
 # Remote calendar errors
 genericErrorTitle=An error has occurred
 httpPutError=Publishing the calendar file failed.\nStatus code: %1$S: %2$S
 otherPutError=Publishing the calendar file failed.\nStatus code: 0x%1$S
 
 # LOCALIZATION NOTE (readOnlyMode):
 # used for an message like 'There has been an error reading data for calendar: Home. It has been...'
@@ -244,104 +242,16 @@ caldavRequestStatusCodeString409=Resourc
 caldavRequestStatusCodeString412=Precondition failed.
 caldavRequestStatusCodeString500=Internal server error.
 caldavRequestStatusCodeString502=Bad gateway (Proxy configuration?).
 caldavRequestStatusCodeString503=Internal server error (Temporary server outage?).
 caldavRedirectTitle=Update location for calendar %1$S?
 caldavRedirectText=The requests for %1$S are being redirected to a new location. Would you like to change the location to the following value?
 caldavRedirectDisableCalendar=Disable Calendar
 
-
-# LOCALIZATION NOTE (likelyTimezone):
-#   Translators, please put the most likely timezone(s) where the people using
-#   your locale will be.  Use the Olson ZoneInfo timezone name *in English*,
-#   ie "Europe/Paris", (continent or ocean)/(largest city in timezone).
-#   Order does not matter, except if two historically different zones now match,
-#   such as America/New_York and America/Toronto, will only find first listed.
-#   (Particularly needed to guess the most relevant timezones if there are
-#    similar timezones at the same June/December GMT offsets with alphabetically
-#    earlier ZoneInfo timezone names.  Sample explanations for English below.)
-# for english-US:
-#   America/Los_Angeles likelier than America/Dawson
-#   America/New_York    likelier than America/Detroit (NY for US-EasternTime)
-# for english:
-#   Europe/London   likelier than Atlantic/Canary
-#   Europe/Paris    likelier than Africa/Ceuta (for WestEuropeanTime)
-#   America/Halifax likelier than America/Glace_Bay (Canada-AtlanticTime)
-#   America/Mexico_City likelier than America/Cancun
-#   America/Argentina/Buenos_Aires likelier than America/Araguaina
-#   America/Sao_Paolo (may not recognize: summer-time dates change every year)
-#   Asia/Singapore  likelier than Antarctica/Casey
-#   Asia/Tokyo      likelier than Asia/Dili
-#   Africa/Lagos likelier than Africa/Algiers (for WestAfricanTime)
-#   Africa/Johannesburg likelier than Africa/Blantyre (for SouthAfricanStdTime)
-#   Africa/Nairobi likelier than Africa/Addis_Ababa (for EastAfricanTime)
-#   Australia/Brisbane likelier than Antarctica/DumontDUrville
-#   Australia/Sydney likelier than Australia/Currie or Australia/Hobart
-#   Pacific/Auckland likelier than Antarctica/McMurdo
-likelyTimezone=America/New_York, America/Chicago, America/Denver, America/Phoenix, America/Los_Angeles, America/Anchorage, America/Adak, Pacific/Honolulu, America/Puerto_Rico, America/Halifax, America/Mexico_City, America/Argentina/Buenos_Aires, America/Sao_Paulo, Europe/London, Europe/Paris, Asia/Singapore, Asia/Tokyo, Africa/Lagos, Africa/Johannesburg, Africa/Nairobi, Australia/Brisbane, Australia/Sydney, Pacific/Auckland
-
-# Guessed Timezone errors and warnings.
-# Testing note:
-# * remove preference for calendar.timezone.default in userprofile/prefs.js
-# * repeat
-#   - set OS timezone to a city (windows: click right on clock in taskbar)
-#   - restart
-#   - observe guess in error console and verify whether guessed timezone city
-#     makes sense for OS city.
-#
-# 'Warning: Operating system timezone "E. South America Standard Time"
-#  no longer matches ZoneInfo timezone "America/Sao_Paulo".'
-# Testing notes:
-# - Brasil DST change dates are set every year by decree, so likely out of sync.
-# - Only appears on OSes from which timezone can be obtained
-#   (windows; or TZ env var, /etc/localtime target path, or line in
-#    /etc/timezone or /etc/sysconfig/clock contains ZoneInfo timezone id).
-# - Windows: turning off "Automatically adjust clock for daylight saving time"
-#   can also trigger this warning.
-WarningOSTZNoMatch=Warning: Operating system timezone "%1$S"\nno longer matches the internal ZoneInfo timezone "%2$S".
-
-# "Skipping Operating System timezone 'Pacific/New_Country'."
-# Testing note: not easily testable.  May occur someday if (non-windows)
-# OS uses different version of ZoneInfo database which has a timezone name
-# that is not included in our current ZoneInfo database (or if the mapping
-# mapping from windows to ZoneInfo timezone ids does).
-SkippingOSTimezone=Skipping Operating System timezone '%1$S'.
-
-# "Skipping locale timezone 'America/New_Yawk'."
-# Testing note: Skipping occurs if a likelyTimezone id is unknown or misspelled.
-SkippingLocaleTimezone=Skipping locale timezone '%1$S'.
-
-# Testing note: "No match" timezones include Bucharest on W2k.
-# Brazil timezones may be "No match" (change every year, so often out of date,
-# and changes are often more than a week different).
-warningUsingFloatingTZNoMatch=Warning: Using "floating" timezone.\nNo ZoneInfo timezone data matched the operating system timezone data.
-
-# "Warning:  Using guessed timezone
-#    America/New York (UTC-0500/-0400).
-#    [rfc2445 summer daylight saving shift rules for timezone]
-#  This ZoneInfo timezone almost matches/seems to match..."
-#  This ZoneInfo timezone was chosen based on ... "
-WarningUsingGuessedTZ=Warning:  Using guessed timezone\n  %1$S (UTC%2$S).\n%3$S\n%4$S
-
-# Testing note: "Almost match" timezones include Cairo on W2k.
-TZAlmostMatchesOSDifferAtMostAWeek=This ZoneInfo timezone almost matches the operating system timezone.\nFor this rule, the next transitions between daylight and standard time\ndiffer at most a week from the operating system timezone transitions.\nThere may be discrepancies in the data, such as differing start date,\nor differing rule, or approximation for non-Gregorian-calendar rule.
-
-TZSeemsToMatchOS=This ZoneInfo timezone seems to match the operating system timezone this year.
-
-# LOCALIZATION NOTE (TZFromOS):
-# used for a display of a chosen timezone
-#    %1$S will be replaced with the name of a timezone
-TZFromOS=This ZoneInfo timezone was chosen based on the operating system timezone\nidentifier "%1$S".
-
-# Localization note (TZFromLocale): Substitute name of your locale language.
-TZFromLocale=This ZoneInfo timezone was chosen based on matching the operating system\ntimezone with likely timezones for internet users using US English.
-
-TZFromKnownTimezones=This ZoneInfo timezone was chosen based on matching the operating system\ntimezone with known timezones in alphabetical order of timezone id.
-
 # Print Layout
 tasksWithNoDueDate = Tasks with no due date
 
 # Providers
 caldavName=CalDAV
 compositeName=Composite
 icsName=iCalendar (ICS)
 memoryName=Temporary (memory)
@@ -647,23 +557,20 @@ datetimeIntervalTaskWithoutStartDate=due
 # LOCALIZATION NOTE (dragLabelTasksWithOnlyEntryDate
 #                    dragLabelTasksWithOnlyDueDate)
 # Labels that appear while dragging a task with only
 # entry date OR due date
 dragLabelTasksWithOnlyEntryDate=Starting time
 dragLabelTasksWithOnlyDueDate=Due at
 
 deleteTaskLabel=Delete Task
-deleteTaskMessage=Do you really want to delete this Task?
 deleteTaskAccesskey=l
 deleteItemLabel=Delete
-deleteItemMessage=Do you really want to delete this Item?
 deleteItemAccesskey=l
 deleteEventLabel=Delete Event
-deleteEventMessage=Do you really want to delete this Event?
 deleteEventAccesskey=l
 
 calendarPropertiesEveryMinute=Every minute;Every #1 minutes
 
 # LOCALIZATION NOTE (extractUsing)
 # Used in message header
 #    %1$S will be replaced with language name from languageNames.properties
 extractUsing=Using %1$S
--- a/chat/accounts.dtd
+++ b/chat/accounts.dtd
@@ -1,41 +1,33 @@
 <!-- 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/. -->
 
 <!-- Account manager window for Instantbird -->
 <!ENTITY accounts.title                      "Accounts - &brandShortName;">
-<!ENTITY accountManager.width                "450">
 <!-- Instant messaging account status window for Thunderbird -->
 <!ENTITY accountsWindow.title                "Instant messaging status">
-<!ENTITY accountsWindow2.style               "width: 41em; height: 27em;">
 
 <!ENTITY accountManager.newAccount.label     "New Account">
 <!ENTITY accountManager.newAccount.accesskey "N">
 <!ENTITY accountManager.close.label          "Close">
 <!ENTITY accountManager.close.accesskey      "l">
 <!-- This should match account.commandkey in instantbird.dtd -->
 <!ENTITY accountManager.close.commandkey     "a">
 <!-- This title must be short, displayed with a big font size -->
 <!ENTITY accountManager.noAccount.title      "No account configured yet">
 <!ENTITY accountManager.noAccount.description "Click on the &accountManager.newAccount.label; button to let &brandShortName; guide you through the process of configuring one.">
 <!ENTITY account.autoSignOn.label     "Sign-on at startup">
 <!ENTITY account.autoSignOn.accesskey "S">
 <!ENTITY account.connect.label        "Connect">
 <!ENTITY account.connect.accesskey    "o">
 <!ENTITY account.disconnect.label     "Disconnect">
 <!ENTITY account.disconnect.accesskey "i">
-<!ENTITY account.delete.label         "Delete">
-<!ENTITY account.delete.accesskey     "D">
 <!ENTITY account.edit.label           "Properties">
 <!ENTITY account.edit.accesskey       "P">
-<!ENTITY account.moveup.label         "Move up">
-<!ENTITY account.movedown.label       "Move down">
 <!ENTITY account.cancelReconnection.label         "Cancel reconnection">
 <!ENTITY account.cancelReconnection.accesskey     "A">
 <!ENTITY account.copyDebugLog.label     "Copy Debug Log">
 <!ENTITY account.copyDebugLog.accesskey "C">
-<!ENTITY account.showDebugLog.label     "Show Debug Log">
-<!ENTITY account.showDebugLog.accesskey "H">
 <!ENTITY account.connecting           "Connecting…">
 <!ENTITY account.disconnecting        "Disconnecting…">
 <!ENTITY account.disconnected         "Not Connected">
deleted file mode 100644
--- a/chat/dateFormat.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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/.
-
-month.1.Mmm=Jan
-month.2.Mmm=Feb
-month.3.Mmm=Mar
-month.4.Mmm=Apr
-month.5.Mmm=May
-month.6.Mmm=Jun
-month.7.Mmm=Jul
-month.8.Mmm=Aug
-month.9.Mmm=Sep
-month.10.Mmm=Oct
-month.11.Mmm=Nov
-month.12.Mmm=Dec
-
-month.1.name=January
-month.2.name=February
-month.3.name=March
-month.4.name=April
-month.5.name=May
-month.6.name=June
-month.7.name=July
-month.8.name=August
-month.9.name=September
-month.10.name=October
-month.11.name=November
-month.12.name=December
-
-day.1.name=Sunday
-day.2.name=Monday
-day.3.name=Tuesday
-day.4.name=Wednesday
-day.5.name=Thursday
-day.6.name=Friday
-day.7.name=Saturday
-
-day.1.Mmm=Sun
-day.2.Mmm=Mon
-day.3.Mmm=Tue
-day.4.Mmm=Wed
-day.5.Mmm=Thu
-day.6.Mmm=Fri
-day.7.Mmm=Sat
-
-day.1.short=Su
-day.2.short=Mo
-day.3.short=Tu
-day.4.short=We
-day.5.short=Th
-day.6.short=Fr
-day.7.short=Sa
-
-noon=Noon
-midnight=Midnight
-
-AllDay=All Day
-
-# LOCALIZATION NOTE (finduri-MonthYear):
-# %1$S is the month name, %2$S is the year (4 digits format).
-finduri-MonthYear=%1$S %2$S
--- a/chat/imtooltip.properties
+++ b/chat/imtooltip.properties
@@ -1,12 +1,10 @@
 # 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/.
 
 buddy.username=Username
 buddy.account=Account
 contact.tags=Tags
 
-otr.tag=OTR Status
-
 encryption.tag=Encryption Status
 message.status=Message encrypted
--- a/chat/matrix.properties
+++ b/chat/matrix.properties
@@ -9,17 +9,16 @@
 matrix.usernameHint=Matrix ID
 
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
 options.saveToken=Store access token
 options.deviceDisplayName=Device display name
 options.homeserver=Server
-
 options.backupPassphrase=Key Backup Passphrase
 
 # LOCALIZATION NOTE (options.encryption.*):
 #   These are strings used to build the status information of the encryption
 #   storage, shown in the account manager. %S is one of the statuses and the
 #   strings are combined with a pipe (|) between.
 options.encryption.enabled=Cryptographic Functions: %S
 options.encryption.secretStorage=Secret Storage: %S
@@ -138,22 +137,16 @@ command.addalias=%S &lt;alias&gt;: Creat
 command.removealias=%S &lt;alias&gt;: Remove the alias for the room. Expected room alias of the form '#localname:domain'. Requires permission to remove aliases.
 command.upgraderoom=%S &lt;newVersion&gt;: Upgrade room to given version. Requires permission to upgrade the room.
 command.me=%S &lt;action&gt;: Perform an action.
 command.msg=%S &lt;userId&gt; &lt;message&gt;: Send a direct message to the given user.
 command.join=%S &lt;roomId&gt;: Join the given room.
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
-#    %S is the reason string for the particular action.
-#    Used within context of ban, kick and withdrew invite.
-message.reason=Reason: %S.
-
-# LOCALIZATION NOTE (message.*):
-#    These are shown as system messages in the conversation.
 #    %1$S is the name of the user who banned.
 #    %2$S is the name of the user who got banned.
 message.banned=%1$S banned %2$S.
 #    Same as message.banned but with a reason.
 #    %3$S is the reason the user was banned.
 message.bannedWithReason=%1$S banned %2$S. Reason: %3$S
 #    %1$S is the name of the user who accepted the invitation.
 #    %2$S is the name of the user who sent the invitation.
--- a/devtools/client/accessibility.properties
+++ b/devtools/client/accessibility.properties
@@ -237,20 +237,16 @@ accessibility.progress.initializing=Initializing…
 # the number of nodes being audited. Semi-colon list of plural forms. See:
 # http://developer.mozilla.org/en/docs/Localization_and_Plurals
 accessibility.progress.progressbar=Checking #1 node;Checking #1 nodes
 
 # LOCALIZATION NOTE (accessibility.progress.finishing): A title text for the
 # accessibility panel overlay shown when accessibility audit is finishing up.
 accessibility.progress.finishing=Finishing up…
 
-# LOCALIZATION NOTE (accessibility.beta): A title text for the features in the
-# accessibility panel that are currently in beta.
-accessibility.beta=beta
-
 # LOCALIZATION NOTE (accessibility.pref.scroll.into.view.title): A title
 # text for the tooltip for the checkbox pref in the accessibility panel that
 # sets node auto scroll.
 accessibility.pref.scroll.into.view.title=Automatically scroll selected node into view
 
 # LOCALIZATION NOTE (accessibility.pref.scroll.into.view.label): A title
 # text for the checkbox pref in the accessibility panel that sets node auto
 # scroll.
--- a/devtools/client/compatibility.ftl
+++ b/devtools/client/compatibility.ftl
@@ -17,19 +17,16 @@ compatibility-issue-deprecated-prefixnee
 compatibility-issue-experimental-prefixneeded = (experimental, prefix needed)
 compatibility-issue-deprecated-experimental-prefixneeded = (deprecated, experimental, prefix needed)
 
 ## Messages used as labels and titles for buttons in the footer
 
 compatibility-settings-button-label = Settings
 compatibility-settings-button-title =
     .title = Settings
-compatibility-feedback-button-label = Feedback
-compatibility-feedback-button-title =
-    .title = Feedback
 
 ## Messages used as headers in settings pane
 
 compatibility-settings-header = Settings
 compatibility-target-browsers-header = Target Browsers
 
 ##
 
--- a/devtools/client/debugger.properties
+++ b/devtools/client/debugger.properties
@@ -276,28 +276,16 @@ sourceSearch.search.key2=CmdOrCtrl+F
 # LOCALIZATION NOTE (sourceSearch.search.placeholder): placeholder text in
 # the source search input bar
 sourceSearch.search.placeholder=Search in file…
 
 # LOCALIZATION NOTE (sourceSearch.search.placeholder2): placeholder text in
 # the source search input bar
 sourceSearch.search.placeholder2=Find in file…
 
-# LOCALIZATION NOTE (sourceSearch.search.again.key3): Key shortcut to highlight
-# the next occurrence of the last search triggered from a source search
-# Do not localize "Cmd+G", or change the format of the string. These are
-# key identifiers, not messages displayed to the user.
-sourceSearch.search.again.key3=Cmd+G
-
-# LOCALIZATION NOTE (sourceSearch.search.againPrev.key3): Key shortcut to highlight
-# the previous occurrence of the last search triggered from a source search
-# Do not localize "Cmd+Shift+G", or change the format of the string. These are
-# key identifiers, not messages displayed to the user.
-sourceSearch.search.againPrev.key3=Cmd+Shift+G
-
 # LOCALIZATION NOTE (sourceSearch.resultsSummary2): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Shows a summary of the number of matches for autocomplete
 sourceSearch.resultsSummary2=#1 result;#1 results
 
 # LOCALIZATION NOTE (breakpointHeadingMenuItem.*): The text for all the elements
 # that are displayed in the breakpoint headings menu item popup.
 breakpointHeadingsMenuItem.enableInSource.label=Enable breakpoints
@@ -843,101 +831,16 @@ symbolSearch.searchModifier.regex=Regex
 symbolSearch.searchModifier.caseSensitive=Case sensitive
 
 # LOCALIZATION NOTE(symbolSearch.searchModifier.wholeWord): A search option
 # when searching text in a file
 symbolSearch.searchModifier.wholeWord=Whole word
 
 experimental=This is an experimental feature
 
-# LOCALIZATION NOTE (whyPaused.debuggerStatement): The text that is displayed
-# in a info block explaining how the debugger is currently paused due to a `debugger`
-# statement in the code
-whyPaused.debuggerStatement=Paused on debugger statement
-
-# LOCALIZATION NOTE (whyPaused.breakpoint): The text that is displayed
-# in a info block explaining how the debugger is currently paused on a breakpoint
-whyPaused.breakpoint=Paused on breakpoint
-
-# LOCALIZATION NOTE (whyPaused.eventBreakpoint): The text that is displayed
-# in a info block explaining how the debugger is currently paused on an event
-# breakpoint.
-whyPaused.eventBreakpoint=Paused on event breakpoint
-
-# LOCALIZATION NOTE (whyPaused.exception): The text that is displayed
-# in a info block explaining how the debugger is currently paused on an exception
-whyPaused.exception=Paused on exception
-
-# LOCALIZATION NOTE (whyPaused.mutationBreakpoint): The text that is displayed
-# in a info block explaining how the debugger is currently paused on a
-# DOM mutation breakpoint
-whyPaused.mutationBreakpoint=Paused on DOM mutation
-
-# LOCALIZATION NOTE (whyPaused.mutationBreakpointAdded): The text that
-# is displayed to describe an added node which triggers a subtree modification
-whyPaused.mutationBreakpointAdded=Added:
-
-# LOCALIZATION NOTE (whyPaused.mutationBreakpointRemoved): The text that
-# is displayed to describe a removed node which triggers a subtree modification
-whyPaused.mutationBreakpointRemoved=Removed:
-
-# LOCALIZATION NOTE (whyPaused.interrupted): The text that is displayed
-# in a info block explaining how the debugger is currently paused at
-# a JS execution
-whyPaused.interrupted=Paused at Execution
-
-# LOCALIZATION NOTE (whyPaused.resumeLimit): The text that is displayed
-# in a info block explaining how the debugger is currently paused while stepping
-# in or out of the stack
-whyPaused.resumeLimit=Paused while stepping
-
-# LOCALIZATION NOTE (whyPaused.pauseOnDOMEvents): The text that is displayed
-# in a info block explaining how the debugger is currently paused on a
-# dom event
-whyPaused.pauseOnDOMEvents=Paused on event listener
-
-# LOCALIZATION NOTE (whyPaused.breakpointConditionThrown): The text that is displayed
-# in an info block when evaluating a conditional breakpoint throws an error
-whyPaused.breakpointConditionThrown=Error with conditional breakpoint
-
-# LOCALIZATION NOTE (whyPaused.XHR): The text that is displayed
-# in a info block explaining how the debugger is currently paused on an
-# xml http request
-whyPaused.XHR=Paused on XMLHttpRequest
-
-# LOCALIZATION NOTE (whyPaused.promiseRejection): The text that is displayed
-# in a info block explaining how the debugger is currently paused on a
-# promise rejection
-whyPaused.promiseRejection=Paused on promise rejection
-
-# LOCALIZATION NOTE (whyPaused.getWatchpoint): The text that is displayed
-# in a info block explaining how the debugger is currently paused at a
-# watchpoint on an object property
-whyPaused.getWatchpoint=Paused on property get
-
-# LOCALIZATION NOTE (whyPaused.setWatchpoint): The text that is displayed
-# in an info block explaining how the debugger is currently paused at a
-# watchpoint on an object property
-whyPaused.setWatchpoint=Paused on property set
-
-# LOCALIZATION NOTE (whyPaused.assert): The text that is displayed
-# in a info block explaining how the debugger is currently paused on an
-# assert
-whyPaused.assert=Paused on assertion
-
-# LOCALIZATION NOTE (whyPaused.debugCommand): The text that is displayed
-# in a info block explaining how the debugger is currently paused on a
-# debugger statement
-whyPaused.debugCommand=Paused on debugged function
-
-# LOCALIZATION NOTE (whyPaused.other): The text that is displayed
-# in a info block explaining how the debugger is currently paused on an event
-# listener breakpoint set
-whyPaused.other=Debugger paused
-
 # LOCALIZATION NOTE (ctrl): The text that is used for documenting
 # keyboard shortcuts that use the control key
 ctrl=Ctrl
 
 # LOCALIZATION NOTE (anonymousFunction): this string is used to display
 # JavaScript functions that have no given name - they are said to be
 # anonymous.
 anonymousFunction=<anonymous>
@@ -983,24 +886,16 @@ shortcuts.fileSearch=Source File Search
 # LOCALIZATION NOTE (shortcuts.fileSearch2): text describing
 # keyboard shortcut action for source file search
 shortcuts.fileSearch2=Go to file
 
 # LOCALIZATION NOTE (shortcuts.gotoLine): text describing
 # keyboard shortcut for jumping to a specific line
 shortcuts.gotoLine=Go to line
 
-# LOCALIZATION NOTE (shortcuts.searchAgain): text describing
-# keyboard shortcut action for searching again
-shortcuts.searchAgain=Search Again
-
-# LOCALIZATION NOTE (shortcuts.searchAgain2): text describing
-# keyboard shortcut action for searching again
-shortcuts.searchAgain2=Find next
-
 # LOCALIZATION NOTE (shortcuts.projectSearch): text describing
 # keyboard shortcut action for full project search
 shortcuts.projectSearch=Full Project Search
 
 # LOCALIZATION NOTE (shortcuts.projectSearch2): text describing
 # keyboard shortcut action for full project search
 shortcuts.projectSearch2=Find in files
 
--- a/devtools/client/netmonitor.properties
+++ b/devtools/client/netmonitor.properties
@@ -1592,17 +1592,8 @@ netmonitor.settings.importHarTooltip=Imp
 
 # LOCALIZATION NOTE (netmonitor.settings.saveHarTooltip): This is the tooltip that gets displayed
 # when the HAR save menu item is hovered
 netmonitor.settings.saveHarTooltip=Save network data to HAR file
 
 # LOCALIZATION NOTE (netmonitor.settings.copyHarTooltip): This is the tooltip that gets displayed
 # when the HAR copy menu item is hovered
 netmonitor.settings.copyHarTooltip=Copy network data to the clipboard
-
-# LOCALIZATION NOTE (netmonitor.errorpanel.description): This is the information displayed once the monitor errors out
-netmonitor.errorpanel.description=The Network panel has crashed.
-
-# LOCALIZATION NOTE (netmonitor.errorpanel.fileBugButton): This is the text that appears in the button to visit the bug filing link.
-netmonitor.errorpanel.fileBugButton=File Bug Report
-
-# LOCALIZATION NOTE (netmonitor.errorpanel.reloadPanelInfo): This is the text that appears after Network panel errors to instruct the user to reload the panel.
-netmonitor.errorpanel.reloadPanelInfo=Close and reopen the toolbox to clear this error.
--- a/devtools/client/performance.dtd
+++ b/devtools/client/performance.dtd
@@ -54,17 +54,16 @@
 <!ENTITY performanceUI.table.totalPercentage          "Total Cost">
 <!ENTITY performanceUI.table.totalPercentage.tooltip  "The percentage of time spent in this function and functions it calls.">
 <!ENTITY performanceUI.table.selfPercentage           "Self Cost">
 <!ENTITY performanceUI.table.selfPercentage.tooltip   "The percentage of time spent only within this function.">
 <!ENTITY performanceUI.table.samples                  "Samples">
 <!ENTITY performanceUI.table.samples.tooltip          "The number of times this function was on the stack when the profiler took a sample.">
 <!ENTITY performanceUI.table.function                 "Function">
 <!ENTITY performanceUI.table.function.tooltip         "The name and source location of the sampled function.">
-<!ENTITY performanceUI.table.totalAlloc               "Total Sampled Allocations">
 <!ENTITY performanceUI.table.totalAlloc.tooltip       "The total number of Object allocations sampled at this location and in callees.">
 
 <!-- LOCALIZATION NOTE (performanceUI.options.filter.tooltiptext): This string
   -  is displayed next to the filter button-->
 <!ENTITY performanceUI.options.filter.tooltiptext "Select what data to display in the timeline">
 
 <!-- LOCALIZATION NOTE (performanceUI.options.gear.tooltiptext): This is the
   -  tooltip for the options button. -->
--- a/devtools/client/perftools.ftl
+++ b/devtools/client/perftools.ftl
@@ -45,20 +45,16 @@ perftools-range-entries-label = Buffer s
 perftools-custom-threads-label = Add custom threads by name:
 
 perftools-devtools-interval-label = Interval:
 perftools-devtools-threads-label = Threads:
 perftools-devtools-settings-label = Settings
 
 ## Various statuses that affect the current state of profiling, not typically displayed.
 
-perftools-status-private-browsing-notice =
-  The profiler is disabled when Private Browsing is enabled.
-  Close all Private Windows to re-enable the profiler
-
 perftools-status-recording-stopped-by-another-tool = The recording was stopped by another tool.
 perftools-status-restart-required = The browser must be restarted to enable this feature.
 
 ## These are shown briefly when the user is waiting for the profiler to respond.
 
 perftools-request-to-stop-profiler = Stopping recording
 perftools-request-to-get-profile-and-stop-profiler = Capturing profile
 
--- a/devtools/client/sourceeditor.dtd
+++ b/devtools/client/sourceeditor.dtd
@@ -9,10 +9,9 @@
 
 <!-- LOCALIZATION NOTE : FILE The correct localization of this file might be to
   - keep it in English, or another language commonly spoken among web developers.
   - You want to make that choice consistent across the developer tools.
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
 <!ENTITY gotoLineCmd.label         "Jump to Line…">
-<!ENTITY gotoLineCmd.key           "J">
 <!ENTITY gotoLineCmd.accesskey     "J">
--- a/devtools/client/startup.properties
+++ b/devtools/client/startup.properties
@@ -226,21 +226,16 @@ application.panelLabel=Application Panel
 application.tooltip=Application Panel
 
 # LOCALIZATION NOTE (toolbox.buttons.responsive):
 # This is the tooltip of the button in the toolbox toolbar that toggles
 # the Responsive mode.
 # Keyboard shortcut will be shown inside brackets.
 toolbox.buttons.responsive = Responsive Design Mode (%S)
 
-# LOCALIZATION NOTE (toolbox.buttons.paintflashing):
-# This is the tooltip of the paintflashing button in the toolbox toolbar
-# that toggles paintflashing.
-toolbox.buttons.paintflashing = Toggle paint flashing
-
 # LOCALIZATION NOTE (toolbox.buttons.screenshot):
 # This is the tooltip of the button in the toolbox toolbar that allows you to
 # take a screenshot of the entire page
 toolbox.buttons.screenshot = Take a screenshot of the entire page
 
 # LOCALIZATION NOTE (toolbox.buttons.rulers):
 # This is the tooltip of the button in the toolbox toolbar that toggles the
 # rulers in the page
--- a/devtools/client/toolbox.properties
+++ b/devtools/client/toolbox.properties
@@ -150,52 +150,16 @@ toolbox.frames.disabled.tooltip=This but
 # LOCALIZATION NOTE (toolbox.showFrames.key)
 # Key shortcut used to show frames menu when 'frames' button is focused
 toolbox.showFrames.key=Alt+Down
 
 # LOCALIZATION NOTE (toolbox.meatballMenu.button.tooltip): This is the tooltip
 # for the "..." button on the developer tools toolbox.
 toolbox.meatballMenu.button.tooltip=Customize Developer Tools and Get Help
 
-# LOCALIZATION NOTE (toolbox.meatballMenu.dock.*.label): These labels are shown
-# in the "..." menu in the toolbox and represent the different arrangements for
-# docking (or undocking) the developer tools toolbox.
-toolbox.meatballMenu.dock.bottom.label=Dock to Bottom
-toolbox.meatballMenu.dock.left.label=Dock to Left
-toolbox.meatballMenu.dock.right.label=Dock to Right
-toolbox.meatballMenu.dock.separateWindow.label=Separate Window
-
-# LOCALIZATION NOTE (toolbox.meatballMenu.{splitconsole,hideconsole}.label):
-# These are the labels in the "..." menu in the toolbox for toggling the split
-# console window.
-# The keyboard shortcut will be shown to the side of the label.
-toolbox.meatballMenu.splitconsole.label=Show Split Console
-toolbox.meatballMenu.hideconsole.label=Hide Split Console
-
-# LOCALIZATION NOTE (toolbox.meatballMenu.noautohide.label): This is the label
-# in the "..." menu in the toolbox to force the popups/panels to stay visible on
-# blur.
-# This is only visible in the browser toolbox as it is meant for
-# addon developers and Firefox contributors.
-toolbox.meatballMenu.noautohide.label=Disable Popup Auto-Hide
-
-# LOCALIZATION NOTE (toolbox.meatballMenu.settings.label): This is the label for
-# the item in the "..." menu in the toolbox that brings up the Settings
-# (Options) panel.
-# The keyboard shortcut will be shown to the side of the label.
-toolbox.meatballMenu.settings.label=Settings
-
-# LOCALIZATION NOTE (toolbox.meatballMenu.documentation.label): This is the
-# label for the Documentation menu item.
-toolbox.meatballMenu.documentation.label=Documentation…
-
-# LOCALIZATION NOTE (toolbox.meatballMenu.community.label): This is the label
-# for the Community menu item.
-toolbox.meatballMenu.community.label=Community…
-
 # LOCALIZATION NOTE (toolbox.closebutton.tooltip): This is the tooltip for
 # the close button the developer tools toolbox.
 toolbox.closebutton.tooltip=Close Developer Tools
 
 # LOCALIZATION NOTE (toolbox.errorCountButton.tooltip): This is the tooltip for
 # the error count button displayed in the developer tools toolbox.
 toolbox.errorCountButton.tooltip=Show Split Console
 
--- a/devtools/client/tooltips.ftl
+++ b/devtools/client/tooltips.ftl
@@ -50,18 +50,16 @@ inactive-scroll-padding-when-not-scroll-container = <strong>{ $property }</strong> has no effect on this element since it doesn’t scroll.
 ## In the Rule View when a CSS property cannot be successfully applied we display
 ## an icon. When this icon is hovered this message is displayed to explain how
 ## the problem can be solved.
 
 inactive-css-not-grid-or-flex-container-fix = Try adding <strong>display:grid</strong> or <strong>display:flex</strong>. { learn-more }
 
 inactive-css-not-grid-or-flex-container-or-multicol-container-fix = Try adding either <strong>display:grid</strong>, <strong>display:flex</strong>, or <strong>columns:2</strong>. { learn-more }
 
-inactive-css-not-grid-or-flex-item-fix-2 = Try adding <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong>, or <strong>display:inline-flex</strong>. { learn-more }
-
 inactive-css-not-grid-or-flex-item-fix-3 = Try adding <strong>display:grid</strong>, <strong>display:flex</strong>, <strong>display:inline-grid</strong>, or <strong>display:inline-flex</strong> to the element’s parent. { learn-more }
 
 inactive-css-not-grid-item-fix-2 =Try adding <strong>display:grid</strong> or <strong>display:inline-grid</strong> to the element’s parent. { learn-more }
 
 inactive-css-not-grid-container-fix = Try adding <strong>display:grid</strong> or <strong>display:inline-grid</strong>. { learn-more }
 
 inactive-css-not-flex-item-fix-2 = Try adding <strong>display:flex</strong> or <strong>display:inline-flex</strong> to the element’s parent. { learn-more }
 
--- a/devtools/client/webconsole.properties
+++ b/devtools/client/webconsole.properties
@@ -195,44 +195,22 @@ webconsole.menu.copyMessage.label=Copy M
 webconsole.menu.copyMessage.accesskey=C
 
 # LOCALIZATION NOTE (webconsole.menu.copyObject.label)
 # Label used for a context-menu item displayed for object/variable log. Clicking on it
 # will copy the object/variable.
 webconsole.menu.copyObject.label=Copy Object
 webconsole.menu.copyObject.accesskey=o
 
-# LOCALIZATION NOTE (webconsole.menu.selectAll.label)
-# Label used for a context-menu item that will select all the content of the webconsole
-# output.
-webconsole.menu.selectAll.label=Select All
-webconsole.menu.selectAll.accesskey=A
-
 # LOCALIZATION NOTE (webconsole.menu.openInSidebar.label)
 # Label used for a context-menu item displayed for object/variable logs. Clicking on it
 # opens the webconsole sidebar for the logged variable.
 webconsole.menu.openInSidebar.label1=Inspect object in Sidebar
 webconsole.menu.openInSidebar.accesskey=V
 
-# LOCALIZATION NOTE (webconsole.menu.exportSubmenu.label)
-# Label used for a context-menu item displayed on the output. Clicking on it
-# opens a submenu where the user can select how to export messages.
-webconsole.menu.exportSubmenu.label=Export Visible Messages To
-
-# LOCALIZATION NOTE (webconsole.menu.exportClipboard.label)
-# Label used for a context-menu item displayed on the output. Clicking on it
-# copies the entire output of the console to the clipboard.
-webconsole.menu.exportSubmenu.exportCliboard.label=Clipboard
-
-# LOCALIZATION NOTE (webconsole.menu.exportFile.label)
-# Label used for a context-menu item displayed on the output. Clicking on it
-# opens a file picker to allow the user save a file containing
-# the output of the console.
-webconsole.menu.exportSubmenu.exportFile.label=File
-
 # LOCALIZATION NOTE (webconsole.menu.copyAllMessages.label)
 # Label used for a context-menu item displayed on the output. Clicking on it
 # copies the entire output of the console to the clipboard.
 webconsole.menu.copyAllMessages.label=Copy all Messages
 webconsole.menu.copyAllMessages.accesskey=M
 
 # LOCALIZATION NOTE (webconsole.menu.saveAllMessagesFile.label)
 # Label used for a context-menu item displayed on the output. Clicking on it
deleted file mode 100644
--- a/devtools/shared/highlighters.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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/.
-
-# LOCALIZATION NOTE This file contains strings used in highlighters.
-# Highlighters are visualizations that DevTools draws on top of content to aid
-# in understanding content sizing, etc.
-
-# LOCALIZATION NOTE (grid.rowColumnPositions): The row and column position of a grid
-# cell shown in the grid cell infobar when hovering over the CSS grid outline.
-grid.rowColumnPositions=Row %S / Column %S
-
-# LOCALIZATION NOTE (gridType.container): the layout type of an element shown in
-# the infobar when hovering over a DOM element and it is a grid container.
-gridType.container=Grid Container
-
-# LOCALIZATION NOTE (gridType.item): the layout type of an element shown in
-# the infobar when hovering over a DOM element and it is a grid item.
-gridType.item=Grid Item
-
-# LOCALIZATION NOTE (gridType.dual): the layout type of an element shown in
-# the infobar when hovering over a DOM element and it is both a grid container and a grid item.
-gridType.dual=Grid Container/Item
-
-# LOCALIZATION NOTE (flexType.container): the layout type of an element shown in
-# the infobar when hovering over a DOM element and it is a flex container.
-flexType.container=Flex Container
-
-# LOCALIZATION NOTE (flexType.item): the layout type of an element shown in
-# the infobar when hovering over a DOM element and it is a flex item.
-flexType.item=Flex Item
-
-# LOCALIZATION NOTE (flexType.dual): the layout type of an element shown in
-# the infobar when hovering over a DOM element and it is both a flex container and a flex item.
-flexType.dual=Flex Container/Item
deleted file mode 100644
--- a/devtools/startup/aboutDevTools.ftl
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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/.
-
-head-title = About Developer Tools
-enable-title = Enable Firefox Developer Tools
-enable-inspect-element-title = Enable Firefox Developer Tools to use Inspect Element
-enable-inspect-element-message = Examine and edit HTML and CSS with the Developer Tools’ Inspector.
-enable-about-debugging-message = Develop and debug WebExtensions, web workers, service workers and more with Firefox Developer Tools.
-enable-key-shortcut-message = You activated a Developer Tools shortcut. If that was a mistake, you can close this Tab.
-enable-menu-message = Perfect your website’s HTML, CSS, and JavaScript with tools like Inspector and Debugger.
-enable-common-message = Firefox Developer Tools are disabled by default to give you more control over your browser.
-enable-learn-more-link = Learn more about Developer Tools
-enable-enable-button = Enable Developer Tools
-enable-close-button = Close this Tab
-
-welcome-title = Welcome to Firefox Developer Tools!
-newsletter-title = Mozilla Developer Newsletter
-newsletter-message = Get developer news, tricks and resources sent straight to your inbox.
-newsletter-email-placeholder =
-    .placeholder = Email
-newsletter-privacy-label = I’m okay with Mozilla handling my info as explained in this <a data-l10n-name="privacy-policy">Privacy Policy</a>.
-newsletter-subscribe-button = Subscribe
-newsletter-thanks-title = Thanks!
-newsletter-thanks-message = If you haven’t previously confirmed a subscription to a Mozilla-related newsletter you may have to do so. Please check your inbox or your spam filter for an email from us.
-
-footer-title = Firefox Developer Edition
-footer-message = Looking for more than just Developer Tools? Check out the Firefox browser that is built specifically for developers and modern workflows.
-footer-learn-more-link = Learn more
-
-features-learn-more = Learn more
-features-inspector-title = Inspector
-features-inspector-desc = Inspect and refine code to build pixel-perfect layouts. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-features-console-title = Console
-features-console-desc = Track CSS, JavaScript, security and network issues. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-features-debugger-title = Debugger
-features-debugger-desc = Powerful JavaScript debugger with support for your framework. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-features-network-title = Network
-features-network-desc = Monitor network requests that can slow or block your site. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-features-storage-title = Storage
-features-storage-desc = Add, modify and remove cache, cookies, databases and session data. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-features-responsive-title = Responsive Design Mode
-features-responsive-desc = Test sites on emulated devices in your browser. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-features-visual-editing-title = Visual Editing
-features-visual-editing-desc = Fine-tune animations, alignment and padding. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-features-performance-title = Performance
-features-performance-desc = Unblock bottlenecks, streamline processes, optimize assets. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-features-memory-title = Memory
-features-memory-desc = Find memory leaks and make your application zippy. <a data-l10n-name="learn-more">{ features-learn-more }</a>
-# Variables:
-#   $errorDescription (String) - The error that occurred e.g. 404 - Not Found
-newsletter-error-common = Subscription request failed ({ $errorDescription }).
-newsletter-error-unknown = An unexpected error occurred.
-newsletter-error-timeout = Subscription request timed out.
-# Variables:
-#   $shortcut (String) - The keyboard shortcut used for the tool
-welcome-message = You’ve successfully enabled Developer Tools! To get started, explore the Web Developer menu or open the tools with { $shortcut }.
deleted file mode 100644
--- a/devtools/startup/key-shortcuts.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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/.
-
-# LOCALIZATION NOTE (toggleToolbox.commandkey):
-# Key pressed to open a toolbox with the default panel selected
-toggleToolbox.commandkey=I
-
-# LOCALIZATION NOTE (toggleToolboxF12.commandkey):
-# Alternative key pressed to open a toolbox with the default panel selected
-toggleToolboxF12.commandkey=VK_F12
-
-# LOCALIZATION NOTE (browserToolbox.commandkey):
-# Key pressed to open the Browser Toolbox, used for debugging Firefox itself
-browserToolbox.commandkey=I
-
-# LOCALIZATION NOTE (browserConsole.commandkey):
-# Key pressed to open the Browser Console, used for debugging Firefox itself
-browserConsole.commandkey=J
-
-# LOCALIZATION NOTE (responsiveDesignMode.commandkey):
-# Key pressed to toggle on the Responsive Design Mode
-responsiveDesignMode.commandkey=M
-
-# LOCALIZATION NOTE (inspector.commandkey):
-# Key pressed to open a toolbox with the inspector panel selected
-inspector.commandkey=C
-
-# LOCALIZATION NOTE (webconsole.commandkey):
-# Key pressed to open a toolbox with the web console panel selected
-webconsole.commandkey=K
-
-# LOCALIZATION NOTE (jsdebugger.commandkey2):
-# Key pressed to open a toolbox with the debugger panel selected
-jsdebugger.commandkey2=Z
-
-# LOCALIZATION NOTE (netmonitor.commandkey):
-# Key pressed to open a toolbox with the network monitor panel selected
-netmonitor.commandkey=E
-
-# LOCALIZATION NOTE (styleeditor.commandkey):
-# Key pressed to open a toolbox with the style editor panel selected
-styleeditor.commandkey=VK_F7
-
-# LOCALIZATION NOTE (performance.commandkey):
-# Key pressed to open a toolbox with the performance panel selected
-performance.commandkey=VK_F5
-
-# LOCALIZATION NOTE (storage.commandkey):
-# Key pressed to open a toolbox with the storage panel selected
-storage.commandkey=VK_F9
-
-# LOCALIZATION NOTE (dom.commandkey):
-# Key pressed to open a toolbox with the DOM panel selected
-dom.commandkey=W
-
-# LOCALIZATION NOTE (accessibilityF12.commandkey):
-# Key pressed to open a toolbox with the accessibility panel selected
-accessibilityF12.commandkey=VK_F12
-
-# LOCALIZATION NOTE (profilerStartStop.commandkey):
-# Key pressed to start or stop the performance profiler
-profilerStartStop.commandkey=VK_1
-
-# LOCALIZATION NOTE (profilerCapture.commandkey):
-# Key pressed to capture a recorded performance profile
-profilerCapture.commandkey=VK_2
deleted file mode 100644
--- a/devtools/startup/startup.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/.
-
-# LOCALIZATION NOTE (enableDevTools.label):
-# Label for the menu item displayed in Tools > Developer Tools when DevTools are disabled.
-enableDevTools.label=Enable Developer Tools…
-enableDevTools.accesskey=E
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -25,14 +25,13 @@ contentEncodingError=The page you are tr
 unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 harmfulBlocked=The site at %S has been reported as a potentially harmful site and has been blocked based on your security preferences.
 unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 xfoBlocked=This page has an X-Frame-Options policy that prevents it from being loaded in this context.
 corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
-remoteXUL=This page uses an unsupported technology that is no longer available by default.
 sslv3Used=The safety of your data on %S could not be guaranteed because it uses SSLv3, a broken security protocol.
 weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, the connection to this website has not been established.
 inadequateSecurityError=The website tried to negotiate an inadequate level of security.
 blockedByPolicy=Your organization has blocked access to this page or website.
 networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired.
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -18,17 +18,16 @@ DebugScriptButton=Debug script
 WaitForScriptButton=Continue
 DontAskAgain=&Don’t ask me again
 WindowCloseBlockedWarning=Scripts may not close windows that were not opened by script.
 OnBeforeUnloadTitle=Are you sure?
 OnBeforeUnloadMessage2=This page is asking you to confirm that you want to leave — information you’ve entered may not be saved.
 OnBeforeUnloadStayButton=Stay on page
 OnBeforeUnloadLeaveButton=Leave page
 EmptyGetElementByIdParam=Empty string passed to getElementById().
-SpeculationFailed=An unbalanced tree was written using document.write() causing data from the network to be reparsed. For more information https://developer.mozilla.org/en/Optimizing_Your_Pages_for_Speculative_Parsing
 SpeculationFailed2=An unbalanced tree was written using document.write() causing data from the network to be reparsed. More information: https://developer.mozilla.org/en-US/docs/Glossary/speculative_parsing
 DocumentWriteIgnored=A call to document.write() from an asynchronously-loaded external script was ignored.
 # LOCALIZATION NOTE (EditorFileDropFailed): Do not translate contenteditable, %S is the error message explaining why the drop failed.
 EditorFileDropFailed=Dropping a file into a contenteditable element failed: %S.
 FormValidationTextTooLong=Please shorten this text to %S characters or less (you are currently using %S characters).
 FormValidationTextTooShort=Please use at least %S characters (you are currently using %S characters).
 FormValidationValueMissing=Please fill out this field.
 FormValidationCheckboxMissing=Please check this box if you want to proceed.
@@ -389,18 +388,16 @@ MathML_DeprecatedMathSpaceValueWarning=“veryverythinmathspace”, “verythinmathspace”, “thinmathspace”, “mediummathspace”, “thickmathspace”, “verythickmathspace” and “veryverythickmathspace” are deprecated values for MathML lengths and will be removed at a future date.
 # LOCALIZATION NOTE: Do not translate radical, notation and menclose.
 MathML_DeprecatedMencloseNotationRadical=The “radical” value is deprecated for the “notation” attribute of the <menclose> element and will be removed at a future date.
 # LOCALIZATION NOTE: Do not translate MathML or mfenced.
 MathML_DeprecatedMfencedElement=MathML element mfenced is deprecated and will be removed at a future date.
 # 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.
 FormSubmissionUntrustedEventWarning=Form submission via untrusted submit event is deprecated and will be removed at a future date.
 WebShareAPI_Failed=The share operation has failed.
--- a/dom/chrome/layout/htmlparser.properties
+++ b/dom/chrome/layout/htmlparser.properties
@@ -1,32 +1,24 @@
 # 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/.
 
 # Encoding warnings and errors
 EncNoDeclarationFrame=The character encoding of a framed document was not declared. The document may appear different if viewed without the document framing it.
-EncNoDeclarationPlain=The character encoding of the plain text document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the file needs to be declared in the transfer protocol or file needs to use a byte order mark as an encoding signature.
-EncNoDeclaration=The character encoding of the HTML document was not declared. The document will render with garbled text in some browser configurations if the document contains characters from outside the US-ASCII range. The character encoding of the page must be declared in the document or in the transfer protocol.
-EncLateMetaFrame=The character encoding declaration of the framed HTML document was not found when prescanning the first 1024 bytes of the file. When viewed without the document framing it, the page will reload automatically. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
-EncLateMeta=The character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. When viewed in a differently-configured browser, this page will reload automatically. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
-EncLateMetaReload=The page was reloaded, because the character encoding declaration of the HTML document was not found when prescanning the first 1024 bytes of the file. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
-EncLateMetaTooLate=The character encoding declaration of document was found too late for it to take effect. The encoding declaration needs to be moved to be within the first 1024 bytes of the file.
 EncXmlDecl=The character encoding of an HTML document was declared using the XML declaration syntax. This is non-conforming, and declaring the encoding using a meta tag at the start of the head part is more efficient.
 EncMetaTooLate=A meta tag attempting to declare the character encoding declaration was found too late, and the encoding was guessed from content instead. The meta tag needs to be moved to the start of the head part of the document.
 EncMetaTooLateFrame=A meta tag attempting to declare the character encoding declaration was found too late, and the encoding of the parent document was used instead. The meta tag needs to be moved to the start of the head part of the document.
 EncMetaAfterHeadInKilobyte=The meta tag declaring the character encoding of the document should be moved to start of the head part of the document.
 EncNoDecl=The character encoding of the document was not declared, so the encoding was guessed from content. The character encoding needs to be declared in the Content-Type HTTP header, using a meta tag, or using a byte order mark.
 EncNoDeclPlain=The character encoding of the document was not declared, so the encoding was guessed from content. The character encoding needs to be declared in the Content-Type HTTP header or using a byte order mark.
 EncMetaUnsupported=An unsupported character encoding was declared for the HTML document using a meta tag. The declaration was ignored.
 EncProtocolUnsupported=An unsupported character encoding was declared on the transfer protocol level. The declaration was ignored.
-EncBomlessUtf16=Detected UTF-16-encoded Basic Latin-only text without a byte order mark and without a transfer protocol-level declaration. Encoding this content in UTF-16 is inefficient and the character encoding should have been declared in any case.
 EncMetaUtf16=A meta tag was used to declare the character encoding as UTF-16. This was interpreted as an UTF-8 declaration instead.
 EncMetaUserDefined=A meta tag was used to declare the character encoding as x-user-defined. This was interpreted as a windows-1252 declaration instead for compatibility with intentionally mis-encoded legacy fonts. This site should migrate to Unicode.
-
 EncMetaReplacement=A meta tag was used to declare an encoding that is a cross-site scripting hazard. The replacement encoding was used instead.
 EncProtocolReplacement=An encoding that is a cross-site scripting hazard was declared on the transfer protocol level. The replacement encoding was used instead.
 EncDetectorReload=The character encoding of the document was not declared, and the encoding was guessable from content only late. This caused the document to be reloaded. The character encoding needs to be declared in the Content-Type HTTP header, using a meta tag, or using a byte order mark.
 EncDetectorReloadPlain=The character encoding of the document was not declared, and the encoding was guessable from content only late. This caused the document to be reloaded. The character encoding needs to be declared in the Content-Type HTTP header or using a byte order mark.
 EncError=The byte stream was erroneous according to the character encoding that was declared. The character encoding declaration may be incorrect.
 EncErrorFrame=The byte stream was erroneous according to the character encoding that was inherited from the parent document. The character encoding needs to be declared in the Content-Type HTTP header, using a meta tag, or using a byte order mark.
 EncErrorFramePlain=The byte stream was erroneous according to the character encoding that was inherited from the parent document. The character encoding needs to be declared in the Content-Type HTTP header or using a byte order mark.
 EncSpeculationFailMeta=The start of the document was reparsed, because there were non-ASCII characters before the meta tag that declared the encoding. The meta should be the first child of head without non-ASCII comments before.
@@ -89,17 +81,16 @@ errEofInTagName=End of file seen when lo
 errEofInEndTag=End of file inside end tag. Ignoring tag.
 errEofAfterLt=End of file after “<”.
 errNcrOutOfRange=Character reference outside the permissible Unicode range.
 errNcrUnassigned=Character reference expands to a permanently unassigned code point.
 errDuplicateAttribute=Duplicate attribute.
 errEofInSystemId=End of file inside system identifier.
 errExpectedSystemId=Expected a system identifier but the doctype ended.
 errMissingSpaceBeforeDoctypeName=Missing space before doctype name.
-errHyphenHyphenBang=“--!” found in comment.
 errNestedComment=Saw “<!--” within a comment. Probable cause: Nested comment (not allowed).
 errNcrZero=Character reference expands to zero.
 errNoSpaceBetweenDoctypeSystemKeywordAndQuote=No space between the doctype “SYSTEM” keyword and the quote.
 errNoSpaceBetweenPublicAndSystemIds=No space between the doctype public and system identifiers.
 errNoSpaceBetweenDoctypePublicKeywordAndQuote=No space between the doctype “PUBLIC” keyword and the quote.
 
 # Tree builder errors
 errDeepTree=The document tree is too deep. The tree will be flattened to be 513 elements deep.
--- a/dom/chrome/layout/layout_errors.properties
+++ b/dom/chrome/layout/layout_errors.properties
@@ -4,18 +4,16 @@
 
 ImageMapRectBoundsError=The “coords” attribute of the <area shape="rect"> tag is not in the “left,top,right,bottom” format.
 ImageMapCircleWrongNumberOfCoords=The “coords” attribute of the <area shape="circle"> tag is not in the “center-x,center-y,radius” format.
 ImageMapCircleNegativeRadius=The “coords” attribute of the <area shape="circle"> tag has a negative radius.
 ImageMapPolyWrongNumberOfCoords=The “coords” attribute of the <area shape="poly"> tag is not in the “x1,y1,x2,y2 …” format.
 ImageMapPolyOddNumberOfCoords=The “coords” attribute of the <area shape="poly"> tag is missing the last “y” coordinate (the correct format is “x1,y1,x2,y2 …”).
 
 TablePartRelPosWarning=Relative positioning of table rows and row groups is now supported. This site may need to be updated because it may depend on this feature having no effect.
-ScrollLinkedEffectFound2=This site appears to use a scroll-linked positioning effect. This may not work well with asynchronous panning; see https://developer.mozilla.org/docs/Mozilla/Performance/ScrollLinkedEffects for further details and to join the discussion on related tools and features!
-
 ScrollLinkedEffectFound3=This site appears to use a scroll-linked positioning effect. This may not work well with asynchronous panning; see https://firefox-source-docs.mozilla.org/performance/scroll-linked_effects.html for further details and to join the discussion on related tools and features!
 
 ## LOCALIZATION NOTE(CompositorAnimationWarningContentTooLargeArea):
 ## %1$S is an integer value of the area of the frame
 ## %2$S is an integer value of the area of a limit based on the viewport size
 CompositorAnimationWarningContentTooLargeArea=Animation cannot be run on the compositor because the area of the frame (%1$S) is too large relative to the viewport (larger than %2$S)
 ## LOCALIZATION NOTE(CompositorAnimationWarningContentTooLarge2):
 ## (%1$S, %2$S) is a pair of integer values of the frame size
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -88,19 +88,16 @@
 <!ENTITY cspBlocked.longDesc "<p>The browser prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY xfoBlocked.title "Blocked by X-Frame-Options Policy">
 <!ENTITY xfoBlocked.longDesc "<p>The browser prevented this page from loading in this context because the page has an X-Frame-Options policy that disallows it.</p>">
 
 <!ENTITY corruptedContentErrorv2.title "Corrupted Content Error">
 <!ENTITY corruptedContentErrorv2.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
-<!ENTITY remoteXUL.title "Remote XUL">
-<!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the website owners to inform them of this problem.</li></ul></p>">
-
 <!ENTITY inadequateSecurityError.title "Your connection is not secure">
 <!-- LOCALIZATION NOTE (inadequateSecurityError.longDesc) - Do not translate
      "NS_ERROR_NET_INADEQUATE_SECURITY". -->
 <!ENTITY inadequateSecurityError.longDesc "<p><span class='hostname'></span> uses security technology that is outdated and vulnerable to attack. An attacker could easily reveal information which you thought to be safe. The website administrator will need to fix the server first before you can visit the site.</p><p>Error code: NS_ERROR_NET_INADEQUATE_SECURITY</p>">
 
 <!ENTITY blockedByPolicy.title "Blocked Page">
 
 <!ENTITY networkProtocolError.title "Network Protocol Error">
deleted file mode 100644
--- a/dom/chrome/plugins.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/.
-
-# GMP Plugins
-gmp_license_info=License information
-gmp_privacy_info=Privacy Information
-
-openH264_name=OpenH264 Video Codec provided by Cisco Systems, Inc.
-openH264_description2=This plugin is automatically installed by Mozilla to comply with the WebRTC specification and to enable WebRTC calls with devices that require the H.264 video codec. Visit https://www.openh264.org/ to view the codec source code and learn more about the implementation.
-
-cdm_description2=This plugin enables playback of encrypted media in compliance with the Encrypted Media Extensions specification. Encrypted media is typically used by sites to protect against copying of premium media content. Visit https://www.w3.org/TR/encrypted-media/ for more information on Encrypted Media Extensions.
-
-widevine_description=Widevine Content Decryption Module provided by Google Inc.
--- a/dom/chrome/security/security.properties
+++ b/dom/chrome/security/security.properties
@@ -5,48 +5,42 @@
 # Mixed Content Blocker
 # LOCALIZATION NOTE: "%1$S" is the URI of the blocked mixed content resource
 BlockMixedDisplayContent = Blocked loading mixed display content “%1$S”
 BlockMixedActiveContent = Blocked loading mixed active content “%1$S”
 
 # CORS
 # LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
 CORSDisabled=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS disabled).
-CORSDidNotSucceed=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request did not succeed).
 CORSDidNotSucceed2=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request did not succeed). Status code: %2$S.
 CORSOriginHeaderNotAdded=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header ‘Origin’ cannot be added).
 CORSExternalRedirectNotAllowed=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request external redirect not allowed).
 CORSRequestNotHttp=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS request not http).
-CORSMissingAllowOrigin=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header ‘Access-Control-Allow-Origin’ missing).
 CORSMissingAllowOrigin2=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS header ‘Access-Control-Allow-Origin’ missing). Status code: %2$S.
 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).
 CORSPreflightDidNotSucceed3=Cross-Origin Request Blocked: The Same Origin Policy disallows reading the remote resource at %1$S. (Reason: CORS preflight response did not succeed). Status code: %2$S.
 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.
 STSInvalidMaxAge=Strict-Transport-Security: The site specified a header that included an invalid ‘max-age’ directive.
 STSMultipleIncludeSubdomains=Strict-Transport-Security: The site specified a header that included multiple ‘includeSubDomains’ directives.
 STSInvalidIncludeSubdomains=Strict-Transport-Security: The site specified a header that included an invalid ‘includeSubDomains’ directive.
 STSCouldNotSaveState=Strict-Transport-Security: An error occurred noting the site as a Strict-Transport-Security host.
 
-# LOCALIZATION NOTE: Do not translate "SHA-1"
-SHA1Sig=This site makes use of a SHA-1 Certificate; it’s recommended you use certificates with signature algorithms that use hash functions stronger than SHA-1.
-
 InsecurePasswordsPresentOnPage=Password fields present on an insecure (http://) page. This is a security risk that allows user login credentials to be stolen.
 InsecureFormActionPasswordsPresent=Password fields present in a form with an insecure (http://) form action. This is a security risk that allows user login credentials to be stolen.
 InsecurePasswordsPresentOnIframe=Password fields present on an insecure (http://) iframe. This is a security risk that allows user login credentials to be stolen.
 # LOCALIZATION NOTE: "%1$S" is the URI of the insecure mixed content resource
 LoadingMixedActiveContent2=Loading mixed (insecure) active content “%1$S” on a secure page
 LoadingMixedDisplayContent2=Loading mixed (insecure) display content “%1$S” on a secure page
 LoadingMixedDisplayObjectSubrequestDeprecation=Loading mixed (insecure) content “%1$S” within a plugin on a secure page is discouraged and will be blocked soon.
 # LOCALIZATION NOTE: "%S" is the URI of the insecure mixed content download
@@ -144,17 +138,16 @@ XFrameOptionsDeny=The loading of “%2$S” in a frame is denied by “X-Frame-Options“ directive set to “%1$S“.
 # LOCALIZATION NOTE: %1$S is the URL of the upgraded request; %2$S is the upgraded scheme.
 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 failed request;
 HTTPSOnlyFailedDowngradeAgain = Upgrading insecure request “%S” failed. Downgrading to “http” again.
-
 # LOCALIZATION NOTE: Hints or indicates a new transaction for a URL is likely coming soon. We use
 # a speculative connection to start a TCP connection so that the resource is immediately ready
 # when the transaction is actually submitted. HTTPS-Only and HTTPS-First will upgrade such
 # speculative TCP connections from http to https.
 # %1$S is the URL of the upgraded speculative TCP connection; %2$S is the upgraded scheme.
 HTTPSOnlyUpgradeSpeculativeConnection = Upgrading insecure speculative TCP connection “%1$S” to use “%2$S”.
 
 # LOCALIZATION NOTE: %S is the URL of the blocked request;
--- a/mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
+++ b/mail/chrome/messenger-smime/msgCompSMIMEOverlay.dtd
@@ -1,36 +1,10 @@
 <!-- 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/. -->
 
 <!--LOCALIZATION NOTE msgCompSMIMEOverlay.dtd UI for s/mime hooks in message composition -->
 
-<!ENTITY menu_securityDoNotEncrypt.label "Do Not Encrypt">
-<!ENTITY menu_securityDoNotEncrypt.accesskey "o">
-
-<!-- not yet used
-<!ENTITY menu_securityEncryptOptional.label "Allow Encryption">
-<!ENTITY menu_securityEncryptOptional.accesskey "w">
--->
-
-<!ENTITY menu_securityEncryptRequire2.label "Require Encryption">
-<!ENTITY menu_securityEncryptRequire.accesskey "E">
-
-<!ENTITY menu_securitySign.label "Digitally Sign This Message">
-<!ENTITY menu_securitySign.accesskey "M">
-
-<!ENTITY menu_securityTech.label "Encryption Technology">
-<!ENTITY menu_securityTech.accesskey "T">
-
 <!ENTITY menu_techPGP.label "OpenPGP">
 <!ENTITY menu_techPGP.accesskey "O">
 <!ENTITY menu_techSMIME.label "S/MIME">
 <!ENTITY menu_techSMIME.accesskey "S">
-
-<!ENTITY menu_securityStatus.label "View Security Info">
-<!ENTITY menu_securityStatus.accesskey "I">
-
-<!ENTITY securityButton.label "Security">
-<!ENTITY securityButton.tooltip "View or change security settings">
-
-<!ENTITY menu_viewSecurityStatus.label "Message Security Info">
-<!ENTITY menu_viewSecurityStatus.accesskey "I">
--- a/mail/chrome/messenger/AccountManager.dtd
+++ b/mail/chrome/messenger/AccountManager.dtd
@@ -10,28 +10,14 @@
 <!ENTITY accountActionsButton.label "Account Actions">
 <!ENTITY accountActionsButton.accesskey "A">
 <!ENTITY addMailAccountButton.label "Add Mail Account…">
 <!ENTITY addMailAccountButton.accesskey "A">
 <!ENTITY addIMAccountButton.label "Add Chat Account…">
 <!ENTITY addIMAccountButton.accesskey "C">
 <!ENTITY addFeedAccountButton.label "Add Feed Account…">
 <!ENTITY addFeedAccountButton.accesskey "F">
-<!ENTITY addOtherAccountButton.label "Add Other Account…">
-<!ENTITY addOtherAccountButton.accesskey "O">
 <!ENTITY setDefaultButton.label "Set as Default">
 <!ENTITY setDefaultButton.accesskey "D">
 <!ENTITY removeButton.label "Remove Account">
 <!ENTITY removeButton.accesskey "R">
 
 <!ENTITY addonsButton.label "Extensions &amp; Themes">
-
-<!-- AccountManager.xhtml -->
-<!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the account
-     setting dialog, which specifies the width and height in em units of the dialog.
-     Localizers ONLY can increase these widths if they are having difficulty getting
-     panel content to fit.
-     1ch = The width of the "0" (ZERO, U+0030) glyph for the current font.
-     1em = The height of the font.
-     XUL/FE DEVELOPERS: DO NOT MODIFY THIS VALUE. It represents the correct size of
-     this window for en-US. -->
-<!ENTITY accountManager.size "width: 105ch; height: 55em;">
-<!ENTITY accountTree.width "width: 32ch;">
--- a/mail/chrome/messenger/AccountWizard.dtd
+++ b/mail/chrome/messenger/AccountWizard.dtd
@@ -2,27 +2,16 @@
    - 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/. -->
 
 <!-- Entities for AccountWizard -->
 
 <!ENTITY windowTitle.label "Account Wizard">
 <!ENTITY accountWizard.size "width: 40em; height: 38em;">
 
-<!-- Entities for Account Type page -->
-
-<!ENTITY accountSetupInfo2.label "In order to receive messages, you first need to set up an account.">
-<!ENTITY accountTypeTitle.label "New Account Setup">
-<!ENTITY accountTypeDesc2.label "This Wizard will collect the information necessary to set up an account. If you do not know the information requested, please contact your System Administrator or Internet Service Provider.">
-<!ENTITY accountTypeDirections.label "Select the type of account you would like to set up:">
-<!ENTITY accountTypeMail.label "Email account">
-<!ENTITY accountTypeMail.accesskey "m">
-<!ENTITY accountTypeNews.label "Newsgroup account">
-<!ENTITY accountTypeNews.accesskey "w">
-
 <!-- Entities for Identity page -->
 
 <!ENTITY identityTitle.label "Identity">
 <!ENTITY identityDesc.label "Each account has an identity, which is the information that identifies you to others when they receive your messages.">
 
 <!-- LOCALIZATION NOTE (fullnameDesc.label) : do not translate two of "&quot;" in below line -->
 <!ENTITY fullnameDesc.label "Enter the name you would like to appear in the &quot;From&quot; field of your outgoing messages">
 <!-- LOCALIZATION NOTE (fullnameExample.label) : use following directions for below line
@@ -34,91 +23,29 @@
 <!ENTITY fullnameLabel.accesskey "Y">
 
 <!ENTITY emailLabel.label "Email Address:">
 <!ENTITY emailLabel.accesskey "E">
 
 <!-- Entities for Incoming Server page -->
 
 <!ENTITY incomingTitle.label "Incoming Server Information">
-<!ENTITY incomingServerTypeDesc.label "Select the type of incoming server you are using.">
-<!-- LOCALIZATION NOTE (imapType.label) : Do not translate "IMAP" in below line -->
-<!ENTITY imapType.label "IMAP">
-<!ENTITY imapType.accesskey "I">
-<!-- LOCALIZATION NOTE (popType.label) : Do not translate "POP" in below line -->
-<!ENTITY popType.label "POP">
-<!ENTITY popType.accesskey "P">
-<!ENTITY leaveMsgsOnSrvr.label "Leave messages on server">
-<!ENTITY leaveMsgsOnSrvr.accesskey "L">
-<!ENTITY portNum.label "Port:">
-<!ENTITY portNum.accesskey "o">
-<!ENTITY defaultPortLabel.label "Default:">
-<!ENTITY defaultPortValue.label "">
-<!-- LOCALIZATION NOTE (incomingServerNameDesc.label) : Do not translate "&quot;pop.example.net&quot;" in below line -->
-<!ENTITY incomingServer.description "Enter the name of your incoming server (for example, &quot;mail.example.net&quot;).">
-<!ENTITY incomingServer.label "Incoming Server:">
-<!ENTITY incomingServer.accesskey "S">
-<!-- LOCALIZATION NOTE (incomingUsername.description) : do not translate "&quot;jsmith&quot;" in below line -->
-<!ENTITY incomingUsername.description "Enter the incoming user name given to you by your email provider (for example, &quot;jsmith&quot;).">
 <!ENTITY incomingUsername.label "User Name:">
-<!ENTITY incomingUsername.accesskey "U">
 <!-- LOCALIZATION NOTE (newsServerNameDesc.label) : Do not translate "NNTP" or the "&quot;" entities in below line -->
 <!ENTITY newsServerNameDesc.label "Enter the name of your news server (NNTP) (for example, &quot;news.example.net&quot;).">
 <!ENTITY newsServerLabel.label "Newsgroup Server:">
 <!ENTITY newsServerLabel.accesskey "S">
 
-<!-- Entities for Outgoing Server page -->
-
-<!ENTITY outgoingTitle.label "Outgoing Server Information">
-<!-- LOCALIZATION NOTE (outgoingServer.description) : Do not translate "SMTP" and "&quot;smtp.example.net&quot;" in below line -->
-<!ENTITY outgoingServer.description "Enter the name of your outgoing server (SMTP) (for example, &quot;smtp.example.net&quot;).">
-<!ENTITY outgoingServer.label "Outgoing Server:">
-<!ENTITY outgoingServer.accesskey "S">
-<!ENTITY outgoingUsername.description "Enter the outgoing user name given to you by your email provider (this is typically the same as your incoming user name).">
-<!ENTITY outgoingUsername.label "Outgoing User Name:">
-<!ENTITY outgoingUsername.accesskey "U">
-
-<!-- LOCALIZATION NOTE (modifyOutgoing.suffix) : This string will be appended after each of
-     haveSmtp1.suffix3, haveSmtp2.suffix3, haveSmtp3.suffix3 .
--->
-<!ENTITY modifyOutgoing.suffix "You can change outgoing servers in the account settings.">
-<!-- LOCALIZATION NOTE (haveSmtp1.prefix and haveSmtp1.suffix3) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp1.prefix and haveSmtp1.suffix3 as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp1.suffix3, if required grammatically.
--->
-<!ENTITY haveSmtp1.prefix "Your existing outgoing server (SMTP), &quot;">
-<!ENTITY haveSmtp1.suffix3 "&quot;, will be used.">
-<!-- LOCALIZATION NOTE (haveSmtp2.prefix and haveSmtp2.suffix3) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp2.prefix and haveSmtp2.suffix3 as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp2.suffix3, if required grammatically.
--->
-<!ENTITY haveSmtp2.prefix "Your existing outgoing (SMTP) username, &quot;">
-<!ENTITY haveSmtp2.suffix3 "&quot;, will be used.">
-<!-- LOCALIZATION NOTE (haveSmtp3.prefix and haveSmtp3.suffix3) : Do not translate "SMTP" and "&quot;" in
-     these variables. Also, translate haveSmtp3.prefix and haveSmtp3.suffix3 as a single sentence, inserting
-     text after the "&quot;" entity in haveSmtp3.suffix3, if required grammatically.
--->
-<!ENTITY haveSmtp3.prefix "Your outgoing (SMTP) server, &quot;">
-<!ENTITY haveSmtp3.suffix3 "&quot;, is identical to your incoming server, your incoming user name will be used to access it.">
-
 <!-- Entities for Account name page -->
 
 <!ENTITY accnameTitle.label "Account Name">
 <!-- LOCALIZATION NOTE (accnameDesc.label) : do not translate any "&quot;" in below line -->
 <!ENTITY accnameDesc.label "Enter the name by which you would like to refer to this account (for example, &quot;Work Account&quot;, &quot;Home Account&quot; or &quot;News Account&quot;).">
 <!ENTITY accnameLabel.label "Account Name:">
 <!ENTITY accnameLabel.accesskey "A">
 
 <!-- Entities for Done (Congratulations) page -->
 
 <!ENTITY completionTitle.label "Congratulations!">
 <!ENTITY completionText.label "Please verify that the information below is correct.">
-<!ENTITY serverTypePrefix.label "Incoming Server Type:">
-<!ENTITY serverNamePrefix.label "Incoming Server Name:">
-<!ENTITY smtpServerNamePrefix.label "Outgoing Server Name (SMTP):">
 <!ENTITY newsServerNamePrefix.label "News Server Name (NNTP):">
-<!ENTITY downloadOnLogin.label "Download messages now">
-<!ENTITY downloadOnLogin.accesskey "D">
-<!ENTITY deferStorageDesc.label "Uncheck this checkbox to store mail for this account in its own directory. That will make this account appear as a top-level account. Otherwise, it will be part of the Local Folders Global Inbox account.">
-<!ENTITY deferStorage.label "Use Global Inbox (store mail in Local Folders)">
-<!ENTITY deferStorage.accesskey "G">
 <!ENTITY clickFinish.label "Click Finish to save these settings and exit the Account Wizard.">
 <!ENTITY clickFinish.labelMac "Click Done to save these settings and exit the Account Wizard.">
--- a/mail/chrome/messenger/FilterEditor.dtd
+++ b/mail/chrome/messenger/FilterEditor.dtd
@@ -1,14 +1,13 @@
 <!-- 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/. -->
 
 <!ENTITY window.title "Filter Rules">
-<!ENTITY filterEditorDialog.dimensions "width: 100ch;">
 <!ENTITY filterName.label "Filter name:">
 <!ENTITY filterName.accesskey "i">
 
 <!ENTITY junk.label "Junk">
 <!ENTITY notJunk.label "Not Junk">
 
 <!ENTITY lowestPriorityCmd.label "Lowest">
 <!ENTITY lowPriorityCmd.label "Low">
--- a/mail/chrome/messenger/activity.dtd
+++ b/mail/chrome/messenger/activity.dtd
@@ -5,33 +5,14 @@
 <!-- LOCALIZATION NOTE (window.width2, window.height): These values should be
 close to the golden ratio (1.618:1) while making sure it's wide enough for long
 file names and tall enough to hint that there are more activities in the list -->
 <!ENTITY window.width2                    "485">
 <!ENTITY window.height                    "300">
 
 <!ENTITY activity.title                  "Activity Manager">
 
-<!ENTITY cmd.pause.label                  "Pause">
-<!ENTITY cmd.pause.accesskey              "P">
-<!ENTITY cmd.resume.label                 "Resume">
-<!ENTITY cmd.resume.accesskey             "R">
-<!ENTITY cmd.cancel.label                 "Cancel">
-<!ENTITY cmd.cancel.accesskey             "C">
-<!ENTITY cmd.undo.label                   "Undo">
-<!ENTITY cmd.undo.accesskey               "U">
-<!ENTITY cmd.recover.label                "Recover">
-<!ENTITY cmd.recover.accesskey            "v">
-<!ENTITY cmd.retry.label                  "Retry">
-<!ENTITY cmd.retry.accesskey              "R">
-<!ENTITY cmd.removeFromList.label         "Remove From List">
-<!ENTITY cmd.removeFromList.accesskey     "e">
-
 <!ENTITY cmd.close.commandkey             "w">
 <!ENTITY cmd.close2.commandkey            "j">
 <!ENTITY cmd.close2Unix.commandkey        "y">
 <!ENTITY cmd.clearList.label              "Clear List">
 <!ENTITY cmd.clearList.tooltip            "Removes completed, canceled, and failed items from the list">
 <!ENTITY cmd.clearList.accesskey          "C">
-<!ENTITY cmd.find.commandkey              "f">
-<!ENTITY cmd.search.commandkey            "k">
-
-<!ENTITY searchBox.label                  "Search…">
--- a/mail/chrome/messenger/addressbook/abCard.dtd
+++ b/mail/chrome/messenger/addressbook/abCard.dtd
@@ -35,18 +35,16 @@
 <!ENTITY preferDisplayName.accesskey    "y">
 <!ENTITY NickName.label                 "Nickname:">
 <!ENTITY NickName.accesskey             "N">
 
 <!ENTITY PrimaryEmail.label             "Email:">
 <!ENTITY PrimaryEmail.accesskey         "E">
 <!ENTITY SecondEmail.label              "Additional Email:">
 <!ENTITY SecondEmail.accesskey          "i">
-<!ENTITY PreferMailFormat.label         "Prefers to receive messages formatted as:">
-<!ENTITY PreferMailFormat.accesskey     "v">
 <!ENTITY PlainText.label                "Plain Text">
 <!ENTITY HTML.label                     "HTML">
 <!ENTITY Unknown.label                  "Unknown">
 <!ENTITY chatName.label                 "Chat Name:">
 
 <!ENTITY WorkPhone.label                "Work:">
 <!ENTITY WorkPhone.accesskey            "k">
 <!ENTITY HomePhone.label                "Home:">
--- a/mail/chrome/messenger/am-smime.dtd
+++ b/mail/chrome/messenger/am-smime.dtd
@@ -1,39 +1,29 @@
 <!-- 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/. -->
 
 <!ENTITY e2eTitle.label "End-To-End Encryption">
 <!ENTITY e2eLearnMore.label "Learn more">
 
 <!ENTITY e2eEnc.description "Without end-to-end encryption the contents of messages are easily exposed to your email provider and to mass surveillance.">
-<!ENTITY e2eeReqWarning.description "If you require encryption, to send a message you must have the public key or certificate of every recipient.">
-
-<!ENTITY e2eSigning.description "A digital signature allows recipients to verify the message was sent by you, and that the content has not been changed.">
 
 <!ENTITY e2eTechPref.description "Preferred encryption technology:">
 
-<!ENTITY doNotEncrypt.label "Do not enable encryption by default">
-<!ENTITY doNotEncrypt.accesskey "N">
-<!ENTITY requireEncryptMessage.label "Require encryption by default">
-<!ENTITY requireEncryptMessage.accesskey "u">
-
 <!ENTITY encryptionCert2.message "Personal certificate for encryption:">
 <!ENTITY digitalSign.certificate.button "Select…">
 <!ENTITY digitalSign.certificate.accesskey "S">
 <!ENTITY digitalSign.certificate_clear.button "Clear">
 <!ENTITY digitalSign.certificate_clear.accesskey "C">
 <!ENTITY encryption.certificate.button "Select…">
 <!ENTITY encryption.certificate.accesskey "t">
 <!ENTITY encryption.certificate_clear.button "Clear">
 <!ENTITY encryption.certificate_clear.accesskey "e">
 <!ENTITY signingGroupTitle.label "Digital Signing">
-<!ENTITY signMessage2.label "Add my digital signature by default">
-<!ENTITY signMessage.accesskey "D">
 <!ENTITY signingCert2.message "Personal certificate for digital signing:">
 
 <!ENTITY sendingDefaults.label "Default settings for sending messages">
 
 <!ENTITY technologyAutomatic.label "Select automatically based on available keys or certificates">
 
 <!ENTITY certificates2.label "S/MIME">
 <!ENTITY manageCerts3.label "Manage S/MIME Certificates">
deleted file mode 100644
--- a/mail/chrome/messenger/app-extension-fields.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/.
-
-# LOCALIZATION NOTE (extension.thunderbird-compact-light@mozilla.org.name): This is displayed in about:addons -> Appearance
-extension.thunderbird-compact-light@mozilla.org.name=Light
-extension.thunderbird-compact-light@mozilla.org.description=A theme with a light color scheme.
-
-# LOCALIZATION NOTE (extension.thunderbird-compact-dark@mozilla.org.name): This is displayed in about:addons -> Appearance
-extension.thunderbird-compact-dark@mozilla.org.name=Dark
-extension.thunderbird-compact-dark@mozilla.org.description=A theme with a dark color scheme.
--- a/mail/chrome/messenger/fieldMapImport.dtd
+++ b/mail/chrome/messenger/fieldMapImport.dtd
@@ -1,14 +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/. -->
 
-<!ENTITY fieldMapImport.size "width: 40em; height: 30em;">
-
 <!ENTITY fieldMapImport.next.label "Next">
 <!ENTITY fieldMapImport.next.accesskey "N">
 <!ENTITY fieldMapImport.previous.label "Previous">
 <!ENTITY fieldMapImport.previous.accesskey "P">
 <!ENTITY fieldMapImport.text "Use Move Up and Move Down to match the address book fields on the left to the correct data for import on the right. Uncheck items you do not want to import.">
 <!ENTITY fieldMapImport.up.label "Move Up">
 <!ENTITY fieldMapImport.up.accesskey "U">
 <!ENTITY fieldMapImport.down.label "Move Down">
--- a/mail/chrome/messenger/filter.properties
+++ b/mail/chrome/messenger/filter.properties
@@ -6,17 +6,16 @@ mustSelectFolder=You must select a targe
 enterValidEmailAddress=Enter a valid e-mail address to forward to.
 pickTemplateToReplyWith=Choose a template to reply with.
 mustEnterName=You must give this filter a name.
 cannotHaveDuplicateFilterTitle=Duplicate Filter Name
 cannotHaveDuplicateFilterMessage=The filter name you entered already exists. Please enter a different filter name.
 mustHaveFilterTypeTitle=No filter event selected
 mustHaveFilterTypeMessage=You must select at least one event when this filter is applied. If you temporarily do not wish the filter to run at any event, uncheck its enabled state from the Message Filters dialog.
 deleteFilterConfirmation=Are you sure you want to delete the selected filter(s)?
-untitledFilterName=Untitled Filter
 matchAllFilterName=Match All Messages
 filterListBackUpMsg=Your filters do not work because the msgFilterRules.dat file, which contains your filters, could not be read. A new msgFilterRules.dat file will be created and a backup of the old file, called rulesbackup.dat, will be created in the same directory.
 customHeaderOverflow=You've exceeded the limit of 50 custom headers. Please remove one or more custom headers and try again.
 filterCustomHeaderOverflow=Your filters have exceeded the limit of 50 custom headers. Please edit the msgFilterRules.dat file, which contains your filters, to use fewer custom headers.
 invalidCustomHeader=One of your filters uses a custom header that contains an invalid character, such as ':', a non-printable character, a non-ascii character, or an eight-bit ascii character. Please edit the msgFilterRules.dat file, which contains your filters, to remove invalid characters from your custom headers.
 continueFilterExecution=Applying filter %S failed. Would you like to continue applying filters?
 promptTitle=Running Filters
 promptMsg=You are currently in the process of filtering messages.\nWould you like to continue applying filters?
--- a/mail/chrome/messenger/importDialog.dtd
+++ b/mail/chrome/messenger/importDialog.dtd
@@ -19,19 +19,16 @@ LOCALIZATION NOTE : Do not translate any
 <!ENTITY importFeeds.accesskey    "d">
 <!ENTITY importAddressbook.label  "Address Books">
 <!ENTITY importAddressbook.accesskey "A">
 <!ENTITY importSettings.label     "Settings">
 <!ENTITY importSettings.accesskey "S">
 <!ENTITY importFilters.label      "Filters">
 <!ENTITY importFilters.accesskey  "F">
 
-<!ENTITY  window.width            "40em">
-<!ENTITY  window.macWidth         "45em">
-
 <!ENTITY importTitle.label        "&brandShortName; Import Wizard">
 <!ENTITY importShortDesc.label    "Import Mail, Address Books, Settings, and Filters from other programs">
 
 <!ENTITY importDescription1.label "This wizard will import mail messages, address book entries, feed subscriptions, preferences, and/or filters from other mail programs and common address book formats into &brandShortName;.">
 <!ENTITY importDescription2.label "Once they have been imported, you will be able to access them from within &brandShortName;.">
 
 <!ENTITY selectDescription.label  "Please select the type of file that you would like to import:">
 <!ENTITY selectDescriptionB.label "Please select an existing account or create a new account:">
deleted file mode 100644
--- a/mail/chrome/messenger/junkMailInfo.dtd
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY window.title  "About Junk Mail">
-<!ENTITY window.width  "450">
-<!ENTITY info1a.label  "&brandShortName; automatically detects incoming messages that appear to be junk mail (also known as spam). Messages that &brandShortName; thinks are junk will display a junk icon">
-<!ENTITY info1b.label  ".">
-<!ENTITY info2.label   "At first, you must train &brandShortName; to identify junk mail by using the Junk toolbar button to mark messages as junk or not junk.">
-<!ENTITY info3.label   "Once &brandShortName; is correctly identifying junk mail, you can use the Junk Mail Controls to automatically move incoming junk mail to the Junk folder.">
-<!ENTITY info4.label   "For more information, click Help.">
--- a/mail/chrome/messenger/messenger.dtd
+++ b/mail/chrome/messenger/messenger.dtd
@@ -19,18 +19,16 @@
 <!-- LOCALIZATION NOTE (moveToNewWindow.label):
      Menu option to cause the current tab to be migrated to a new Thunderbird
      window.
      -->
 <!ENTITY moveToNewWindow.label "Move to New Window">
 <!ENTITY moveToNewWindow.accesskey "W">
 <!ENTITY newVirtualFolderCmd.label "Saved Search…">
 <!ENTITY newVirtualFolderCmd.accesskey "S">
-<!ENTITY newOtherAccountsCmd.label "Other Accounts…">
-<!ENTITY newOtherAccountsCmd.accesskey "O">
 <!ENTITY newCreateEmailAccountCmd.label "Get a New Mail Account…">
 <!ENTITY newCreateEmailAccountCmd.accesskey "G">
 <!ENTITY newExistingEmailAccountCmd.label "Existing Mail Account…">
 <!ENTITY newExistingEmailAccountCmd.accesskey "E">
 <!ENTITY newIMAccountCmd.label "Chat Account…">
 <!ENTITY newIMAccountCmd.accesskey "C">
 <!ENTITY newFeedAccountCmd.label "Feed Account…">
 <!ENTITY newFeedAccountCmd.accesskey "d">
@@ -43,18 +41,16 @@
 <!ENTITY  newContactCmd.label "Address Book Contact…">
 <!ENTITY  newContactCmd.accesskey "C">
 <!ENTITY openMenuCmd.label "Open">
 <!ENTITY openMenuCmd.accesskey "O">
 <!ENTITY openMessageFileCmd.label "Saved Message…">
 <!ENTITY openMessageFileCmd.accesskey "M">
 <!ENTITY saveAsMenu.label "Save As">
 <!ENTITY saveAsMenu.accesskey "S">
-<!ENTITY saveAsFileCmd.label "File">
-<!ENTITY saveAsFileCmd.accesskey "F">
 <!ENTITY saveAsFileCmd.key "s">
 <!ENTITY saveAsTemplateCmd.label "Template">
 <!ENTITY saveAsTemplateCmd.accesskey "T">
 <!ENTITY getNewMsgForCmd.label "Get New Messages for">
 <!ENTITY getNewMsgForCmd.accesskey "w">
 <!ENTITY getAllNewMsgCmdPopupMenu.label "All Accounts">
 <!ENTITY getAllNewMsgCmdPopupMenu.accesskey "A">
 <!ENTITY getNewMsgCurrentAccountCmdPopupMenu.label "Current Account">
deleted file mode 100644
--- a/mail/chrome/messenger/messengercompose/askSendFormat.dtd
+++ /dev/null
@@ -1,20 +0,0 @@
-<!-- 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/. -->
-
-<!--LOCALIZATION NOTE askSendFormat.dtd UI for dialog that asks the user, which format to use for sending a message -->
-<!ENTITY windowTitle.label "HTML Mail Question">
-
-<!ENTITY recipient.label "Some of the recipients are not listed as being able to receive HTML mail.">
-
-<!ENTITY question.label "Would you like to convert the message to plain text or send it in HTML anyway?">
-
-<!ENTITY plainTextAndHtml.label "Send in Plain Text and HTML">
-<!ENTITY plainTextAndHtml.accesskey "a">
-<!ENTITY plainTextOnly.label "Send in Plain Text Only">
-<!ENTITY plainTextOnly.accesskey "P">
-<!ENTITY htmlOnly.label "Send in HTML Only">
-<!ENTITY htmlOnly.accesskey "H">
-
-<!ENTITY send.label "Send">
-<!ENTITY send.accesskey "S">
deleted file mode 100644
--- a/mail/chrome/messenger/messengercompose/askSendFormat.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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/.
-
-convertibleYes=Your message can be converted to plain text without losing information.
-convertibleAltering=Your message can be converted to plain text without losing important information. However, the plain text version might look different from what you saw in the composer.
-convertibleNo=However, you used formatting (e.g. colors) that will not be converted to plain text.
-recommended=(recommended)
--- a/mail/chrome/messenger/messengercompose/composeMsgs.properties
+++ b/mail/chrome/messenger/messengercompose/composeMsgs.properties
@@ -399,22 +399,16 @@ errorCloudFileUpload.title=Upload Error
 ## %2$S is the name of the file that failed to upload.
 errorCloudFileUpload.message=Unable to upload %2$S to %1$S.
 errorCloudFileQuota.title=Quota Error
 
 ## LOCALIZATION NOTE(errorCloudFileQuota.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to exceeding the storage limit.
 errorCloudFileQuota.message=Uploading %2$S to %1$S would exceed your space quota.
-errorCloudFileNameLimit.title=File Name Error
-
-## LOCALIZATION NOTE(errorCloudFileNameLimit.message):
-## %1$S is the name of the online storage service being uploaded to.
-## %2$S is the name of the file that could not be uploaded due to the excess file name length
-errorCloudFileNameLimit.message=%2$S contains has more than 120 characters in its name which is more than the maximum file name length for %1$S. Please rename the file to have 120 characters or less in its name and upload again.
 errorCloudFileLimit.title=File Size Error
 
 ## LOCALIZATION NOTE(errorCloudFileLimit.message):
 ## %1$S is the name of the online storage service being uploaded to.
 ## %2$S is the name of the file that could not be uploaded due to size restrictions.
 errorCloudFileLimit.message=%2$S exceeds the maximum size for %1$S.
 errorCloudFileOther.title=Unknown Error
 
@@ -424,30 +418,16 @@ errorCloudFileOther.message=An unknown e
 errorCloudFileDeletion.title=Deletion Error
 
 ## LOCALIZATION NOTE(errorCloudFileDeletion.message):
 ## %1$S is the name of the online storage service that the file is to be deleted from.
 ## %2$S is the name of the file that failed to be deleted.
 errorCloudFileDeletion.message=There was a problem deleting %2$S from %1$S.
 errorCloudFileUpgrade.label=Upgrade
 
-## LOCALIZATION NOTE(cloudAttachmentCountHeader): A line of text describing how
-## many uploaded files have been appended to this message.  Emphasis should be
-## on sharing as opposed to attaching. This item is used as a header to a list,
-## hence the colon.  This header is only displayed in HTML emails.
-## Using PluralForm (so don't replace the #1).
-cloudAttachmentCountHeader=I've linked #1 file to this email:;I've linked #1 files to this email:
-
-## LOCALIZATION NOTE(cloudAttachmentListItem): A line of text describing a cloud
-## attachment to be inserted into the message body. Do not translate the words
-## %1$S, %2$S, %3$S, or %4$S. %1$S is the attachment name, %2$S is its size,
-## %3$S is the name of the cloud storage service, and %4$S is the link to the
-## attachment.
-cloudAttachmentListItem=* %1$S (%2$S) hosted on %3$S: %4$S
-
 ## LOCALIZATION NOTE(stopShowingUploadingNotification): This string is used in the Filelink
 ## upload notification bar to allow the user to dismiss the notification permanently.
 stopShowingUploadingNotification.accesskey=N
 stopShowingUploadingNotification.label=Never show this again
 replaceButton.label=Replace…
 replaceButton.accesskey=x
 replaceButton.tooltip=Show the Find and Replace dialog
 
--- a/mail/chrome/messenger/messengercompose/messengercompose.dtd
+++ b/mail/chrome/messenger/messengercompose/messengercompose.dtd
@@ -16,19 +16,16 @@
 <!ENTITY newContact.label "Address Book Contact…">
 <!ENTITY newContact.accesskey "C">
 <!ENTITY attachMenu.label "Attach">
 <!ENTITY attachMenu.accesskey "h">
 <!ENTITY attachCloudCmd.label "Filelink">
 <!ENTITY attachCloudCmd.accesskey "i">
 <!ENTITY attachPageCmd.label "Web Page…">
 <!ENTITY attachPageCmd.accesskey "W">
-<!--LOCALIZATION NOTE attachVCardCmd.label Don't translate the term 'vCard' -->
-<!ENTITY attachVCardCmd.label "Personal Card (vCard)">
-<!ENTITY attachVCardCmd.accesskey "P">
 <!ENTITY remindLater.label "Remind Me Later">
 <!ENTITY remindLater.accesskey "L">
 <!ENTITY closeCmd.label "Close">
 <!ENTITY closeCmd.key "W">
 <!ENTITY closeCmd.accesskey "c">
 <!ENTITY saveCmd.label "Save">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "s">
@@ -144,26 +141,16 @@
 <!--LOCALIZATION NOTE attachVCard.label Don't translate the term 'vCard' -->
 <!ENTITY attachVCard.label "Attach Personal Card (vCard)">
 <!ENTITY attachVCard.accesskey "v">
 
 <!ENTITY returnReceiptMenu.label "Return Receipt">
 <!ENTITY returnReceiptMenu.accesskey "t">
 <!ENTITY dsnMenu.label "Delivery Status Notification">
 <!ENTITY dsnMenu.accesskey "N">
-<!ENTITY deliveryFormatMenu.label "Delivery Format">
-<!ENTITY deliveryFormatMenu.accesskey "F">
-<!ENTITY autoFormatCmd.label "Auto-Detect">
-<!ENTITY autoFormatCmd.accesskey "a">
-<!ENTITY plainTextFormatCmd.label "Plain Text Only">
-<!ENTITY plainTextFormatCmd.accesskey "p">
-<!ENTITY htmlFormatCmd.label "Rich Text (HTML) Only">
-<!ENTITY htmlFormatCmd.accesskey "r">
-<!ENTITY bothFormatCmd.label "Plain and Rich (HTML) Text">
-<!ENTITY bothFormatCmd.accesskey "l">
 <!ENTITY priorityMenu.label "Priority">
 <!ENTITY priorityMenu.accesskey "p">
 <!ENTITY priorityButton.title "Priority">
 <!ENTITY priorityButton.tooltiptext "Change the message priority">
 <!ENTITY priorityButton.label "Priority:">
 <!ENTITY lowestPriorityCmd.label "Lowest">
 <!ENTITY lowestPriorityCmd.accesskey "l">
 <!ENTITY lowPriorityCmd.label "Low">
@@ -217,17 +204,16 @@
 <!ENTITY copyButton.tooltip             "Copy">
 <!ENTITY pasteButton.tooltip            "Paste">
 <!ENTITY printButton.tooltip "Print this message">
 
 <!-- Headers -->
 <!--LOCALIZATION NOTE headersSpaces.style is for aligning  the From:, To: and
     Subject: rows. It should be larger than the largest Header label  -->
 <!ENTITY headersSpace2.style "width: 8em;">
-<!ENTITY extraRecipients.tooltip "Other types of addressing fields">
 <!ENTITY fromAddr2.label "From">
 <!ENTITY fromAddr.accesskey "r">
 <!ENTITY replyAddr2.label "Reply-To">
 <!ENTITY newsgroupsAddr2.label "Newsgroup">
 <!ENTITY followupAddr2.label "Followup-To">
 <!ENTITY subject2.label "Subject">
 <!ENTITY subject.accesskey "S">
 <!ENTITY attachmentBucketCloseButton.tooltip "Hide the attachment pane">
--- a/mail/chrome/messenger/migration/migration.properties
+++ b/mail/chrome/messenger/migration/migration.properties
@@ -1,17 +1,16 @@
 # 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/.
 
 profileName_format=%S %S
 
 # Import Sources
 1_seamonkey=Preferences
-
 1_thunderbird=Preferences
 
 2_seamonkey=Account Settings
 2_thunderbird=Account Settings
 2_outlook=Account Settings
 
 4_seamonkey=Address Books
 4_thunderbird=Address Books
@@ -19,14 +18,13 @@ 4_outlook=Address Book
 
 8_seamonkey=Junk Mail Training
 
 16_seamonkey=Saved Passwords
 
 32_seamonkey=Other Data
 
 64_seamonkey=Newsgroup Folders
-
 64_thunderbird=Newsgroup Folders
 
 128_seamonkey=Mail Folders
 128_thunderbird=Mail Folders
 128_outlook=Mail Folders
deleted file mode 100644
--- a/mail/chrome/messenger/newmailaccount/accountProvisioner.dtd
+++ /dev/null
@@ -1,43 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY window.title "Welcome to &brandShortName;">
-<!ENTITY header2.label "Would you like a new email address?">
-<!ENTITY other.languages "We are only displaying the providers offering addresses in your area.  Click here to show all providers.">
-<!ENTITY error.line1 "Sorry, we could not find any suggested email addresses.">
-<!ENTITY error.line2 "You can try to search for nicknames or any other term to find more emails.">
-
-<!-- LOCALIZATION NOTE(error.suggest.before, error.suggest.middle, error.suggest.after):
-     error.suggest.before, error.suggest.middle, and error.suggest.after all go into
-     one line with error.suggest.middle that links to a site which provides download
-     of free account alternatives. -->
-<!ENTITY error.suggest.before "Also you might try one of the ">
-<!ENTITY error.suggest.middle "free email account alternatives">
-<!ENTITY error.suggest.after ".">
-
-<!-- LOCALIZATION NOTE(success.title.before, success.title.after):
-     success.title.before and success.title.after all go into one line, wrapping
-     around the name that the user has typed in to the search input. -->
-<!ENTITY success.title.before "Hello ">
-<!ENTITY success.title.after ", the following email addresses are available to you:">
-<!ENTITY success.tip "(You can also search for nicknames or any other term to find more emails)">
-<!ENTITY partnership.description "In partnership with several providers, &brandShortName; can offer you a new email account. Just fill in your first and last name, or any other words you'd like, in the fields above to get started.">
-<!ENTITY existing.header "Already have an address you want to use?">
-<!ENTITY tinyheader.title "Got an address?">
-<!ENTITY tinyheader.existing "Skip this and use my existing email">
-<!ENTITY content.close "I think I'll configure my account later.">
-<!ENTITY successful.title "Congratulations!">
-<!ENTITY successful.successMessage "You have successfully set up your account.">
-<!ENTITY successful.write "Write some email">
-<!ENTITY successful.write.desc "Let your friends and family know about your new address.<br/> That's why you got this new account, isn't it?">
-<!ENTITY successful.customize "Customize &brandShortName; with some cool add-ons">
-<!ENTITY successful.customize.desc "There are thousands of add-ons that let you customize &brandShortName; to make it fit your specific needs.">
-<!ENTITY successful.attach "Attach a personal signature to my email">
-<!ENTITY successful.attach.desc "You can automatically attach a quote or some information about yourself to the end of every message you send.">
-<!ENTITY successful.close "Close this window.">
-<!ENTITY input.namePlaceholder "Your name, or nickname">
-<!ENTITY input.search "Search">
-<!ENTITY search_engine.title "Customize your search engine">
-<!ENTITY search_engine.message "Your email provider can also provide you with web search capabilities.">
-<!ENTITY search_engine.button "Finish">
deleted file mode 100644
--- a/mail/chrome/messenger/newmailaccount/accountProvisioner.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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/.
-
-# LOCALIZATION NOTE (free):
-# This will be shown instead of a price when displaying free email accounts
-free=Free
-# LOCALIZATION NOTE (price):
-#   %S will be the price per year charged to the user for the account.
-price=%S a year
-# LOCALIZATION NOTE (moreOptions): Semi-colon list of plural forms.
-# See: https://developer.mozilla.org/en/Localization_and_Plurals
-# #1 is the number of additional email addresses available for registration.
-# This line is shown when there are more than two suggested email
-# addresses available.
-moreOptions=+#1 more…;+#1 more…
-# LOCALIZATION NOTE (sepAnd):
-#   \u0020 is a space, and should be included before and after.
-sepAnd=\u0020and\u0020
-# LOCALIZATION NOTE (sepComma):
-#   \u0020 is a space, and should be included after.
-sepComma=,\u0020
-# LOCALIZATION NOTE (privacyDisclaimer):
-#   #1 will be a link for the Mozilla Privacy policy page.
-#   #2 will be a list of providers with links to their ToS and Privacy policies, separated by the 'sepComma' delimiter.
-privacyDisclaimer=The search terms used are sent to Mozilla (#1) and to 3rd party email providers #2 to find available email addresses.
-privacyPolicy=Privacy Policy
-tos=Terms of Service
-# LOCALIZATION NOTE (searchEngineDesc):
-#   %S will be the selected search engine.
-searchEngineDesc=Use %S as my default search engine
-cannotConnect=Sorry - we're unable to communicate with our sign-up server. Please check your connection.
--- a/mail/chrome/messenger/preferences/preferences.properties
+++ b/mail/chrome/messenger/preferences/preferences.properties
@@ -1,22 +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/.
 
-#### Add HTML and Plain Text Domain Names for sendOption
-html_domainsAddDomainTitle=Add HTML Domain Name
-html_domainsAddDomain=HTML Domain Name:
-plaintext_domainsAddDomainTitle=Add Plain Text Domain Name
-plaintext_domainsAddDomain=Plain Text Domain Name:
-
-domainNameErrorTitle=Domain Name Error
-#### LOCALIZATION NOTE: do not translate %S
-domainDuplicationError=The domain name %S already exists in the HTML or Plain Text lists.
-
 #### Junk
 confirmResetJunkTrainingTitle=Confirm
 confirmResetJunkTrainingText=Are you sure you want to reset the adaptive filter training data?
 
 #### Downloads
 desktopFolderName=Desktop
 myDownloadsFolderName=My Downloads
 chooseAttachmentsFolderTitle=Choose Folder
--- a/mail/messenger/aboutAddonsExtra.ftl
+++ b/mail/messenger/aboutAddonsExtra.ftl
@@ -4,10 +4,8 @@
 
 add-on-options-button =
     .title = Add-on Options
 
 add-on-search-alternative-button-label = Find an alternative add-on
 
 atn-addons-heading-search-input =
     .placeholder = Search addons.thunderbird.net
-
-sidebar-preferences-button-title = { -brand-short-name } Preferences
--- a/mail/messenger/aboutRights.ftl
+++ b/mail/messenger/aboutRights.ftl
@@ -42,25 +42,16 @@ rights-intro-point-5-unbranded =
     If this product incorporates web services, any applicable service terms for
     the service(s) should be linked to the
     <a data-l10n-name="mozilla-website-services-link"> Website Services</a>
     section.
 rights-intro-point-6 =
     In order to play back certain types of video content, { -brand-short-name }
     downloads certain content decryption modules from third parties.
 rights-webservices-header = { -brand-full-name } Web-Based Information Services
-rights-webservices =
-    { -brand-full-name } uses web-based information services (“Services”) to
-    provide some of the features provided for your use with this binary version
-    of { -brand-short-name } under the terms described below. If you do not
-    want to use one or more of the Services or the terms below are
-    unacceptable, you may disable the feature or Service(s). Instructions on
-    how to disable a particular feature or Service may be found
-    <a data-l10n-name="mozilla-disable-service-link">here</a>. Other features
-    and Services can be disabled in the application preferences.
 rights-webservices2 =
     { -brand-full-name } uses web-based information services (“Services”) to
     provide some of the features provided for your use with this binary version
     of { -brand-short-name } under the terms described below. If you do not
     want to use one or more of the Services or the terms below are
     unacceptable, you may disable the feature or Service(s). Instructions on
     how to disable a particular feature or Service may be found
     <a data-l10n-name="mozilla-disable-service-link">here</a>. Other features
--- a/mail/messenger/accountCentral.ftl
+++ b/mail/messenger/accountCentral.ftl
@@ -40,18 +40,16 @@ feeds-label = Feeds
     .aria-label = Connect to feeds
 feeds-description = { -brand-short-name } lets you connect to RSS/Atom feeds to get news and updates from all around.
 
 newsgroups-label = Newsgroups
     .aria-label = Connect to a newsgroup
 newsgroups-description = { -brand-short-name } lets you connect to all the newsgroups you want.
 
 import-title = Import from Another Program
-import-paragraph = { -brand-short-name } lets you import mail messages, address book entries, feed subscriptions, preferences, and/or filters from other mail programs and common address book formats.
-
 import-paragraph2 = { -brand-short-name } lets you import mail messages, address book entries, feed subscriptions, settings, and/or filters from other mail programs and common address book formats.
 
 import-label = Import
     .aria-label = Import data from other programs
 
 about-paragraph = Thunderbird is the leading open source, cross-platform email and calendaring client, free for business and personal use. We want it to stay secure and become even better. A donation will allow us to hire developers, pay for infrastructure, and continue to improve.
 
 about-paragraph-consider-donation = <b>Thunderbird is funded by users like you! If you like Thunderbird, please consider making a donation.</b> The best way for you to ensure Thunderbird remains available is to <a data-l10n-name="donation-link"> make a donation</a>.
--- a/mail/messenger/accountManager.ftl
+++ b/mail/messenger/accountManager.ftl
@@ -1,14 +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/.
 
-open-preferences-sidebar-button = { -brand-short-name } Preferences
-
 open-preferences-sidebar-button2 = { -brand-short-name } Settings
 
 open-addons-sidebar-button = Add-ons and Themes
 
 account-action-add-newsgroup-account =
     .label = Add Newsgroup Account…
     .accesskey = N
 
--- a/mail/messenger/accountcreation/accountSetup.ftl
+++ b/mail/messenger/accountcreation/accountSetup.ftl
@@ -48,19 +48,16 @@ account-setup-email-warning-icon =
 
 account-setup-password-label = Password
     .accesskey = P
     .title = Optional, will only be used to validate the username
 
 account-provisioner-button = Get a new email address
     .accesskey = G
 
-account-setup-password-toggle =
-    .title = Show/hide password
-
 account-setup-password-toggle-show =
     .title = Show password in clear text
 
 account-setup-password-toggle-hide =
     .title = Hide password
 
 account-setup-remember-password = Remember password
     .accesskey = m
@@ -177,42 +174,31 @@ account-setup-getting-started = Getting 
 # Variables:
 #  $count (Number) - Number of available protocols.
 account-setup-results-area-title =
     { $count ->
         [one] Available configuration
         *[other] Available configurations
     }
 
-# Note: IMAP is the name of a protocol.
-account-setup-result-imap = IMAP
-
 account-setup-result-imap-description = Keep your folders and emails synced on your server
 
-# Note: POP3 is the name of a protocol.
-account-setup-result-pop = POP3
-
 account-setup-result-pop-description = Keep your folders and emails on your computer
 
-# Note: Exchange is the name of a product.
-account-setup-result-exchange = Exchange
-
 # Note: Exchange, Office365 are the name of products.
 account-setup-result-exchange2-description = Use the Microsoft Exchange server or Office365 cloud services
 
 account-setup-incoming-title = Incoming
 
 account-setup-outgoing-title = Outgoing
 
 account-setup-username-title = Username
 
 account-setup-exchange-title = Server
 
-account-setup-result-smtp = SMTP
-
 account-setup-result-no-encryption = No Encryption
 
 account-setup-result-ssl = SSL/TLS
 
 account-setup-result-starttls = STARTTLS
 
 account-setup-result-outgoing-existing = Use existing outgoing SMTP server
 
@@ -237,22 +223,16 @@ account-setup-provisioner-error = An err
 ## Manual configuration area
 
 account-setup-manual-config-title = Manual configuration
 
 account-setup-incoming-server-legend = Incoming server
 
 account-setup-protocol-label = Protocol:
 
-protocol-imap-option = { account-setup-result-imap }
-
-protocol-pop-option = { account-setup-result-pop }
-
-protocol-exchange-option = { account-setup-result-exchange }
-
 account-setup-hostname-label = Hostname:
 
 account-setup-port-label = Port:
     .title = Set the port number to 0 for autodetection
 
 account-setup-auto-description = { -brand-short-name } will attempt to auto-detect fields that are left blank.
 
 account-setup-ssl-label = Connection security:
--- a/mail/messenger/addressbook/abCardDAVDialog.ftl
+++ b/mail/messenger/addressbook/abCardDAVDialog.ftl
@@ -1,15 +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/.
 
-carddav-window =
-    .title = New CardDAV Address Book
-
 carddav-window-title = New CardDAV Address Book
 
 carddav-dialog =
     .buttonlabelaccept = Continue
     .buttonaccesskeyaccept = C
 
 carddav-username-label =
     .value = Username:
--- a/mail/messenger/addressbook/aboutAddressBook.ftl
+++ b/mail/messenger/addressbook/aboutAddressBook.ftl
@@ -11,17 +11,16 @@ about-addressbook-toolbar-new-address-bo
 about-addressbook-toolbar-add-carddav-address-book =
   .label = Add CardDAV Address Book
 about-addressbook-toolbar-add-ldap-address-book =
   .label = Add LDAP Address Book
 about-addressbook-toolbar-new-contact =
   .label = New Contact
 about-addressbook-toolbar-new-list =
   .label = New List
-
 about-addressbook-toolbar-import =
   .label = Import
 
 ## Books
 
 all-address-books = All Address Books
 
 about-addressbook-books-context-properties =
@@ -31,17 +30,16 @@ about-addressbook-books-context-synchron
 about-addressbook-books-context-print =
   .label = Print…
 about-addressbook-books-context-export =
   .label = Export…
 about-addressbook-books-context-delete =
   .label = Delete
 about-addressbook-books-context-remove =
   .label = Remove
-
 about-addressbook-books-context-startup-default =
   .label = Default startup directory
 
 about-addressbook-confirm-delete-book-title = Delete Address Book
 # Variables:
 # $name (String) - Name of the address book to be deleted.
 about-addressbook-confirm-delete-book =
   Are you sure you want to delete { $name } and all of its contacts?
@@ -132,16 +130,18 @@ about-addressbook-confirm-delete-contact
   { $count ->
      [one] Are you sure you want to delete the contact { $name }?
     *[other] Are you sure you want to delete these { $count } contacts?
   }
 
 ## Details
 
 about-addressbook-write-action-button = Write
+about-addressbook-event-action-button = Event
+about-addressbook-search-action-button = Search
 
 about-addressbook-begin-edit-contact-button = Edit
 about-addressbook-delete-edit-contact-button = Delete
 about-addressbook-cancel-edit-contact-button = Cancel
 about-addressbook-save-edit-contact-button = Save
 
 about-addressbook-add-contact-to = Add to:
 
--- a/mail/messenger/addressbook/fieldMapImport.ftl
+++ b/mail/messenger/addressbook/fieldMapImport.ftl
@@ -1,15 +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/.
 
-import-ab-csv-window =
-    .title = Import Address Book from Text File
-
 import-ab-csv-dialog-title = Import Address Book from Text File
 
 #   $recordNumber (Number) - The current record number of the preview data.
 import-ab-csv-preview-record-number = Preview of the data import for record { $recordNumber }
 
 import-ab-csv-dialog =
     .buttonlabelaccept = Import
     .buttonaccesskeyaccept = I
--- a/mail/messenger/menubar.ftl
+++ b/mail/messenger/menubar.ftl
@@ -3,22 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 toolbar-context-menu-menu-bar =
     .toolbarname = Menu Bar
     .accesskey = M
 
 ## Tools Menu
 
-# Since v89 we dropped the platforms distinction between Options or Preferences
-# and consolidated everything with Preferences.
-menu-tools-preferences =
-    .label = Preferences
-    .accesskey = P
-
 menu-tools-settings =
     .label = Settings
     .accesskey = e
 
 menu-addons-and-themes =
     .label = Add-ons and Themes
     .accesskey = A
 
--- a/mail/messenger/messenger.ftl
+++ b/mail/messenger/messenger.ftl
@@ -94,21 +94,16 @@ redirect-msg-menuitem =
     .accesskey = D
 
 menu-file-save-as-file =
     .label = File…
     .accesskey = F
 
 ## AppMenu
 
-# Since v89 we dropped the platforms distinction between Options or Preferences
-# and consolidated everything with Preferences.
-appmenu-preferences =
-    .label = Preferences
-
 appmenu-save-as-file =
     .label = File…
 
 appmenu-settings =
     .label = Settings
 
 appmenu-addons-and-themes =
     .label = Add-ons and Themes
--- a/mail/messenger/messengercompose/messengercompose.ftl
+++ b/mail/messenger/messengercompose/messengercompose.ftl
@@ -95,20 +95,16 @@ menuitem-toggle-attachment-pane =
     .label = Attachment Pane
     .accesskey = m
     .acceltext = { ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key }
 
 toolbar-button-add-attachment =
     .label = Attach
     .tooltiptext = Add an Attachment ({ ctrl-cmd-shift-pretty-prefix }{ trigger-attachment-picker-key })
 
-add-attachment-notification-reminder =
-    .label = Add Attachment…
-    .tooltiptext = { toolbar-button-add-attachment.tooltiptext }
-
 add-attachment-notification-reminder2 =
     .label = Add Attachment…
     .accesskey = A
     .tooltiptext = { toolbar-button-add-attachment.tooltiptext }
 
 menuitem-attach-files =
     .label = File(s)…
     .accesskey = F
@@ -129,22 +125,16 @@ context-menuitem-attach-openpgp-key =
     .accesskey = K
 
 #   $count (Number) - the number of attachments in the attachment bucket
 attachment-bucket-count-value = { $count ->
     [1]      { $count } Attachment
     *[other] { $count } Attachments
 }
 
-expand-attachment-pane-tooltip =
-    .tooltiptext = Show the attachment pane ({ ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key })
-
-collapse-attachment-pane-tooltip =
-    .tooltiptext = Hide the attachment pane ({ ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key })
-
 attachment-area-show =
     .title = Show the attachment pane ({ ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key })
 
 attachment-area-hide =
     .title = Hide the attachment pane ({ ctrl-cmd-shift-pretty-prefix }{ toggle-attachment-pane-key })
 
 drop-file-label-attachment = { $count ->
     [one]   Add as attachment
@@ -242,58 +232,16 @@ key-notification-disable-encryption =
 
 key-notification-resolve =
     .label = Resolve…
     .accesskey = R
     .tooltiptext = Open the OpenPGP Key Assistant
 
 ## Addressing Area
 
-to-compose-address-row-label =
-    .value = To
-
-#   $key (String) - the shortcut key for this field
-to-compose-show-address-row-menuitem =
-    .label = { to-compose-address-row-label.value } Field
-    .accesskey = T
-    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
-
-to-compose-show-address-row-label =
-    .value = { to-compose-address-row-label.value }
-    .tooltiptext = Show { to-compose-address-row-label.value } Field ({ to-compose-show-address-row-menuitem.acceltext })
-
-cc-compose-address-row-label =
-    .value = Cc
-
-#   $key (String) - the shortcut key for this field
-cc-compose-show-address-row-menuitem =
-    .label = { cc-compose-address-row-label.value } Field
-    .accesskey = C
-    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
-
-cc-compose-show-address-row-label =
-    .value = { cc-compose-address-row-label.value }
-    .tooltiptext = Show { cc-compose-address-row-label.value } Field ({ cc-compose-show-address-row-menuitem.acceltext })
-
-bcc-compose-address-row-label =
-    .value = Bcc
-
-#   $key (String) - the shortcut key for this field
-bcc-compose-show-address-row-menuitem =
-    .label = { bcc-compose-address-row-label.value } Field
-    .accesskey = B
-    .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
-
-bcc-compose-show-address-row-label =
-    .value = { bcc-compose-address-row-label.value }
-    .tooltiptext = Show { bcc-compose-address-row-label.value } Field ({ bcc-compose-show-address-row-menuitem.acceltext })
-
-#   $count (Number) - the count of addresses in the "To" and "Cc" fields.
-many-public-recipients-info = The {$count} recipients in To and Cc will see each other’s address. You can avoid disclosing recipients by using Bcc instead.
-
 to-address-row-label =
     .value = To
 
 #   $key (String) - the shortcut key for this field
 show-to-row-main-menuitem =
     .label = To Field
     .accesskey = T
     .acceltext = { ctrl-cmd-shift-pretty-prefix }{ $key }
--- a/mail/messenger/openpgp/keyWizard.ftl
+++ b/mail/messenger/openpgp/keyWizard.ftl
@@ -119,22 +119,16 @@ openpgp-import-key-title = Import an exi
 
 openpgp-import-key-legend = Select a previously backed up file.
 
 openpgp-import-key-description = You may import personal keys that were created with other OpenPGP software.
 
 openpgp-import-key-info = Other software might describe a personal key using alternative terms such as your own key, secret key, private key or key pair.
 
 #   $count (Number) - the number of keys found in the selected files
-openpgp-import-key-list-amount = { $count ->
-    [one]   Thunderbird found one key that can be imported.
-   *[other] Thunderbird found { $count } keys that can be imported.
-}
-
-#   $count (Number) - the number of keys found in the selected files
 openpgp-import-key-list-amount-2 = { $count ->
     [one]   { -brand-short-name } found one key that can be imported.
    *[other] { -brand-short-name } found { $count } keys that can be imported.
 }
 
 openpgp-import-key-list-description = Confirm which keys may be treated as your personal keys. Only keys that you created yourself and that show your own identity should be used as personal keys. You can change this option later in the Key Properties dialog.
 
 openpgp-import-key-list-caption = Keys marked to be treated as Personal Keys will be listed in the End-To-End Encryption section. The others will be available inside the Key Manager.
--- a/mail/messenger/openpgp/oneRecipientStatus.ftl
+++ b/mail/messenger/openpgp/oneRecipientStatus.ftl
@@ -21,17 +21,16 @@ openpgp-one-recipient-status-instruction
 openpgp-one-recipient-status-instruction2 = To obtain their public key, import them from email they have sent to you and that includes it. Alternatively, you can try to discover their public key on a directory.
 
 openpgp-key-own = Accepted (personal key)
 openpgp-key-secret-not-personal = Not usable
 openpgp-key-verified = Accepted (verified)
 openpgp-key-unverified = Accepted (unverifed)
 openpgp-key-undecided = Not accepted (undecided)
 openpgp-key-rejected = Not accepted (rejected)
-
 openpgp-key-expired = Expired
 
 openpgp-intro = Available public keys for { $key }
 
 openpgp-pubkey-import-id = ID: { $kid }
 openpgp-pubkey-import-fpr = Fingerprint: { $fpr }
 
 openpgp-pubkey-import-intro =
--- a/mail/messenger/openpgp/openpgp.ftl
+++ b/mail/messenger/openpgp/openpgp.ftl
@@ -255,16 +255,18 @@ openpgp-key-man-select-all-key =
 openpgp-key-man-key-details-key =
     .key = I
 
 openpgp-ign-addr-intro =
     You accept using this key for the following selected email addresses:
 
 openpgp-key-details-title =
     .title = Key Properties
+
+openpgp-key-details-doc-title = Key Properties
 openpgp-key-details-signatures-tab =
     .label = Certifications
 openpgp-key-details-structure-tab =
     .label = Structure
 openpgp-key-details-uid-certified-col =
     .label = User ID / Certified by
 openpgp-key-details-key-id-label = Key ID
 openpgp-key-details-user-id2-label = Alleged Key Owner
@@ -298,51 +300,41 @@ openpgp-key-details-expiry-header = Expi
 openpgp-key-details-usage-label =
     .label = Usage
 openpgp-key-details-fingerprint-label = Fingerprint
 openpgp-key-details-legend-secret-missing =
     For keys marked with (!) the secret key is not available.
 openpgp-key-details-sel-action =
   .label = Select action…
   .accesskey = S
-openpgp-key-details-also-known-label = Alleged Alternative Identities of the Key Owner:
 openpgp-card-details-close-window-label =
     .buttonlabelaccept = Close
 openpgp-acceptance-label =
     .label = Your Acceptance
 openpgp-acceptance-rejected-label =
     .label = No, reject this key.
 openpgp-acceptance-undecided-label =
     .label = Not yet, maybe later.
 openpgp-acceptance-unverified-label =
     .label = Yes, but I have not verified that it is the correct key.
 openpgp-acceptance-verified-label =
     .label = Yes, I’ve verified in person this key has the correct fingerprint.
 key-accept-personal =
     For this key, you have both the public and the secret part. You may use it as a personal key.
     If this key was given to you by someone else, then don’t use it as a personal key.
-key-personal-warning = Did you create this key yourself, and the displayed key ownership refers to yourself?
 openpgp-personal-no-label =
     .label = No, don’t use it as my personal key.
 openpgp-personal-yes-label =
     .label = Yes, treat this key as a personal key.
 
 openpgp-copy-cmd-label =
     .label = Copy
 
 ## e2e encryption settings
 
-#   $count (Number) - the number of configured keys associated with the current identity
-#   $identity (String) - the email address of the currently selected identity
-openpgp-description = { $count ->
-    [0]     Thunderbird doesn’t have a personal OpenPGP key for <b>{ $identity }</b>
-    [one]   Thunderbird found { $count } personal OpenPGP key associated with <b>{ $identity }</b>
-   *[other] Thunderbird found { $count } personal OpenPGP keys associated with <b>{ $identity }</b>
-}
-
 #   $identity (String) - the email address of the currently selected identity
 openpgp-description-no-key = { -brand-short-name } doesn’t have a personal OpenPGP key for <b>{ $identity }</b>
 
 #   $count (Number) - the number of configured keys associated with the current identity
 #   $identity (String) - the email address of the currently selected identity
 openpgp-description-has-keys = { $count ->
     [one]   { -brand-short-name } found { $count } personal OpenPGP key associated with <b>{ $identity }</b>
    *[other] { -brand-short-name } found { $count } personal OpenPGP keys associated with <b>{ $identity }</b>
@@ -420,18 +412,16 @@ key-usage-encrypt = Encrypt
 key-usage-sign = Sign
 key-usage-certify = Certify
 key-usage-authentication = Authentication
 key-does-not-expire = The key does not expire
 key-expired-date = The key expired on { $keyExpiry }
 key-expired-simple = The key has expired
 key-revoked-simple = The key was revoked
 key-do-you-accept = Do you accept this key for verifying digital signatures and for encrypting messages?
-key-accept-warning = Avoid accepting a rogue key. Use a communication channel other than email to verify the fingerprint of your correspondent’s key.
-
 key-verification = Verify the fingerprint of the key using a secure communication channel other than email to make sure that it’s really the key of { $addr }.
 
 # Strings enigmailMsgComposeOverlay.js
 cannot-use-own-key-because = Unable to send the message, because there is a problem with your personal key. { $problem }
 cannot-encrypt-because-missing = Unable to send this message with end-to-end encryption, because there are problems with the keys of the following recipients: { $problem }
 window-locked = Compose window is locked; send cancelled
 
 # Strings in mimeDecrypt.jsm
@@ -456,37 +446,16 @@ wkd-message-body-process =
     You do not need to take any manual action at this point.
 
 # Strings in persistentCrypto.jsm
 converter-decrypt-body-failed =
     Could not decrypt message with subject
     { $subject }.
     Do you want to retry with a different passphrase or do you want to skip the message?
 
-# Strings in gpg.jsm
-unknown-signing-alg = Unknown signing algorithm (ID: { $id })
-unknown-hash-alg = Unknown cryptographic hash (ID: { $id })
-
-# Strings in keyUsability.jsm
-expiry-key-expires-soon =
-    Your key { $desc } will expire in less than { $days } days.
-    We recommend that you create a new key pair and configure the corresponding accounts to use it.
-expiry-keys-expire-soon =
-    Your following keys will expire in less than { $days } days:{ $desc }.
-    We recommend that you create new keys and configure the corresponding accounts to use them.
-expiry-key-missing-owner-trust =
-    Your secret key { $desc } has missing trust.
-    We recommend that you set “You rely on certifications” to “ultimate” in key properties.
-expiry-keys-missing-owner-trust =
-    The following of your secret keys have missing trust.
-    { $desc }.
-    We recommend that you set “You rely on certifications” to “ultimate” in key properties.
-expiry-open-key-manager = Open OpenPGP Key Manager
-expiry-open-key-properties = Open Key Properties
-
 # Strings filters.jsm
 filter-folder-required = You must select a target folder.
 filter-decrypt-move-warn-experimental =
     Warning - the filter action “Decrypt permanently” may lead to destroyed messages.
     We strongly recommend that you first try the “Create decrypted Copy” filter, test the result carefully, and only start using this filter once you are satisfied with the result.
 filter-term-pgpencrypted-label = OpenPGP Encrypted
 filter-key-required = You must select a recipient key.
 filter-key-not-found = Could not find an encryption key for ‘{ $desc }’.
@@ -713,30 +682,20 @@ minimal-line-wrapping =
 sending-news =
     Encrypted send operation aborted.
     This message cannot be encrypted because there are newsgroup recipients. Please re-send the message without encryption.
 send-to-news-warning =
     Warning: you are about to send an encrypted email to a newsgroup.
     This is discouraged because it only makes sense if all members of the group can decrypt the message, i.e. the message needs to be encrypted with the keys of all group participants. Please send this message only if you know exactly what you are doing.
     Continue?
 save-attachment-header = Save decrypted attachment
-no-temp-dir =
-    Could not find a temporary directory to write to
-    Please set the TEMP environment variable
 possibly-pgp-mime = Possibly PGP/MIME encrypted or signed message; use ‘Decrypt/Verify’ function to verify
 cannot-send-sig-because-no-own-key = Cannot digitally sign this message, because you haven’t yet configured end-to-end encryption for <{ $key }>
 cannot-send-enc-because-no-own-key = Cannot send this message encrypted, because you haven’t yet configured end-to-end encryption for <{ $key }>
 
-compose-menu-attach-key =
-    .label = Attach My Public Key
-    .accesskey = A
-compose-menu-encrypt-subject =
-    .label = Subject Encryption
-    .accesskey = b
-
 # Strings used in decryption.jsm
 do-import-multiple =
     Import the following keys?
     { $key }
 do-import-one = Import { $name } ({ $id })?
 cant-import = Error importing public key
 unverified-reply = Indented message part (reply) was probably modified
 key-in-message-body = A key was found in the message body. Click ‘Import Key’ to import the key
--- a/mail/messenger/otr/add-finger.ftl
+++ b/mail/messenger/otr/add-finger.ftl
@@ -1,15 +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/.
 
-otr-add-finger =
-    .title = Add OTR Key Fingerprint
-
 otr-add-finger-title = Add OTR Key Fingerprint
 
 # Variables:
 #   $name (String) - name of a chat contact person
 # Do not translate 'OTR' (name of an encryption protocol)
 otr-add-finger-description = Enter the OTR key fingerprint for { $name }.
 
 otr-add-finger-fingerprint = Fingerprint:
--- a/mail/messenger/otr/am-im-otr.ftl
+++ b/mail/messenger/otr/am-im-otr.ftl
@@ -1,26 +1,23 @@
 # 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/.
 
 account-encryption =
     .label = End-to-end Encryption
 account-otr-label = Off-the-Record Messaging (OTR)
-account-otr-description = { -brand-short-name } supports end-to-end encryption of one-to-one conversations. This prevents third parties from eavesdropping on a conversation. End-to-end encryption can only be used when the other person also uses software that supports OTR.
 account-otr-description2 = { -brand-short-name } supports end-to-end encryption of one-to-one conversations based on OTR. This prevents third parties from eavesdropping on a conversation. This kind of end-to-end encryption can only be used when the other person also uses software that supports OTR.
 otr-encryption-title = Verified Encryption
 otr-encryption-caption = To enable others to verify your identity in OTR chats, share your own OTR fingerprint using an outside (out-of-band) communication channel.
 otr-fingerprint-label = Your Fingerprint:
 view-fingerprint-button =
     .label = Manage Fingerprints of Contacts
     .accesskey = F
 otr-settings-title = OTR Settings
-otr-log =
-    .label = Include OTR encrypted messages in conversation logs
 otr-require-encryption =
     .label = Require end-to-end encryption for one-to-one conversations
 otr-require-encryption-info =
     When requiring end-to-end encryption, messages in one-to-one conversations
     will not be sent unless they can be encrypted. Received unencrypted messages
     will not be shown as part of the regular conversation, and not logged either.
 otr-verify-nudge =
     .label = Always remind me to verify an unverified contact
--- a/mail/messenger/otr/finger.ftl
+++ b/mail/messenger/otr/finger.ftl
@@ -1,16 +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/.
 
-otr-finger =
-    .buttonlabelaccept = Close
-    .title = Previously Seen OTR Fingerprints
-
 otr-finger-title = Previously Seen OTR Fingerprints
 
 finger-intro = OTR key fingerprints from previous end-to-end encrypted conversations.
 
 finger-screen-name =
     .label = Contact
 finger-verified =
     .label = Verification Status
--- a/mail/messenger/otr/otrUI.ftl
+++ b/mail/messenger/otr/otrUI.ftl
@@ -41,17 +41,16 @@ alert-gone-insecure = The encrypted conv
 #   $name (String) - the screen name of a chat contact person
 finger-unseen = The identity of { $name } has not been verified yet. Casual eavesdropping is not possible, but with some effort someone could be listening in. Prevent surveillance by verifying this contact’s identity.
 
 # Variables:
 #   $name (String) - the screen name of a chat contact person
 finger-seen={ $name } is contacting you from an unrecognized computer. Casual eavesdropping is not possible, but with some effort someone could be listening in. Prevent surveillance by verifying this contact’s identity.
 
 state-not-private = The current conversation is not private.
-
 state-generic-not-private = The current conversation is not private.
 
 # Variables:
 #   $name (String) - the screen name of a chat contact person
 state-unverified = The current conversation is encrypted but not private, since the identity of { $name } has not yet been verified.
 
 state-generic-unverified = The current conversation is encrypted but not private, since some identities have not yet been verified.
 
--- a/mail/messenger/preferences/connection.ftl
+++ b/mail/messenger/preferences/connection.ftl
@@ -20,19 +20,16 @@ connection-dns-over-https-custom-label =
 
 connection-dialog-window =
     .title = Connection Settings
     .style = { PLATFORM() ->
         [macos] width: 44em !important
         *[other] width: 49em !important
     }
 
-connection-disable-extension =
-    .label = Disable Extension
-
 disable-extension-button = Disable Extension
 
 # Variables:
 #   $name (String) - The extension that is controlling the proxy settings.
 #
 # The extension-icon is the extension's icon, or a fallback image. It should be
 # purely decoration for the actual extension name, with alt="".
 proxy-settings-controlled-by-extension = An extension, <img data-l10n-name="extension-icon" alt="" /> { $name }, is controlling how { -brand-short-name } connects to the Internet.
--- a/mail/messenger/preferences/dock-options.ftl
+++ b/mail/messenger/preferences/dock-options.ftl
@@ -22,11 +22,9 @@ dock-icon-show-label =
 count-unread-messages-radio =
     .label = Count of unread messages
     .accesskey = u
 
 count-new-messages-radio =
     .label = Count of new messages
     .accesskey = n
 
-notification-settings-info = You can disable the badge on the Notification pane of System Preferences.
-
 notification-settings-info2 = You can disable the badge on the Notification pane of System Settings.
--- a/mail/messenger/preferences/preferences.ftl
+++ b/mail/messenger/preferences/preferences.ftl
@@ -1,17 +1,15 @@
 # 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/.
 
 close-button =
     .aria-label = Close
 
-preferences-doc-title = Preferences
-
 preferences-doc-title2 = Settings
 
 category-list =
     .aria-label = Categories
 
 pane-general-title = General
 category-general =
     .tooltiptext = { pane-general-title }
@@ -195,18 +193,16 @@ mail-play-button =
     .label = Play
     .accesskey = P
 
 change-dock-icon = Change preferences for the app icon
 app-icon-options =
     .label = App Icon Options…
     .accesskey = n
 
-notification-settings = Alerts and the default sound can be disabled on the Notification pane of System Preferences.
-
 notification-settings2 = Alerts and the default sound can be disabled on the Notification pane of System Settings.
 
 animated-alert-label =
     .label = Show an alert
     .accesskey = S
 customize-alert-label =
     .label = Customize…
     .accesskey = C
@@ -252,17 +248,16 @@ maildir-store-label =
 
 scrolling-legend = Scrolling
 autoscroll-label =
     .label = Use autoscrolling
     .accesskey = U
 smooth-scrolling-label =
     .label = Use smooth scrolling
     .accesskey = m
-
 browsing-gtk-use-non-overlay-scrollbars =
     .label = Always show scrollbars
     .accesskey = c
 
 system-integration-legend = System Integration
 always-check-default =
     .label = Always check to see if { -brand-short-name } is the default mail client on startup
     .accesskey = A
@@ -573,22 +568,16 @@ bg-color-label =
 restore-html-label =
     .label = Restore Defaults
     .accesskey = R
 
 default-format-label =
     .label = Use Paragraph format instead of Body Text by default
     .accesskey = P
 
-format-description = Configure text format behavior
-
-send-options-label =
-    .label = Send Options…
-    .accesskey = S
-
 compose-send-format-title = Sending Format
 
 compose-send-automatic-option =
     .label = Automatic
 
 compose-send-automatic-description = If no styling is used in the message, send Plain Text. Otherwise, send HTML with a Plain Text fallback.
 
 compose-send-both-option =
@@ -879,19 +868,16 @@ chat-custom-sound-label =
 chat-browse-sound-button =
     .label = Browse…
     .accesskey = B
 
 theme-label =
     .value = Theme:
     .accesskey = T
 
-style-thunderbird =
-    .label = Thunderbird
-
 style-mail =
     .label = { -brand-short-name }
 style-bubbles =
     .label = Bubbles
 style-dark =
     .label = Dark
 style-paper =
     .label = Paper Sheets
@@ -909,43 +895,23 @@ chat-variant-label =
 # This is used to determine the width of the search field in about:preferences,
 # in order to make the entire placeholder string visible
 #
 # Please keep the placeholder string short to avoid truncation.
 #
 # Notice: The value of the `.style` attribute is a CSS string, and the `width`
 # is the name of the CSS property. It is intended only to adjust the element's width.
 # Do not translate.
-search-preferences-input =
-    .style = width: 15.4em
-    .placeholder = Find in Preferences
-
-## Preferences UI Search Results
-
-# This is used to determine the width of the search field in about:preferences,
-# in order to make the entire placeholder string visible
-#
-# Please keep the placeholder string short to avoid truncation.
-#
-# Notice: The value of the `.style` attribute is a CSS string, and the `width`
-# is the name of the CSS property. It is intended only to adjust the element's width.
-# Do not translate.
 search-preferences-input2 =
     .style = width: 15.4em
     .placeholder = Find in Settings
 
 ## Settings UI Search Results
 
 search-results-header = Search Results
 
 # `<span data-l10n-name="query"></span>` will be replaced by the search term.
-search-results-empty-message = { PLATFORM() ->
-    [windows] Sorry! There are no results in Options for “<span data-l10n-name="query"></span>”.
-    *[other] Sorry! There are no results in Preferences for “<span data-l10n-name="query"></span>”.
-}
-
-# `<span data-l10n-name="query"></span>` will be replaced by the search term.
 search-results-empty-message2 = { PLATFORM() ->
     [windows] Sorry! There are no results in Options for “<span data-l10n-name="query"></span>”.
     *[other] Sorry! There are no results in Settings for “<span data-l10n-name="query"></span>”.
 }
 
 search-results-help-link = Need help? Visit <a data-l10n-name="url">{ -brand-short-name } Support</a>
deleted file mode 100644
--- a/mail/messenger/preferences/sendoptions.ftl
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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/.
-
-sendoptions-dialog-window =
-    .title = Send Options
-
-send-mail-title = Text Format
-
-auto-downgrade-label =
-    .label = Send messages as plain text if possible
-    .accesskey = t
-
-default-html-format-label = When sending messages in HTML format and one or more recipients are not listed as being able to receive HTML:
-
-html-format-ask =
-    .label = Ask me what to do
-    .accesskey = k
-
-html-format-convert =
-    .label = Convert the message to plain text
-    .accesskey = C
-
-html-format-send-html =
-    .label = Send the message in HTML anyway
-    .accesskey = S
-
-html-format-send-both =
-    .label = Send the message in both plain text and HTML
-    .accesskey = e
-
-default-html-format-info = Note: Use the Address Book to specify preferred text formats for recipients.
-
-html-tab-label =
-    .label = HTML Domains
-    .accesskey = H
-
-plain-tab-label =
-    .label = Plain Text Domains
-    .accesskey = P
-
-send-message-domain-label = When you send a message to an address with one of the domain names listed below, { -brand-short-name } automatically sends the message in the correct format.
-
-add-domain-button =
-    .label = Add…
-    .accesskey = A
-
-delete-domain-button =
-    .label = Delete
-    .accesskey = D
deleted file mode 100644
--- a/mobile/chrome/region.properties
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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/.
-
-# Increment this number when anything gets changed in the list below.  This will
-# cause Firefox to re-read these prefs and inject any new handlers into the
-# profile database.  Note that "new" is defined as "has a different URL"; this
-# means that it's not possible to update the name of existing handler, so
-# don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=3
-
-# The default set of protocol handlers for mailto:
-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
-gecko.handlerService.schemes.mailto.1.name=Gmail
-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
-
-# This is the default set of web based feed handlers shown in the reader
-# selection UI
-browser.contentHandlers.types.0.title=My Yahoo!
-browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
-
-# Order of suggested websites displayed in the Top Sites panel.
-# Values for these keys must correspond to the name used in the keys that
-# define each suggested website's details. For example:
-# browser.suggestedsites.list.0=NAME
-# browser.suggestedsites.NAME.title=Displayed name
-# browser.suggestedsites.NAME.url=Website URL
-# browser.suggestedsites.NAME.bgcolor= Color (hex format)
-#
-browser.suggestedsites.list.0=facebook
-browser.suggestedsites.list.1=youtube
-browser.suggestedsites.list.2=amazon
-browser.suggestedsites.list.3=wikipedia
-browser.suggestedsites.list.4=twitter
-
-browser.suggestedsites.facebook.title=Facebook
-browser.suggestedsites.facebook.url=https://m.facebook.com/
-browser.suggestedsites.facebook.bgcolor=#3B5998
-
-browser.suggestedsites.youtube.title=YouTube
-browser.suggestedsites.youtube.url=https://m.youtube.com/
-browser.suggestedsites.youtube.bgcolor=#DB2532
-
-browser.suggestedsites.amazon.title=Amazon
-browser.suggestedsites.amazon.url=https://www.amazon.com/
-browser.suggestedsites.amazon.bgcolor=#FFFFFF
-
-browser.suggestedsites.wikipedia.title=Wikipedia
-browser.suggestedsites.wikipedia.url=https://www.wikipedia.org/
-browser.suggestedsites.wikipedia.bgcolor=#000000
-
-browser.suggestedsites.twitter.title=Twitter
-browser.suggestedsites.twitter.url=https://mobile.twitter.com/
-browser.suggestedsites.twitter.bgcolor=#1DA1F2
-
-browser.suggestedsites.restricted.list.0=restricted_fxsupport
-browser.suggestedsites.restricted.list.1=webmaker
-browser.suggestedsites.restricted.list.2=restricted_mozilla
-
-browser.suggestedsites.restricted_fxsupport.title=Firefox Help and Support for restricted profiles on Android tablets
-browser.suggestedsites.restricted_fxsupport.url=https://support.mozilla.org/kb/controlledaccess
-browser.suggestedsites.restricted_fxsupport.bgcolor=#FF9400
-
-browser.suggestedsites.webmaker.title=Learn the Web: Mozilla Webmaker
-browser.suggestedsites.webmaker.url=https://webmaker.org/
-browser.suggestedsites.webmaker.bgcolor=#5B6C86
-
-# LOCALIZATION NOTE: browser.suggestedsites.restricted_mozilla.url must be different from browser.suggestedsites.mozilla.url
-browser.suggestedsites.restricted_mozilla.title=The Mozilla Project
-browser.suggestedsites.restricted_mozilla.url=https://www.mozilla.org
-browser.suggestedsites.restricted_mozilla.bgcolor=#000000
-browser.suggestedsites.restricted_mozilla.trackingid=632
--- a/mobile/overrides/appstrings.properties
+++ b/mobile/overrides/appstrings.properties
@@ -29,13 +29,12 @@ proxyConnectFailure=Firefox is configure
 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
 unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 harmfulBlocked=The site at %S has been reported as a potentially harmful site and has been blocked based on your security preferences.
 deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
 unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
-remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
 sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
 weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, Firefox has not connected to this website.
 inadequateSecurityError=The website tried to negotiate an inadequate level of security.
 networkProtocolError=Firefox has experienced a network protocol violation that cannot be repaired.
--- a/mobile/overrides/netError.dtd
+++ b/mobile/overrides/netError.dtd
@@ -189,19 +189,16 @@ netError.xhtml) because it exposes funct
 
 <!ENTITY securityOverride.warningContent "
 <p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
 
 <button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
 <button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>
 ">
 
-<!ENTITY remoteXUL.title "Remote XUL">
-<!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the website owners to inform them of this problem.</li></ul></p>">
-
 <!ENTITY sslv3Used.title "Unable to Connect Securely">
 <!-- LOCALIZATION NOTE (sslv3Used.longDesc) - Do not translate
      "SSL_ERROR_UNSUPPORTED_VERSION". -->
 <!ENTITY sslv3Used.longDesc "Advanced info: SSL_ERROR_UNSUPPORTED_VERSION">
 
 <!ENTITY weakCryptoUsed.title "Your connection is not secure">
 <!-- LOCALIZATION NOTE (weakCryptoUsed.longDesc) - Do not translate
      "SSL_ERROR_NO_CYPHER_OVERLAP". -->
--- a/netwerk/necko.properties
+++ b/netwerk/necko.properties
@@ -59,20 +59,16 @@ CookieLaxForced2=Cookie “%1$S” has “SameSite” policy set to “Lax” because it is missing a “SameSite” attribute, and “SameSite=Lax” is the default value for this attribute.
 # LOCALIZATION NOTE(CookieLaxForcedForBeta2): %1$S is the cookie name. %2$S is a URL. Do not localize "SameSite", "Lax" and "SameSite=Lax", "SameSite=None".
 CookieLaxForcedForBeta2=Cookie “%1$S” does not have a proper “SameSite” attribute value. Soon, cookies without the “SameSite” attribute or with an invalid value will be treated as “Lax”. This means that the cookie will no longer be sent in third-party contexts. If your application depends on this cookie being available in such contexts, please add the “SameSite=None“ attribute to it. To know more about the “SameSite“ attribute, read %2$S
 # LOCALIZATION NOTE(CookieSameSiteValueInvalid2): %1$S is cookie name. Do not localize "SameSite", "Lax", "Strict" and "None"
 CookieSameSiteValueInvalid2=Invalid “SameSite“ value for cookie “%1$S”. The supported values are: “Lax“, “Strict“, “None“.
 # LOCALIZATION NOTE (CookieOversize): %1$S is the cookie name. %2$S is the number of bytes. "B" means bytes.
 CookieOversize=Cookie “%1$S” is invalid because its size is too big. Max size is %2$S B.
 # LOCALIZATION NOTE (CookiePathOversize): %1$S is the cookie name. %2$S is the number of bytes. "B" means bytes.
 CookiePathOversize=Cookie “%1$S” is invalid because its path size is too big. Max size is %2$S B.
-# LOCALIZATION NOTE (CookieSchemefulRejectForBeta): %1$S is the cookie name. %2$S is the hostname.
-CookieSchemefulRejectForBeta=Cookie “%1$S” will be soon treated as cross-site cookie against “%2$S” because the scheme does not match.
-# LOCALIZATION NOTE (CookieSchemefulReject): %1$S is the cookie name. %2$S is the hostname.
-CookieSchemefulReject=Cookie “%1$S” has been treated as cross-site against “%2$S” because the scheme does not match.
 # LOCALIZATION NOTE (CookieRejectedByPermissionManager): %1$S is the cookie response header.
 CookieRejectedByPermissionManager=Cookie “%1$S” has been rejected by user set permissions.
 # LOCALIZATION NOTE (CookieRejectedInvalidCharName): %1$S is the cookie name.
 CookieRejectedInvalidCharName=Cookie “%1$S” has been rejected for invalid characters in the name.
 # LOCALIZATION NOTE (CookieRejectedInvalidDomain): %1$S is the cookie name.
 CookieRejectedInvalidDomain=Cookie “%1$S” has been rejected for invalid domain.
 # LOCALIZATION NOTE (CookieRejectedInvalidPrefix): %1$S is the cookie name.
 CookieRejectedInvalidPrefix=Cookie “%1$S” has been rejected for invalid prefix.
--- a/suite/chatzilla/chrome/chatzilla.properties
+++ b/suite/chatzilla/chrome/chatzilla.properties
@@ -16,44 +16,16 @@ msg.alert   = Alert
 msg.prompt  = Prompt
 msg.confirm = Confirm
 
 # command.js
 
 ### Notes for localizers ###
 #
 # ChatZilla uses cmd.<command name>.* to construct the command's help,
-# parameters and any UI labels. For the command to continue to function, the
-# *.params entries MUST NOT BE CHANGED. Hopefully in the future you will be
-# able to localize these items as well.
-#
-### DO NOT LOCALIZE THE *.params STRINGS ###
-#
-# Note also that, for every command, an accesskey may be specified:
-#   EITHER by prefixing the desired accesskey with "&" in the .label string,
-#   OR     by specifying a .accesskey string, which is useful if the desired
-#          accesskey does not occur in the label.
-#
-# The following are therefore equivalent:
-#    cmd.foo.label = &Foo
-# and
-#    cmd.foo.label = Foo
-#    cmd.foo.accesskey = F
-#
-#
-# All localised strings may contain certain entities for branding purposes.
-# The three standard brand entities (brandShortName, brandFullName, vendorName)
-# can all be used like this:
-#     foo.bar = Some text used in &brandFullName;!
-#
-### End of notes ###
-
-### Notes for localizers ###
-#
-# ChatZilla uses cmd.<command name>.* to construct the command's help,
 # help usage and any UI labels.
 #
 # Note also that, for every command, an accesskey may be specified:
 #   EITHER by prefixing the desired accesskey with "&" in the .label string,
 #   OR     by specifying a .accesskey string, which is useful if the desired
 #          accesskey does not occur in the label.
 #
 # The following are therefore equivalent:
@@ -68,896 +40,583 @@ msg.confirm = Confirm
 # can all be used like this:
 #     foo.bar = Some text used in &brandFullName;!
 #
 ### End of notes ###
 
 cmd.about.label = About ChatZilla
 cmd.about.help  = Display information about this version of ChatZilla.
 
-cmd.alias.params = [<alias-name> [<command-list>]]
-
 cmd.alias.helpUsage = [<alias-name> [<command-list>]]
 cmd.alias.help   = Defines <alias-name> as an alias for the semicolon (';') delimited list of commands specified by <command-list>.  If <command-list> is a minus ('-') character, the alias will be removed; if omitted, the alias will be displayed. If <alias-name> is not provided, all aliases will be listed.
 
-cmd.attach.params = <irc-url>
-
 cmd.attach.helpUsage = <irc-url>
 cmd.attach.help   = Attaches to the IRC URL specified by <irc-url>.  If you are already attached, the view for <irc-url> is made current.  If that view has been deleted, it is recreated.  You may omit the irc:// portion of the <irc-url>.  Examples are; /attach libera.chat, /attach libera.chat/firefox and /attach libera.chat/SeaMonkey,isnick.
 
 cmd.away.label  = Away (default)
 # LOCALIZATION NOTE (cmd.away.format):
 # Do not localize $reason
 cmd.away.format = Away ($reason)
-cmd.away.params = [<reason>]
 cmd.away.helpUsage = [<reason>]
 cmd.away.help   = If <reason> is specified, sets you away with that message. Used without <reason>, you are marked away with a default message.
 
 cmd.back.label  = Back
-cmd.back.params =
 cmd.back.help   = Marks you as no longer away.
 
 cmd.ban.label  = Ban
 # LOCALIZATION NOTE (cmd.ban.format):
 # Do not localize $channelName
 cmd.ban.format = Ban from $channelName
-cmd.ban.params = [<nickname>]
 cmd.ban.helpUsage = [<nickname>]
 cmd.ban.help   = Bans a single user, or mask of users, from the current channel. A user's nickname may be specified, or a proper host mask can be used. Used without a nickname or mask, shows the list of bans currently in effect.
 
 cmd.cancel.help = Cancels an /attach or /server command, or a file transfer.  Use /cancel on a network view when ChatZilla is repeatedly trying to attach to a network that is not responding, to tell ChatZilla to give up before the normal number of retries.  Use /cancel on a file transfer view to stop the transfer.
 
-cmd.charset.params = [<new-charset>]
-
 cmd.charset.helpUsage = [<new-charset>]
 cmd.charset.help   = Sets the character encoding mode for the current view to <new-charset>, or displays the current character encoding mode if <new-charset> is not provided.
 
-cmd.channel-motif.params = [<motif> [<channel>]]
-
 cmd.channel-motif.helpUsage = [<motif> [<channel>]]
 cmd.channel-motif.help   = Sets the CSS file used for the message tab for this specific channel.  <motif> can be a URL to a .css file, or the shortcut "dark" or "light".  If <motif> is a minus ('-') character, the motif will revert to the network motif.  If <channel> is not provided, the current channel will be assumed.  See the ChatZilla homepage at <http://www.mozilla.org/projects/rt-messaging/chatzilla/> for more information on how to style ChatZilla.  See also |motif|.
 
-cmd.channel-pref.params = [<pref-name> [<pref-value>]]
-
 cmd.channel-pref.helpUsage = [<pref-name> [<pref-value>]]
 cmd.channel-pref.help    = Sets the value of the preference named <pref-name> to the value of <pref-value> on the current channel.  If <pref-value> is not provided, the current value of <pref-name> will be displayed.  If both <pref-name> and <pref-value> are omitted, all preferences will be displayed.  If <pref-value> is a minus ('-') character, then the preference will revert back to its default value.
 
 cmd.clear-view.label  = Cl&ear Tab
-cmd.clear-view.params = [<view>]
 cmd.clear-view.helpUsage = [<view>]
 cmd.clear-view.help = Clear the current view, discarding *all* content.
 cmd.clear-view.key = accel L
 
 cmd.client.help = Make the ``*client*'' view current.  If the ``*client*'' view has been deleted, it will be recreated.
 
-cmd.cmd-docommand.params = <cmd-name>
-cmd.cmd-docommand.help   =
-
 cmd.cmd-undo.label  = &Undo
 cmd.cmd-undo.key    = accel Z
-cmd.cmd-undo.params =
-cmd.cmd-undo.help   = Undoes the last change made to text in the input box.
-
 cmd.cmd-redo.label  = &Redo
 cmd.cmd-redo.key    = accel Y
-cmd.cmd-redo.params =
-cmd.cmd-redo.help   = Redoes the last change to the text in the input box which you undid.
-
 cmd.cmd-cut.label  = Cu&t
 cmd.cmd-cut.key    = accel X
-cmd.cmd-cut.params =
-cmd.cmd-cut.help   = Copies the currently-selected text to clipboard, and removes it from the source.
-
 cmd.cmd-copy.label  = &Copy
 cmd.cmd-copy.key    = accel C
-cmd.cmd-copy.params =
-cmd.cmd-copy.help   = Copies the currently-selected text to clipboard.
-
 cmd.cmd-paste.label  = &Paste
 cmd.cmd-paste.key    = accel V
-cmd.cmd-paste.params =
-cmd.cmd-paste.help   = Pastes the contents of clipboard.
-
 cmd.cmd-delete.label  = &Delete
 cmd.cmd-delete.key    = VK_DELETE
-cmd.cmd-delete.params =
-cmd.cmd-delete.help   = Deletes the current selection.
-
 cmd.cmd-selectall.label  = Select &All
 cmd.cmd-selectall.key    = accel A
-cmd.cmd-selectall.params =
-cmd.cmd-selectall.help   = Selects all the text in the current view.
-
 cmd.cmd-copy-link-url.label  = Copy Link Location
-cmd.cmd-copy-link-url.params = <url>
-cmd.cmd-copy-link-url.help   = Copies the URL of the current link to clipboard.
 
 cmd.cmd-mozilla-prefs.label  = &&brandShortName; Preferences…
-cmd.cmd-mozilla-prefs.params =
-cmd.cmd-mozilla-prefs.help   =
-
 cmd.cmd-prefs.label  = Pr&eferences…
-cmd.cmd-prefs.params =
-cmd.cmd-prefs.help   =
-
 cmd.cmd-chatzilla-prefs.label  = ChatZilla Pr&eferences…
-cmd.cmd-chatzilla-prefs.params =
-cmd.cmd-chatzilla-prefs.help   =
-
 cmd.cmd-chatzilla-opts.label  = &Options…
-cmd.cmd-chatzilla-opts.params =
-cmd.cmd-chatzilla-opts.help   =
-
-cmd.commands.params = [<pattern>]
 
 cmd.commands.helpUsage = [<pattern>]
 cmd.commands.help   = Lists all command names matching <pattern>, or all command names if pattern is not specified.
 
-cmd.create-tab-for-view.params = <view>
-cmd.create-tab-for-view.help   =
-
 cmd.custom-away.label  = Away (custom)…
-cmd.custom-away.help   = Prompts for a custom away message and then sets you away using it. Use the |/away| command to specify an away message as part of the command.
-
-cmd.sync-font.help      = Synchronizes all views with their current font settings.
-cmd.sync-header.help    = Synchronizes all views with their current header display setting.
-cmd.sync-log.help       = Synchronizes all views with their current logging setting.
-cmd.sync-motif.help     = Synchronizes all views with their current motif setting.
-cmd.sync-timestamp.help = Synchronizes all views with their current timestamp display settings.
-cmd.sync-window.help    = Synchronizes all views with their current output window setting.
-
-cmd.ctcp.params = <target> <code> [<params>]
 
 cmd.ctcp.helpUsage = <target> <code> [<params>]
 cmd.ctcp.help   = Sends the CTCP code <code> to the target (user or channel) <target>.  If <params> are specified they are sent along as well.
 
-cmd.default-charset.params = [<new-charset>]
-
 cmd.default-charset.helpUsage = [<new-charset>]
 cmd.default-charset.help   = Sets the global default character encoding mode to <new-charset>, or displays the current global default character encoding mode if <new-charset> is not provided.
 
-cmd.delayed.params = <delay> <rest>
-
 cmd.delayed.helpUsage = <delay> <rest>
 cmd.delayed.help   = After |delay| seconds, run the command specified in |rest|.
 
-cmd.describe.params = <target> <action>
-
 cmd.describe.helpUsage = <target> <action>
 cmd.describe.help   = Performs an 'action' at the |target|, either a channel or a user.
 
-cmd.dcc-accept.params = [<nickname> [<type> [<file>]]]
-
 cmd.dcc-accept.helpUsage = [<nickname> [<type> [<file>]]]
 cmd.dcc-accept.help   = Accepts an incoming DCC Chat or Send offer. If a |nickname| is not specified, the last offer that arrived will be accepted (for security reasons, this will not work in the first 10 seconds after an offer is received). You can also use a regular expression for either <nickname> or <file>.
 
-cmd.dcc-accept-list.params =
-
 cmd.dcc-accept-list.help   = Displays the DCC auto-accept list for the current network.
 
-cmd.dcc-accept-list-add.params = <nickname>
-
 cmd.dcc-accept-list-add.helpUsage = <nickname>
 cmd.dcc-accept-list-add.help   = Add someone to your DCC auto-accept list for the current network.
 
-cmd.dcc-accept-list-remove.params = <nickname>
-
 cmd.dcc-accept-list-remove.helpUsage = <nickname>
 cmd.dcc-accept-list-remove.help   = Remove someone from your DCC auto-accept list for the current network.
 
-cmd.dcc-chat.params = [<nickname>]
-
 cmd.dcc-chat.helpUsage = [<nickname>]
 cmd.dcc-chat.help   = Sends a DCC Chat offer to |nickname| on the current server. On a query view, |nickname| may be omitted to send the offer to the query view's user.
 cmd.dcc-chat.label  = Direct Chat
 
 # LOCALIZATION NOTE (cmd.dcc-close.format):
 # Do not localize $userName
 cmd.dcc-close.format = Disconnect From $userName
 cmd.dcc-close.label  = &Disconnect
-cmd.dcc-close.params = [<nickname> [<type> [<file>]]]
 cmd.dcc-close.helpUsage = [<nickname> [<type> [<file>]]]
 cmd.dcc-close.help   = Closes an existing DCC connection. |nickname| may be omitted if run from a DCC view, in which case the DCC connection for that view will be closed. |type| and |file| may be needed to identify the connection. You can also use a regular expression for either <nickname> or <file>.
 
-cmd.dcc-decline.params = [<nickname>]
-
 cmd.dcc-decline.helpUsage = [<nickname>]
 cmd.dcc-decline.help   = Declines an incoming DCC Chat or Send offer. If a |nickname| is not specified, the last offer that arrived will be declined. You can also use a regular expression for <nickname>.
 
-cmd.dcc-list.params = [<type>]
-
 cmd.dcc-list.helpUsage = [<type>]
 cmd.dcc-list.help   = Lists the currently known about DCC offers and connections. This may be limited to just "chat" or "send" using the |type| parameter.
 
-cmd.dcc-send.params = [<nickname> [<file>]]
-
 cmd.dcc-send.helpUsage = [<nickname> [<file>]]
 cmd.dcc-send.help   = Offers a file to |nickname|. On a query view, |nickname| may be omitted to send the offer to the query view's user. A file may be specified directly by passing |file| or, if omitted, selected from a browse dialog.
 cmd.dcc-send.label  = Send File…
 
-cmd.dcc-show-file.params = <file>
-
 cmd.dcc-show-file.helpUsage = <file>
 cmd.dcc-show-file.help   = Opens the folder containing the file you downloaded.
 
 cmd.delete-view.key    = accel W
 cmd.delete-view.label  = &Close Tab
-cmd.delete-view.params = [<view>]
 cmd.delete-view.helpUsage = [<view>]
 cmd.delete-view.help   = Clear the current view, discarding *all* content, and drop its icon from the tab strip. If a channel view is deleted this way, you also leave the channel.
 
 cmd.dehop.label  = Remove Half-operator Status
-cmd.dehop.params = <nickname> [<...>]
 cmd.dehop.helpUsage = <nickname> [<...>]
 cmd.dehop.help   = Removes half-operator status from <nickname> on current channel. Requires operator status.
 
 cmd.deop.label  = Remove Operator Status
-cmd.deop.params = <nickname> [<...>]
 cmd.deop.helpUsage = <nickname> [<...>]
 cmd.deop.help   = Removes operator status from <nickname> on current channel. Requires operator status.
 
-cmd.desc.params = [<description>]
-
 cmd.desc.helpUsage = [<description>]
 cmd.desc.help   = Changes the 'ircname' line returned when someone performs a /whois on you.  You must specify this *before* connecting to the network. If you omit <description>, the current description is shown.
 
 cmd.devoice.label  = Remove Voice Status
-cmd.devoice.params = <nickname> [<...>]
 cmd.devoice.helpUsage = <nickname> [<...>]
 cmd.devoice.help   = Removes voice status from <nickname> on current channel. Requires operator (or half-operator) status.
 
 # LOCALIZATION NOTE (cmd.disconnect.format):
 # Do not localize $networkName
 cmd.disconnect.format = Disconnect From $networkName
 cmd.disconnect.label  = &Disconnect
-cmd.disconnect.params = [<reason>]
 cmd.disconnect.helpUsage = [<reason>]
 cmd.disconnect.help   = Disconnects from the server represented by the active view when the command is executed providing the reason <reason> or the default reason if <reason> is not specified.
 
 cmd.disconnect-all.label  = &Disconnect From All Networks
-cmd.disconnect-all.params = [<reason>]
 cmd.disconnect-all.helpUsage = [<reason>]
 cmd.disconnect-all.key    = accel D
 cmd.disconnect-all.help   = Disconnects from all networks providing the reason <reason> or the default reason if <reason> is not specified.
 
-cmd.echo.params = <message>
-
 cmd.echo.helpUsage = <message>
 cmd.echo.help   = Displays <message> in the current view, but does not send it to the server.
 
 cmd.edit-networks.label = &Networks…
 cmd.edit-networks.help  = Opens the network editor, where you can edit the list of available networks and servers.
 
-cmd.enable-plugin.params = <plugin>
-
 cmd.enable-plugin.helpUsage = <plugin>
 cmd.enable-plugin.help   = Meant to be used to re-enable a plugin after calling |disable-plugin|, this command calls the plugin's enablePlugin function.  There are no guarantees that the plugin will properly enable itself.
 
-cmd.eval.params = <expression>
-
 cmd.eval.helpUsage = <expression>
 cmd.eval.help   = Evaluates <expression> as JavaScript code.  Not for the faint of heart.
 
-cmd.evalsilent.params = <expression>
-
 cmd.evalsilent.helpUsage = <expression>
 cmd.evalsilent.help   = Identical to the /eval command, except the [EVAL-IN] and [EVAL-OUT] lines are not displayed.
 
-cmd.except.params = [<nickname>]
-
 cmd.except.helpUsage = [<nickname>]
 cmd.except.help   = Excepts a user from channel bans. A user's nickname may be specified, or a proper host mask can be used. Used without a nickname or mask, shows the list of exceptions currently in effect.
 
 cmd.exit.label  = E&xit ChatZilla
-cmd.exit.params = [<reason>]
 cmd.exit.helpUsage = [<reason>]
 cmd.exit.help   = Disconnects from all active servers and networks,  providing the reason <reason>, or the default reason if <reason> is not specified.  Exits ChatZilla after disconnecting.
 
-cmd.exit-mozilla.label = E&xit
-cmd.exit-mozilla.help  = Exit &brandShortName;.
-
 cmd.faq.label   = ChatZilla FAQ
 
 cmd.find.label  = &Find…
 cmd.find.key    = accel F
-cmd.find.params = [<rest>]
-cmd.find.help   = Finds text in the current view.
-
 cmd.find-again.label  = Find A&gain
 cmd.find-again.key    = accel G
-cmd.find-again.params =
-cmd.find-again.help   = Finds the next instance of your previously searched word.
 
 cmd.focus-input.key  = VK_ESCAPE
-cmd.focus-input.help = Force keyboard focus to the input box.
-
-cmd.font-family.params = [<font>]
 
 cmd.font-family.helpUsage = [<font>]
 cmd.font-family.help   = Sets or views the font family being used on the current view. Omit <font> to see the current font family. The value |default| will use your global font family, |serif|, |sans-serif| and |monospace| will use your global font settings, other values will set a font directly.
-
 cmd.font-family-default.label    = Default &Font
 cmd.font-family-serif.label      = Se&rif
 cmd.font-family-sans-serif.label = S&ans Serif
 cmd.font-family-monospace.label  = Mo&nospace
-
 # LOCALIZATION NOTE (cmd.font-family.format):
 # Do not localize $fontFamily
 cmd.font-family-other.format     = Other ($fontFamily)…
 cmd.font-family-other.label      = O&ther…
-cmd.font-family-other.help       = Prompts for a font family name.
-
-cmd.font-size.params = [<font-size>]
 
 cmd.font-size.helpUsage = [<font-size>]
 cmd.font-size.help   = Sets or views the font size being used on the current view. Omit <font-size> to see the current font size. The size value is specified in points (pt). The value |default| will use your global font size, and the values |bigger| and |smaller| increase or reduce the size by a fixed amount each time.
-
 cmd.font-size-bigger.label  = Make Text &Bigger
 cmd.font-size-bigger.key    = accel +
 cmd.font-size-bigger2.key   = accel =
 cmd.font-size-smaller.label = Make Text &Smaller
 cmd.font-size-smaller.key   = accel -
-
 cmd.font-size-default.label = Default Si&ze
 cmd.font-size-small.label   = Sma&ll
 cmd.font-size-medium.label  = &Medium
 cmd.font-size-large.label   = Lar&ge
-
 # LOCALIZATION NOTE (cmd.font-size-other.format):
 # Do not localize $fontSize
 cmd.font-size-other.format  = Other ($fontSize pt)…
 cmd.font-size-other.label   = &Other…
-cmd.font-size-other.help    = Prompts for a font size.
 
 cmd.goto-startup.label  = Open Auto-connect
 cmd.goto-startup.help   = Open all of your configured auto-connect URLs.
 
 cmd.goto-url.label  = Open Link
 # LOCALIZATION NOTE (cmd.goto-url.format):
 # Do not localize $label
 cmd.goto-url.format = $label
-cmd.goto-url.params = <url> [<anchor>]
-cmd.goto-url.help   = Navigate to the url specified by <url>.  If the <url> is not an irc: url, it will be opened in the most recent browser window.  If <url> is an alias for a url, the optional <anchor> can be used to specify a named anchor within the url.
-
 cmd.goto-url-newwin.label  = Open Link in New Window
-cmd.goto-url-newwin.params = <url> [<anchor>]
-cmd.goto-url-newwin.help   = Navigate to the url specified by <url>.  If the <url> is not an irc: url, it will be opened in a new browser window.  If <url> is an alias for a url, the optional <anchor> can be used to specify a named anchor within the url.
-
 cmd.goto-url-newtab.label  = Open Link in New Tab
-cmd.goto-url-newtab.params = <url> [<anchor>]
-cmd.goto-url-newtab.help   = Navigate to the url specified by <url>.  If the <url> is not an irc: url, it will be opened in a new tab in the most recent browser window.  If <url> is an alias for a url, the optional <anchor> can be used to specify a named anchor within the url.
-
-cmd.goto-url-external.label  = Open Link in Default Browser
-cmd.goto-url-external.params = <url> [<anchor>]
-cmd.goto-url-external.help   = Navigate to the url specified by <url>.  If the <url> is not an irc: url, it will be opened in your system default browser.  If <url> is an alias for a url, the optional <anchor> can be used to specify a named anchor within the url.
 
 cmd.header.label = Header
 cmd.header.key = accel shift H
-
-cmd.input-text-direction.params = <dir>
-cmd.input-text-direction.help   =
-
-cmd.text-direction.params = <dir>
-cmd.text-direction.help   =
-
 cmd.header.help = Toggles visibility of the header bar.
 
-cmd.help.params = [<pattern>]
-
 cmd.help.helpUsage = [<pattern>]
 cmd.help.help   = Displays help on all commands matching <pattern>, if <pattern> is not given, displays help on all commands.
 
 cmd.hide-view.label  = &Hide Tab
-cmd.hide-view.params = [<view>]
 cmd.hide-view.helpUsage = [<view>]
 cmd.hide-view.help   = Drop the current view's icon from the tab strip, but save its contents.  The icon will reappear the next time there is activity on the view.
 
 cmd.homepage.label = ChatZilla Homepage
 
 cmd.hop.label  = Give Half-operator Status
-cmd.hop.params = <nickname> [<...>]
 cmd.hop.helpUsage = <nickname> [<...>]
 cmd.hop.help   = Gives half-operator status to <nickname> on current channel. Requires operator status.
 
-cmd.idle-away.help = Internal command used for automatically setting "away" status when idle.
-cmd.idle-back.help = Internal command used for automatically setting "back" status when returning from idle.
-
 # LOCALIZATION NOTE (cmd.reconnect.format):
 # Do not localize $networkName
 cmd.reconnect.format = Reconnect To $networkName
 cmd.reconnect.label  = &Reconnect
-cmd.reconnect.params = [<reason>]
 cmd.reconnect.helpUsage = [<reason>]
 cmd.reconnect.help   = Reconnects to the network represented by the active view when the command is executed providing the reason <reason> when disconnecting, or the default reason if <reason> is not specified.
 
 cmd.reconnect-all.label  = &Reconnect To All Networks
-cmd.reconnect-all.params = [<reason>]
 cmd.reconnect-all.helpUsage = [<reason>]
 cmd.reconnect-all.help   = Reconnects to all networks providing the reason <reason> when disconnecting, or the default reason if <reason> is not specified.
 
-cmd.toggle-ui.params = <thing>
-
 cmd.toggle-ui.helpUsage = <thing>
 cmd.toggle-ui.help   = Toggles the visibility of various pieces of the user interface.  <thing> must be one of: tabstrip, userlist, header, status.
 
 cmd.rtl.help  = Switches text direction to Right-to-Left.
 cmd.ltr.help  = Switches text direction to Left-to-Right.
-
 cmd.irtl.help = Switches input area direction to Right-to-Left.
 cmd.iltr.help = Switches input area direction to Left-to-Right.
 
 cmd.toggle-text-dir.label  = S&witch Text Direction
 cmd.toggle-text-dir.key    = accel shift X
 
-cmd.toggle-pref.params = <pref-name>
-cmd.toggle-pref.help   = Toggles the boolean preference specified by <pref-name>.
-
 cmd.toggle-usort.label = Sort Users By Mode
 cmd.toggle-ccm.label   = Collapse Co&nsecutive Messages
 cmd.toggle-copy.label  = Copy &Important Messages
 cmd.toggle-umode.label = Show Mode as Symbol
 cmd.toggle-timestamps.label = Show &Timestamps
 
 cmd.unban.label  = Un-ban
 # LOCALIZATION NOTE (cmd.unban.format):
 # Do not localize $channelName
 cmd.unban.format = Un-ban from $channelName
-cmd.unban.params = <nickname>
 cmd.unban.helpUsage = <nickname>
 cmd.unban.help   = Removes the ban on a single user, or removes a specific ban mask from the channel's ban list.
 
-cmd.unexcept.params = <nickname>
-
 cmd.unexcept.helpUsage = <nickname>
 cmd.unexcept.help   = Removes a channel ban exception.
 
-cmd.user.params  = [<username> <description>]
-
 cmd.user.helpUsage  = [<username> <description>]
 cmd.user.help    = Sets your username to <username> and your description (``Real Name'') to <description>. Equivalent to using the |name| and |desc| command. The new name and description will be used the next time you connect to the network. You can use this command without parameters to show the current username and description.
 
 cmd.userlist.label = User List
 cmd.userlist.key = accel shift L
-
 cmd.userlist.help = Toggles the visibility of the user list.
 
-cmd.ignore.params = [<mask>]
-
 cmd.identify.helpUsage = [<password>]
 cmd.identify.help   = Identify with nickname services on the current server. If <password> is not provided, you will be asked to enter the password in a prompt with a masked textfield (so nobody will be able to read it when you type it).
 
 cmd.ignore.helpUsage = [<mask>]
 cmd.ignore.help   = Add someone to your ignore list for the current network. A nickname will suffice for <mask>, but you can also use a hostmask. With no parameters, it shows a list of all currently ignored users.
 
-cmd.install-plugin.params = [<url> [<name>]]
-
 cmd.install-plugin.helpUsage = [<url> [<name>]]
 cmd.install-plugin.help   = Installs a ChatZilla plugin for you.
 cmd.install-plugin.label  = &Install Plugin…
 
-cmd.invite.params = <nickname> [<channel-name>]
-
 cmd.invite.helpUsage = <nickname> [<channel-name>]
 cmd.invite.help   = Invites <nickname> to <channel-name> or current channel if not supplied. Requires operator status if +i is set.
 
-cmd.j.params = <channel-name> [<key>]
-
 cmd.j.helpUsage = [<channel-name> [<key>]]
 cmd.j.help   = This command is an alias for /join.
 
 cmd.join.label  = &Join Channel…
 cmd.join.key    = accel J
-cmd.join.params = [<channel-name> [<key>]]
 cmd.join.helpUsage = [<channel-name> [<key>]]
 cmd.join.help   = Joins the global (name starts with #), local (name starts with &), or modeless (name starts with a +) channel named <channel-name>.  If no prefix is given, # is assumed.  Provides the key <key> if specified.
 
-cmd.join-charset.params = [<channel-name> <charset> [<key>]]
-
 cmd.join-charset.helpUsage = [<channel-name> <charset> [<key>]]
 cmd.join-charset.help   = Joins the global (name starts with #), local (name starts with &), or modeless (name starts with a +) channel named <channel-name>.  Messages will be encoded and decoded according to the character encoding specified by <charset>.  The <charset> parameter is independent of the default character encoding, which can be selected with the /charset command.  If no prefix is given, # is assumed.  Provides the key <key> if specified.
 
-cmd.jump-to-anchor.params = <anchor> [<channel-name>]
-cmd.jump-to-anchor.help   =
-
 # LOCALIZATION NOTE (cmd.kick.format):
 # Do not localize $channelName
 cmd.kick.format = Kick from $channelName
 cmd.kick.label  = Kick
-cmd.kick.params = <nickname> [<reason>]
 cmd.kick.helpUsage = <nickname> [<reason>]
 cmd.kick.help   = Kicks <nickname> off the current channel. Requires operator status.
 
 # LOCALIZATION NOTE (cmd.kick-ban.format):
 # Do not localize $channelName
 cmd.kick-ban.format = Kickban from $channelName
 cmd.kick-ban.label  = Kickban
-cmd.kick-ban.params = <nickname> [<reason>]
 cmd.kick-ban.helpUsage = <nickname> [<reason>]
 cmd.kick-ban.help   = Bans *!username@hostmask from the current channel, then kicks them off. Requires operator status.
 
-cmd.knock.params = <channel-name> [<reason>]
-
 cmd.knock.helpUsage = <channel-name> [<reason>]
 cmd.knock.help   = Requests an invitation from the specified channel with optional reason. This command is not supported by all servers.
 
 # LOCALIZATION NOTE (cmd.label-user.format):
 # Do not localize $nickname
 cmd.label-user.format = «$nickname»
 cmd.label-user.label  = <unknown>
-cmd.label-user.params = <unspecified>
-cmd.label-user.help   =
 
 # LOCALIZATION NOTE (cmd.label-user-multi.format):
 # Do not localize $userCount
 cmd.label-user-multi.format = «$userCount users»
 cmd.label-user-multi.label  = <unknown>
-cmd.label-user-multi.params = <unspecified>
-cmd.label-user-multi.help   =
 
 # LOCALIZATION NOTE (cmd.leave.format):
 # Do not localize $channelName
 cmd.leave.format = Leave $channelName
 cmd.leave.label  = &Leave
-cmd.leave.params = [<channel-name>] [<reason>]
 cmd.leave.helpUsage = [<channel-name>] [<reason>]
 cmd.leave.help   = Leaves the current channel. Use /delete to force the view to go away, losing its contents, or /hide to temporarily hide it, preserving its contents. Many servers do not support the optional <reason> parameter. Your preferences are used to determine whether to delete the tab. If you are dispatching this command from a script, you may override this behaviour with the <delete-when-done> parameter.
 
 cmd.marker.help   = Scrolls to the last read message marker. If the marker is not visible, this is equivalent to using ``marker-set''.
 cmd.marker-clear.help   = Hides the last read message marker.
 cmd.marker-set.help   = Moves the last read message marker to the last line of the view and scrolls to it.
 
 cmd.links.help   = Displays the "links" to the current server. This is a list of the other servers in the network which are directly connected to the one you are connected to.
 
-cmd.list.params = [<channel-name>]
-
 cmd.list.helpUsage = [<channel-name>]
 cmd.list.help   = Lists channel name, user count, and topic information for the network/server you are attached to.  If you omit the optional channel argument, all channels will be listed.  On large networks, the server may disconnect you for asking for a complete list.
 
-cmd.list-plugins.params = [<plugin>]
-
 cmd.list-plugins.helpUsage = [<plugin>]
 cmd.list-plugins.help   = If <plugin> is not provided, this command lists information on all loaded plugins.  If <plugin> is provided, only its information will be displayed.  If this command is dispatched from the console, you may specify <plugin> by either the plugin id, or index.
 
-cmd.load.params = <url>
-
 cmd.load.helpUsage = <url>
 cmd.load.help   = Executes the contents of the url specified by <url>.  See also: The |initialScripts| pref.
 
-cmd.reload-plugin.params = <plugin>
-
 cmd.reload-plugin.helpUsage = <plugin>
 cmd.reload-plugin.help   = Reloads the plugin from the same url it was loaded from last time.  This will only work if the currently loaded version of the plugin can be disabled.
 
-cmd.log.params = [<state>]
-
 cmd.log.helpUsage = [<state>]
 cmd.log.help   = Turns logging on or off for the current channel.  If <state> is provided and is |true|, |on|, |yes|, or |1|, logging will be turned on.  Values |false|, |off|, |no| and |0| will turn logging off.  Omit <state> to see the current logging state.  The state will be saved in prefs, so that if logging is on when you close ChatZilla, it will resume logging the next time you join the channel.
 
-cmd.rlist.params = <regexp>
-
 cmd.rlist.helpUsage = <regexp>
 cmd.rlist.help   = Lists channel name, user count, and topic information for the network/server you are attached to, filtered by the regular expression.
 
-cmd.reload-ui.help = Reload the ChatZilla XUL file.  Used during development.
-
 cmd.map.help = Similar to /links, but provides a graphical "Network Map" of the IRC network. Mainly used for routing purposes.
 
-cmd.match-users.params = <mask>
-
 cmd.match-users.helpUsage = <mask>
 cmd.match-users.help   = Shows a list of all users whose hostmask matches <mask>.
 
-cmd.me.params = <action>
-
 cmd.me.helpUsage = <action>
 cmd.me.help   = Sends the text <action> to the channel as a statement in the third person.  Try it and see!
 
 cmd.motd.help   = Displays the "Message of the Day", which usually contains information about the network and current server, as well as any usage policies.
 
-cmd.mode.params = [<target>] [<modestr> [<param> [<...>]]]
-
 cmd.mode.helpUsage = [<target>] [<modestr> [<param> [<...>]]]
 cmd.mode.help   = Changes the channel or user mode of <target> using <modestr> and any subsequent <param> if added. When used from a channel view, <target> may be omitted. For a list of modes you may use, see http://irchelp.org.
 
-cmd.motif.params = [<motif>]
-
 cmd.motif.helpUsage = [<motif>]
 cmd.motif.help   = Sets the default CSS file used for the message tabs.  <motif> can be a URL to a .css file, or the shortcut "dark" or "light".  See the ChatZilla homepage at <http://www.mozilla.org/projects/rt-messaging/chatzilla/> for more information on how to style ChatZilla.  See also |network-motif|, |channel-motif|, |user-motif|.
 
 cmd.motif-dark.label = Dar&k Motif
 cmd.motif-light.label = &Light Motif
 
-cmd.msg.params = <nickname> <message>
-
 cmd.msg.helpUsage = <nickname> <message>
 cmd.msg.help   = Sends the private message <message> to <nickname>.
 
-cmd.name.params = [<username>]
-
 cmd.name.helpUsage = [<username>]
 cmd.name.help   = Changes the username displayed before your hostmask if the server you're connecting to allows it.  Some servers will only trust the username reply from the ident service.  You must specify this *before* connecting to the network. If you omit <username>, the current username will be shown.
 
-cmd.names.params = [<channel-name>]
-
 cmd.names.helpUsage = [<channel-name>]
 cmd.names.help   = Lists the users in a channel.
 
-cmd.network.params = <network-name>
-
 cmd.network.helpUsage = <network-name>
 cmd.network.help   = Sets the current network to <network-name>
 
 cmd.networks.help   = Lists all available networks as clickable links.
 
-cmd.network-motif.params = [<motif> [<network>]]
-
 cmd.network-motif.helpUsage = [<motif> [<network>]]
 cmd.network-motif.help   = Sets the CSS file used for the message tab for the network <network>.  <motif> can be a URL to a .css file, or the shortcut "dark" or "light".  If <motif> is a minus ('-') character, the motif will revert to the global motif.  If <network> is not provided, the current network is assumed.  See the ChatZilla homepage at <http://www.mozilla.org/projects/rt-messaging/chatzilla/> for more information on how to style ChatZilla.  See also |motif|.
 
-cmd.network-pref.params = [<pref-name> [<pref-value>]]
-
 cmd.network-pref.helpUsage = [<pref-name> [<pref-value>]]
 cmd.network-pref.help    = Sets the value of the preference named <pref-name> to the value of <pref-value> on the current network.  If <pref-value> is not provided, the current value of <pref-name> will be displayed.  If both <pref-name> and <pref-value> are omitted, all preferences will be displayed.  If <pref-value> is a minus ('-') character, then the preference will revert back to its default value.
 
 cmd.nick.label  = Change nickname…
-cmd.nick.params = [<nickname>]
 cmd.nick.helpUsage = [<nickname>]
 cmd.nick.help   = Changes your nickname. If |nickname| is omited, a prompt is shown.
 
-cmd.notify.params = [<nickname> [<...>]]
-
 cmd.notify.helpUsage = [<nickname> [<...>]]
 cmd.notify.help   = With no parameters, /notify shows you the online/offline status of all the users on your notify list.  If one or more <nickname> parameters are supplied, the nickname(s) will be added to your notify list if they are not yet on it, or removed from it if they are.
 
-cmd.notice.params = <nickname> <message>
-
 cmd.notice.helpUsage = <nickname> <message>
 cmd.notice.help   = Sends the notice <message> to <nickname>.
 
 cmd.op.label  = Give Operator Status
-cmd.op.params = <nickname> [<...>]
 cmd.op.helpUsage = <nickname> [<...>]
 cmd.op.help   = Gives operator status to <nickname> on current channel. Requires operator status.
 
-cmd.open-at-startup.params = [<toggle>]
-
 cmd.open-at-startup.helpUsage = [<toggle>]
 cmd.open-at-startup.help   = Used to add the current view to the list of views that will be automatically opened at startup.  If <toggle> is not provided, the status of the current view will be displayed.  <toggle> can be one of: yes, on, true, 1, no, off, false, 0, or toggle, to toggle the current state.
 
-cmd.oper.params = <opername> [<password>]
-
 cmd.oper.helpUsage = <opername> [<password>]
 cmd.oper.help   = Requests IRC Operator status from the current server. If <password> is not provided, you will be asked to enter the password in a prompt with a masked textfield (so nobody will be able to read it when you type it).
 
 cmd.print.label  = &Print…
 cmd.print.key    = accel P
-cmd.print.params =
 cmd.print.help   = Opens the print dialog for the current view.
 
 cmd.save.label = Save View &As…
 cmd.save.key = accel S
-cmd.save.params = [<filename> [<savetype>]]
 cmd.save.helpUsage = [<filename> [<savetype>]]
 cmd.save.help = Save the current view as file <filename>. If <filename> is omitted, a Save As… dialog will be shown. <savetype> can be either |complete|, |htmlonly| or |text|. If it is omitted, it is deduced from the file extension. Files with the extension .html, .xhtml, .xhtm or .htm will be saved as complete views, .txt files as text files. Any other extensions will throw an error if <savetype> is not provided.
 
-cmd.say.params = <message>
-
 cmd.say.helpUsage = <message>
 cmd.say.help   = Sends a message to the current view. This command is used automatically by ChatZilla when you type text that does not begin with the "/" character.
 
-cmd.stats.params = [<params>]
-
 cmd.stats.helpUsage = [<params>]
 cmd.stats.help = Request server statistics. Use this command with no parameters to get a server-specific list of available parameters for use with this command.
 
-cmd.time.params = [<nickname>]
-
 cmd.time.helpUsage = [<nickname>]
 cmd.time.help   = Asks <nickname> what time it is on their machine.  Their IRC client may or may not show them that you've asked for this information.  ChatZilla currently does not.  If you do not specify <nickname>, ChatZilla will ask the server for the time it is on the server.
 cmd.time.label  = Get Local Time
 
-cmd.timestamps.params = [<toggle>]
-
 cmd.timestamps.helpUsage = [<toggle>]
 cmd.timestamps.help   = Sets the visibility of timestamps in the current view. If <toggle> is provided and is |true|, |on|, |yes|, or |1|, timestamps will be turned on.  Values |false|, |off|, |no| and |0| will turn timestamps off, and |toggle| will toggle the state.  Omit <toggle> to see the current state.
 
 # LOCALIZATION NOTE (cmd.toggle-oas.format):
 # Do not localize $viewType
 cmd.toggle-oas.format = Open This $viewType at Startup
 cmd.toggle-oas.label  = Open at &Startup
 
-cmd.pass.params = <password>
-
 cmd.pass.helpUsage = <password>
 cmd.pass.help   = Sends a password to the server for use when connecting to password-protected servers.
 
-cmd.ping.params = <nickname>
-
 cmd.ping.helpUsage = <nickname>
 cmd.ping.help   = Ping takes its name from the technique of measuring distance with sonar.  In IRC, it is used to measure the time it takes to send a message to someone, and receive a response.  Specify a channel to ping everyone in that channel.  Some IRC clients will display ping requests to the user.  ChatZilla does not.
 cmd.ping.label  = Ping User
 
-cmd.plugin-pref.params = <plugin> [<pref-name> [<pref-value>]]
-
 cmd.plugin-pref.helpUsage = <plugin> [<pref-name> [<pref-value>]]
 cmd.plugin-pref.help = Sets the value of the plugin's preference named <pref-name> to the value of <pref-value>.  If <pref-value> is not provided, the current value of <pref-name> will be displayed.  If both <pref-name> and <pref-value> are omitted, all preferences for <plugin> will be displayed.  If <pref-value> is a minus ('-') character, then the preference will revert back to its default value.
 
-cmd.pref.params  = [<pref-name> [<pref-value>]]
-
 cmd.pref.helpUsage  = [<pref-name> [<pref-value>]]
 cmd.pref.help    = Sets the value of the preference named <pref-name> to the value of <pref-value>.  If <pref-value> is not provided, the current value of <pref-name> will be displayed.  If both <pref-name> and <pref-value> are omitted, all preferences will be displayed.  If <pref-value> is a minus ('-') character, then the preference will revert back to its default value.
 
 cmd.query.label  = Open Private Chat
-cmd.query.params = <nickname> [<message>]
 cmd.query.helpUsage = <nickname> [<message>]
 cmd.query.help   = Opens a one-on-one chat with <nickname>.  If <message> is supplied, it is sent as the initial private message to <nickname>.
 
 cmd.quit.label  = &Quit ChatZilla
-cmd.quit.params = [<reason>]
 cmd.quit.helpUsage = [<reason>]
 cmd.quit.help   = Quit ChatZilla.
 
-cmd.quit-mozilla.label  = &Quit
-cmd.quit-mozilla.help   = Quit &brandShortName;.
-
-cmd.quote.params = <irc-command>
-
 cmd.quote.helpUsage = <irc-command>
 cmd.quote.help   = Sends a raw command to the IRC server, not a good idea if you don't know what you're doing. see IRC RFC1459 <http://www.irchelp.org/irchelp/rfc1459.html> for complete details.
 
-cmd.rejoin.params = [<reason>]
-
 cmd.rejoin.helpUsage = [<reason>]
 cmd.rejoin.help   = Rejoins the channel displayed in the current view. Only works from a channel view.
 # LOCALIZATION NOTE (cmd.rejoin.format):
 # Do not localize $channelName
 cmd.rejoin.format = Rejoin $channelName
 cmd.rejoin.label  = Rejoin
 
-cmd.rename.params = [<label>]
-
 cmd.rename.helpUsage = [<label>]
 cmd.rename.help   = Change the label of the current tab to <label>.
 cmd.rename.label  = Rename Tab…
 
-cmd.server.params = <hostname> [<port> [<password>]]
-
 cmd.server.helpUsage = <hostname> [<port> [<password>]]
 cmd.server.help   = Connects to server <hostname> on <port>, or 6667 if <port> is not specified.  Provides the password <password> if specified. If you are already connected, the view for <hostname> is made current.  If that view has been deleted, it is recreated.
 
-cmd.set-current-view.params = <view>
-cmd.set-current-view.help   =
-
-cmd.sslserver.params = <hostname> [<port> [<password>]]
-
 cmd.sslserver.helpUsage = <hostname> [<port> [<password>]]
 cmd.sslserver.help   = Connects to server using SSL <hostname> on <port>, or 6697 if <port> is not specified.  Provides the password <password> if specified. If you are already connected, the view for <hostname> is made current.  If that view has been deleted, it is recreated.
 
-cmd.ssl-exception.params = [<hostname> <port> [<connect>]]
-cmd.ssl-exception.help = Opens the dialog to add an SSL certificate exception for <hostname>. If <connect> is true then a connection to <hostname> will be initiated after the exception is added.
-
-cmd.squery.params = <service> [<commands>]
-
 cmd.squery.helpUsage = <service> [<commands>]
 cmd.squery.help   = Sends the commands <commands> to the service <service>.
 
-cmd.stalk.params = [<text>]
-
 cmd.stalk.helpUsage = [<text>]
 cmd.stalk.help   = Add <text> to list of words for which you would like to see alerts. Whenever a person with a nickname matching <text> speaks, or someone says a phrase containing <text>, your ChatZilla window will become active (on some operating systems) and its taskbar icon will flash (on some operating systems.) If <text> is omitted the list of stalk words is displayed.
 
 cmd.status.help = Shows status information for the current view.
 
 cmd.statusbar.label = Status Bar
 cmd.statusbar.key = accel shift S
-
 cmd.statusbar.help = Toggles the visibility of the status bar.
 
 cmd.supports.help = Lists the capabilities of the current server, as reported by the 005 numeric.
 
 cmd.testdisplay.help = Displays a sample text.  Used to preview styles.
 
-cmd.topic.params = [<new-topic>]
-
 cmd.topic.helpUsage = [<new-topic>]
 cmd.topic.help   = If <new-topic> is specified and you are a chanop, or the channel is not in 'private topic' mode (+t), the topic will be changed to <new-topic>.  If <new-topic> is *not* specified, the current topic will be displayed.
 
 cmd.tabstrip.label = Tab Strip
 cmd.tabstrip.key = accel shift S
-
 cmd.tabstrip.help = Toggles the visibility of the channel tab strip.
 
-cmd.unalias.params = <alias-name>
-
 cmd.unalias.helpUsage = <alias-name>
 cmd.unalias.help   = Removes the named alias.
 
-cmd.unignore.params = <mask>
-
 cmd.unignore.helpUsage = <mask>
 cmd.unignore.help   = Removes someone from your ignore list for the current network. A nickname will suffice for <mask>, but you can also use a hostmask.
 
-cmd.unstalk.params = <text>
-
 cmd.uninstall-plugin.helpUsage = <plugin>
 cmd.uninstall-plugin.help   = Uninstalls a ChatZilla plugin for you.
 
 cmd.unstalk.helpUsage = <text>
 cmd.unstalk.help   = Remove word from list of terms for which you would like to see alerts.
 
-cmd.urls.params = [<number>]
-
 cmd.urls.helpUsage = [<number>]
 cmd.urls.help   = Displays the last few URLs seen by ChatZilla. Specify <number> to change how many it displays, or omit to display the default 10.
 
-cmd.userhost.params = <nickname> [<...>]
-
 cmd.userhost.helpUsage = <nickname> [<...>]
 cmd.userhost.help   = Requests the hostmask of every <nickname> given.
 
-cmd.userip.params = <nickname> [<...>]
-
 cmd.userip.helpUsage = <nickname> [<...>]
 cmd.userip.help   = Requests the IP-address of every <nickname> given.
 
-cmd.disable-plugin.params = <plugin>
-
 cmd.disable-plugin.helpUsage = <plugin>
 cmd.disable-plugin.help   = This command calls the plugin's disablePlugin function, if it exists.  There are no guarantees that the plugin will properly disable itself.
 
-cmd.usermode.params = [<new-mode>]
-
 cmd.usermode.helpUsage = [<new-mode>]
 cmd.usermode.help   = Changes or displays the current user mode.
 
-cmd.user-motif.params = [<motif> [<user>]]
-
 cmd.user-motif.helpUsage = [<motif> [<user>]]
 cmd.user-motif.help   = Sets the CSS file used for the message tab for the user <user>.  <motif> can be a URL to a .css file, or the shortcut "dark" or "light".  If <motif> is a minus ('-') character, the motif will revert to the network motif.  If <user> is not provided, the current user is assumed.  See the ChatZilla homepage at <http://www.mozilla.org/projects/rt-messaging/chatzilla/> for more information on how to style ChatZilla.  See also |motif|.
 
-cmd.user-pref.params = [<pref-name> [<pref-value>]]
-
 cmd.user-pref.helpUsage = [<pref-name> [<pref-value>]]
 cmd.user-pref.help    = Sets the value of the preference named <pref-name> to the value of <pref-value> on the current user.  If <pref-value> is not provided, the current value of <pref-name> will be displayed.  If both <pref-name> and <pref-value> are omitted, all preferences will be displayed.  If <pref-value> is a minus ('-') character, then the preference will revert back to its default value.
 
 cmd.websearch.help   = Runs a web search for the currently-selected text.
-cmd.websearch.params = <selected-text>
 cmd.websearch.helpUsage = <selected-text>
 # LOCALIZATION NOTE (cmd.websearch.format):
 # Do not localize $selectedText
 cmd.websearch.format = Search the web for "$selectedText""
 cmd.websearch.label  = Search the web
 
 cmd.version.label  = Get Version Information
-cmd.version.params = [<nickname>]
 cmd.version.helpUsage = [<nickname>]
 cmd.version.help   = Asks <nickname> what irc client they're running.  Their IRC client may or may not show them that you've asked for this information.  ChatZilla currently does not.  If you do not specify <nickname>, ChatZilla will ask the server for the version of the IRCserver software it is running.
 
 cmd.voice.label  = Give Voice Status
-cmd.voice.params = <nickname> [<...>]
 cmd.voice.helpUsage = <nickname> [<...>]
 cmd.voice.help   = Gives voice status to <nickname> on current channel. Requires operator (or half-operator) status.
 
-cmd.who.params = <rest>
-
 cmd.who.helpUsage = <rest>
 cmd.who.help   = List users who have name, host, or description information matching <rest>.
 
 cmd.whois.label  = Who is
-cmd.whois.params = <nickname> [<...>]
 cmd.whois.helpUsage = <nickname> [<...>]
 cmd.whois.help   = Displays information about the user <nickname>, including 'real name', server connected to, idle time, and signon time.  Note that some servers will lie about the idle time.  The correct idle time can usually be obtained by using |wii| instead of |whois|.
 
-cmd.wii.params = <nickname> [<...>]
-
 cmd.wii.helpUsage = <nickname> [<...>]
 cmd.wii.help   = Displays the same information as |whois|, but asks the server to include the user's real idle time.
 
 cmd.whowas.label  = Who was
-cmd.whowas.params = <nickname> [<limit>]
 cmd.whowas.helpUsage = <nickname> [<limit>]
 cmd.whowas.help   = Displays the last known information about the user <nickname>, including 'real name', for a user that has left the server.
 
 ## dispatch-related error messages ##
 msg.err.internal.dispatch = Internal error dispatching command ``%1$S''.
 msg.err.internal.hook   = Internal error processing hook ``%1$S''.
 msg.err.invalid.param   = Invalid value for parameter %1$S (%2$S).
 msg.err.disabled        = Sorry, ``%1$S'' is currently disabled.
@@ -1045,17 +704,16 @@ msg.irc.471.knock = %S You might be able
 msg.irc.473.knock = %S Use "/knock %S" to ask the channel operators to invite you in. [[Knock][Asks the channel operators to let you in][%S]]
 msg.irc.475.knock = %S You might be able to use "/knock %S" to ask the channel operators to invite you in. [[Knock][Asks the channel operators to let you in][%S]]
 
 msg.val.on  = on
 msg.val.off = off
 
 msg.plugin.enabled = Plugin ``%S'' is now enabled.
 msg.plugin.disabled = Plugin ``%S'' is now disabled.
-
 msg.plugin.uninstalled = Plugin ``%S'' has been uninstalled.
 
 msg.leave.inputbox = There is nothing to tab-complete. Use F6 to cycle through the user list, input box and the chat output.
 
 ## formatting ##
 msg.fmt.usage = "%1$S %2$S"
 msg.fmt.jsexception = "%1$S: %2$S @ <%3$S> %4$S"
 # 1: error number,  2: error text, 3: file name, 4: line number, 5: function name
@@ -1082,18 +740,16 @@ msg.fmt.logged.on = "%S is logged in as 
 
 # 1: local short date/time, 2: nick info
 msg.fmt.status    = "%S %S"
 
 msg.unknown   = <unknown>
 msg.none      = <none>
 msg.na        = <n/a>
 
-msg.commasp   = ", "
-
 msg.always    = always
 msg.and       = and
 msg.primary   = primary
 msg.secondary = secondary
 msg.you       = you
 msg.network   = Network
 msg.server    = Server
 msg.channel   = Channel
@@ -1214,17 +870,16 @@ msg.sts.upgrade.new   = "A new security 
 msg.localeurl.homepage  = http://chatzilla.hacksrus.com/
 msg.localeurl.faq       = http://chatzilla.hacksrus.com/faq/
 
 msg.no.notify.list    = Your notify list is empty.
 msg.notify.addone     = "%S has been added to your notify list.
 msg.notify.addsome    = "%S have been added to your notify list.
 msg.notify.delone     = "%S has been removed from your notify list.
 msg.notify.delsome    = "%S have been removed from your notify list.
-
 msg.notify.list       = You are watching %S.
 msg.notify.full       = Your notify list is full.
 
 msg.not.an.alias  = No such alias: %S.
 msg.alias.removed = Removed alias: %S.
 msg.alias.created = Created alias: %S = %S.
 msg.no.aliases    = No aliases are defined.
 
@@ -1483,17 +1138,16 @@ msg.ignore.list.1  = Currently not ignor
 msg.ignore.list.2  = Currently ignoring [%S].
 msg.ignore.add     = You are now ignoring %S.
 msg.ignore.adderr  = You are already ignoring %S.
 msg.ignore.del     = You are no longer ignoring %S.
 msg.ignore.delerr  = "%S not found in your ignore list.
 
 msg.you.invite     = You have invited %S to %S.
 msg.invite.you     = "%S (%S@%S) has invited you to [[%S][Accept invitation to channel %S][goto-url %S]].
-
 msg.invite.someone = "%S has invited %S to %S".
 
 msg.nick.in.use    = The nickname ``%S'' is already in use, use the /nick command to pick a new one.
 msg.retry.nick     = The nickname ``%S'' is already in use, trying ``%S''.
 msg.nick.prompt    = Enter a nickname to use:
 
 msg.tab.name.prompt = Enter a label for this tab:
 
@@ -1799,42 +1453,32 @@ pref.hasPrefs.help              = Indica
 pref.identd.enabled.label       = Enable Identification Server during connection process
 pref.identd.enabled.help        = Allows ChatZilla to connect to servers that require an ident response.
 pref.initialURLs.label          = Locations
 pref.initialURLs.help           = A list of locations (irc: and ircs: URLs) to which ChatZilla should connect when starting. These will not be processed if ChatZilla was started by clicking on a hyperlink.
 pref.initialScripts.label       = Script files
 pref.initialScripts.help        = A list of script files (file: URLs) for ChatZilla to load when it starts. URLs may be relative to the profile directory. If a URL points to a directory, "init.js" from that directory and each subdirectory is loaded.
 pref.inputSpellcheck.label      = Spellcheck the inputbox
 pref.inputSpellcheck.help       = Whether or not the inputbox will be spellchecked. Only works on recent &brandShortName; builds.
-pref.link.focus.label           = Focus browser when opening links
-pref.link.focus.help            = Moves the focus to the browser window when opening URLs from ChatZilla.
 pref.log.label                  = Log this view
 pref.log.help                   = Makes ChatZilla log this view. The log file is usually stored in your profile, which can be overridden with "Profile path" (for the base path) or "Log file name" for a specific view's log.
 pref.logFileName.label          = Log file name
 pref.logFileName.help           = The log file used for this view. If the view is currently open and logging, changing this option won't take effect until the next time it starts logging.
 pref.logFile.client.label       = Log file for client
 pref.logFile.client.help        = Specifies the name of the log file for the client view. This is appended to the 'log folder' to create a full path.
 pref.logFile.network.label      = Log file for networks
 pref.logFile.network.help       = Specifies the name of the log file for network views. This is appended to the 'log folder' to create a full path.
 pref.logFile.channel.label      = Log file for channels
 pref.logFile.channel.help       = Specifies the name of the log file for channel views. This is appended to the 'log folder' to create a full path.
 pref.logFile.user.label         = Log file for users
 pref.logFile.user.help          = Specifies the name of the log file for user/query views. This is appended to the 'log folder' to create a full path.
 pref.logFile.dccuser.label      = Log file for DCC
 pref.logFile.dccuser.help       = Specifies the name of the log file for DCC chat/file views. This is appended to the 'log folder' to create a full path.
 pref.logFolder.label            = Log folder
 pref.logFolder.help             = Specifies the base location for all logs. The various "Log file for" preferences specify the exact names for the different types of log file.
-pref.messages.click.label       = Normal click
-pref.messages.click.help        = What to do when clicking a URL normally.
-pref.messages.ctrlClick.label   = Control-click
-pref.messages.ctrlClick.help    = What to do when clicking a URL with the Control key held down.
-pref.messages.metaClick.label   = Alt/Meta-click
-pref.messages.metaClick.help    = What to do when clicking a URL with the Alt or Meta key held down.
-pref.messages.middleClick.label = Middle-click
-pref.messages.middleClick.help  = What to do when clicking a URL with the middle mouse button.
 pref.login.promptToSave.label   = Prompt to save passwords
 pref.login.promptToSave.help    = Enable this preference if you wish to save passwords with the password manager. Passwords that can be saved include server passwords, channel keys, nickname identification passwords and oper passwords. Passwords can only be added via this prompt.
 pref.motif.dark.label           = Dark motif
 pref.motif.dark.help            = The dark motif selectable from the View > Color Scheme menu.
 pref.motif.light.label          = Light motif
 pref.motif.light.help           = The light motif selectable from the View > Color Scheme menu.
 pref.motif.current.label        = Current motif
 pref.motif.current.help         = The currently selected motif file. A Motif is a CSS file that describes how do display the chat view, and can be used to customize the display.
@@ -1960,18 +1604,16 @@ pref.group.lists.label                 =
 pref.group.lists.stalkWords.label      = Stalk words
 pref.group.lists.aliases.label         = Command aliases
 pref.group.lists.notifyList.label      = Notify list
 pref.group.lists.nicknameList.label    = Nickname List
 pref.group.lists.autoperform.label     = Auto-perform
 pref.group.global.label                = Global
 pref.group.global.header.label         = Headers
 pref.group.global.header.help          = Sets the default visibility for headers of views. Each view can override this default if necessary.
-pref.group.global.links.label          = Links
-pref.group.global.links.help           = The link preferences define how ChatZilla reacts to different kinds of clicks on links. You can re-arrange these to suit your preferences.
 pref.group.global.log.label            = Log these view types
 pref.group.global.log.help             = Sets the default logging state for views. Each view can override this default if necessary.
 pref.group.global.maxLines.label       = Scrollback size
 pref.group.global.maxLines.help        = The number of lines of text to keep in this view type. Once the limit is reached, the oldest lines are removed as new lines are added.
 pref.group.global.security.label       = Security
 pref.group.global.sounds.label         = Sound Configuration
 pref.group.general.sounds.help          =
 pref.group.general.soundEvts.label      = Sound Events
--- a/suite/chatzilla/chrome/networks.dtd
+++ b/suite/chatzilla/chrome/networks.dtd
@@ -5,17 +5,16 @@
 <!-- Used in networks-edit dialog -->
 <!ENTITY networksEditDialog.title     "Networks Editor">
 <!-- LOCALIZATION NOTE
      - width should be 62ch + length of longest serverList*.label -->
 <!ENTITY networksEditDialog.size      "width: 75ch; height: 28em;">
 
 <!ENTITY restoreButton.label          "Restore Defaults">
 <!ENTITY restoreButton.accesskey      "f">
-
 <!ENTITY connectNetwork.label         "Connect to Network">
 <!ENTITY connectNetwork.accesskey     "N">
 
 <!ENTITY networkListAdd.label         "Add Network…">
 <!ENTITY networkListAdd.accesskey     "A">
 <!ENTITY networkListAdd.tooltip       "Add a new network">
 <!ENTITY networkListEdit.label        "Edit Network…">
 <!ENTITY networkListEdit.accesskey    "E">
--- a/suite/chrome/browser/navigator.properties
+++ b/suite/chrome/browser/navigator.properties
@@ -59,18 +59,16 @@ editBookmarkPanel.editBookmarkTitle=Edit
 # Semi-colon list of plural forms. Replacement for #1 is
 # the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=Remove Bookmark;Remove #1 Bookmarks
 
 # bookmark dialog strings
 
-bookmarkAllTabsDefault=[Folder Name]
-
 # LOCALIZATION NOTE (addKeywordTitleAutoFill): %S will be replaced by the page's title
 # Used as the bookmark name when saving a keyword for a search field.
 addKeywordTitleAutoFill=Search %S
 
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.name=SeaMonkey Default Theme
 extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description=This theme uses styles and colors from the system to fit in with other applications.
 
 extensions.modern@themes.mozilla.org.name=SeaMonkey Modern
--- a/suite/chrome/common/notification.properties
+++ b/suite/chrome/common/notification.properties
@@ -1,47 +1,19 @@
 # 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/.
 
-outdatedpluginsMessage.title=Some plugins used by this page are out of date.
-outdatedpluginsMessage.button.label=Update Plugins…
-outdatedpluginsMessage.button.accesskey=U
-
-missingpluginsMessage.title=Additional plugins are required to display all the media on this page.
-
-blockedpluginsMessage.title=Some plugins required by this page have been blocked for your protection.
-blockedpluginsMessage.infoButton.label=Details…
-blockedpluginsMessage.infoButton.accesskey=D
-
 crashedpluginsMessage.title=The %S plugin has crashed.
 crashedpluginsMessage.reloadButton.label=Reload page
 crashedpluginsMessage.reloadButton.accesskey=R
 crashedpluginsMessage.submitButton.label=Submit a crash report
 crashedpluginsMessage.submitButton.accesskey=S
 crashedpluginsMessage.learnMore=Learn More…
 
-activatepluginsMessage.title=Would you like to activate the plugins on this page?
-activatepluginsMessage.activate.label=Activate plugins
-activatepluginsMessage.activate.accesskey=A
-activatepluginsMessage.dismiss.label=Don't activate
-activatepluginsMessage.dismiss.accesskey=D
-activatepluginsMessage.remember=Remember for this website
-activatepluginsMessage.always.label=Always activate plugins for this site
-activatepluginsMessage.always.accesskey=c
-activatepluginsMessage.never.label=Never activate plugins for this site
-activatepluginsMessage.never.accesskey=N
-activateSinglePlugin=Activate
-PluginClickToActivate=Activate %S.
-PluginVulnerableUpdatable=This plugin is vulnerable and should be updated.
-PluginVulnerableNoUpdate=This plugin has security vulnerabilities.
-vulnerableUpdatablePluginWarning=Outdated Version!
-vulnerableNoUpdatePluginWarning=Vulnerable Plugin!
-vulnerablePluginsMessage=Some plugins have been deactivated for your safety.
-
 pluginInfo.unknownPlugin=Unknown
 
 # LOCALIZATION NOTE (popupWarning.message): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is brandShortName and #2 is the number of popups blocked.
 popupWarning.message=#1 prevented this website from opening a popup window.;#1 prevented this website from opening #2 popup windows.
 popupWarningButton=Preferences
 popupWarningButton.accesskey=P
--- a/suite/chrome/common/pref/pref-advanced.dtd
+++ b/suite/chrome/common/pref/pref-advanced.dtd
@@ -3,17 +3,16 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!--LOCALIZATION NOTE : FILE 'Advanced' prefs settings -->
 <!ENTITY pref.advanced.title              "Advanced">
 
 <!ENTITY prefCheckDefault.caption         "System Integration">
 <!ENTITY prefCheckDefaultClient.label     "Check default application settings on startup">
 <!ENTITY prefCheckDefaultClient.accesskey "C">
-
 <!ENTITY defaultClientFor.description     "Make &brandShortName; the default application for:">
 <!ENTITY setDefaultBrowser.label          "Browser">
 <!ENTITY setDefaultBrowser.accesskey      "B">
 <!ENTITY setDefaultMail.label             "Mail">
 <!ENTITY setDefaultMail.accesskey         "M">
 <!ENTITY setDefaultNews.label             "News">
 <!ENTITY setDefaultNews.accesskey         "N">
 <!ENTITY setDefaultFeed.label             "Feeds">
--- a/suite/chrome/common/pref/pref-content.dtd
+++ b/suite/chrome/common/pref/pref-content.dtd
@@ -2,22 +2,16 @@
    - 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/. -->
 
 <!--LOCALIZATION NOTE : FILE The Appearance > Content prefs dialog.  -->
 
 <!ENTITY pref.content.title                     "Content">
 <!ENTITY pref.content.description               "These settings influence how website and message content appears in &brandShortName;.">
 
-<!ENTITY siteIcons.label                        "Website icons">
-<!ENTITY useSiteIcons.label                     "Show website icons">
-<!ENTITY useSiteIcons.accesskey                 "S">
-<!ENTITY useFavIcons2.label                     "Try to use the servers favicon when the page doesn&apos;t define an icon">
-<!ENTITY useFavIcons2.accesskey                 "i">
-
 <!ENTITY scrolling.label                        "Scrolling">
 <!ENTITY useAutoScroll.label                    "Use autoscrolling">
 <!ENTITY useAutoScroll.accesskey                "t">
 <!ENTITY useSmoothScroll.label                  "Use smooth scrolling">
 <!ENTITY useSmoothScroll.accesskey              "U">
 
 <!ENTITY zoomPrefs.label                        "Zoom options">
 <!-- LOCALIZATION NOTE (minZoom.label, maxZoom.label, percent.label):
@@ -38,11 +32,8 @@
 <!ENTITY siteSpecific.accesskey                 "m">
 <!ENTITY showZoomStatusPanel.label              "Show zoom controls in the status bar">
 <!ENTITY showZoomStatusPanel.accesskey          "S">
 <!ENTITY enableAutomaticImageResizing.label     "Resize large images to fit in the browser window">
 <!ENTITY enableAutomaticImageResizing.accesskey "R">
 
 <!ENTITY allowHWAccel.label                     "Use hardware acceleration when available">
 <!ENTITY allowHWAccel.accesskey                 "e">
-<!ENTITY blockAutoRefresh.label                 "Warn me when websites try to redirect or reload the page">
-<!ENTITY blockAutoRefresh.accesskey             "W">
-
--- a/suite/chrome/common/pref/pref-masterpass.dtd
+++ b/suite/chrome/common/pref/pref-masterpass.dtd
@@ -1,17 +1,13 @@
 <!-- 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/. -->
 
-<!ENTITY  pref.masterpass.title                  "Master Passwords">
-
 <!ENTITY  changepassword.caption                 "Change Master Password">
 <!ENTITY  changepassword.text                    "Your master password protects sensitive information such as web passwords and certificates.">
 <!ENTITY  changepassword.button                  "Change Password…">
 <!ENTITY  changepassword.accesskey               "C">
 
 <!ENTITY  resetpassword.caption                  "Reset Master Password">
 <!ENTITY  resetpassword.text                     "If you reset your master password, all of your stored web and e-mail passwords, form data, personal certificates, and private keys will be lost.">
-<!ENTITY  resetpassword.button                   "Reset Password">
-<!ENTITY  resetpassword.accesskey                "R">
 <!ENTITY  resetpassword2.button                  "Reset Password">
 <!ENTITY  resetpassword2.accesskey               "P">
--- a/suite/chrome/common/pref/pref-navigator.dtd
+++ b/suite/chrome/common/pref/pref-navigator.dtd
@@ -41,16 +41,8 @@
 <!ENTITY useCurrent.label               "Use Current Page">
 <!ENTITY useCurrent.accesskey           "U">
 <!ENTITY useCurrentGroup.label          "Use Current Group">
 <!ENTITY useCurrentGroup.accesskey      "G">
 <!ENTITY browseFile.label               "Choose File…">
 <!ENTITY browseFile.accesskey           "C">
 <!ENTITY useDefault.label               "Restore Default">
 <!ENTITY useDefault.accesskey           "R">
-
-<!ENTITY defaultBrowserGroup.label      "Default Browser">
-<!ENTITY defaultBrowserButton.label     "Set Default Browser">
-<!ENTITY defaultBrowserButton.accesskey "D">
-<!ENTITY alreadyDefaultText             "&brandShortName; is already your default browser.">
-<!ENTITY defaultPendingText             "&brandShortName; will be set as your default browser when you click OK.">
-<!ENTITY wasMadeDefaultText             "&brandShortName; has been set as your default browser.">
-<!ENTITY makeDefaultText                "Set &brandShortName; as your default browser.">
--- a/suite/chrome/common/pref/pref-scripts.dtd
+++ b/suite/chrome/common/pref/pref-scripts.dtd
@@ -1,17 +1,14 @@
 <!-- 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/. -->
 
 <!-- extracted from content/pref-scripts.xul -->
 
-<!--LOCALIZATION NOTE : FILE The 'Scripts & Plugins' preferences dialog -->
-<!ENTITY pref.scripts.title              "Scripts &amp; Plugins">
-
 <!--LOCALIZATION NOTE : FILE The 'Scripts' preferences dialog -->
 <!ENTITY pref.scripts2.title             "Scripts">
 
 <!ENTITY navigator.label                 "Browser">
 <!ENTITY navigator.accesskey             "B">
 
 <!--LOCALIZATION NOTE (enableJavaScript.label): 'JavaScript' should never be translated -->
 <!ENTITY enableJavaScript.label          "Enable JavaScript for">
@@ -25,18 +22,8 @@
 
 <!ENTITY debugging.label                  "JavaScript Debugging">
 <!ENTITY debugEnableDump.label            "Enable JavaScript dump() output">
 <!ENTITY debugEnableDump.accesskey        "E">
 <!ENTITY debugStrictJavascript.label      "Show strict JavaScript warnings">
 <!ENTITY debugStrictJavascript.accesskey  "J">
 <!ENTITY debugConsoleJavascript.label     "Show chrome JavaScript errors and warnings">
 <!ENTITY debugConsoleJavascript.accesskey "c">
-
-<!ENTITY enablePlugins.label             "Enable Plugins for">
-<!ENTITY enablePluginForSuite.label      "Suite">
-<!ENTITY enablePluginForSuite.accesskey  "u">
-
-<!ENTITY whenPageRequiresPlugins.label   "When a page requires plugins">
-<!ENTITY activateAllPlugins.label        "Activate all plugins by default">
-<!ENTITY activateAllPlugins.accesskey    "d">
-<!ENTITY warnPluginsRequired.label       "Warn me if additional plugins need to be installed">
-<!ENTITY warnPluginsRequired.accesskey   "W">
--- a/suite/chrome/common/pref/preferences.dtd
+++ b/suite/chrome/common/pref/preferences.dtd
@@ -33,24 +33,22 @@
 <!ENTITY download.label "Downloads">
 
 <!ENTITY security.label "Privacy &amp; Security">
 <!ENTITY privatedata.label "Private Data">
 <!ENTITY cookies.label "Cookies">
 <!ENTITY images.label "Images">
 <!ENTITY popups.label "Popup Windows">
 <!ENTITY passwords.label "Passwords">
-<!ENTITY masterpass.label "Master Passwords">
 <!ENTITY ssltls.label "SSL/TLS">
 <!ENTITY certs.label "Certificates">
 
 <!ENTITY sync.label "Sync">
 
 <!ENTITY advance.label "Advanced">
-<!ENTITY scriptsAndWindows.label "Scripts &amp; Plugins">
 <!ENTITY scriptsAndWindows2.label "Scripts">
 <!ENTITY keynav.label "Keyboard Navigation">
 <!ENTITY findAsYouType.label "Find As You Type">
 <!ENTITY cache.label "Cache">
 <!ENTITY offlineApps.label "Offline Apps">
 <!ENTITY proxies.label "Proxies">
 <!ENTITY httpnetworking.label "HTTP Networking">
 <!ENTITY smart.label "Software Installation">
--- a/suite/chrome/common/sitePermissions.properties
+++ b/suite/chrome/common/sitePermissions.properties
@@ -11,17 +11,16 @@
 # This label is used to display active permission states in the site
 # identity popup (which does not have a lot of screen space).
 state.current.allowed = Allowed
 state.current.allowedForSession = Allowed for Session
 state.current.allowedTemporarily = Allowed Temporarily
 state.current.blockedTemporarily = Blocked Temporarily
 state.current.blocked = Blocked
 state.current.prompt = Always Ask
-state.current.hide = Hide Prompt
 
 # LOCALIZATION NOTE (state.multichoice.alwaysAsk,
 #                    state.multichoice.allow,
 #                    state.multichoice.allowForSameDomain,
 #                    state.multichoice.allowForSession,
 #                    state.multichoice.block):
 # Used to label permission state checkboxes in the page info dialog.
 state.multichoice.alwaysAsk = Always Ask
@@ -37,9 +36,8 @@ permission.camera.label = Use the Camera
 permission.microphone.label = Use the Microphone
 permission.screen.label = Share the Screen
 permission.install.label = Install Add-ons
 permission.popup.label = Open Pop-up Windows
 permission.geo.label = Access Your Location
 permission.indexedDB.label = Maintain Offline Storage
 permission.focus-tab-by-prompt.label = Switch to this Tab
 permission.persistent-storage.label = Store Data in Persistent Storage
-permission.flash-plugin.label = Run Adobe Flash
--- a/suite/chrome/mailnews/FilterEditor.dtd
+++ b/suite/chrome/mailnews/FilterEditor.dtd
@@ -1,14 +1,13 @@
 <!-- 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/. -->
 
 <!ENTITY window.title "Filter Rules">
-<!ENTITY filterEditorDialog.dimensions "width: 105ch;">
 <!ENTITY filterName.label "Filter name:">
 <!ENTITY filterName.accesskey "i">
 
 <!ENTITY recentFolders.label "Recent">
 
 <!ENTITY junk.label "Junk">
 <!ENTITY notJunk.label "Not Junk">
 
--- a/suite/chrome/mailnews/FilterListDialog.dtd
+++ b/suite/chrome/mailnews/FilterListDialog.dtd
@@ -29,11 +29,9 @@
 <!ENTITY viewLogButton.label "Filter Log">
 <!ENTITY viewLogButton.accesskey "L">
 <!ENTITY runFilters.label "Run Now">
 <!ENTITY runFilters.accesskey "R">
 <!ENTITY stopFilters.label "Stop">
 <!ENTITY stopFilters.accesskey "S">
 <!ENTITY folderPickerPrefix.label "Run selected filter(s) on:">
 <!ENTITY folderPickerPrefix.accesskey "c">
-<!ENTITY choosethis.label "choose this folder">
-<!ENTITY choosethisnewsserver.label "choose this news server">
 <!ENTITY searchBox.emptyText "Search filters by name…">
--- a/suite/chrome/mailnews/fieldMapImport.dtd
+++ b/suite/chrome/mailnews/fieldMapImport.dtd
@@ -1,14 +1,13 @@
 <!-- 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/. -->
 
 <!ENTITY fieldMapImport.title "Import Address Book">
-<!ENTITY fieldMapImport.size "width: 40em; height: 30em;">
 <!ENTITY fieldMapImport.recordNumber "Imported data for Record: ">
 <!ENTITY fieldMapImport.next.label "Next">
 <!ENTITY fieldMapImport.next.accesskey "N">
 <!ENTITY fieldMapImport.previous.label "Previous">
 <!ENTITY fieldMapImport.previous.accesskey "P">
 <!ENTITY fieldMapImport.text "Use Move Up and Move Down to match the address book fields on the left to the correct data for import on the right. Uncheck items you do not want to import.">
 <!ENTITY fieldMapImport.up.label "Move Up">
 <!ENTITY fieldMapImport.up.accesskey "U">
--- a/suite/chrome/mailnews/filter.properties
+++ b/suite/chrome/mailnews/filter.properties
@@ -17,17 +17,16 @@ filterListBackUpMsg=Your filters do not 
 customHeaderOverflow=You've exceeded the limit of 50 custom headers. Please remove one or more custom headers and try again.
 filterCustomHeaderOverflow=Your filters have exceeded the limit of 50 custom headers. Please edit the msgFilterRules.dat file, which contains your filters, to use fewer custom headers.
 invalidCustomHeader=One of your filters uses a custom header that contains an invalid character, such as ':', a non-printable character, a non-ascii character, or an eight-bit ascii character. Please edit the msgFilterRules.dat file, which contains your filters, to remove invalid characters from your custom headers.
 continueFilterExecution=Applying filter %S failed. Would you like to continue applying filters?
 promptTitle=Running Filters
 promptMsg=You are currently in the process of filtering messages.\nWould you like to continue applying filters?
 stopButtonLabel=Stop
 continueButtonLabel=Continue
-cannotEnableFilter=This filter was probably created by a future version of this software. You cannot enable this filter because we don't know how to apply it.
 # LOCALIZATION NOTE(cannotEnableIncompatFilter)
 # %S=the name of the application
 cannotEnableIncompatFilter=This filter was probably created by a newer or incompatible version of %S. You cannot enable this filter because we don't know how to apply it.
 dontWarnAboutDeleteCheckbox=&Don't ask me again
 
 # LOCALIZATION NOTE(copyToNewFilterName)
 # %S=the name of the filter that is being copied
 copyToNewFilterName=Copy of %S
--- a/suite/chrome/mailnews/messenger.dtd
+++ b/suite/chrome/mailnews/messenger.dtd
@@ -308,19 +308,16 @@
 <!ENTITY forwardMsgCmd.accesskey "F">
 <!ENTITY forwardMsgCmd.key "l">
 <!ENTITY forwardAsMenu.label "Forward As">
 <!ENTITY forwardAsMenu.accesskey "o">
 <!ENTITY forwardAsInline.label "Inline">
 <!ENTITY forwardAsInline.accesskey "I">
 <!ENTITY forwardAsAttachmentCmd.label "Attachment">
 <!ENTITY forwardAsAttachmentCmd.accesskey "A">
-<!ENTITY editMsgAsNewCmd.label "Edit Message As New">
-<!ENTITY editMsgAsNewCmd.accesskey "E">
-<!ENTITY editMsgAsNewCmd.key "e">
 <!ENTITY editAsNewMsgCmd.label "Edit As New Message">
 <!ENTITY editAsNewMsgCmd.accesskey "E">
 <!ENTITY editAsNewMsgCmd.key "e">
 <!ENTITY editDraftMsgCmd.label "Edit Draft Message">
 <!ENTITY editDraftMsgCmd.accesskey "D">
 <!ENTITY editTemplateMsgCmd.label "Edit Template">
 <!ENTITY editTemplateMsgCmd.accesskey "T">
 <!ENTITY newMsgFromTemplateCmd.label "New Message from Template">
@@ -474,18 +471,16 @@
 <!-- Statusbar -->
 <!ENTITY statusText.label "Done">
 
 <!-- Thread Pane Context Menu -->
 <!ENTITY contextOpenNewWindow.label "Open Message in New Window">
 <!ENTITY contextOpenNewWindow.accesskey "W">
 <!ENTITY contextOpenNewTab.label "Open Message in New Tab">
 <!ENTITY contextOpenNewTab.accesskey "T">
-<!ENTITY contextEditAsNew.label "Edit As New…">
-<!ENTITY contextEditAsNew.accesskey "E">
 <!ENTITY contextEditMsgAsNew.label "Edit As New Message">
 <!ENTITY contextEditMsgAsNew.accesskey "E">
 <!ENTITY contextEditDraftMsg.label "Edit Draft Message">
 <!ENTITY contextEditTemplate.label "Edit Template">
 <!ENTITY contextEditTemplate.accesskey "T">
 <!ENTITY contextNewMsgFromTemplate.label "New Message from Template">
 <!ENTITY contextReplySender.label "Reply to Sender Only">
 <!ENTITY contextReplySender.accesskey "O">
--- a/suite/chrome/mailnews/msgHdrViewOverlay.dtd
+++ b/suite/chrome/mailnews/msgHdrViewOverlay.dtd
@@ -18,19 +18,16 @@
 <!ENTITY tagsHdr.label "Tags: ">
 <!ENTITY dateField.label "Date: ">
 <!ENTITY userAgentField.label "User-Agent: ">
 <!ENTITY referencesField.label "References: ">
 <!ENTITY messageIdField.label "Message-ID: ">
 <!ENTITY inReplyToField.label "In-Reply-To: ">
 <!ENTITY originalWebsite.label "Website: ">
 
-<!ENTITY editMessage.label                 "Edit Draft…">
-<!ENTITY editMessage.accesskey             "D">
-
 <!ENTITY editDraft.label                   "Edit Draft…">
 <!ENTITY editDraft.accesskey               "D">
 <!ENTITY editTemplate.label                "Edit Template…">
 <!ENTITY editTemplate.accesskey            "d">
 
 <!ENTITY attachmentsTree.label             "Attachments:">
 <!ENTITY attachmentsTree.accesskey         "c">
 <!ENTITY openAttachmentCmd.label           "Open">
--- a/suite/chrome/mailnews/pref/mailPrefsOverlay.dtd
+++ b/suite/chrome/mailnews/pref/mailPrefsOverlay.dtd
@@ -1,16 +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/. -->
 
-<!-- These are added to the Advanced - Scripts & Plugins panel -->
-<!ENTITY enbPluginCheckMailNews.label     "Mail &amp; Newsgroups">
-<!ENTITY enbPluginCheckMailNews.accesskey "a">
-
 <!-- These are added to the Window menu -->
 <!ENTITY mail.label                       "Mail &amp; Newsgroups">
 <!ENTITY mail.accesskey                   "M">
 <!ENTITY addressbook.label                "Address Book">
 <!ENTITY addressbook.accesskey            "A">
 
 <!-- These are added to Preferences dialog -->
 <!ENTITY viewingMessages.label            "Message Display">
--- a/suite/chrome/mailnews/pref/pref-mailnews.dtd
+++ b/suite/chrome/mailnews/pref/pref-mailnews.dtd
@@ -17,30 +17,16 @@
 <!ENTITY mailMiddleClick.accesskey        "M">
 <!ENTITY mailMiddleClickMac.label         "Middle-click or &#8984;+Return on a message or a folder">
 <!ENTITY mailMiddleClickMac.accesskey     "M">
 <!ENTITY mailDoubleClick.label            "Double-click on a message">
 <!ENTITY mailDoubleClick.accesskey        "k">
 <!ENTITY mailBiffOnNewWindow.label        "Only check for new mail after opening Mail &amp; Newsgroups">
 <!ENTITY mailBiffOnNewWindow.accesskey    "O">
 
-<!ENTITY defaultMailSettings.description  "Make &brandShortName; the default application for:">
-<!ENTITY setDefaultMail.label             "Mail">
-<!ENTITY setDefaultMail.accesskey         "M">
-<!ENTITY setDefaultNews.label             "News">
-<!ENTITY setDefaultNews.accesskey         "N">
-<!ENTITY setDefaultFeed.label             "Feeds">
-<!ENTITY setDefaultFeed.accesskey         "e">
-
-<!ENTITY useInternalSettings.description  "Use &brandShortName; Mail &amp; News when opening browser links for:">
-<!ENTITY useInternalMail.label            "Mail (mailto:)">
-<!ENTITY useInternalMail.accesskey        "a">
-<!ENTITY useInternalNews.label            "News (news:, snews:, nntp:)">
-<!ENTITY useInternalNews.accesskey        "s">
-
 <!ENTITY messengerStartPage.caption       "Mail Start Page">
 <!ENTITY enableStartPage.label            "When Mail launches, show the Start Page in the message area">
 <!ENTITY enableStartPage.accesskey        "W">
 <!ENTITY location.label                   "Location:">
 <!ENTITY location.accesskey               "L">
 <!ENTITY useDefault.label                 "Restore Default">
 <!ENTITY useDefault.accesskey             "D">
 <!ENTITY rememberLastMsg.label            "Remember the last selected message">
--- a/suite/chrome/mailnews/start.dtd
+++ b/suite/chrome/mailnews/start.dtd
@@ -21,19 +21,14 @@ client, supporting advanced junk mail de
 "Tight integration with the &brandShortName; application suite">
 <!ENTITY dict.title "Dictionaries">
 <!ENTITY dict_intro.label "Dictionaries are used to check the spelling of your messages.">
 <!ENTITY dict_info.label2
 'Many additional languages can be installed from the
 <a id="dictURL" href="">dictionaries</a> section on
 <a href="https://addons.thunderbird.net/seamonkey/">SeaMonkey and Thunderbird Add-ons</a>.'>
 <!ENTITY info.title "More Information">
-<!--# LOCALIZATION NOTE (info_bugs.label): the URL for <a id="releaseNotesURL"> is fetched from brand.properties -->
-<!ENTITY info_bugs.label
-'<a href="https://developer.mozilla.org/docs/Mozilla/Projects/MailNews">We</a> welcome bug reports and feature
-requests, but please read the <a id="releaseNotesURL" href="">release notes</a> and query
-<a href="https://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.'>
 <!--# LOCALIZATION NOTE (info_bugs.label2): the URL for <a id="releaseNotesURL"> is fetched from brand.properties -->
 <!ENTITY info_bugs.label2
 '<a href="https://www.seamonkey-project.org/dev/get-involved">We</a> welcome
 bug reports and feature requests, but please read the
 <a id="releaseNotesURL" href="">release notes</a> and query
 <a href="https://bugzilla.mozilla.org/query.cgi">Bugzilla</a> first.'>
--- a/toolkit/chrome/global/extensions.properties
+++ b/toolkit/chrome/global/extensions.properties
@@ -1,29 +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/.
 
-csp.error.missing-directive = Policy is missing a required ‘%S’ directive
-
-#LOCALIZATION NOTE (csp.error.illegal-keyword) %1$S is the name of a CSP directive, such as "script-src". %2$S is the name of a CSP keyword, usually 'unsafe-inline'.
-csp.error.illegal-keyword = ‘%1$S’ directive contains a forbidden %2$S keyword
-
-#LOCALIZATION NOTE (csp.error.illegal-protocol) %2$S a protocol name, such as "http", which appears as "http:", as it would in a URL.
-csp.error.illegal-protocol = ‘%1$S’ directive contains a forbidden %2$S: protocol source
-
-#LOCALIZATION NOTE (csp.error.missing-host) %2$S a protocol name, such as "http", which appears as "http:", as it would in a URL.
-csp.error.missing-host = %2$S: protocol requires a host in ‘%1$S’ directives
-
-#LOCALIZATION NOTE (csp.error.missing-source) %1$S is the name of a CSP directive, such as "script-src". %2$S is the name of a CSP source, usually 'self'.
-csp.error.missing-source = ‘%1$S’ must include the source %2$S
-
-#LOCALIZATION NOTE (csp.error.illegal-host-wildcard) %2$S a protocol name, such as "http", which appears as "http:", as it would in a URL.
-csp.error.illegal-host-wildcard = %2$S: wildcard sources in ‘%1$S’ directives must include at least one non-generic sub-domain (e.g., *.example.com rather than *.com)
-
 #LOCALIZATION NOTE (uninstall.confirmation.title) %S is the name of the extension which is about to be uninstalled.
 uninstall.confirmation.title = Uninstall %S
 
 #LOCALIZATION NOTE (uninstall.confirmation.message) %S is the name of the extension which is about to be uninstalled.
 uninstall.confirmation.message = The extension “%S” is requesting to be uninstalled. What would you like to do?
 
 uninstall.confirmation.button-0.label = Uninstall
 uninstall.confirmation.button-1.label = Keep Installed
deleted file mode 100644
--- a/toolkit/chrome/global/global-extension-fields.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/.
-
-# LOCALIZATION NOTE (extension.default-theme@mozilla.org.name, extension.default-theme@mozilla.org.description): This is displayed in about:addons -> Appearance
-extension.default-theme@mozilla.org.name=System theme
-extension.default-theme@mozilla.org.description=Follow the operating system setting for buttons, menus, and windows.
--- a/toolkit/chrome/global/narrate.properties
+++ b/toolkit/chrome/global/narrate.properties
@@ -2,18 +2,16 @@
 # 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/.
 
 # "Listen, which allows users to listen to Firefox reading the text,
 # instead of having to read it themselves." This is the name
 # of the feature and it is the label for the popup button.
 listen = Listen
 back = Back
-start = Start
-stop = Stop
 # %S is the keyboard shortcut for the start command
 start-label = Start (%S)
 # %S is the keyboard shortcut for the stop command
 stop-label = Stop (%S)
 # Keyboard shortcut to toggle the narrate feature
 narrate-key-shortcut = N
 forward = Forward
 speed = Speed
deleted file mode 100644
--- a/toolkit/chrome/global/textcontext.dtd
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY spellAddToDictionary.label "Add to Dictionary">
-<!ENTITY spellAddToDictionary.accesskey "o">
-<!ENTITY spellUndoAddToDictionary.label "Undo Add To Dictionary">
-<!ENTITY spellUndoAddToDictionary.accesskey "n">
-<!ENTITY spellCheckToggle.label "Check Spelling">
-<!ENTITY spellCheckToggle.accesskey "g">
-<!ENTITY spellNoSuggestions.label "(No Spelling Suggestions)">
-<!ENTITY spellDictionaries.label "Languages">
-<!ENTITY spellDictionaries.accesskey "l">
-
-<!ENTITY searchTextBox.clear.label "Clear">
deleted file mode 100644
--- a/toolkit/chrome/mozapps/downloads/unknownContentType.dtd
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY  intro2.label                "You have chosen to open:">
-<!ENTITY  from.label                  "from:">
-<!ENTITY  actionQuestion.label        "What should &brandShortName; do with this file?">
-
-<!ENTITY  openWith.label              "Open with">
-<!ENTITY  openWith.accesskey          "o">
-<!ENTITY  other.label                 "Other…">
-
-<!ENTITY  saveFile.label              "Save File">
-<!ENTITY  saveFile.accesskey          "s">
-
-<!ENTITY  rememberChoice.label        "Do this automatically for files like this from now on.">
-<!ENTITY  rememberChoice.accesskey    "a">
-
-<!ENTITY  whichIs.label              "which is:">
-
-<!ENTITY  chooseHandlerMac.label      "Choose…">
-<!ENTITY  chooseHandlerMac.accesskey  "C">
-<!ENTITY  chooseHandler.label         "Browse…">
-<!ENTITY  chooseHandler.accesskey     "B">
-
-<!ENTITY  unknownPromptText.label     "Would you like to save this file?">
--- a/toolkit/chrome/mozapps/extensions/extensions.properties
+++ b/toolkit/chrome/mozapps/extensions/extensions.properties
@@ -57,30 +57,20 @@ details.notification.vulnerableUpdatable
 #LOCALIZATION NOTE (details.notification.vulnerableNoUpdate) %1$S is the add-on name
 details.notification.vulnerableNoUpdate=%1$S is known to be vulnerable. Use with caution.
 details.notification.vulnerableNoUpdate.link=More Information
 #LOCALIZATION NOTE (details.notification.restartless-uninstall) %1$S is the add-on name.
 details.notification.restartless-uninstall=%1$S will be uninstalled after you close this tab.
 #LOCALIZATION NOTE (details.notification.gmpPending) %1$S is the add-on name
 details.notification.gmpPending=%1$S will be installed shortly.
 
-type.extension.name=Extensions
-type.themes.name=Themes
-type.locale.name=Languages
-type.plugin.name=Plugins
-type.dictionary.name=Dictionaries
-type.service.name=Services
-type.legacy.name=Legacy Extensions
-type.unsupported.name=Unsupported
-
 #LOCALIZATION NOTE(listHeading.discover) %S is the brandShortName
 listHeading.discover=Personalize Your %S
 listHeading.extension=Manage Your Extensions
 listHeading.shortcuts=Manage Extension Shortcuts
 listHeading.theme=Manage Your Themes
 listHeading.plugin=Manage Your Plugins
 listHeading.locale=Manage Your Languages
 listHeading.dictionary=Manage Your Dictionaries
-
 listHeading.sitepermission=Manage Your Site Permissions
 
 searchLabel.extension=Find more extensions
 searchLabel.theme=Find more themes
--- a/toolkit/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/chrome/mozapps/profile/profileSelection.properties
@@ -44,14 +44,12 @@ profileMissingTitle=Profile Missing
 profileDeletionFailed=Profile couldn’t be deleted as it may be in use.
 profileDeletionFailedTitle=Deletion Failed
 
 # Profile reset
 # LOCALIZATION NOTE (resetBackupDirectory): Directory name for the profile directory backup created during reset. This directory is placed in a location users will see it (ie. their desktop). %S is the application name.
 resetBackupDirectory=Old %S Data
 
 flushFailTitle=Changes not saved
-# LOCALIZATION NOTE (conflictMessage): %1$S is brandProductName, %2$S is brandShortName.
-conflictMessage=Another copy of %1$S has made changes to profiles. You must restart %2$S before making more changes.
 flushFailMessage=An unexpected error has prevented your changes from being saved.
 # LOCALIZATION NOTE (flushFailRestartButton): $S is brandShortName.
 flushFailRestartButton=Restart %S
 flushFailExitButton=Exit
--- a/toolkit/toolkit/about/aboutAddons.ftl
+++ b/toolkit/toolkit/about/aboutAddons.ftl
@@ -186,17 +186,16 @@ addon-category-locale = Languages
 addon-category-locale-title =
     .title = Languages
 addon-category-available-updates = Available Updates
 addon-category-available-updates-title =
     .title = Available Updates
 addon-category-recent-updates = Recent Updates
 addon-category-recent-updates-title =
     .title = Recent Updates
-
 addon-category-sitepermission = Site Permissions
 addon-category-sitepermission-title =
     .title = Site Permissions
 
 ## These are global warnings
 
 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.
@@ -319,17 +318,16 @@ created-by-author = by <a data-l10n-name
 #   $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
-
 find-more-themes = Find more themes
 
 # 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
@@ -353,17 +351,16 @@ 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
-
 theme-monochromatic-heading = Colorways
 theme-monochromatic-subheading = Vibrant new colorways from { -brand-product-name }. Available for a limited time.
 
 plugin-enabled-heading = Enabled
 plugin-disabled-heading = Disabled
 
 dictionary-enabled-heading = Enabled
 dictionary-disabled-heading = Disabled
--- a/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
+++ b/toolkit/toolkit/about/aboutHttpsOnlyError.ftl
@@ -1,15 +1,13 @@
 # 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/.
 
 about-httpsonly-title-alert = HTTPS-Only Mode Alert
-about-httpsonly-title-connection-not-available = Secure Connection Not Available
-
 about-httpsonly-title-site-not-available = Secure Site Not Available
 
 # Variables:
 #   $websiteUrl (String) - Url of the website that failed to load. Example: www.example.com
 about-httpsonly-explanation-unavailable2 = You’ve enabled HTTPS-Only Mode for enhanced security, and a HTTPS version of <em>{ $websiteUrl }</em> is not available.
 about-httpsonly-explanation-question = What could be causing this?
 about-httpsonly-explanation-nosupport = Most likely, the website simply does not support HTTPS.
 about-httpsonly-explanation-risk = It’s also possible that an attacker is involved. If you decide to visit the website, you should not enter any sensitive information like passwords, emails, or credit card details.
--- a/toolkit/toolkit/about/aboutNetworking.ftl
+++ b/toolkit/toolkit/about/aboutNetworking.ftl
@@ -15,17 +15,16 @@ 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
 about-networking-active = Active
 about-networking-idle = Idle
 about-networking-host = Host
-about-networking-tcp = TCP
 about-networking-type = Type
 about-networking-sent = Sent
 about-networking-received = Received
 about-networking-family = Family
 about-networking-trr = TRR
 about-networking-addresses = Addresses
 about-networking-expires = Expires (Seconds)
 about-networking-originAttributesSuffix = Isolation Key
--- a/toolkit/toolkit/about/aboutProcesses.ftl
+++ b/toolkit/toolkit/about/aboutProcesses.ftl
@@ -61,21 +61,19 @@ about-processes-utility-process = Utilit
 about-processes-unknown-process = Other: { $type } ({ $pid })
 
 ## Isolated process names
 ## Variables:
 ##    $pid (String) The process id of this process, assigned by the OS.
 ##    $origin (String) The domain name for this process.
 
 about-processes-web-isolated-process = { $origin } ({ $pid })
-about-processes-web-large-allocation-process = { $origin } ({ $pid }, large)
 about-processes-web-serviceworker = { $origin } ({ $pid }, serviceworker)
 about-processes-with-coop-coep-process = { $origin } ({ $pid }, cross-origin isolated)
 about-processes-web-isolated-process-private = { $origin } — Private ({ $pid })
-about-processes-web-large-allocation-process-private = { $origin } — Private ({ $pid }, large)
 about-processes-with-coop-coep-process-private = { $origin } — Private ({ $pid }, cross-origin isolated)
 
 ## Details within processes
 
 # Single-line summary of threads (non-idle process)
 # Variables:
 #    $number (Number) The number of threads in the process. Typically larger
 #                     than 30. We don't expect to ever have processes with less
@@ -140,20 +138,16 @@ about-processes-utility-actor-audio-deco
 
 # Common case.
 about-processes-cpu = { NUMBER($percent, maximumSignificantDigits: 2, style: "percent") }
     .title = Total CPU time: { NUMBER($total, maximumFractionDigits: 0) }{ $unit }
 
 # Special case: data is not available yet.
 about-processes-cpu-user-and-kernel-not-ready = (measuring)
 
-# Special case: process or thread is currently idle.
-about-processes-cpu-idle = idle
-    .title = Total CPU time: { NUMBER($total, maximumFractionDigits: 2) }{ $unit }
-
 # Special case: process or thread is almost idle (using less than 0.1% of a CPU core).
 # This case only occurs on Windows where the precision of the CPU times is low.
 about-processes-cpu-almost-idle = < 0.1%
     .title = Total CPU time: { NUMBER($total, maximumFractionDigits: 0) }{ $unit }
 
 # Special case: process or thread is currently idle.
 about-processes-cpu-fully-idle = idle
     .title = Total CPU time: { NUMBER($total, maximumFractionDigits: 0) }{ $unit }
--- a/toolkit/toolkit/about/aboutTelemetry.ftl
+++ b/toolkit/toolkit/about/aboutTelemetry.ftl
@@ -29,17 +29,16 @@ about-telemetry-session-info-section = S
 about-telemetry-scalar-section = Scalars
 about-telemetry-keyed-scalar-section = Keyed Scalars
 about-telemetry-histograms-section = Histograms
 about-telemetry-keyed-histogram-section = Keyed Histograms
 about-telemetry-events-section = Events
 about-telemetry-simple-measurements-section = Simple Measurements
 about-telemetry-slow-sql-section = Slow SQL Statements
 about-telemetry-addon-details-section = Add-on Details
-about-telemetry-captured-stacks-section = Captured Stacks
 about-telemetry-late-writes-section = Late Writes
 about-telemetry-raw-payload-section = Raw Payload
 about-telemetry-raw = Raw JSON
 about-telemetry-full-sql-warning = NOTE: Slow SQL debugging is enabled. Full SQL strings may be displayed below but they will not be submitted to Telemetry.
 about-telemetry-fetch-stack-symbols = Fetch function names for stacks
 about-telemetry-hide-stack-symbols = Show raw stack data
 # Selects the correct release version
 # Variables:
@@ -117,20 +116,16 @@ about-telemetry-addon-table-id = Add-on 
 about-telemetry-addon-table-details = Details
 # Variables:
 #   $addonProvider (String): the name of an Add-on Provider (e.g. “XPI”, “Plugin”)
 about-telemetry-addon-provider = { $addonProvider } Provider
 about-telemetry-keys-header = Property
 about-telemetry-names-header = Name
 about-telemetry-values-header = Value
 # Variables:
-#   $stackKey (String): the string key for this stack
-#   $capturedStacksCount (Integer):  the number of times this stack was captured
-about-telemetry-captured-stacks-title = { $stackKey } (capture count: { $capturedStacksCount })
-# Variables:
 #   $lateWriteCount (Integer): the number of the late writes
 about-telemetry-late-writes-title = Late Write #{ $lateWriteCount }
 about-telemetry-stack-title = Stack:
 about-telemetry-memory-map-title = Memory map:
 about-telemetry-error-fetching-symbols = An error occurred while fetching symbols. Check that you are connected to the Internet and try again.
 about-telemetry-time-stamp-header = timestamp
 about-telemetry-category-header = category
 about-telemetry-method-header = method
--- a/toolkit/toolkit/about/aboutWebrtc.ftl
+++ b/toolkit/toolkit/about/aboutWebrtc.ftl
@@ -56,21 +56,16 @@ about-webrtc-ice-state = ICE State
 # "Stats" is an abbreviation for Statistics.
 about-webrtc-ice-stats-heading = ICE Stats
 about-webrtc-ice-restart-count-label = ICE restarts:
 about-webrtc-ice-rollback-count-label = ICE rollbacks:
 about-webrtc-ice-pair-bytes-sent = Bytes sent:
 about-webrtc-ice-pair-bytes-received = Bytes received:
 about-webrtc-ice-component-id = Component ID
 
-## "Avg." is an abbreviation for Average. These are used as data labels.
-
-about-webrtc-avg-bitrate-label = Avg. bitrate:
-about-webrtc-avg-framerate-label = Avg. framerate:
-
 ## These adjectives are used to label a line of statistics collected for a peer
 ## connection. The data represents either the local or remote end of the
 ## connection.
 
 about-webrtc-type-local = Local
 about-webrtc-type-remote = Remote
 
 ##
--- a/toolkit/toolkit/featuregates/features.ftl
+++ b/toolkit/toolkit/featuregates/features.ftl
@@ -11,47 +11,26 @@ experimental-features-css-masonry-descri
 # 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-media-jxl =
     .label = Media: JPEG XL
 experimental-features-media-jxl-description = With this feature enabled, { -brand-short-name } supports the JPEG XL (JXL) format. This is an enhanced image file format that supports lossless transition from traditional JPEG files. See <a data-l10n-name="bugzilla">bug 1539075</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-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.
 
-experimental-features-devtools-color-scheme-simulation =
-    .label = Developer Tools: Color Scheme Simulation
-experimental-features-devtools-color-scheme-simulation-description = Adds an option to simulate different color 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 color 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”.
@@ -79,32 +58,17 @@ experimental-features-devtools-servicewo
 # "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.
 
 # 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.
 
-# Win32k Lockdown
-experimental-features-win32k-lockdown =
-    .label = Win32k Lockdown
-experimental-features-win32k-lockdown-description = Disable use of Win32k APIs in browser tabs. Provides an increase in security but may currently be unstable or glitchy. (Windows only)
-
 # 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 websites 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>.
-
-# Support for having multiple Picture-in-Picture windows open simultaneously
-experimental-features-multi-pip =
-    .label = Multiple Picture-in-Picture Support
-experimental-features-multi-pip-description = Experimental support for allowing multiple Picture-in-Picture windows to be open at the same time.
-
 # Search during IME
 experimental-features-ime-search =
     .label = Address Bar: show results during IME composition
 experimental-features-ime-search-description = An IME (Input Method Editor) is a tool that allows you to enter complex symbols, such as those used in East Asian or Indic written languages, using a standard keyboard. Enabling this experiment will keep the address bar panel open, showing search results and suggestions, while using IME to input text. Note that the IME might display a panel that covers the address bar results, therefore this preference is only suggested for IME not using this type of panel.
--- a/toolkit/toolkit/global/processTypes.ftl
+++ b/toolkit/toolkit/global/processTypes.ftl
@@ -16,20 +16,16 @@ process-type-privilegedabout = Privilege
 # such as accounts.firefox.com
 process-type-privilegedmozilla = Privileged Mozilla Content
 
 process-type-extension = Extension
 
 # process used to open file:// URLs
 process-type-file = Local File
 
-# process used to isolate webpages that requested special
-# permission to allocate large amounts of memory
-process-type-weblargeallocation = Large Allocation
-
 # process used to isolate a webpage from other web pages
 # to improve security
 process-type-webisolated = Isolated Web Content
 
 # process used to isolate a ServiceWorker to improve
 # performance
 process-type-webserviceworker = Isolated Service Worker