Bug 881054 - Remove obsolete Sunbird preference files. r=philipp
authorStefan Sitter <ssitter@gmail.com>
Tue, 11 Jun 2013 07:32:23 +0200
changeset 15721 d1bbc784c3f201bad745f286d035dfd7cfa9ea0f
parent 15720 2870d0f37de0b0bcdaa66d1a16c5c97555d19d17
child 15722 42ffb0f73c89735ef72c83336d37d5fbd286a7d1
push id942
push userbugzilla@standard8.plus.com
push dateMon, 05 Aug 2013 19:15:38 +0000
treeherdercomm-beta@0e1a1c4a9f0c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs881054
Bug 881054 - Remove obsolete Sunbird preference files. r=philipp
calendar/base/content/preferences/advanced.js
calendar/base/content/preferences/advanced.xul
calendar/base/content/preferences/connection.js
calendar/base/content/preferences/connection.xul
calendar/base/content/preferences/preferences.xul
calendar/locales/en-US/chrome/calendar/preferences/advanced.dtd
calendar/locales/en-US/chrome/calendar/preferences/connection.dtd
calendar/locales/en-US/chrome/calendar/preferences/preferences.dtd
calendar/locales/jar.mn
calendar/resources/jar.mn
deleted file mode 100644
--- a/calendar/base/content/preferences/advanced.js
+++ /dev/null
@@ -1,391 +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/.
- */
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-/**
- * Global Object to hold methods for the advanced pref pane
- */
-var gAdvancedPane = {
-    _inited: false,
-    /**
-     * Initialize the advanced pref pane. Sets up dialog controls to match the
-     * values set in prefs.
-     */
-    init: function advPaneInit() {
-        this._inited = true;
-        this._initMasterPasswordUI();
-
-        var advancedPrefs = document.getElementById("advancedPrefs");
-        var preference = document.getElementById("calendar.preferences.advanced.selectedTabIndex");
-        if (preference.value === null) {
-            return;
-        }
-        advancedPrefs.selectedIndex = preference.value;
-
-#ifdef MOZ_UPDATER
-        this.updateAppUpdateItems();
-        this.updateAutoItems();
-        this.updateModeItems();
-#endif
-    },
-
-    /**
-     * Handler function to call when the tab in the advanced pane has been
-     * changed.
-     */
-    tabSelectionChanged: function advPaneTabSelectionChanged() {
-        if (!this._inited) {
-            return;
-        }
-        var advancedPrefs = document.getElementById("advancedPrefs");
-        var preference = document.getElementById("calendar.preferences.advanced.selectedTabIndex");
-        preference.valueFromPreferences = advancedPrefs.selectedIndex;
-    },
-
-    // GENERAL TAB
-
-    /**
-     * Show the connections dialog
-     */
-    showConnections: function advPaneShowConnections() {
-        var url = "chrome://calendar/content/preferences/connection.xul";
-        document.documentElement.openSubDialog(url, "", "chrome,dialog");
-    },
-
-    /**
-     * Show the config editor dialog
-     */
-    showConfigEdit: function advPaneShowConfigEdit() {
-        document.documentElement.openWindow("Preferences:ConfigManager",
-                                            "chrome://global/content/config.xul",
-                                            "", null);
-    },
-
-    // PASSWORDS TAB
-
-    /**
-     * Caches the security module service for multiple use.
-     */
-    __secModDb: null,
-    get _secModDb() {
-        if (!this.__secModDb) {
-            this.__secModDb =
-                Components.classes["@mozilla.org/security/pkcs11moduledb;1"]
-                          .getService(Components.interfaces.nsIPKCS11ModuleDB);
-        }
-        return this.__secModDb;
-    },
-
-    /**
-     * 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: function advPaneInitMasterPassword() {
-        var noMP = !this._masterPasswordSet();
-
-        var button = document.getElementById("changeMasterPassword");
-        button.disabled = noMP;
-
-        var checkbox = document.getElementById("useMasterPassword");
-        checkbox.checked = !noMP;
-    },
-
-    /**
-     * Returns true if the user has a Master Password set and false otherwise.
-     */
-    _masterPasswordSet: function advPaneMasterPasswordSet() {
-        var slot = this._secModDb.findSlotByName("");
-        if (slot) {
-            const nsIPKCS11Slot = Components.interfaces.nsIPKCS11Slot;
-            var status = slot.status;
-            // Does the user have a Master Password set?
-            return ((status != nsIPKCS11Slot.SLOT_UNINITIALIZED) &&
-                    (status != nsIPKCS11Slot.SLOT_READY));
-        } else {
-            return false;
-        }
-    },
-
-    /**
-     * 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. This function is called when the "Use Master
-     * Password" checkbox is changed.
-     */
-    updateMasterPasswordButton: function advPaneUpdateMasterPasswordButton() {
-        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();
-        }
-    },
-
-    /**
-     * Displays the "Remove Master Password" dialog to allow the user to
-     * remove the current Master Password.  When the dialog is dismissed,
-     * the Master Password UI is automatically updated.
-     */
-    _removeMasterPassword: function advRemoveMasterPassword() {
-        if (this._secModDb.isFIPSEnabled) {
-            var bundle = document.getElementById("bundleCalendarPreferences");
-            Services.prompt.alert(window,
-                                  bundle.getString("pw_change_failed_title"),
-                                  bundle.getString("pw_change2empty_in_fips_mode"));
-        } else {
-            var url = "chrome://mozapps/content/preferences/removemp.xul";
-            document.documentElement.openSubDialog(url, "", null);
-
-        }
-        this._initMasterPasswordUI();
-    },
-
-    /**
-     * Displays a dialog in which the Master Password may be changed.
-     */
-    changeMasterPassword: function advPaneChangeMasterPassword() {
-        var url = "chrome://mozapps/content/preferences/changemp.xul";
-        document.documentElement.openSubDialog(url, "", null);
-
-        this._initMasterPasswordUI();
-    },
-
-    /**
-     * Shows the sites where the user has saved passwords and the associated
-     * login information.
-     */
-    viewPasswords: function advPaneViewPasswords() {
-        var url = "chrome://passwordmgr/content/passwordManager.xul";
-        document.documentElement.openWindow("Toolkit:PasswordManager", url,
-                                            "", null);
-    },
-
-    // UPDATE TAB
-
-    /**
-     * Preferences:
-     *
-     * app.update.enabled
-     * - true if updates to the application are enabled, false otherwise
-     * extensions.update.enabled
-     * - true if updates to extensions and themes are enabled, false otherwise
-     * app.update.auto
-     * - true if updates should be automatically downloaded and installed,
-     *   possibly with a warning if incompatible extensions are installed (see
-     *   app.update.mode); false if the user should be asked what he wants to
-     *   do when an update is available
-     * app.update.mode
-     * - an integer:
-     *     0    do not warn if an update will disable extensions or themes
-     *     1    warn if an update will disable extensions or themes
-     *     2    warn if an update will disable extensions or themes *or* if
-     *          the update is a major update
-     */
-
-    /**
-     * Enables and disables various UI preferences as necessary to reflect
-     * locked, disabled, and checked/unchecked states.
-     *
-     * UI state matrix for update preference conditions
-     *
-     * UI Elements:                                   Preferences
-     * 1 = Sunbird checkbox                           i   = app.update.enabled
-     * 2 = When updates for Sunbird are found label   ii  = app.update.auto
-     * 3 = Automatic Radiogroup (Ask vs. Auto)        iii = app.update.mode
-     * 4 = Warn before disabling add-ons checkbox
-     *
-     * States:
-     * Element  Disabled    Pref  Value   Locked
-     * 1        false       i     t/f     f
-     *          true        i     t/f     t
-     *          false       ii    t/f     t/f
-     *          false       iii   0/1/2   t/f
-     * 2,3      false       i     t       t/f
-     *          true        i     f       t/f
-     *          false       ii    t/f     f
-     *          true        ii    t/f     t
-     *          false       iii   0/1/2   t/f
-     * 4        false       i     t       t/f
-     *          true        i     f       t/f
-     *          false       ii    t       t/f
-     *          true        ii    f       t/f
-     *          false       iii   0/1/2   f
-     *          true        iii   0/1/2   t
-     *
-     */
-#ifdef MOZ_UPDATER
-    updateAppUpdateItems: function advPaneUpdateAppUpdateItems() {
-        var aus = Components.classes["@mozilla.org/updates/update-service;1"]
-                            .getService(Components.interfaces.nsIApplicationUpdateService);
-
-        var enabledPref = document.getElementById("app.update.enabled");
-        var enableAppUpdate = document.getElementById("enableAppUpdate");
-
-        enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked;
-    },
-
-    /**
-     * Enables/disables UI for "when updates are found" based on the values,
-     * and "locked" states of associated preferences.
-     */
-    updateAutoItems: function advPaneUpdateAutoItems() {
-        var enabledPref = document.getElementById("app.update.enabled");
-        var autoPref = document.getElementById("app.update.auto");
-
-        var updateModeLabel = document.getElementById("updateModeLabel");
-        var updateMode = document.getElementById("updateMode");
-
-        var disable = enabledPref.locked || !enabledPref.value ||
-                      autoPref.locked;
-
-        updateMode.disabled = disable;
-        updateModeLabel.disabled = updateMode.disabled;
-    },
-
-    /**
-     * Enables/disables the "warn if incompatible add-ons exist" UI based on
-     * the values and "locked" states of various preferences.
-     */
-    updateModeItems: function advPaneUpdateModeItems() {
-        var enabledPref = document.getElementById("app.update.enabled");
-        var autoPref = document.getElementById("app.update.auto");
-        var modePref = document.getElementById("app.update.mode");
-
-        var warnIncompatible = document.getElementById("warnIncompatible");
-
-        var disable = enabledPref.locked || !enabledPref.value ||
-                      autoPref.locked || !autoPref.value || modePref.locked;
-
-        warnIncompatible.disabled = disable;
-    },
-
-    /**
-     * Stores the value of the app.update.mode preference, which is a tristate
-     * integer preference.  We store the value here so that we can properly
-     * restore the preference value if the UI reflecting the preference value
-     * is in a state which can represent either of two integer values (as
-     * opposed to only one possible value in the other UI state).
-     */
-    _modePreference: -1,
-
-    /**
-     * Reads the app.update.mode preference and converts its value into a
-     * true/false value for use in determining whether the "Warn me if this
-     * will disable any of my add-ons" checkbox is checked.  We also save the
-     * value of the preference so that the preference value can be properly
-     * restored if the user's preferences cannot adequately be expressed by a
-     * single checkbox.
-     *
-     * app.update.mode   Checkbox State   Meaning
-     * 0                 Unchecked        Do not warn
-     * 1                 Checked          Warn if there are incompatibilities
-     * 2                 Checked          Warn if there are incompatibilities,
-     *                                    or the update is major.
-     */
-    readAddonWarn: function advPaneReadAddonWarn() {
-        var preference = document.getElementById("app.update.mode");
-        var warnMe = preference.value != 0;
-        this._modePreference = warnMe ? preference.value : 1;
-        return warnMe;
-    },
-
-    /**
-     * Converts the state of the "Warn me if this will disable any of my
-     * add-ons" checkbox into the integer preference which represents it,
-     * returning that value.
-     */
-    writeAddonWarn: function advPaneWriteAddonWarn() {
-        var warnIncompatible = document.getElementById("warnIncompatible");
-        return warnIncompatible.checked ? this._modePreference : 0;
-    },
-
-    /**
-     * Displays the history of installed updates.
-     */
-    showUpdates: function advPaneShowUpdates() {
-        var prompter = Components.classes["@mozilla.org/updates/update-prompt;1"]
-                                 .createInstance(Components.interfaces.nsIUpdatePrompt);
-        prompter.showUpdateHistory(window);
-    },
-#endif
-
-    /**
-     * The Add-ons checkbox and button are disabled only if the enable
-     * add-on update preference is locked.
-     */
-    updateAddonUpdateUI: function advPaneUpdateAddonUpdateUI() {
-        var enabledPref = document.getElementById("extensions.update.enabled");
-        var enableAddonUpdate = document.getElementById("enableAddonUpdate");
-
-        enableAddonUpdate.disabled = enabledPref.locked;
-    },
-
-
-    // ENCRYPTION TAB
-
-    /*
-     * Preferences:
-     *
-     * security.enable_ssl3
-     * - true if SSL 3 encryption is enabled, false otherwise
-     * security.enable_tls
-     * - true if TLS encryption is enabled, false otherwise
-     * security.default_personal_cert
-     * - a string:
-     *     "Select Automatically"   select a certificate automatically when a site
-     *                              requests one
-     *     "Ask Every Time"         present a dialog to the user so he can select
-     *                              the certificate to use on a site which
-     *                              requests one
-     */
-
-    /**
-     * Displays the user's certificates and associated options.
-     */
-    showCertificates: function gAP_showCertificates() {
-      document.documentElement.openWindow("mozilla:certmanager",
-                                          "chrome://pippki/content/certManager.xul",
-                                          "", null);
-    },
-
-    /**
-     * Displays a dialog which describes the user's CRLs.
-     */
-    showCRLs: function gAP_showCRLs() {
-      document.documentElement.openWindow("Mozilla:CRLManager",
-                                          "chrome://pippki/content/crlManager.xul",
-                                          "", null);
-    },
-
-    /**
-     * Displays a dialog in which OCSP preferences can be configured.
-     */
-    showOCSP: function gAP_showOCSP() {
-      document.documentElement.openSubDialog("chrome://mozapps/content/preferences/ocsp.xul",
-                                             "", null);
-    },
-
-    /**
-     * Displays a dialog from which the user can manage his security devices.
-     */
-    showSecurityDevices: function gAP_showSecurityDevices() {
-      document.documentElement.openWindow("mozilla:devicemanager",
-                                          "chrome://pippki/content/device_manager.xul",
-                                          "", null);
-    }
-};
deleted file mode 100644
--- a/calendar/base/content/preferences/advanced.xul
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<!DOCTYPE overlay [
-    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-    <!ENTITY % advancedDTD SYSTEM "chrome://calendar/locale/preferences/advanced.dtd">
-    %brandDTD;
-    %advancedDTD;
-]>
-
-<overlay id="AdvancedPaneOverlay"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-    <vbox id="calPreferencesBoxAdvanced">
-        <script type="application/javascript"
-                src="chrome://calendar/content/preferences/advanced.js"/>
-
-        <preferences id="advancePrefs-preferences">
-            <preference id="calendar.preferences.advanced.selectedTabIndex"
-                        name="calendar.preferences.advanced.selectedTabIndex"
-                        type="int"/>
-
-            <!-- Passwords tab -->
-            <preference id="signon.rememberSignons"
-                        name="signon.rememberSignons"
-                        type="bool"/>
-            <preference id="pref.privacy.disable_button.view_passwords"
-                        name="pref.privacy.disable_button.view_passwords"
-                        type="bool"/>
-
-            <!-- Advanced tab -->
-#ifdef MOZ_UPDATER
-            <preference id="app.update.enabled"
-                        name="app.update.enabled"
-                        type="bool"
-                        onchange="gAdvancedPane.updateAppUpdateItems();
-                                  gAdvancedPane.updateAutoItems();
-                                  gAdvancedPane.updateModeItems();"/>
-            <preference id="app.update.auto"
-                        name="app.update.auto"
-                        type="bool"
-                        onchange="gAdvancedPane.updateAutoItems();
-                                  gAdvancedPane.updateModeItems();"/>
-            <preference id="app.update.mode"
-                        name="app.update.mode"
-                        type="int"
-                        onchange="gAdvancedPane.updateModeItems();"/>
-            <preference id="app.update.disable_button.showUpdateHistory"
-                        name="app.update.disable_button.showUpdateHistory"
-                        type="bool"/>
-#endif
-            <preference id="extensions.update.enabled"
-                        name="extensions.update.enabled"
-                        type="bool"
-                        onchange="gAdvancedPane.updateAddonUpdateUI();"/>
-            <!-- Encryption tab -->
-            <preference id="security.enable_ssl3" name="security.enable_ssl3" type="bool"/>
-            <preference id="security.enable_tls" name="security.enable_tls" type="bool"/>
-
-            <preference id="security.default_personal_cert" name="security.default_personal_cert" type="string"/>
-
-            <preference id="security.disable_button.openCertManager"
-                        name="security.disable_button.openCertManager"
-                        type="bool"/>
-            <preference id="security.OCSP.disable_button.managecrl"
-                        name="security.OCSP.disable_button.managecrl"
-                        type="bool"/>
-            <preference id="security.disable_button.openDeviceManager"
-                        name="security.disable_button.openDeviceManager"
-                        type="bool"/>
-        </preferences>
-
-        <tabbox id="advancedPrefs"
-                flex="1"
-                onselect="gAdvancedPane.tabSelectionChanged();">
-            <tabs id="advancedPrefs-tabs">
-                <tab id="generalTab" label="&pref.calendar.advanced.generalTab.label;"/>
-                <tab id="networkTab" label="&pref.calendar.advanced.passwordsTab.label;"/>
-                <tab id="updateTab" label="&pref.calendar.advanced.updateTab.label;"/>
-                <tab id="encryptionTab" label="&pref.calendar.advanced.encryptionTab.label;"/>
-            </tabs>
-
-            <tabpanels id="advancedPrefs-tabpanels" flex="1">
-                <!-- General -->
-                <tabpanel id="generalPanel" orient="vertical">
-                    <hbox align="center" pack="start">
-                        <description flex="1">&pref.calendar.advanced.proxiesInfo.label;</description>
-                        <button id="catProxiesButton"
-                                label="&pref.calendar.advanced.showConnections.label;"
-                                accesskey="&pref.calendar.advanced.showConnections.accesskey;"
-                                oncommand="gAdvancedPane.showConnections();"/>
-                    </hbox>
-
-                    <separator/>
-
-                    <hbox align="center" pack="start">
-                        <description flex="1">&pref.calendar.advanced.configEdit.caption;</description>
-                        <button id="configEditor"
-                                label="&pref.calendar.advanced.configEdit.button;"
-                                accesskey="&pref.calendar.advanced.configEdit.accesskey;"
-                                oncommand="gAdvancedPane.showConfigEdit();"/>
-                    </hbox>
-
-                    <separator/>
-                </tabpanel>
-
-                <!-- Passwords -->
-                <tabpanel id="passwordsPanel" orient="vertical" align="start">
-                    <description>&pref.calendar.advanced.savedPasswords.intro;</description>
-                    <checkbox id="useMasterPassword"
-                              label="&pref.calendar.advanced.useMasterPassword.label;"
-                              accesskey="&pref.calendar.advanced.useMasterPassword.accesskey;"
-                              oncommand="gAdvancedPane.updateMasterPasswordButton();"
-                              class="indent"
-                              flex="1"/>
-                    <separator/>
-
-                    <hbox align="start">
-                        <description flex="1">&pref.calendar.advanced.masterPassword.intro;</description>
-                        <vbox>
-                            <button id="changeMasterPassword"
-                                    label="&pref.calendar.advanced.changeMasterPassword.label;"
-                                    accesskey="&pref.calendar.advanced.changeMasterPassword.accesskey;"
-                                    oncommand="gAdvancedPane.changeMasterPassword();"/>
-                        </vbox>
-                    </hbox>
-                    <separator flex="1"/>
-
-                    <hbox>
-                        <button id="viewPasswords"
-                                label="&pref.calendar.advanced.viewPasswords.label;"
-                                accesskey="&pref.calendar.advanced.viewPasswords.accesskey;"
-                                oncommand="gAdvancedPane.viewPasswords();"
-                                preference="pref.privacy.disable_button.view_passwords"/>
-                    </hbox>
-                </tabpanel>
-
-                <!-- Update -->
-                <tabpanel id="updatePanel" orient="vertical" align="start">
-                    <label control="autoUpdateGroup">&pref.calendar.advanced.update.autoCheck.label;</label>
-                    <vbox id="autoUpdateGroup" class="indent">
-#ifdef MOZ_UPDATER
-                        <checkbox id="enableAppUpdate"
-                                  label="&pref.calendar.advanced.update.enableAppUpdate.label;"
-                                  accesskey="&pref.calendar.advanced.update.enableAppUpdate.accesskey;"
-                                  preference="app.update.enabled"/>
-#endif
-                        <checkbox id="enableAddonUpdate"
-                                  label="&pref.calendar.advanced.update.enableAddonsUpdate.label;"
-                                  accesskey="&pref.calendar.advanced.update.enableAddonsUpdate.accesskey;"
-                                  preference="extensions.update.enabled"/>
-                    </vbox>
-
-#ifdef MOZ_UPDATER
-                    <separator id="updateSeparator1"/>
-
-                    <label id="updateModeLabel"
-                           control="updateMode">&pref.calendar.advanced.update.whenUpdatesFound.label;</label>
-                    <radiogroup id="updateMode"
-                                class="indent"
-                                preference="app.update.auto">
-                        <radio id="ask"
-                               value="false"
-                               label="&pref.calendar.advanced.update.modeAskMe.label;"
-                               accesskey="&pref.calendar.advanced.update.modeAskMe.accesskey;"/>
-                        <radio id="automatic"
-                               value="true"
-                               label="&pref.calendar.advanced.update.modeAuto.label;"
-                               accesskey="&pref.calendar.advanced.update.modeAuto.accesskey;"/>
-                        <hbox class="indent">
-                            <checkbox id="warnIncompatible"
-                                      label="&pref.calendar.advanced.update.modeAutoWarn.label;"
-                                      accesskey="&pref.calendar.advanced.update.modeAutoWarn.accesskey;"
-                                      preference="app.update.mode"
-                                      onsyncfrompreference="return gAdvancedPane.readAddonWarn();"
-                                      onsynctopreference="return gAdvancedPane.writeAddonWarn();"/>
-                        </hbox>
-                    </radiogroup>
-
-                    <separator id="updateSeparator2"/>
-
-                    <hbox>
-                        <button id="showUpdateHistory"
-                                label="&pref.calendar.advanced.update.showHistory.label;"
-                                accesskey="&pref.calendar.advanced.update.showHistory.accesskey;"
-                                preference="app.update.disable_button.showUpdateHistory"
-                                oncommand="gAdvancedPane.showUpdates();"/>
-                    </hbox>
-#endif
-                </tabpanel>
-
-                <!-- Encryption -->
-                <tabpanel id="encryptionPanel" orient="vertical">
-
-                  <!-- Protocols -->
-                  <groupbox id="protocolsGroup">
-                    <caption label="&pref.calendar.advanced.encryption.protocols.label;"/>
-
-                    <grid>
-                      <columns>
-                        <column flex="1"/>
-                        <column flex="1"/>
-                      </columns>
-                      <rows>
-                        <row>
-                          <hbox>
-                            <checkbox id="useSSL3"
-                                      label="&pref.calendar.advanced.encryption.useSSL3.label;"
-                                      accesskey="&pref.calendar.advanced.encryption.useSSL3.accesskey;"
-                                      preference="security.enable_ssl3"/>
-                          </hbox>
-                          <hbox>
-                            <checkbox id="useTLS1"
-                                      label="&pref.calendar.advanced.encryption.useTLS1.label;"
-                                      accesskey="&pref.calendar.advanced.encryption.useTLS1.accesskey;"
-                                      preference="security.enable_tls"/>
-                          </hbox>
-                        </row>
-                      </rows>
-                    </grid>
-                  </groupbox>
-
-                  <!-- Certificates -->
-                  <groupbox id="certificatesGroup">
-                    <caption id="CertGroupCaption"
-                             label="&pref.calendar.advanced.encryption.certificates.label;"/>
-
-                    <description id="CertSelectionDesc" control="certSelection">&pref.calendar.advanced.encryption.certSelection.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" orient="horizontal" preftype="string"
-                                preference="security.default_personal_cert"
-                                aria-labelledby="CertGroupCaption CertSelectionDesc">
-                      <radio label="&pref.calendar.advanced.encryption.certs.auto;"
-                             accesskey="&pref.calendar.advanced.encryption.certs.auto.accesskey;"
-                             value="Select Automatically"/>
-                      <radio label="&pref.calendar.advanced.encryption.certs.ask;"
-                             accesskey="&pref.calendar.advanced.encryption.certs.ask.accesskey;"
-                             value="Ask Every Time"/>
-                    </radiogroup>
-
-                    <separator/>
-
-#ifdef XP_MACOSX
-                    <vbox>
-#endif
-                    <hbox>
-                      <button id="viewCertificatesButton"
-                              label="&pref.calendar.advanced.encryption.viewCerts.label;"
-                              accesskey="&pref.calendar.advanced.encryption.viewCerts.accesskey;"
-                              oncommand="gAdvancedPane.showCertificates();"
-                              preference="security.disable_button.openCertManager"/>
-                      <button id="viewCRLButton"
-                              label="&pref.calendar.advanced.encryption.viewCRLs.label;"
-                              accesskey="&pref.calendar.advanced.encryption.viewCRLs.accesskey;"
-                              oncommand="gAdvancedPane.showCRLs();"
-                              preference="security.OCSP.disable_button.managecrl"/>
-                      <button id="verificationButton"
-                              label="&pref.calendar.advanced.encryption.verify2.label;"
-                              accesskey="&pref.calendar.advanced.encryption.verify2.accesskey;"
-                              oncommand="gAdvancedPane.showOCSP();"/>
-#ifdef XP_MACOSX
-                    </hbox>
-                    <hbox>
-#endif
-                      <button id="viewSecurityDevicesButton"
-                              label="&pref.calendar.advanced.encryption.viewSecurityDevices.label;"
-                              accesskey="&pref.calendar.advanced.encryption.viewSecurityDevices.accesskey;"
-                              oncommand="gAdvancedPane.showSecurityDevices();"
-                              preference="security.disable_button.openDeviceManager"/>
-                    </hbox>
-#ifdef XP_MACOSX
-                    </vbox>
-#endif
-                  </groupbox>
-                </tabpanel>
-            </tabpanels>
-        </tabbox>
-        <separator/>
-    </vbox>
-</overlay>
deleted file mode 100644
--- a/calendar/base/content/preferences/connection.js
+++ /dev/null
@@ -1,209 +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/. */
-
-/**
- * Global Object to hold methods for the connections dialog.
- */
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-var gConnectionsDialog = {
-  /**
-   * Handler function to be called before the pref window is closed (i.e
-   * onbeforeaccept attribute).
-   */
-  beforeAccept: function gCD_beforeAccept() {
-    var proxyTypePref = document.getElementById("network.proxy.type");
-    if (proxyTypePref.value == 2) {
-      this.doAutoconfigURLFixup();
-      return true;
-    }
-
-    if (proxyTypePref.value != 1)
-      return true;
-
-    var httpProxyURLPref = document.getElementById("network.proxy.http");
-    var httpProxyPortPref = document.getElementById("network.proxy.http_port");
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    if (shareProxiesPref.value) {
-      var proxyPrefs = ["ssl", "ftp", "socks"];
-      for (var i = 0; i < proxyPrefs.length; ++i) {
-        var proxyServerURLPref = document.getElementById("network.proxy." + proxyPrefs[i]);
-        var proxyPortPref = document.getElementById("network.proxy." + proxyPrefs[i] + "_port");
-        var backupServerURLPref = document.getElementById("network.proxy.backup." + proxyPrefs[i]);
-        var backupPortPref = document.getElementById("network.proxy.backup." + proxyPrefs[i] + "_port");
-        backupServerURLPref.value = proxyServerURLPref.value;
-        backupPortPref.value = proxyPortPref.value;
-        proxyServerURLPref.value = httpProxyURLPref.value;
-        proxyPortPref.value = httpProxyPortPref.value;
-      }
-    }
-    
-    var noProxiesPref = document.getElementById("network.proxy.no_proxies_on");
-    noProxiesPref.value = noProxiesPref.value.replace(/[;]/g,',');
-    
-    return true;
-  },
-  
-
-  /**
-   * Handler function to be called when the network.proxy.type preference has
-   * changed while the connection preferences dialog is open.
-   */
-  proxyTypeChanged: function gCD_proxyTypeChanged() {
-    var proxyTypePref = document.getElementById("network.proxy.type");
-    
-    // Update http
-    var httpProxyURLPref = document.getElementById("network.proxy.http");
-    httpProxyURLPref.disabled = proxyTypePref.value != 1;
-    var httpProxyPortPref = document.getElementById("network.proxy.http_port");
-    httpProxyPortPref.disabled = proxyTypePref.value != 1;
-
-    // Now update the other protocols
-    this.updateProtocolPrefs();
-
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    shareProxiesPref.disabled = proxyTypePref.value != 1;
-    
-    var noProxiesPref = document.getElementById("network.proxy.no_proxies_on");
-    noProxiesPref.disabled = proxyTypePref.value != 1;
-    
-    var autoconfigURLPref = document.getElementById("network.proxy.autoconfig_url");
-    autoconfigURLPref.disabled = proxyTypePref.value != 2;
-
-    this.updateReloadButton();
-  },
-
-  /**
-   * Updates the disabled state of the Reload button depending on the selected
-   * proxy option.
-   * 
-   * Disable the "Reload PAC" button if the selected proxy type is not PAC or
-   * if the current value of the PAC textbox does not match the value stored
-   * in prefs.  Likewise, disable the reload button if PAC is not configured
-   * in prefs.
-   */
-  updateReloadButton: function gCD_updateReloadButton() {
-    var typedURL = document.getElementById("networkProxyAutoconfigURL").value;
-    var proxyTypeCur = document.getElementById("network.proxy.type").value;
-
-    var pacURL = Services.prefs.getCharPref("network.proxy.autoconfig_url");
-    var proxyType = Services.prefs.getIntPref("network.proxy.type");
-
-    var disableReloadPref =
-        document.getElementById("pref.advanced.proxies.disable_button.reload");
-    disableReloadPref.disabled =
-        (proxyTypeCur != 2 || proxyType != 2 || typedURL != pacURL);
-  },
-
-  /**
-   * Handler function to be called when the network proxy type radiogroup
-   * receives a 'syncfrompreference' event. Updates the proxy type and disables
-   * controls related to this if needed (i.e Reload button)
-   */
-  readProxyType: function gCD_readProxyType() {
-    this.proxyTypeChanged();
-    return undefined;
-  },
-  
-  /**
-   * Handler function to be called when the shareAllProxies checkbox receives a
-   * 'syncfrompreference' event.
-   */
-  updateProtocolPrefs: function gCD_updateProtocolPrefs() {
-    var proxyTypePref = document.getElementById("network.proxy.type");
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    var proxyPrefs = ["ssl", "ftp", "socks"];
-    for (var i = 0; i < proxyPrefs.length; ++i) {
-      var proxyServerURLPref = document.getElementById("network.proxy." + proxyPrefs[i]);
-      var proxyPortPref = document.getElementById("network.proxy." + proxyPrefs[i] + "_port");
-      
-      // Restore previous per-proxy custom settings, if present. 
-      if (!shareProxiesPref.value) {
-        var backupServerURLPref = document.getElementById("network.proxy.backup." + proxyPrefs[i]);
-        var backupPortPref = document.getElementById("network.proxy.backup." + proxyPrefs[i] + "_port");
-        if (backupServerURLPref.hasUserValue) {
-          proxyServerURLPref.value = backupServerURLPref.value;
-          backupServerURLPref.reset();
-        }
-        if (backupPortPref.hasUserValue) {
-          proxyPortPref.value = backupPortPref.value;
-          backupPortPref.reset();
-        }
-      }
-
-      proxyServerURLPref.updateElements();
-      proxyPortPref.updateElements();
-      proxyServerURLPref.disabled = proxyTypePref.value != 1 || shareProxiesPref.value;
-      proxyPortPref.disabled = proxyServerURLPref.disabled;
-    }
-    var socksVersionPref = document.getElementById("network.proxy.socks_version");
-    socksVersionPref.disabled = proxyTypePref.value != 1 || shareProxiesPref.value;
-    
-    return undefined;
-  },
-  
-  /**
-   * Handler function to be called when a proxy server host/port textbox
-   * receives a 'syncfrompreference' event.
-   *
-   * @param aProtocol       The protocol to be updated. This is the string
-   *                          contained in the respective preference.
-   * @param aIsPort         If true, the update comes from the port textbox.
-   */
-  readProxyProtocolPref: function gCD_readProxyProtocolPref (aProtocol, aIsPort) {
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    if (shareProxiesPref.value) {
-      var pref = document.getElementById("network.proxy.http" + (aIsPort ? "_port" : ""));    
-      return pref.value;
-    }
-    
-    var backupPref = document.getElementById("network.proxy.backup." + aProtocol + (aIsPort ? "_port" : ""));
-    return backupPref.hasUserValue ? backupPref.value : undefined;
-  },
-
-  /**
-   * Reloads the proxy.pac that is set in the preferences.
-   */
-  reloadPAC: function gCD_reloadPAC() {
-    Components.classes["@mozilla.org/network/protocol-proxy-service;1"]
-              .getService().reloadPAC();
-  },
-  
-  /**
-   * Use nsIURIFixup to fix the url entered in the autoconfig url field and the
-   * respective preference element.
-   */
-  doAutoconfigURLFixup: function gCD_doAutoconfigURLFixup() {
-    var autoURL = document.getElementById("networkProxyAutoconfigURL");
-    var autoURLPref = document.getElementById("network.proxy.autoconfig_url");
-    var URIFixup = Components.classes["@mozilla.org/docshell/urifixup;1"]
-                             .getService(Components.interfaces.nsIURIFixup);
-    try {
-      autoURLPref.value = autoURL.value = URIFixup.createFixupURI(autoURL.value, 0).spec;
-    } catch(ex) {}
-  },
-  
-  /**
-   * Special case handler function to be called when a HTTP proxy server host
-   * textbox receives a 'syncfrompreference' event.
-   */
-  readHTTPProxyServer: function gCD_readHTTPProxyServer() {
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    if (shareProxiesPref.value)
-      this.updateProtocolPrefs();
-    return undefined;
-  },
-  
-  /**
-   * Special case handler function to be called when a HTTP proxy server port
-   * textbox receives a 'syncfrompreference' event.
-   */
-  readHTTPProxyPort: function gCD_readHTTPProxyPort() {
-    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
-    if (shareProxiesPref.value)
-      this.updateProtocolPrefs();
-    return undefined;
-  }
-};
deleted file mode 100644
--- a/calendar/base/content/preferences/connection.xul
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<!DOCTYPE prefwindow SYSTEM "chrome://calendar/locale/preferences/connection.dtd">
-
-<?xml-stylesheet href="chrome://global/skin/"?>
-
-<prefwindow id="ConnectionsDialog" type="child"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-            title="&connectionsDialog.title;"
-            dlgbuttons="accept,cancel"
-            onbeforeaccept="return gConnectionsDialog.beforeAccept();"
-#ifdef XP_MACOSX
-            style="width: &window.macWidth; !important;">
-#else
-            style="width: &window.width; !important;">
-#endif
-
-  <prefpane id="ConnectionsDialogPane">
-
-    <preferences>
-      <preference id="network.proxy.type"         name="network.proxy.type"         type="int" onchange="gConnectionsDialog.proxyTypeChanged();"/>
-      <preference id="network.proxy.http"         name="network.proxy.http"         type="string"/>
-      <preference id="network.proxy.http_port"    name="network.proxy.http_port"    type="int"/>
-      <preference id="network.proxy.ftp"          name="network.proxy.ftp"          type="string"/>
-      <preference id="network.proxy.ftp_port"     name="network.proxy.ftp_port"     type="int"/>
-      <preference id="network.proxy.ssl"          name="network.proxy.ssl"          type="string"/>
-      <preference id="network.proxy.ssl_port"     name="network.proxy.ssl_port"     type="int"/>
-      <preference id="network.proxy.socks"        name="network.proxy.socks"        type="string"/>
-      <preference id="network.proxy.socks_port"   name="network.proxy.socks_port"   type="int"/>
-      <preference id="network.proxy.socks_version"  name="network.proxy.socks_version"  type="int"/>
-      <preference id="network.proxy.no_proxies_on"  name="network.proxy.no_proxies_on"  type="string"/>
-      <preference id="network.proxy.autoconfig_url" name="network.proxy.autoconfig_url" type="string"/>
-      <preference id="network.proxy.share_proxy_settings"
-                  name="network.proxy.share_proxy_settings"
-                  type="bool"/>
-      
-      <preference id="pref.advanced.proxies.disable_button.reload"
-                  name="pref.advanced.proxies.disable_button.reload"
-                  type="bool"/>
-
-      <preference id="network.proxy.backup.ftp"          name="network.proxy.backup.ftp"          type="string"/>
-      <preference id="network.proxy.backup.ftp_port"     name="network.proxy.backup.ftp_port"     type="int"/>
-      <preference id="network.proxy.backup.ssl"          name="network.proxy.backup.ssl"          type="string"/>
-      <preference id="network.proxy.backup.ssl_port"     name="network.proxy.backup.ssl_port"     type="int"/>
-      <preference id="network.proxy.backup.socks"        name="network.proxy.backup.socks"        type="string"/>
-      <preference id="network.proxy.backup.socks_port"   name="network.proxy.backup.socks_port"   type="int"/>
-    </preferences>
-    
-    <script type="application/javascript" src="chrome://calendar/content/preferences/connection.js"/>
-
-    <stringbundle id="preferencesBundle" src="chrome://calendar/locale/preferences/preferences.properties"/>
-
-    <groupbox>
-      <caption label="&proxyTitle.label;"/>
-
-      <radiogroup id="networkProxyType" preference="network.proxy.type"
-                  onsyncfrompreference="return gConnectionsDialog.readProxyType();">
-        <radio value="0" label="&directTypeRadio.label;" accesskey="&directTypeRadio.accesskey;"/>
-        <radio value="4" label="&WPADTypeRadio.label;" accesskey="&WPADTypeRadio.accesskey;"/>
-        <radio value="1" label="&manualTypeRadio.label;" accesskey="&manualTypeRadio.accesskey;"/>
-        <grid class="indent" flex="1">
-          <columns>
-            <column/>
-            <column flex="1"/>
-          </columns>
-          <rows>
-            <row align="center">
-              <hbox pack="end">
-                <label value="&http.label;" accesskey="&http.accesskey;" control="networkProxyHTTP"/>
-              </hbox>
-              <hbox align="center">
-                <textbox id="networkProxyHTTP" flex="1"
-                         preference="network.proxy.http" onsyncfrompreference="return gConnectionsDialog.readHTTPProxyServer();"/>
-                <label value="&port.label;" accesskey="&HTTPport.accesskey;" control="networkProxyHTTP_Port"/>
-                <textbox id="networkProxyHTTP_Port" size="5" type="number" min="0" max="65535"
-                         preference="network.proxy.http_port" onsyncfrompreference="return gConnectionsDialog.readHTTPProxyPort();"/>
-              </hbox>
-            </row>
-            <row>
-              <hbox/>
-              <hbox>
-                <checkbox id="shareAllProxies" label="&shareproxy.label;" accesskey="&shareproxy.accesskey;"
-                          preference="network.proxy.share_proxy_settings"
-                          onsyncfrompreference="return gConnectionsDialog.updateProtocolPrefs();"/>
-              </hbox>
-            </row>
-            <row align="center">
-              <hbox pack="end">
-                <label value="&ssl.label;" accesskey="&ssl.accesskey;" control="networkProxySSL"/>
-              </hbox>
-              <hbox align="center">
-                <textbox id="networkProxySSL" flex="1" preference="network.proxy.ssl"
-                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ssl', false);"/>
-                <label value="&port.label;" accesskey="&SSLport.accesskey;" control="networkProxySSL_Port"/>
-                <textbox id="networkProxySSL_Port" size="5" preference="network.proxy.ssl_port" type="number" min="0" max="65535"
-                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ssl', true);"/>
-              </hbox>
-            </row>
-            <row align="center">
-              <hbox pack="end">
-                <label value="&ftp.label;" accesskey="&ftp.accesskey;" control="networkProxyFTP"/>
-              </hbox>
-              <hbox align="center">
-                <textbox id="networkProxyFTP" flex="1" preference="network.proxy.ftp"
-                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ftp', false);"/>
-                <label value="&port.label;" accesskey="&FTPport.accesskey;" control="networkProxyFTP_Port"/>
-                <textbox id="networkProxyFTP_Port" size="5" preference="network.proxy.ftp_port" type="number" min="0" max="65535"
-                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ftp', true);"/>
-              </hbox>
-            </row>
-            <row align="center">
-              <hbox pack="end">
-                <label value="&socks.label;" accesskey="&socks.accesskey;" control="networkProxySOCKS"/>
-              </hbox>
-              <hbox align="center">
-                <textbox id="networkProxySOCKS" flex="1" preference="network.proxy.socks"
-                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('socks', false);"/>
-                <label value="&port.label;" accesskey="&SOCKSport.accesskey;" control="networkProxySOCKS_Port"/>
-                <textbox id="networkProxySOCKS_Port" size="5" preference="network.proxy.socks_port" type="number" min="0" max="65535"
-                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('socks', true);"/>
-              </hbox>
-            </row>
-            <row>
-              <spacer/>
-              <radiogroup id="networkProxySOCKSVersion" orient="horizontal"
-                          preference="network.proxy.socks_version">
-                <radio id="networkProxySOCKSVersion4" value="4" label="&socks4.label;" accesskey="&socks4.accesskey;" />
-                <radio id="networkProxySOCKSVersion5" value="5" label="&socks5.label;" accesskey="&socks5.accesskey;" />
-              </radiogroup>
-            </row>
-
-            <row align="center"> 
-              <hbox align="center" pack="end">
-                <label value="&noproxy.label;" accesskey="&noproxy.accesskey;" control="networkProxyNone"/>
-              </hbox>
-              <textbox id="networkProxyNone" preference="network.proxy.no_proxies_on"/>
-            </row>
-            <row>
-              <spacer/>
-              <label value="&noproxyExplain.label;" control="networkProxyNone"/>
-            </row>
-          </rows>
-        </grid>
-        <radio value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"/>
-        <hbox class="indent" flex="1" align="center">
-          <textbox id="networkProxyAutoconfigURL"
-                   flex="1"
-                   preference="network.proxy.autoconfig_url"
-                   oninput="gConnectionsDialog.updateReloadButton();"/>
-          <button id="autoReload" icon="refresh"
-                  label="&reload.label;" accesskey="&reload.accesskey;"
-                  oncommand="gConnectionsDialog.reloadPAC();" 
-                  preference="pref.advanced.proxies.disable_button.reload"/>
-        </hbox>
-      </radiogroup>
-    </groupbox>
-  </prefpane>
-</prefwindow>
deleted file mode 100644
--- a/calendar/base/content/preferences/preferences.xul
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://calendar/skin/preferences/preferences.css"?>
-
-<!DOCTYPE prefwindow [
-    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-    <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
-    %brandDTD;
-    %preferencesDTD;
-]>
-
-#ifdef XP_WIN
-#define USE_WIN_TITLE_STYLE
-#endif
-#ifdef XP_OS2
-#define USE_WIN_TITLE_STYLE
-#endif
-
-<prefwindow type="prefwindow"
-            id="CalendarPreferences"
-            windowtype="Calendar:Preferences"
-            xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-#ifdef USE_WIN_TITLE_STYLE
-            title="&prefWindow.titleWin;"
-            style="&prefWindow.styleWin;">
-#else
-#ifdef XP_UNIX
-#ifdef XP_MACOSX
-            style="&prefWindow.styleMac;">
-#else
-            title="&prefWindow.titleGNOME;"
-            style="&prefWindow.styleGNOME;">
-#endif
-#endif
-#endif
-
-    <prefpane id="paneGeneral"
-              label="&paneGeneral.title;"
-              onpaneload="gCalendarGeneralPane.init();"
-              src="chrome://calendar/content/preferences/general.xul">
-        <vbox id="calPreferencesBoxGeneral"/>
-    </prefpane>
-
-    <prefpane id="paneAlarms"
-              label="&paneAlarms.title;"
-              onpaneload="gAlarmsPane.init();"
-              src="chrome://calendar/content/preferences/alarms.xul">
-        <vbox id="calPreferencesBoxAlarms"/>
-    </prefpane>
-
-    <prefpane id="paneCategories"
-              label="&paneCategories.title;"
-              onpaneload="gCategoriesPane.init();"
-              src="chrome://calendar/content/preferences/categories.xul">
-        <vbox id="calPreferencesBoxCategories"/>
-    </prefpane>
-
-    <prefpane id="paneViews"
-              label="&paneViews.title;"
-              onpaneload="gViewsPane.init();"
-              src="chrome://calendar/content/preferences/views.xul">
-        <vbox id="calPreferencesBoxViews"/>
-    </prefpane>
-
-    <prefpane id="paneTimezones"
-              label="&paneTimezones.title;"
-              onpaneload="gTimezonesPane.init();"
-              src="chrome://calendar/content/preferences/timezones.xul">
-        <vbox id="calPreferencesBoxTimezones"/>
-    </prefpane>
-
-    <prefpane id="paneAdvanced"
-              label="&paneAdvanced.title;"
-              onpaneload="gAdvancedPane.init();"
-              src="chrome://calendar/content/preferences/advanced.xul">
-        <vbox id="calPreferencesBoxAdvanced"/>
-    </prefpane>
-
-    <script type="application/javascript"
-            src="chrome://calendar/content/calUtils.js"/>
-
-</prefwindow>
deleted file mode 100644
--- a/calendar/locales/en-US/chrome/calendar/preferences/advanced.dtd
+++ /dev/null
@@ -1,68 +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/. -->
-
-<!-- WARNING! This file contains UTF-8 encoded characters!
-   - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
-   - your editor isn't using UTF-8 encoding and may munge up the document!
-  -->
-
-<!ENTITY pref.calendar.advanced.generalTab.label "General">
-<!ENTITY pref.calendar.advanced.passwordsTab.label "Passwords">
-<!ENTITY pref.calendar.advanced.updateTab.label "Update">
-<!ENTITY pref.calendar.advanced.encryptionTab.label "Encryption">
-
-<!-- General -->
-<!ENTITY pref.calendar.advanced.showConnections.label     "Connection Settings…">
-<!ENTITY pref.calendar.advanced.showConnections.accesskey "o">
-<!ENTITY pref.calendar.advanced.proxiesInfo.label         "Determine how &brandShortName; connects to the Internet">
-<!ENTITY pref.calendar.advanced.configEdit.caption "Advanced Configuration">
-<!ENTITY pref.calendar.advanced.configEdit.button "Config Editor…">
-<!ENTITY pref.calendar.advanced.configEdit.accesskey "g">
-
-<!-- Passwords -->
-<!ENTITY pref.calendar.advanced.savedPasswords.intro "&brandShortName; can remember password information for all of your calendars so you don't need to re-enter your login details.">
-<!ENTITY pref.calendar.advanced.useMasterPassword.label "Use a Master Password to encrypt stored passwords">
-<!ENTITY pref.calendar.advanced.useMasterPassword.accesskey "P">
-<!ENTITY pref.calendar.advanced.masterPassword.intro "When set, the Master Password protects all your passwords, but you must enter it once per session.">
-<!ENTITY pref.calendar.advanced.changeMasterPassword.label "Change Master Password…">
-<!ENTITY pref.calendar.advanced.changeMasterPassword.accesskey "M">
-<!ENTITY pref.calendar.advanced.viewPasswords.label "View Saved Passwords…">
-<!ENTITY pref.calendar.advanced.viewPasswords.accesskey "V">
-
-<!-- Update -->
-<!ENTITY pref.calendar.advanced.update.autoCheck.label "Automatically check for updates to:">
-<!ENTITY pref.calendar.advanced.update.enableAppUpdate.label "&brandShortName;">
-<!ENTITY pref.calendar.advanced.update.enableAppUpdate.accesskey "r">
-<!ENTITY pref.calendar.advanced.update.enableAddonsUpdate.label "Installed Add-ons">
-<!ENTITY pref.calendar.advanced.update.enableAddonsUpdate.accesskey "n">
-<!ENTITY pref.calendar.advanced.update.whenUpdatesFound.label "When updates to &brandShortName; are found:">
-<!ENTITY pref.calendar.advanced.update.modeAskMe.label "Ask me what I want to do">
-<!ENTITY pref.calendar.advanced.update.modeAskMe.accesskey "k">
-<!ENTITY pref.calendar.advanced.update.modeAuto.label "Automatically download and install the update">
-<!ENTITY pref.calendar.advanced.update.modeAuto.accesskey "d">
-<!ENTITY pref.calendar.advanced.update.modeAutoWarn.label "Warn me if this will disable any of my add-ons">
-<!ENTITY pref.calendar.advanced.update.modeAutoWarn.accesskey "W">
-<!ENTITY pref.calendar.advanced.update.showHistory.label "Show Update History…">
-<!ENTITY pref.calendar.advanced.update.showHistory.accesskey "U">
-
-<!-- Encryption -->
-<!ENTITY pref.calendar.advanced.encryption.protocols.label "Protocols">
-<!ENTITY pref.calendar.advanced.encryption.useSSL3.label "Use SSL 3.0">
-<!ENTITY pref.calendar.advanced.encryption.useSSL3.accesskey "3">
-<!ENTITY pref.calendar.advanced.encryption.useTLS1.label "Use TLS 1.0">
-<!ENTITY pref.calendar.advanced.encryption.useTLS1.accesskey "1">
-<!ENTITY pref.calendar.advanced.encryption.certificates.label "Certificates">
-<!ENTITY pref.calendar.advanced.encryption.certSelection.description "When a server requests my personal certificate:">
-<!ENTITY pref.calendar.advanced.encryption.certs.auto "Select one automatically">
-<!ENTITY pref.calendar.advanced.encryption.certs.auto.accesskey "l">
-<!ENTITY pref.calendar.advanced.encryption.certs.ask "Ask me every time">
-<!ENTITY pref.calendar.advanced.encryption.certs.ask.accesskey "i">
-<!ENTITY pref.calendar.advanced.encryption.viewCerts.label "View Certificates">
-<!ENTITY pref.calendar.advanced.encryption.viewCerts.accesskey "s">
-<!ENTITY pref.calendar.advanced.encryption.viewCRLs.label "Revocation Lists">
-<!ENTITY pref.calendar.advanced.encryption.viewCRLs.accesskey "R">
-<!ENTITY pref.calendar.advanced.encryption.verify2.label "Validation">
-<!ENTITY pref.calendar.advanced.encryption.verify2.accesskey "V">
-<!ENTITY pref.calendar.advanced.encryption.viewSecurityDevices.label "Security Devices">
-<!ENTITY pref.calendar.advanced.encryption.viewSecurityDevices.accesskey "y">
deleted file mode 100644
--- a/calendar/locales/en-US/chrome/calendar/preferences/connection.dtd
+++ /dev/null
@@ -1,46 +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/. -->
-
-<!-- WARNING! This file contains UTF-8 encoded characters!
-   - If this ==> … <== doesn't look like an ellipsis (three dots in a row),
-   - your editor isn't using UTF-8 encoding and may munge up the document!
-  -->
-
-<!ENTITY  connectionsDialog.title       "Connection Settings">
-<!ENTITY  window.width                  "37em">
-<!ENTITY  window.macWidth               "39em">
-
-<!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet">
-<!ENTITY  directTypeRadio.label         "Direct connection to the Internet">
-<!ENTITY  directTypeRadio.accesskey     "d">
-<!ENTITY  WPADTypeRadio.label           "Auto-detect proxy settings for this network">
-<!ENTITY  WPADTypeRadio.accesskey       "w">
-<!ENTITY  manualTypeRadio.label         "Manual proxy configuration:">
-<!ENTITY  manualTypeRadio.accesskey     "m">
-<!ENTITY  autoTypeRadio.label           "Automatic proxy configuration URL:">
-<!ENTITY  autoTypeRadio.accesskey       "A">
-<!ENTITY  reload.label                  "Reload">
-<!ENTITY  reload.accesskey              "e">
-<!ENTITY  ftp.label                     "FTP Proxy:">
-<!ENTITY  ftp.accesskey                 "F">
-<!ENTITY  http.label                    "HTTP Proxy:">
-<!ENTITY  http.accesskey                "y">
-<!ENTITY  ssl.label                     "SSL Proxy:">
-<!ENTITY  ssl.accesskey                 "S">
-<!ENTITY  socks.label                   "SOCKS Host:">
-<!ENTITY  socks.accesskey               "C">
-<!ENTITY  socks4.label                  "SOCKS v4">
-<!ENTITY  socks4.accesskey              "K">
-<!ENTITY  socks5.label                  "SOCKS v5">
-<!ENTITY  socks5.accesskey              "v">
-<!ENTITY  port.label                    "Port:">
-<!ENTITY  HTTPport.accesskey            "P">
-<!ENTITY  SSLport.accesskey             "o">
-<!ENTITY  FTPport.accesskey             "r">
-<!ENTITY  SOCKSport.accesskey           "t">
-<!ENTITY  noproxy.label                 "No Proxy for:">
-<!ENTITY  noproxy.accesskey             "n">
-<!ENTITY  noproxyExplain.label          "Example: .mozilla.org, .net.nz, 192.168.1.0/24">
-<!ENTITY  shareproxy.label              "Use this proxy server for all protocols">
-<!ENTITY  shareproxy.accesskey          "x">
--- a/calendar/locales/en-US/chrome/calendar/preferences/preferences.dtd
+++ b/calendar/locales/en-US/chrome/calendar/preferences/preferences.dtd
@@ -1,16 +1,9 @@
 <!-- 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/. -->
 
