cleaned up all files draft
authorZack Herrick <herrickz@msu.edu>
Thu, 16 Feb 2017 16:39:33 -0500
changeset 485584 79c461e3683d01e1727a0a4f65667f5e3bb460f4
parent 482433 0447dc1396a093c61cabf9fafa1a00d12cb45040
child 485599 7027887fb7b7e45c05f30a87778426cdb515cae8
push id45772
push userbmo:lzylong@gmail.com
push dateThu, 16 Feb 2017 21:41:43 +0000
milestone54.0a1
cleaned up all files MozReview-Commit-ID: CvuqIsdRSWC
browser/components/preferences/in-content/advanced.js
browser/components/preferences/in-content/advanced.xul
browser/components/preferences/in-content/applications.xul
browser/components/preferences/in-content/content.js
browser/components/preferences/in-content/content.xul
browser/components/preferences/in-content/jar.mn
browser/components/preferences/in-content/main.js
browser/components/preferences/in-content/main.xul
browser/components/preferences/in-content/preferences.js
browser/components/preferences/in-content/preferences.xul
browser/components/preferences/in-content/privacy.js
browser/components/preferences/in-content/privacy.xul
browser/components/preferences/in-content/search.js
browser/components/preferences/in-content/search.xul
browser/components/preferences/in-content/security.js
browser/components/preferences/in-content/security.xul
browser/locales/en-US/chrome/browser/preferences/advanced.dtd
browser/locales/en-US/chrome/browser/preferences/preferences.dtd
browser/locales/en-US/chrome/browser/preferences/privacy.dtd
--- a/browser/components/preferences/in-content/advanced.js
+++ b/browser/components/preferences/in-content/advanced.js
@@ -20,21 +20,16 @@ var gAdvancedPane = {
    */
   init() {
     function setEventListener(aId, aEventType, aCallback) {
       document.getElementById(aId)
               .addEventListener(aEventType, aCallback.bind(gAdvancedPane));
     }
 
     this._inited = true;
-    //var advancedPrefs = document.getElementById("advancedPrefs");
-
-    //var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
-    // if (preference.value !== null)
-    //     advancedPrefs.selectedIndex = preference.value;
 
     if (AppConstants.MOZ_UPDATER) {
       let onUnload = function() {
         window.removeEventListener("unload", onUnload);
         Services.prefs.removeObserver("app.update.", this);
       }.bind(this);
       window.addEventListener("unload", onUnload);
       Services.prefs.addObserver("app.update.", this, false);
@@ -47,61 +42,29 @@ var gAdvancedPane = {
     this.initTelemetry();
     if (AppConstants.MOZ_TELEMETRY_REPORTING) {
       this.initSubmitHealthReport();
     }
     this.updateOnScreenKeyboardVisibility();
 
     setEventListener("layers.acceleration.disabled", "change",
                      gAdvancedPane.updateHardwareAcceleration);
-    // setEventListener("advancedPrefs", "select",
-    //                  gAdvancedPane.tabSelectionChanged);
     if (AppConstants.MOZ_TELEMETRY_REPORTING) {
       setEventListener("submitHealthReportBox", "command",
                        gAdvancedPane.updateSubmitHealthReport);
     }
 
     if (AppConstants.MOZ_UPDATER) {
       setEventListener("updateRadioGroup", "command",
                        gAdvancedPane.updateWritePrefs);
       setEventListener("showUpdateHistory", "command",
                        gAdvancedPane.showUpdates);
     }
-
-    if (AppConstants.MOZ_WIDGET_GTK) {
-      // GTK tabbox' allow the scroll wheel to change the selected tab,
-      // but we don't want this behavior for the in-content preferences.
-      // let tabsElement = document.getElementById("tabsElement");
-      // tabsElement.addEventListener("DOMMouseScroll", event => {
-      //   event.stopPropagation();
-      // }, true);
-    }
   },
 
-  /**
-   * Stores the identity of the current tab in preferences so that the selected
-   * tab can be persisted between openings of the preferences window.
-   */
-  // tabSelectionChanged() {
-  //   if (!this._inited)
-  //     return;
-  //   var advancedPrefs = document.getElementById("advancedPrefs");
-  //   var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
-
-  //   // tabSelectionChanged gets called twice due to the selectedIndex being set
-  //   // by both the selectedItem and selectedPanel callstacks. This guard is used
-  //   // to prevent double-counting in Telemetry.
-  //   if (preference.valueFromPreferences != advancedPrefs.selectedIndex) {
-  //     Services.telemetry
-  //             .getHistogramById("FX_PREFERENCES_CATEGORY_OPENED")
-  //             .add(telemetryBucketForCategory("advanced"));
-  //   }
-
-  //   preference.valueFromPreferences = advancedPrefs.selectedIndex;
-  // },
 
   // GENERAL TAB
 
   /*
    * Preferences:
    *
    * accessibility.browsewithcaret
    * - true enables keyboard navigation and selection within web pages using a
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@@ -49,17 +49,17 @@
   <stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/>
   <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
 #endif
 
 <hbox id="header-advanced"
       class="header"
       hidden="true"
       data-category="paneAdvanced">
-  <label class="header-name" flex="1">&paneAdvanced.title;</label>
+  <label class="header-name" flex="1">&paneUpdates.title;</label>
   <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
 </hbox>
 
 
 
     <!-- General -->
       <!-- Accessibility -->
       <!--<groupbox id="accessibilityGroup" align="start">
--- a/browser/components/preferences/in-content/applications.xul
+++ b/browser/components/preferences/in-content/applications.xul
@@ -58,17 +58,17 @@
   <key key="&focusSearch1.key;" modifiers="accel" id="focusSearch1" oncommand=";"/>
   <key key="&focusSearch2.key;" modifiers="accel" id="focusSearch2" oncommand=";"/>
 </keyset>
 
 <hbox id="header-applications"
       class="header"
       hidden="true"
       data-category="paneApplications">
-  <label class="header-name" flex="1">&paneApplications.title;</label>
+  <label class="header-name" flex="1">&paneDownloadLinks.title;</label>
   <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
 </hbox>
 
 <vbox id="applicationsContent"
       data-category="paneApplications"
       hidden="true"
       flex="1">
 
@@ -97,17 +97,16 @@
 #ifdef XP_MACOSX
                 accesskey="&chooseFolderMac.accesskey;"
                 label="&chooseFolderMac.label;"
 #else
                 accesskey="&chooseFolderWin.accesskey;"
                 label="&chooseFolderWin.label;"
 #endif
         />
-        <!--<button id="chooseFolder"/>-->
       </hbox>
       <hbox>
         <radio id="alwaysAsk"
               value="false"
               label="&alwaysAskWhere.label;"
               accesskey="&alwaysAskWhere.accesskey;"/>
       </hbox>
     </radiogroup>
deleted file mode 100644
--- a/browser/components/preferences/in-content/content.js
+++ /dev/null
@@ -1,280 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", function() {
-  try {
-    let alertsService = Cc["@mozilla.org/alerts-service;1"]
-                          .getService(Ci.nsIAlertsService)
-                          .QueryInterface(Ci.nsIAlertsDoNotDisturb);
-    // This will throw if manualDoNotDisturb isn't implemented.
-    alertsService.manualDoNotDisturb;
-    return alertsService;
-  } catch (ex) {
-    return undefined;
-  }
-});
-
-var gContentPane = {
-  init() {
-    // function setEventListener(aId, aEventType, aCallback) {
-    //   document.getElementById(aId)
-    //           .addEventListener(aEventType, aCallback.bind(gContentPane));
-    // }
-
-    // Initializes the fonts dropdowns displayed in this pane.
-    // this._rebuildFonts();
-    // var menulist = document.getElementById("defaultFont");
-    // if (menulist.selectedIndex == -1) {
-    //   menulist.value = FontBuilder.readFontSelection(menulist);
-    // }
-
-    // // Show translation preferences if we may:
-    // const prefName = "browser.translation.ui.show";
-    // if (Services.prefs.getBoolPref(prefName)) {
-    //   let row = document.getElementById("translationBox");
-    //   row.removeAttribute("hidden");
-    //   // Showing attribution only for Bing Translator.
-    //   Components.utils.import("resource:///modules/translation/Translation.jsm");
-    //   if (Translation.translationEngine == "bing") {
-    //     document.getElementById("bingAttribution").removeAttribute("hidden");
-    //   }
-    // }
-
-    // if (AlertsServiceDND) {
-    //   let notificationsDoNotDisturbRow =
-    //     document.getElementById("notificationsDoNotDisturbRow");
-    //   notificationsDoNotDisturbRow.removeAttribute("hidden");
-    //   if (AlertsServiceDND.manualDoNotDisturb) {
-    //     let notificationsDoNotDisturb =
-    //       document.getElementById("notificationsDoNotDisturb");
-    //     notificationsDoNotDisturb.setAttribute("checked", true);
-    //   }
-    // }
-
-    // setEventListener("font.language.group", "change",
-    //   gContentPane._rebuildFonts);
-    // setEventListener("notificationsPolicyButton", "command",
-    //   gContentPane.showNotificationExceptions);
-    // setEventListener("popupPolicyButton", "command",
-    //   gContentPane.showPopupExceptions);
-    // setEventListener("advancedFonts", "command",
-    //   gContentPane.configureFonts);
-    // setEventListener("colors", "command",
-    //   gContentPane.configureColors);
-    // setEventListener("chooseLanguage", "command",
-    //   gContentPane.showLanguages);
-    // setEventListener("translationAttributionImage", "click",
-    //   gContentPane.openTranslationProviderAttribution);
-    // setEventListener("translateButton", "command",
-    //   gContentPane.showTranslationExceptions);
-    // setEventListener("notificationsDoNotDisturb", "command",
-    //   gContentPane.toggleDoNotDisturbNotifications);
-
-    // let notificationInfoURL =
-    //   Services.urlFormatter.formatURLPref("app.support.baseURL") + "push";
-    // document.getElementById("notificationsPolicyLearnMore").setAttribute("href",
-    //                                                                      notificationInfoURL);
-
-    // let drmInfoURL =
-    //   Services.urlFormatter.formatURLPref("app.support.baseURL") + "drm-content";
-    // document.getElementById("playDRMContentLink").setAttribute("href", drmInfoURL);
-    // let emeUIEnabled = Services.prefs.getBoolPref("browser.eme.ui.enabled");
-    // // Force-disable/hide on WinXP:
-    // if (navigator.platform.toLowerCase().startsWith("win")) {
-    //   emeUIEnabled = emeUIEnabled && parseFloat(Services.sysinfo.get("version")) >= 6;
-    // }
-    // if (!emeUIEnabled) {
-    //   // Don't want to rely on .hidden for the toplevel groupbox because
-    //   // of the pane hiding/showing code potentially interfering:
-    //   document.getElementById("drmGroup").setAttribute("style", "display: none !important");
-    // }
-  },
-
-  // // UTILITY FUNCTIONS
-
-  // /**
-  //  * Utility function to enable/disable the button specified by aButtonID based
-  //  * on the value of the Boolean preference specified by aPreferenceID.
-  //  */
-  // updateButtons(aButtonID, aPreferenceID) {
-  //   var button = document.getElementById(aButtonID);
-  //   var preference = document.getElementById(aPreferenceID);
-  //   button.disabled = preference.value != true;
-  //   return undefined;
-  // },
-
-  // // BEGIN UI CODE
-
-  // /*
-  //  * Preferences:
-  //  *
-  //  * dom.disable_open_during_load
-  //  * - true if popups are blocked by default, false otherwise
-  //  */
-
-  // // NOTIFICATIONS
-
-  // /**
-  //  * Displays the notifications exceptions dialog where specific site notification
-  //  * preferences can be set.
-  //  */
-  // showNotificationExceptions() {
-  //   let bundlePreferences = document.getElementById("bundlePreferences");
-  //   let params = { permissionType: "desktop-notification" };
-  //   params.windowTitle = bundlePreferences.getString("notificationspermissionstitle");
-  //   params.introText = bundlePreferences.getString("notificationspermissionstext4");
-
-  //   gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
-  //                   "resizable=yes", params);
-
-  //   try {
-  //     Services.telemetry
-  //             .getHistogramById("WEB_NOTIFICATION_EXCEPTIONS_OPENED").add();
-  //   } catch (e) {}
-  // },
-
-
-  // // POP-UPS
-
-  // /**
-  //  * Displays the popup exceptions dialog where specific site popup preferences
-  //  * can be set.
-  //  */
-  // showPopupExceptions() {
-  //   var bundlePreferences = document.getElementById("bundlePreferences");
-  //   var params = { blockVisible: false, sessionVisible: false, allowVisible: true,
-  //                  prefilledHost: "", permissionType: "popup" }
-  //   params.windowTitle = bundlePreferences.getString("popuppermissionstitle");
-  //   params.introText = bundlePreferences.getString("popuppermissionstext");
-
-  //   gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
-  //                   "resizable=yes", params);
-  // },
-
-  // // FONTS
-
-  // /**
-  //  * Populates the default font list in UI.
-  //  */
-  // _rebuildFonts() {
-  //   var preferences = document.getElementById("contentPreferences");
-  //   // Ensure preferences are "visible" to ensure bindings work.
-  //   preferences.hidden = false;
-  //   // Force flush:
-  //   preferences.clientHeight;
-  //   var langGroupPref = document.getElementById("font.language.group");
-  //   this._selectDefaultLanguageGroup(langGroupPref.value,
-  //                                    this._readDefaultFontTypeForLanguage(langGroupPref.value) == "serif");
-  // },
-
-  // /**
-  //  *
-  //  */
-  // _selectDefaultLanguageGroup(aLanguageGroup, aIsSerif) {
-  //   const kFontNameFmtSerif         = "font.name.serif.%LANG%";
-  //   const kFontNameFmtSansSerif     = "font.name.sans-serif.%LANG%";
-  //   const kFontNameListFmtSerif     = "font.name-list.serif.%LANG%";
-  //   const kFontNameListFmtSansSerif = "font.name-list.sans-serif.%LANG%";
-  //   const kFontSizeFmtVariable      = "font.size.variable.%LANG%";
-
-  //   var preferences = document.getElementById("contentPreferences");
-  //   var prefs = [{ format   : aIsSerif ? kFontNameFmtSerif : kFontNameFmtSansSerif,
-  //                  type     : "fontname",
-  //                  element  : "defaultFont",
-  //                  fonttype : aIsSerif ? "serif" : "sans-serif" },
-  //                { format   : aIsSerif ? kFontNameListFmtSerif : kFontNameListFmtSansSerif,
-  //                  type     : "unichar",
-  //                  element  : null,
-  //                  fonttype : aIsSerif ? "serif" : "sans-serif" },
-  //                { format   : kFontSizeFmtVariable,
-  //                  type     : "int",
-  //                  element  : "defaultFontSize",
-  //                  fonttype : null }];
-  //   for (var i = 0; i < prefs.length; ++i) {
-  //     var preference = document.getElementById(prefs[i].format.replace(/%LANG%/, aLanguageGroup));
-  //     if (!preference) {
-  //       preference = document.createElement("preference");
-  //       var name = prefs[i].format.replace(/%LANG%/, aLanguageGroup);
-  //       preference.id = name;
-  //       preference.setAttribute("name", name);
-  //       preference.setAttribute("type", prefs[i].type);
-  //       preferences.appendChild(preference);
-  //     }
-
-  //     if (!prefs[i].element)
-  //       continue;
-
-  //     var element = document.getElementById(prefs[i].element);
-  //     if (element) {
-  //       element.setAttribute("preference", preference.id);
-
-  //       if (prefs[i].fonttype)
-  //         FontBuilder.buildFontList(aLanguageGroup, prefs[i].fonttype, element);
-
-  //       preference.setElementValue(element);
-  //     }
-  //   }
-  // },
-
-  // /**
-  //  * Returns the type of the current default font for the language denoted by
-  //  * aLanguageGroup.
-  //  */
-  // _readDefaultFontTypeForLanguage(aLanguageGroup) {
-  //   const kDefaultFontType = "font.default.%LANG%";
-  //   var defaultFontTypePref = kDefaultFontType.replace(/%LANG%/, aLanguageGroup);
-  //   var preference = document.getElementById(defaultFontTypePref);
-  //   if (!preference) {
-  //     preference = document.createElement("preference");
-  //     preference.id = defaultFontTypePref;
-  //     preference.setAttribute("name", defaultFontTypePref);
-  //     preference.setAttribute("type", "string");
-  //     preference.setAttribute("onchange", "gContentPane._rebuildFonts();");
-  //     document.getElementById("contentPreferences").appendChild(preference);
-  //   }
-  //   return preference.value;
-  // },
-
-  // /**
-  //  * Displays the fonts dialog, where web page font names and sizes can be
-  //  * configured.
-  //  */
-  // configureFonts() {
-  //   gSubDialog.open("chrome://browser/content/preferences/fonts.xul", "resizable=no");
-  // },
-
-  // /**
-  //  * Displays the colors dialog, where default web page/link/etc. colors can be
-  //  * configured.
-  //  */
-  // configureColors() {
-  //   gSubDialog.open("chrome://browser/content/preferences/colors.xul", "resizable=no");
-  // },
-
-  // LANGUAGES
-
-  // /**
-  //  * Shows a dialog in which the preferred language for web content may be set.
-  //  */
-  // showLanguages() {
-  //   gSubDialog.open("chrome://browser/content/preferences/languages.xul");
-  // },
-
-  // /**
-  //  * Displays the translation exceptions dialog where specific site and language
-  //  * translation preferences can be set.
-  //  */
-  // showTranslationExceptions() {
-  //   gSubDialog.open("chrome://browser/content/preferences/translation.xul");
-  // },
-
-  // openTranslationProviderAttribution() {
-  //   Components.utils.import("resource:///modules/translation/Translation.jsm");
-  //   Translation.openProviderAttribution();
-  // },
-
-  // toggleDoNotDisturbNotifications(event) {
-  //   AlertsServiceDND.manualDoNotDisturb = event.target.checked;
-  // },
-};
deleted file mode 100644
--- a/browser/components/preferences/in-content/content.xul
+++ /dev/null
@@ -1,210 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-<!-- Content panel -->
-
-<preferences id="contentPreferences" hidden="true" data-category="paneContent">
-
-   <!--DRM content -->
-  <!--<preference id="media.eme.enabled"
-              name="media.eme.enabled"
-              type="bool"/>-->
-
-  <!-- Popups -->
-  <!--<preference id="dom.disable_open_during_load"
-              name="dom.disable_open_during_load"
-              type="bool"/>-->
-
-   <!--Fonts -->
-  <!--<preference id="font.language.group"
-              name="font.language.group"
-              type="wstring"/>-->
-
-  <!-- Languages -->
-  <!--<preference id="browser.translation.detectLanguage"
-              name="browser.translation.detectLanguage"
-              type="bool"/>-->
-</preferences>
-
-<script type="application/javascript"
-        src="chrome://mozapps/content/preferences/fontbuilder.js"/>
-<script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/content.js"/>
-
-<hbox id="header-content"
-      class="header"
-      hidden="true"
-      data-category="paneContent">
-  <label class="header-name" flex="1">&paneContent.title;</label>
-  <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
-</hbox>
-
-  <!-- DRM Content -->
-<!--<groupbox id="drmGroup" data-category="paneContent" hidden="true">
-  <caption><label>&drmContent.label;</label></caption>
-  <grid id="contentGrid2">
-    <columns>
-      <column flex="1"/>
-      <column/>
-    </columns>
-    <rows id="contentRows-2">
-      <row id="playDRMContentRow">
-        <hbox align="center">
-          <checkbox id="playDRMContent" preference="media.eme.enabled"
-                    label="&playDRMContent.label;" accesskey="&playDRMContent.accesskey;"/>
-          <label id="playDRMContentLink" class="learnMore text-link" value="&playDRMContent.learnMore.label;"/>
-        </hbox>
-      </row>
-    </rows>
-  </grid>
-</groupbox>-->
-
-  <!-- Notifications -->
-<!--<groupbox id="notificationsGroup" data-category="paneContent" hidden="true">
-  <caption><label>&notificationsPolicy.label;</label></caption>
-  <grid>
-    <columns>
-      <column flex="1"/>
-      <column/>
-    </columns>
-    <rows>
-      <row id="notificationsPolicyRow" align="center">
-        <hbox align="start">
-          <label id="notificationsPolicy">&notificationsPolicyDesc3.label;</label>
-          <label id="notificationsPolicyLearnMore"
-                 class="learnMore text-link"
-                 value="&notificationsPolicyLearnMore.label;"/>
-        </hbox>
-        <hbox pack="end">
-          <button id="notificationsPolicyButton" label="&notificationsPolicyButton.label;"
-                  accesskey="&notificationsPolicyButton.accesskey;"/>
-        </hbox>
-      </row>
-      <row id="notificationsDoNotDisturbRow" hidden="true">
-        <vbox align="start">
-          <checkbox id="notificationsDoNotDisturb" label="&notificationsDoNotDisturb.label;"
-                    accesskey="&notificationsDoNotDisturb.accesskey;"/>
-          <label id="notificationsDoNotDisturbDetails"
-                 class="indent"
-                 value="&notificationsDoNotDisturbDetails.value;"/>
-        </vbox>
-      </row>
-    </rows>
-  </grid>
-</groupbox>-->
-
-<!-- Pop-ups -->
-<!--<groupbox id="miscGroup" data-category="paneContent" hidden="true">
-  <caption><label>&popups.label;</label></caption>
-  <grid id="contentGrid">
-    <columns>
-      <column flex="1"/>
-      <column/>
-    </columns>
-    <rows id="contentRows-1">
-      <row id="popupPolicyRow">
-        <vbox align="start">
-          <checkbox id="popupPolicy" preference="dom.disable_open_during_load"
-                    label="&blockPopups.label;" accesskey="&blockPopups.accesskey;"
-                    onsyncfrompreference="return gContentPane.updateButtons('popupPolicyButton',
-                                                                        'dom.disable_open_during_load');"/>
-        </vbox>
-        <hbox pack="end">
-          <button id="popupPolicyButton" label="&popupExceptions.label;"
-                  accesskey="&popupExceptions.accesskey;"/>
-        </hbox>
-      </row>
-    </rows>
-  </grid>
-</groupbox>-->
-
-<!-- Fonts and Colors -->
-<!--<groupbox id="fontsGroup" data-category="paneContent" hidden="true">
-  <caption><label>&fontsAndColors.label;</label></caption>
-
-  <grid id="fontsGrid">
-    <columns>
-      <column flex="1"/>
-      <column/>
-    </columns>
-    <rows id="fontsRows">
-      <row id="fontRow">
-        <hbox align="center">
-          <label control="defaultFont" accesskey="&defaultFont.accesskey;">&defaultFont.label;</label>
-          <menulist id="defaultFont" delayprefsave="true"/>
-          <label id="defaultFontSizeLabel" control="defaultFontSize" accesskey="&defaultSize.accesskey;">&defaultSize.label;</label>
-          <menulist id="defaultFontSize" delayprefsave="true">
-            <menupopup>
-              <menuitem value="9" label="9"/>
-              <menuitem value="10" label="10"/>
-              <menuitem value="11" label="11"/>
-              <menuitem value="12" label="12"/>
-              <menuitem value="13" label="13"/>
-              <menuitem value="14" label="14"/>
-              <menuitem value="15" label="15"/>
-              <menuitem value="16" label="16"/>
-              <menuitem value="17" label="17"/>
-              <menuitem value="18" label="18"/>
-              <menuitem value="20" label="20"/>
-              <menuitem value="22" label="22"/>
-              <menuitem value="24" label="24"/>
-              <menuitem value="26" label="26"/>
-              <menuitem value="28" label="28"/>
-              <menuitem value="30" label="30"/>
-              <menuitem value="32" label="32"/>
-              <menuitem value="34" label="34"/>
-              <menuitem value="36" label="36"/>
-              <menuitem value="40" label="40"/>
-              <menuitem value="44" label="44"/>
-              <menuitem value="48" label="48"/>
-              <menuitem value="56" label="56"/>
-              <menuitem value="64" label="64"/>
-              <menuitem value="72" label="72"/>
-            </menupopup>
-          </menulist>
-        </hbox>
-        <button id="advancedFonts" icon="select-font"
-                label="&advancedFonts.label;"
-                accesskey="&advancedFonts.accesskey;"/>
-      </row>
-      <row id="colorsRow">
-        <hbox/>
-        <button id="colors" icon="select-color"
-                label="&colors.label;"
-                accesskey="&colors.accesskey;"/>
-      </row>
-    </rows>
-  </grid>
-</groupbox>-->
-
-<!-- Languages -->
-<!--<groupbox id="languagesGroup" data-category="paneContent" hidden="true">
-  <caption><label>&languages.label;</label></caption>
-
-  <hbox id="languagesBox" align="center">
-    <description flex="1" control="chooseLanguage">&chooseLanguage.label;</description>
-    <button id="chooseLanguage"
-            label="&chooseButton.label;"
-            accesskey="&chooseButton.accesskey;"/>
-  </hbox>
-
-  <hbox id="translationBox" hidden="true">
-    <hbox align="center" flex="1">
-      <checkbox id="translate" preference="browser.translation.detectLanguage"
-                label="&translateWebPages.label;." accesskey="&translateWebPages.accesskey;"
-                onsyncfrompreference="return gContentPane.updateButtons('translateButton',
-                                              'browser.translation.detectLanguage');"/>
-      <hbox id="bingAttribution" hidden="true">
-        <label>&translation.options.attribution.beforeLogo;</label>
-        <separator orient="vertical" class="thin"/>
-        <image id="translationAttributionImage" aria-label="Microsoft Translator"
-               src="chrome://browser/content/microsoft-translator-attribution.png"/>
-        <separator orient="vertical" class="thin"/>
-        <label>&translation.options.attribution.afterLogo;</label>
-      </hbox>
-    </hbox>
-    <button id="translateButton" label="&translateExceptions.label;"
-            accesskey="&translateExceptions.accesskey;"/>
-  </hbox>
-</groupbox>-->
--- a/browser/components/preferences/in-content/jar.mn
+++ b/browser/components/preferences/in-content/jar.mn
@@ -7,12 +7,9 @@ browser.jar:
 *  content/browser/preferences/in-content/preferences.xul
    content/browser/preferences/in-content/subdialogs.js
 
    content/browser/preferences/in-content/main.js
    content/browser/preferences/in-content/privacy.js
    content/browser/preferences/in-content/containers.js
    content/browser/preferences/in-content/advanced.js
    content/browser/preferences/in-content/applications.js
