No Bug, mozilla-release repo-update blocklist remote-settings - a=repo-update r=RyanVM
authorffxbld <ffxbld@mozilla.com>
Mon, 25 Nov 2019 13:20:11 +0000
changeset 12461 02dbeb5428119533a34f68e57aff42e7950a6e84
parent 12460 0d27cfbf6dbc4920a0a69b43d35fd2aaad48d8d4
child 12462 2312d1fdb669a3460a536511a618aa4715e8f112
push id201
push userflodolo@mozilla.com
push dateWed, 27 Nov 2019 09:22:01 +0000
reviewersrepo-update, RyanVM
No Bug, mozilla-release repo-update blocklist remote-settings - a=repo-update r=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D54468 X-Channel-Repo: mozilla-central X-Channel-Revision: f2ecc55dcad1cd3fc252c98061c7fda0c3008d33 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: a25e8472d4ff130f59792b0ac11a133b0514aca0 X-Channel-Repo: releases/mozilla-release X-Channel-Converted-Revision: c49da39eaf2966633dcec6d5476989e687e2ba32 X-Channel-Repo: releases/mozilla-esr68 X-Channel-Revision: 78764fc644ded50f7e681596608aa754ed90b0cc
browser/browser/aboutLogins.ftl
browser/browser/menubar.ftl
browser/browser/newtab/newtab.ftl
browser/browser/newtab/onboarding.ftl
browser/chrome/browser/accounts.properties
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
devtools/client/debugger.properties
devtools/client/menus.properties
devtools/client/netmonitor.properties
devtools/client/toolbox.dtd
devtools/client/tooltips.ftl
devtools/client/webconsole.properties
toolkit/chrome/passwordmgr/passwordmgr.properties
--- a/browser/browser/aboutLogins.ftl
+++ b/browser/browser/aboutLogins.ftl
@@ -13,22 +13,16 @@ login-app-promo-android =
 login-app-promo-apple =
   .alt = Download on the App Store
 
 login-filter =
   .placeholder = Search Logins
 
 create-login-button = Create New Login
 
-# This string is used as alternative text for favicon images.
-# Variables:
-#   $title (String) - The title of the website associated with the favicon.
-login-favicon =
-  .alt = Favicon for { $title }
-
 fxaccounts-sign-in-text = Get your passwords on your other devices
 fxaccounts-sign-in-button = Sign in to { -sync-brand-short-name }
 fxaccounts-avatar-button =
   .title = Manage account
 
 ## The ⋯ menu that is in the top corner of the page
 
 menu =
@@ -60,20 +54,16 @@ login-list-last-changed-option = Last Mo
 login-list-last-used-option = Last Used
 login-list-intro-title = No logins found
 login-list-intro-description = When you save a password in { -brand-product-name }, it will show up here.
 about-logins-login-list-empty-search-title = No logins found
 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-warning-icon = 
-  .alt = Warning icon
-  .title = Breached website
-
 about-logins-list-item-breach-icon =
   .title = Breached website
 
 ## Introduction screen
 
 login-intro-heading = Looking for your saved logins? Set up { -sync-brand-short-name }.
 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:
@@ -162,18 +152,12 @@ breach-alert-dismiss =
     .title = Close this alert
 
 ## Error Messages
 
 # This is an error message that appears when a user attempts to save
 # a new login that is identical to an existing saved login.
 # Variables:
 #   $loginTitle (String) - The title of the website associated with the login.
-about-logins-error-message-duplicate-login = An entry for { $loginTitle } with that username already exists.
-
-# This is an error message that appears when a user attempts to save
-# a new login that is identical to an existing saved login.
-# Variables:
-#   $loginTitle (String) - The title of the website associated with the login.
 about-logins-error-message-duplicate-login-with-link = An entry for { $loginTitle } with that username already exists. <a data-l10n-name="duplicate-link">Go to existing entry?</a>
 
 # This is a generic error message.
 about-logins-error-message-default = An error occurred while trying to save this password.
