Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
authorffxbld <release@mozilla.com>
Mon, 15 Oct 2018 03:18:52 -0700
changeset 10579 7c91e1179efb7d6ae0ad543b48780f36c07f4f0e
parent 10578 6056bde07e123c506cddc563414bb64437ad4518
child 10580 60f451acbe03ff90c788b86b6d7f74c1522b008b
push id91
push userfrancesco.lodolo@mozillaitalia.org
push dateTue, 16 Oct 2018 11:59:59 +0000
reviewersrelease
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release X-Channel-Repo: mozilla-central X-Channel-Revision: aa4cdd603e44a5035074927038fa37bc44c68525 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: 66ab8622488cd2df04e61f686698e21124b34a43 X-Channel-Repo: releases/mozilla-release X-Channel-Converted-Revision: 18d4c09e9378f1fca26c074a10195589248c88c0
browser/browser/preferences/languages.ftl
browser/browser/preferences/permissions.ftl
browser/browser/preferences/preferences.ftl
browser/chrome/browser-region/region.properties
browser/chrome/browser/activity-stream/newtab.properties
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/downloads/downloads.properties
browser/chrome/browser/places/editBookmarkOverlay.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/quitDialog.properties
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/tabbrowser.properties
browser/chrome/overrides/netError.dtd
browser/extensions/formautofill/formautofill.properties
devtools/client/font-inspector.properties
devtools/client/inspector.properties
devtools/client/layout.properties
devtools/client/netmonitor.properties
devtools/client/network-throttling.properties
devtools/client/responsive.properties
devtools/client/webconsole.properties
devtools/shared/csscoverage.dtd
mobile/android/base/android_strings.dtd
mobile/chrome/region.properties
netwerk/necko.properties
security/manager/chrome/pipnss/pipnss.properties
toolkit/chrome/global/viewSource.properties
toolkit/chrome/mozapps/downloads/downloads.properties
toolkit/crashreporter/crashes.dtd
toolkit/crashreporter/crashes.properties
--- a/browser/browser/preferences/languages.ftl
+++ b/browser/browser/preferences/languages.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/.
 
-languages-window =
-    .title = Languages
-    .style = width: 30em
-
 webpage-languages-window =
     .title = Webpage Language Settings
     .style = width: 40em
 
 languages-close-key =
     .key = w
 
 languages-description = Web pages are sometimes offered in more than one language. Choose languages for displaying these web pages, in order of preference
--- a/browser/browser/preferences/permissions.ftl
+++ b/browser/browser/preferences/permissions.ftl
@@ -93,21 +93,16 @@ permissions-exceptions-saved-logins-desc
 
 permissions-exceptions-addons-window =
     .title = Allowed Websites - Add-ons Installation
     .style = { permissions-window.style }
 permissions-exceptions-addons-desc = You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
 
 ## Exceptions - Autoplay Media
 
-permissions-exceptions-autoplay-media-window =
-    .title = Allowed Websites - Autoplay
-    .style = { permissions-window.style }
-permissions-exceptions-autoplay-media-desc = You can specify which websites are allowed to automatically play media elements. Type the exact address of the site you want to allow and then click Allow.
-
 permissions-exceptions-autoplay-media-window2 =
     .title = Exceptions - Autoplay
     .style = { permissions-window.style }
 permissions-exceptions-autoplay-media-desc2 = You can specify which websites are always or never allowed to autoplay media with sound. Type the address of the site you want to manage and then click Block or Allow.
 
 ## Site Permissions - Notifications
 
 permissions-site-notification-window =
--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -411,18 +411,16 @@ browsing-use-cursor-navigation =
     .accesskey = k
 
 browsing-search-on-start-typing =
     .label = Search for text when you start typing
     .accesskey = x
 
 ## General Section - Proxy
 
-network-proxy-title = Network Proxy
-
 network-settings-title = Network Settings
 
 network-proxy-connection-description = Configure how { -brand-short-name } connects to the internet.
 
 network-proxy-connection-learn-more = Learn More
 
 network-proxy-connection-settings =
     .label = Settings…
@@ -743,42 +741,24 @@ sitedata-total-size-calculating = Calculating site data and cache size…
 
 # Variables:
 #   $value (Number) - Value of the unit (for example: 4.6, 500)
 #   $unit (String) - Name of the unit (for example: "bytes", "KB")
 sitedata-total-size = Your stored cookies, site data and cache are currently using { $value } { $unit } of disk space.
 
 sitedata-learn-more = Learn more
 
-sitedata-accept-cookies-option =
-    .label = Accept cookies and site data from websites (recommended)
-    .accesskey = A
-
-sitedata-block-cookies-option =
-    .label = Block cookies and site data (may cause websites to break)
-    .accesskey = B
-
 sitedata-keep-until = Keep until
     .accesskey = u
 
 sitedata-keep-until-expire =
     .label = They expire
 sitedata-keep-until-closed =
     .label = { -brand-short-name } is closed
 
-sitedata-accept-third-party-desc = Accept third-party cookies and site data
-    .accesskey = y
-
-sitedata-accept-third-party-always-option =
-    .label = Always
-sitedata-accept-third-party-visited-option =
-    .label = From visited
-sitedata-accept-third-party-never-option =
-    .label = Never
-
 sitedata-allow-cookies-option =
     .label = Accept cookies and site data
     .accesskey = A
 
 sitedata-disallow-cookies-option =
     .label = Block cookies and site data
     .accesskey = B
 
@@ -913,21 +893,16 @@ tracking-mode-always =
     .accesskey = y
 tracking-mode-private =
     .label = Only in private windows
     .accesskey = l
 tracking-mode-never =
     .label = Never
     .accesskey = N
 
-# This string is displayed if privacy.trackingprotection.ui.enabled is set to false.
-# This currently happens on the release and beta channel.
-tracking-pbm-label = Use Tracking Protection in Private Browsing to block known trackers
-    .accesskey = v
-
 tracking-exceptions =
     .label = Exceptions…
     .accesskey = x
 
 tracking-change-block-list =
     .label = Change Block List…
     .accesskey = C
 
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -1,17 +1,12 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# This 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
-
 # 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 webcal:
--- a/browser/chrome/browser/activity-stream/newtab.properties
+++ b/browser/chrome/browser/activity-stream/newtab.properties
@@ -138,17 +138,16 @@ topsites_form_url_validation=Valid URL r
 topsites_form_image_validation=Image failed to load. Try a different URL.
 
 # LOCALIZATION NOTE (pocket_read_more): This is shown at the bottom of the
 # trending stories section and precedes a list of links to popular topics.
 pocket_read_more=Popular Topics:
 # LOCALIZATION NOTE (pocket_read_even_more): This is shown as a link at the
 # end of the list of popular topic links.
 pocket_read_even_more=View More Stories
