Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
authorffxbld <release@mozilla.com>
Fri, 24 Aug 2018 09:01:59 -0700
changeset 10322 dabbbead689f2a42b0ba3130e9b63b9ba97bd3b0
parent 10321 8f9678c7bfe28c2de8117cfa187500227a48f83b
child 10323 f43921bd579d7471bf75a950d80fbbab850da6b5
push id79
push userfrancesco.lodolo@mozillaitalia.org
push dateSun, 26 Aug 2018 05:43:27 +0000
reviewersrelease
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release X-Channel-Repo: mozilla-central X-Channel-Revision: ec5152902eb717a568b34accf03f2a520862c512 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: a59e5c3dda046d0b6c1bc5ac17820ac8e9b20e83 X-Channel-Repo: releases/mozilla-release X-Channel-Converted-Revision: 736023aebdb11fb916f414354a8f73417f7f455b
browser/browser/preferences/preferences.ftl
browser/browser/preferences/siteDataSettings.ftl
browser/chrome/browser-region/region.properties
browser/chrome/browser/aboutHome.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/places/editBookmarkOverlay.dtd
browser/chrome/browser/places/places.dtd
browser/chrome/browser/places/places.properties
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/search.properties
browser/chrome/browser/syncSetup.properties
devtools/client/aboutdebugging.properties
devtools/client/appcacheutils.properties
devtools/client/boxmodel.properties
devtools/client/menus.properties
devtools/client/performance.properties
devtools/client/responsive.properties
devtools/client/toolbox.properties
devtools/shared/gclicommands.properties
devtools/startup/key-shortcuts.properties
dom/chrome/dom/dom.properties
mobile/android/base/android_strings.dtd
mobile/chrome/region.properties
netwerk/necko.properties
security/manager/chrome/pipnss/pipnss.properties
toolkit/chrome/global/aboutTelemetry.dtd
toolkit/chrome/global/aboutTelemetry.properties
--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -695,20 +695,16 @@ history-remember-option-custom =
 
 history-remember-description = { -brand-short-name } will remember your browsing, download, form and search history.
 history-dontremember-description = { -brand-short-name } will use the same settings as private browsing, and will not remember any history as you browse the Web.
 
 history-private-browsing-permanent =
     .label = Always use private browsing mode
     .accesskey = p
 
-history-remember-option =
-    .label = Remember my browsing and download history
-    .accesskey = b
-
 history-remember-browser-option =
     .label = Remember browsing and download history
     .accesskey = b
 
 history-remember-search-option =
     .label = Remember search and form history
     .accesskey = f
 
--- a/browser/browser/preferences/siteDataSettings.ftl
+++ b/browser/browser/preferences/siteDataSettings.ftl
@@ -46,19 +46,16 @@ site-data-remove-all =
     .accesskey = e
 
 site-data-remove-shown =
     .label = Remove All Shown
     .accesskey = e
 
 ## Removing
 
-site-data-removing-window =
-    .title = { site-data-removing-header }
-
 site-data-removing-dialog =
     .title = { site-data-removing-header }
     .buttonlabelaccept = Remove
 
 site-data-removing-header = Removing Cookies and Site Data
 
 site-data-removing-desc = Removing cookies and site data may log you out of websites. Are you sure you want to make the changes?
 
--- a/browser/chrome/browser-region/region.properties
+++ b/browser/chrome/browser-region/region.properties
@@ -1,19 +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/.
 
-# Default search engine
-browser.search.defaultenginename=Google
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Google
-browser.search.order.2=Bing
-
 # 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
deleted file mode 100644
--- a/browser/chrome/browser/aboutHome.dtd
+++ /dev/null
@@ -1,40 +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 % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd">
-%syncBrandDTD;
-
-<!-- These strings are used in the about:home page -->
-
-<!ENTITY abouthome.pageTitle "&brandFullName; Start Page">
-
-<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
-     text in <a/> will be linked to the Firefox features page on mozilla.com
--->
-<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>.">
-<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
-     text in <a/> will be linked to the featured add-ons on addons.mozilla.org
--->
-<!ENTITY abouthome.defaultSnippet2.v1 "It’s easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
-<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
-<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
-
-<!ENTITY abouthome.bookmarksButton.label "Bookmarks">
-<!ENTITY abouthome.historyButton.label   "History">
-<!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the
-     preferences/options item on about:home on Windows -->
-<!ENTITY abouthome.preferencesButtonWin.label  "Options">
-<!-- LOCALIZATION NOTE (abouthome.preferencesButtonUnix.label): The label for the
-     preferences/options item on about:home on Linux and OS X -->
-<!ENTITY abouthome.preferencesButtonUnix.label  "Preferences">
-<!ENTITY abouthome.addonsButton.label    "Add-ons">
-<!ENTITY abouthome.downloadsButton.label "Downloads">
-<!ENTITY abouthome.syncButton.label      "&syncBrand.shortName.label;">
-
-<!-- LOCALIZATION NOTE (abouthome.aboutMozilla.label): The (invisible) label for
-     the mozilla wordmark in the top-right corner that links to Mozilla's main
-     about page. -->
-<!ENTITY abouthome.aboutMozilla.label    "About Mozilla">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -63,18 +63,16 @@ can reach it easily. -->
 <!ENTITY  unpinTab.label                     "Unpin Tab">
 <!ENTITY  unpinTab.accesskey                 "b">
 <!ENTITY  sendTabToDevice.label              "Send Tab to Device">
 <!ENTITY  sendTabToDevice.accesskey          "n">
 <!ENTITY  sendPageToDevice.label             "Send Page to Device">
 <!ENTITY  sendPageToDevice.accesskey         "n">
 <!ENTITY  sendLinkToDevice.label             "Send Link to Device">
 <!ENTITY  sendLinkToDevice.accesskey         "n">
-<!ENTITY  sendToDeviceFeedback.label         "Sent!">
-<!ENTITY  sendToDeviceOfflineFeedback.label  "Queued (offline)">
 <!ENTITY  moveToNewWindow.label              "Move to New Window">
 <!ENTITY  moveToNewWindow.accesskey          "W">
 <!ENTITY  reopenInContainer.label            "Reopen in Container">
 <!ENTITY  reopenInContainer.accesskey        "e">
 <!ENTITY  bookmarkAllTabs.label              "Bookmark All Tabs…">
 <!ENTITY  bookmarkAllTabs.accesskey          "T">
 <!ENTITY  undoCloseTab.label                 "Undo Close Tab">
 <!ENTITY  undoCloseTab.accesskey             "U">
@@ -263,17 +261,16 @@ These should match what Safari and other
 <!ENTITY urlbar.midiBlocked.tooltip              "You have blocked MIDI access for this website.">
 
 <!ENTITY urlbar.openHistoryPopup.tooltip                "Show history">
 
 <!ENTITY searchItem.title             "Search">
 
 <!-- Toolbar items -->
 <!ENTITY homeButton.label             "Home">
-
 <!ENTITY homeButton.defaultPage.tooltip "&brandShortName; Home Page">
 
 <!ENTITY bookmarksButton.label          "Bookmarks">
 <!ENTITY bookmarksCmd.commandkey "b">
 
 <!ENTITY bookmarksSubview.label             "Bookmarks">
 <!ENTITY bookmarksMenuButton2.label         "Bookmarks Menu">
 <!ENTITY bookmarksMenuButton.other.label    "Other Bookmarks">
@@ -423,47 +420,33 @@ These should match what Safari and other
 <!ENTITY appMenuRemoteTabs.managedevices.label "Manage Devices…">
 <!ENTITY appMenuRemoteTabs.sidebar.label "View Synced Tabs Sidebar">
 <!ENTITY appMenuRemoteTabs.connectdevice.label "Connect Another Device">
 
 <!ENTITY appMenuRecentHighlights.label "Recent Highlights">
 
 <!ENTITY customizeMenu.addToToolbar.label "Add to Toolbar">
 <!ENTITY customizeMenu.addToToolbar.accesskey "A">
-<!ENTITY customizeMenu.addToPanel.label "Add to Menu">
-<!ENTITY customizeMenu.addToPanel.accesskey "M">
 <!-- LOCALIZATION NOTE (customizeMenu.addToOverflowMenu.label,
      customizeMenu.pinToOverflowMenu.label, customizeMenu.unpinFromOverflowMenu.label)
      The overflow menu is the menu that appears if you click the chevron (>> button)
      in the location bar. -->
 <!ENTITY customizeMenu.addToOverflowMenu.label "Add to Overflow Menu">
 <!ENTITY customizeMenu.addToOverflowMenu.accesskey "M">
-<!ENTITY customizeMenu.moveToToolbar.label "Move to Toolbar">
-<!ENTITY customizeMenu.moveToToolbar.accesskey "o">
-<!-- LOCALIZATION NOTE (customizeMenu.moveToPanel.accesskey, customizeMenu.pinToOverflowMenu.accesskey)
-     can appear on the same context menu as menubarCmd and personalbarCmd,
-     so they should have different access keys. customizeMenu.moveToToolbar and
-     customizeMenu.moveToPanel are mutually exclusive, so can share access
-     keys.  -->
-<!ENTITY customizeMenu.moveToPanel.label "Move to Menu">
-<!ENTITY customizeMenu.moveToPanel.accesskey "o">
 <!-- LOCALIZATION NOTE (customizeMenu.pinToOverflowMenu.accesskey)
      can appear on the same context menu as menubarCmd and personalbarCmd,
      so they should have different access keys.  -->
 <!ENTITY customizeMenu.pinToOverflowMenu.label "Pin to Overflow Menu">
 <!ENTITY customizeMenu.pinToOverflowMenu.accesskey "P">
 <!ENTITY customizeMenu.unpinFromOverflowMenu.label "Unpin from Overflow Menu">
 <!ENTITY customizeMenu.unpinFromOverflowMenu.accesskey "U">
 <!ENTITY customizeMenu.removeFromToolbar.label "Remove from Toolbar">
 <!ENTITY customizeMenu.removeFromToolbar.accesskey "R">
-<!ENTITY customizeMenu.removeFromMenu.label "Remove from Menu">
-<!ENTITY customizeMenu.removeFromMenu.accesskey "R">
 <!ENTITY customizeMenu.addMoreItems.label "Add More Items…">
 <!ENTITY customizeMenu.addMoreItems.accesskey "A">
-
 <!ENTITY customizeMenu.autoHideDownloadsButton.label "Auto-Hide in Toolbar">
 <!ENTITY customizeMenu.autoHideDownloadsButton.accesskey "A">
 <!ENTITY customizeMenu.manageExtension.label "Manage Extension">
 <!ENTITY customizeMenu.manageExtension.accesskey "E">
 
 <!-- LOCALIZATION NOTE (moreMenu.label) This label is used in the new Photon
     app (hamburger) menu. When clicked, it opens a subview that contains
     secondary commands. -->
@@ -599,17 +582,16 @@ These should match what Safari and other
 <!ENTITY setDesktopBackgroundCmd.accesskey  "S">
 <!ENTITY bookmarkPageCmd2.label       "Bookmark This Page">
 <!ENTITY bookmarkPageCmd2.accesskey   "m">
 <!ENTITY bookmarkThisLinkCmd.label      "Bookmark This Link">
 <!ENTITY bookmarkThisLinkCmd.accesskey  "L">
 <!ENTITY bookmarkThisFrameCmd.label      "Bookmark This Frame">
 <!ENTITY bookmarkThisFrameCmd.accesskey  "m">
 <!ENTITY pageAction.copyLink.label    "Copy Link">
-<!ENTITY copyURLFeedback.label        "Copied!">
 <!ENTITY emailPageCmd.label           "Email Link…">
 <!ENTITY emailPageCmd.accesskey       "E">
 <!ENTITY savePageCmd.label            "Save Page As…">
 <!ENTITY savePageCmd.accesskey        "A">
 <!-- alternate for content area context menu -->
 <!ENTITY savePageCmd.accesskey2       "P">
 <!ENTITY savePageCmd.commandkey       "s">
 <!ENTITY saveFrameCmd.label           "Save Frame As…">
@@ -786,17 +768,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.removeBookmark.accessKey       "R">
 
 <!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">
 
@@ -837,17 +818,16 @@ you can use these alternative items. Oth
 
 <!ENTITY identity.moreInfoLinkText2 "More Information">
 
 <!ENTITY identity.clearSiteData "Clear Cookies and Site Data…">
 
 <!ENTITY identity.permissions "Permissions">
 <!ENTITY identity.permissionsEmpty "You have not granted this site any special permissions.">
 <!ENTITY identity.permissionsReloadHint "You may need to reload the page for changes to apply.">
-
 <!ENTITY identity.permissionsPreferences.tooltip "Open Permissions Preferences">
 
 <!-- Name for the tabs toolbar as spoken by screen readers.
      The word "toolbar" is appended automatically and should not be contained below! -->
 <!ENTITY tabsToolbar.label "Browser tabs">
 
 <!-- LOCALIZATION NOTE (syncTabsMenu3.label): This appears in the history menu -->
 <!ENTITY syncTabsMenu3.label     "Synced Tabs">
@@ -998,32 +978,16 @@ you can use these alternative items. Oth
 <!ENTITY contentBlocking.breakageReportView.learnMore "Learn More">
 <!ENTITY contentBlocking.breakageReportView.collection.url.label "URL">
 <!ENTITY contentBlocking.breakageReportView.collection.userAgent.label "&brandShortName; Version Number">
 <!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.detectedBlocked3 "&brandShortName; is blocking parts of the page that may track your browsing.">