-<!ENTITY  prefWindow.titleWin     "Options">
-<!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
-<!ENTITY  prefWindow.styleWin     "width: 47em; height: 37em;">
-<!ENTITY  prefWindow.styleMac     "width: 47em;">
-<!ENTITY  prefWindow.styleGNOME   "width: 47em; height: 34.5em;">
-
 <!ENTITY  paneGeneral.title       "General">
 <!ENTITY  paneAlarms.title        "Reminders">
 <!ENTITY  paneCategories.title    "Categories">
 <!ENTITY  paneViews.title         "Views">
 <!ENTITY  paneTimezones.title     "Timezone">
-<!ENTITY  paneAdvanced.title      "Advanced">
--- a/calendar/locales/jar.mn
+++ b/calendar/locales/jar.mn
@@ -21,18 +21,16 @@ calendar-@AB_CD@.jar:
     locale/@AB_CD@/calendar/dateFormat.properties          (%chrome/calendar/dateFormat.properties)
     locale/@AB_CD@/calendar/global.dtd                     (%chrome/calendar/global.dtd)
     locale/@AB_CD@/calendar/menuOverlay.dtd                (%chrome/calendar/menuOverlay.dtd)
     locale/@AB_CD@/calendar/migration.dtd                  (%chrome/calendar/migration.dtd)
     locale/@AB_CD@/calendar/migration.properties           (%chrome/calendar/migration.properties)
     locale/@AB_CD@/calendar/provider-uninstall.dtd         (%chrome/calendar/provider-uninstall.dtd)
     locale/@AB_CD@/calendar/timezones.properties           (%chrome/calendar/timezones.properties)
     locale/@AB_CD@/calendar/wcap.properties                (%chrome/calendar/providers/wcap/wcap.properties)