-
 pocket_more_reccommendations=More Recommendations
 pocket_learn_more=Learn More
 pocket_how_it_works=How it works
 pocket_cta_button=Get Pocket
 pocket_cta_text=Save the stories you love in Pocket, and fuel your mind with fascinating reads.
 
 highlights_empty_state=Start browsing, and we’ll show some of the great articles, videos, and other pages you’ve recently visited or bookmarked here.
 # LOCALIZATION NOTE (topstories_empty_state): When there are no recommendations,
@@ -192,17 +191,16 @@ firstrun_learn_more_link=Learn more abou
 
 # LOCALIZATION NOTE (firstrun_form_header and firstrun_form_sub_header):
 # firstrun_form_sub_header is a continuation of firstrun_form_header, they are one sentence.
 # firstrun_form_header is displayed more boldly as the call to action.
 firstrun_form_header=Enter your email
 firstrun_form_sub_header=to continue to Firefox Sync
 
 firstrun_email_input_placeholder=Email
-
 firstrun_invalid_input=Valid email required
 
 # LOCALIZATION NOTE (firstrun_extra_legal_links): {terms} is equal to firstrun_terms_of_service, and
 # {privacy} is equal to firstrun_privacy_notice. {terms} and {privacy} are clickable links.
 firstrun_extra_legal_links=By proceeding, you agree to the {terms} and {privacy}.
 firstrun_terms_of_service=Terms of Service
 firstrun_privacy_notice=Privacy Notice
 
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -610,19 +610,16 @@ These should match what Safari and other
 <!ENTITY openLinkCmdInContainerTab.label "Open Link in New Container Tab">
 <!ENTITY openLinkCmdInContainerTab.accesskey "b">
 <!ENTITY showOnlyThisFrameCmd.label     "Show Only This Frame">
 <!ENTITY showOnlyThisFrameCmd.accesskey "S">
 <!ENTITY reloadCmd.commandkey         "r">
 <!ENTITY reloadFrameCmd.label         "Reload Frame">
 <!ENTITY reloadFrameCmd.accesskey     "R">
 <!ENTITY viewPartialSourceForSelectionCmd.label "View Selection Source">
-<!ENTITY viewPartialSourceForMathMLCmd.label    "View MathML Source">
-<!-- LOCALIZATION NOTE (viewPartialSourceCmd.accesskey): This accesskey is used for both
-         viewPartialSourceForSelectionCmd.label and viewPartialSourceForMathMLCmd.label -->
 <!ENTITY viewPartialSourceCmd.accesskey "e">
 <!ENTITY viewPageSourceCmd.label      "View Page Source">
 <!ENTITY viewPageSourceCmd.accesskey  "V">
 <!ENTITY viewFrameSourceCmd.label     "View Frame Source">
 <!ENTITY viewFrameSourceCmd.accesskey "V">
 <!ENTITY viewPageInfoCmd.label        "View Page Info">
 <!ENTITY viewPageInfoCmd.accesskey    "I">
 <!ENTITY viewFrameInfoCmd.label       "View Frame Info">
@@ -829,17 +826,16 @@ you can use these alternative items. Oth
 <!ENTITY spellAddDictionaries.label "Add Dictionaries…">
 <!ENTITY spellAddDictionaries.accesskey "A">
 
 <!-- LOCALIZATION NOTE (editBookmark.panel.width): width of the bookmark panel.
      Should be large enough to fully display the Done and Cancel/
      Remove Bookmark buttons. -->
 <!ENTITY editBookmark.panel.width                    "23em">
 <!ENTITY editBookmark.done.label                     "Done">
-
 <!ENTITY editBookmark.showForNewBookmarks.label       "Show editor when saving">
 <!ENTITY editBookmark.showForNewBookmarks.accesskey   "S">
 
 <!-- LOCALIZATION NOTE (identity.securityView.label)
      This is the header of the security subview in the Site Identity panel. -->
 <!ENTITY identity.securityView.label "Site Security">
 
 <!ENTITY identity.connection "Connection">
@@ -980,19 +976,16 @@ you can use these alternative items. Oth
 
 <!ENTITY getUserMedia.selectCamera.label "Camera to share:">
 <!ENTITY getUserMedia.selectCamera.accesskey "C">
 <!ENTITY getUserMedia.selectMicrophone.label "Microphone to share:">
 <!ENTITY getUserMedia.selectMicrophone.accesskey "M">
 <!ENTITY getUserMedia.audioCapture.label "Audio from the tab will be shared.">
 <!ENTITY getUserMedia.allWindowsShared.message "All visible windows on your screen will be shared.">
 
-<!ENTITY trackingProtection.on "Tracking Protection: ON">
-<!ENTITY trackingProtection.off "Tracking Protection: OFF">
-
 <!ENTITY contentBlocking.title "Content Blocking">
 <!ENTITY contentBlocking.detected "Blockable content detected on this site.">
 <!ENTITY contentBlocking.notDetected "No blockable content detected on this page.">
 <!ENTITY contentBlocking.disabled.label "Disabled">
 <!ENTITY contentBlocking.disabled.tooltip "You have disabled Content Blocking.">
 <!ENTITY contentBlocking.exception.tooltip "You have disabled Content Blocking for this site.">
 
 <!ENTITY contentBlocking.fastBlock.label "Slow-Loading Trackers">
@@ -1041,38 +1034,25 @@ you can use these alternative items. Oth
 <!ENTITY contentBlocking.breakageReportView.learnMore "Learn More">
 <!ENTITY contentBlocking.breakageReportView.collection.url.label "URL">
 <!ENTITY contentBlocking.breakageReportView.collection.comments.label "What problems did you have? (Optional)">
 <!ENTITY contentBlocking.breakageReportView.sendReport.label "Send Report">
 <!ENTITY contentBlocking.breakageReportView.cancel.label "Cancel">
 
 <!ENTITY trackingProtection.title "Tracking Protection">
 <!ENTITY trackingProtection.tooltip "Open Tracking Protection Preferences">
-<!ENTITY trackingProtection.detectedBlocked4 "&brandShortName; is blocking parts of this page that may track your browsing.">
-<!ENTITY trackingProtection.detectedNotBlocked5 "&brandShortName; has detected elements that may track your browsing.">
-<!ENTITY trackingProtection.detectedException "&brandShortName; has detected elements that may track your browsing. You have disabled protection for this site.">
-<!ENTITY trackingProtection.notDetected5 "No tracking elements detected on this page.">
-<!ENTITY trackingProtection.notDetectedException "No tracking elements detected on this page. You have disabled protection for this site.">
-
-<!ENTITY trackingProtection.reloadRequired2 "You have enabled Tracking Protection. Reload this page to block all trackers.">
 
 <!-- LOCALIZATION NOTE (trackingProtection.unblock3.label, trackingProtection.unblock3.accesskey):
      The associated button with this label and accesskey is only shown when opening the control
      center while looking at a site with trackers in NON-private browsing mode. -->