-<!ENTITY trackingProtection.detectedNotBlocked3 "This site includes elements that may track your browsing. You have disabled protection.">
-<!ENTITY trackingProtection.notDetected3 "No tracking elements detected on this page.">
-<!-- LOCALIZATION NOTE (trackingProtection.unblock.label, trackingProtection.unblock.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.unblock.label "Disable protection for this site">
-<!ENTITY trackingProtection.unblock.accesskey "D">
-<!-- LOCALIZATION NOTE (trackingProtection.unblockPrivate.label, trackingProtection.unblockPrivate.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.unblockPrivate.label "Disable protection for this session">
-<!ENTITY trackingProtection.unblockPrivate.accesskey "D">
-<!ENTITY trackingProtection.block2.label "Enable protection">
-<!ENTITY trackingProtection.block2.accesskey "E">
-
 <!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.">
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -549,32 +549,27 @@ trackingProtection.toggle.enable.tooltip
 trackingProtection.toggle.disable.tooltip=Disable Tracking Protection
 trackingProtection.toggle.enable.pbmode.tooltip=Enable Tracking Protection in Private Browsing
 trackingProtection.toggle.disable.pbmode.tooltip=Disable Tracking Protection in Private Browsing
 
 trackingProtection.icon.activeTooltip=Tracking attempts blocked
 trackingProtection.icon.disabledTooltip=Tracking content detected
 
 # Edit Bookmark UI
-editBookmarkPanel.pageBookmarkedTitle=Page Bookmarked
-editBookmarkPanel.pageBookmarkedDescription=%S will always remember this page for you.
-editBookmarkPanel.bookmarkedRemovedTitle=Bookmark Removed
 editBookmarkPanel.newBookmarkTitle=New Bookmark
 editBookmarkPanel.editBookmarkTitle=Edit This Bookmark
-
 editBookmarkPanel.cancel.label=Cancel
 editBookmarkPanel.cancel.accesskey=C
 
 # LOCALIZATION NOTE (editBookmark.removeBookmarks.label): Semicolon-separated list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # Replacement for #1 is the number of bookmarks to be removed.
 # If this causes problems with localization you can also do "Remove Bookmarks (#1)"
 # instead of "Remove #1 Bookmarks".
 editBookmark.removeBookmarks.label=Remove Bookmark;Remove #1 Bookmarks
-
 editBookmark.removeBookmarks.accesskey=R
 
 # Post Update Notifications
 pu.notifyButton.label=Details…
 pu.notifyButton.accesskey=D
 # LOCALIZATION NOTE %S will be replaced by the short name of the application.
 puNotifyText=%S has been updated
 puAlertTitle=%S Updated
--- a/browser/chrome/browser/places/editBookmarkOverlay.dtd
+++ b/browser/chrome/browser/places/editBookmarkOverlay.dtd
@@ -11,18 +11,16 @@
 <!ENTITY editBookmarkOverlay.siteLocation.label              "Site Location:">
 <!ENTITY editBookmarkOverlay.siteLocation.accesskey          "S">
 <!ENTITY editBookmarkOverlay.folder.label                    "Folder:">
 <!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.description.label               "Description:">
-<!ENTITY editBookmarkOverlay.description.accesskey           "D">
 <!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
@@ -73,17 +73,16 @@
 <!ENTITY cmd.reloadLivebookmark.label      "Reload Live Bookmark">
 <!ENTITY cmd.reloadLivebookmark.accesskey  "R">
 
 <!ENTITY col.name.label          "Name">
 <!ENTITY col.tags.label          "Tags">
 <!ENTITY col.url.label           "Location">
 <!ENTITY col.mostrecentvisit.label "Most Recent Visit">
 <!ENTITY col.visitcount.label    "Visit Count">
-<!ENTITY col.description.label   "Description">
 <!ENTITY col.dateadded.label     "Added">
 <!ENTITY col.lastmodified.label  "Last Modified">
 
 <!ENTITY historySearch.placeholder  "Search history">
 <!ENTITY bookmarksSearch.placeholder  "Search bookmarks">
 
 <!ENTITY cmd.find.key  "f">
 
--- a/browser/chrome/browser/places/places.properties
+++ b/browser/chrome/browser/places/places.properties
@@ -31,18 +31,16 @@ sortByNameGeneric=Sort by Name
 view.sortBy.1.name.label=Sort by Name
 view.sortBy.1.name.accesskey=N
 view.sortBy.1.url.label=Sort by Location
 view.sortBy.1.url.accesskey=L
 view.sortBy.1.date.label=Sort by Most Recent Visit
 view.sortBy.1.date.accesskey=V
 view.sortBy.1.visitCount.label=Sort by Visit Count
 view.sortBy.1.visitCount.accesskey=C
-view.sortBy.1.description.label=Sort by Description
-view.sortBy.1.description.accesskey=D
 view.sortBy.1.dateAdded.label=Sort by Added
 view.sortBy.1.dateAdded.accesskey=e
 view.sortBy.1.lastModified.label=Sort by Last Modified
 view.sortBy.1.lastModified.accesskey=M
 view.sortBy.1.tags.label=Sort by Tags
 view.sortBy.1.tags.accesskey=T
 
 searchBookmarks=Search Bookmarks
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -4,87 +4,21 @@
 
 #### Security
 
 # LOCALIZATION NOTE: phishBefore uses %S to represent the name of the provider
 #                    whose privacy policy must be accepted (for enabling
 #                    check-every-page-as-I-load-it phishing protection).
 phishBeforeText=Selecting this option will send the address of web pages you are viewing to %S. To continue, please review and accept the following terms of service.
 
-#### Fonts
-
-labelDefaultFont=Default (%S)
-labelDefaultFontUnnamed=Default
-
-veryLargeMinimumFontTitle=Large minimum font size
-veryLargeMinimumFontWarning=You have selected a very large minimum font size (more than 24 pixels). This may make it difficult or impossible to use some important configuration pages like this one.
-acceptVeryLargeMinimumFont=Keep my changes anyway
-
-#### Permissions Manager
-
-trackingprotectionpermissionstext2=You have disabled Tracking Protection on these websites.
-trackingprotectionpermissionstitle=Exceptions - Tracking Protection
-cookiepermissionstext1=You can specify which websites are always or never allowed to use cookies and site data.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
-cookiepermissionstitle1=Exceptions - Cookies and Site Data
-addonspermissionstext=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.
-addons_permissions_title2=Allowed Websites - Add-ons Installation
-popuppermissionstext=You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow.
-popuppermissionstitle2=Allowed Websites - Pop-ups
-notificationspermissionstext6=The following websites have requested to send you notifications. You can specify which websites are allowed to send you notifications. You can also block new requests asking to allow notifications.
-notificationspermissionstitle2=Settings - Notification Permissions
-notificationspermissionsdisablelabel=Block new requests asking to allow notifications
-notificationspermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to send notifications. Blocking notifications may break some website features.
-locationpermissionstext2=The following websites have requested to access your location. You can specify which websites are allowed to access your location. You can also block new requests asking to access your location.
-locationpermissionstitle=Settings - Location Permissions
-locationpermissionsdisablelabel=Block new requests asking to access your location
-locationpermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to access your location. Blocking access to your location may break some website features.
-camerapermissionstext2=The following websites have requested to access your camera. You can specify which websites are allowed to access your camera. You can also block new requests asking to access your camera.
-camerapermissionstitle=Settings - Camera Permissions
-camerapermissionsdisablelabel=Block new requests asking to access your camera
-camerapermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to access your camera. Blocking access to your camera may break some website features.
-microphonepermissionstext2=The following websites have requested to access your microphone. You can specify which websites are allowed to access your microphone. You can also block new requests asking to access your microphone.
-microphonepermissionstitle=Settings - Microphone Permissions
-microphonepermissionsdisablelabel=Block new requests asking to access your microphone
-microphonepermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to access your microphone. Blocking access to your microphone may break some website features.
-invalidURI=Please enter a valid hostname
-invalidURITitle=Invalid Hostname Entered
-savedLoginsExceptions_title=Exceptions - Saved Logins
-savedLoginsExceptions_desc3=Logins for the following websites will not be saved
-
-#### Block List Manager
-
-# LOCALIZATION NOTE (mozNameTemplate): This template constructs the name of the
-# block list in the block lists dialog. It combines the list name and
-# description.
-#   e.g. mozNameTemplate : "Standard (Recommended). This list does a pretty good job."
-#   %1$S = list name (fooName), %2$S = list descriptive text (fooDesc)
-mozNameTemplate=%1$S %2$S
-# LOCALIZATION NOTE (mozstdName, etc.): These labels appear in the tracking
-# protection block lists dialog, mozNameTemplate is used to create the final
-# string. Note that in the future these two strings (name, desc) could be
-# displayed on two different lines.
-mozstdName=Disconnect.me basic protection (Recommended).
-mozstdDesc=Allows some trackers so websites function properly.
-mozfullName=Disconnect.me strict protection.
-mozfullDesc2=Blocks known trackers. Some websites may not function properly.
-
 #### Master Password
 
 pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
 pw_change_failed_title=Password Change Failed
 
-#### Fonts
-
-# LOCALIZATION NOTE: The string represents a localized locale name
-#   followed by the BCP47 locale code.
-#
-# Example: "French (Canada)  [fr-ca]"
-#   %1$S = locale name, %2$S = locale code
-languageCodeFormat=%1$S  [%2$S]
-
 #### Downloads
 
 desktopFolderName=Desktop
 downloadsFolderName=Downloads
 chooseDownloadFolderTitle=Choose Download Folder:
 
 #### Applications
 
@@ -121,42 +55,16 @@ typeDescriptionWithType=%S (%S)
 #### Permission labels
 
 can=Allow
 canAccessFirstParty=Allow first party only
 canSession=Allow for Session
 cannot=Block
 prompt=Always Ask
 
-#### Site Data Manager
-
-# LOCALIZATION NOTE (totalSiteDataSize2, siteUsage, siteUsagePersistent):
-#   This is the total usage of site data, where we insert storage size and unit.
-#   e.g., "The total usage is currently 200 MB"
-#   %1$S = size
-#   %2$S = unit (MB, KB, etc.)
-totalSiteDataSize2=Your stored cookies, site data and cache are currently using %1$S %2$S of disk space.
-siteUsage=%1$S %2$S
-siteUsagePersistent=%1$S %2$S (Persistent)
-loadingSiteDataSize1=Calculating site data and cache size…
-
-acceptRemove=Remove
-# LOCALIZATION NOTE (siteDataSettings3.description): %S = brandShortName
-siteDataSettings3.description=The following websites store cookies and site data on your computer. %S keeps data from websites with persistent storage until you delete it, and deletes data from websites with non-persistent storage as space is needed.
-# LOCALIZATION NOTE (removeAllSiteData, removeAllSiteDataShown):
-# removeAllSiteData and removeAllSiteDataShown are both used on the same one button,
-# never displayed together and can share the same accesskey.
-# When only partial sites are shown as a result of keyword search,
-# removeAllShown is displayed as button label.
-# removeAll is displayed when no keyword search and all sites are shown.
-removeAllSiteData.label=Remove All
-removeAllSiteData.accesskey=e
-removeAllSiteDataShown.label=Remove All Shown
-removeAllSiteDataShown.accesskey=e
-
 spaceAlert.learnMoreButton.label=Learn More
 spaceAlert.learnMoreButton.accesskey=L
 spaceAlert.over5GB.prefButton.label=Open Preferences
 spaceAlert.over5GB.prefButton.accesskey=O
 # LOCALIZATION NOTE (spaceAlert.over5GB.prefButtonWin.label): On Windows Preferences is called Options
 spaceAlert.over5GB.prefButtonWin.label=Open Options
 spaceAlert.over5GB.prefButtonWin.accesskey=O
 # LOCALIZATION NOTE (spaceAlert.over5GB.message1): %S = brandShortName
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -8,18 +8,16 @@
      The column width should be set at half of the dialog width. -->
 <!ENTITY sanitizePrefs2.modal.width    "34em">
 <!ENTITY sanitizePrefs2.column.width   "17em">
 
 <!ENTITY sanitizeDialog2.title         "Clear Recent History">
 <!-- LOCALIZATION NOTE (sanitizeDialog2.width): width of the Clear Recent History dialog -->
 <!ENTITY sanitizeDialog2.width         "34em">
 
-<!ENTITY clearDataSettings3.label     "When I quit &brandShortName;, it should automatically clear all">
-
 <!ENTITY clearDataSettings4.label     "When closed, &brandShortName; should automatically clear all">
 
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
 <!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
      See UI mockup at bug 480169 -->
 <!ENTITY clearTimeDuration.label          "Time range to clear: ">
 <!ENTITY clearTimeDuration.accesskey      "T">
 <!ENTITY clearTimeDuration.lastHour       "Last Hour">
--- a/browser/chrome/browser/search.properties
+++ b/browser/chrome/browser/search.properties
@@ -29,17 +29,16 @@ cmd_showSuggestions_accesskey=S
 cmd_addFoundEngine=Add “%S”
 # LOCALIZATION NOTE (cmd_addFoundEngineMenu): When more than 5 engines
 # are offered by a web page, instead of listing all of them in the
 # search panel using the cmd_addFoundEngine string, they will be
 # grouped in a submenu using cmd_addFoundEngineMenu as a label.
 cmd_addFoundEngineMenu=Add search engine
 
 searchAddFoundEngine2=Add Search Engine
-searchAddedFoundEngine2=Added Search Engine
 
 # LOCALIZATION NOTE (searchForSomethingWith2):
 # This string is used to build the header above the list of one-click
 # search providers:  "Search for <user-typed string> with:"
 searchForSomethingWith2=Search for %S with:
 
 # LOCALIZATION NOTE (searchWithHeader):
 # The wording of this string should be as close as possible to
--- a/browser/chrome/browser/syncSetup.properties
+++ b/browser/chrome/browser/syncSetup.properties
@@ -3,20 +3,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Several other strings are used (via Weave.Status.login), but they come from
 #  /services/sync
 
 # Firefox Accounts based setup.
 continue.label = Continue
 
-# LOCALIZATION NOTE (disconnect.label, disconnect.verify.title, disconnect.verify.bodyHeading, disconnect.verify.bodyText):
-# These strings are used in the confirmation dialog shown when the user hits the disconnect button
-# LOCALIZATION NOTE (disconnect.label): This is the label for the disconnect button
-disconnect.label = Disconnect
-disconnect.verify.title = Disconnect
-disconnect.verify.bodyHeading = Disconnect from Sync?
-disconnect.verify.bodyText = Your browsing data will remain on this computer, but it will no longer sync with your account.
-
 relinkVerify.title = Merge Warning
 relinkVerify.heading = Are you sure you want to sign in to Sync?
 # LOCALIZATION NOTE (relinkVerify.description): Email address of a user previously signed into sync.
 relinkVerify.description = A different user was previously signed in to Sync on this computer. Signing in will merge this browser’s bookmarks, passwords and other settings with %S
--- a/devtools/client/aboutdebugging.properties
+++ b/devtools/client/aboutdebugging.properties
@@ -48,21 +48,16 @@ addonDebugging.label = Enable add-on deb
 addonDebugging.tooltip = Turning this on will allow you to debug add-ons and various other parts of the browser chrome
 
 # LOCALIZATION NOTE (addonDebugging.learnMore):
 # This string is displayed as a link next to addonDebugging.label and leads the user to
 # the MDN documentation page for about:debugging.
 # (https://developer.mozilla.org/docs/Tools/about:debugging#Enabling_add-on_debugging)
 addonDebugging.learnMore = Learn more
 
-# LOCALIZATION NOTE (loadTemporaryAddon):
-# This string is displayed as a label of a button that allows the user to
-# load additional add-ons.
-loadTemporaryAddon = Load Temporary Add-on
-
 # LOCALIZATION NOTE (loadTemporaryAddon2):
 # This string is displayed as a label of a button that allows the user to
 # load additional add-ons.
 loadTemporaryAddon2 = Load Temporary Add-on…
 
 # LOCALIZATION NOTE (addonInstallError):
 # This string is displayed when an error occurs while installing an addon.
 # %S will be replaced with the error message.
deleted file mode 100644
--- a/devtools/client/appcacheutils.properties
+++ /dev/null
@@ -1,121 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# LOCALIZATION NOTE These strings are used inside the Web Console
-# command line which is available from the Web Developer sub-menu
-# -> 'Web Console'.
-# These messages are displayed when an attempt is made to validate a
-# page or a cache manifest using AppCacheUtils.jsm
-
-# 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 (noManifest): the specified page has no cache manifest.
-noManifest=The specified page has no manifest.
-
-# LOCALIZATION NOTE (notUTF8): the associated cache manifest has a character
-# encoding that is not UTF-8. Parameters: %S is the current encoding.
-notUTF8=Manifest has a character encoding of %S. Manifests must have the utf-8 character encoding.
-
-# LOCALIZATION NOTE (badMimeType): the associated cache manifest has a
-# mimetype that is not text/cache-manifest. Parameters: %S is the current
-# mimetype.
-badMimeType=Manifest has a mimetype of %S. Manifests must have a mimetype of text/cache-manifest.
-
-# LOCALIZATION NOTE (duplicateURI): the associated cache manifest references
-# the same URI from multiple locations. Parameters: %1$S is the URI, %2$S is a
-# list of references to this URI.
-duplicateURI=URI %1$S is referenced in multiple locations. This is not allowed: %2$S.
-
-# LOCALIZATION NOTE (networkBlocksURI, fallbackBlocksURI): the associated
-# cache manifest references the same URI in the NETWORK (or FALLBACK) section
-# as it does in other sections. Parameters: %1$S is the line number, %2$S is
-# the resource name, %3$S is the line number, %4$S is the resource name, %5$S
-# is the section name.
-networkBlocksURI=NETWORK section line %1$S (%2$S) prevents caching of line %3$S (%4$S) in the %5$S section.
-fallbackBlocksURI=FALLBACK section line %1$S (%2$S) prevents caching of line %3$S (%4$S) in the %5$S section.
-
-# LOCALIZATION NOTE (fileChangedButNotManifest): the associated cache manifest
-# references a URI that has a file modified after the cache manifest.
-# Parameters: %1$S is the resource name, %2$S is the cache manifest, %3$S is
-# the line number.
-fileChangedButNotManifest=The file %1$S was modified after %2$S. Unless the text in the manifest file is changed the cached version will be used instead at line %3$S.
-
-# LOCALIZATION NOTE (cacheControlNoStore): the specified page has a header
-# preventing caching or storing information. Parameters: %1$S is the resource
-# name, %2$S is the line number.
-cacheControlNoStore=%1$S has cache-control set to no-store. This will prevent the application cache from storing the file at line %2$S.
-
-# LOCALIZATION NOTE (notAvailable): the specified resource is not available.
-# Parameters: %1$S is the resource name, %2$S is the line number.
-notAvailable=%1$S points to a resource that is not available at line %2$S.
-
-# LOCALIZATION NOTE (invalidURI): it's used when an invalid URI is passed to
-# the appcache.
-invalidURI=The URI passed to AppCacheUtils is invalid.
-
-# LOCALIZATION NOTE (noResults): it's used when a search returns no results.
-noResults=Your search returned no results.
-
-# LOCALIZATION NOTE (cacheDisabled): it's used when the cache is disabled and
-# an attempt is made to view offline data.
-cacheDisabled=Your disk cache is disabled. Please set browser.cache.disk.enable to true in about:config and try again.
-
-# LOCALIZATION NOTE (firstLineMustBeCacheManifest): the associated cache
-# manifest has a first line that is not "CACHE MANIFEST". Parameters: %S is
-# the line number.
-firstLineMustBeCacheManifest=The first line of the manifest must be “CACHE MANIFEST” at line %S.
-
-# LOCALIZATION NOTE (cacheManifestOnlyFirstLine2): the associated cache
-# manifest has "CACHE MANIFEST" on a line other than the first line.
-# Parameters: %S is the line number where "CACHE MANIFEST" appears.
-cacheManifestOnlyFirstLine2=“CACHE MANIFEST” is only valid on the first line but was found at line %S.
-
-# LOCALIZATION NOTE (asteriskInWrongSection2): the associated cache manifest
-# has an asterisk (*) in a section other than the NETWORK section. Parameters:
-# %1$S is the section name, %2$S is the line number.
-asteriskInWrongSection2=Asterisk (*) incorrectly used in the %1$S section at line %2$S. If a line in the NETWORK section contains only a single asterisk character, then any URI not listed in the manifest will be treated as if the URI was listed in the NETWORK section. Otherwise such URIs will be treated as unavailable. Other uses of the * character are prohibited.
-
-# LOCALIZATION NOTE (escapeSpaces1): the associated cache manifest has a space
-# in a URI. Spaces must be replaced with %20. Parameters: %S is the line
-# number where this error occurs.
-# %% will be displayed as a single % character (% is commonly used to define
-# format specifiers, so it needs to be escaped).
-escapeSpaces1=Spaces in URIs need to be replaced with %%20 at line %S.
-
-# LOCALIZATION NOTE (slashDotDotSlashBad): the associated cache manifest has a
-# URI containing /../, which is invalid. Parameters: %S is the line number
-# where this error occurs.
-slashDotDotSlashBad=/../ is not a valid URI prefix at line %S.
-
-# LOCALIZATION NOTE (tooManyDotDotSlashes): the associated cache manifest has
-# a URI containing too many ../ operators. Too many of these operators mean
-# that the file would be below the root of the site, which is not possible.
-# Parameters: %S is the line number where this error occurs.
-tooManyDotDotSlashes=Too many dot dot slash operators (../) at line %S.
-
-# LOCALIZATION NOTE (fallbackUseSpaces): the associated cache manifest has a
-# FALLBACK section containing more or less than the standard two URIs
-# separated by a single space. Parameters: %S is the line number where this
-# error occurs.
-fallbackUseSpaces=Only two URIs separated by spaces are allowed in the FALLBACK section at line %S.
-
-# LOCALIZATION NOTE (fallbackAsterisk2): the associated cache manifest has a
-# FALLBACK section that attempts to use an asterisk (*) as a wildcard. In this
-# section the URI is simply a path prefix. Parameters: %S is the line number
-# where this error occurs.
-fallbackAsterisk2=Asterisk (*) incorrectly used in the FALLBACK section at line %S. URIs in the FALLBACK section simply need to match a prefix of the request URI.
-
-# LOCALIZATION NOTE (settingsBadValue): the associated cache manifest has a
-# SETTINGS section containing something other than the valid "prefer-online"
-# or "fast". Parameters: %S is the line number where this error occurs.
-settingsBadValue=The SETTINGS section may only contain a single value, “prefer-online” or “fast” at line %S.
-
-# LOCALIZATION NOTE (invalidSectionName): the associated cache manifest
-# contains an invalid section name. Parameters: %1$S is the section name, %2$S
-# is the line number.
-invalidSectionName=Invalid section name (%1$S) at line %2$S.
--- a/devtools/client/boxmodel.properties
+++ b/devtools/client/boxmodel.properties
@@ -10,24 +10,16 @@
 # 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 (boxmodel.title) This is the title of the box model panel and is
 # displayed as a label.
 boxmodel.title=Box Model
 
-# LOCALIZATION NOTE (boxmodel.position) This refers to the position in the box model and
-# might be displayed as a label or as a tooltip.
-boxmodel.position=position
-
-# LOCALIZATION NOTE (boxmodel.content) This refers to the content in the box model and
-# might be displayed as a label or as a tooltip.
-boxmodel.content=content
-
 # LOCALIZATION NOTE: (boxmodel.geometryButton.tooltip) This label is displayed as a
 # tooltip that appears when hovering over the button that allows users to edit the
 # position of an element in the page.
 boxmodel.geometryButton.tooltip=Edit position
 
 # LOCALIZATION NOTE: (boxmodel.propertiesLabel) This label is displayed as the header
 # for showing and collapsing the properties underneath the box model in the layout view
 boxmodel.propertiesLabel=Box Model Properties
--- a/devtools/client/menus.properties
+++ b/devtools/client/menus.properties
@@ -36,19 +36,16 @@ 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
 
-devToolbarMenu.label = Developer Toolbar
-devToolbarMenu.accesskey = v
-
 webide.label = WebIDE
 webide.accesskey = W
 
 devToolboxMenuItem.label = Toggle Tools
 devToolboxMenuItem.accesskey = T
 
 getMoreDevtoolsCmd.label = Get More Tools
 getMoreDevtoolsCmd.accesskey = M
--- a/devtools/client/performance.properties
+++ b/devtools/client/performance.properties
@@ -58,24 +58,21 @@ graphs.ms=ms
 # AS SHORT AS POSSIBLE so it doesn't obstruct important parts of the graph.
 graphs.memory=MB
 
 # LOCALIZATION NOTE (category.*):
 # These strings are displayed in the categories graph of the Performance Tools,
 # as the legend for each block in every bar. These labels should be kept
 # AS SHORT AS POSSIBLE so they don't obstruct important parts of the graph.
 category.other=Gecko
-category.css=Styles
 category.layout=Layout
 category.js=JIT
 category.gc=GC
 category.network=Network
 category.graphics=Graphics
-category.storage=Storage
-category.events=Input & Events
 category.dom=DOM
 category.idle=Idle
 category.tools=Tools
 
 # LOCALIZATION NOTE (table.bytes):
 # This string is displayed in the call tree after bytesize units.
 # %S represents the value in bytes.
 table.bytes=%S B
--- a/devtools/client/responsive.properties
+++ b/devtools/client/responsive.properties
@@ -65,21 +65,16 @@ responsive.screenshot=Take a screenshot 
 # second argument (%2$S) is the time string in HH.MM.SS format.
 responsive.screenshotGeneratedFilename=Screen Shot %1$S at %2$S
 
 # LOCALIZATION NOTE (responsive.remoteOnly): Message displayed in the tab's
 # notification box if a user tries to open Responsive Design Mode in a
 # non-remote tab.
 responsive.remoteOnly=Responsive Design Mode is only available for remote browser tabs, such as those used for web content in multi-process Firefox.
 
-# LOCALIZATION NOTE (responsive.noContainerTabs): Message displayed in the tab's
-# notification box if a user tries to open Responsive Design Mode in a
-# container tab.
-responsive.noContainerTabs=Responsive Design Mode is currently unavailable in container tabs.
-
 # LOCALIZATION NOTE (responsive.changeDevicePixelRatio): Tooltip for the
 # device pixel ratio dropdown when is enabled.
 responsive.changeDevicePixelRatio=Change device pixel ratio of the viewport
 
 # LOCALIZATION NOTE (responsive.devicePixelRatio.auto): Tooltip for the device pixel ratio
 # dropdown when it is disabled because a device is selected.
 # The argument (%1$S) is the selected device (e.g. iPhone 6) that set
 # automatically the device pixel ratio value.
--- a/devtools/client/toolbox.properties
+++ b/devtools/client/toolbox.properties
@@ -1,41 +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 (toolboxToggleButton.errors): Semi-colon list of plural
-# forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of errors in the current web page
-toolboxToggleButton.errors=#1 error;#1 errors
-
-# LOCALIZATION NOTE (toolboxToggleButton.warnings): Semi-colon list of plural
-# forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of warnings in the current web page
-toolboxToggleButton.warnings=#1 warning;#1 warnings
-
-# LOCALIZATION NOTE (toolboxToggleButton.tooltip): This string is shown
-# as tooltip in the developer toolbar to open/close the developer tools.
-# It's using toolboxToggleButton.errors as first and
-# toolboxToggleButton.warnings as second argument to show the number of errors
-# and warnings.
-toolboxToggleButton.tooltip=%1$S, %2$S\nClick to toggle the developer tools.
-
-# LOCALIZATION NOTE (toolbar.closeButton.tooltip)
-# Used as a message in tooltip when overing the close button of the Developer
-# Toolbar.
-toolbar.closeButton.tooltip=Close Developer Toolbar
-
-# LOCALIZATION NOTE (toolbar.toolsButton.tooltip)
-# Used as a message in tooltip when overing the wrench icon of the Developer
-# Toolbar, which toggle the developer toolbox.
-toolbar.toolsButton.tooltip=Toggle developer tools
-
 # LOCALIZATION NOTE (toolbox.titleTemplate1): This is the template
 # used to format the title of the toolbox.
 # The URL of the page being targeted: %1$S.
 toolbox.titleTemplate1=Developer Tools - %1$S
 
 # LOCALIZATION NOTE (toolbox.titleTemplate2): This is the template
 # used to format the title of the toolbox.
 # The page title or other name for the thing being targeted: %1$S
@@ -106,17 +77,16 @@ toolbox.nextTool.key=CmdOrCtrl+]
 # Key shortcut used to select the previous tool
 toolbox.previousTool.key=CmdOrCtrl+[
 
 # LOCALIZATION NOTE (toolbox.zoom*.key)
 # Key shortcuts used to zomm in/out or reset the toolbox
 # Should match fullZoom*Cmd.commandkey values from browser.dtd
 toolbox.zoomIn.key=CmdOrCtrl+Plus
 toolbox.zoomIn2.key=CmdOrCtrl+=
-toolbox.zoomIn3.key=
 
 toolbox.zoomOut.key=CmdOrCtrl+-
 toolbox.zoomOut2.key=
 
 toolbox.zoomReset.key=CmdOrCtrl+0
 toolbox.zoomReset2.key=
 
 # LOCALIZATION NOTE (toolbox.reload*.key)
@@ -151,17 +121,16 @@ toolbox.showFrames.key=Alt+Down
 # LOCALIZATION NOTE (toolbox.meatballMenu.button.tooltip): This is the tooltip
 # for the "..." button on the developer tools toolbox.
 toolbox.meatballMenu.button.tooltip=Customize Developer Tools and Get Help
 
 # LOCALIZATION NOTE (toolbox.meatballMenu.dock.*.label): These labels are shown
 # in the "..." menu in the toolbox and represent the different arrangements for
 # docking (or undocking) the developer tools toolbox.
 toolbox.meatballMenu.dock.bottom.label=Dock to Bottom
-toolbox.meatballMenu.dock.side.label=Dock to side
 toolbox.meatballMenu.dock.left.label=Dock to Left
 toolbox.meatballMenu.dock.right.label=Dock to Right
 toolbox.meatballMenu.dock.separateWindow.label=Separate Window
 
 # LOCALIZATION NOTE (toolbox.meatballMenu.{splitconsole,hideconsole}.label):
 # These are the labels in the "..." menu in the toolbox for toggling the split
 # console window.
 # The keyboard shortcut will be shown to the side of the label.
--- a/devtools/shared/gclicommands.properties
+++ b/devtools/shared/gclicommands.properties
@@ -13,21 +13,19 @@
 # documentation on web development on the web.
 
 # LOCALIZATION NOTE (helpDesc) A very short string used to describe the
 # function of the help command.
 helpDesc=Get help on the available commands
 
 # LOCALIZATION NOTE (helpAvailable) Used in the output of the help command to
 # explain the contents of the command help table.
-helpAvailable=Available Commands
 
 # LOCALIZATION NOTE (notAvailableInE10S) Used in the output of any command that
 # is not compatible with multiprocess mode (E10S).
-notAvailableInE10S=The command ‘%1$S’ is not available in multiprocess mode (E10S)
 
 # LOCALIZATION NOTE (consoleDesc) A very short string used to describe the
 # function of the console command.
 consoleDesc=Commands to control the console
 
 # LOCALIZATION NOTE (consoleManual) A longer description describing the
 # set of commands that control the console.
 consoleManual=Filter, clear and close the web console
@@ -149,152 +147,16 @@ screenshotImgurManual=Use if you want to
 # encountering error while uploading the screenshot to imgur.com.
 screenshotImgurError=Could not reach imgur API
 
 # LOCALIZATION NOTE (screenshotImgurUploaded) Text displayed to user when the
 # screenshot is successfully sent to Imgur but the program is waiting on a response.
 # The argument (%1$S) is a new image URL at Imgur.
 screenshotImgurUploaded=Uploaded to %1$S
 
-# LOCALIZATION NOTE (highlightDesc) A very short description of the
-# 'highlight' command. See highlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-highlightDesc=Highlight nodes
-
-# LOCALIZATION NOTE (highlightManual) A fuller description of the 'highlight'
-# command, displayed when the user asks for help on what it does.
-highlightManual=Highlight nodes that match a selector on the page
-
-# LOCALIZATION NOTE (highlightSelectorDesc) A very short string to describe
-# the 'selector' parameter to the 'highlight' command, which is displayed in
-# a dialog when the user is using this command.
-highlightSelectorDesc=CSS selector
-
-# LOCALIZATION NOTE (highlightSelectorManual) A fuller description of the
-# 'selector' parameter to the 'highlight' command, displayed when the user
-# asks for help on what it does.
-highlightSelectorManual=The CSS selector used to match nodes in the page
-
-# LOCALIZATION NOTE (highlightOptionsDesc) The title of a set of options to
-# the 'highlight' command, displayed as a heading to the list of option.
-highlightOptionsDesc=Options
-
-# LOCALIZATION NOTE (highlightHideGuidesDesc) A very short string to describe
-# the 'hideguides' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightHideGuidesDesc=Hide guides
-
-# LOCALIZATION NOTE (highlightHideGuidesManual) A fuller description of the
-# 'hideguides' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightHideGuidesManual=Hide the guides around the highlighted node
-
-# LOCALIZATION NOTE (highlightShowInfoBarDesc) A very short string to describe
-# the 'showinfobar' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightShowInfoBarDesc=Show the node infobar
-
-# LOCALIZATION NOTE (highlightShowInfoBarManual) A fuller description of the
-# 'showinfobar' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightShowInfoBarManual=Show the infobar above the highlighted node (the infobar displays the tagname, attributes and dimension)
-
-# LOCALIZATION NOTE (highlightShowAllDesc) A very short string to describe
-# the 'showall' option parameter to the 'highlight' command, which is
-# displayed in a dialog when the user is using this command.
-highlightShowAllDesc=Show all matches
-
-# LOCALIZATION NOTE (highlightShowAllManual) A fuller description of the
-# 'showall' option parameter to the 'highlight' command, displayed when the
-# user asks for help on what it does.
-highlightShowAllManual=If too many nodes match the selector, only the first 100 will be shown to avoid slowing down the page too much. Use this option to show all matches instead
-
-# LOCALIZATION NOTE (highlightRegionDesc) A very short string to describe the
-# 'region' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightRegionDesc=Box model region
-
-# LOCALIZATION NOTE (highlightRegionManual) A fuller description of the 'region'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightRegionManual=Which box model region should be highlighted: ‘content’, ‘padding’, ‘border’ or ‘margin’
-
-# LOCALIZATION NOTE (highlightFillDesc) A very short string to describe the
-# 'fill' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightFillDesc=Fill style
-
-# LOCALIZATION NOTE (highlightFillManual) A fuller description of the 'fill'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightFillManual=Override the default region fill style with a custom color
-
-# LOCALIZATION NOTE (highlightKeepDesc) A very short string to describe the
-# 'keep' option parameter to the 'highlight' command, which is displayed in a
-# dialog when the user is using this command.
-highlightKeepDesc=Keep existing highlighters
-
-# LOCALIZATION NOTE (highlightKeepManual) A fuller description of the 'keep'
-# option parameter to the 'highlight' command, displayed when the user asks for
-# help on what it does.
-highlightKeepManual=By default, existing highlighters are hidden when running the command, unless this option is set
-
-# LOCALIZATION NOTE (highlightOutputConfirm2) A confirmation message for the
-# 'highlight' command, displayed to the user once the command has been entered,
-# informing the user how many nodes have been highlighted successfully and how
-# to turn highlighting off
-highlightOutputConfirm2=%1$S node highlighted;%1$S nodes highlighted
-
-# LOCALIZATION NOTE (highlightOutputMaxReached) A confirmation message for the
-# 'highlight' command, displayed to the user once the command has been entered,
-# informing the user how many nodes have been highlighted successfully and that
-# some nodes could not be highlighted due to the maximum number of nodes being
-# reached, and how to turn highlighting off
-highlightOutputMaxReached=%1$S nodes matched, but only %2$S nodes highlighted. Use ‘--showall’ to show all
-
-# LOCALIZATION NOTE (unhighlightDesc) A very short description of the
-# 'unhighlight' command. See unhighlightManual for a fuller description of what
-# it does. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-unhighlightDesc=Unhighlight all nodes
-
-# LOCALIZATION NOTE (unhighlightManual) A fuller description of the 'unhighlight'
-# command, displayed when the user asks for help on what it does.
-unhighlightManual=Unhighlight all nodes previously highlighted with the ‘highlight’ command
-
-# LOCALIZATION NOTE (restartBrowserDesc) A very short description of the
-# 'restart' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-# The argument (%1$S) is the browser name.
-restartBrowserDesc=Restart %1$S
-
-# LOCALIZATION NOTE (restartBrowserNocacheDesc) A very short string to
-# describe the 'nocache' parameter to the 'restart' command, which is
-# displayed in a dialog when the user is using this command.
-restartBrowserNocacheDesc=Disables loading content from cache upon restart
-
-# LOCALIZATION NOTE (restartBrowserRequestCancelled) A string displayed to the
-# user when a scheduled restart has been aborted by the user.
-restartBrowserRequestCancelled=Restart request cancelled by user.
-
-# LOCALIZATION NOTE (restartBrowserRestarting) A string displayed to the
-# user when a restart has been initiated without a delay.
-# The argument (%1$S) is the browser name.
-restartBrowserRestarting=Restarting %1$S…
-
-# LOCALIZATION NOTE (restartBrowserGroupOptions) A label for the optional options of
-# the restart command.
-restartBrowserGroupOptions=Options
-
-# LOCALIZATION NOTE (restartBrowserSafemodeDesc) A very short string to
-# describe the 'safemode' parameter to the 'restart' command, which is
-# displayed in a dialog when the user is using this command.
-restartBrowserSafemodeDesc=Enables Safe Mode upon restart
-
 # LOCALIZATION NOTE (inspectDesc) A very short description of the 'inspect'
 # command. See inspectManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
 # is why it should be as short as possible.
 inspectDesc=Inspect a node
 
 # LOCALIZATION NOTE (inspectManual) A fuller description of the 'inspect'
 # command, displayed when the user asks for help on what it does.
@@ -519,21 +381,16 @@ editManual2=Edit one of the resources th
 # when the user is using this command.
 editResourceDesc=URL to edit
 
 # LOCALIZATION NOTE (editLineToJumpToDesc) A very short string to describe the
 # 'line' parameter to the 'edit' command, which is displayed in a dialog
 # when the user is using this command.
 editLineToJumpToDesc=Line to jump to
 
-# LOCALIZATION NOTE (resizePageDesc) A very short string to describe the
-# 'resizepage' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-resizePageDesc=Resize the page
-
 # LOCALIZATION NOTE (resizePageArgWidthDesc) A very short string to describe the
 # 'width' parameter to the 'resizepage' command, which is displayed in a dialog
 # when the user is using this command.
 resizePageArgWidthDesc=Width in pixels
 
 # LOCALIZATION NOTE (resizePageArgHeightDesc) A very short string to describe the
 # 'height' parameter to the 'resizepage' command, which is displayed in a dialog
 # when the user is using this command.
@@ -569,649 +426,16 @@ resizeModeToDesc=Alter page size
 # alongside the command name, which is why it should be as short as possible.
 resizeModeDesc=Control Responsive Design Mode
 
 # LOCALIZATION NOTE (resizeModeManual2) A fuller description of the 'resize'
 # command, displayed when the user asks for help on what it does.
 # The argument (%1$S) is the browser name.
 resizeModeManual2=Responsive websites respond to their environment, so they look good on a mobile display, a cinema display and everything in-between. Responsive Design Mode allows you to easily test a variety of page sizes in %1$S without needing to resize your whole browser.
 
-# LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdDesc=Manipulate the commands
-
-# LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdRefreshDesc=Re-read mozcmd directory
-
-# LOCALIZATION NOTE (cmdStatus3) When the we load new commands from mozcmd
-# directory, we report where we loaded from using %1$S.
-cmdStatus3=Loaded commands from ‘%1$S’
-
-# LOCALIZATION NOTE (cmdSetdirDesc)  A very short description of the 'cmd setdir'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-cmdSetdirDesc=Setup a mozcmd directory
-
-# LOCALIZATION NOTE (cmdSetdirManual3) A fuller description of the 'cmd setdir'
-# command, displayed when the user asks for help on what it does.
-cmdSetdirManual3=A ‘mozcmd’ directory is an easy way to create new custom commands. For more information see https://developer.mozilla.org/docs/Tools/GCLI/Customization
-
-# LOCALIZATION NOTE (cmdSetdirDirectoryDesc) The description of the directory
-# parameter to the 'cmd setdir' command.
-cmdSetdirDirectoryDesc=Directory containing .mozcmd files
-
-# LOCALIZATION NOTE (addonDesc) A very short description of the 'addon'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-addonDesc=Manipulate add-ons
-
-# LOCALIZATION NOTE (addonListDesc) A very short description of the 'addon list'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-addonListDesc=List installed add-ons
-
-# LOCALIZATION NOTE (addonListTypeDesc) A very short description of the
-# 'addon list <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonListTypeDesc=Select an add-on type
-
-# LOCALIZATION NOTE (addonListDictionaryHeading, addonListExtensionHeading,
-# addonListLocaleHeading, addonListPluginHeading, addonListThemeHeading,
-# addonListUnknownHeading) Used in the output of the 'addon list' command as the
-# first line of output.
-addonListDictionaryHeading=The following dictionaries are currently installed:
-addonListExtensionHeading=The following extensions are currently installed:
-addonListLocaleHeading=The following locales are currently installed:
-addonListPluginHeading=The following plugins are currently installed:
-addonListThemeHeading=The following themes are currently installed:
-addonListAllHeading=The following add-ons are currently installed:
-addonListUnknownHeading=The following add-ons of the selected type are currently installed:
-
-# LOCALIZATION NOTE (addonListOutEnable, addonListOutDisable) Used in the
-# output of the 'addon list' command as the labels for the enable/disable
-# action buttons in the listing. This string is designed to be shown in a
-# small action button next to the addon name, which is why it should be as
-# short as possible.
-addonListOutEnable=Enable
-addonListOutDisable=Disable
-
-# LOCALIZATION NOTE (addonPending, addonPendingEnable, addonPendingDisable,
-# addonPendingUninstall, addonPendingInstall, addonPendingUpgrade) Used in
-# the output of the 'addon list' command as the descriptions of pending
-# addon operations. addonPending is used as a prefix for a list of pending
-# actions (named by the other lookup variables). These strings are designed
-# to be shown alongside addon names, which is why they should be as short
-# as possible.
-addonPending=pending
-addonPendingEnable=enable
-addonPendingDisable=disable
-addonPendingUninstall=uninstall
-addonPendingInstall=install
-addonPendingUpgrade=upgrade
-
-# LOCALIZATION NOTE (addonNameDesc) A very short description of the
-# name parameter of numerous add-on commands. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-addonNameDesc=The name of the add-on
-
-# LOCALIZATION NOTE (addonNoneOfType) Used in the output of the 'addon list'
-# command when a search for add-ons of a particular type were not found.
-addonNoneOfType=There are no add-ons of that type installed.
-
-# LOCALIZATION NOTE (addonEnableDesc) A very short description of the
-# 'addon enable <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonEnableDesc=Enable the specified add-on
-
-# LOCALIZATION NOTE (addonAlreadyEnabled) Used in the output of the
-# 'addon enable' command when an attempt is made to enable an add-on that is
-# already enabled.
-addonAlreadyEnabled=%S is already enabled.
-
-# LOCALIZATION NOTE (addonEnabled) Used in the output of the 'addon enable'
-# command when an add-on is enabled.
-addonEnabled=%S enabled.
-
-# LOCALIZATION NOTE (addonDisableDesc) A very short description of the
-# 'addon disable <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonDisableDesc=Disable the specified add-on
-
-# LOCALIZATION NOTE (addonAlreadyDisabled) Used in the output of the
-# 'addon disable' command when an attempt is made to disable an add-on that is
-# already disabled.
-addonAlreadyDisabled=%S is already disabled.
-
-# LOCALIZATION NOTE (addonDisabled) Used in the output of the 'addon disable'
-# command when an add-on is disabled.
-addonDisabled=%S disabled.
-
-# LOCALIZATION NOTE (addonCtpDesc) A very short description of the
-# 'addon ctp <type>' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-addonCtpDesc=Set the specified plugin to click-to-play.
-
-# LOCALIZATION NOTE (addonCtp) Used in the output of the 'addon ctp'
-# command when a plugin is set to click-to-play.
-addonCtp=%S set to click-to-play.
-
-# LOCALIZATION NOTE (addonAlreadyCtp) Used in the output of the
-# 'addon ctp' command when an attempt is made to set a plugin to
-# click-to-play that is already set to click-to-play.
-addonAlreadyCtp=%S is already set to click-to-play.
-
-# LOCALIZATION NOTE (addonCantCtp) Used in the output of the 'addon
-# ctp' command when an attempt is made to set an addon to click-to-play,
-# but the addon is not a plugin.
-addonCantCtp=%S cannot be set to click-to-play because it is not a plugin.
-
-# LOCALIZATION NOTE (addonNoCtp) Used in the output of the 'addon
-# ctp' command when an attempt is made to set an addon to click-to-play,
-# but the plugin cannot be set to click-to-play for some reason.
-addonNoCtp=%S cannot be set to click-to-play.
-
-# LOCALIZATION NOTE (exportDesc) A very short description of the 'export'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-exportDesc=Export resources
-
-# LOCALIZATION NOTE (exportHtmlDesc) A very short description of the 'export
-# html' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible.
-exportHtmlDesc=Export HTML from page
-
-# LOCALIZATION NOTE (pagemodDesc) A very short description of the 'pagemod'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible.
-pagemodDesc=Make page changes
-
-# LOCALIZATION NOTE (pagemodReplaceDesc) A very short description of the
-# 'pagemod replace' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-pagemodReplaceDesc=Search and replace in page elements
-
-# LOCALIZATION NOTE (pagemodReplaceSearchDesc) A very short string to describe
-# the 'search' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceSearchDesc=What to search for
-
-# LOCALIZATION NOTE (pagemodReplaceReplaceDesc) A very short string to describe
-# the 'replace' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceReplaceDesc=Replacement string
-
-# LOCALIZATION NOTE (pagemodReplaceIgnoreCaseDesc) A very short string to
-# describe the 'ignoreCase' parameter to the 'pagemod replace' command, which is
-# displayed in a dialog when the user is using this command.
-pagemodReplaceIgnoreCaseDesc=Perform case-insensitive search
-
-# LOCALIZATION NOTE (pagemodReplaceRootDesc) A very short string to describe the
-# 'root' parameter to the 'pagemod replace' command, which is displayed in
-# a dialog when the user is using this command.
-pagemodReplaceRootDesc=CSS selector to root of search
-
-# LOCALIZATION NOTE (pagemodReplaceSelectorDesc) A very short string to describe
-# the 'selector' parameter to the 'pagemod replace' command, which is displayed
-# in a dialog when the user is using this command.
-pagemodReplaceSelectorDesc=CSS selector to match in search
-
-# LOCALIZATION NOTE (pagemodReplaceAttributesDesc) A very short string to
-# describe the 'attributes' parameter to the 'pagemod replace' command, which is
-# displayed in a dialog when the user is using this command.
-pagemodReplaceAttributesDesc=Attribute match regexp
-
-# LOCALIZATION NOTE (pagemodReplaceAttrOnlyDesc) A very short string to describe
-# the 'attrOnly' parameter to the 'pagemod replace' command, which is displayed
-# in a dialog when the user is using this command.
-pagemodReplaceAttrOnlyDesc=Restrict search to attributes
-
-# LOCALIZATION NOTE (pagemodReplaceContentOnlyDesc) A very short string to
-# describe the 'contentOnly' parameter to the 'pagemod replace' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodReplaceContentOnlyDesc=Restrict search to text nodes
-
-# LOCALIZATION NOTE (pagemodReplaceResult) A string displayed as
-# the result of the 'pagemod replace' command.
-pagemodReplaceResult=Elements matched by selector: %1$S. Replaces in text nodes: %2$S. Replaces in attributes: %3$S.
-
-# LOCALIZATION NOTE (pagemodRemoveDesc) A very short description of the
-# 'pagemod remove' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-pagemodRemoveDesc=Remove elements and attributes from page
-
-# LOCALIZATION NOTE (pagemodRemoveElementDesc) A very short description of the
-# 'pagemod remove element' command. This string is designed to be shown in
-# a menu alongside the command name, which is why it should be as short as
-# possible.
-pagemodRemoveElementDesc=Remove elements from page
-
-# LOCALIZATION NOTE (pagemodRemoveElementSearchDesc) A very short string to
-# describe the 'search' parameter to the 'pagemod remove element' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveElementSearchDesc=CSS selector specifying elements to remove
-
-# LOCALIZATION NOTE (pagemodRemoveElementRootDesc) A very short string to
-# describe the 'root' parameter to the 'pagemod remove element' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveElementRootDesc=CSS selector specifying root of search
-
-# LOCALIZATION NOTE (pagemodRemoveElementStripOnlyDesc) A very short string to
-# describe the 'stripOnly' parameter to the 'pagemod remove element' command,
-# which is displayed in a dialog when the user is using this command.
-pagemodRemoveElementStripOnlyDesc=Remove element, but leave content
-
-# LOCALIZATION NOTE (pagemodRemoveElementIfEmptyOnlyDesc) A very short string to
-# describe the 'ifEmptyOnly' parameter to the 'pagemod remove element' command,
-# which is displayed in a dialog when the user is using this command.
-pagemodRemoveElementIfEmptyOnlyDesc=Remove only empty elements
-
-# LOCALIZATION NOTE (pagemodRemoveElementResultMatchedAndRemovedElements)
-# A string displayed as the result of the 'pagemod remove element' command.
-pagemodRemoveElementResultMatchedAndRemovedElements=Elements matched by selector: %1$S. Elements removed: %2$S.
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeDesc) A very short description of the
-# 'pagemod remove attribute' command. This string is designed to be shown in
-# a menu alongside the command name, which is why it should be as short as
-# possible.
-pagemodRemoveAttributeDesc=Remove matching attributes
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeSearchAttributesDesc) A very short
-# string to describe the 'searchAttributes' parameter to the 'pagemod remove
-# attribute' command, which is displayed in a dialog when the user is using this
-# command.
-pagemodRemoveAttributeSearchAttributesDesc=Regexp specifying attributes to remove
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeSearchElementsDesc) A very short
-# string to describe the 'searchElements' parameter to the 'pagemod remove
-# attribute' command, which is displayed in a dialog when the user is using this
-# command.
-pagemodRemoveAttributeSearchElementsDesc=CSS selector of elements to include
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeRootDesc) A very short string to
-# describe the 'root' parameter to the 'pagemod remove attribute' command, which
-# is displayed in a dialog when the user is using this command.
-pagemodRemoveAttributeRootDesc=CSS selector of root of search
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeIgnoreCaseDesc) A very short string
-# to describe the 'ignoreCase' parameter to the 'pagemod remove attribute'
-# command, which is displayed in a dialog when the user is using this command.
-pagemodRemoveAttributeIgnoreCaseDesc=Perform case-insensitive search
-
-# LOCALIZATION NOTE (pagemodRemoveAttributeResult) A string displayed as the
-# result of the 'pagemod remove attribute' command.
-pagemodRemoveAttributeResult=Elements matched by selector: %1$S. Attributes removed: %2$S.
-
-# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
-# command, the parent command for tool-hacking commands.
-# The argument (%1$S) is the browser name.
-toolsDesc2=Hack the %1$S Developer Tools
-
-# LOCALIZATION NOTE (toolsManual2) A fuller description of the 'tools'
-# command. The argument (%1$S) is the browser name.
-toolsManual2=Various commands related to hacking directly on the %1$S Developer Tools.
-
-# LOCALIZATION NOTE (toolsSrcdirDesc) A very short description of the 'tools srcdir'
-# command, for pointing your developer tools loader at a mozilla-central source tree.
-toolsSrcdirDesc=Load tools from a mozilla-central checkout
-
-# LOCALIZATION NOTE (toolsSrcdirNotFound2) Shown when the 'tools srcdir' command was handed
-# an invalid srcdir.
-toolsSrcdirNotFound2=%1$S does not exist or is not a mozilla-central checkout.
-
-# LOCALIZATION NOTE (toolsSrcdirReloaded2) Displayed when tools have been reloaded by the
-# 'tools srcdir' command.
-toolsSrcdirReloaded2=Tools loaded from %1$S.
-
-# LOCALIZATION NOTE (toolsSrcdirManual2) A full description of the 'tools srcdir'
-# command. The argument (%1$S) is the browser name.
-toolsSrcdirManual2=Load the %1$S Developer Tools from a complete mozilla-central checkout.
-
-# LOCALIZATION NOTE (toolsSrcdirDir) The srcdir argument to the 'tools srcdir' command.
-toolsSrcdirDir=A mozilla-central checkout
-
-# LOCALIZATION NOTE (toolsBuiltinDesc) A short description of the 'tools builtin'
-# command, which overrides a previous 'tools srcdir' command.
-toolsBuiltinDesc=Use the builtin tools
-
-# LOCALIZATION NOTE (toolsBuiltinManual) A fuller description of the 'tools builtin'
-# command.
-toolsBuiltinManual=Use the builtin tools, overriding any previous srcdir command.
-
-# LOCALIZATION NOTE (toolsBuiltinReloaded) Displayed when tools are loaded with the
-# 'tools builtin' command.
-toolsBuiltinReloaded=Builtin tools loaded.
-
-# LOCALIZATION NOTE (toolsReloadDesc) A short description of the 'tools reload' command.
-# which will reload the tools from the current srcdir.
-toolsReloadDesc=Reload the developer tools
-
-# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
-# reload' command.
-toolsReloaded2=Tools reloaded.
-
-# LOCALIZATION NOTE (cookieDesc) A very short description of the 'cookie'
-# command. See cookieManual for a fuller description of what it does. This
-# string is designed to be shown in a menu alongside the command name, which
-# is why it should be as short as possible.
-cookieDesc=Display and alter cookies
-
-# LOCALIZATION NOTE (cookieManual) A fuller description of the 'cookie'
-# command, displayed when the user asks for help on what it does.
-cookieManual=Commands to list, create, delete and alter cookies for the current domain.
-
-# LOCALIZATION NOTE (cookieListDesc) A very short description of the
-# 'cookie list' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieListDesc=Display cookies
-
-# LOCALIZATION NOTE (cookieListManual) A fuller description of the 'cookie list'
-# command, displayed when the user asks for help on what it does.
-cookieListManual=Display a list of the cookies relevant to the current page.
-
-# LOCALIZATION NOTE (cookieListOutHost,cookieListOutPath,cookieListOutExpires,cookieListOutAttributes):
-# The 'cookie list' command has a number of headings for cookie properties.
-# Particular care should be taken in translating these strings as they have
-# references to names in the cookies spec.
-cookieListOutHost=Host:
-cookieListOutPath=Path:
-cookieListOutExpires=Expires:
-cookieListOutAttributes=Attributes:
-
-# LOCALIZATION NOTE (cookieListOutNone) The output of the 'cookie list' command
-# uses this string when no cookie attributes (like httpOnly, secure, etc) apply
-cookieListOutNone=None
-
-# LOCALIZATION NOTE (cookieListOutSession) The output of the 'cookie list'
-# command uses this string to describe a cookie with an expiry value of '0'
-# that is to say it is a session cookie
-cookieListOutSession=At browser exit (session)
-
-# LOCALIZATION NOTE (cookieListOutNonePage) The output of the 'cookie list'
-# command uses this string for pages like 'about:blank' which can't contain
-# cookies
-cookieListOutNonePage=No cookies found for this page
-
-# LOCALIZATION NOTE (cookieListOutNoneHost) The output of the 'cookie list'
-# command uses this string when there are no cookies on a given web page
-cookieListOutNoneHost=No cookies found for host %1$S
-
-# LOCALIZATION NOTE (cookieListOutEdit) A title used in the output from the
-# 'cookie list' command on a button which can be used to edit cookie values
-cookieListOutEdit=Edit
-
-# LOCALIZATION NOTE (cookieListOutRemove) A title used in the output from the
-# 'cookie list' command on a button which can be used to remove cookies
-cookieListOutRemove=Remove
-
-# LOCALIZATION NOTE (cookieRemoveDesc) A very short description of the
-# 'cookie remove' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieRemoveDesc=Remove a cookie
-
-# LOCALIZATION NOTE (cookieRemoveManual) A fuller description of the 'cookie remove'
-# command, displayed when the user asks for help on what it does.
-cookieRemoveManual=Remove a cookie, given its key
-
-# LOCALIZATION NOTE (cookieRemoveKeyDesc) A very short string to describe the
-# 'key' parameter to the 'cookie remove' command, which is displayed in a dialog
-# when the user is using this command.
-cookieRemoveKeyDesc=The key of the cookie to remove
-
-# LOCALIZATION NOTE (cookieSetDesc) A very short description of the
-# 'cookie set' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-cookieSetDesc=Set a cookie
-
-# LOCALIZATION NOTE (cookieSetManual) A fuller description of the 'cookie set'
-# command, displayed when the user asks for help on what it does.
-cookieSetManual=Set a cookie by specifying a key name, its value and optionally one or more of the following attributes: expires (max-age in seconds or the expires date in GMTString format), path, domain, secure
-
-# LOCALIZATION NOTE (cookieSetKeyDesc) A very short string to describe the
-# 'key' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetKeyDesc=The key of the cookie to set
-
-# LOCALIZATION NOTE (cookieSetValueDesc) A very short string to describe the
-# 'value' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetValueDesc=The value of the cookie to set
-
-# LOCALIZATION NOTE (cookieSetOptionsDesc) The title of a set of options to
-# the 'cookie set' command, displayed as a heading to the list of option.
-cookieSetOptionsDesc=Options
-
-# LOCALIZATION NOTE (cookieSetPathDesc) A very short string to describe the
-# 'path' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetPathDesc=The path of the cookie to set
-
-# LOCALIZATION NOTE (cookieSetDomainDesc) A very short string to describe the
-# 'domain' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetDomainDesc=The domain of the cookie to set
-
-# LOCALIZATION NOTE (cookieSetSecureDesc) A very short string to describe the
-# 'secure' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetSecureDesc=Only transmitted over https
-
-# LOCALIZATION NOTE (cookieSetHttpOnlyDesc) A very short string to describe the
-# 'httpOnly' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetHttpOnlyDesc=Not accessible from client side script
-
-# LOCALIZATION NOTE (cookieSetSessionDesc) A very short string to describe the
-# 'session' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetSessionDesc=Only valid for the lifetime of the browser session
-
-# LOCALIZATION NOTE (cookieSetExpiresDesc) A very short string to describe the
-# 'expires' parameter to the 'cookie set' command, which is displayed in a dialog
-# when the user is using this command.
-cookieSetExpiresDesc=The expiry date of the cookie (quoted RFC2822 or ISO 8601 date)
-
-# LOCALIZATION NOTE (jsbDesc) A very short description of the
-# 'jsb' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbDesc=JavaScript beautifier
-
-# LOCALIZATION NOTE (jsbUrlDesc) A very short description of the
-# 'jsb <url>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbUrlDesc=The URL of the JS file to beautify
-
-# LOCALIZATION NOTE (jsbIndentSizeDesc) A very short description of the
-# 'jsb <indentSize>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbIndentSizeDesc=Indentation size in chars
-
-# LOCALIZATION NOTE (jsbIndentSizeManual) A fuller description of the
-# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
-# does.
-jsbIndentSizeManual=The number of chars with which to indent each line
-
-# LOCALIZATION NOTE (jsbIndentCharDesc) A very short description of the
-# 'jsb <indentChar>' parameter. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-jsbIndentCharDesc=The chars used to indent each line
-
-# LOCALIZATION NOTE (jsbIndentCharManual) A fuller description of the
-# 'jsb <indentChar>' parameter, displayed when the user asks for help on what it
-# does.
-jsbIndentCharManual=The chars used to indent each line. The possible choices are space or tab.
-
-# the 'jsb <doNotPreserveNewlines>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short
-# as possible.
-jsbDoNotPreserveNewlinesDesc=Do not preserve line breaks
-
-# LOCALIZATION NOTE (jsbPreserveNewlinesManual) A fuller description of the
-# 'jsb <jsbPreserveNewlines>' parameter, displayed when the user asks for help
-# on what it does.
-jsbPreserveNewlinesManual=Should existing line breaks be preserved
-
-# LOCALIZATION NOTE (jsbPreserveMaxNewlinesDesc) A very short description of the
-# 'jsb <preserveMaxNewlines>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbPreserveMaxNewlinesDesc=Max consecutive line breaks
-
-# LOCALIZATION NOTE (jsbPreserveMaxNewlinesManual) A fuller description of the
-# 'jsb <preserveMaxNewlines>' parameter, displayed when the user asks for help
-# on what it does.
-jsbPreserveMaxNewlinesManual=The maximum number of consecutive line breaks to preserve
-
-# LOCALIZATION NOTE (jsbJslintHappyDesc) A very short description of the
-# 'jsb <jslintHappy>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbJslintHappyDesc=Enforce jslint-stricter mode?
-
-# LOCALIZATION NOTE (jsbJslintHappyManual) A fuller description of the
-# 'jsb <jslintHappy>' parameter, displayed when the user asks for help
-# on what it does.
-jsbJslintHappyManual=When set to true, jslint-stricter mode is enforced
-
-# LOCALIZATION NOTE (jsbBraceStyleDesc2) A very short description of the
-# 'jsb <braceStyle>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbBraceStyleDesc2=Select the coding style of braces
-
-# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
-# 'jsb <braceStyle>' parameter, displayed when the user asks for help
-# on what it does.
-#
-# NOTES: The keywords collapse, expand, end-expand and expand-strict should not
-# be translated. "even if it will break your code" means that the resulting code
-# may no longer be functional.
-jsbBraceStyleManual2=Select the coding style of braces: collapse - put braces on the same line as control statements; expand - put braces on own line (Allman / ANSI style); end-expand - put end braces on own line; expand-strict - put braces on own line even if it will break your code.
-
-# LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
-# of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to
-# be shown in a menu alongside the command name, which is why it should be as
-# short as possible.
-jsbNoSpaceBeforeConditionalDesc=No space before conditional statements
-
-# LOCALIZATION NOTE (jsbUnescapeStringsDesc) A very short description of the
-# 'jsb <unescapeStrings>' parameter. This string is designed to be shown
-# in a menu alongside the command name, which is why it should be as short as
-# possible.
-jsbUnescapeStringsDesc=Unescape \\xNN characters?
-
-# LOCALIZATION NOTE (jsbUnescapeStringsManual) A fuller description of the
-# 'jsb <unescapeStrings>' parameter, displayed when the user asks for help
-# on what it does.
-jsbUnescapeStringsManual=Should printable characters in strings encoded in \\xNN notation be unescaped?
-
-# LOCALIZATION NOTE (jsbInvalidURL) Displayed when an invalid URL is passed to
-# the jsb command.
-jsbInvalidURL=Please enter a valid URL
-
-# LOCALIZATION NOTE (jsbOptionsDesc) The title of a set of options to
-# the 'jsb' command, displayed as a heading to the list of options.
-jsbOptionsDesc=Options
-
-# LOCALIZATION NOTE (calllogDesc) A very short description of the
-# 'calllog' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogDesc=Commands to manipulate function call logging
-
-# LOCALIZATION NOTE (calllogStartDesc) A very short description of the
-# 'calllog start' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogStartDesc=Start logging function calls to the console
-
-# LOCALIZATION NOTE (calllogStartReply) A string displayed as the result of
-# the 'calllog start' command.
-calllogStartReply=Call logging started.
-
-# LOCALIZATION NOTE (calllogStopDesc) A very short description of the
-# 'calllog stop' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogStopDesc=Stop function call logging
-
-# LOCALIZATION NOTE (calllogStopNoLogging) A string displayed as the result of
-# the 'calllog stop' command when there is nothing to stop.
-calllogStopNoLogging=No call logging is currently active
-
-# LOCALIZATION NOTE (calllogStopReply) A string displayed as the result of
-# the 'calllog stop' command when there are logging actions to stop.
-calllogStopReply=Stopped call logging. Active contexts: %1$S.
-
-# LOCALIZATION NOTE (calllogChromeStartDesc) A very short description of the
-# 'calllog chromestart' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeStartDesc=Start logging function calls for chrome code to the console
-
-# LOCALIZATION NOTE (calllogChromeSourceTypeDesc) A very short description of the
-# 'calllog chromestart <sourceType>' parameter. This string is designed to be
-# shown in a menu alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeDesc=Global object, JSM URI, or JS to get a global object from
-
-# LOCALIZATION NOTE (calllogChromeSourceTypeManual) A very short description of the
-# 'calllog chromestart' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeSourceTypeManual=The global object, URI of a JSM, or JS to execute in the chrome window from which to obtain a global object
-
-# LOCALIZATION NOTE (calllogChromeStartReply) A string displayed as the result
-# of the 'calllog chromestart' command.
-calllogChromeStartReply=Call logging started.
-
-# LOCALIZATION NOTE (calllogChromeStopDesc) A very short description of the
-# 'calllog chromestop' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-calllogChromeStopDesc=Stop function call logging
-
-# LOCALIZATION NOTE (calllogChromeStopNoLogging) A string displayed as the
-# result of the 'calllog chromestop' command when there is nothing to stop.
-calllogChromeStopNoLogging=No call logging for chrome code is currently active
-
-# LOCALIZATION NOTE (calllogChromeStopReply) A string displayed as the result of
-# the 'calllog chromestop' command when there are logging actions to stop.
-calllogChromeStopReply=Stopped call logging. Active contexts: %1$S.
-
-# LOCALIZATION NOTE (callLogChromeAnonFunction) A string displayed as the result
-# of the 'calllog chromestart' command when an anonymouse function is to be
-# logged.
-callLogChromeAnonFunction=<anonymous>
-
-# LOCALIZATION NOTE (callLogChromeMethodCall) A string displayed as the result
-# of the 'calllog chromestart' command to proceed a method name when it is to be
-# logged.
-callLogChromeMethodCall=Method call
-
-# LOCALIZATION NOTE (callLogChromeInvalidJSM) A string displayed as the result
-# of the 'calllog chromestart' command with an invalid JSM or JSM path.
-callLogChromeInvalidJSM=Invalid JSM!
-
-# LOCALIZATION NOTE (callLogChromeVarNotFoundContent) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of
-# content-variable and an invalid variable name.
-callLogChromeVarNotFoundContent=Variable not found in content window.
-
-# LOCALIZATION NOTE (callLogChromeVarNotFoundChrome) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of
-# chrome-variable and an invalid variable name.
-callLogChromeVarNotFoundChrome=Variable not found in chrome window.
-
-# LOCALIZATION NOTE (callLogChromeEvalException) A string displayed as the
-# result of the 'calllog chromestart' command with a source type of JavaScript
-# and invalid JavaScript code.
-callLogChromeEvalException=Evaluated JavaScript threw the following exception
-
-# LOCALIZATION NOTE (callLogChromeEvalNeedsObject) A string displayed as the
-# result of passing a non-JavaScript object creating source via the
-# 'calllog chromestart javascript' command.
-callLogChromeEvalNeedsObject=The JavaScript source must evaluate to an object whose method calls are to be logged e.g. “({a1: function() {this.a2()},a2: function() {}});”
-
 # LOCALIZATION NOTE (scratchpadOpenTooltip) A string displayed as the
 # tooltip of button in devtools toolbox which opens Scratchpad.
 scratchpadOpenTooltip=Scratchpad
 
 # LOCALIZATION NOTE (paintflashingDesc) A very short string used to describe the
 # function of the "paintflashing" command
 paintflashingDesc=Highlight painted area
 
