16 files changed, 62 insertions, 45 deletions
diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js
index f032f82aa..4d7176b4c 100644
--- a/devtools/client/framework/devtools-browser.js
+++ b/devtools/client/framework/devtools-browser.js
@@ -28,7 +28,7 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main",
 loader.lazyRequireGetter(this, "BrowserMenus", "devtools/client/framework/browser-menus");
 
 loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm");
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
 loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm");
 #endif
 
@@ -335,7 +335,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
    * Install Developer widget
    */
   installDeveloperWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
     let id = "developer-button";
     let widget = CustomizableUI.getWidget(id);
     if (widget && widget.provider == CustomizableUI.PROVIDER_API) {
@@ -394,7 +394,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
    */
   // Used by itself
   installWebIDEWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
     if (this.isWebIDEWidgetInstalled()) {
       return;
     }
@@ -422,7 +422,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
   },
 
   isWebIDEWidgetInstalled: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
     let widgetWrapper = CustomizableUI.getWidget("webide-button");
     return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API);
 #else
@@ -439,7 +439,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
    * Uninstall WebIDE widget
    */
   uninstallWebIDEWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
     if (this.isWebIDEWidgetInstalled()) {
       CustomizableUI.removeWidgetFromArea("webide-button");
     }
@@ -454,7 +454,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
    */
    // Used by webide.js
   moveWebIDEWidgetInNavbar: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
     CustomizableUI.addWidgetToArea("webide-button", CustomizableUI.AREA_NAVBAR);
 #else
     return;
diff --git a/devtools/client/locales/en-US/aboutdebugging.dtd b/devtools/client/locales/en-US/aboutdebugging.dtd
index 1f38a9443..2b2615c10 100644
--- a/devtools/client/locales/en-US/aboutdebugging.dtd
+++ b/devtools/client/locales/en-US/aboutdebugging.dtd
@@ -2,4 +2,8 @@
    - 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 aboutDebugging.fullTitle    "Debugging with Firefox Developer Tools">
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+
+<!ENTITY aboutDebugging.fullTitle    "Debugging with &brandShortName; Developer Tools">
diff --git a/devtools/client/locales/en-US/animationinspector.properties b/devtools/client/locales/en-US/animationinspector.properties
index a61f07f57..57063e101 100644
--- a/devtools/client/locales/en-US/animationinspector.properties
+++ b/devtools/client/locales/en-US/animationinspector.properties
@@ -121,12 +121,12 @@ player.somePropertiesOnCompositorTooltip=Some animation properties are optimized
 # run.
 timeline.rateSelectorTooltip=Set the animations playback rates
 
-# LOCALIZATION NOTE (timeline.pauseResumeButtonTooltip):
+# LOCALIZATION NOTE (timeline.pausedButtonTooltip):
 # This string is displayed in the timeline toolbar, as the tooltip of the
 # pause/resume button that can be used to pause or resume the animations
 timeline.pausedButtonTooltip=Resume the animations
 
-# LOCALIZATION NOTE (timeline.pauseResumeButtonTooltip):
+# LOCALIZATION NOTE (timeline.resumedButtonTooltip):
 # This string is displayed in the timeline toolbar, as the tooltip of the
 # pause/resume button that can be used to pause or resume the animations
 timeline.resumedButtonTooltip=Pause the animations
diff --git a/devtools/client/locales/en-US/connection-screen.dtd b/devtools/client/locales/en-US/connection-screen.dtd
index 674a408d5..15d70f764 100644
--- a/devtools/client/locales/en-US/connection-screen.dtd
+++ b/devtools/client/locales/en-US/connection-screen.dtd
@@ -7,6 +7,10 @@
   - in the Web Developer menu.
   - -->
 
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+
 <!ENTITY title      "Connect">
 <!ENTITY header     "Connect to remote device">
 <!ENTITY host       "Host:">
@@ -24,7 +28,7 @@
 <!-- LOCALIZATION NOTE (remoteHelp, remoteDocumentation, remoteHelpSuffix):
 these strings will be concatenated in a single label, remoteDocumentation will
 be used as text for a link to MDN. -->