-<!ENTITY trackingProtection.unblock3.label "Disable For This Site">
-<!ENTITY trackingProtection.unblock3.accesskey "D">
 <!ENTITY trackingProtection.unblock4.label "Disable Blocking For This Site">
 <!ENTITY trackingProtection.unblock4.accesskey "D">
 <!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate3.label, trackingProtection.unblockPrivate3.accesskey):
      The associated button with this label and accesskey is only shown when opening the control
      center while looking at a site with trackers in PRIVATE browsing mode. -->
-<!ENTITY trackingProtection.unblockPrivate3.label "Disable For This Session">
-<!ENTITY trackingProtection.unblockPrivate3.accesskey "D">
-<!ENTITY trackingProtection.block4.label "Enable For This Site">
-<!ENTITY trackingProtection.block4.accesskey "E">
 <!ENTITY trackingProtection.unblockPrivate4.label "Disable Blocking Temporarily">
 <!ENTITY trackingProtection.unblockPrivate4.accesskey "D">
 <!ENTITY trackingProtection.block5.label "Enable Blocking For This Site">
 <!ENTITY trackingProtection.block5.accesskey "E">
 <!ENTITY trackingProtection.reload2.label "Reload Page">
 <!ENTITY trackingProtection.reload2.accesskey "R">
 
 <!ENTITY pluginNotification.showAll.label "Show All">
@@ -1172,17 +1152,16 @@ you can use these alternative items. Oth
 <!ENTITY pageAction.disallowInUrlbar.label "Don’t Show in Address Bar">
 <!ENTITY pageAction.manageExtension.label "Manage Extension…">
 
 <!ENTITY pageAction.sendTabToDevice.label "Send Tab to Device">
 
 <!ENTITY sendToDevice.syncNotReady.label "Syncing Devices…">
 
 <!ENTITY pageAction.shareUrl.label "Share">
-
 <!ENTITY pageAction.shareMore.label "More…">
 
 <!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. -->
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -990,19 +990,16 @@ midi.DontAllow.accesskey = N
 midi.remember=Remember this decision
 midi.shareWithFile.message = Will you allow this local file to access your MIDI Devices?
 # LOCALIZATION NOTE (midi.shareWithSite.message): %S is the name of the site URL (https://...) requesting MIDI access
 midi.shareWithSite.message = Will you allow %S to access your MIDI Devices?
 midi.shareSysexWithFile.message = Will you allow this local file to access your MIDI devices and send/receive SysEx messages?
 # LOCALIZATION NOTE (midi.shareSysexWithSite.message): %S is the name of the site URL (https://...) requesting MIDI access
 midi.shareSysexWithSite.message = Will you allow %S to access your MIDI devices and send/receive SysEx messages?
 
-autoplay.Allow.label = Allow Autoplay
-autoplay.Allow.accesskey = A
-
 autoplay.Allow2.label = Allow
 autoplay.Allow2.accesskey = A
 autoplay.DontAllow.label = Don’t Allow
 autoplay.DontAllow.accesskey = n
 autoplay.remember = Remember this decision
 autoplay.remember-private = Remember for this session
 # LOCALIZATION NOTE (autoplay.message): %S is the name of the site URL (https://...) trying to autoplay media
 autoplay.message = Will you allow %S to autoplay media with sound?
--- a/browser/chrome/browser/downloads/downloads.properties
+++ b/browser/chrome/browser/downloads/downloads.properties
@@ -85,20 +85,16 @@ sizeUnknown=Unknown size
 # 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
 
-fileExecutableSecurityWarning=“%S” is an executable file. Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch “%S”?
-fileExecutableSecurityWarningTitle=Open Executable File?
-fileExecutableSecurityWarningDontAsk=Don’t ask me this again
-
 # 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):
--- a/browser/chrome/browser/places/editBookmarkOverlay.dtd
+++ b/browser/chrome/browser/places/editBookmarkOverlay.dtd
@@ -14,13 +14,11 @@
 <!ENTITY editBookmarkOverlay.foldersExpanderDown.tooltip     "Show all the bookmarks folders">
 <!ENTITY editBookmarkOverlay.expanderUp.tooltip              "Hide">
 <!ENTITY editBookmarkOverlay.tags.label                      "Tags:">
 <!ENTITY editBookmarkOverlay.tags.accesskey                  "T">
 <!ENTITY editBookmarkOverlay.tagsEmptyDesc.label             "Separate tags with commas">
 <!ENTITY editBookmarkOverlay.keyword.label                   "Keyword:">
 <!ENTITY editBookmarkOverlay.keyword.accesskey               "K">
 <!ENTITY editBookmarkOverlay.tagsExpanderDown.tooltip        "Show all tags">
-<!ENTITY editBookmarkOverlay.loadInSidebar.label             "Load this bookmark in the sidebar">
-<!ENTITY editBookmarkOverlay.loadInSidebar.accesskey         "h">
 <!ENTITY editBookmarkOverlay.choose.label                    "Choose…">
 <!ENTITY editBookmarkOverlay.newFolderButton.label           "New Folder">
 <!ENTITY editBookmarkOverlay.newFolderButton.accesskey       "o">
--- a/browser/chrome/browser/places/places.dtd
+++ b/browser/chrome/browser/places/places.dtd
@@ -89,21 +89,16 @@
 <!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.more.label "More">
-<!ENTITY detailsPane.more.accesskey "e">
-<!ENTITY detailsPane.less.label "Less">
-<!ENTITY detailsPane.less.accesskey "e">
-
 <!ENTITY detailsPane.selectAnItemText.description "Select an item to view and edit its properties">
 
 <!ENTITY view.label               "View">
 <!ENTITY view.accesskey           "w">
 <!ENTITY byDate.label             "By Date">
 <!ENTITY byDate.accesskey         "D">
 <!ENTITY bySite.label             "By Site">
 <!ENTITY bySite.accesskey         "S">
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -52,19 +52,16 @@ EnterExport=Export Bookmarks File
 
 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
 
-mostVisitedTitle=Most Visited
-recentTagsTitle=Recent Tags
-
 # LOCALIZATION NOTE (tagResultLabel, bookmarkResultLabel, switchtabResultLabel,
 # keywordResultLabel, searchengineResultLabel)
 # Noun used to describe the location bar autocomplete result type
 # to users with screen readers
 # See createResultLabel() in urlbarBindings.xml
 tagResultLabel=Tag
 bookmarkResultLabel=Bookmark
 switchtabResultLabel=Tab