--- a/browser/browser/menubar.ftl
+++ b/browser/browser/menubar.ftl
@@ -203,31 +203,25 @@ menu-tools =
     .label = Tools
     .accesskey = T
 menu-tools-downloads =
     .label = Downloads
     .accesskey = D
 menu-tools-addons =
     .label = Add-ons
     .accesskey = A
-menu-tools-sync-sign-in =
-    .label = Sign In To { -sync-brand-short-name }…
-    .accesskey = y
 menu-tools-fxa-sign-in =
     .label = Sign In To { -brand-product-name }…
     .accesskey = g
 menu-tools-turn-on-sync =
     .label = Turn on { -sync-brand-short-name }…
     .accesskey = n
 menu-tools-sync-now =
     .label = Sync Now
     .accesskey = S
-menu-tools-sync-re-auth =
-    .label = Reconnect to { -sync-brand-short-name }…
-    .accesskey = R
 menu-tools-fxa-re-auth =
     .label = Reconnect to { -brand-product-name }…
     .accesskey = R
 menu-tools-web-developer =
     .label = Web Developer
     .accesskey = W
 menu-tools-page-source =
     .label = Page Source
--- a/browser/browser/newtab/newtab.ftl
+++ b/browser/browser/newtab/newtab.ftl
@@ -78,17 +78,16 @@ newtab-menu-open-new-window = Open in a 
 newtab-menu-open-new-private-window = Open in a New Private Window
 newtab-menu-dismiss = Dismiss
 newtab-menu-pin = Pin
 newtab-menu-unpin = Unpin
 newtab-menu-delete-history = Delete from History
 newtab-menu-save-to-pocket = Save to { -pocket-brand-name }
 newtab-menu-delete-pocket = Delete from { -pocket-brand-name }
 newtab-menu-archive-pocket = Archive in { -pocket-brand-name }
-
 newtab-menu-show-privacy-info = Our sponsors & your privacy
 
 ## Message displayed in a modal window to explain privacy and provide context for sponsored content.
 
 newtab-privacy-modal-button-done = Done
 newtab-privacy-modal-header = Your privacy matters.
 newtab-privacy-modal-paragraph =
     In addition to dishing up captivating stories, we also show you relevant,
--- a/browser/browser/newtab/onboarding.ftl
+++ b/browser/browser/newtab/onboarding.ftl
@@ -51,18 +51,16 @@ onboarding-fullpage-welcome-subheader = Let’s start exploring everything you can do.
 onboarding-fullpage-form-email =
     .placeholder = Your email address…
 
 ## Firefox Sync modal dialog strings.
 
 onboarding-sync-welcome-header = Take { -brand-product-name } with You
 onboarding-sync-welcome-content = Get your bookmarks, history, passwords and other settings on all your devices.
 onboarding-sync-welcome-learn-more-link = Learn more about Firefox Accounts
-onboarding-sync-form-invalid-input = Valid email required
-onboarding-sync-legal-notice = By proceeding, you agree to the <a data-l10n-name="terms">Terms of Service</a> and <a data-l10n-name="privacy">Privacy Notice</a>.
 
 onboarding-sync-form-input =
     .placeholder = Email
 
 onboarding-sync-form-continue-button = Continue
 onboarding-sync-form-skip-login-button = Skip this step
 
 ## This is part of the line "Enter your email to continue to Firefox Sync"
--- a/browser/chrome/browser/accounts.properties
+++ b/browser/chrome/browser/accounts.properties
@@ -134,30 +134,21 @@ unnamedTabsArrivingNotificationNoDevice.
 # Should display the URL with an indication that it's benen truncated.
 # %S is the portion of the URL that remains after truncation.
 singleTabArrivingWithTruncatedURL.body = %S…
 
 # LOCALIZATION NOTE (account.title):
 # Used as a default header for the FxA toolbar menu.
 account.title = Account
 
-# LOCALIZATION NOTE (account.manageAccount):
-# Used as the description below user's email in the FxA toolbar menu.
-account.manageAccount = Manage Account
-
 # LOCALIZATION NOTE (account.settings):
 # Used as the description below user's email in the FxA toolbar menu.
 account.settings = Settings
 
 # LOCALIZATION NOTE (account.finishAccountSetup):
 # Used as the FxA toolbar menu item value when user has not
 # finished setting up an account.
 account.finishAccountSetup = Finish Account Setup
 