@@ -1239,267 +463,16 @@ paintflashingTooltip=Highlight painted a
 # function of the "paintflashing toggle" command.
 paintflashingToggleDesc=Toggle paint flashing
 
 # LOCALIZATION NOTE (splitconsoleTooltip2) A string displayed as the
 # tooltip of button in devtools toolbox which toggles the split webconsole.
 # Keyboard shortcut will be shown inside brackets.
 splitconsoleTooltip2=Toggle split console (%S)
 
-# LOCALIZATION NOTE (appCacheDesc) A very short string used to describe the
-# function of the "appcache" command
-appCacheDesc=Application cache utilities
-
-# LOCALIZATION NOTE (appCacheValidateDesc) A very short string used to describe
-# the function of the "appcache validate" command.
-appCacheValidateDesc=Validate cache manifest
-
-# LOCALIZATION NOTE (appCacheValidateManual) A fuller description of the
-# 'validate' parameter to the 'appcache' command, displayed when the user asks
-# for help on what it does.
-appCacheValidateManual=Find issues relating to a cache manifest and the files that it references
-
-# LOCALIZATION NOTE (appCacheValidateUriDesc) A very short string used to describe
-# the function of the "uri" parameter of the appcache validate" command.
-appCacheValidateUriDesc=URI to check
-
-# LOCALIZATION NOTE (appCacheValidatedSuccessfully) Displayed by the "appcache validate"
-# command when it has been successfully validated.
-appCacheValidatedSuccessfully=Appcache validated successfully.
-
-# LOCALIZATION NOTE (appCacheClearDesc) A very short string used to describe
-# the function of the "appcache clear" command.
-appCacheClearDesc=Clear entries from the application cache
-
-# LOCALIZATION NOTE (appCacheClearManual) A fuller description of the
-# 'appcache clear' command, displayed when the user asks for help on what it does.
-appCacheClearManual=Clear one or more entries from the application cache
-
-# LOCALIZATION NOTE (appCacheClearCleared) Displayed by the "appcache clear"
-# command when entries are successfully cleared.
-appCacheClearCleared=Entries cleared successfully.
-
-# LOCALIZATION NOTE (appCacheListDesc) A very short string used to describe
-# the function of the "appcache list" command.
-appCacheListDesc=Display a list of application cache entries.
-
-# LOCALIZATION NOTE (appCacheListManual) A fuller description of the
-# 'appcache list' command, displayed when the user asks for help on what it does.
-appCacheListManual=Display a list of all application cache entries. If the search parameter is used then the table displays the entries containing the search term.
-
-# LOCALIZATION NOTE (appCacheListSearchDesc) A very short string used to describe
-# the function of the "search" parameter of the appcache list" command.
-appCacheListSearchDesc=Filter results using a search term.
-
-# LOCALIZATION NOTE (AppCacheList*) Row headers for the 'appcache list' command.
-appCacheListKey=Key:
-appCacheListDataSize=Data size:
-appCacheListDeviceID=Device ID:
-appCacheListExpirationTime=Expires:
-appCacheListFetchCount=Fetch count:
-appCacheListLastFetched=Last fetched:
-appCacheListLastModified=Last modified:
-
-# LOCALIZATION NOTE (appCacheListViewEntry) The text for the view entry button
-# of the 'appcache list' command.
-appCacheListViewEntry=View Entry
-
-# LOCALIZATION NOTE (appCacheViewEntryDesc) A very short string used to describe
-# the function of the "appcache viewentry" command.
-appCacheViewEntryDesc=Open a new tab containing the specified cache entry information.
-
-# LOCALIZATION NOTE (appCacheViewEntryManual) A fuller description of the
-# 'appcache viewentry' command, displayed when the user asks for help on what it
-# does.
-appCacheViewEntryManual=Open a new tab containing the specified cache entry information.
-
-# LOCALIZATION NOTE (appCacheViewEntryKey) A very short string used to describe
-# the function of the "key" parameter of the 'appcache viewentry' command.
-appCacheViewEntryKey=The key for the entry to display.
-
-# LOCALIZATION NOTE (profilerDesc) A very short string used to describe the
-# function of the profiler command.
-profilerDesc=Manage profiler
-
-# LOCALIZATION NOTE (profilerManual) A longer description describing the
-# set of commands that control the profiler.
-profilerManual=Commands to start or stop a JavaScript profiler
-
-# LOCALIZATION NOTE (profilerOpenDesc) A very short string used to describe the function
-# of the profiler open command.
-profilerOpenDesc=Open the profiler
-
-# LOCALIZATION NOTE (profilerCloseDesc) A very short string used to describe the function
-# of the profiler close command.
-profilerCloseDesc=Close the profiler
-
-# LOCALIZATION NOTE (profilerStartDesc) A very short string used to describe the function
-# of the profiler start command.
-profilerStartDesc=Start profiling
-
-# LOCALIZATION NOTE (profilerStartManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to name a newly created profile or to lookup
-# an existing profile by its name.
-profilerStartManual=Name of a profile you wish to start.
-
-# LOCALIZATION NOTE (profilerStopDesc) A very short string used to describe the function
-# of the profiler stop command.
-profilerStopDesc=Stop profiling
-
-# LOCALIZATION NOTE (profilerStopManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to lookup an existing profile by its name.
-profilerStopManual=Name of a profile you wish to stop.
-
-# LOCALIZATION NOTE (profilerListDesc) A very short string used to describe the function
-# of the profiler list command.
-profilerListDesc=List all profiles
-
-# LOCALIZATION NOTE (profilerShowDesc) A very short string used to describe the function
-# of the profiler show command.
-profilerShowDesc=Show individual profile
-
-# LOCALIZATION NOTE (profilerShowManual) A fuller description of the 'profile name'
-# parameter. This parameter is used to name a newly created profile or to lookup
-# an existing profile by its name.
-profilerShowManual=Name of a profile.
-
-# LOCALIZATION NOTE (profilerAlreadyStarted2) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has already
-# been started.
-profilerAlreadyStarted2=Profile has already been started
-
-# LOCALIZATION NOTE (profilerNotFound) A message that is displayed whenever
-# an operation cannot be completed because the profile in question could not be
-# found.
-profilerNotFound=Profile not found
-
-# LOCALIZATION NOTE (profilerNotStarted3) A message that is displayed whenever
-# an operation cannot be completed because the profile in question has not been
-# started yet. It also contains a hint to use the 'profile start' command to
-# start the profiler.
-profilerNotStarted3=Profiler has not been started yet. Use ‘profile start’ to start profiling
-
-# LOCALIZATION NOTE (profilerStarted2) A very short string that indicates that
-# we have started recording.
-profilerStarted2=Recording…
-
-# LOCALIZATION NOTE (profilerStopped) A very short string that indicates that
-# we have stopped recording.
-profilerStopped=Stopped…
-
-# LOCALIZATION NOTE (profilerNotReady) A message that is displayed whenever
-# an operation cannot be completed because the profiler has not been opened yet.
-profilerNotReady=For this command to work you need to open the profiler first
-
-# LOCALIZATION NOTE (listenDesc) A very short string used to describe the
-# function of the 'listen' command.
-listenDesc=Open a remote debug port
-
-# LOCALIZATION NOTE (listenManual2) A longer description of the 'listen'
-# command.
-listenManual2=%1$S can allow remote debugging over a TCP/IP connection. For security reasons this is turned off by default, but can be enabled using this command.
-
-# LOCALIZATION NOTE (listenPortDesc) A very short string used to describe the
-# function of 'port' parameter to the 'listen' command.
-listenPortDesc=The TCP port to listen on
-
-# LOCALIZATION NOTE (listenProtocolDesc) A very short string used to describe the
-# function of 'protocol' parameter to the 'listen' command.
-listenProtocolDesc=The protocol to be used
-
-# LOCALIZATION NOTE (listenDisabledOutput) Text of a message output during the
-# execution of the 'listen' command.
-listenDisabledOutput=Listen is disabled by the devtools.debugger.remote-enabled preference
-
-# LOCALIZATION NOTE (listenInitOutput) Text of a message output during the
-# execution of the 'listen' command. %1$S is a port number
-listenInitOutput=Listening on port %1$S
-
-# LOCALIZATION NOTE (listenNoInitOutput) Text of a message output during the
-# execution of the 'listen' command.
-listenNoInitOutput=DebuggerServer not initialized
-
-# LOCALIZATION NOTE (unlistenDesc) A very short string used to describe the
-# function of the 'unlisten' command.
-unlistenDesc=Close all remote debug ports
-
-# LOCALIZATION NOTE (unlistenManual) A longer description of the 'unlisten'
-# command.
-unlistenManual=Closes all the open ports for remote debugging.
-
-# LOCALIZATION NOTE (unlistenOutput) Text of a message output during the
-# execution of the 'unlisten' command.
-unlistenOutput=All TCP ports closed
-
-# LOCALIZATION NOTE (mediaDesc, mediaEmulateDesc, mediaEmulateManual,
-# mediaEmulateType, mediaResetDesc, mediaResetManual) These strings describe
-# the 'media' commands and all available parameters.
-mediaDesc=CSS media type emulation
-mediaEmulateDesc=Emulate a specified CSS media type
-mediaEmulateManual=View the document as if rendered on a device supporting the given media type, with the relevant CSS rules applied.
-mediaEmulateType=The media type to emulate
-mediaResetDesc=Stop emulating a CSS media type
-
-# LOCALIZATION NOTE (qsaDesc, qsaQueryDesc)
-# These strings describe the 'qsa' commands and all available parameters.
-qsaDesc=Perform querySelectorAll on the current document and return number of matches
-qsaQueryDesc=CSS selectors separated by comma
-
-# LOCALIZATION NOTE (injectDesc, injectManual, injectLibraryDesc, injectLoaded,
-# injectFailed) These strings describe the 'inject' commands and all available
-# parameters.
-injectDesc=Inject common libraries into the page
-injectManual2=Inject common libraries into the content of the page which can also be accessed from the console.
-injectLibraryDesc=Select the library to inject or enter a valid script URI to inject
-injectLoaded=%1$S loaded
-injectFailed=Failed to load %1$S - Invalid URI
-
-# LOCALIZATION NOTE (folderDesc, folderOpenDesc, folderOpenDir,
-# folderOpenProfileDesc) These strings describe the 'folder' commands and
-# all available parameters.
-folderDesc=Open folders
-folderOpenDesc=Open folder path
-folderOpenDir=Directory Path
-folderOpenProfileDesc=Open profile directory
-
-# LOCALIZATION NOTE (folderInvalidPath) A string displayed as the result
-# of the 'folder open' command with an invalid folder path.
-folderInvalidPath=Please enter a valid path
-
-# LOCALIZATION NOTE (folderOpenDirResult) A very short string used to
-# describe the result of the 'folder open' command.
-# The argument (%1$S) is the folder path.
-folderOpenDirResult=Opened %1$S
-
-# Security
-securityPrivacyDesc=Display supported security and privacy features
-securityManual=Commands to list and get suggestions about security features for the current domain.
-securityListDesc=Display security features
-securityListManual=Display a list of all relevant security features of the current page.
-# CSP specific
-securityCSPDesc=Display CSP specific security features
-securityCSPManual=Display feedback about the CSP applied to the current page.
-securityCSPRemWildCard=Can you remove the wildcard(*)?
-securityCSPPotentialXSS=Potential XSS vulnerability!
-# LOCALIZATION NOTE: do not translate 'Content-Security-Policy'
-securityCSPNoCSPOnPage=Could not find Content-Security-Policy for
-securityCSPHeaderOnPage=Content-Security-Policy for
-securityCSPROHeaderOnPage=Content-Security-Policy-Report-Only for
-# Referrer Policy specific
-securityReferrerPolicyDesc=Display the current Referrer Policy
-securityReferrerPolicyManual=Display the Referrer Policy for the current page with example referrers for different URIs.
-securityReferrerNextURI=When Visiting
-securityReferrerCalculatedReferrer=Referrer Will Be
-# LOCALIZATION NOTE: %1$S is the current page URI
-securityReferrerPolicyReportHeader=Referrer Policy for %1$S
-securityReferrerPolicyOtherDomain=Other Origin
-securityReferrerPolicyOtherDomainDowngrade=Other Origin HTTP
-securityReferrerPolicySameDomain=Same Origin
-securityReferrerPolicySameDomainDowngrade=Same Host HTTP
-
 # LOCALIZATION NOTE (rulersDesc) A very short description of the
 # 'rulers' command. See rulersManual for a fuller description of what
 # it does. This string is designed to be shown in a menu alongside the
 # command name, which is why it should be as short as possible.
 rulersDesc=Toggle rulers for the page
 
 # LOCALIZATION NOTE (rulersManual) A fuller description of the 'rulers'
 # command, displayed when the user asks for help on what it does.