-<!ENTITY remoteHelp "Firefox Developer Tools can debug remote devices (Firefox for Android and Firefox OS, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
+<!ENTITY remoteHelp "&brandShortName; Developer Tools can debug remote devices (Firefox for Android, for example). Make sure that you have turned on the ‘Remote debugging’ option in the remote device. For more, see the ">
 <!ENTITY remoteDocumentation "documentation">
 <!ENTITY remoteHelpSuffix ".">
 
diff --git a/devtools/client/locales/en-US/markers.properties b/devtools/client/locales/en-US/markers.properties
index 11fe9bd7f..81e68fef0 100644
--- a/devtools/client/locales/en-US/markers.properties
+++ b/devtools/client/locales/en-US/markers.properties
@@ -141,7 +141,7 @@ marker.nurseryCollection=Nursery Collection
 # These strings are used to give an expanded description of why a GC occurred.
 marker.gcreason.description.API=There was an API call to force garbage collection.
 marker.gcreason.description.EAGER_ALLOC_TRIGGER=JavaScript returned to the event loop and there were enough bytes allocated since the last GC that a new GC cycle was triggered.
-marker.gcreason.description.DESTROY_RUNTIME=Firefox destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down.
+marker.gcreason.description.DESTROY_RUNTIME=The browser destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down.
 marker.gcreason.description.LAST_DITCH=JavaScript attempted to allocate, but there was no memory available. Doing a full compacting garbage collection as an attempt to free up memory for the allocation.
 marker.gcreason.description.TOO_MUCH_MALLOC=JavaScript allocated too many bytes, and forced a garbage collection.
 marker.gcreason.description.ALLOC_TRIGGER=JavaScript allocated too many times, and forced a garbage collection.
@@ -152,7 +152,7 @@ marker.gcreason.description.OUT_OF_NURSERY=JavaScript allocated enough new objec
 marker.gcreason.description.EVICT_NURSERY=Work needed to be done on the tenured heap, requiring the nursery to be empty.
 marker.gcreason.description.FULL_STORE_BUFFER=There were too many properties on tenured objects whose value was an object in the nursery.
 marker.gcreason.description.SHARED_MEMORY_LIMIT=A large allocation was requested, but there was not enough memory.
-marker.gcreason.description.PERIODIC_FULL_GC=JavaScript returned to the event loop, and it has been a relatively long time since Firefox performed a garbage collection.
+marker.gcreason.description.PERIODIC_FULL_GC=JavaScript returned to the event loop, and it has been a relatively long time since the browser performed a garbage collection.
 marker.gcreason.description.INCREMENTAL_TOO_SLOW=A full, non-incremental garbage collection was triggered because there was a faster rate of allocations than the existing incremental garbage collection cycle could keep up with.
 marker.gcreason.description.COMPONENT_UTILS=Components.utils.forceGC() was called to force a garbage collection.
 marker.gcreason.description.MEM_PRESSURE=There was very low memory available.
@@ -160,7 +160,7 @@ marker.gcreason.description.CC_WAITING=The cycle collector required a garbage co
 marker.gcreason.description.CC_FORCED=The cycle collector required a garbage collection.
 marker.gcreason.description.LOAD_END=The document finished loading.
 marker.gcreason.description.PAGE_HIDE=The tab or window was moved to the background.
-marker.gcreason.description.NSJSCONTEXT_DESTROY=Firefox destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down.
+marker.gcreason.description.NSJSCONTEXT_DESTROY=The browser destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down.
 marker.gcreason.description.SET_NEW_DOCUMENT=The page has been navigated to a new document.
 marker.gcreason.description.SET_DOC_SHELL=The page has been navigated to a new document.
 marker.gcreason.description.DOM_UTILS=There was an API call to force garbage collection.
@@ -168,7 +168,7 @@ marker.gcreason.description.DOM_IPC=Received an inter-process message that reque
 marker.gcreason.description.DOM_WORKER=The worker was idle for a relatively long time.
 marker.gcreason.description.INTER_SLICE_GC=There has been a relatively long time since the last incremental GC slice.
 marker.gcreason.description.FULL_GC_TIMER=JavaScript returned to the event loop, and it has been a relatively long time since we performed a garbage collection.
