fixes for 39690, 22056, 36125. r=hyatt

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

@@ -41,7 +41,7 @@
   <![CDATA[
     // the first elements in this array will be poked from chromeregistry loaded
     // overlays once overlays.rdf works properly 
-    _elementIDs = ["generalStartupBrowser", "generalStartupMail", "generalStartupEditor", "toolbarStyle"];
+    _elementIDs = ["generalStartupBrowser", "generalStartupMail", "generalStartupEditor", /*"toolbarStyle" */];
   ]]>
   </script>
           
@@ -74,7 +74,7 @@
   </titledbox>
   
   <!-- displaying none for beta -->
-  <titledbox id="toolbarStyleBox" orient="vertical">
+  <titledbox id="toolbarStyleBox" orient="vertical" style="display: none;">
   	<title><text value="&showToolsLegend.label;"/></title>
     <radiogroup id="toolbarStyle" orient="vertical" autostretch="never"
                 pref="true" preftype="int" prefstring="browser.chrome.toolbar_style"

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

@@ -71,6 +71,7 @@
       <box orient="vertical">
         <button class="dialog" value="&languages.customize.addButton.label;" oncommand="AddLanguage();"/>
         <button class="dialog" value="&languages.customize.deleteButton.label;" oncommand="RemoveActiveLanguage();"/>
+        <spring flex="1"/>
       </box>
     </box>
 	</titledbox>

xpfe/components/prefwindow/resources/content/pref-proxies.js

@@ -24,12 +24,14 @@ function DoEnabling()
   var ftpPort = document.getElementById("networkProxyFTP_Port");
   var http = document.getElementById("networkProxyHTTP");
   var httpPort = document.getElementById("networkProxyHTTP_Port");
+  var ssl = document.getElementById("networkProxySSL");
+  var sslPort = document.getElementById("networkProxySSL_Port");
   var noProxy = document.getElementById("networkProxyNone");
   var autoURL = document.getElementById("networkProxyAutoconfigURL");
   var autoReload = document.getElementById("autoReload");
 
   // convenience arrays
-  var manual = [ftp, ftpPort, http, httpPort, noProxy];
+  var manual = [ftp, ftpPort, http, httpPort, ssl, sslPort, noProxy];
   var auto = [autoURL, autoReload];
   
   // radio buttons

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

@@ -32,7 +32,7 @@
 
   <script language="JavaScript">
   <![CDATA[
-    _elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP", "networkProxyHTTP_Port", "networkProxyNone", "networkProxyAutoconfigURL"];
+    _elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP", "networkProxyHTTP_Port", "networkProxySSL", "networkProxySSL_Port", "networkProxyNone", "networkProxyAutoconfigURL"];
   ]]>
   </script>
         
@@ -78,6 +78,16 @@
                          prefattribute="value" size="5"/>
             </box>
           </row>
+          <row>
+            <text class="label" value="&ssl.label;" accesskey="&ssl.accesskey;" for="networkProxySSL"/>
+            <box autostretch="never">
+              <textfield id="networkProxySSL" pref="true" preftype="string" prefstring="network.proxy.ssl"
+                         prefattribute="value" flex="1"/>
+              <text class="label" value="&port.label;" accesskey="&SSLport.accesskey;" for="networkProxySSL_Port"/>
+              <textfield id="networkProxySSL_Port" pref="true" preftype="int" prefstring="network.proxy.ssl_port"
+                         prefattribute="value" size="5"/>
+            </box>
+          </row>
           <row> 
             <text class="label" value="&noproxy.label;" accesskey="&noproxy.accesskey;" for="networkProxyNone"/>
             <textfield id="networkProxyNone" pref="true" preftype="string" prefstring="network.proxy.no_proxies_on"