--- a/devtools/startup/key-shortcuts.properties
+++ b/devtools/startup/key-shortcuts.properties
@@ -5,20 +5,16 @@
 # LOCALIZATION NOTE (toggleToolbox.commandkey):
 # Key pressed to open a toolbox with the default panel selected
 toggleToolbox.commandkey=I
 
 # LOCALIZATION NOTE (toggleToolboxF12.commandkey):
 # Alternative key pressed to open a toolbox with the default panel selected
 toggleToolboxF12.commandkey=VK_F12
 
-# LOCALIZATION NOTE (toggleToolbar.commandkey):
-# Key pressed to open the Developer Toolbar (a.k.a gcli)
-toggleToolbar.commandkey=VK_F2
-
 # LOCALIZATION NOTE (webide.commandkey):
 # Key pressed to open the Web IDE window
 webide.commandkey=VK_F8
 
 # LOCALIZATION NOTE (browserToolbox.commandkey):
 # Key pressed to open the Browser Toolbox, used for debugging Firefox itself
 browserToolbox.commandkey=I
 
--- a/dom/chrome/dom/dom.properties
+++ b/dom/chrome/dom/dom.properties
@@ -353,12 +353,10 @@ ReadableStreamReadingFailed=Failed to read data from the ReadableStream: “%S”.
 RegisterProtocolHandlerInsecureWarning=Use of the registerProtocolHandler for insecure connections will be removed in version 62.
 MixedDisplayObjectSubrequestWarning=Loading insecure content within a plugin embedded in a secure connection is going to be removed.
 MotionEventWarning=Use of the motion sensor is deprecated.
 OrientationEventWarning=Use of the orientation sensor is deprecated.
 ProximityEventWarning=Use of the proximity sensor is deprecated.
 AmbientLightEventWarning=Use of the ambient light sensor is deprecated.
 # LOCALIZATION NOTE: Do not translate "storage", "indexedDB.open" and "navigator.storage.persist()".
 IDBOpenDBOptions_StorageTypeWarning=The ‘storage’ attribute in options passed to indexedDB.open is deprecated and will soon be removed. To get persistent storage, please use navigator.storage.persist() instead.