-    locale/@AB_CD@/calendar/preferences/advanced.dtd       (%chrome/calendar/preferences/advanced.dtd)
     locale/@AB_CD@/calendar/preferences/alarms.dtd         (%chrome/calendar/preferences/alarms.dtd)
     locale/@AB_CD@/calendar/preferences/categories.dtd     (%chrome/calendar/preferences/categories.dtd)
-*   locale/@AB_CD@/calendar/preferences/connection.dtd     (%chrome/calendar/preferences/connection.dtd)
     locale/@AB_CD@/calendar/preferences/general.dtd        (%chrome/calendar/preferences/general.dtd)
     locale/@AB_CD@/calendar/preferences/preferences.dtd    (%chrome/calendar/preferences/preferences.dtd)
     locale/@AB_CD@/calendar/preferences/timezones.dtd      (%chrome/calendar/preferences/timezones.dtd)
     locale/@AB_CD@/calendar/preferences/views.dtd          (%chrome/calendar/preferences/views.dtd)
     locale/@AB_CD@/calendar/dialogs/calendar-event-dialog-reminder.dtd  (%chrome/calendar/dialogs/calendar-event-dialog-reminder.dtd)
     locale/@AB_CD@/calendar/calendar-event-dialog-attendees.properties  (%chrome/calendar/calendar-event-dialog-attendees.properties)
