From 4f82d9b238a3ffc73e0342dbebb5677a6e296148 Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Tue, 16 Oct 2012 15:00:19 +0100
Subject: [PATCH] Bug 799462 - GCLI jsb command should revert
 jsbBraceStyleDesc, jsbBraceStyleManual strings r=joewalker a=pike

---
 browser/devtools/commandline/CmdJsb.jsm                   | 4 ++--
 .../en-US/chrome/browser/devtools/gclicommands.properties | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/devtools/commandline/CmdJsb.jsm b/browser/devtools/commandline/CmdJsb.jsm
index f19c32f86edb..6d5f399b9bab 100644
--- a/browser/devtools/commandline/CmdJsb.jsm
+++ b/browser/devtools/commandline/CmdJsb.jsm
@@ -74,8 +74,8 @@ gcli.addCommand({
             name: 'selection',
             data: ['collapse', 'expand', 'end-expand', 'expand-strict']
           },
-          description: gcli.lookup('jsbBraceStyleDesc'),
-          manual: gcli.lookup('jsbBraceStyleManual'),
+          description: gcli.lookup('jsbBraceStyleDesc2'),
+          manual: gcli.lookup('jsbBraceStyleManual2'),
           defaultValue: "collapse"
         },
         {
diff --git a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
index 07a4b6b5d4d4..576991b73063 100644
--- a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
@@ -849,16 +849,16 @@ jsbJslintHappyDesc=Enforce jslint-stricter mode?
 # on what it does.
 jsbJslintHappyManual=When set to true, jslint-stricter mode is enforced
 
-# LOCALIZATION NOTE (jsbBraceStyleDesc) A very short description of the
+# 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.
-jsbBraceStyleDesc=Select the coding style of braces
+jsbBraceStyleDesc2=Collapse, expand, end-expand, expand-strict
 
-# LOCALIZATION NOTE (jsbBraceStyleManual) A fuller description of the
+# LOCALIZATION NOTE (jsbBraceStyleManual2) A fuller description of the
 # 'jsb <braceStyle>' parameter, displayed when the user asks for help
 # on what it does.
-jsbBraceStyleManual=<p class="nowrap">The coding style of braces. Select from one of the following:</p><ul><li>collapse<br/><pre>if (x == 1) {\n  ...\n} else {\n  ...\n}</pre></li><li>expand<br/><pre>if (x == 1)\n{\n  ...\n}\nelse\n{\n  ...\n}</pre></li><li>end-expand<br/><pre>if (x == 1) {\n  ...\n}\nelse {\n  ...\n}</pre></li><li>expand-strict<br/><pre>if (x == 1)\n{\n  return // This option can break scripts\n  {\n    a: 1\n  };\n} else {\n  ...\n}</pre></li></ul>
+jsbBraceStyleManual2=The coding style of braces. Either collapse, expand, end-expand or expand-strict
 
 # LOCALIZATION NOTE (jsbNoSpaceBeforeConditionalDesc) A very short description
 # of the 'jsb <noSpaceBeforeConditional>' parameter. This string is designed to