deleted file mode 100644
--- a/browser/chrome/browser/quitDialog.properties
+++ /dev/null
@@ -1,13 +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/.
-
-quitDialogTitle=Quit %S
-
-quitTitle=&Quit
-cancelTitle=&Cancel
-saveTitle=&Save and Quit
-neverAsk2=&Do not ask next time
-message=Do you want %S to save your tabs and windows for the next time it starts?
-messageNoWindows=Do you want %S to save your tabs for the next time it starts?
-messagePrivate=You’re in private browsing mode. Quitting %S now will discard all your open tabs and windows.
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -24,22 +24,16 @@
 <!ENTITY clearTimeDuration.last2Hours     "Last Two Hours">
 <!ENTITY clearTimeDuration.last4Hours     "Last Four Hours">
 <!ENTITY clearTimeDuration.today          "Today">
 <!ENTITY clearTimeDuration.everything     "Everything">
 <!-- Localization note (clearTimeDuration.suffix) - trailing entity for languages
 that require it.  -->
 <!ENTITY clearTimeDuration.suffix         "">
 
-<!-- LOCALIZATION NOTE (detailsProgressiveDisclosure.*): Labels and accesskeys
-     of the "Details" progressive disclosure button.  See UI mockup at bug
-     480169 -->
-<!ENTITY detailsProgressiveDisclosure.label     "Details">
-<!ENTITY detailsProgressiveDisclosure.accesskey "e">
-
 <!ENTITY historySection.label         "History">
 <!ENTITY dataSection.label            "Data">
 
 <!ENTITY itemHistoryAndDownloads.label     "Browsing &amp; Download History">
 <!ENTITY itemHistoryAndDownloads.accesskey "B">
 <!ENTITY itemFormSearchHistory.label       "Form &amp; Search History">
 <!ENTITY itemFormSearchHistory.accesskey   "F">
 <!ENTITY itemCookies.label                 "Cookies">
--- a/browser/chrome/browser/tabbrowser.properties
+++ b/browser/chrome/browser/tabbrowser.properties
@@ -11,31 +11,16 @@ tabs.closeWarningTitle=Confirm close
 # 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.closeWarningMultiple=;You are about to close #1 tabs. Are you sure you want to continue?
 tabs.closeButtonMultiple=Close tabs
 tabs.closeWarningPromptMe=Warn me when I attempt to close multiple tabs
 
-tabs.closeTab.tooltip=Close tab
-# LOCALIZATION NOTE (tabs.closeSelectedTab.tooltip):
-# %S is the keyboard shortcut for closing the current tab
-tabs.closeSelectedTab.tooltip=Close tab (%S)
-# LOCALIZATION NOTE (tabs.muteAudio.tooltip):
-# %S is the keyboard shortcut for "Mute tab"
-tabs.muteAudio.tooltip=Mute tab (%S)
-# LOCALIZATION NOTE (tabs.unmuteAudio.tooltip):
-# %S is the keyboard shortcut for "Unmute tab"
-tabs.unmuteAudio.tooltip=Unmute tab (%S)
-tabs.muteAudio.background.tooltip=Mute tab
-tabs.unmuteAudio.background.tooltip=Unmute tab
-
-tabs.unblockAudio.tooltip=Play tab
-
 # LOCALIZATION NOTE (tabs.closeWarningMultipleWindows):
 # 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. 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'.
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -5,17 +5,16 @@
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 
 <!ENTITY loadError.label "Problem loading page">
 <!ENTITY retry.label "Try Again">
 <!ENTITY returnToPreviousPage.label "Go Back">
 <!ENTITY returnToPreviousPage1.label "Go Back (Recommended)">
 <!ENTITY advanced.label "Advanced">
-
 <!ENTITY continue2.label "More…">
 <!ENTITY moreInformation.label "More Information">
 
 <!-- Specific error messages -->
 
 <!ENTITY connectionFailure.title "Unable to connect">
 <!ENTITY connectionFailure.longDesc "&sharedLongDesc;">
 
@@ -150,17 +149,16 @@
 ">
 
 <!ENTITY certerror.longpagetitle1 "Your connection is not secure">
 <!ENTITY certerror.longpagetitle2 "Warning: Potential Security Risk Ahead">
 <!-- Localization note (certerror.introPara, certerror.introPara2) - The text content of the span tag
 will be replaced at runtime with the name of the server to which the user
 was trying to connect. -->
 <!ENTITY certerror.introPara "The owner of <span class='hostname'/> has configured their website improperly.  To protect your information from being stolen, &brandShortName; has not connected to this website.">
-
 <!ENTITY certerror.introPara2 "&brandShortName; detected a potential security threat and did not continue to <span class='hostname'/>. If you visit this site, attackers could try to steal information like your passwords, emails, or credit card details.">
 
 <!ENTITY certerror.expiredCert.secondPara "This issue is most likely because your computer clock is set to the wrong time, which would prevent &brandShortName; from connecting securely.">
 
 <!ENTITY certerror.whatCanYouDoAboutItTitle "What can you do about it?">
 
 <!ENTITY certerror.unknownIssuer.whatCanYouDoAboutIt "
 <p>The issue is most likely with the website, and there is nothing you can do to resolve it.</p>
@@ -190,17 +188,16 @@ was trying to connect. -->
 <!ENTITY cspBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security 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 securityOverride.exceptionButtonLabel "Add Exception…">
-
 <!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.title "Remote XUL">
 <!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the website owners to inform them of this problem.</li></ul></p>">
 
--- a/browser/extensions/formautofill/formautofill.properties
+++ b/browser/extensions/formautofill/formautofill.properties
@@ -179,17 +179,16 @@ countryWarningMessage2 = Form Autofill i
 
 # LOCALIZATION NOTE (addNewCreditCardTitle, editCreditCardTitle): The dialog title for creating or editing
 # credit cards in browser preferences.
 addNewCreditCardTitle = Add New Credit Card
 editCreditCardTitle = Edit Credit Card
 cardNumber = Card Number
 invalidCardNumber = Please enter a valid card number
 nameOnCard = Name on Card
-cardExpires = Expires
 cardExpiresMonth = Exp. Month
 cardExpiresYear = Exp. Year
 billingAddress = Billing Address
 cardNetwork = Card Type
 
 # LOCALIZATION NOTE (cardCVV): Credit card security code https://en.wikipedia.org/wiki/Card_security_code
 cardCVV = CVV
 
--- a/devtools/client/font-inspector.properties
+++ b/devtools/client/font-inspector.properties
@@ -4,49 +4,36 @@
 
 # LOCALIZATION NOTE This file contains the Font Inspector strings.
 # The Font Inspector is a panel accessible in the Inspector sidebar.
 
 # LOCALIZATION NOTE (fontinspector.system) This label indicates that the font is a local
 # system font.
 fontinspector.system=system
 