-# LOCALIZATION NOTE (account.reconnectToSync):
-# Used as the FxA toolbar menu item title when the user
-# needs to reconnect Sync. %S is the Sync brand name.
-account.reconnectToSync = Reconnect to %S
-
 # LOCALIZATION NOTE (account.reconnectToFxA):
 # Used as the FxA toolbar menu item title when the user
 # needs to reconnect their account.
 account.reconnectToFxA = Reconnect to Firefox Account
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -145,37 +145,36 @@ These should match what Safari and other
 <!ENTITY fxa.signin.button.label "Turn on &syncBrand.shortName.label;…">
 
 <!-- LOCALIZATION NOTE (fxa.unverified) Used to define the different labels
      for the Firefox Account toolbar unverified menu screen. -->
 <!ENTITY fxa.unverified.callout.label "Check Your Email">
 <!ENTITY fxa.unverified.description.label "You’ll need to verify your account before you can sync.">
 <!ENTITY fxa.unverified.button.label "Open &syncBrand.shortName.label; Settings…">
 
-<!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
+     for the Firefox Account toolbart menu screen. The `Signed in as` text is
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "Signed in as">
 <!ENTITY fxa.menu.manageAccount.label "Manage Account…">
 <!ENTITY fxa.menu.syncSettings.label "&syncBrand.shortName.label; Settings…">
 
+<!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.syncSettings2.label "&syncBrand.shortName.label; Settings">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Connect Another Device…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
 
 <!ENTITY fxa.menu.signin.label "Sign in to &brandProductName;">
 <!ENTITY fxa.menu.turnOnSync.label "Turn on &syncBrand.shortName.label;">
 <!ENTITY fxa.menu.firefoxServices.label "&brandProductName; Services">
-
 <!ENTITY fxa.menu.account.label "Account">
 <!ENTITY fxa.menu.settings.label "Settings">
 <!ENTITY fxa.menu.accountSettings.label "Account Settings">
 <!ENTITY fxa.menu.signOut.label "Sign Out…">
 <!ENTITY fxa.menu.deviceSettings.label "Device Settings">
 <!ENTITY fxa.menu.setupSync.label "Set Up &syncBrand.shortName.label;…">
 
 <!-- LOCALIZATION NOTE (fxa.service) Used to define the different FxA services
@@ -563,22 +562,16 @@ These should match what Safari and other
 <!ENTITY search.label                 "Search ">
 <!ENTITY searchAfter.label            "">
 
 <!-- LOCALIZATION NOTE (searchWithHeader.label):
      The wording of this string should be as close as possible to
      searchFor.label and searchWith.label. This string will be used instead of
      them when the user has not typed any keyword. -->
 <!ENTITY searchWithHeader.label       "Search with:">
-
-<!-- LOCALIZATION NOTE (searchWithDesc.label):
-     This string prompts the user to use the list of one-click search engines in
-     the Urlbar and searchbar. -->
-<!ENTITY searchWithDesc.label         "This time, search with:">
-
 <!-- LOCALIZATION NOTE (changeSearchSettings.button):
      This string won't wrap, so if the translated string is longer,
      consider translating it as if it said only "Search Settings". -->
 <!ENTITY changeSearchSettings.button  "Change Search Settings">
 <!ENTITY changeSearchSettings.tooltip "Change search settings">
 
 <!ENTITY searchInNewTab.label         "Search in New Tab">
 <!ENTITY searchInNewTab.accesskey     "T">
@@ -935,22 +928,16 @@ you can use these alternative items. Oth
 <!ENTITY protections.blocking2.label "Blocked">
 <!ENTITY protections.notBlocking2.label "Allowed">
 <!ENTITY protections.notFound.label "None Detected">
 <!-- LOCALIZATION NOTE (protections.notBlocking.why.label, protections.notBlocking.why.etp*.tooltip):
      The "Allowed" header also includes a "Why?" link that, when hovered, shows
      a tooltip explaining why these items were not blocked in the page. -->
 <!ENTITY protections.notBlocking.why.label "Why?">
 <!ENTITY protections.notBlocking.why.etpOn.tooltip "Blocking these could break elements of some websites. Without trackers, some buttons, forms, and login fields might not work.">