-# LOCALIZATION NOTE: Do not translate "getPropertyCSSValue" and "getPropertyValue".
-GetPropertyCSSValueWarning=Use of getPropertyCSSValue is deprecated, use getPropertyValue instead.
 DOMQuadBoundsAttrWarning=DOMQuad.bounds is deprecated in favor of DOMQuad.getBounds()
 UnsupportedEntryTypesIgnored=Ignoring unsupported entryTypes: %S.
--- a/mobile/android/base/android_strings.dtd
+++ b/mobile/android/base/android_strings.dtd
@@ -22,22 +22,16 @@
 <!ENTITY firstrun_sync_subtext2 "Use Sync to find the bookmarks, passwords, and other things you save to &brandShortName; on all your devices.">
 <!ENTITY firstrun_signin_message "Get connected, get started">
 <!ENTITY firstrun_signin_button "Sign in to Sync">
 <!ENTITY  onboard_start_button_browser "Start Browsing">
 <!ENTITY firstrun_button_notnow "Not right now">
 <!ENTITY firstrun_button_next "Next">
 
 <!ENTITY firstrun_tabqueue_title "Links">
-<!-- Localization note (firstrun_tabqueue_message): 'Tab queue' is a feature that allows users to queue up or save links from outside of Firefox (without switching apps) - these links will be loaded in Firefox the next time Firefox is opened. -->
-<!ENTITY firstrun_tabqueue_message_off "Turn on Tab queue">
-<!ENTITY firstrun_tabqueue_subtext_off "Save links for later in &brandShortName; when tapping them in other apps.">
-
-<!ENTITY firstrun_tabqueue_message_on "Success!">
-<!ENTITY firstrun_tabqueue_subtext_on "You can always turn this off in &settings; under &pref_category_general;.">
 
 <!ENTITY firstrun_readerview_title "Articles">
 <!-- Localization note (firstrun_readerview_message): This is a casual way of describing getting rid of unnecessary things, and is referring to simplifying websites so only the article text and images are visible, removing unnecessary headers or ads. -->
 <!ENTITY firstrun_readerview_message "Lose the clutter">
 <!ENTITY firstrun_readerview_subtext "Use Reader View to make articles nicer to read \u2014 even offline.">
 
 <!-- Localization note (firstrun_devices_title): This is a casual way of addressing the user, somewhat referring to their online identity (which would include other devices, Firefox usage, accounts, etc). -->
 <!ENTITY firstrun_account_title "You">
