From 0367feb053eec42363016a504981a789c34be36b Mon Sep 17 00:00:00 2001
From: Michael Ratcliffe <mratcliffe@mozilla.com>
Date: Tue, 9 Oct 2012 14:56:09 +0100
Subject: [PATCH] Bug 799462 - GCLI jsb command should revert
 jsbBraceStyleDesc, jsbBraceStyleManual strings; r=jwalker

---
 .../en-US/chrome/browser/devtools/gclicommands.properties     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
index 07a4b6b5d4d..787df4af2b1 100644
--- a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
@@ -853,12 +853,12 @@ jsbJslintHappyManual=When set to true, jslint-stricter mode is enforced
 # '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
+jsbBraceStyleDesc=Collapse, expand, end-expand, expand-strict
 
 # LOCALIZATION NOTE (jsbBraceStyleManual) 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>
+jsbBraceStyleManual=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