backing out Doron's patch per his request (just backing out changes to

things that are already built).  Will try to reland ASAP, but he wanted
it out while he's working on it.

xpfe/components/prefwindow/resources/content/pref-advanced.xul

@@ -30,7 +30,7 @@
   <script type="application/x-javascript">
   <![CDATA[
     var panel = "chrome://communicator/content/pref/pref-advanced.xul";
-    var _elementIDs = ["advancedJavaAllow", "advancedMailFTP", "advancedMailFTPAddress"];
+    var _elementIDs = ["advancedJavaAllow", "javascriptEnabled", "advancedMailFTP", "advancedMailFTPAddress"];
     
     function Startup() {
       ftpCheck();
@@ -134,6 +134,8 @@
     <vbox align="start" id="contentEnablingBox">
       <checkbox id="advancedJavaAllow" label="&enbJavaCheck.label;" accesskey="&enbJavaCheck.accesskey;"
                 prefstring="security.enable_java"/>
+      <checkbox id="javascriptEnabled" label="&enbJsCheck.label;" accesskey="&enbJsCheck.accesskey;"
+                prefstring="javascript.enabled"/>
     </vbox>
     <vbox>
       <separator/>

xpfe/components/prefwindow/resources/content/preftree.xul

@@ -130,11 +130,6 @@
         <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/> 
       </treerow>
       <treechildren id="advancedChildren">
-        <treeitem>
-          <treerow>
-            <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/> 
-          </treerow>
-        </treeitem>
         <treeitem>
           <treerow>
             <treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-cache.xul" label="&cache.label;"/> 

xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd

@@ -10,6 +10,10 @@
 <!ENTITY enbJavaCheck.label           "Enable Java">
 <!ENTITY enbJavaCheck.accesskey       "j">
 
+<!--LOCALIZATION NOTE (enbJsCheck.label): 'JavaScript' should never be translated -->
+<!ENTITY enbJsCheck.label             "Enable JavaScript for Navigator">
+<!ENTITY enbJsCheck.accesskey         "r">
+
 <!ENTITY sendAddFtpCheck.label        "Send this email address as anonymous FTP password:">
 <!ENTITY sendAddFtpCheck.accesskey    "e">
 

xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd

@@ -30,4 +30,3 @@
 <!ENTITY search.label "Internet Search">
 <!ENTITY policies.label "Security Policies">
 <!ENTITY mousewheel.label "Mouse Wheel">
-<!ENTITY scriptsAndWindows.label "Scripts &amp; Windows">