@@ -64,17 +58,16 @@
 <!ENTITY  crash_allow_contact2 "Allow &vendorShortName; to contact me about this report">
 <!ENTITY  crash_email "Your email">
 <!ENTITY  crash_closing_alert "Exit without sending a crash report?">
 <!ENTITY  sending_crash_report "Sending crash report\u2026">
 <!ENTITY  crash_close_label "Close">
 <!ENTITY  crash_restart_label "Restart &brandShortName;">
 
 <!ENTITY url_bar_default_text2 "Search or enter address">
-
 <!-- Localization note (url_bar_qrcode_text2) : This text will be
      heard by non-visual users when the focus is on the QR Code
      icon in the url bar. -->
 <!ENTITY url_bar_qrcode_text2 "Use your QR Reader to search or enter address">
 <!-- Localization note (url_bar_mic_text2) : This text will be
      heard by non-visual users when the focus is on the Microphone
      icon in the url bar. -->
 <!ENTITY url_bar_mic_text2 "Use your microphone to search or enter address">
@@ -210,17 +203,16 @@
      it is applicable. -->
 <!ENTITY pref_search_hint2 "TIP: Add any website to your list of search providers by long-pressing on its search field and then touching the &formatI; icon.">
 <!ENTITY pref_category_advanced "Advanced">
 <!-- Localization note (pref_category_advanced_summary3): “data saver” in this
      context means consuming less data, e.g. by not loading images, not
      “storing data”. -->
 <!ENTITY pref_category_advanced_summary3 "Restore tabs, data saver, developer tools">
 <!ENTITY pref_category_notifications "Notifications">