-   content/browser/preferences/in-content/content.js
    content/browser/preferences/in-content/sync.js
-   content/browser/preferences/in-content/security.js
-   content/browser/preferences/in-content/search.js
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -830,17 +830,17 @@ var gMainPane = {
   },
 
   // FONTS
 
   /**
    * Populates the default font list in UI.
    */
   _rebuildFonts() {
-    var preferences = document.getElementById("contentPreferences");
+    var preferences = document.getElementById("mainPreferences");
     // Ensure preferences are "visible" to ensure bindings work.
     preferences.hidden = false;
     // Force flush:
     preferences.clientHeight;
     var langGroupPref = document.getElementById("font.language.group");
     this._selectDefaultLanguageGroup(langGroupPref.value,
                                      this._readDefaultFontTypeForLanguage(langGroupPref.value) == "serif");
   },
@@ -854,29 +854,29 @@ var gMainPane = {
     var defaultFontTypePref = kDefaultFontType.replace(/%LANG%/, aLanguageGroup);
     var preference = document.getElementById(defaultFontTypePref);
     if (!preference) {
       preference = document.createElement("preference");
       preference.id = defaultFontTypePref;
       preference.setAttribute("name", defaultFontTypePref);
       preference.setAttribute("type", "string");
       preference.setAttribute("onchange", "gMainPane._rebuildFonts();");
-      document.getElementById("contentPreferences").appendChild(preference);
+      document.getElementById("mainPreferences").appendChild(preference);
     }
     return preference.value;
   },
 
   _selectDefaultLanguageGroup(aLanguageGroup, aIsSerif) {
     const kFontNameFmtSerif         = "font.name.serif.%LANG%";
     const kFontNameFmtSansSerif     = "font.name.sans-serif.%LANG%";
     const kFontNameListFmtSerif     = "font.name-list.serif.%LANG%";
     const kFontNameListFmtSansSerif = "font.name-list.sans-serif.%LANG%";
     const kFontSizeFmtVariable      = "font.size.variable.%LANG%";
 
-    var preferences = document.getElementById("contentPreferences");
+    var preferences = document.getElementById("mainPreferences");
     var prefs = [{ format   : aIsSerif ? kFontNameFmtSerif : kFontNameFmtSansSerif,
                    type     : "fontname",
                    element  : "defaultFont",
                    fonttype : aIsSerif ? "serif" : "sans-serif" },
                  { format   : aIsSerif ? kFontNameListFmtSerif : kFontNameListFmtSansSerif,
                    type     : "unichar",
                    element  : null,
                    fonttype : aIsSerif ? "serif" : "sans-serif" },
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -5,33 +5,36 @@
 <!-- General panel -->
 
 <script type="application/javascript"
         src="chrome://browser/content/preferences/in-content/main.js"/>
 
 <script type="application/javascript"
             src="chrome://browser/content/preferences/in-content/search.js"/>
 
+<script type="application/javascript"
+        src="chrome://mozapps/content/preferences/fontbuilder.js"/>
+
 <!--<preferences id="searchPreferences" hidden="true" data-category="paneSearch">
 
       <preference id="browser.search.suggest.enabled"
                   name="browser.search.suggest.enabled"
                   type="bool"/>
 
       <preference id="browser.urlbar.suggest.searches"
                   name="browser.urlbar.suggest.searches"
                   type="bool"/>
 
       <preference id="browser.search.hiddenOneOffs"
                   name="browser.search.hiddenOneOffs"
                   type="unichar"/>
 
 </preferences>-->
 
-    <stringbundle id="engineManagerBundle" src="chrome://browser/locale/engineManager.properties"/>
+<stringbundle id="engineManagerBundle" src="chrome://browser/locale/engineManager.properties"/>
 
 <preferences id="mainPreferences" hidden="true" data-category="paneGeneral">
 
 #ifdef E10S_TESTING_ONLY
     <preference id="browser.tabs.remote.autostart"
                 name="browser.tabs.remote.autostart"
                 type="bool"/>
     <preference id="e10sTempPref"
--- a/browser/components/preferences/in-content/preferences.js
+++ b/browser/components/preferences/in-content/preferences.js
@@ -26,18 +26,16 @@ Cu.import("resource://gre/modules/Servic
 Cu.import("resource://gre/modules/AppConstants.jsm");
 
 var gLastHash = "";
 
 var gCategoryInits = new Map();
 function init_category_if_required(category) {
   let categoryInfo = gCategoryInits.get(category);
 
-  console.log("Category: " + category);
-
   if (!categoryInfo) {
     throw "Unknown in-content prefs category! Can't init " + category;
   }
   if (categoryInfo.inited) {
     return;
   }
   categoryInfo.init();
 }
@@ -57,24 +55,21 @@ addEventListener("DOMContentLoaded", fun
   init_all();
 });
 
 function init_all() {
   document.documentElement.instantApply = true;
 
   gSubDialog.init();
   register_module("paneGeneral", gMainPane);
-  //register_module("paneSearch", gSearchPane);
   register_module("panePrivacy", gPrivacyPane);
   register_module("paneContainers", gContainersPane);
   register_module("paneAdvanced", gAdvancedPane);
   register_module("paneApplications", gApplicationsPane);
-  //register_module("paneContent", gContentPane);
   register_module("paneSync", gSyncPane);
-  register_module("paneSecurity", gSecurityPane);
 
   let categories = document.getElementById("categories");
   categories.addEventListener("select", event => gotoPref(event.target.value));
 
   document.documentElement.addEventListener("keydown", function(event) {
     if (event.keyCode == KeyEvent.DOM_VK_TAB) {
       categories.setAttribute("keyboard-navigation", "true");
     }
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -97,112 +97,77 @@
                     value="paneGeneral"
                     helpTopic="prefs-main"
                     tooltiptext="&paneGeneral.title;"
                     align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1">&paneGeneral.title;</label>
       </richlistitem>
 
-      <!--<richlistitem id="category-search"
-                    class="category"
-                    value="paneSearch"
-                    helpTopic="prefs-search"
-                    tooltiptext="&paneSearch.title;"
-                    align="center">
-        <image class="category-icon"/>
-        <label class="category-name" flex="1">&paneSearch.title;</label>
-      </richlistitem>-->
-
-      <!--<richlistitem id="category-content"
-                    class="category"
-                    value="paneContent"
-                    helpTopic="prefs-content"
-                    tooltiptext="&paneContent.title;"
-                    align="center">
-        <image class="category-icon"/>
-        <label class="category-name" flex="1">&paneContent.title;</label>
-      </richlistitem>-->
-
       <richlistitem id="category-application"
                     class="category"
                     value="paneApplications"
                     helpTopic="prefs-applications"
-                    tooltiptext="&paneApplications.title;"
+                    tooltiptext="&paneDownloadLinks.title;"
                     align="center">
         <image class="category-icon"/>
-        <label class="category-name" flex="1">&paneApplications.title;</label>
+        <label class="category-name" flex="1">&paneDownloadLinks.title;</label>
       </richlistitem>
 
-
-
       <richlistitem id="category-containers"
                     class="category"
                     value="paneContainers"
                     helpTopic="prefs-containers"
                     hidden="true"/>
 
-      <!--<richlistitem id="category-security"
-                    class="category"
-                    value="paneSecurity"
-                    helpTopic="prefs-security"
-                    tooltiptext="&paneSecurity.title;"
-                    align="center">
-        <image class="category-icon"/>
-        <label class="category-name" flex="1">&paneSecurity.title;</label>
-      </richlistitem>-->
-
       <richlistitem id="category-sync"
                     class="category"
                     value="paneSync"
                     helpTopic="prefs-weave"
                     tooltiptext="&paneSync.title;"
                     align="center">
         <image class="category-icon"/>
         <label class="category-name" flex="1">&paneSync.title;</label>
       </richlistitem>
 
       <richlistitem id="category-privacy"
                     class="category"
                     value="panePrivacy"
                     helpTopic="prefs-privacy"
-                    tooltiptext="&panePrivacy.title;"
+                    tooltiptext="&panePrivacySecurity.title;"
                     align="center">
         <image class="category-icon"/>
-        <label class="category-name" flex="1">&panePrivacy.title;</label>
+        <label class="category-name" flex="1">&panePrivacySecurity.title;</label>
       </richlistitem>
-      
+
       <richlistitem id="category-advanced"
                     class="category"
                     value="paneAdvanced"
                     helpTopic="prefs-advanced-general"
-                    tooltiptext="&paneAdvanced.title;"
+                    tooltiptext="&paneUpdates.title;"
                     align="center">
         <image class="category-icon"/>
-        <label class="category-name" flex="1">&paneAdvanced.title;</label>
+        <label class="category-name" flex="1">&paneUpdates.title;</label>
       </richlistitem>
     </richlistbox>
 
     <keyset>
       <!-- Disable the findbar because it doesn't work properly.
            Remove this keyset once bug 1094240 ("disablefastfind" attribute
            broken in e10s mode) is fixed. -->
       <key key="&focusSearch1.key;" modifiers="accel" id="focusSearch1" oncommand=";"/>
     </keyset>
 
     <vbox class="main-content" flex="1">
       <prefpane id="mainPrefPane">
 #include main.xul
-<!--#include search.xul-->
 #include privacy.xul
 #include containers.xul
 #include advanced.xul
 #include applications.xul
-#include content.xul
-#include security.xul
 #include sync.xul
       </prefpane>
     </vbox>
 
   </hbox>
 
     <vbox id="dialogOverlay" align="center" pack="center">
       <groupbox id="dialogBox"
--- a/browser/components/preferences/in-content/privacy.js
+++ b/browser/components/preferences/in-content/privacy.js
@@ -10,16 +10,29 @@ XPCOMUtils.defineLazyModuleGetter(this, 
 XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
                                   "resource://gre/modules/PluralForm.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "LoginHelper",
  "resource://gre/modules/LoginHelper.jsm");
 
 Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
 
+XPCOMUtils.defineLazyGetter(this, "AlertsServiceDND", function() {
+  try {
+    let alertsService = Cc["@mozilla.org/alerts-service;1"]
+                          .getService(Ci.nsIAlertsService)
+                          .QueryInterface(Ci.nsIAlertsDoNotDisturb);
+    // This will throw if manualDoNotDisturb isn't implemented.
+    alertsService.manualDoNotDisturb;
+    return alertsService;
+  } catch (ex) {
+    return undefined;
+  }
+});
+
 var gPrivacyPane = {
 
   _pane: null,
 
   /**
    * Whether the use has selected the auto-start private browsing mode in the UI.
    */
   _autoStartPrivateBrowsing: false,
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -161,17 +161,17 @@
 </preferences>
 
 <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
 
 <hbox id="header-privacy"
       class="header"
       hidden="true"
       data-category="panePrivacy">
-  <label class="header-name" flex="1">&panePrivacy.title;</label>
+  <label class="header-name" flex="1">&panePrivacySecurity.title;</label>
   <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
 </hbox>
 
 
 <!-- History -->
 <groupbox id="historyGroup" data-category="panePrivacy" hidden="true">
   <caption><label>&history.label;</label></caption>
   <hbox align="center">
@@ -469,64 +469,17 @@
   <checkbox id="openpageSuggestion" label="&locbar.openpage.label;"
             accesskey="&locbar.openpage.accesskey;"
             preference="browser.urlbar.suggest.openpage"/>
   <label class="text-link" onclick="gotoPref('search')">
     &suggestionSettings.label;
   </label>
 </groupbox>
 
-
-  <!-- Certificates -->
-<groupbox id="certSelection" align="start" data-category="panePrivacy" hidden="true">
-  <caption><label>&certPersonal.label;</label></caption>
-  <!--<description id="CertSelectionDesc" control="certSelection">&certPersonal.description;</description>-->
-
-  <!--
-    The values on these radio buttons may look like l12y issues, but
-    they're not - this preference uses *those strings* as its values.
-    I KID YOU NOT.
-  -->
-  <radiogroup id="certSelection"
-              preftype="string"
-              preference="security.default_personal_cert"
-              aria-labelledby="CertSelectionDesc">
-    <radio label="&selectCerts.auto;"
-            accesskey="&selectCerts.auto.accesskey;"
-            value="Select Automatically"/>
-    <radio label="&selectCerts.ask;"
-            accesskey="&selectCerts.ask.accesskey;"
-            value="Ask Every Time"/>
-  </radiogroup>
-
-<separator/>
-<checkbox id="enableOCSP"
-          label="&enableOCSP.label;"
-          accesskey="&enableOCSP.accesskey;"
-          onsyncfrompreference="return gPrivacyPane.readEnableOCSP();"
-          onsynctopreference="return gPrivacyPane.writeEnableOCSP();"
-          preference="security.OCSP.enabled"/>
-<separator/>
-<hbox>
-  <button id="viewCertificatesButton"
-          flex="1"
-          label="&viewCerts.label;"
-          accesskey="&viewCerts.accesskey;"
-          preference="security.disable_button.openCertManager"/>
-  <button id="viewSecurityDevicesButton"
-          flex="1"
-          label="&viewSecurityDevices.label;"
-          accesskey="&viewSecurityDevices.accesskey;"
-          preference="security.disable_button.openDeviceManager"/>
-  <hbox flex="10"/>
- </hbox>
-</groupbox>
-
-
-  <!-- addons, forgery (phishing) UI -->
+  <!-- addons, forgery (phishing) UI Security -->
 <groupbox id="addonsPhishingGroup" data-category="panePrivacy" hidden="true">
   <caption><label>&general.label;</label></caption>
 
   <hbox id="addonInstallBox">
     <checkbox id="warnAddonInstall"
               label="&warnOnAddonInstall.label;"
               accesskey="&warnOnAddonInstall.accesskey;"
               preference="xpinstall.whitelist.required"
@@ -548,16 +501,59 @@
                 accesskey="&blockDownloads.accesskey;" />
       <checkbox id="blockUncommonUnwanted"
                 label="&blockUncommonAndUnwanted.label;"
                 accesskey="&blockUncommonAndUnwanted.accesskey;" />
     </vbox>
   </vbox>
 </groupbox>
 
+  <!-- Certificates -->
+<groupbox id="certSelection" align="start" data-category="panePrivacy" hidden="true">
+  <caption><label>&certPersonal.label;</label></caption>
+  <!--<description id="CertSelectionDesc" control="certSelection">&certPersonal.description;</description>-->
+
+  <!--
+    The values on these radio buttons may look like l12y issues, but
+    they're not - this preference uses *those strings* as its values.
+    I KID YOU NOT.
+  -->
+  <radiogroup id="certSelection"
+              preftype="string"
+              preference="security.default_personal_cert"
+              aria-labelledby="CertSelectionDesc">
+    <radio label="&selectCerts.auto;"
+            accesskey="&selectCerts.auto.accesskey;"
+            value="Select Automatically"/>
+    <radio label="&selectCerts.ask;"
+            accesskey="&selectCerts.ask.accesskey;"
+            value="Ask Every Time"/>
+  </radiogroup>
+<checkbox id="enableOCSP"
+          label="&enableOCSP.label;"
+          accesskey="&enableOCSP.accesskey;"
+          onsyncfrompreference="return gPrivacyPane.readEnableOCSP();"
+          onsynctopreference="return gPrivacyPane.writeEnableOCSP();"
+          preference="security.OCSP.enabled"/>
+<separator/>
+<hbox>
+  <button id="viewCertificatesButton"
+          flex="1"
+          label="&viewCerts.label;"
+          accesskey="&viewCerts.accesskey;"
+          preference="security.disable_button.openCertManager"/>
+  <button id="viewSecurityDevicesButton"
+          flex="1"
+          label="&viewSecurityDevices.label;"
+          accesskey="&viewSecurityDevices.accesskey;"
+          preference="security.disable_button.openDeviceManager"/>
+  <hbox flex="10"/>
+ </hbox>
+</groupbox>
+
   <!-- DRM Content -->
 <groupbox id="drmGroup" data-category="panePrivacy" hidden="true">
   <caption><label>&drmContent.label;</label></caption>
   <grid id="contentGrid2">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
deleted file mode 100644
deleted file mode 100755
--- a/browser/components/preferences/in-content/search.xul
+++ /dev/null
@@ -1,86 +0,0 @@
-    <!--<preferences id="searchPreferences" hidden="true" data-category="paneSearch">
-
-      <preference id="browser.search.suggest.enabled"
-                  name="browser.search.suggest.enabled"
-                  type="bool"/>
-
-      <preference id="browser.urlbar.suggest.searches"
-                  name="browser.urlbar.suggest.searches"
-                  type="bool"/>
-
-      <preference id="browser.search.hiddenOneOffs"
-                  name="browser.search.hiddenOneOffs"
-                  type="unichar"/>
-
-    </preferences>
-
-    <script type="application/javascript"
-            src="chrome://browser/content/preferences/in-content/search.js"/>
-
-    <stringbundle id="engineManagerBundle" src="chrome://browser/locale/engineManager.properties"/>-->
-
-    <!--<hbox id="header-search"
-          class="header"
-          hidden="true"
-          data-category="paneSearch">
-      <label class="header-name" flex="1">&paneSearch.title;</label>
-      <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
-    </hbox>-->
-
-    <!-- Default Search Engine -->
-    <!--<groupbox id="defaultEngineGroup" align="start" data-category="paneSearch">
-      <caption label="&defaultSearchEngine.label;"/>
-      <label>&chooseYourDefaultSearchEngine.label;</label>
-      <menulist id="defaultEngine">
-        <menupopup/>
-      </menulist>
-      <checkbox id="suggestionsInSearchFieldsCheckbox"
-                label="&provideSearchSuggestions.label;"
-                accesskey="&provideSearchSuggestions.accesskey;"
-                preference="browser.search.suggest.enabled"/>
-      <vbox class="indent">
-        <checkbox id="urlBarSuggestion" label="&showURLBarSuggestions.label;"
-                  accesskey="&showURLBarSuggestions.accesskey;"
-                  preference="browser.urlbar.suggest.searches"/>
-        <hbox id="urlBarSuggestionPermanentPBLabel"
-              align="center" class="indent">
-          <label flex="1">&urlBarSuggestionsPermanentPB.label;</label>
-        </hbox>
-      </vbox>
-    </groupbox>
-
-    <groupbox id="oneClickSearchProvidersGroup" data-category="paneSearch">
-      <caption label="&oneClickSearchEngines.label;"/>
-      <label>&chooseWhichOneToDisplay.label;</label>
-
-      <tree id="engineList" flex="1" rows="8" hidecolumnpicker="true" editable="true"
-            seltype="single">
-        <treechildren id="engineChildren" flex="1"/>
-        <treecols>
-          <treecol id="engineShown" type="checkbox" editable="true" sortable="false"/>
-          <treecol id="engineName" flex="4" label="&engineNameColumn.label;" sortable="false"/>
-          <treecol id="engineKeyword" flex="1" label="&engineKeywordColumn.label;" editable="true"
-                   sortable="false"/>
-        </treecols>
-      </tree>
-
-      <hbox>
-        <button id="restoreDefaultSearchEngines"
-                label="&restoreDefaultSearchEngines.label;"
-                accesskey="&restoreDefaultSearchEngines.accesskey;"
-                />
-        <spacer flex="1"/>
-        <button id="removeEngineButton"
-                class="searchEngineAction"
-                label="&removeEngine.label;"
-                accesskey="&removeEngine.accesskey;"
-                disabled="true"
-                />
-      </hbox>
-
-      <separator class="thin"/>
-
-      <hbox id="addEnginesBox" pack="start">
-        <label id="addEngines" class="text-link" value="&addMoreSearchEngines.label;"/>
-      </hbox>
-    </groupbox>-->
deleted file mode 100644
--- a/browser/components/preferences/in-content/security.js
+++ /dev/null
@@ -1,290 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-XPCOMUtils.defineLazyModuleGetter(this, "LoginHelper",
- "resource://gre/modules/LoginHelper.jsm");
-
-Components.utils.import("resource://gre/modules/PrivateBrowsingUtils.jsm");
-
-var gSecurityPane = {
-  _pane: null,
-
-  /**
-   * Initializes master password UI.
-   */
-  init() {
-    // function setEventListener(aId, aEventType, aCallback) {
-    //   document.getElementById(aId)
-    //           .addEventListener(aEventType, aCallback.bind(gSecurityPane));
-    // }
-
-    // this._pane = document.getElementById("paneSecurity");
-    // this._initMasterPasswordUI();
-    // this._initSafeBrowsing();
-
-    // setEventListener("addonExceptions", "command",
-    //   gSecurityPane.showAddonExceptions);
-    // setEventListener("passwordExceptions", "command",
-    //   gSecurityPane.showPasswordExceptions);
-    // setEventListener("useMasterPassword", "command",
-    //   gSecurityPane.updateMasterPasswordButton);
-    // setEventListener("changeMasterPassword", "command",
-    //   gSecurityPane.changeMasterPassword);
-    // setEventListener("showPasswords", "command",
-    //   gSecurityPane.showPasswords);
-  },
-
-  // ADD-ONS
-
-  /*
-   * Preferences:
-   *
-   * xpinstall.whitelist.required
-   * - true if a site must be added to a site whitelist before extensions
-   *   provided by the site may be installed from it, false if the extension
-   *   may be directly installed after a confirmation dialog
-   */
-
-  /**
-   * Enables/disables the add-ons Exceptions button depending on whether
-   * or not add-on installation warnings are displayed.
-   */
-  // readWarnAddonInstall() {
-  //   var warn = document.getElementById("xpinstall.whitelist.required");
-  //   var exceptions = document.getElementById("addonExceptions");
-
-  //   exceptions.disabled = !warn.value;
-
-  //   // don't override the preference value
-  //   return undefined;
-  // },
-
-  // /**
-  //  * Displays the exceptions lists for add-on installation warnings.
-  //  */
-  // showAddonExceptions() {
-  //   var bundlePrefs = document.getElementById("bundlePreferences");
-
-  //   var params = this._addonParams;
-  //   if (!params.windowTitle || !params.introText) {
-  //     params.windowTitle = bundlePrefs.getString("addons_permissions_title");
-  //     params.introText = bundlePrefs.getString("addonspermissionstext");
-  //   }
-
-  //   gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
-  //                   null, params);
-  // },
-
-  // /**
-  //  * Parameters for the add-on install permissions dialog.
-  //  */
-  // _addonParams:
-  //   {
-  //     blockVisible: false,
-  //     sessionVisible: false,
-  //     allowVisible: true,
-  //     prefilledHost: "",
-  //     permissionType: "install"
-  //   },
-
-  // PASSWORDS
-
-  /*
-   * Preferences:
-   *
-   * signon.rememberSignons
-   * - true if passwords are remembered, false otherwise
-   */
-
-  // /**
-  //  * Enables/disables the Exceptions button used to configure sites where
-  //  * passwords are never saved. When browser is set to start in Private
-  //  * Browsing mode, the "Remember passwords" UI is useless, so we disable it.
-  //  */
-  // readSavePasswords() {
-  //   var pref = document.getElementById("signon.rememberSignons");
-  //   var excepts = document.getElementById("passwordExceptions");
-
-  //   if (PrivateBrowsingUtils.permanentPrivateBrowsing) {
-  //     document.getElementById("savePasswords").disabled = true;
-  //     excepts.disabled = true;
-  //     return false;
-  //   }
-  //   excepts.disabled = !pref.value;
-  //   // don't override pref value in UI
-  //   return undefined;
-  // },
-
-  // /**
-  //  * Displays a dialog in which the user can view and modify the list of sites
-  //  * where passwords are never saved.
-  //  */
-  // showPasswordExceptions() {
-  //   var bundlePrefs = document.getElementById("bundlePreferences");
-  //   var params = {
-  //     blockVisible: true,
-  //     sessionVisible: false,
-  //     allowVisible: false,
-  //     hideStatusColumn: true,
-  //     prefilledHost: "",
-  //     permissionType: "login-saving",
-  //     windowTitle: bundlePrefs.getString("savedLoginsExceptions_title"),
-  //     introText: bundlePrefs.getString("savedLoginsExceptions_desc")
-  //   };
-
-  //   gSubDialog.open("chrome://browser/content/preferences/permissions.xul",
-  //                   null, params);
-  // },
-
-  // /**
-  //  * Initializes master password UI: the "use master password" checkbox, selects
-  //  * the master password button to show, and enables/disables it as necessary.
-  //  * The master password is controlled by various bits of NSS functionality, so
-  //  * the UI for it can't be controlled by the normal preference bindings.
-  //  */
-  // _initMasterPasswordUI() {
-  //   var noMP = !LoginHelper.isMasterPasswordSet();
-
-  //   var button = document.getElementById("changeMasterPassword");
-  //   button.disabled = noMP;
-
-  //   var checkbox = document.getElementById("useMasterPassword");
-  //   checkbox.checked = !noMP;
-  // },
-
-  // _initSafeBrowsing() {
-  //   let enableSafeBrowsing = document.getElementById("enableSafeBrowsing");
-  //   let blockDownloads = document.getElementById("blockDownloads");
-  //   let blockUncommonUnwanted = document.getElementById("blockUncommonUnwanted");
-
-  //   let safeBrowsingPhishingPref = document.getElementById("browser.safebrowsing.phishing.enabled");
-  //   let safeBrowsingMalwarePref = document.getElementById("browser.safebrowsing.malware.enabled");
-
-  //   let blockDownloadsPref = document.getElementById("browser.safebrowsing.downloads.enabled");
-  //   let malwareTable = document.getElementById("urlclassifier.malwareTable");
-
-  //   let blockUnwantedPref = document.getElementById("browser.safebrowsing.downloads.remote.block_potentially_unwanted");
-  //   let blockUncommonPref = document.getElementById("browser.safebrowsing.downloads.remote.block_uncommon");
-
-  //   enableSafeBrowsing.addEventListener("command", function() {
-  //     safeBrowsingPhishingPref.value = enableSafeBrowsing.checked;
-  //     safeBrowsingMalwarePref.value = enableSafeBrowsing.checked;
-
-  //     if (enableSafeBrowsing.checked) {
-  //       blockDownloads.removeAttribute("disabled");
-  //       if (blockDownloads.checked) {
-  //         blockUncommonUnwanted.removeAttribute("disabled");
-  //       }
-  //     } else {
-  //       blockDownloads.setAttribute("disabled", "true");
-  //       blockUncommonUnwanted.setAttribute("disabled", "true");
-  //     }
-  //   });
-
-  //   blockDownloads.addEventListener("command", function() {
-  //     blockDownloadsPref.value = blockDownloads.checked;
-  //     if (blockDownloads.checked) {
-  //       blockUncommonUnwanted.removeAttribute("disabled");
-  //     } else {
-  //       blockUncommonUnwanted.setAttribute("disabled", "true");
-  //     }
-  //   });
-
-  //   blockUncommonUnwanted.addEventListener("command", function() {
-  //     blockUnwantedPref.value = blockUncommonUnwanted.checked;
-  //     blockUncommonPref.value = blockUncommonUnwanted.checked;
-
-  //     let malware = malwareTable.value
-  //       .split(",")
-  //       .filter(x => x !== "goog-unwanted-shavar" && x !== "test-unwanted-simple");
-
-  //     if (blockUncommonUnwanted.checked) {
-  //       malware.push("goog-unwanted-shavar");
-  //       malware.push("test-unwanted-simple");
-  //     }
-
-  //     // sort alphabetically to keep the pref consistent
-  //     malware.sort();
-
-  //     malwareTable.value = malware.join(",");
-  //   });
-
-  //   // set initial values
-
-  //   enableSafeBrowsing.checked = safeBrowsingPhishingPref.value && safeBrowsingMalwarePref.value;
-  //   if (!enableSafeBrowsing.checked) {
-  //     blockDownloads.setAttribute("disabled", "true");
-  //     blockUncommonUnwanted.setAttribute("disabled", "true");
-  //   }
-
-  //   blockDownloads.checked = blockDownloadsPref.value;
-  //   if (!blockDownloadsPref.value) {
-  //     blockUncommonUnwanted.setAttribute("disabled", "true");
-  //   }
-
-  //   blockUncommonUnwanted.checked = blockUnwantedPref.value && blockUncommonPref.value;
-  // },
-
-  // /**
-  //  * Enables/disables the master password button depending on the state of the
-  //  * "use master password" checkbox, and prompts for master password removal if
-  //  * one is set.
-  //  */
-  // updateMasterPasswordButton() {
-  //   var checkbox = document.getElementById("useMasterPassword");
-  //   var button = document.getElementById("changeMasterPassword");
-  //   button.disabled = !checkbox.checked;
-
-  //   // unchecking the checkbox should try to immediately remove the master
-  //   // password, because it's impossible to non-destructively remove the master
-  //   // password used to encrypt all the passwords without providing it (by
-  //   // design), and it would be extremely odd to pop up that dialog when the
-  //   // user closes the prefwindow and saves his settings
-  //   if (!checkbox.checked)
-  //     this._removeMasterPassword();
-  //   else
-  //     this.changeMasterPassword();
-
-  //   this._initMasterPasswordUI();
-  // },
-
-  // /**
-  //  * Displays the "remove master password" dialog to allow the user to remove
-  //  * the current master password.  When the dialog is dismissed, master password
-  //  * UI is automatically updated.
-  //  */
-  // _removeMasterPassword() {
-  //   var secmodDB = Cc["@mozilla.org/security/pkcs11moduledb;1"].
-  //                  getService(Ci.nsIPKCS11ModuleDB);
-  //   if (secmodDB.isFIPSEnabled) {
-  //     var promptService = Cc["@mozilla.org/embedcomp/prompt-service;1"].
-  //                         getService(Ci.nsIPromptService);
-  //     var bundle = document.getElementById("bundlePreferences");
-  //     promptService.alert(window,
-  //                         bundle.getString("pw_change_failed_title"),
-  //                         bundle.getString("pw_change2empty_in_fips_mode"));
-  //     this._initMasterPasswordUI();
-  //   } else {
-  //     gSubDialog.open("chrome://mozapps/content/preferences/removemp.xul",
-  //                     null, null, this._initMasterPasswordUI.bind(this));
-  //   }
-  // },
-
-  // /**
-  //  * Displays a dialog in which the master password may be changed.
-  //  */
-  // changeMasterPassword() {
-  //   gSubDialog.open("chrome://mozapps/content/preferences/changemp.xul",
-  //                   "resizable=no", null, this._initMasterPasswordUI.bind(this));
-  // },
-
-  // /**
-  //  * Shows the sites where the user has saved passwords and the associated login
-  //  * information.
-  //  */
-  // showPasswords() {
-  //   gSubDialog.open("chrome://passwordmgr/content/passwordManager.xul");
-  // }
-
-};
deleted file mode 100644
--- a/browser/components/preferences/in-content/security.xul
+++ /dev/null
@@ -1,131 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-<!-- Security panel -->
-
-<script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/security.js"/>
-
-<preferences id="securityPreferences" hidden="true" data-category="paneSecurity">
-  <!-- XXX buttons -->
-  <!--<preference id="pref.privacy.disable_button.view_passwords"
-              name="pref.privacy.disable_button.view_passwords"
-              type="bool"/>
-  <preference id="pref.privacy.disable_button.view_passwords_exceptions"
-              name="pref.privacy.disable_button.view_passwords_exceptions"
-              type="bool"/>-->
-
-  <!-- Add-ons, malware, phishing -->
-  <!--<preference id="xpinstall.whitelist.required"
-              name="xpinstall.whitelist.required"
-              type="bool"/>
-
-  <preference id="browser.safebrowsing.malware.enabled"
-              name="browser.safebrowsing.malware.enabled"
-              type="bool"/>
-  <preference id="browser.safebrowsing.phishing.enabled"
-              name="browser.safebrowsing.phishing.enabled"
-              type="bool"/>
-
-  <preference id="browser.safebrowsing.downloads.enabled"
-              name="browser.safebrowsing.downloads.enabled"
-              type="bool"/>
-
-  <preference id="urlclassifier.malwareTable"
-              name="urlclassifier.malwareTable"
-              type="string"/>
-
-  <preference id="browser.safebrowsing.downloads.remote.block_potentially_unwanted"
-              name="browser.safebrowsing.downloads.remote.block_potentially_unwanted"
-              type="bool"/>
-  <preference id="browser.safebrowsing.downloads.remote.block_uncommon"
-              name="browser.safebrowsing.downloads.remote.block_uncommon"
-              type="bool"/>-->
-
-  <!-- Passwords -->
-  <!--<preference id="signon.rememberSignons" name="signon.rememberSignons" type="bool"/>-->
-
-</preferences>
-
-<hbox id="header-security"
-      class="header"
-      hidden="true"
-      data-category="paneSecurity">
-  <label class="header-name" flex="1">&paneSecurity.title;</label>
-  <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
-</hbox>
-
-<!-- addons, forgery (phishing) UI -->
-<!--<groupbox id="addonsPhishingGroup" data-category="paneSecurity" hidden="true">
-  <caption><label>&general.label;</label></caption>
-
-  <hbox id="addonInstallBox">
-    <checkbox id="warnAddonInstall"
-              label="&warnOnAddonInstall.label;"
-              accesskey="&warnOnAddonInstall.accesskey;"
-              preference="xpinstall.whitelist.required"
-              onsyncfrompreference="return gSecurityPane.readWarnAddonInstall();"/>
-    <spacer flex="1"/>
-    <button id="addonExceptions"
-            label="&addonExceptions.label;"
-            accesskey="&addonExceptions.accesskey;"/>
-  </hbox>
-
-  <separator class="thin"/>
-  <vbox align="start">
-    <checkbox id="enableSafeBrowsing"
-              label="&enableSafeBrowsing.label;"
-              accesskey="&enableSafeBrowsing.accesskey;" />
-    <vbox class="indent">
-      <checkbox id="blockDownloads"
-                label="&blockDownloads.label;"
-                accesskey="&blockDownloads.accesskey;" />
-      <checkbox id="blockUncommonUnwanted"
-                label="&blockUncommonAndUnwanted.label;"
-                accesskey="&blockUncommonAndUnwanted.accesskey;" />
-    </vbox>
-  </vbox>
-</groupbox>-->
-
-<!-- Passwords -->
-<!--<groupbox id="passwordsGroup" orient="vertical" data-category="paneSecurity" hidden="true">
-  <caption><label>&logins.label;</label></caption>
-
-  <hbox id="savePasswordsBox">
-    <checkbox id="savePasswords"
-              label="&rememberLogins.label;" accesskey="&rememberLogins.accesskey;"
-              preference="signon.rememberSignons"
-              onsyncfrompreference="return gSecurityPane.readSavePasswords();"/>
-    <spacer flex="1"/>
-    <button id="passwordExceptions"
-            label="&passwordExceptions.label;"
-            accesskey="&passwordExceptions.accesskey;"
-            preference="pref.privacy.disable_button.view_passwords_exceptions"/>
-  </hbox>
-  <grid id="passwordGrid">
-    <columns>
-      <column flex="1"/>
-      <column/>
-    </columns>
-    <rows id="passwordRows">
-      <row id="masterPasswordRow">
-        <hbox id="masterPasswordBox">
-          <checkbox id="useMasterPassword"
-                    label="&useMasterPassword.label;"
-                    accesskey="&useMasterPassword.accesskey;"/>
-          <spacer flex="1"/>
-        </hbox>
-        <button id="changeMasterPassword"
-                label="&changeMasterPassword.label;"
-                accesskey="&changeMasterPassword.accesskey;"/>
-      </row>
-      <row id="showPasswordRow">
-        <hbox id="showPasswordsBox"/>
-        <button id="showPasswords"
-                label="&savedLogins.label;" accesskey="&savedLogins.accesskey;"
-                preference="pref.privacy.disable_button.view_passwords"/>
-      </row>
-    </rows>
-  </grid>
-</groupbox>-->
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -110,17 +110,17 @@
 
 <!ENTITY offlineAppsList2.label          "The following websites are allowed to store data for offline use:">
 <!ENTITY offlineAppsList.height          "7em">
 <!ENTITY offlineAppsListRemove.label     "Remove…">
 <!ENTITY offlineAppsListRemove.accesskey "R">
 <!ENTITY offlineAppRemove.confirm        "Remove offline data">
 
 <!ENTITY certificateTab.label            "Certificates">
-<!ENTITY certPersonal.label              "Requests">
+<!ENTITY certPersonal.label              "Certificates">
 <!ENTITY certPersonal.description        "When a server requests your personal certificate:">
 <!ENTITY selectCerts.auto                "Select one automatically">
 <!ENTITY selectCerts.auto.accesskey      "S">
 <!ENTITY selectCerts.ask                 "Ask you every time">
 <!ENTITY selectCerts.ask.accesskey       "A">
 <!ENTITY enableOCSP.label                "Query OCSP responder servers to confirm the current validity of certificates">
 <!ENTITY enableOCSP.accesskey            "Q">
 <!ENTITY viewCerts.label                 "View Certificates">
--- a/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/preferences.dtd
@@ -12,18 +12,29 @@
 <!ENTITY  prefWinMinSize.styleWin2      "width: 42em; min-height: 37.5em;">
 <!ENTITY  prefWinMinSize.styleMac       "width: 47em; min-height: 40em;">
 <!ENTITY  prefWinMinSize.styleGNOME     "width: 45.5em; min-height: 40.5em;">
 
 <!ENTITY  paneGeneral.title       "General">
 <!ENTITY  paneTabs.title          "Tabs">
 <!ENTITY  paneSearch.title        "Search">
 <!ENTITY  paneContent.title       "Content">
-<!ENTITY  paneApplications.title  "Downloads &amp; Links">
-<!ENTITY  panePrivacy.title       "Privacy &amp; Security">
+<!ENTITY  paneDownloadLinks.title  "Downloads &amp; Links">
+<!ENTITY  panePrivacySecurity.title       "Privacy &amp; Security">
 <!ENTITY  paneContainers.title    "Container Tabs">
 <!ENTITY  paneSecurity.title      "Security">
-<!ENTITY  paneAdvanced.title      "Updates">
+<!ENTITY  paneUpdates.title      "Updates">
 
 <!-- LOCALIZATION NOTE (paneSync.title): This should match syncBrand.shortName.label in ../syncBrand.dtd -->
 <!ENTITY  paneSync.title          "Firefox Account">
 
 <!ENTITY  helpButton.label        "Help">
+
+
+<!--<!ENTITY  paneGeneral.title       "General">
+<!ENTITY  paneTabs.title          "Tabs">
+<!ENTITY  paneSearch.title        "Search">
+<!ENTITY  paneContent.title       "Content">
+<!ENTITY  paneDownloadLinks.title  "Downloads &amp; Links">
+<!ENTITY  panePrivacySecurity.title       "Privacy &amp; Security">
+<!ENTITY  paneContainers.title    "Container Tabs">
+<!ENTITY  paneSecurity.title      "Security">
+<!ENTITY  paneUpdates.title      "Updates">-->
\ No newline at end of file
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -9,17 +9,17 @@
 <!ENTITY  trackingProtectionPrivate.accesskey  "l">
 <!ENTITY  trackingProtectionNever.label        "Never">
 <!ENTITY  trackingProtectionNever.accesskey    "n">
 <!ENTITY  trackingProtectionLearnMore.label    "Learn more">
 <!ENTITY  trackingProtectionExceptions.label   "Exceptions…">
 <!ENTITY  trackingProtectionExceptions.accesskey "x">
 
 <!ENTITY tracking.label                 "Tracking">
-<!ENTITY trackingProtectionPBM5.label         "Use Tracking Protection in Private Windows">
+<!ENTITY trackingProtectionPBM5.label         "Tracking Protection">
 <!ENTITY trackingProtectionPBM5.accesskey     "v">
 <!ENTITY trackingProtectionPBMLearnMore.label "Learn more">
 <!ENTITY changeBlockList.label          "Change Block List">
 <!ENTITY changeBlockList.accesskey      "C">
 
 <!-- LOCALIZATION NOTE (doNotTrack.pre.label): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (doNotTrack.post.label): include a starting space as needed -->
 <!ENTITY  doNotTrack.pre.label          "You can also ">