-<!ENTITY protections.notBlocking.why.etpOff.tooltip "Turning off protections will allow all trackers on this site. It may also improve some website functionality.">
-<!ENTITY protections.socialMediaTrackers.label "Social Media Trackers">
-<!ENTITY protections.crossSiteTrackingCookies.label "Cross-Site Tracking Cookies">
-<!ENTITY protections.trackingContent.label "Tracking Content">
-<!ENTITY protections.fingerprinters.label "Fingerprinters">
-<!ENTITY protections.cryptominers.label "Cryptominers">
 <!ENTITY protections.notBlocking.why.etpOff2.tooltip "All trackers on this site have been loaded because protections are turned off.">
 <!ENTITY protections.noTrackersFound.description "No trackers known to &brandShortName; were detected on this page.">
 
 <!ENTITY protections.crossSiteTrackingCookies.description "These cookies follow you from site to site to gather data about what you do online. They are set by third parties such as advertisers and analytics companies.">
 <!ENTITY protections.cryptominers.description "Cryptominers use your system’s computing power to mine digital money. Cryptomining scripts drain your battery, slow down your computer, and can increase your energy bill.">
 <!ENTITY protections.fingerprinters.description "Fingerprinters collect settings from your browser and computer to create a profile of you. Using this digital fingerprint, they can track you across different websites.">
 <!ENTITY protections.trackingContent2.description "Websites may load external ads, videos, and other content with tracking code. Blocking tracking content can help sites load faster, but some buttons, forms, and login fields might not work.">
 <!ENTITY protections.socialMediaTrackers.description "Social networks place trackers on other websites to follow what you do, see, and watch online. This allows social media companies to learn more about you beyond what you share on your social media profiles.">
@@ -963,17 +950,16 @@ you can use these alternative items. Oth
 <!ENTITY syncTabsMenu3.label     "Synced Tabs">
 
 <!ENTITY syncedTabs.sidebar.label              "Synced Tabs">
 
 <!ENTITY syncBrand.shortName.label    "Sync">
 
 <!ENTITY syncSignIn.label             "Sign In To &syncBrand.shortName.label;…">
 <!ENTITY syncSignIn.accesskey         "Y">
-
 <!ENTITY syncSyncNowItem.label        "Sync Now">
 <!ENTITY syncSyncNowItemSyncing.label "Syncing…">
 <!ENTITY syncSyncNowItem.accesskey    "S">
 <!ENTITY syncReAuthItem.label         "Reconnect to &syncBrand.shortName.label;…">
 <!ENTITY syncReAuthItem.accesskey     "R">
 <!ENTITY syncToolbarButton.label      "Sync">
 
 <!ENTITY customizeMode.autoHideDownloadsButton.label "Auto-hide">
@@ -1002,18 +988,16 @@ you can use these alternative items. Oth
 
 <!ENTITY contentBlocking.trackingProtection4.label "Tracking Content">
 
 <!ENTITY contentBlocking.manageSettings2.label "Manage Protection Settings">
 <!ENTITY contentBlocking.manageSettings2.accesskey "M">
 
 <!ENTITY contentBlocking.socialblock.label "Social Media Trackers">
 
-<!ENTITY contentBlocking.cookies2.label "Cross-Site Tracking Cookies">
-
 <!ENTITY contentBlocking.cryptominers.label "Cryptominers">
 <!ENTITY contentBlocking.cryptominersView.label "Cryptominers">
 
 <!ENTITY contentBlocking.fingerprinters.label "Fingerprinters">
 <!ENTITY contentBlocking.fingerprintersView.label "Fingerprinters">
 
 <!ENTITY contentBlocking.openBreakageReportView2.label "Report a problem">
 <!ENTITY contentBlocking.breakageReportView.label "Report Problems">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -289,24 +289,24 @@ popupBlock=Block pop-ups for %S
 popupWarningDontShowFromMessage=Don’t show this message when pop-ups are blocked
 popupShowPopupPrefix=Show ‘%S’
 
 # LOCALIZATION NOTE (popupShowBlockedPopupsIndicatorText): Semicolon separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of pop-ups blocked.
 popupShowBlockedPopupsIndicatorText=Show #1 blocked pop-up…;Show #1 blocked pop-ups…
 
-# LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
-geolocationLastAccessIndicatorText=Last access %S
-
 # Bad Content Blocker Doorhanger Notification
 # %S is brandShortName
 badContentBlocked.blocked.message=%S is blocking content on this page.
 badContentBlocked.notblocked.message=%S is not blocking any content on this page.
 
+# LOCALIZATION NOTE (geolocationLastAccessIndicatorText): %S is the relative time of the most recent geolocation access (e.g. 5 min. ago)
+geolocationLastAccessIndicatorText=Last access %S
+
 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…
 
 # Keyword fixup messages
@@ -541,19 +541,16 @@ contentBlocking.trackers.allowed.label=A
 #   tense expresses that we are waiting for trackers to load
 #   and will block them as appropriate. This concept may not directly
 #   translate to your language, but it is still preferable if the translation
 #   would not make it seem like the blocking had already happened.
 #   So in full context this word could be part of the sentence:
 #   "[Firefox is] Blocking [trackers when they get loaded.]"
 contentBlocking.trackers.blocking.label=Blocking
 
-protectionReport.title=Privacy Protections
-protectionReport.tooltip=Go to your privacy report
-
 # LOCALIZATION NOTE (contentBlocking.trackersView.blocked.label):
 #   This label is shown next to a tracker in the trackers subview.
 #   It forms the end of the (imaginary) sentence "www.example.com [was] Blocked"
 contentBlocking.trackersView.blocked.label=Blocked
 
 contentBlocking.trackersView.empty.label=None detected on this site
 
 # LOCALIZATION NOTE (contentBlocking.cookies.allowed.label):
@@ -667,26 +664,16 @@ contentBlocking.intro.v1.description=Whe
 contentBlocking.intro.v2.description=The privacy benefits of Tracking Protection are now just one part of content blocking. When you see the shield, content blocking is on.
 # LOCALIZATION NOTE (trackingProtection.intro.step1of3): Indicates that the intro panel is step one of three in a tour.
 trackingProtection.intro.step1of3=1 of 3
 trackingProtection.intro.nextButton.label=Next
 
 trackingProtection.icon.activeTooltip=Tracking attempts blocked
 trackingProtection.icon.disabledTooltip=Tracking content detected
 
-# Social Tracking Protection
-# LOCALIZATION NOTE (contentBlocking.socialblock.title): %S is brandShortName
-contentBlocking.socialblock.title=%S stopped a social network from tracking you here
-# LOCALIZATION NOTE (contentBlocking.socialblock.prompt): %S is brandShortName
-contentBlocking.socialblock.prompt=Your privacy matters. %S now blocks common social media trackers, limiting how much data they can collect about what you do online.
-contentBlocking.socialblock.primaryButton.label=See Protections
-contentBlocking.socialblock.primaryButton.accesskey=P
-contentBlocking.socialblock.secondaryButton.label=Close
-contentBlocking.socialblock.secondaryButton.accessKey=C
-
 trackingProtection.icon.activeTooltip2=Blocking social media trackers, cross-site tracking cookies, and fingerprinters.
 trackingProtection.icon.disabledTooltip2=Enhanced Tracking Protection is OFF for this site.
 # LOCALIZATION NOTE (trackingProtection.icon.noTrackersDetectedTooltip): %S is brandShortName.
 trackingProtection.icon.noTrackersDetectedTooltip=No trackers known to %S were detected on this page.
 
 # LOCALIZATION NOTE (protections.header):
 # Header of the Protections Panel. %S is replaced with the site's hostname.
 protections.header=Protections for %S