-<!ENTITY pref_category_notifications_summary "New features, website updates">
 <!ENTITY pref_category_notifications_summary2 "New features, product tips">
 <!ENTITY pref_developer_remotedebugging_usb "Remote debugging via USB">
 <!ENTITY pref_developer_remotedebugging_wifi "Remote debugging via Wi-Fi">
 <!ENTITY pref_developer_remotedebugging_wifi_disabled_summary "Wi-Fi debugging requires your device to have a QR code reader app installed.">
 <!ENTITY pref_remember_signons2 "Remember logins">
 <!ENTITY pref_manage_logins "Manage logins">
 
 <!ENTITY pref_category_home "Home">
--- a/mobile/chrome/region.properties
+++ b/mobile/chrome/region.properties
@@ -1,25 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This preference is only used to generate browsersearch.json.
 browser.search.defaultenginename=Google
 
-# Search engine order (order displayed in the search bar dropdown).
-browser.search.order.1=Google
-browser.search.order.2=Bing
-
-# These override the equivalents above when the client detects that it is in
-# US market only.
-browser.search.defaultenginename.US=Google
-browser.search.order.US.1=Google
-browser.search.order.US.2=Bing
-
 # 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
@@ -40,15 +40,11 @@ PhishingAuthAccept=I understand and will
 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.
 