-# LOCALIZATION NOTE (fontinspector.noFontsOnSelectedElement): This label is shown when
-# no fonts found on the selected element.
-fontinspector.noFontsOnSelectedElement=No fonts were found for the current element.
-
 # LOCALIZATION NOTE (fontinspector.noFontsUsedOnCurrentElement): This label is shown when
 # no fonts were used on the selected element.
 fontinspector.noFontsUsedOnCurrentElement=No fonts used on the current element.
 
 # LOCALIZATION NOTE (fontinspector.otherFontsInPageHeader): This is the text for the
 # header of a collapsible section containing other fonts used in the page.
 fontinspector.otherFontsInPageHeader=Other fonts in page
 
-# LOCALIZATION NOTE (fontinspector.editPreview): This is the text that appears in a
-# tooltip on hover of a font preview string. Clicking on the string opens a text input
-# where users can type to change the preview text.
-fontinspector.editPreview=Click to edit preview
-
 # LOCALIZATION NOTE (fontinspector.copyURL): This is the text that appears in a tooltip
 # displayed when the user hovers over the copy icon next to the font URL.
 # Clicking the copy icon copies the full font URL to the user's clipboard
 fontinspector.copyURL=Copy URL
 
 # LOCALIZATION NOTE (fontinspector.customInstanceName): Think of instances as presets
 # (groups of settings that apply in bulk to a thing). Instances have names. When the user
 # creates a new instance, it doesn't have a name. This is the text that appears as the
 # default name for a new instance. It shows up in a dropdown from which users can select
 # between predefined instances and this custom instance.
 fontinspector.customInstanceName=Custom
 
-# LOCALIZATION NOTE (fontinspector.fontFamilyLabel): This label is shown next to the
-# string that identifies the font family currently being edited in the font editor.
-fontinspector.fontFamilyLabel=Family
-
 # LOCALIZATION NOTE (fontinspector.fontInstanceLabel): This label is shown next to the UI
 # in the font editor which allows a user to select a font instance option from a
 # dropdown. An instance is like a preset. A "font instance" is the term used by the font
 # authors to mean a group of predefined font settings.
 fontinspector.fontInstanceLabel=Instance
 
 # LOCALIZATION NOTE (fontinspector.fontSizeLabel): This label is shown next to the UI
 # in the font editor which allows the user to change the font size.
--- a/devtools/client/inspector.properties
+++ b/devtools/client/inspector.properties
@@ -83,22 +83,16 @@ markupView.event.tooltiptext=Event liste
 # the markup view. Only displayed on custom elements with a shadow root attached.
 markupView.custom.tooltiptext=Show custom element definition
 
 # LOCALIZATION NOTE (markupView.newAttribute.label)
 # This is used to speak the New Attribute button when editing a tag
 # and a screen reader user tabs to it. This string is not visible onscreen.
 markupView.newAttribute.label=New attribute
 
-# LOCALIZATION NOTE (markupView.revealLink.label)
-# Used in the markup view when displaying elements inserted in <slot> nodes in a custom
-# component. On hover, a link with this label will be shown to select the corresponding
-# non-slotted container. (test with dom.webcomponents.shadowdom.enabled set to true)
-markupView.revealLink.label=reveal
-
 # LOCALIZATION NOTE (markupView.revealLink.tooltip)
 # Used as a tooltip for an icon in the markup view when displaying elements inserted in
 # <slot> nodes in a custom  component. When clicking on the icon, the corresponding
 # non-slotted container will be selected
 # (test with dom.webcomponents.shadowdom.enabled set to true)
 markupView.revealLink.tooltip=Reveal
 
 #LOCALIZATION NOTE: Used in the image preview tooltip when the image could not be loaded
--- a/devtools/client/layout.properties
+++ b/devtools/client/layout.properties
@@ -16,20 +16,16 @@ flexbox.flexContainer=Flex Container
 # LOCALIZATION NOTE) (flexbox.flexItemOf): The accordion header for the Flexbox panel
 # when a flex item is selected. %s represents the flex container selector.
 flexbox.flexItemOf=Flex Item of %S
 
 # LOCALIZATION NOTE (flexbox.noFlexboxeOnThisPage): In the case where there are no CSS
 # flex containers to display.
 flexbox.noFlexboxeOnThisPage=Select a Flex container or item to continue.
 
-# LOCALIZATION NOTE (flexbox.overlayFlexbox): Header for the list of flex container
-# elements if only one item can be selected.
-flexbox.overlayFlexbox=Overlay Flexbox
-
 # LOCALIZATION NOTE (flexbox.flexContainerProperties): Header for the flex container
 # properties in the Flexbox panel.
 flexbox.flexContainerProperties=Flex Container Properties
 
 # LOCALIZATION NOTE (flexbox.contentWidth, flexbox.contentHeight, flexbox.finalWidth,
 # flexbox.finalHeight): Labels for the flex item sizing properties in the Flexbox panel.
 flexbox.contentWidth=Content width:
 flexbox.contentHeight=Content height:
@@ -147,12 +143,8 @@ layout.noGridsOnThisPage=CSS Grid is not
 
 # LOCALIZATION NOTE (layout.overlayMultipleGrids): The header for the list of grid
 # container elements that can be highlighted in the CSS Grid panel.
 layout.overlayMultipleGrids=Overlay Multiple Grids
 
 # LOCALIZATION NOTE (layout.overlayGrid): Alternate header for the list of grid container
 # elements if only one item can be selected.
 layout.overlayGrid=Overlay Grid
-
-# LOCALIZATION NOTE (layout.rowColumnPositions): The row and column position of a grid
-# cell shown in the grid cell infobar when hovering over the CSS grid outline.
-layout.rowColumnPositions=Row %S / Column %S
--- a/devtools/client/netmonitor.properties
+++ b/devtools/client/netmonitor.properties
@@ -470,22 +470,16 @@ certmgr.certdetail.sha256fingerprint=SHA
 # LOCALIZATION NOTE (certmgr.certdetail.sha1fingerprint):
 # A label used for Fingerprints sub-section in security tab
 certmgr.certdetail.sha1fingerprint=SHA1 Fingerprint:
 
 # LOCALIZATION NOTE (certmgr.certificateTransparency.label):
 # This string is used as a label in the security tab.
 certmgr.certificateTransparency.label=Transparency:
 
-# LOCALIZATION NOTE (certmgr.certificateTransparency.status.none):
-# This string is used to indicate that there are no signed certificate
-# timestamps available. This is a property for the 'Transparency'
-# field in the security tab.
-certmgr.certificateTransparency.status.none=No SCT records
-
 # LOCALIZATION NOTE (certmgr.certificateTransparency.status.ok):
 # This string is used to indicate that there are valid signed certificate
 # timestamps. This is a property for the 'Transparency'
 # field in the security tab.
 certmgr.certificateTransparency.status.ok=Valid SCT records
 
 # LOCALIZATION NOTE (certmgr.certificateTransparency.status.notEnoughSCTS):
 # This string is used to indicate that there are not enough valid signed