--- a/devtools/client/debugger.properties
+++ b/devtools/client/debugger.properties
@@ -213,20 +213,16 @@ otherEvents=Other
 # the user hovers over the checkbox used to toggle blackboxing its associated
 # source.
 blackboxCheckboxTooltip2=Toggle blackboxing
 
 # LOCALIZATION NOTE (eventListenersHeader1): The text to display in the events
 # header.
 eventListenersHeader1=Event Listener Breakpoints
 
-# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
-# DOM Mutation Breakpoints pane when there are no events.
-noDomMutationBreakpointsText=No breakpoints to display.
-
 # LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
 # display in the DOM Mutation Breakpoints pane when there are no events.
 # %S will be replaced by an active link using inspectorTool as text
 noDomMutationBreakpoints=Right click an element in the %S and select “Break on…” to add a breakpoint
 
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
 inspectorTool=Inspector
 
--- a/devtools/client/menus.properties
+++ b/devtools/client/menus.properties
@@ -39,24 +39,24 @@ browserToolboxMenu.label = Browser Toolb
 browserToolboxMenu.accesskey = e
 
 # LOCALIZATION NOTE (browserContentToolboxMenu.label): This is the label for the
 # application menu item that opens the browser content toolbox UI in the Tools menu.
 # This toolbox allows to debug the chrome of the content process in multiprocess builds.
 browserContentToolboxMenu.label = Browser Content Toolbox
 browserContentToolboxMenu.accesskey = x
 
+webide.label = WebIDE
+webide.accesskey = W
+
 # LOCALIZATION NOTE (toggleProfilerButtonMenu.label): This is the label for the
 # application menu item that toggles the profiler button to record performance profiles.
 toggleProfilerButtonMenu.label = Enable Profiler Toolbar Icon
 toggleProfilerButtonMenu.accesskey = P
 
-webide.label = WebIDE
-webide.accesskey = W
-
 devtoolsWebReplay.label = Web Replay
 devtoolsRecordNewTab.label = Open New Recording Tab
 devtoolsReloadAndRecordTab.label = Reload and Record Tab
 devtoolsSaveRecording.label = Save Recording
 devtoolsReplayNewTab.label = Load Recording in New Tab
 
 devToolboxMenuItem.label = Toggle Tools
 devToolboxMenuItem.accesskey = T
--- a/devtools/client/netmonitor.properties
+++ b/devtools/client/netmonitor.properties
@@ -260,17 +260,17 @@ networkMenu.sizeUnavailable.title=Transf
 # cached.
 networkMenu.sizeCached=cached
 
 # LOCALIZATION NOTE (networkMenu.sizeServiceWorker): This is the label displayed
 # in the network menu specifying the transferred of a request computed
 # by a service worker.
 networkMenu.sizeServiceWorker=service worker
 
-# LOCALIZATION NOTE (networkMenu.blockedBy): This is the label displayed
+# LOCALIZATION NOTE (networkMenu.sizeServiceWorker): This is the label displayed
 # in the network menu specifying the request was blocked by something.
 # %S is replaced by the blocked reason, which could be "DevTools", "CORS", etc.
 networkMenu.blockedBy=blocked by %S
 
 # LOCALIZATION NOTE (networkMenu.blocked): This is a generic message for a
 # URL that has been blocked for an unknown reason
 networkMenu.blocked=blocked
 
@@ -771,24 +771,16 @@ netmonitor.search.toolbar.inputPlaceholder=Find in resources…
 # LOCALIZATION NOTE (netmonitor.search.toolbar.close): This is the label
 # displayed in the search toolbar to close the search panel.
 netmonitor.search.toolbar.close=Close Search Panel
 
 # LOCALIZATION NOTE (netmonitor.search.toolbar.clear): This is the label
 # displayed in the search toolbar to clear the search panel.
 netmonitor.search.toolbar.clear=Clear Search Results
 