-# LOCALIZATION NOTE (APIDeprecationWarning):
-# %1$S is the deprecated API; %2$S is the API function that should be used.
-APIDeprecationWarning=Warning: ‘%1$S’ deprecated, please use ‘%2$S’
-
 # 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.
 nsICookieManagerAPIDeprecated=“%1$S” is changed. Update your code and pass the correct originAttributes. Read more on MDN: https://developer.mozilla.org/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsICookieManager%2$S
--- a/security/manager/chrome/pipnss/pipnss.properties
+++ b/security/manager/chrome/pipnss/pipnss.properties
@@ -51,20 +51,16 @@ PrivateSlotDescription=PSM Private Keys
 # LOCALIZATION NOTE (Fips140TokenDescription): string limit is 32 bytes after
 # conversion to UTF-8.
 # length_limit = 32 bytes
 Fips140TokenDescription=Software Security Device (FIPS)
 # LOCALIZATION NOTE (Fips140SlotDescription): string limit is 64 bytes after
 # conversion to UTF-8.
 # length_limit = 64 bytes
 Fips140SlotDescription=FIPS 140 Cryptographic, Key and Certificate Services
-# LOCALIZATION NOTE (InternalToken): string limit is 32 bytes after conversion
-# to UTF-8.
-# length_limit = 32 bytes
-InternalToken=Software Security Device
 
 VerifySSLClient=SSL Client Certificate
 VerifySSLServer=SSL Server Certificate
 VerifySSLCA=SSL Certificate Authority
 VerifyEmailSigner=Email Signer Certificate
 VerifyEmailRecip=Email Recipient Certificate
 HighGrade=High Grade
 MediumGrade=Medium Grade
--- a/toolkit/chrome/global/aboutTelemetry.dtd
+++ b/toolkit/chrome/global/aboutTelemetry.dtd
@@ -32,17 +32,16 @@
 <!ENTITY aboutTelemetry.sessionInfoSection "Session Information">
 <!ENTITY aboutTelemetry.scalarsSection "Scalars">
 <!ENTITY aboutTelemetry.keyedScalarsSection "Keyed Scalars">
 <!ENTITY aboutTelemetry.histogramsSection "Histograms">
 <!ENTITY aboutTelemetry.keyedHistogramsSection "Keyed Histograms">
 <!ENTITY aboutTelemetry.eventsSection "Events">
 <!ENTITY aboutTelemetry.simpleMeasurementsSection "Simple Measurements">
 <!ENTITY aboutTelemetry.slowSqlSection "Slow SQL Statements">
-<!ENTITY aboutTelemetry.chromeHangsSection "Browser Hangs">
 <!ENTITY aboutTelemetry.addonDetailsSection "Add-on Details">
 <!ENTITY aboutTelemetry.capturedStacksSection "Captured Stacks">
 <!ENTITY aboutTelemetry.lateWritesSection "Late Writes">
 <!ENTITY aboutTelemetry.rawPayloadSection "Raw Payload">
 <!ENTITY aboutTelemetry.raw "Raw JSON">
 
 <!ENTITY aboutTelemetry.fullSqlWarning "NOTE: Slow SQL debugging is enabled. Full SQL strings may be displayed below but they will not be submitted to Telemetry.">
 <!ENTITY aboutTelemetry.fetchStackSymbols "Fetch function names for stacks">
--- a/toolkit/chrome/global/aboutTelemetry.properties
+++ b/toolkit/chrome/global/aboutTelemetry.properties
@@ -76,21 +76,16 @@ addonTableDetails = Details
 # LOCALIZATION NOTE(addonProvider):
 # - %1$S is replaced by the name of an Add-on Provider (e.g. “XPI”, “Plugin”)
 addonProvider = %1$S Provider
 
 keysHeader = Property
 namesHeader = Name
 valuesHeader = Value
 
-# LOCALIZATION NOTE(chrome-hangs-title):
-# - %1$S is replaced by the number of the hang
-# - %2$S is replaced by the duration of the hang
-chrome-hangs-title = Hang Report #%1$S (%2$S seconds)
-
 # LOCALIZATION NOTE(captured-stacks-title):
 # - %1$S is replaced by the string key for this stack
 # - %2$S is replaced by the number of times this stack was captured
 captured-stacks-title = %1$S (capture count: %2$S)
 # LOCALIZATION NOTE(late-writes-title):
 # - %1$S is replaced by the number of the late write
 late-writes-title = Late Write #%1$S