@@ -901,24 +895,16 @@ netmonitor.context.copyUrl.accesskey=U
 # LOCALIZATION NOTE (netmonitor.context.copyUrlParams): This is the label displayed
 # on the context menu that copies the selected request's url parameters
 netmonitor.context.copyUrlParams=Copy URL Parameters
 
 # LOCALIZATION NOTE (netmonitor.context.copyUrlParams.accesskey): This is the access key
 # for the Copy URL Parameters menu item displayed in the context menu for a request
 netmonitor.context.copyUrlParams.accesskey=P
 
-# LOCALIZATION NOTE (netmonitor.context.copyPostData): This is the label displayed
-# on the context menu that copies the selected request's post data
-netmonitor.context.copyPostData=Copy POST Data
-
-# LOCALIZATION NOTE (netmonitor.context.copyPostData.accesskey): This is the access key
-# for the Copy POST Data menu item displayed in the context menu for a request
-netmonitor.context.copyPostData.accesskey=D
-
 # LOCALIZATION NOTE (netmonitor.context.copyRequestData): This is the label displayed
 # on the context menu that copies the selected request's data
 netmonitor.context.copyRequestData=Copy %S Data
 
 # LOCALIZATION NOTE (netmonitor.context.copyRequestData.accesskey): This is the access key
 # for the Copy POST/PATCH/PUT/DELETE Data menu item displayed in the context menu for a request
 netmonitor.context.copyRequestData.accesskey=D
 
--- a/devtools/client/network-throttling.properties
+++ b/devtools/client/network-throttling.properties
@@ -1,21 +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/.
 
-# LOCALIZATION NOTE These strings are used inside the NetworkThrottlingSelector
-# component used to throttle network bandwidth.
-#
-# 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.
-
 # LOCALIZATION NOTE These strings are used inside the NetworkThrottlingMenu
 # component used to throttle network bandwidth.
 #
 # 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.
--- a/devtools/client/responsive.properties
+++ b/devtools/client/responsive.properties
@@ -6,49 +6,29 @@
 # available from the Web Developer sub-menu -> 'Responsive Design Mode'.
 #
 # 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.
 
-# LOCALIZATION NOTE (responsive.editDeviceList): option displayed in the device
-# selector
-responsive.editDeviceList=Edit list…
-
 # LOCALIZATION NOTE (responsive.editDeviceList2): Context menu item displayed in the
 # device selector.
 responsive.editDeviceList2=Edit List…
 
 # LOCALIZATION NOTE (responsive.exit): Tooltip text of the exit button.
 responsive.exit=Close Responsive Design Mode
 
 # LOCALIZATION NOTE (responsive.rotate): Tooltip text of the rotate button.
 responsive.rotate=Rotate viewport
 
-# LOCALIZATION NOTE (responsive.deviceListLoading): placeholder text for
-# device selector when it's still fetching devices
-responsive.deviceListLoading=Loading…
-
-# LOCALIZATION NOTE (responsive.deviceListError): placeholder text for
-# device selector when an error occurred
-responsive.deviceListError=No list available
-
 # LOCALIZATION NOTE (responsive.done): Button text in the device list modal
 responsive.done=Done
 
-# LOCALIZATION NOTE (responsive.noDeviceSelected): placeholder text for the
-# device selector
-responsive.noDeviceSelected=no device selected
-
-# LOCALIZATION NOTE  (responsive.title): the title displayed in the global
-# toolbar
-responsive.title=Responsive Design Mode
-
 # LOCALIZATION NOTE (responsive.responsiveMode): Placeholder text for the
 # device selector.
 responsive.responsiveMode=Responsive
 
 # LOCALIZATION NOTE (responsive.enableTouch): Tooltip text for the touch
 # simulation button when it's disabled.
 responsive.enableTouch=Enable touch simulation
 
@@ -131,37 +111,24 @@ responsive.deviceAdderSave=Save
 # device.  %4$S is the user agent of the device.  %5$S is a boolean value
 # noting whether touch input is supported.
 responsive.deviceDetails=Size: %1$S x %2$S\nDPR: %3$S\nUA: %4$S\nTouch: %5$S
 
 # LOCALIZATION NOTE (responsive.devicePixelRatioOption): UI option in a menu to configure
 # the device pixel ratio. %1$S is the devicePixelRatio value of the device.
 responsive.devicePixelRatioOption=DPR: %1$S
 
-# LOCALIZATION NOTE (responsive.reloadConditions.label): Label on button to open a menu
-# used to choose whether to reload the page automatically when certain actions occur.
-responsive.reloadConditions.label=Reload when…
-
-# LOCALIZATION NOTE (responsive.reloadConditions.title): Title on button to open a menu
-# used to choose whether to reload the page automatically when certain actions occur.
-responsive.reloadConditions.title=Choose whether to reload the page automatically when certain actions occur
-
 # LOCALIZATION NOTE (responsive.reloadConditions.touchSimulation): Label on checkbox used
 # to select whether to reload when touch simulation is toggled.
 responsive.reloadConditions.touchSimulation=Reload when touch simulation is toggled
 
 # LOCALIZATION NOTE (responsive.reloadConditions.userAgent): Label on checkbox used
 # to select whether to reload when user agent is changed.
 responsive.reloadConditions.userAgent=Reload when user agent is changed
 
-# LOCALIZATION NOTE (responsive.reloadNotification.description): Text in notification bar
-# shown on first open to clarify that some features need a reload to apply.  %1$S is the
-# label on the reload conditions menu (responsive.reloadConditions.label).
-responsive.reloadNotification.description=Device simulation changes require a reload to fully apply.  Automatic reloads are disabled by default to avoid losing any changes in DevTools.  You can enable reloading via the “%1$S” menu.
-
 # LOCALIZATION NOTE (responsive.reloadNotification.description2): Text in notification bar
 # shown on first open to clarify that some features need a reload to apply.
 responsive.reloadNotification.description2=Device simulation changes require a reload to fully apply. Automatic reloads are disabled by default to avoid losing any changes in DevTools. You can enable reloading via the Settings menu.
 
 # LOCALIZATION NOTE (responsive.leftAlignViewport): Label on checkbox used in the settings
 # menu.
 responsive.leftAlignViewport=Left-align Viewport
 
--- a/devtools/client/webconsole.properties
+++ b/devtools/client/webconsole.properties
@@ -57,20 +57,16 @@ noCounterLabel=<no label>
 # LOCALIZATION NOTE (counterDoesntExist): this string is displayed when
 # console.countReset() is called with a counter that doesn't exist.
 counterDoesntExist=Counter “%S” doesn’t exist.
 
 # LOCALIZATION NOTE (noGroupLabel): this string is used to display
 # console.group messages with no label provided.
 noGroupLabel=<no group label>
 