-marker.gcreason.description.SHUTDOWN_CC=Firefox destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down.
-marker.gcreason.description.FINISH_LARGE_EVALUATE=Firefox finished evaluating a large script, and performed a GC because the script will never be run again.
+marker.gcreason.description.SHUTDOWN_CC=The browser destroyed a JavaScript runtime or context, and this was the final garbage collection before shutting down.
+marker.gcreason.description.FINISH_LARGE_EVALUATE=The browser finished evaluating a large script, and performed a GC because the script will never be run again.
 marker.gcreason.description.DOM_WINDOW_UTILS=The user was inactive for a long time. Took the opportunity to perform GC when it was unlikely to be noticed.
-marker.gcreason.description.USER_INACTIVE=The user was inactive for a long time. Firefox took the opportunity to perform GC when it was unlikely to be noticed.
+marker.gcreason.description.USER_INACTIVE=The user was inactive for a long time. The browser took the opportunity to perform GC when it was unlikely to be noticed.
diff --git a/devtools/client/locales/en-US/memory.properties b/devtools/client/locales/en-US/memory.properties
index e271a8a7d..5dcc77375 100644
--- a/devtools/client/locales/en-US/memory.properties
+++ b/devtools/client/locales/en-US/memory.properties
@@ -96,7 +96,7 @@ censusDisplays.internalType.tooltip=Group items by their internal C++ type
 # options of the label options.
 toolbar.labelBy=Label by:
 
-# LOCALIZATION NOTE (toolbar.labelBy): The tooltip for the label describing the
+# LOCALIZATION NOTE (toolbar.labelBy.tooltip): The tooltip for the label describing the
 # select menu options of the label options.
 toolbar.labelBy.tooltip=Change how objects are labeled
 
@@ -250,7 +250,7 @@ diffing.state.selecting.full=Select two snapshots to compare
 # dominator tree state COMPUTING.
 dominatorTree.state.computing=Generating dominators report…
 
-# LOCALIZATION NOTE (dominatorTree.state.computing): The label describing the
+# LOCALIZATION NOTE (dominatorTree.state.computing.full): The label describing the
 # dominator tree state COMPUTING, used in the dominator tree view.
 dominatorTree.state.computing.full=Generating dominators report…
 
@@ -258,7 +258,7 @@ dominatorTree.state.computing.full=Generating dominators report…
 # dominator tree state FETCHING.
 dominatorTree.state.fetching=Computing sizes…
 
-# LOCALIZATION NOTE (dominatorTree.state.fetching): The label describing the
+# LOCALIZATION NOTE (dominatorTree.state.fetching.full): The label describing the
 # dominator tree state FETCHING, used in the dominator tree view.
 dominatorTree.state.fetching.full=Computing dominator’s retained sizes…
 
@@ -266,7 +266,7 @@ dominatorTree.state.fetching.full=Computing dominator’s retained sizes…
 # describing the dominator tree state INCREMENTAL_FETCHING.
 dominatorTree.state.incrementalFetching=Fetching…
 
-# LOCALIZATION NOTE (dominatorTree.state.incrementalFetching): The label describing the
+# LOCALIZATION NOTE (dominatorTree.state.incrementalFetching.full): The label describing the
 # dominator tree state INCREMENTAL_FETCHING, used in the dominator tree view.
 dominatorTree.state.incrementalFetching.full=Fetching more…
 
@@ -274,7 +274,7 @@ dominatorTree.state.incrementalFetching.full=Fetching more…
 # dominator tree state ERROR.
 dominatorTree.state.error=Error
 
-# LOCALIZATION NOTE (dominatorTree.state.error): The label describing the
+# LOCALIZATION NOTE (dominatorTree.state.error.full): The label describing the
 # dominator tree state ERROR, used in the dominator tree view.
 dominatorTree.state.error.full=There was an error while processing the dominator tree
 