-# LOCALIZATION NOTE (netmonitor.search.labels.responseHeaders): This is the label
-# displayed in the search results as the label for the response headers
-netmonitor.search.labels.responseHeaders=Response Header
-
-# LOCALIZATION NOTE (netmonitor.search.labels.requestHeaders): This is the label
-# displayed in the search results as the label for the request headers
-netmonitor.search.labels.requestHeaders=Request Header
-
 # LOCALIZATION NOTE (netmonitor.search.toolbar.caseSensitive): This is the label
 # displayed in the search toolbar to do a case sensitive search.
 netmonitor.search.toolbar.caseSensitive=Case Sensitive
 
 # LOCALIZATION NOTE (netmonitor.search.status.labels.fetching): This is the label
 # displayed in the search results status bar when status is set to fetching.
 netmonitor.search.status.labels.fetching=Searching…
 
@@ -979,24 +971,24 @@ netmonitor.toolbar.disableCache.tooltip=
 # LOCALIZATION NOTE (netmonitor.toolbar.clear): This is the label displayed
 # in the network toolbar for the "Clear" button.
 netmonitor.toolbar.clear=Clear
 
 # LOCALIZATION NOTE (netmonitor.toolbar.toggleRecording): This is the label displayed
 # in the network toolbar for the toggle recording button.
 netmonitor.toolbar.toggleRecording=Pause/Resume recording network log
 
+# LOCALIZATION NOTE (netmonitor.toolbar.perf): This is the label displayed
+# in the network toolbar for the performance analysis button.
+netmonitor.toolbar.perf=Toggle performance analysis…
+
 # LOCALIZATION NOTE (netmonitor.toolbar.search): This is the tooltip label displayed
 # in the network toolbar for the search  button.
 netmonitor.toolbar.search=Search
 
-# LOCALIZATION NOTE (netmonitor.toolbar.perf): This is the label displayed
-# in the network toolbar for the performance analysis button.
-netmonitor.toolbar.perf=Toggle performance analysis…
-
 # LOCALIZATION NOTE (netmonitor.toolbar.resetColumns): This is the label
 # displayed in the network table header context menu.
 netmonitor.toolbar.resetColumns=Reset Columns
 
 # LOCALIZATION NOTE (netmonitor.toolbar.resetSorting): This is the label
 # displayed in the network table header context menu to reset sorting
 netmonitor.toolbar.resetSorting=Reset Sorting
 
--- a/devtools/client/toolbox.dtd
+++ b/devtools/client/toolbox.dtd
@@ -131,21 +131,16 @@
   -  heading of the group of Web Console preferences in the options panel. -->
 <!ENTITY options.webconsole.label            "Web Console">
 
 <!-- LOCALIZATION NOTE (options.timestampMessages.label): This is the
    - label for the checkbox that toggles timestamps in the Web Console -->
 <!ENTITY options.timestampMessages.label      "Enable timestamps">
 <!ENTITY options.timestampMessages.tooltip    "If you enable this option commands and output in the Web Console will display a timestamp">
 
-<!-- LOCALIZATION NOTE (options.warningGroups.label): This is the
-   - label for the checkbox that toggles the warningGroups feature in the Web Console -->
-<!ENTITY options.warningGroups.label      "Group similar messages">
-<!ENTITY options.warningGroups.tooltip    "When enabled, similar messages are placed into groups">
-
 <!-- LOCALIZATION NOTE (options.debugger.label): This is the label for the
   -  heading of the group of Debugger preferences in the options panel. -->
 <!ENTITY options.debugger.label            "Debugger">
 
 <!-- LOCALIZATION NOTE (options.sourceMaps.label): This is the
    - label for the checkbox that toggles source maps in all tools -->
 <!ENTITY options.sourceMaps.label      "Enable Source Maps">
 <!ENTITY options.sourceMaps.tooltip1   "If you enable this option sources will be mapped in the tools.">
--- a/devtools/client/tooltips.ftl
+++ b/devtools/client/tooltips.ftl
@@ -42,22 +42,22 @@ inactive-css-not-display-block-on-floate
 inactive-css-property-is-impossible-to-override-in-visited = It’s impossible to override <strong>{ $property }</strong> due to <strong>:visited</strong> restriction.
 
 ## 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 = 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-item-fix =Try adding <strong>display:grid</strong> or <strong>display:inline-grid</strong> to the item’s parent. { 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-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 = Try adding <strong>display:flex</strong> or <strong>display:inline-flex</strong> to the item’s parent. { learn-more }
 
