Bug 1487581 - Stop using hardcoded Firefox string in aboutdebugging;r=flod,ladybenko draft
authorJulian Descottes <jdescottes@mozilla.com>
Wed, 20 Mar 2019 18:08:36 +0000
changeset 11260 e478cad193d4
parent 11259 da25dfd65a54
child 11261 8eabb3570dd2
push id171
push userflodolo@mozilla.com
push dateThu, 21 Mar 2019 07:32:46 +0000
reviewersflod, ladybenko
bugs1487581
Bug 1487581 - Stop using hardcoded Firefox string in aboutdebugging;r=flod,ladybenko Depends on D23879 Differential Revision: https://phabricator.services.mozilla.com/D23907 X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: c475753fb341948266bed261c128cb4a3fd0f621 X-Channel-Repo: releases/mozilla-beta X-Channel-Revision: c5f6756905f70add7313f8b74dcbe15029dc2590 X-Channel-Repo: releases/mozilla-release X-Channel-Revision: 15f10287a218572a7fd47acabb40208645b4462d
devtools/client/aboutdebugging.ftl
--- a/devtools/client/aboutdebugging.ftl
+++ b/devtools/client/aboutdebugging.ftl
@@ -10,22 +10,19 @@
 about-debugging-page-title-setup-page = Debugging - Setup
 
 # Page title (ie tab title) for the Runtime page
 # { $selectedRuntimeId } is the id of the current runtime, such as "this-firefox", "localhost:6080", ...
 about-debugging-page-title-runtime-page = Debugging - Runtime / { $selectedRuntimeId }
 
 # Sidebar strings
 
-# Display name of the runtime "This Firefox". Reused as the sidebar name for This Firefox
-# (about-debugging-sidebar-this-firefox.name). Not displayed elsewhere in the application
-# at the moment.
-# This should the same string as the part outside of the parentheses in toolbox.properties
-# toolbox.debugTargetInfo.runtimeLabel.thisFirefox. See Bug 1520525.
-about-debugging-this-firefox-runtime-name = This Firefox
+# Display name of the runtime for the currently running instance of Firefox. Used in the
+# Sidebar and in the Setup page.
+about-debugging-this-firefox-runtime-name = This { -brand-shorter-name }
 
 # Sidebar heading for selecting the currently running instance of Firefox
 about-debugging-sidebar-this-firefox =
   .name = { about-debugging-this-firefox-runtime-name }
 
 # Sidebar heading for connecting to some remote source
 about-debugging-sidebar-setup =
   .name = Setup
@@ -78,26 +75,26 @@ about-debugging-setup-title = Setup
 # Introduction text in the Setup page to explain how to configure remote debugging.
 about-debugging-setup-intro = Configure the connection method you wish to remotely debug your device with.
 
 # Link displayed in the Setup page that leads to MDN page with list of supported devices.
 # Temporarily leads to https://support.mozilla.org/en-US/kb/will-firefox-work-my-mobile-device#w_android-devices
 about-debugging-setup-link-android-devices = View list of supported Android devices
 
 # Explanatory text in the Setup page about what the 'This Firefox' page is for
-about-debugging-setup-this-firefox = Use <a>This Firefox</a> to debug tabs, extensions and service workers on this version of Firefox.
+about-debugging-setup-this-firefox = Use <a>{ about-debugging-this-firefox-runtime-name }</a> to debug tabs, extensions and service workers on this version of { -brand-shorter-name }.
 
 # Title of the heading Connect section of the Setup page.
 about-debugging-setup-connect-heading = Connect a Device
 
 # USB section of the Setup page
 about-debugging-setup-usb-title = USB
 
 # Explanatory text displayed in the Setup page when USB debugging is disabled
-about-debugging-setup-usb-disabled = Enabling this will download and add the required Android USB debugging components to Firefox.
+about-debugging-setup-usb-disabled = Enabling this will download and add the required Android USB debugging components to { -brand-shorter-name }.
 
 # Text of the button displayed in the USB section of the setup page when USB debugging is disabled.
 # Clicking on it will download components needed to debug USB Devices remotely.
 about-debugging-setup-usb-enable-button = Enable USB Devices
 
 # Text of the button displayed in the USB section of the setup page when USB debugging is enabled.
 about-debugging-setup-usb-disable-button = Disable USB Devices
 
@@ -192,17 +189,17 @@ about-debugging-runtime-version-too-old 
 about-debugging-runtime-version-too-old-67-debugger = The Debugger panel may not work with the connected runtime. Please use Firefox { $runtimeVersion } if you need to use the Debugger with this runtime.
 
 # This string is displayed in the runtime page if the remote runtime version is too recent.
 # "Troubleshooting" link points to https://developer.mozilla.org/en-US/docs/Tools/WebIDE/Troubleshooting
 # { $runtimeID } is the build ID of the remote runtime (for instance "20181231", format is yyyyMMdd)
 # { $localID } is the build ID of the current Firefox instance (same format)
 # { $runtimeVersion } is the version of the remote runtime (for instance "67.0a1")
 # { $localVersion } is the version of your current runtime (same format)
-about-debugging-runtime-version-too-recent = The connected runtime is more recent ({ $runtimeVersion }, buildID { $runtimeID }) than your desktop Firefox ({ $localVersion }, buildID { $localID }). This is an unsupported setup and may cause DevTools to fail. Please update Firefox. <a>Troubleshooting</a>
+about-debugging-runtime-version-too-recent = The connected runtime is more recent ({ $runtimeVersion }, buildID { $runtimeID }) than your { -brand-shorter-name } ({ $localVersion }, buildID { $localID }). This is an unsupported setup and may cause DevTools to fail. Please update Firefox. <a>Troubleshooting</a>
 
 # Displayed for runtime info in runtime pages.
 # { $name } is brand name such as "Firefox Nightly"
 # { $version } is version such as "64.0a1"
 about-debugging-runtime-name = { $name } ({ $version })
 
 # Text of a button displayed in Runtime pages for remote runtimes.
 # Clicking on the button will close the connection to the runtime.