-# LOCALIZATION NOTE (Autocomplete.blank): this string is used when inputnode
-# string containing anchor doesn't matches to any property in the content.
-Autocomplete.blank=  <- no result
-
 maxTimersExceeded=The maximum allowed number of timers in this page was exceeded.
 timerAlreadyExists=Timer “%S” already exists.
 timerDoesntExist=Timer “%S” doesn’t exist.
 timerJSError=Failed to process the timer name.
 
 # LOCALIZATION NOTE (connectionTimeout): message displayed when the Remote Web
 # Console fails to connect to the server due to a timeout.
 connectionTimeout=Connection timeout. Check the Error Console on both ends for potential error messages. Reopen the Web Console to try again.
--- a/devtools/shared/csscoverage.dtd
+++ b/devtools/shared/csscoverage.dtd
@@ -1,18 +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/. -->
 
 <!-- LOCALIZATION NOTE : FILE This file contains the CSS Coverage Report
    - strings. See the 'csscoverage' command for more information, and
-   - devtools/client/styleeditor/styleeditor.xul for context -->
-
-<!-- LOCALIZATION NOTE : FILE This file contains the CSS Coverage Report
-   - strings. See the 'csscoverage' command for more information, and
    - devtools/client/styleeditor/index.xul for context -->
 
 <!-- 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. -->
 
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -358,17 +358,16 @@
 <!ENTITY pref_restore_quit "Don\'t restore after quitting &brandShortName;">
 
 <!-- Localization note (pref_use_system_font_size, pref_use_system_font_size_summary):
      Font size here refers to the name of the corresponding Android system setting. -->
 <!ENTITY pref_use_system_font_size "Use system font size">
 <!ENTITY pref_use_system_font_size_summary "Scale web content according to the system font size">
 
 <!ENTITY pref_media_autoplay_enabled "Allow autoplay">
-<!ENTITY pref_media_autoplay_enabled_summary "Control if websites can autoplay videos and other media content">
 <!ENTITY pref_media_autoplay_allow "Allow autoplay">
 <!ENTITY pref_media_autoplay_block "Block autoplay">
 <!ENTITY pref_zoom_force_enabled "Always enable zoom">
 <!ENTITY pref_zoom_force_enabled_summary "Force override so you can zoom any page">
 <!ENTITY pref_voice_input "Voice input">
 <!ENTITY pref_voice_input_summary2 "Allow voice dictation in the URL bar">
 <!ENTITY pref_qrcode_enabled "QR code reader">
 <!ENTITY pref_qrcode_enabled_summary2 "Allow QR scanner in the URL bar">
@@ -826,19 +825,16 @@ just addresses the organization to follo
 <!-- LOCALIZATION NOTE (unsupported_sdk_version): The user installed a build of this app that does not support
      the Android version of this device. the formatS1 is replaced by the CPU ABI (e.g., ARMv7); the formatS2 is
      replaced by the Android OS version (e.g., 14)-->
 <!ENTITY unsupported_sdk_version "Sorry! This &brandShortName; won\'t work on this device (&formatS1;, &formatS2;). Please download the correct version.">
 
 <!-- LOCALIZATION NOTE(corrupt_apk): This notification is shown if corruption has been detected on startup and the user has to reinstall Firefox -->
 <!ENTITY corrupt_apk "Unable to open &brandShortName;. Please reinstall and try again.">
 
-<!ENTITY eol_notification_title2 "&brandShortName; will no longer update">
-<!ENTITY eol_notification_summary "Tap to learn more">
-
 <!-- LOCALIZATION NOTE (whatsnew_notification_title, whatsnew_notification_summary): These strings
      are used for a system notification that's shown to users after the app updates. -->
 <!ENTITY whatsnew_notification_title "&brandShortName; is up to date">
 <!ENTITY whatsnew_notification_summary "Find out what\'s new in this version">
 
 <!ENTITY promotion_add_page_shortcut "Add page shortcut">
 
 <!ENTITY helper_first_offline_bookmark_title "Read offline">
--- a/mobile/chrome/region.properties
+++ b/mobile/chrome/region.properties
@@ -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/.
 
-# This preference is only used to generate browsersearch.json.
-browser.search.defaultenginename=Google
-
 # 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 webcal:
--- a/netwerk/necko.properties
+++ b/netwerk/necko.properties
@@ -35,21 +35,18 @@ DirColSize=Size
 DirColMTime=Last Modified
 DirFileLabel=File: 
 
 PhishingAuth=You are about to visit “%1$S”. This site may be attempting to trick you into thinking you are visiting a different site. Use extreme caution.
 PhishingAuthAccept=I understand and will be very careful
 SuperfluousAuth=You are about to log in to the site “%1$S” with the username “%2$S”, but the website does not require authentication. This may be an attempt to trick you.\n\nIs “%1$S” the site you want to visit?
 AutomaticAuth=You are about to log in to the site “%1$S” with the username “%2$S”.
 
-TrackingUriBlocked=The resource at “%1$S” was blocked because tracking protection is enabled.
-
 TrackerUriBlocked=The resource at “%1$S” was blocked because content blocking is enabled.
 UnsafeUriBlocked=The resource at “%1$S” was blocked by Safe Browsing.
-
 CookieBlockedByPermission=Request to access cookies or storage on “%1$S” was blocked because of custom cookie permission.
 CookieBlockedTracker=Request to access cookie or storage on “%1$S” was blocked because it came from a tracker and content blocking is enabled.
 CookieBlockedAll=Request to access cookie or storage on “%1$S” was blocked because we are blocking all storage access requests.
 CookieBlockedForeign=Request to access cookie or storage on “%1$S” was blocked because we are blocking all third-party storage access requests and content blocking is enabled.
 CookieBlockedSlowTrackingContent=The resource at “%1$S” was blocked because content blocking is enabled and the resource was classified as a slow tracking resource.
 
 # LOCALIZATION NOTE (nsICookieManagerAPIDeprecated): don't localize originAttributes.
 # %1$S is the deprecated API; %2$S is the interface suffix that the given deprecated API belongs to.
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -284,46 +284,43 @@ certErrorTrust_UnknownIssuer5=Websites p
 # LOCALIZATION NOTE (certErrorTrust_UnknownIssuer6): %1$S is replaced by the brand name, %2$S is replaced by host name.
 certErrorTrust_UnknownIssuer6=Websites prove their identity via certificates. %1$S does not trust %2$S because its certificate issuer is unknown, the certificate is self-signed, or the server is not sending the correct intermediate certificates.
 certErrorTrust_CaInvalid=The certificate is not trusted because it was issued by an invalid CA certificate.
 certErrorTrust_Issuer=The certificate is not trusted because the issuer certificate is not trusted.
 certErrorTrust_SignatureAlgorithmDisabled=The certificate is not trusted because it was signed using a signature algorithm that was disabled because that algorithm is not secure.
 certErrorTrust_ExpiredIssuer=The certificate is not trusted because the issuer certificate has expired.
 certErrorTrust_Untrusted=The certificate does not come from a trusted source.
 certErrorTrust_MitM=Your connection is being intercepted by a TLS proxy. Uninstall it if possible or configure your device to trust its root certificate.