diff --git a/devtools/client/locales/en-US/performance.dtd b/devtools/client/locales/en-US/performance.dtd
index 4009ae104..54b49d2fb 100644
--- a/devtools/client/locales/en-US/performance.dtd
+++ b/devtools/client/locales/en-US/performance.dtd
@@ -11,6 +11,10 @@
   - A good criteria is the language in which you'd find the best
   - documentation on web development on the web. -->
 
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+
 <!-- LOCALIZATION NOTE (performanceUI.bufferStatusTooltip): This string
   -  is displayed as the tooltip for the buffer capacity during a recording. -->
 <!ENTITY performanceUI.bufferStatusTooltip "The profiler stores samples in a circular buffer, and once the buffer reaches the limit for a recording, newer samples begin to overwrite samples at the beginning of the recording.">
@@ -18,18 +22,18 @@
 <!-- LOCALIZATION NOTE (performanceUI.disabledRealTime.nonE10SBuild): This string
   -  is displayed as a message for why the real time overview graph is disabled
   -  when running on a non-multiprocess build. -->
-<!ENTITY performanceUI.disabledRealTime.nonE10SBuild "Realtime recording data disabled on non-multiprocess Firefox.">
+<!ENTITY performanceUI.disabledRealTime.nonE10SBuild "Realtime recording data disabled on non-multiprocess &brandShortName;.">
 
 <!-- LOCALIZATION NOTE (performanceUI.disabledRealTime.disabledE10S): This string
   -  is displayed as a message for why the real time overview graph is disabled
-  -  when running on a build that can run multiprocess Firefox, but just is not enabled. -->
-<!ENTITY performanceUI.disabledRealTime.disabledE10S "Enable multiprocess Firefox in preferences for rendering recording data in realtime.">
+  -  when running on a build that can run multiprocess browser, but just is not enabled. -->
+<!ENTITY performanceUI.disabledRealTime.disabledE10S "Enable multiprocess &brandShortName; in preferences for rendering recording data in realtime.">
 
 <!-- LOCALIZATION NOTE (performanceUI.bufferStatusFull): This string
   -  is displayed when the profiler's circular buffer has started to overlap. -->
 <!ENTITY performanceUI.bufferStatusFull "The buffer is full. Older samples are now being overwritten.">
 
-<!-- LOCALIZATION NOTE (performanceUI.loadingNotice): This is the label shown
+<!-- LOCALIZATION NOTE (performanceUI.unavailableNoticePB): This is the label shown
   -  in the details view while the profiler is unavailable, for example, while
   -  in Private Browsing mode. -->
 <!ENTITY performanceUI.unavailableNoticePB "Recording a profile is currently unavailable. Please close all private browsing windows and try again.">
@@ -88,10 +92,10 @@
 <!ENTITY performanceUI.invertFlameGraph.tooltiptext "Inverting the flame chart displays the profiled call paths starting from the youngest frames and expanding out to the older frames.">
 
 <!-- LOCALIZATION NOTE (performanceUI.showPlatformData): This is the
-  -  label for the checkbox that toggles whether or not Gecko platform data
+  -  label for the checkbox that toggles whether or not Goanna platform data
   -  is displayed in the profiler. -->
-<!ENTITY performanceUI.showPlatformData             "Show Gecko Platform Data">
-<!ENTITY performanceUI.showPlatformData.tooltiptext "Showing platform data enables the JavaScript Profiler reports to include Gecko platform symbols.">
+<!ENTITY performanceUI.showPlatformData             "Show Goanna Platform Data">
+<!ENTITY performanceUI.showPlatformData.tooltiptext "Showing platform data enables the JavaScript Profiler reports to include Goanna platform symbols.">
 
 <!-- LOCALIZATION NOTE (performanceUI.showJITOptimizations): This string
   -  is displayed next to a checkbox determining whether or not JIT optimization data
diff --git a/devtools/client/locales/en-US/performance.properties b/devtools/client/locales/en-US/performance.properties
index 86ddc29b5..14f45186c 100644
--- a/devtools/client/locales/en-US/performance.properties
+++ b/devtools/client/locales/en-US/performance.properties
@@ -62,7 +62,7 @@ graphs.memory=MB
 # 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.other=Goanna
 category.css=Styles
 category.js=JIT
 category.gc=GC