--- a/calendar/resources/jar.mn
+++ b/calendar/resources/jar.mn
@@ -10,18 +10,13 @@ calendar.jar:
     content/calendar/calendarCreation.js                   (content/calendarCreation.js)
     content/calendar/publish.js                            (content/publish.js)
     content/calendar/publishDialog.js                      (content/publishDialog.js)    
     content/calendar/publishDialog.xul                     (content/publishDialog.xul)
     content/calendar/mouseoverPreviews.js                  (content/mouseoverPreviews.js)
     content/calendar/sound.wav                             (content/sound.wav)
     content/calendar/datetimepickers/datetimepickers.css   (content/datetimepickers/datetimepickers.css)
     content/calendar/datetimepickers/datetimepickers.xml   (content/datetimepickers/datetimepickers.xml)
-*   content/calendar/preferences/advanced.js               (/calendar/base/content/preferences/advanced.js)
-*   content/calendar/preferences/advanced.xul              (/calendar/base/content/preferences/advanced.xul)
-*   content/calendar/preferences/connection.xul            (/calendar/base/content/preferences/connection.xul)
-    content/calendar/preferences/connection.js             (/calendar/base/content/preferences/connection.js)
-*   content/calendar/preferences/preferences.xul           (/calendar/base/content/preferences/preferences.xul)
 % skin calendar classic/1.0 %skin/calendar/
     skin/calendar/dialogOverlay.css                        (skin/classic/dialogOverlay.css)
     skin/calendar/datetimepickers/datetimepickers.css      (skin/classic/datetimepickers/datetimepickers.css)
     skin/calendar/preferences/Options.png                  (/calendar/base/themes/@THEME@/preferences/Options.png)
     skin/calendar/preferences/preferences.css              (/calendar/base/themes/@THEME@/preferences/preferences.css)