-
 # LOCALIZATION NOTE (certErrorTrust_Symantec): %S is replaced by the domain for which the certificate is valid
 certErrorTrust_Symantec=The security certificate for %S is not trustworthy because the issuing organization failed to follow security practices. Certificates issued by Symantec, including the Thawte, GeoTrust, and RapidSSL brands, are not considered safe.
 
 certErrorMismatch=The certificate is not valid for the name %S.
 # LOCALIZATION NOTE (certErrorMismatch1, certErrorMismatchSinglePrefix1, certErrorMismatchMultiple1): %1$S is replaced by the brand name, %2$S is replaced by host name.
 certErrorMismatch1=Websites prove their identity via security certificates. %1$S does not trust %2$S because it uses a security certificate that is not valid for %2$S.
 # LOCALIZATION NOTE (certErrorMismatch2, certErrorMismatchSinglePrefix2, certErrorMismatchMultiple2): %1$S is replaced by the brand name, %2$S is replaced by host name.
 certErrorMismatch2=Websites prove their identity via certificates. %1$S does not trust %2$S because it uses a certificate that is not valid for %2$S.
 # LOCALIZATION NOTE (certErrorMismatchSinglePrefix): %S is replaced by the domain for which the certificate is valid
 certErrorMismatchSinglePrefix=The certificate is only valid for %S.
 # LOCALIZATION NOTE (certErrorMismatchSinglePrefix1): %3$S is replaced by the domain for which the certificate is valid
 certErrorMismatchSinglePrefix1=Websites prove their identity via security certificates. %1$S does not trust %2$S because it uses a security certificate that is not valid for %2$S.
 # LOCALIZATION NOTE (certErrorMismatchSinglePrefix2): %3$S is replaced by the domain for which the certificate is valid
 certErrorMismatchSinglePrefix2=Websites prove their identity via certificates. %1$S does not trust %2$S because it uses a certificate that is not valid for %2$S.
 certErrorMismatchMultiple=The certificate is only valid for the following names:
-
 certErrorMismatchMultiple1=Websites prove their identity via security certificates. %1$S does not trust %2$S because it uses a security certificate that is not valid for %2$S. The certificate is only valid for the following names:
 
 certErrorMismatchMultiple2=Websites prove their identity via certificates. %1$S does not trust %2$S because it uses a certificate that is not valid for %2$S. The certificate is only valid for the following names:
 
 # LOCALIZATION NOTE (certErrorExpiredNow): Do not translate %1$S (date+time of expired certificate) or %2$S (current date+time)
 certErrorExpiredNow=The certificate expired on %1$S. The current time is %2$S.
 certErrorExpiredNow1=Websites prove their identity via security certificates, which are valid for a set time period. The security certificate for %S appears to be expired.
 
 certErrorExpiredNow2=Websites prove their identity via certificates, which are valid for a set time period. The certificate for %S appears to be expired.
 
 # LOCALIZATION NOTE (certErrorNotYetValidNow): Do not translate %1$S (date+time certificate will become valid) or %2$S (current date+time)
 certErrorNotYetValidNow=The certificate will not be valid until %1$S. The current time is %2$S.
-
 certErrorNotYetValidNow1=Websites prove their identity via security certificates, which are valid for a set time period. The security certificate for %S appears to be not yet valid.
 
 certErrorNotYetValidNow2=Websites prove their identity via certificates, which are valid for a set time period. The certificate for %S appears to be not yet valid.
 
 # LOCALIZATION NOTE (certErrorSymantecDistrustDescription): %S will be replaced by the domain for which the certificate is valid.
 certErrorSymantecDistrustDescription=Websites prove their identity via certificates, which are issued by certificate authorities. Most browsers will no longer trust Symantec, the certificate authority for %S.
 certErrorSymantecDistrustAdministrator=You may notify the website’s administrator about this problem.
 
--- a/toolkit/chrome/global/viewSource.properties
+++ b/toolkit/chrome/global/viewSource.properties
@@ -4,14 +4,13 @@
 
 goToLineTitle     = Go to line
 goToLineText      = Enter line number
 invalidInputTitle = Invalid input
 invalidInputText  = The line number entered is invalid.
 outOfRangeTitle   = Line not found
 outOfRangeText    = The specified line was not found.
 viewSelectionSourceTitle = DOM Source of Selection
-viewMathMLSourceTitle    = DOM Source of MathML
 
 context_goToLine_label        = Go to Line…
 context_goToLine_accesskey    = L
 context_wrapLongLines_label   = Wrap Long Lines
 context_highlightSyntax_label = Syntax Highlighting
--- a/toolkit/chrome/mozapps/downloads/downloads.properties
+++ b/toolkit/chrome/mozapps/downloads/downloads.properties
@@ -101,12 +101,11 @@ doneScheme2=%1$S resource
 # This is used as an eTLD replacement for local files, so make it lower case
 doneFileScheme=local file
 
 # LOCALIZATION NOTE (yesterday): Displayed time for files finished yesterday
 yesterday=Yesterday
 
 fileExecutableSecurityWarning=“%S” is an executable file. Executable files may contain viruses or other malicious code that could harm your computer. Use caution when opening this file. Are you sure you want to launch “%S”?
 fileExecutableSecurityWarningTitle=Open Executable File?
-fileExecutableSecurityWarningDontAsk=Don’t ask me this again
 
 # Desktop folder name for downloaded files
 downloadsFolder=Downloads
deleted file mode 100644
--- a/toolkit/crashreporter/crashes.dtd
+++ /dev/null
@@ -1,13 +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 crashReports.title         "Crash Reports">
-<!ENTITY crashesUnsubmitted.label   "Unsubmitted Crash Reports">
-<!ENTITY crashesSubmitted.label     "Submitted Crash Reports">
-<!ENTITY id.heading                 "Report ID">
-<!ENTITY dateCrashed.heading        "Date Crashed">
-<!ENTITY dateSubmitted.heading      "Date Submitted">
-<!ENTITY noReports.label            "No crash reports have been submitted.">
-<!ENTITY noConfig.label             "This application has not been configured to display crash reports. The preference <code>breakpad.reportURL</code> must be set.">
-<!ENTITY clearAllReports.label      "Remove All Reports">
deleted file mode 100644
--- a/toolkit/crashreporter/crashes.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/.
-
-deleteconfirm.title=Are you sure?
-deleteconfirm.description=This will delete all reports and cannot be undone.
-