Bug 868452 - Fix entity name (&brandShortName;) and string consistency in gclicommands.properties r=dcamp
authorFrancesco Lodolo [:flod] <francesco.lodolo@gmail.com>
Thu, 09 May 2013 18:58:45 +0200
changeset 142352 671e9ced84bc448be1656225edd2a2447148b356
parent 142351 0f05638c8f26579812daae21af7bf72613182525
child 142353 712d3684efe44cff7d6963ba3d8af0d58e80f802
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdcamp
bugs868452
milestone23.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 868452 - Fix entity name (&brandShortName;) and string consistency in gclicommands.properties r=dcamp
browser/devtools/commandline/BuiltinCommands.jsm
browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
--- a/browser/devtools/commandline/BuiltinCommands.jsm
+++ b/browser/devtools/commandline/BuiltinCommands.jsm
@@ -1598,25 +1598,25 @@ XPCOMUtils.defineLazyModuleGetter(this, 
   }
 }(this));
 
 /* CmdTools -------------------------------------------------------------- */
 
 (function(module) {
   gcli.addCommand({
     name: "tools",
-    description: gcli.lookup("toolsDesc"),
-    manual: gcli.lookup("toolsManual"),
+    description: gcli.lookupFormat("toolsDesc2", [BRAND_SHORT_NAME]),
+    manual: gcli.lookupFormat("toolsManual2", [BRAND_SHORT_NAME]),
     get hidden() gcli.hiddenByChromePref(),
   });
 
   gcli.addCommand({
     name: "tools srcdir",
     description: gcli.lookup("toolsSrcdirDesc"),
-    manual: gcli.lookup("toolsSrcdirManual"),
+    manual: gcli.lookupFormat("toolsSrcdirManual2", [BRAND_SHORT_NAME]),
     get hidden() gcli.hiddenByChromePref(),
     params: [
       {
         name: "srcdir",
         type: "string",
         description: gcli.lookup("toolsSrcdirDir")
       }
     ],
@@ -1657,17 +1657,17 @@ XPCOMUtils.defineLazyModuleGetter(this, 
   gcli.addCommand({
     name: "tools reload",
     description: gcli.lookup("toolsReloadDesc"),
     get hidden() gcli.hiddenByChromePref() || !Services.prefs.prefHasUserValue("devtools.loader.srcdir"),
 
     returnType: "string",
     exec: function(args, context) {
       devtools.reload();
-      return gcli.lookup("toolsReloaded");
+      return gcli.lookup("toolsReloaded2");
     }
   });
 }(this));
 
 /* CmdRestart -------------------------------------------------------------- */
 
 (function(module) {
   /**
--- a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
@@ -729,62 +729,63 @@ pagemodRemoveAttributeRootDesc=CSS selec
 # 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 (toolsDesc) A very short description of the 'tools'
+# LOCALIZATION NOTE (toolsDesc2) A very short description of the 'tools'
 # command, the parent command for tool-hacking commands.
-toolsDesc=Hack the &brandShortName; Developer Tools
+# The argument (%1$S) is the browser name.
+toolsDesc2=Hack the %1$S Developer Tools
 
-# LOCALIZATION NOTE (toolsDesc) A fuller description of the 'tools'
-# command.
-toolsManual=Various commands related to hacking directly on the &brandShortName; 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 (toolsSrcdirNotFound) Shown when the 'tools srcdir' command was handed
 # an invalid srcdir.
 toolsSrcdirNotFound=%1$s does not exist or is not a mozilla-central checkout.
 
 # LOCALIZATION NOTE (toolsSrcdirReloaded) Displayed when tools have been reloaded by the
 # 'tools srcdir' command.
 toolsSrcdirReloaded=Tools loaded from %1$s.
 
-# LOCALIZATION NOTE (toolsSrcdirDesc) A full description of the 'tools srcdir'
-# command.
-toolsSrcdirManual=Load the &brandShortName; Developer Tools from a complete mozilla-central checkout.
+# 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 (toolsBuiltinDesc) 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=Built-in tools loaded.
+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 (toolsReloaded) Displayed when tools are reloaded with the 'tools
+# LOCALIZATION NOTE (toolsReloaded2) Displayed when tools are reloaded with the 'tools
 # reload' command.
-toolsReloaded="Tools reloaded."
+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'