diff --git a/devtools/client/locales/en-US/responsive.properties b/devtools/client/locales/en-US/responsive.properties
index 4347ea0b4..2edcde969 100644
--- a/devtools/client/locales/en-US/responsive.properties
+++ b/devtools/client/locales/en-US/responsive.properties
@@ -57,7 +57,7 @@ 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.
+responsive.remoteOnly=Responsive Design Mode is only available for remote browser tabs, such as those used for web content in the multi-process browser.
 
 # LOCALIZATION NOTE (responsive.noContainerTabs): Message displayed in the tab's
 # notification box if a user tries to open Responsive Design Mode in a
diff --git a/devtools/client/locales/en-US/scratchpad.properties b/devtools/client/locales/en-US/scratchpad.properties
index 250b0cb2f..ae8d08891 100644
--- a/devtools/client/locales/en-US/scratchpad.properties
+++ b/devtools/client/locales/en-US/scratchpad.properties
@@ -64,12 +64,12 @@ confirmRevert=Do you want to revert the changes you made to this scratchpad?
 # you try to revert unsaved content of scratchpad.
 confirmRevert.title=Revert Changes
 
-# LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
+# LOCALIZATION NOTE  (scratchpadIntro1): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
 scratchpadIntro1=/*\n * This is a JavaScript Scratchpad.\n *\n * Enter some JavaScript, then Right Click or choose from the Execute Menu:\n * 1. Run to evaluate the selected text (%1$S),\n * 2. Inspect to bring up an Object Inspector on the result (%2$S), or,\n * 3. Display to insert the result in a comment after the selection. (%3$S)\n */\n\n
 
-# LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
+# LOCALIZATION NOTE  (browserContext.notification): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=This scratchpad executes in the Browser context.
 
@@ -82,7 +82,7 @@ help.openDocumentationPage=https://developer.mozilla.org/en/Tools/Scratchpad
 # Scratchpad.
 scratchpad.statusBarLineCol  = Line %1$S, Col %2$S
 
-# LOCALIZATION NOTE (fileExists.notification): This is the message displayed
+# LOCALIZATION NOTE (fileNoLongerExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification=This file no longer exists.
 
@@ -99,7 +99,7 @@ connectionTimeout=Connection timeout. Check the Error Console on both ends for p
 # %1 is the text of selfxss.okstring
 selfxss.msg=Scam Warning: Take care when pasting things you don’t understand. This could allow attackers to steal your identity or take control of your computer. Please type ‘%S’ in the scratchpad below to allow pasting.
 
-# LOCALIZATION NOTE (selfxss.msg): the string to be typed
+# LOCALIZATION NOTE (selfxss.okstring): the string to be typed
 # in by a new user of the developer tools when they receive the sefxss.msg prompt.
 # Please avoid using non-keyboard characters here
 selfxss.okstring=allow pasting
diff --git a/devtools/client/locales/en-US/sourceeditor.properties b/devtools/client/locales/en-US/sourceeditor.properties
index 842d549f0..42c5a0210 100644
--- a/devtools/client/locales/en-US/sourceeditor.properties
+++ b/devtools/client/locales/en-US/sourceeditor.properties
@@ -4,7 +4,7 @@
 
 # LOCALIZATION NOTE These strings are used inside the Source Editor component.
 # This component is used whenever source code is displayed for the purpose of
-# being edited, inside the Firefox developer tools - current examples are the
+# being edited, inside the browser developer tools - current examples are the
 # Scratchpad and the Style Editor tools.
 
 # LOCALIZATION NOTE The correct localization of this file might be to keep it
diff --git a/devtools/client/locales/en-US/toolbox.dtd b/devtools/client/locales/en-US/toolbox.dtd
index 6097fa82a..73c74567c 100644
--- a/devtools/client/locales/en-US/toolbox.dtd
+++ b/devtools/client/locales/en-US/toolbox.dtd
@@ -199,9 +199,9 @@
   -  label for the checkbox that toggles the display of the platform data in the,
   -  Profiler i.e. devtools.profiler.ui.show-platform-data a boolean preference
   -  in about:config, in the options panel. -->
-<!ENTITY options.showPlatformData.label    "Show Gecko platform data">
+<!ENTITY options.showPlatformData.label    "Show Goanna platform data">
 <!ENTITY options.showPlatformData.tooltip  "If you enable this option the JavaScript Profiler reports will include