--- a/devtools/client/webconsole.properties
+++ b/devtools/client/webconsole.properties
@@ -304,41 +304,41 @@ webconsole.requestsFilterButton.label=Re
 # LOCALIZATION NOTE (webconsole.filteredMessages.label)
 # Text of the "filtered messages" bar, shown when console messages are hidden
 # because the user has set non-default filters in the filter bar.
 # This is a semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # example: 345 items hidden by filters.
 webconsole.filteredMessages.label=#1 item hidden by filters;#1 items hidden by filters
 
+# Label used as the text of the "Reset filters" button in the "filtered messages" bar.
+# It resets the default filters of the console to their original values.
+webconsole.resetFiltersButton.label=Reset filters
+
+# LOCALIZATION NOTE (webconsole.enablePersistentLogs.label)
+webconsole.enablePersistentLogs.label=Persist Logs
+# LOCALIZATION NOTE (webconsole.enablePersistentLogs.tooltip)
+webconsole.enablePersistentLogs.tooltip=If you enable this option the output will not be cleared each time you navigate to a new page
+
 # LOCALIZATION NOTE (webconsole.filteredMessagesByText.label)
 # Text on the filter input displayed when some console messages are hidden because the
 # user has filled in the input.
 # This is a semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # example: 345 hidden.
 webconsole.filteredMessagesByText.label=#1 hidden;#1 hidden
 
 # LOCALIZATION NOTE (webconsole.filteredMessagesByText.tooltip)
 # Tooltip on the filter input "hidden" text, displayed when some console messages are
 # hidden because the user has filled in the input.
 # This is a semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # example: 345 items hidden by text filter.
 webconsole.filteredMessagesByText.tooltip=#1 item hidden by text filter;#1 items hidden by text filter
 
-# Label used as the text of the "Reset filters" button in the "filtered messages" bar.
-# It resets the default filters of the console to their original values.
-webconsole.resetFiltersButton.label=Reset filters
-
-# LOCALIZATION NOTE (webconsole.enablePersistentLogs.label)
-webconsole.enablePersistentLogs.label=Persist Logs
-# LOCALIZATION NOTE (webconsole.enablePersistentLogs.tooltip)
-webconsole.enablePersistentLogs.tooltip=If you enable this option the output will not be cleared each time you navigate to a new page
-
 # LOCALIZATION NOTE (webconsole.console.settings.menu.menuButton.tooltip)
 # Tooltip for the filter bar preferences menu. This menu will display multiple perefences for the
 # filter bar, such as enabling the compact toolbar mode, enable the timestamps, persist logs, etc
 webconsole.console.settings.menu.button.tooltip=Console Settings
 
 # LOCALIZATION NOTE (webconsole.console.settings.menu.item.compactToolbar.label)
 # Label for the `Compact Toolbar` preference option. This will turn the message filters buttons
 # into a Menu Button, making the filter bar more compact.
--- a/toolkit/chrome/passwordmgr/passwordmgr.properties
+++ b/toolkit/chrome/passwordmgr/passwordmgr.properties
@@ -56,17 +56,16 @@ useASecurelyGeneratedPassword=Use a Secu
 generatedPasswordWillBeSaved=%S will save this password for this website.
 # LOCALIZATION NOTE (loginHostAge):
 # This is used to show the context menu login items with their age.
 # 1st string is the username for the login, 2nd is the login's age.
 loginHostAge=%1$S (%2$S)
 # LOCALIZATION NOTE (noUsername):
 # String is used on the context menu when a login doesn't have a username.
 noUsername=No username
-
 duplicateLoginTitle=Login already exists
 duplicateLogin=A duplicate login already exists.
 
 # LOCALIZATION NOTE (displaySameOrigin):
 # String is used on the autocomplete row when the login origin is a domain match with the document origin
 displaySameOrigin=From this website
 
 # LOCALIZATION NOTE (insecureFieldWarningDescription2):