-Gecko platform symbols">
+Goanna platform symbols">
 
 <!-- LOCALIZATION NOTE (options.sourceeditor.*): Options under the editor
   -  section. -->
diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
index 5e1a80ccd..554488f6d 100644
--- a/devtools/client/locales/en-US/webide.dtd
+++ b/devtools/client/locales/en-US/webide.dtd
@@ -2,7 +2,11 @@
    - 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 windowTitle "Firefox WebIDE">
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+
+<!ENTITY windowTitle "&brandShortName; WebIDE">
 
 <!ENTITY projectMenu_label "Project">
 <!ENTITY projectMenu_accesskey "P">
@@ -59,7 +63,7 @@
 <!ENTITY projectButton_label "Open App">
 <!ENTITY runtimeButton_label "Select Runtime">
 
-<!-- We try to repicate Firefox' bindings: -->
+<!-- We try to repicate browser' bindings: -->
 <!-- quit app -->
 <!ENTITY key_quit "W">
 <!-- open menu -->
diff --git a/devtools/client/locales/en-US/webide.properties b/devtools/client/locales/en-US/webide.properties
index 2368ad7f1..154094906 100644
--- a/devtools/client/locales/en-US/webide.properties
+++ b/devtools/client/locales/en-US/webide.properties
@@ -2,8 +2,8 @@
 # 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/.
 
-title_noApp=Firefox WebIDE
-title_app=Firefox WebIDE: %S
+title_noApp=WebIDE
+title_app=WebIDE: %S
 
 runtimeButton_label=Select Runtime
 projectButton_label=Open App
@@ -45,11 +45,11 @@ error_cantConnectToApp=Can’t connect to app: %1$S
 # Variable: error message (in english)
 error_cantFetchAddonsJSON=Can’t fetch the add-on list: %S
 
-error_appProjectsLoadFailed=Unable to load project list. This can occur if you’ve used this profile with a newer version of Firefox.
+error_appProjectsLoadFailed=Unable to load project list. This can occur if you’ve used this profile with a newer version of the browser.
 error_folderCreationFailed=Unable to create project folder in the selected directory.
 
 # Variable: runtime app build ID (looks like this %Y%M%D format) and firefox build ID (same format)
-error_runtimeVersionTooRecent=The connected runtime has a more recent build date (%1$S) than your desktop Firefox (%2$S) does. This is an unsupported setup and may cause DevTools to fail. Please update Firefox.
+error_runtimeVersionTooRecent=The connected runtime has a more recent build date (%1$S) than your desktop browser (%2$S) does. This is an unsupported setup and may cause DevTools to fail. Please update the browser.
 
 addons_stable=stable
 addons_unstable=unstable
diff --git a/devtools/client/netmonitor/request-utils.js b/devtools/client/netmonitor/request-utils.js
index 647d71e7c..90fb0c957 100644
--- a/devtools/client/netmonitor/request-utils.js
+++ b/devtools/client/netmonitor/request-utils.js
@@ -177,7 +177,8 @@ const LOAD_CAUSE_STRINGS = {
   [Ci.nsIContentPolicy.TYPE_BEACON]: "beacon",
   [Ci.nsIContentPolicy.TYPE_FETCH]: "fetch",
   [Ci.nsIContentPolicy.TYPE_IMAGESET]: "imageset",
-  [Ci.nsIContentPolicy.TYPE_WEB_MANIFEST]: "webManifest"
+  [Ci.nsIContentPolicy.TYPE_WEB_MANIFEST]: "webManifest",
+  [Ci.nsIContentPolicy.TYPE_SAVEAS_DOWNLOAD]: "saveasDownload"
 };
 
 exports.loadCauseString = function (causeType) {
diff --git a/devtools/client/themes/webconsole.css b/devtools/client/themes/webconsole.css
index c0c0177e1..89bb38628 100644
--- a/devtools/client/themes/webconsole.css
+++ b/devtools/client/themes/webconsole.css
@@ -148,7 +148,7 @@ a {
   display: flex;
 }
 
-.message-body > * {
+.message-body {
   white-space: pre-wrap;
   word-wrap: break-word;
 }