From 0d2810902cb8fb75c8e2673f1c8b098c286defb1 Mon Sep 17 00:00:00 2001
From: "mattwillis%gmail.com" <mattwillis%gmail.com>
Date: Mon, 19 Jun 2006 18:29:55 +0000
Subject: [PATCH] bug 333923 - converts Sunbird preferences from xpfe to
 toolkit. r=jminta

---
 calendar/base/content/preferences/alarms.js   | 166 ++++
 calendar/base/content/preferences/alarms.xul  | 278 ++++++
 .../base/content/preferences/categories.js    | 241 +++++
 .../base/content/preferences/categories.xul   | 106 +++
 .../base/content/preferences/connection.js    | 205 +++++
 .../base/content/preferences/connection.xul   | 207 +++++
 .../base/content/preferences/editCategory.xul |  99 +++
 calendar/base/content/preferences/general.js  |  68 ++
 calendar/base/content/preferences/general.xul | 133 +++
 .../base/content/preferences/preferences.xul  |  94 ++
 .../base/content/preferences/timezones.js     |  67 ++
 .../base/content/preferences/timezones.xul    | 826 ++++++++++++++++++
 calendar/base/content/preferences/views.xul   | 258 ++++++
 .../locales/en-US/chrome/calendar/global.dtd  |  16 +
 calendar/locales/jar.mn                       |   7 +
 calendar/resources/content/calendar.js        |  18 +-
 calendar/resources/jar.mn                     |  37 +-
 calendar/sunbird/app/profile/sunbird.js       |  12 +
 calendar/sunbird/base/jar.mn                  |   2 -
 .../sunbird/themes/pinstripe/sunbird/jar.mn   |   3 +-
 .../sunbird/themes/winstripe/sunbird/jar.mn   |   2 -
 21 files changed, 2820 insertions(+), 25 deletions(-)
 create mode 100644 calendar/base/content/preferences/alarms.js
 create mode 100644 calendar/base/content/preferences/alarms.xul
 create mode 100644 calendar/base/content/preferences/categories.js
 create mode 100644 calendar/base/content/preferences/categories.xul
 create mode 100644 calendar/base/content/preferences/connection.js
 create mode 100644 calendar/base/content/preferences/connection.xul
 create mode 100644 calendar/base/content/preferences/editCategory.xul
 create mode 100644 calendar/base/content/preferences/general.js
 create mode 100644 calendar/base/content/preferences/general.xul
 create mode 100644 calendar/base/content/preferences/preferences.xul
 create mode 100644 calendar/base/content/preferences/timezones.js
 create mode 100644 calendar/base/content/preferences/timezones.xul
 create mode 100644 calendar/base/content/preferences/views.xul

diff --git a/calendar/base/content/preferences/alarms.js b/calendar/base/content/preferences/alarms.js
new file mode 100644
index 000000000000..cad0aecfc385
--- /dev/null
+++ b/calendar/base/content/preferences/alarms.js
@@ -0,0 +1,166 @@
+/**
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OEone Calendar Code, released October 31st, 2001.
+ *
+ * The Initial Developer of the Original Code is
+ * OEone Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Mostafa Hosseini <mostafah@oeone.com>
+ *   Matthew Willis <mattwillis@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+var gAlarmsPane = {
+
+    init: function () {
+        // Enable/disable the alarm sound URL box and buttons
+        this.alarmsPlaySoundPrefChanged();
+
+        // Set the correct singular/plural for the time units
+        this.updateMenuPlural("eventdefalarmlen", "eventdefalarmunit");
+        this.updateMenuPlural("tododefalarmlen",  "tododefalarmunit");
+    },
+
+    updateMenuPlural: function (lengthFieldId, menuId) {
+        var field = document.getElementById(lengthFieldId);
+        var menu  = document.getElementById(menuId);
+
+        var length = field.value;
+        var newLabelNumber;
+        if (Number(length) > 1) {
+            newLabelNumber = "labelplural";
+        } else {
+            newLabelNumber = "labelsingular";
+        }
+
+        // Only make necessary changes
+        var oldLabelNumber = menu.getAttribute("labelnumber");
+        if (newLabelNumber != oldLabelNumber) {
+            // remember what we are showing now
+            menu.setAttribute("labelnumber", newLabelNumber);
+
+            // update the menu items
+            var items = menu.getElementsByTagName("menuitem");
+
+            for (var i=0; i < items.length; i++) {
+                var menuItem = items[i];
+                var newLabel = menuItem.getAttribute(newLabelNumber);
+                menuItem.label = newLabel;
+                menuItem.setAttribute("label", newLabel);
+            }
+
+            // force the menu selection to redraw
+            var saveSelectedIndex = menu.selectedIndex;
+            menu.selectedIndex = -1;
+            menu.selectedIndex = saveSelectedIndex;
+        }
+    },
+
+    convertURLToLocalFile: function (aFileURL) {
+        // convert the file url into a nsILocalFile
+        if (aFileURL) {
+            var ios = Components.classes["@mozilla.org/network/io-service;1"]
+                                .getService(Components.interfaces.nsIIOService);
+            var fph = ios.getProtocolHandler("file")
+                         .QueryInterface(Components.interfaces.nsIFileProtocolHandler);
+            return fph.getFileFromURLSpec(aFileURL);
+        } else {
+            return null;
+        }
+    },
+
+    readSoundLocation: function () {
+        var soundUrl = document.getElementById("alarmSoundFileField");
+        soundUrl.value = document.getElementById("calendar.alarms.soundURL").value;
+        if (soundUrl.value.indexOf("file://") == 0) {
+            soundUrl.label = this.convertURLToLocalFile(soundUrl.value).leafName;
+        } else {
+            soundUrl.label = soundUrl.value;
+        }
+        return undefined;
+    },
+
+    useDefaultSound: function () {
+        var defaultSoundUrl = "chrome://calendar/content/sound.wav";
+        document.getElementById("calendar.alarms.soundURL").value = defaultSoundUrl;
+        document.getElementById("alarmSoundCheckbox").checked = true;
+        this.readSoundLocation();
+    },
+
+    browseAlarm: function () {
+        const nsIFilePicker = Components.interfaces.nsIFilePicker;
+        var fp = Components.classes["@mozilla.org/filepicker;1"]
+                    .createInstance(nsIFilePicker);
+
+        var bundlePreferences = document.getElementById("bundlePreferences");
+        var title = bundlePreferences.getString("Open");
+        fp.init(window, title, nsIFilePicker.modeOpen);
+
+        var ret = fp.show();
+
+        if (ret == nsIFilePicker.returnOK) {
+            document.getElementById("calendar.alarms.soundURL").value = fp.fileURL.spec;
+            document.getElementById("alarmSoundCheckbox").checked = true;
+            this.readSoundLocation();
+        }
+    },
+
+    previewAlarm: function () {
+        var soundUrl = document.getElementById("alarmSoundFileField").value;
+        var soundIfc = Components.classes["@mozilla.org/sound;1"]
+                            .createInstance(Components.interfaces.nsISound);
+        var ios = Components.classes["@mozilla.org/network/io-service;1"]
+                            .getService(Components.interfaces.nsIIOService);
+        var url;
+        try {
+            url = ios.newURI(soundUrl, null, null);
+            soundIfc.init();
+            soundIfc.play(url);
+        } catch (ex) {
+            dump("alarms.js previewAlarm Exception caught! " + ex + "\n");
+        }
+    },
+
+    alarmsPlaySoundPrefChanged: function () {
+        var alarmsPlaySoundPref =
+            document.getElementById("calendar.alarms.playsound");
+
+        var items = [document.getElementById("alarmSoundFileField"),
+                     document.getElementById("calendar.prefs.alarm.sound.useDefault"),
+                     document.getElementById("calendar.prefs.alarm.sound.browse"),
+                     document.getElementById("calendar.prefs.alarm.sound.preview")];
+
+        for (var i=0; i < items.length; i++) {
+            items[i].disabled = !alarmsPlaySoundPref.value;
+        }
+    }
+
+};
diff --git a/calendar/base/content/preferences/alarms.xul b/calendar/base/content/preferences/alarms.xul
new file mode 100644
index 000000000000..ac3acfd494ba
--- /dev/null
+++ b/calendar/base/content/preferences/alarms.xul
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Calendar Preferences
+   -
+   - The Initial Developer of the Original Code is
+   - Mike Potter
+   - Portions created by the Initial Developer are Copyright (C) 2002
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Mike Potter <mikep@oeone.com>
+   -   Matthew Willis <mattwillis@gmail.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay [
+    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+    <!ENTITY % alarmsDTD SYSTEM "chrome://calendar/locale/preferences/alarms.dtd">
+    <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+    <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
+    %brandDTD;
+    %alarmsDTD;
+    %globalDTD;
+    %preferencesDTD;
+]>
+
+<overlay id="AlarmsPaneOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <prefpane id="paneAlarms" onpaneload="gAlarmsPane.init();">
+        <script type="application/x-javascript"
+                src="chrome://calendar/content/preferences/alarms.js"/>
+
+        <preferences>
+            <preference id="calendar.alarms.playsound"
+                        name="calendar.alarms.playsound"
+                        type="bool"
+                        onchange="gAlarmsPane.alarmsPlaySoundPrefChanged();"/>
+            <preference id="calendar.alarms.soundURL"
+                        name="calendar.alarms.soundURL"
+                        type="string"
+                        onchange="gAlarmsPane.readSoundLocation();"/>/>
+            <preference id="calendar.alarms.show"
+                        name="calendar.alarms.show"
+                        type="bool"/>
+            <preference id="calendar.alarms.showmissed"
+                        name="calendar.alarms.showmissed"
+                        type="bool"/>
+            <preference id="calendar.alarms.onforevents"
+                        name="calendar.alarms.onforevents"
+                        type="int"/>
+            <preference id="calendar.alarms.onfortodos"
+                        name="calendar.alarms.onfortodos"
+                        type="int"/>
+            <preference id="calendar.alarms.eventalarmlen"
+                        name="calendar.alarms.eventalarmlen"
+                        type="int"/>
+            <preference id="calendar.alarms.eventalarmunit"
+                        name="calendar.alarms.eventalarmunit"
+                        type="string"/>
+            <preference id="calendar.alarms.todoalarmlen"
+                        name="calendar.alarms.todoalarmlen"
+                        type="int"/>
+            <preference id="calendar.alarms.todoalarmunit"
+                        name="calendar.alarms.todoalarmunit"
+                        type="string"/>
+<!--
+            <preference id="calendar.alarms.emailaddress"
+                        name="calendar.alarms.emailaddress"
+                        type="string"/>
+            <preference id="calendar.alarms.text"
+                        name="calendar.alarms.text"
+                        type="string"/>
+-->
+        </preferences>
+
+        <groupbox>
+            <caption label="&pref.alarmgoesoff.label;"/>
+            <vbox>
+                <hbox align="center" flex="1">
+                    <checkbox id="alarmSoundCheckbox"
+                              preference="calendar.alarms.playsound"
+                              label="&pref.playasound;"
+                              accesskey="&pref.calendar.alarms.playsound.accessKey;"/>
+                    <filefield id="alarmSoundFileField"
+                               flex="1"
+                               preference="calendar.alarms.soundURL"
+                               preference-editable="true"
+                               onsyncfrompreference="return gAlarmsPane.readSoundLocation();"/>
+                </hbox>
+                <hbox pack="end">
+                    <button id="calendar.prefs.alarm.sound.useDefault"
+                            label="&pref.calendar.alarms.sound.useDefault.label;"
+                            accesskey="&pref.calendar.alarms.sound.useDefault.accessKey;"
+                            oncommand="gAlarmsPane.useDefaultSound()"/>
+                    <button id="calendar.prefs.alarm.sound.browse"
+                            label="&pref.calendar.alarms.sound.browse.label;"
+                            accesskey="&pref.calendar.alarms.sound.browse.accessKey;"
+                            oncommand="gAlarmsPane.browseAlarm()"/>
+                    <button id="calendar.prefs.alarm.sound.preview"
+                            label="&pref.calendar.alarms.sound.preview.label;"
+                            accesskey="&pref.calendar.alarms.sound.preview.accessKey;"
+                            oncommand="gAlarmsPane.previewAlarm()"/>
+                </hbox>
+            </vbox>
+            <hbox align="center" flex="1">
+                <checkbox id="alarmshow"
+                          preference="calendar.alarms.show"
+                          label="&pref.showalarmbox;"
+                          accesskey="&pref.calendar.alarms.showAlarmBox.accessKey;"/>
+            </hbox>
+            <hbox align="center" flex="1">
+                <checkbox id="missedalarms"
+                          preference="calendar.alarms.showmissed"
+                          label="&pref.missedalarms;"
+                          accesskey="&pref.calendar.alarms.missedAlarms.accessKey;"/>
+            </hbox>
+        </groupbox>
+
+        <groupbox>
+            <caption label="&pref.calendar.alarms.defaults.label;"/>
+            <grid>
+                <columns>
+                    <column flex="1"/>
+                    <column/>
+                </columns>
+                <rows>
+                    <row>
+                        <vbox align="start">
+                            <caption label="&pref.defalarm4events.label;"/>
+                        </vbox>
+                        <menulist id="eventdefalarm"
+                                  crop="none"
+                                  preference="calendar.alarms.onforevents">
+                            <menupopup id="eventdefalarm">
+                                <menuitem id="eventdefalarmon"
+                                          label="&pref.alarm.on;"
+                                          value="1"/>
+                                <menuitem id="eventdefalarmoff"
+                                          label="&pref.alarm.off;"
+                                          value="0"
+                                          selected="true"/>
+                            </menupopup>
+                        </menulist>
+                    </row>
+                    <row>
+                        <vbox align="start">
+                            <caption label="&pref.defalarm4todos.label;"/>
+                        </vbox>
+                        <menulist id="tododefalarm"
+                                  crop="none"
+                                  preference="calendar.alarms.onfortodos">
+                            <menupopup id="tododefalarm">
+                                <menuitem id="tododefalarmon"
+                                          label="&pref.alarm.on;"
+                                          value="1"/>
+                                <menuitem id="tododefalarmoff"
+                                          label="&pref.alarm.off;"
+                                          value="0"
+                                          selected="true"/>
+                            </menupopup>
+                        </menulist>
+                    </row>
+                    <row>
+                        <vbox align="start">
+                            <caption label="&pref.defalarmlen4events.label;"/>
+                        </vbox>
+                        <hbox>
+                            <textbox id="eventdefalarmlen"
+                                     preference="calendar.alarms.eventalarmlen"
+                                     size="3"
+                                     oninput="gAlarmsPane.updateMenuPlural('eventdefalarmlen','eventdefalarmunit')"/>
+                            <menulist id="eventdefalarmunit"
+                                      crop="none"
+                                      preference="calendar.alarms.eventalarmunit"
+                                      labelnumber="labelplural">
+                                <menupopup id="eventdefalarmunit">
+                                    <menuitem id="eventdefalarmunitday"
+                                              label="&calendar.global.units.minutes;"
+                                              labelplural="&calendar.global.units.minutes;"
+                                              labelsingular="&calendar.global.units.minute;"
+                                              value="minutes"
+                                              selected="true"/>
+                                    <menuitem id="eventdefalarmunitmin"
+                                              label="&calendar.global.units.hours;"
+                                              labelplural="&calendar.global.units.hours;"
+                                              labelsingular="&calendar.global.units.hour;"
+                                              value="hours"/>
+                                    <menuitem id="eventdefalarmunitmin"
+                                              label="&calendar.global.units.days;"
+                                              labelplural="&calendar.global.units.days;"
+                                              labelsingular="&calendar.global.units.day;"
+                                              value="days"/>
+                                </menupopup>
+                            </menulist>
+                        </hbox>
+                    </row>
+                    <row>
+                        <vbox align="start">
+                            <caption label="&pref.defalarmlen4todos.label;"/>
+                        </vbox>
+                        <hbox>
+                            <textbox id="tododefalarmlen"
+                                     preference="calendar.alarms.todoalarmlen"
+                                     size="3"
+                                     oninput="gAlarmsPane.updateMenuPlural('tododefalarmlen','tododefalarmunit')"/>
+                            <menulist id="tododefalarmunit"
+                                      crop="none"
+                                      preference="calendar.alarms.todoalarmunit"
+                                      labelnumber="labelplural">
+                                <menupopup id="tododefalarmunit">
+                                    <menuitem id="tododefalarmunitday"
+                                              label="&calendar.global.units.minutes;"
+                                              labelplural="&calendar.global.units.minutes;"
+                                              labelsingular="&calendar.global.units.minute;"
+                                              value="minutes"
+                                              selected="true"/>
+                                    <menuitem id="tododefalarmunitmin"
+                                              label="&calendar.global.units.hours;"
+                                              labelplural="&calendar.global.units.hours;"
+                                              labelsingular="&calendar.global.units.hour;"
+                                              value="hours"/>
+                                    <menuitem id="tododefalarmunitmin"
+                                              label="&calendar.global.units.days;"
+                                              labelplural="&calendar.global.units.days;"
+                                              labelsingular="&calendar.global.units.day;"
+                                              value="days"/>
+                                </menupopup>
+                            </menulist>
+                        </hbox>
+                    </row>
+                </rows>
+            </grid>
+
+<!--
+            <hbox collapsed="true">
+                <caption label="&pref.defaultemail.label;"/>
+                <textbox id="alarmemailaddress"
+                         preference="calendar.alarms.emailaddress"
+                         flex="1"/>
+            </hbox>
+            <hbox collapsed="true">
+                <caption label="&pref.defaulttext.label;"/>
+                <textbox id="alarmtext"
+                         preference="calendar.alarm.text"
+                         flex="1"/>
+            </hbox>
+-->
+        </groupbox>
+
+        <separator/>
+
+    </prefpane>
+</overlay>
diff --git a/calendar/base/content/preferences/categories.js b/calendar/base/content/preferences/categories.js
new file mode 100644
index 000000000000..909c21df1afd
--- /dev/null
+++ b/calendar/base/content/preferences/categories.js
@@ -0,0 +1,241 @@
+/**
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Calendar Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mike Potter.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   ArentJan Banck <ajbanck@planet.nl>
+ *   Matthew Willis <mattwillis@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+var gCategoryList;
+var prefService = Components.classes["@mozilla.org/preferences-service;1"]
+                    .getService(Components.interfaces.nsIPrefService);
+var categoryPrefBranch = prefService.getBranch("calendar.category.color.");
+
+var gCategoriesPane = {
+
+    init: function () {
+        // On non-instant-apply platforms, once this pane has been loaded,
+        // attach our "revert all changes" function to the parent prefwindow's
+        // "ondialogcancel" event.
+        var parentPrefWindow = document.getElementById("CalendarPreferences");
+        if (!parentPrefWindow.instantApply) {
+            var existingOnDialogCancel = parentPrefWindow.getAttribute("ondialogcancel");
+            parentPrefWindow.setAttribute("ondialogcancel",
+                                          "gCategoriesPane.panelOnCancel(); " + 
+                                          existingOnDialogCancel);
+        }
+
+        // A list of preferences to be reverted when the dialog is cancelled.
+        // It needs to be a property of the parent to be visible onCancel
+        if (!parent.backupPrefList) {
+            parent.backupPrefList = [];
+        }
+
+        var categories = document.getElementById("categories").value;
+        gCategoryList = categories.split(",");
+        this.updateCategoryList();
+    },
+
+    updateCategoryList: function () {
+        gCategoryList.sort();
+        document.getElementById("categories").value = gCategoryList.join(",");
+        var listbox = document.getElementById("categorieslist");
+
+        listbox.clearSelection();
+        document.getElementById("editCButton").disabled = "true";
+        document.getElementById("deleteCButton").disabled = "true";
+
+        while (listbox.lastChild.id != "categoryColumns")
+            listbox.removeChild(listbox.lastChild);
+
+        for (var i=0; i < gCategoryList.length; i++) {
+            var newListItem = document.createElement("listitem");
+            var categoryName = document.createElement("listcell");
+            categoryName.setAttribute("id", gCategoryList[i]);
+            categoryName.setAttribute("label", gCategoryList[i]);
+            var categoryNameFix = this.fixName(gCategoryList[i]);
+            var categoryColor = document.createElement("listcell");
+            try {
+                var colorCode = categoryPrefBranch.getCharPref(categoryNameFix);
+                categoryColor.setAttribute("id", colorCode);
+                categoryColor.setAttribute("style","background-color: "+colorCode+';');
+            } catch (ex) {
+                categoryColor.setAttribute("label", noneLabel);
+            }
+ 
+            newListItem.appendChild(categoryName);
+            newListItem.appendChild(categoryColor);
+            listbox.appendChild(newListItem);
+        }
+    },
+
+    addCategory: function () {
+        var list = document.getElementById("categorieslist");
+        list.selectedIndex = -1;
+        document.getElementById("editCButton").disabled = "true";
+        document.getElementById("deleteCButton").disabled = "true";
+        window.openDialog("chrome://calendar/content/preferences/editCategory.xul",
+                          "addCategory", "modal,centerscreen,chrome,resizable=no",
+                          "", null, addTitle);
+    },
+
+    editCategory: function () {
+        var list = document.getElementById("categorieslist");
+        var categoryNameFix = this.fixName(gCategoryList[list.selectedIndex]);
+        try {
+            var currentColor = categoryPrefBranch.getCharPref(categoryNameFix);
+        } catch (ex) {
+            var currentColor = null;
+        }
+ 
+        if (list.selectedItem) {
+            window.openDialog("chrome://calendar/content/preferences/editCategory.xul",
+                              "editCategory", "modal,centerscreen,chrome,resizable=no",
+                              gCategoryList[list.selectedIndex], currentColor, editTitle);
+        }
+    },
+
+    deleteCategory: function () {
+        var list = document.getElementById("categorieslist");
+        if (list.selectedItem) {
+            var categoryNameFix = this.fixName(gCategoryList[list.selectedIndex]);
+            this.backupData(categoryNameFix);
+            try {
+                categoryPrefBranch.clearUserPref(categoryNameFix);
+            } catch (ex) {
+            }
+            gCategoryList.splice(list.selectedIndex, 1);
+            this.updateCategoryList();
+        }
+    },
+
+    saveCategory: function (categoryName, categoryColor) {
+        var list = document.getElementById("categorieslist");
+        // Check to make sure another category doesn't have the same name
+        var toBeDeleted = -1;
+        var promptService = 
+             Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                       .getService(Components.interfaces.nsIPromptService);
+        for (var i=0; i < gCategoryList.length; i++) {
+            if (i == list.selectedIndex)
+                continue;
+            if (categoryName.toLowerCase() == gCategoryList[i].toLowerCase()) {
+                if (promptService.confirm(null, overwriteTitle, overwrite)) {
+                    if (list.selectedIndex != -1)
+                        // Don't delete the old category yet. It will mess up indices.
+                        toBeDeleted = list.selectedIndex;
+                    list.selectedIndex = i;
+                } else {
+                    return;
+                }
+            }
+        }
+
+        if (categoryName.length == 0) {
+            promptService.alert(null, null, noBlankCategories);
+            return;
+        }
+
+        var categoryNameFix = this.fixName(categoryName);
+        if (list.selectedIndex == -1) {
+            this.backupData(categoryNameFix);
+            gCategoryList.push(categoryName);
+            if (categoryColor)
+                categoryPrefBranch.setCharPref(categoryNameFix, categoryColor);
+        } else {
+            this.backupData(categoryNameFix);
+            gCategoryList.splice(list.selectedIndex, 1, categoryName);
+            if (categoryColor) {
+                categoryPrefBranch.setCharPref(categoryNameFix, categoryColor);
+            } else {
+                try {
+                    categoryPrefBranch.clearUserPref(categoryNameFix);
+                } catch (ex) {
+                }
+            }
+        }
+
+       // If 'Overwrite' was chosen, delete category that was being edited
+       if (toBeDeleted != -1) {
+           list.selectedIndex = toBeDeleted;
+           this.deleteCategory();
+       }
+
+       this.updateCategoryList();
+
+    },
+
+    fixName: function (categoryName) {
+        var categoryNameFix = categoryName.toLowerCase();
+        categoryNameFix = categoryNameFix.replace(" ","_");
+        return categoryNameFix;
+    },
+
+    enableButtons: function () {
+        document.getElementById("editCButton").disabled=null;
+        document.getElementById("deleteCButton").disabled=null;
+    },
+
+    backupData: function (categoryNameFix) {
+        var currentColor;
+        try {
+            currentColor = categoryPrefBranch.getCharPref(categoryNameFix);
+        } catch (ex) {
+            currentColor="##NEW";
+        }
+
+        for (var i=0; i < parent.backupPrefList.length; i++) {
+            if (categoryNameFix == parent.backupPrefList[i].name)
+                return;
+        }
+        parent.backupPrefList[parent.backupPrefList.length] =
+            { name : categoryNameFix, color : currentColor };
+    },
+
+    panelOnCancel: function () {
+        for (var i=0; i < parent.backupPrefList.length; i++) {
+            if (parent.backupPrefList[i].color == "##NEW") {
+                try {
+                   categoryPrefBranch.clearUserPref(parent.backupPrefList[i].name);
+                } catch (ex) {
+                }
+            } else {
+                categoryPrefBranch.setCharPref(parent.backupPrefList[i].name,
+                                               parent.backupPrefList[i].color);
+            }
+        }
+    }
+
+};
diff --git a/calendar/base/content/preferences/categories.xul b/calendar/base/content/preferences/categories.xul
new file mode 100644
index 000000000000..43fc586ae85d
--- /dev/null
+++ b/calendar/base/content/preferences/categories.xul
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Calendar Preferences
+   -
+   - The Initial Developer of the Original Code is
+   - OEOne Corporation
+   - Portions created by the Initial Developer are Copyright (C) 2002
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Matthew Willis <mattwillis@gmail.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay [
+    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+    <!ENTITY % categoriesDTD SYSTEM "chrome://calendar/locale/preferences/categories.dtd">
+    <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+    <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
+    %brandDTD;
+    %categoriesDTD;
+    %globalDTD;
+    %preferencesDTD;
+]>
+
+<overlay id="CategoriesPaneOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <prefpane id="paneCategories"
+              onpaneload="gCategoriesPane.init();">
+        <script type="application/x-javascript"
+                src="chrome://calendar/content/preferences/categories.js"/>
+
+        <!-- Get the localized text for use in the .js -->
+        <script type="application/x-javascript">
+            var noneLabel  = "&pref.categories.none.label;";
+            var addTitle   = "&pref.categories.add.title;";
+            var editTitle  = "&pref.categories.edit.title;";
+            var overwrite  = "&pref.categories.overwrite;";
+            var overwriteTitle = "&pref.categories.overwrite.title;";
+            var noBlankCategories = "&pref.categories.noBlankCategories;";
+        </script>
+        
+        <preferences>
+            <preference id="calendar.categories.names"
+                        name="calendar.categories.names"
+                        type="string"/>
+        </preferences>
+
+        <groupbox id="categoriesBox">
+            <listbox id="categorieslist"
+                     flex="1"
+                     onselect="gCategoriesPane.enableButtons()">
+                <listhead>
+                    <listheader label="&pref.categories.name.label;"/>
+                    <listheader label="&pref.categories.color.label;"/>
+                </listhead>
+                <listcols id="categoryColumns">
+                    <listcol flex="3"/>
+                    <listcol flex="1"/>
+                </listcols>
+            </listbox>
+            <hbox pack="end">
+                <button label="&add.label;"
+                        oncommand="gCategoriesPane.addCategory()"/>
+                <button id="editCButton"
+                        label="&edit.label;"
+                        oncommand="gCategoriesPane.editCategory()"/>
+                <button id="deleteCButton"
+                        label="&remove.label;"
+                        oncommand="gCategoriesPane.deleteCategory()"/>
+            </hbox>
+            <textbox id="categories"
+                     preference="calendar.categories.names"
+                     hidden="true"/>
+
+        </groupbox>
+
+        <separator/>
+
+    </prefpane>
+</overlay>
diff --git a/calendar/base/content/preferences/connection.js b/calendar/base/content/preferences/connection.js
new file mode 100644
index 000000000000..8ab32f79e731
--- /dev/null
+++ b/calendar/base/content/preferences/connection.js
@@ -0,0 +1,205 @@
+/**
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Firefox Preferences System.
+ *
+ * The Initial Developer of the Original Code is
+ * Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+var gConnectionsDialog = {
+  beforeAccept: function ()
+  {
+    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", "gopher"];
+      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;
+  },
+  
+  proxyTypeChanged: function ()
+  {
+    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();
+  },
+
+  updateReloadButton: function ()
+  {
+    // 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.
+
+    var typedURL = document.getElementById("networkProxyAutoconfigURL").value;
+    var proxyTypeCur = document.getElementById("network.proxy.type").value;
+
+    var prefs =
+        Components.classes["@mozilla.org/preferences-service;1"].
+        getService(Components.interfaces.nsIPrefBranch);
+    var pacURL = prefs.getCharPref("network.proxy.autoconfig_url");
+    var proxyType = prefs.getIntPref("network.proxy.type");
+
+    var disableReloadPref =
+        document.getElementById("pref.advanced.proxies.disable_button.reload");
+    disableReloadPref.disabled =
+        (proxyTypeCur != 2 || proxyType != 2 || typedURL != pacURL);
+  },
+  
+  readProxyType: function ()
+  {
+    this.proxyTypeChanged();
+    return undefined;
+  },
+  
+  updateProtocolPrefs: function ()
+  {
+    var proxyTypePref = document.getElementById("network.proxy.type");
+    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
+    var proxyPrefs = ["ssl", "ftp", "socks", "gopher"];
+    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;
+  },
+  
+  readProxyProtocolPref: function (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;
+  },
+
+  reloadPAC: function ()
+  {
+    Components.classes["@mozilla.org/network/protocol-proxy-service;1"].
+        getService().reloadPAC();
+  },
+  
+  doAutoconfigURLFixup: function ()
+  {
+    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) {}
+  },
+  
+  readHTTPProxyServer: function ()
+  {
+    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
+    if (shareProxiesPref.value)
+      this.updateProtocolPrefs();
+    return undefined;
+  },
+  
+  readHTTPProxyPort: function ()
+  {
+    var shareProxiesPref = document.getElementById("network.proxy.share_proxy_settings");
+    if (shareProxiesPref.value)
+      this.updateProtocolPrefs();
+    return undefined;
+  }
+};
diff --git a/calendar/base/content/preferences/connection.xul b/calendar/base/content/preferences/connection.xul
new file mode 100644
index 000000000000..43d19e2f6083
--- /dev/null
+++ b/calendar/base/content/preferences/connection.xul
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is the Firefox Preferences System.
+   -
+   - The Initial Developer of the Original Code is
+   - Ben Goodger.
+   - Portions created by the Initial Developer are Copyright (C) 2005
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!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.gopher"       name="network.proxy.gopher"       type="string"/>
+      <preference id="network.proxy.gopher_port"  name="network.proxy.gopher_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"/>
+      <preference id="network.proxy.backup.gopher"       name="network.proxy.backup.gopher"       type="string"/>
+      <preference id="network.proxy.backup.gopher_port"  name="network.proxy.backup.gopher_port"  type="int"/>
+    </preferences>
+    
+    <script type="application/x-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"
+                         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"
+                         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"
+                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('ftp', true);"/>
+              </hbox>
+            </row>
+            <row align="center">
+              <hbox pack="end">
+                <label value="&gopher.label;" accesskey="&gopher.accesskey;" control="networkProxyGopher"/>
+              </hbox>
+              <hbox align="center">
+                <textbox id="networkProxyGopher" flex="1" preference="network.proxy.gopher"
+                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('gopher', false);"/>
+                <label value="&port.label;" accesskey="&gopherPort.accesskey;" control="networkProxyGopher_Port"/>
+                <textbox id="networkProxyGopher_Port" size="5" preference="network.proxy.gopher_port"
+                         onsyncfrompreference="return gConnectionsDialog.readProxyProtocolPref('gopher', 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"
+                         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>
diff --git a/calendar/base/content/preferences/editCategory.xul b/calendar/base/content/preferences/editCategory.xul
new file mode 100644
index 000000000000..7849629b6f4f
--- /dev/null
+++ b/calendar/base/content/preferences/editCategory.xul
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Calendar Code
+   -
+   - The Initial Developer of the Original Code is
+   - Joey Minta <jminta@gmail.com>
+   - Portions created by the Initial Developer are Copyright (C) 2005
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!-- DTD File with all strings specific to the file -->
+<!DOCTYPE page
+[
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/prefs.dtd" > %dtd1;
+    <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd2;
+]>
+
+<dialog id="editCategory"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        buttons="accept,cancel"
+        onload="editCategoryLoad();"
+        ondialogaccept="return doOK();">
+
+<script type="application/x-javascript">
+ <![CDATA[
+   var oldColor="#000000";
+   function editCategoryLoad()
+   {
+     document.getElementById("categoryName").value = window.arguments[0];
+     document.getElementById("categoryColor").color = window.arguments[1];
+     document.title = window.arguments[2];
+     if(window.arguments[1])
+        document.getElementById("useColor").checked = true;
+   }
+
+   function toggleColor()
+   {
+      if(document.getElementById("useColor").checked)
+         document.getElementById("categoryColor").color = oldColor;
+      else {
+         oldColor = document.getElementById("categoryColor").color;
+         document.getElementById("categoryColor").color=null;
+      }
+   }
+
+   function doOK()
+   {
+      window.opener.gCategoriesPane.saveCategory(document.getElementById
+        ("categoryName").value,document.getElementById("categoryColor").color);
+   }
+ ]]>
+</script>
+
+<!-- dialog-box: from dialogOverlay.xul -->
+  <vbox id="dialog-box">
+     <hbox>
+        <label value="&pref.categories.name.label;"/>
+        <textbox id="categoryName"/>
+     </hbox>
+     <hbox id="row2" pack="center">
+        <checkbox id="useColor"
+                  label="&pref.categories.usecolor.label;"
+                  oncommand="toggleColor()"/>
+        <colorpicker id="categoryColor"
+                 type="button"
+                 onchange="document.getElementById('useColor').checked=true;"/>
+     </hbox>
+  </vbox>
+</dialog>
diff --git a/calendar/base/content/preferences/general.js b/calendar/base/content/preferences/general.js
new file mode 100644
index 000000000000..3bbe484f9cb6
--- /dev/null
+++ b/calendar/base/content/preferences/general.js
@@ -0,0 +1,68 @@
+/**
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Firefox Preferences System.
+ *
+ * The Initial Developer of the Original Code is
+ * Ben Goodger.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Asaf Romano <mozilla.mano@sent.com>
+ *   Matthew Willis <mattwillis@gmail.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+var gGeneralPane = {
+
+    init: function () {
+        var df = Components.classes["@mozilla.org/calendar/datetime-formatter;1"]
+                    .getService(Components.interfaces.calIDateTimeFormatter);
+
+        var dateFormattedLong  = df.formatDateLong(now());
+        var dateFormattedShort = df.formatDateShort(now());
+
+        // menu items include examples of current date formats.
+        document.getElementById("dateformat-long-menuitem")
+                .setAttribute("label", labelLong + ": " + dateFormattedLong);
+        document.getElementById("dateformat-short-menuitem")
+                .setAttribute("label", labelShort + ": " + dateFormattedShort);
+
+        // deselect and reselect to update visible item title
+        var dateFormatMenuList = document.getElementById("dateformat");
+        var selectedIndex = dateFormatMenuList.selectedIndex;
+        dateFormatMenuList.selectedIndex = -1;
+        dateFormatMenuList.selectedIndex = selectedIndex;
+    },
+
+    showConnections: function () {
+        var url = "chrome://calendar/content/preferences/connection.xul";
+        document.documentElement.openSubDialog(url, "", "chrome,dialog");
+    }
+
+};
diff --git a/calendar/base/content/preferences/general.xul b/calendar/base/content/preferences/general.xul
new file mode 100644
index 000000000000..2626466a9c37
--- /dev/null
+++ b/calendar/base/content/preferences/general.xul
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Calendar Preferences
+   -
+   - The Initial Developer of the Original Code is
+   - Matthew Willis
+   - Portions created by the Initial Developer are Copyright (C) 2006
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay [
+    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+    <!ENTITY % generalDTD SYSTEM "chrome://calendar/locale/preferences/general.dtd">
+    <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+    <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
+#ifdef MOZ_SUNBIRD
+    <!ENTITY % connectionDTD SYSTEM "chrome://calendar/locale/preferences/connection.dtd">
+    %connectionDTD;
+#endif
+    %brandDTD;
+    %generalDTD;
+    %globalDTD;
+    %preferencesDTD;
+]>
+
+<overlay id="GeneralPaneOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <prefpane id="paneGeneral" onpaneload="gGeneralPane.init();">
+        <script type="application/x-javascript"
+                src="chrome://calendar/content/preferences/general.js"/>
+        <script type="application/x-javascript"
+                src="chrome://calendar/content/calendarUtils.js"/>
+
+        <!-- Get the localized text for use in the .js -->
+        <script type="application/x-javascript">
+            var labelLong  = "&pref.dateformat.long;";
+            var labelShort = "&pref.dateformat.short;";
+        </script>
+
+        <preferences>
+            <preference id="calendar.date.format"
+                        name="calendar.date.format"
+                        type="int"/>
+            <preference id="calendar.event.defaultlength"
+                        name="calendar.event.defaultlength"
+                        type="int"/>
+            <preference id="calendar.alarms.defaultsnoozelength"
+                        name="calendar.alarms.defaultsnoozelength"
+                        type="int"/>
+        </preferences>
+
+        <groupbox>
+            <caption label="&pref.mainbox.label;"/>
+            <hbox align="center">
+                <label value="&pref.dateformat.label;"/>
+                <menulist id="dateformat" crop="none"
+                          preference="calendar.date.format">
+                    <menupopup id="dateformat">
+                        <menuitem id="dateformat-long-menuitem"
+                                  label="&pref.dateformat.long;"
+                                  value="0"/>
+                        <menuitem id="dateformat-short-menuitem"
+                                  label="&pref.dateformat.short;"
+                                  value="1"/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+
+            <hbox align="center">
+                <label value="&pref.defaultlength.label;"/>
+                <textbox id="defaultlength"
+                         preference="calendar.event.defaultlength"
+                         maxlength="3"
+                         size="3"/>
+                <label value="&calendar.global.units.minutes;"/>
+            </hbox>
+
+            <hbox align="center">
+                <label value="&pref.defaultsnoozelength.label;"/>
+                <textbox id="defaultsnoozelength"
+                         preference="calendar.alarms.defaultsnoozelength"
+                         maxlength="3"
+                         size="3"/>
+                <label value="&calendar.global.units.minutes;"/>
+            </hbox>
+
+        </groupbox>
+
+#ifdef MOZ_SUNBIRD
+        <groupbox>
+            <caption label="&pref.connectionsInfo.caption;"/>
+            <hbox align="center">
+                <caption flex="1" label="&pref.proxiesInfo.label;"/>
+                <button id="catProxiesButton"
+                        label="&pref.showConnections.label;"
+                        accesskey="&pref.showConnections.accesskey;"
+                        oncommand="gGeneralPane.showConnections();"/>
+            </hbox>
+        </groupbox>
+#endif
+
+        <separator/>
+
+    </prefpane>
+</overlay>
diff --git a/calendar/base/content/preferences/preferences.xul b/calendar/base/content/preferences/preferences.xul
new file mode 100644
index 000000000000..4ccae2d874c0
--- /dev/null
+++ b/calendar/base/content/preferences/preferences.xul
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is the Firefox Preferences System.
+   -
+   - The Initial Developer of the Original Code is
+   - Ben Goodger.
+   - Portions created by the Initial Developer are Copyright (C) 2005
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Matthew Willis <mattwillis@gmail.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://global/skin/global.css"?>
+<?xml-stylesheet href="chrome://mozapps/content/preferences/preferences.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
+
+    <stringbundle id="bundlePreferences"
+                  src="chrome://calendar/locale/calendar.properties"/>
+
+    <prefpane id="paneGeneral"
+              label="&paneGeneral.title;"
+              src="chrome://calendar/content/preferences/general.xul"/>
+    <prefpane id="paneAlarms"
+              label="&paneAlarms.title;"
+              src="chrome://calendar/content/preferences/alarms.xul"/>
+    <prefpane id="paneCategories"
+              label="&paneCategories.title;"
+              src="chrome://calendar/content/preferences/categories.xul"/>
+    <prefpane id="paneViews"
+              label="&paneViews.title;"
+              src="chrome://calendar/content/preferences/views.xul"/>
+    <prefpane id="paneTimezones"
+              label="&paneTimezones.title;"
+              src="chrome://calendar/content/preferences/timezones.xul"/>
+
+</prefwindow>
diff --git a/calendar/base/content/preferences/timezones.js b/calendar/base/content/preferences/timezones.js
new file mode 100644
index 000000000000..c5b6047bbd38
--- /dev/null
+++ b/calendar/base/content/preferences/timezones.js
@@ -0,0 +1,67 @@
+/**
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Oracle Corporation code
+ *
+ * The Initial Developer of the Original Code is
+ * Oracle Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Stuart Parmenter <stuart.parmenter@oracle.com>
+ *   Simon Paquet <bugzilla@babylonsounds.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
+var gTimezonesPane = {
+    init: function () {
+        var tzMenuList = document.getElementById("calendar.timezone.menulist");
+        prefValue = document.getElementById("calendar.timezone.local").value;
+        
+        if (!prefValue) {
+            prefValue = calendarDefaultTimezone();
+            tzMenuList.value = prefValue;
+        }
+    },
+
+    getTimezoneResult: function() {
+        var tzMenuList = document.getElementById("calendar.timezone.menulist");
+        if (tzMenuList.selectedItem != null) {
+            var value = tzMenuList.value
+            return value;
+        }
+        return undefined;
+    },
+
+    setTimezone: function() {
+        var prefValue = document.getElementById("calendar.timezone.local").value;
+        var tzMenuList = document.getElementById("calendar.timezone.menulist");
+        
+        prefValue = tzMenuList.value;
+    }
+};
diff --git a/calendar/base/content/preferences/timezones.xul b/calendar/base/content/preferences/timezones.xul
new file mode 100644
index 000000000000..997039c48ede
--- /dev/null
+++ b/calendar/base/content/preferences/timezones.xul
@@ -0,0 +1,826 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Lightning Preferences
+   -
+   - The Initial Developer of the Original Code is
+   - Oracle Corporation
+   - Portions created by the Initial Developer are Copyright (C) 2005
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Stuart Parmenter <stuart.parmenter@oracle.com>
+   -   Matthew Willis <mattwillis@gmail.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay [
+    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+    <!ENTITY % timezonesDTD SYSTEM "chrome://calendar/locale/preferences/timezones.dtd">
+    <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+    <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
+    %brandDTD;
+    %timezonesDTD;
+    %globalDTD;
+    %preferencesDTD;
+]>
+
+<overlay id="TimezonesPaneOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <prefpane id="paneTimezones" onpaneload="gTimezonesPane.init();">
+        <script type="application/x-javascript"
+                src="chrome://calendar/content/preferences/timezones.js"/>
+        <script type="application/x-javascript"
+                src="chrome://calendar/content/calendarUtils.js"/>
+
+        <preferences>
+            <preference id="calendar.timezone.local"
+                        name="calendar.timezone.local"
+                        type="string"/>
+        </preferences>
+
+        <caption label="&pref.calendar.timezones.list.caption;"/>
+
+        <menulist id="calendar.timezone.menulist"
+                  preference="calendar.timezone.local"
+                  onselect="document.getElementById('paneTimezones').userChangedValue(event.target);"
+                  onsynctopreference="return gTimezonesPane.getTimezoneResult();"
+                  onsyncfrompreference="gTimezonesPane.setTimezone();">
+            <menupopup>
+                <menuitem label="&pref.timezone.Africa.Abidjan;"
+                          value="/mozilla.org/20050126_1/Africa/Abidjan"/>
+                <menuitem label="&pref.timezone.Africa.Accra;"
+                          value="/mozilla.org/20050126_1/Africa/Accra"/>
+                <menuitem label="&pref.timezone.Africa.Addis_Ababa;"
+                          value="/mozilla.org/20050126_1/Africa/Addis_Ababa"/>
+                <menuitem label="&pref.timezone.Africa.Algiers;"
+                          value="/mozilla.org/20050126_1/Africa/Algiers"/>
+                <menuitem label="&pref.timezone.Africa.Asmera;"
+                          value="/mozilla.org/20050126_1/Africa/Asmera"/>
+                <menuitem label="&pref.timezone.Africa.Bamako;"
+                          value="/mozilla.org/20050126_1/Africa/Bamako"/>
+                <menuitem label="&pref.timezone.Africa.Bangui;"
+                          value="/mozilla.org/20050126_1/Africa/Bangui"/>
+                <menuitem label="&pref.timezone.Africa.Banjul;"
+                          value="/mozilla.org/20050126_1/Africa/Banjul"/>
+                <menuitem label="&pref.timezone.Africa.Bissau;"
+                          value="/mozilla.org/20050126_1/Africa/Bissau"/>
+                <menuitem label="&pref.timezone.Africa.Blantyre;"
+                          value="/mozilla.org/20050126_1/Africa/Blantyre"/>
+                <menuitem label="&pref.timezone.Africa.Brazzaville;"
+                          value="/mozilla.org/20050126_1/Africa/Brazzaville"/>
+                <menuitem label="&pref.timezone.Africa.Bujumbura;"
+                          value="/mozilla.org/20050126_1/Africa/Bujumbura"/>
+                <menuitem label="&pref.timezone.Africa.Cairo;"
+                          value="/mozilla.org/20050126_1/Africa/Cairo"/>
+                <menuitem label="&pref.timezone.Africa.Casablanca;"
+                          value="/mozilla.org/20050126_1/Africa/Casablanca"/>
+                <menuitem label="&pref.timezone.Africa.Ceuta;"
+                          value="/mozilla.org/20050126_1/Africa/Ceuta"/>
+                <menuitem label="&pref.timezone.Africa.Conakry;"
+                          value="/mozilla.org/20050126_1/Africa/Conakry"/>
+                <menuitem label="&pref.timezone.Africa.Dakar;"
+                          value="/mozilla.org/20050126_1/Africa/Dakar"/>
+                <menuitem label="&pref.timezone.Africa.Dar_es_Salaam;"
+                          value="/mozilla.org/20050126_1/Africa/Dar_es_Salaam"/>
+                <menuitem label="&pref.timezone.Africa.Djibouti;"
+                          value="/mozilla.org/20050126_1/Africa/Djibouti"/>
+                <menuitem label="&pref.timezone.Africa.Douala;"
+                          value="/mozilla.org/20050126_1/Africa/Douala"/>
+                <menuitem label="&pref.timezone.Africa.El_Aaiun;"
+                          value="/mozilla.org/20050126_1/Africa/El_Aaiun"/>
+                <menuitem label="&pref.timezone.Africa.Freetown;"
+                          value="/mozilla.org/20050126_1/Africa/Freetown"/>
+                <menuitem label="&pref.timezone.Africa.Gaborone;"
+                          value="/mozilla.org/20050126_1/Africa/Gaborone"/>
+                <menuitem label="&pref.timezone.Africa.Harare;"
+                          value="/mozilla.org/20050126_1/Africa/Harare"/>
+                <menuitem label="&pref.timezone.Africa.Johannesburg;"
+                          value="/mozilla.org/20050126_1/Africa/Johannesburg"/>
+                <menuitem label="&pref.timezone.Africa.Kampala;"
+                          value="/mozilla.org/20050126_1/Africa/Kampala"/>
+                <menuitem label="&pref.timezone.Africa.Khartoum;"
+                          value="/mozilla.org/20050126_1/Africa/Khartoum"/>
+                <menuitem label="&pref.timezone.Africa.Kigali;"
+                          value="/mozilla.org/20050126_1/Africa/Kigali"/>
+                <menuitem label="&pref.timezone.Africa.Kinshasa;"
+                          value="/mozilla.org/20050126_1/Africa/Kinshasa"/>
+                <menuitem label="&pref.timezone.Africa.Lagos;"
+                          value="/mozilla.org/20050126_1/Africa/Lagos"/>
+                <menuitem label="&pref.timezone.Africa.Libreville;"
+                          value="/mozilla.org/20050126_1/Africa/Libreville"/>
+                <menuitem label="&pref.timezone.Africa.Lome;"
+                          value="/mozilla.org/20050126_1/Africa/Lome"/>
+                <menuitem label="&pref.timezone.Africa.Luanda;"
+                          value="/mozilla.org/20050126_1/Africa/Luanda"/>
+                <menuitem label="&pref.timezone.Africa.Lubumbashi;"
+                          value="/mozilla.org/20050126_1/Africa/Lubumbashi"/>
+                <menuitem label="&pref.timezone.Africa.Lusaka;"
+                          value="/mozilla.org/20050126_1/Africa/Lusaka"/>
+                <menuitem label="&pref.timezone.Africa.Malabo;"
+                          value="/mozilla.org/20050126_1/Africa/Malabo"/>
+                <menuitem label="&pref.timezone.Africa.Maputo;"
+                          value="/mozilla.org/20050126_1/Africa/Maputo"/>
+                <menuitem label="&pref.timezone.Africa.Maseru;"
+                          value="/mozilla.org/20050126_1/Africa/Maseru"/>
+                <menuitem label="&pref.timezone.Africa.Mbabane;"
+                          value="/mozilla.org/20050126_1/Africa/Mbabane"/>
+                <menuitem label="&pref.timezone.Africa.Mogadishu;"
+                          value="/mozilla.org/20050126_1/Africa/Mogadishu"/>
+                <menuitem label="&pref.timezone.Africa.Monrovia;"
+                          value="/mozilla.org/20050126_1/Africa/Monrovia"/>
+                <menuitem label="&pref.timezone.Africa.Nairobi;"
+                          value="/mozilla.org/20050126_1/Africa/Nairobi"/>
+                <menuitem label="&pref.timezone.Africa.Ndjamena;"
+                          value="/mozilla.org/20050126_1/Africa/Ndjamena"/>
+                <menuitem label="&pref.timezone.Africa.Niamey;"
+                          value="/mozilla.org/20050126_1/Africa/Niamey"/>
+                <menuitem label="&pref.timezone.Africa.Nouakchott;"
+                          value="/mozilla.org/20050126_1/Africa/Nouakchott"/>
+                <menuitem label="&pref.timezone.Africa.Ouagadougou;"
+                          value="/mozilla.org/20050126_1/Africa/Ouagadougou"/>
+                <menuitem label="&pref.timezone.Africa.Porto-Novo;"
+                          value="/mozilla.org/20050126_1/Africa/Porto-Novo"/>
+                <menuitem label="&pref.timezone.Africa.Sao_Tome;"
+                          value="/mozilla.org/20050126_1/Africa/Sao_Tome"/>
+                <menuitem label="&pref.timezone.Africa.Timbuktu;"
+                          value="/mozilla.org/20050126_1/Africa/Timbuktu"/>
+                <menuitem label="&pref.timezone.Africa.Tripoli;"
+                          value="/mozilla.org/20050126_1/Africa/Tripoli"/>
+                <menuitem label="&pref.timezone.Africa.Tunis;"
+                          value="/mozilla.org/20050126_1/Africa/Tunis"/>
+                <menuitem label="&pref.timezone.Africa.Windhoek;"
+                          value="/mozilla.org/20050126_1/Africa/Windhoek"/>
+                <menuitem label="&pref.timezone.America.Adak;"
+                          value="/mozilla.org/20050126_1/America/Adak"/>
+                <menuitem label="&pref.timezone.America.Anchorage;"
+                          value="/mozilla.org/20050126_1/America/Anchorage"/>
+                <menuitem label="&pref.timezone.America.Anguilla;"
+                          value="/mozilla.org/20050126_1/America/Anguilla"/>
+                <menuitem label="&pref.timezone.America.Antigua;"
+                          value="/mozilla.org/20050126_1/America/Antigua"/>
+                <menuitem label="&pref.timezone.America.Araguaina;"
+                          value="/mozilla.org/20050126_1/America/Araguaina"/>
+                <menuitem label="&pref.timezone.America.Aruba;"
+                          value="/mozilla.org/20050126_1/America/Aruba"/>
+                <menuitem label="&pref.timezone.America.Asuncion;"
+                          value="/mozilla.org/20050126_1/America/Asuncion"/>
+                <menuitem label="&pref.timezone.America.Barbados;"
+                          value="/mozilla.org/20050126_1/America/Barbados"/>
+                <menuitem label="&pref.timezone.America.Belem;"
+                          value="/mozilla.org/20050126_1/America/Belem"/>
+                <menuitem label="&pref.timezone.America.Belize;"
+                          value="/mozilla.org/20050126_1/America/Belize"/>
+                <menuitem label="&pref.timezone.America.Boa_Vista;"
+                          value="/mozilla.org/20050126_1/America/Boa_Vista"/>
+                <menuitem label="&pref.timezone.America.Bogota;"
+                          value="/mozilla.org/20050126_1/America/Bogota"/>
+                <menuitem label="&pref.timezone.America.Boise;"
+                          value="/mozilla.org/20050126_1/America/Boise"/>
+                <menuitem label="&pref.timezone.America.Buenos_Aires;"
+                          value="/mozilla.org/20050126_1/America/Buenos_Aires"/>
+                <menuitem label="&pref.timezone.America.Cambridge_Bay;"
+                          value="/mozilla.org/20050126_1/America/Cambridge_Bay"/>
+                <menuitem label="&pref.timezone.America.Cancun;"
+                          value="/mozilla.org/20050126_1/America/Cancun"/>
+                <menuitem label="&pref.timezone.America.Caracas;"
+                          value="/mozilla.org/20050126_1/America/Caracas"/>
+                <menuitem label="&pref.timezone.America.Catamarca;"
+                          value="/mozilla.org/20050126_1/America/Catamarca"/>
+                <menuitem label="&pref.timezone.America.Cayenne;"
+                          value="/mozilla.org/20050126_1/America/Cayenne"/>
+                <menuitem label="&pref.timezone.America.Cayman;"
+                          value="/mozilla.org/20050126_1/America/Cayman"/>
+                <menuitem label="&pref.timezone.America.Chicago;"
+                          value="/mozilla.org/20050126_1/America/Chicago"/>
+                <menuitem label="&pref.timezone.America.Chihuahua;"
+                          value="/mozilla.org/20050126_1/America/Chihuahua"/>
+                <menuitem label="&pref.timezone.America.Cordoba;"
+                          value="/mozilla.org/20050126_1/America/Cordoba"/>
+                <menuitem label="&pref.timezone.America.Costa_Rica;"
+                          value="/mozilla.org/20050126_1/America/Costa_Rica"/>
+                <menuitem label="&pref.timezone.America.Cuiaba;"
+                          value="/mozilla.org/20050126_1/America/Cuiaba"/>
+                <menuitem label="&pref.timezone.America.Curacao;"
+                          value="/mozilla.org/20050126_1/America/Curacao"/>
+                <menuitem label="&pref.timezone.America.Dawson;"
+                          value="/mozilla.org/20050126_1/America/Dawson"/>
+                <menuitem label="&pref.timezone.America.Dawson_Creek;"
+                          value="/mozilla.org/20050126_1/America/Dawson_Creek"/>
+                <menuitem label="&pref.timezone.America.Denver;"
+                          value="/mozilla.org/20050126_1/America/Denver"/>
+                <menuitem label="&pref.timezone.America.Detroit;"
+                          value="/mozilla.org/20050126_1/America/Detroit"/>
+                <menuitem label="&pref.timezone.America.Dominica;"
+                          value="/mozilla.org/20050126_1/America/Dominica"/>
+                <menuitem label="&pref.timezone.America.Edmonton;"
+                          value="/mozilla.org/20050126_1/America/Edmonton"/>
+                <menuitem label="&pref.timezone.America.Eirunepe;"
+                          value="/mozilla.org/20050126_1/America/Eirunepe"/>
+                <menuitem label="&pref.timezone.America.El_Salvador;"
+                          value="/mozilla.org/20050126_1/America/El_Salvador"/>
+                <menuitem label="&pref.timezone.America.Fortaleza;"
+                          value="/mozilla.org/20050126_1/America/Fortaleza"/>
+                <menuitem label="&pref.timezone.America.Glace_Bay;"
+                          value="/mozilla.org/20050126_1/America/Glace_Bay"/>
+                <menuitem label="&pref.timezone.America.Godthab;"
+                          value="/mozilla.org/20050126_1/America/Godthab"/>
+                <menuitem label="&pref.timezone.America.Goose_Bay;"
+                          value="/mozilla.org/20050126_1/America/Goose_Bay"/>
+                <menuitem label="&pref.timezone.America.Grand_Turk;"
+                          value="/mozilla.org/20050126_1/America/Grand_Turk"/>
+                <menuitem label="&pref.timezone.America.Grenada;"
+                          value="/mozilla.org/20050126_1/America/Grenada"/>
+                <menuitem label="&pref.timezone.America.Guadeloupe;"
+                          value="/mozilla.org/20050126_1/America/Guadeloupe"/>
+                <menuitem label="&pref.timezone.America.Guatemala;"
+                          value="/mozilla.org/20050126_1/America/Guatemala"/>
+                <menuitem label="&pref.timezone.America.Guayaquil;"
+                          value="/mozilla.org/20050126_1/America/Guayaquil"/>
+                <menuitem label="&pref.timezone.America.Guyana;"
+                          value="/mozilla.org/20050126_1/America/Guyana"/>
+                <menuitem label="&pref.timezone.America.Halifax;"
+                          value="/mozilla.org/20050126_1/America/Halifax"/>
+                <menuitem label="&pref.timezone.America.Havana;"
+                          value="/mozilla.org/20050126_1/America/Havana"/>
+                <menuitem label="&pref.timezone.America.Hermosillo;"
+                          value="/mozilla.org/20050126_1/America/Hermosillo"/>
+                <menuitem label="&pref.timezone.America.Indiana.Indianapolis;"
+                          value="/mozilla.org/20050126_1/America/Indiana/Indianapolis"/>
+                <menuitem label="&pref.timezone.America.Indiana.Knox;"
+                          value="/mozilla.org/20050126_1/America/Indiana/Knox"/>
+                <menuitem label="&pref.timezone.America.Indiana.Marengo;"
+                          value="/mozilla.org/20050126_1/America/Indiana/Marengo"/>
+                <menuitem label="&pref.timezone.America.Indiana.Vevay;"
+                          value="/mozilla.org/20050126_1/America/Indiana/Vevay"/>
+                <menuitem label="&pref.timezone.America.Indianapolis;"
+                          value="/mozilla.org/20050126_1/America/Indianapolis"/>
+                <menuitem label="&pref.timezone.America.Inuvik;"
+                          value="/mozilla.org/20050126_1/America/Inuvik"/>
+                <menuitem label="&pref.timezone.America.Iqaluit;"
+                          value="/mozilla.org/20050126_1/America/Iqaluit"/>
+                <menuitem label="&pref.timezone.America.Jamaica;"
+                          value="/mozilla.org/20050126_1/America/Jamaica"/>
+                <menuitem label="&pref.timezone.America.Jujuy;"
+                          value="/mozilla.org/20050126_1/America/Jujuy"/>
+                <menuitem label="&pref.timezone.America.Juneau;"
+                          value="/mozilla.org/20050126_1/America/Juneau"/>
+                <menuitem label="&pref.timezone.America.Kentucky.Louisville;"
+                          value="/mozilla.org/20050126_1/America/Kentucky/Louisville"/>
+                <menuitem label="&pref.timezone.America.Kentucky.Monticello;"
+                          value="/mozilla.org/20050126_1/America/Kentucky/Monticello"/>
+                <menuitem label="&pref.timezone.America.La_Paz;"
+                          value="/mozilla.org/20050126_1/America/La_Paz"/>
+                <menuitem label="&pref.timezone.America.Lima;"
+                          value="/mozilla.org/20050126_1/America/Lima"/>
+                <menuitem label="&pref.timezone.America.Los_Angeles;"
+                          value="/mozilla.org/20050126_1/America/Los_Angeles"/>
+                <menuitem label="&pref.timezone.America.Louisville;"
+                          value="/mozilla.org/20050126_1/America/Louisville"/>
+                <menuitem label="&pref.timezone.America.Maceio;"
+                          value="/mozilla.org/20050126_1/America/Maceio"/>
+                <menuitem label="&pref.timezone.America.Managua;"
+                          value="/mozilla.org/20050126_1/America/Managua"/>
+                <menuitem label="&pref.timezone.America.Manaus;"
+                          value="/mozilla.org/20050126_1/America/Manaus"/>
+                <menuitem label="&pref.timezone.America.Martinique;"
+                          value="/mozilla.org/20050126_1/America/Martinique"/>
+                <menuitem label="&pref.timezone.America.Mazatlan;"
+                          value="/mozilla.org/20050126_1/America/Mazatlan"/>
+                <menuitem label="&pref.timezone.America.Mendoza;"
+                          value="/mozilla.org/20050126_1/America/Mendoza"/>
+                <menuitem label="&pref.timezone.America.Menominee;"
+                          value="/mozilla.org/20050126_1/America/Menominee"/>
+                <menuitem label="&pref.timezone.America.Merida;"
+                          value="/mozilla.org/20050126_1/America/Merida"/>
+                <menuitem label="&pref.timezone.America.Mexico_City;"
+                          value="/mozilla.org/20050126_1/America/Mexico_City"/>
+                <menuitem label="&pref.timezone.America.Miquelon;"
+                          value="/mozilla.org/20050126_1/America/Miquelon"/>
+                <menuitem label="&pref.timezone.America.Monterrey;"
+                          value="/mozilla.org/20050126_1/America/Monterrey"/>
+                <menuitem label="&pref.timezone.America.Montevideo;"
+                          value="/mozilla.org/20050126_1/America/Montevideo"/>
+                <menuitem label="&pref.timezone.America.Montreal;"
+                          value="/mozilla.org/20050126_1/America/Montreal"/>
+                <menuitem label="&pref.timezone.America.Montserrat;"
+                          value="/mozilla.org/20050126_1/America/Montserrat"/>
+                <menuitem label="&pref.timezone.America.Nassau;"
+                          value="/mozilla.org/20050126_1/America/Nassau"/>
+                <menuitem label="&pref.timezone.America.New_York;"
+                          value="/mozilla.org/20050126_1/America/New_York"/>
+                <menuitem label="&pref.timezone.America.Nipigon;"
+                          value="/mozilla.org/20050126_1/America/Nipigon"/>
+                <menuitem label="&pref.timezone.America.Nome;"
+                          value="/mozilla.org/20050126_1/America/Nome"/>
+                <menuitem label="&pref.timezone.America.Noronha;"
+                          value="/mozilla.org/20050126_1/America/Noronha"/>
+                <menuitem label="&pref.timezone.America.Panama;"
+                          value="/mozilla.org/20050126_1/America/Panama"/>
+                <menuitem label="&pref.timezone.America.Pangnirtung;"
+                          value="/mozilla.org/20050126_1/America/Pangnirtung"/>
+                <menuitem label="&pref.timezone.America.Paramaribo;"
+                          value="/mozilla.org/20050126_1/America/Paramaribo"/>
+                <menuitem label="&pref.timezone.America.Phoenix;"
+                          value="/mozilla.org/20050126_1/America/Phoenix"/>
+                <menuitem label="&pref.timezone.America.Port-au-Prince;"
+                          value="/mozilla.org/20050126_1/America/Port-au-Prince"/>
+                <menuitem label="&pref.timezone.America.Port_of_Spain;"
+                          value="/mozilla.org/20050126_1/America/Port_of_Spain"/>
+                <menuitem label="&pref.timezone.America.Porto_Velho;"
+                          value="/mozilla.org/20050126_1/America/Porto_Velho"/>
+                <menuitem label="&pref.timezone.America.Puerto_Rico;"
+                          value="/mozilla.org/20050126_1/America/Puerto_Rico"/>
+                <menuitem label="&pref.timezone.America.Rainy_River;"
+                          value="/mozilla.org/20050126_1/America/Rainy_River"/>
+                <menuitem label="&pref.timezone.America.Rankin_Inlet;"
+                          value="/mozilla.org/20050126_1/America/Rankin_Inlet"/>
+                <menuitem label="&pref.timezone.America.Recife;"
+                          value="/mozilla.org/20050126_1/America/Recife"/>
+                <menuitem label="&pref.timezone.America.Regina;"
+                          value="/mozilla.org/20050126_1/America/Regina"/>
+                <menuitem label="&pref.timezone.America.Rio_Branco;"
+                          value="/mozilla.org/20050126_1/America/Rio_Branco"/>
+                <menuitem label="&pref.timezone.America.Rosario;"
+                          value="/mozilla.org/20050126_1/America/Rosario"/>
+                <menuitem label="&pref.timezone.America.Santiago;"
+                          value="/mozilla.org/20050126_1/America/Santiago"/>
+                <menuitem label="&pref.timezone.America.Santo_Domingo;"
+                          value="/mozilla.org/20050126_1/America/Santo_Domingo"/>
+                <menuitem label="&pref.timezone.America.Sao_Paulo;"
+                          value="/mozilla.org/20050126_1/America/Sao_Paulo"/>
+                <menuitem label="&pref.timezone.America.Scoresbysund;"
+                          value="/mozilla.org/20050126_1/America/Scoresbysund"/>
+                <menuitem label="&pref.timezone.America.Shiprock;"
+                          value="/mozilla.org/20050126_1/America/Shiprock"/>
+                <menuitem label="&pref.timezone.America.St_Johns;"
+                          value="/mozilla.org/20050126_1/America/St_Johns"/>
+                <menuitem label="&pref.timezone.America.St_Kitts;"
+                          value="/mozilla.org/20050126_1/America/St_Kitts"/>
+                <menuitem label="&pref.timezone.America.St_Lucia;"
+                          value="/mozilla.org/20050126_1/America/St_Lucia"/>
+                <menuitem label="&pref.timezone.America.St_Thomas;"
+                          value="/mozilla.org/20050126_1/America/St_Thomas"/>
+                <menuitem label="&pref.timezone.America.St_Vincent;"
+                          value="/mozilla.org/20050126_1/America/St_Vincent"/>
+                <menuitem label="&pref.timezone.America.Swift_Current;"
+                          value="/mozilla.org/20050126_1/America/Swift_Current"/>
+                <menuitem label="&pref.timezone.America.Tegucigalpa;"
+                          value="/mozilla.org/20050126_1/America/Tegucigalpa"/>
+                <menuitem label="&pref.timezone.America.Thule;"
+                          value="/mozilla.org/20050126_1/America/Thule"/>
+                <menuitem label="&pref.timezone.America.Thunder_Bay;"
+                          value="/mozilla.org/20050126_1/America/Thunder_Bay"/>
+                <menuitem label="&pref.timezone.America.Tijuana;"
+                          value="/mozilla.org/20050126_1/America/Tijuana"/>
+                <menuitem label="&pref.timezone.America.Tortola;"
+                          value="/mozilla.org/20050126_1/America/Tortola"/>
+                <menuitem label="&pref.timezone.America.Vancouver;"
+                          value="/mozilla.org/20050126_1/America/Vancouver"/>
+                <menuitem label="&pref.timezone.America.Whitehorse;"
+                          value="/mozilla.org/20050126_1/America/Whitehorse"/>
+                <menuitem label="&pref.timezone.America.Winnipeg;"
+                          value="/mozilla.org/20050126_1/America/Winnipeg"/>
+                <menuitem label="&pref.timezone.America.Yakutat;"
+                          value="/mozilla.org/20050126_1/America/Yakutat"/>
+                <menuitem label="&pref.timezone.America.Yellowknife;"
+                          value="/mozilla.org/20050126_1/America/Yellowknife"/>
+                <menuitem label="&pref.timezone.Antarctica.Casey;"
+                          value="/mozilla.org/20050126_1/Antarctica/Casey"/>
+                <menuitem label="&pref.timezone.Antarctica.Davis;"
+                          value="/mozilla.org/20050126_1/Antarctica/Davis"/>
+                <menuitem label="&pref.timezone.Antarctica.DumontDUrville;"
+                          value="/mozilla.org/20050126_1/Antarctica/DumontDUrville"/>
+                <menuitem label="&pref.timezone.Antarctica.Mawson;"
+                          value="/mozilla.org/20050126_1/Antarctica/Mawson"/>
+                <menuitem label="&pref.timezone.Antarctica.McMurdo;"
+                          value="/mozilla.org/20050126_1/Antarctica/McMurdo"/>
+                <menuitem label="&pref.timezone.Antarctica.Palmer;"
+                          value="/mozilla.org/20050126_1/Antarctica/Palmer"/>
+                <menuitem label="&pref.timezone.Antarctica.South_Pole;"
+                          value="/mozilla.org/20050126_1/Antarctica/South_Pole"/>
+                <menuitem label="&pref.timezone.Antarctica.Syowa;"
+                          value="/mozilla.org/20050126_1/Antarctica/Syowa"/>
+                <menuitem label="&pref.timezone.Antarctica.Vostok;"
+                          value="/mozilla.org/20050126_1/Antarctica/Vostok"/>
+                <menuitem label="&pref.timezone.Arctic.Longyearbyen;"
+                          value="/mozilla.org/20050126_1/Arctic/Longyearbyen"/>
+                <menuitem label="&pref.timezone.Asia.Aden;"
+                          value="/mozilla.org/20050126_1/Asia/Aden"/>
+                <menuitem label="&pref.timezone.Asia.Almaty;"
+                          value="/mozilla.org/20050126_1/Asia/Almaty"/>
+                <menuitem label="&pref.timezone.Asia.Amman;"
+                          value="/mozilla.org/20050126_1/Asia/Amman"/>
+                <menuitem label="&pref.timezone.Asia.Anadyr;"
+                          value="/mozilla.org/20050126_1/Asia/Anadyr"/>
+                <menuitem label="&pref.timezone.Asia.Aqtau;"
+                          value="/mozilla.org/20050126_1/Asia/Aqtau"/>
+                <menuitem label="&pref.timezone.Asia.Aqtobe;"
+                          value="/mozilla.org/20050126_1/Asia/Aqtobe"/>
+                <menuitem label="&pref.timezone.Asia.Ashgabat;"
+                          value="/mozilla.org/20050126_1/Asia/Ashgabat"/>
+                <menuitem label="&pref.timezone.Asia.Baghdad;"
+                          value="/mozilla.org/20050126_1/Asia/Baghdad"/>
+                <menuitem label="&pref.timezone.Asia.Bahrain;"
+                          value="/mozilla.org/20050126_1/Asia/Bahrain"/>
+                <menuitem label="&pref.timezone.Asia.Baku;"
+                          value="/mozilla.org/20050126_1/Asia/Baku"/>
+                <menuitem label="&pref.timezone.Asia.Bangkok;"
+                          value="/mozilla.org/20050126_1/Asia/Bangkok"/>
+                <menuitem label="&pref.timezone.Asia.Beirut;"
+                          value="/mozilla.org/20050126_1/Asia/Beirut"/>
+                <menuitem label="&pref.timezone.Asia.Bishkek;"
+                          value="/mozilla.org/20050126_1/Asia/Bishkek"/>
+                <menuitem label="&pref.timezone.Asia.Brunei;"
+                          value="/mozilla.org/20050126_1/Asia/Brunei"/>
+                <menuitem label="&pref.timezone.Asia.Calcutta;"
+                          value="/mozilla.org/20050126_1/Asia/Calcutta"/>
+                <menuitem label="&pref.timezone.Asia.Chungking;"
+                          value="/mozilla.org/20050126_1/Asia/Chungking"/>
+                <menuitem label="&pref.timezone.Asia.Colombo;"
+                          value="/mozilla.org/20050126_1/Asia/Colombo"/>
+                <menuitem label="&pref.timezone.Asia.Damascus;"
+                          value="/mozilla.org/20050126_1/Asia/Damascus"/>
+                <menuitem label="&pref.timezone.Asia.Dhaka;"
+                          value="/mozilla.org/20050126_1/Asia/Dhaka"/>
+                <menuitem label="&pref.timezone.Asia.Dili;"
+                          value="/mozilla.org/20050126_1/Asia/Dili"/>
+                <menuitem label="&pref.timezone.Asia.Dubai;"
+                          value="/mozilla.org/20050126_1/Asia/Dubai"/>
+                <menuitem label="&pref.timezone.Asia.Dushanbe;"
+                          value="/mozilla.org/20050126_1/Asia/Dushanbe"/>
+                <menuitem label="&pref.timezone.Asia.Gaza;"
+                          value="/mozilla.org/20050126_1/Asia/Gaza"/>
+                <menuitem label="&pref.timezone.Asia.Harbin;"
+                          value="/mozilla.org/20050126_1/Asia/Harbin"/>
+                <menuitem label="&pref.timezone.Asia.Hong_Kong;"
+                          value="/mozilla.org/20050126_1/Asia/Hong_Kong"/>
+                <menuitem label="&pref.timezone.Asia.Hovd;"
+                          value="/mozilla.org/20050126_1/Asia/Hovd"/>
+                <menuitem label="&pref.timezone.Asia.Irkutsk;"
+                          value="/mozilla.org/20050126_1/Asia/Irkutsk"/>
+                <menuitem label="&pref.timezone.Asia.Istanbul;"
+                          value="/mozilla.org/20050126_1/Asia/Istanbul"/>
+                <menuitem label="&pref.timezone.Asia.Jakarta;"
+                          value="/mozilla.org/20050126_1/Asia/Jakarta"/>
+                <menuitem label="&pref.timezone.Asia.Jayapura;"
+                          value="/mozilla.org/20050126_1/Asia/Jayapura"/>
+                <menuitem label="&pref.timezone.Asia.Jerusalem;"
+                          value="/mozilla.org/20050126_1/Asia/Jerusalem"/>
+                <menuitem label="&pref.timezone.Asia.Kabul;"
+                          value="/mozilla.org/20050126_1/Asia/Kabul"/>
+                <menuitem label="&pref.timezone.Asia.Kamchatka;"
+                          value="/mozilla.org/20050126_1/Asia/Kamchatka"/>
+                <menuitem label="&pref.timezone.Asia.Karachi;"
+                          value="/mozilla.org/20050126_1/Asia/Karachi"/>
+                <menuitem label="&pref.timezone.Asia.Kashgar;"
+                          value="/mozilla.org/20050126_1/Asia/Kashgar"/>
+                <menuitem label="&pref.timezone.Asia.Katmandu;"
+                          value="/mozilla.org/20050126_1/Asia/Katmandu"/>
+                <menuitem label="&pref.timezone.Asia.Krasnoyarsk;"
+                          value="/mozilla.org/20050126_1/Asia/Krasnoyarsk"/>
+                <menuitem label="&pref.timezone.Asia.Kuala_Lumpur;"
+                          value="/mozilla.org/20050126_1/Asia/Kuala_Lumpur"/>
+                <menuitem label="&pref.timezone.Asia.Kuching;"
+                          value="/mozilla.org/20050126_1/Asia/Kuching"/>
+                <menuitem label="&pref.timezone.Asia.Kuwait;"
+                          value="/mozilla.org/20050126_1/Asia/Kuwait"/>
+                <menuitem label="&pref.timezone.Asia.Macao;"
+                          value="/mozilla.org/20050126_1/Asia/Macao"/>
+                <menuitem label="&pref.timezone.Asia.Magadan;"
+                          value="/mozilla.org/20050126_1/Asia/Magadan"/>
+                <menuitem label="&pref.timezone.Asia.Manila;"
+                          value="/mozilla.org/20050126_1/Asia/Manila"/>
+                <menuitem label="&pref.timezone.Asia.Muscat;"
+                          value="/mozilla.org/20050126_1/Asia/Muscat"/>
+                <menuitem label="&pref.timezone.Asia.Nicosia;"
+                          value="/mozilla.org/20050126_1/Asia/Nicosia"/>
+                <menuitem label="&pref.timezone.Asia.Novosibirsk;"
+                          value="/mozilla.org/20050126_1/Asia/Novosibirsk"/>
+                <menuitem label="&pref.timezone.Asia.Omsk;"
+                          value="/mozilla.org/20050126_1/Asia/Omsk"/>
+                <menuitem label="&pref.timezone.Asia.Phnom_Penh;"
+                          value="/mozilla.org/20050126_1/Asia/Phnom_Penh"/>
+                <menuitem label="&pref.timezone.Asia.Pontianak;"
+                          value="/mozilla.org/20050126_1/Asia/Pontianak"/>
+                <menuitem label="&pref.timezone.Asia.Pyongyang;"
+                          value="/mozilla.org/20050126_1/Asia/Pyongyang"/>
+                <menuitem label="&pref.timezone.Asia.Qatar;"
+                          value="/mozilla.org/20050126_1/Asia/Qatar"/>
+                <menuitem label="&pref.timezone.Asia.Rangoon;"
+                          value="/mozilla.org/20050126_1/Asia/Rangoon"/>
+                <menuitem label="&pref.timezone.Asia.Riyadh;"
+                          value="/mozilla.org/20050126_1/Asia/Riyadh"/>
+                <menuitem label="&pref.timezone.Asia.Saigon;"
+                          value="/mozilla.org/20050126_1/Asia/Saigon"/>
+                <menuitem label="&pref.timezone.Asia.Samarkand;"
+                          value="/mozilla.org/20050126_1/Asia/Samarkand"/>
+                <menuitem label="&pref.timezone.Asia.Seoul;"
+                          value="/mozilla.org/20050126_1/Asia/Seoul"/>
+                <menuitem label="&pref.timezone.Asia.Shanghai;"
+                          value="/mozilla.org/20050126_1/Asia/Shanghai"/>
+                <menuitem label="&pref.timezone.Asia.Singapore;"
+                          value="/mozilla.org/20050126_1/Asia/Singapore"/>
+                <menuitem label="&pref.timezone.Asia.Taipei;"
+                          value="/mozilla.org/20050126_1/Asia/Taipei"/>
+                <menuitem label="&pref.timezone.Asia.Tashkent;"
+                          value="/mozilla.org/20050126_1/Asia/Tashkent"/>
+                <menuitem label="&pref.timezone.Asia.Tbilisi;"
+                          value="/mozilla.org/20050126_1/Asia/Tbilisi"/>
+                <menuitem label="&pref.timezone.Asia.Tehran;"
+                          value="/mozilla.org/20050126_1/Asia/Tehran"/>
+                <menuitem label="&pref.timezone.Asia.Thimphu;"
+                          value="/mozilla.org/20050126_1/Asia/Thimphu"/>
+                <menuitem label="&pref.timezone.Asia.Tokyo;"
+                          value="/mozilla.org/20050126_1/Asia/Tokyo"/>
+                <menuitem label="&pref.timezone.Asia.Ujung_Pandang;"
+                          value="/mozilla.org/20050126_1/Asia/Ujung_Pandang"/>
+                <menuitem label="&pref.timezone.Asia.Ulaanbaatar;"
+                          value="/mozilla.org/20050126_1/Asia/Ulaanbaatar"/>
+                <menuitem label="&pref.timezone.Asia.Urumqi;"
+                          value="/mozilla.org/20050126_1/Asia/Urumqi"/>
+                <menuitem label="&pref.timezone.Asia.Vientiane;"
+                          value="/mozilla.org/20050126_1/Asia/Vientiane"/>
+                <menuitem label="&pref.timezone.Asia.Vladivostok;"
+                          value="/mozilla.org/20050126_1/Asia/Vladivostok"/>
+                <menuitem label="&pref.timezone.Asia.Yakutsk;"
+                          value="/mozilla.org/20050126_1/Asia/Yakutsk"/>
+                <menuitem label="&pref.timezone.Asia.Yekaterinburg;"
+                          value="/mozilla.org/20050126_1/Asia/Yekaterinburg"/>
+                <menuitem label="&pref.timezone.Asia.Yerevan;"
+                          value="/mozilla.org/20050126_1/Asia/Yerevan"/>
+                <menuitem label="&pref.timezone.Atlantic.Azores;"
+                          value="/mozilla.org/20050126_1/Atlantic/Azores"/>
+                <menuitem label="&pref.timezone.Atlantic.Bermuda;"
+                          value="/mozilla.org/20050126_1/Atlantic/Bermuda"/>
+                <menuitem label="&pref.timezone.Atlantic.Canary;"
+                          value="/mozilla.org/20050126_1/Atlantic/Canary"/>
+                <menuitem label="&pref.timezone.Atlantic.Cape_Verde;"
+                          value="/mozilla.org/20050126_1/Atlantic/Cape_Verde"/>
+                <menuitem label="&pref.timezone.Atlantic.Faeroe;"
+                          value="/mozilla.org/20050126_1/Atlantic/Faeroe"/>
+                <menuitem label="&pref.timezone.Atlantic.Jan_Mayen;"
+                          value="/mozilla.org/20050126_1/Atlantic/Jan_Mayen"/>
+                <menuitem label="&pref.timezone.Atlantic.Madeira;"
+                          value="/mozilla.org/20050126_1/Atlantic/Madeira"/>
+                <menuitem label="&pref.timezone.Atlantic.Reykjavik;"
+                          value="/mozilla.org/20050126_1/Atlantic/Reykjavik"/>
+                <menuitem label="&pref.timezone.Atlantic.South_Georgia;"
+                          value="/mozilla.org/20050126_1/Atlantic/South_Georgia"/>
+                <menuitem label="&pref.timezone.Atlantic.St_Helena;"
+                          value="/mozilla.org/20050126_1/Atlantic/St_Helena"/>
+                <menuitem label="&pref.timezone.Atlantic.Stanley;"
+                          value="/mozilla.org/20050126_1/Atlantic/Stanley"/>
+                <menuitem label="&pref.timezone.Australia.Adelaide;"
+                          value="/mozilla.org/20050126_1/Australia/Adelaide"/>
+                <menuitem label="&pref.timezone.Australia.Brisbane;"
+                          value="/mozilla.org/20050126_1/Australia/Brisbane"/>
+                <menuitem label="&pref.timezone.Australia.Broken_Hill;"
+                          value="/mozilla.org/20050126_1/Australia/Broken_Hill"/>
+                <menuitem label="&pref.timezone.Australia.Darwin;"
+                          value="/mozilla.org/20050126_1/Australia/Darwin"/>
+                <menuitem label="&pref.timezone.Australia.Hobart;"
+                          value="/mozilla.org/20050126_1/Australia/Hobart"/>
+                <menuitem label="&pref.timezone.Australia.Lindeman;"
+                          value="/mozilla.org/20050126_1/Australia/Lindeman"/>
+                <menuitem label="&pref.timezone.Australia.Lord_Howe;"
+                          value="/mozilla.org/20050126_1/Australia/Lord_Howe"/>
+                <menuitem label="&pref.timezone.Australia.Melbourne;"
+                          value="/mozilla.org/20050126_1/Australia/Melbourne"/>
+                <menuitem label="&pref.timezone.Australia.Perth;"
+                          value="/mozilla.org/20050126_1/Australia/Perth"/>
+                <menuitem label="&pref.timezone.Australia.Sydney;"
+                          value="/mozilla.org/20050126_1/Australia/Sydney"/>
+                <menuitem label="&pref.timezone.Europe.Amsterdam;"
+                          value="/mozilla.org/20050126_1/Europe/Amsterdam"/>
+                <menuitem label="&pref.timezone.Europe.Andorra;"
+                          value="/mozilla.org/20050126_1/Europe/Andorra"/>
+                <menuitem label="&pref.timezone.Europe.Athens;"
+                          value="/mozilla.org/20050126_1/Europe/Athens"/>
+                <menuitem label="&pref.timezone.Europe.Belfast;"
+                          value="/mozilla.org/20050126_1/Europe/Belfast"/>
+                <menuitem label="&pref.timezone.Europe.Belgrade;"
+                          value="/mozilla.org/20050126_1/Europe/Belgrade"/>
+                <menuitem label="&pref.timezone.Europe.Berlin;"
+                          value="/mozilla.org/20050126_1/Europe/Berlin"/>
+                <menuitem label="&pref.timezone.Europe.Bratislava;"
+                          value="/mozilla.org/20050126_1/Europe/Bratislava"/>
+                <menuitem label="&pref.timezone.Europe.Brussels;"
+                          value="/mozilla.org/20050126_1/Europe/Brussels"/>
+                <menuitem label="&pref.timezone.Europe.Bucharest;"
+                          value="/mozilla.org/20050126_1/Europe/Bucharest"/>
+                <menuitem label="&pref.timezone.Europe.Budapest;"
+                          value="/mozilla.org/20050126_1/Europe/Budapest"/>
+                <menuitem label="&pref.timezone.Europe.Chisinau;"
+                          value="/mozilla.org/20050126_1/Europe/Chisinau"/>
+                <menuitem label="&pref.timezone.Europe.Copenhagen;"
+                          value="/mozilla.org/20050126_1/Europe/Copenhagen"/>
+                <menuitem label="&pref.timezone.Europe.Dublin;"
+                          value="/mozilla.org/20050126_1/Europe/Dublin"/>
+                <menuitem label="&pref.timezone.Europe.Gibraltar;"
+                          value="/mozilla.org/20050126_1/Europe/Gibraltar"/>
+                <menuitem label="&pref.timezone.Europe.Helsinki;"
+                          value="/mozilla.org/20050126_1/Europe/Helsinki"/>
+                <menuitem label="&pref.timezone.Europe.Istanbul;"
+                          value="/mozilla.org/20050126_1/Europe/Istanbul"/>
+                <menuitem label="&pref.timezone.Europe.Kaliningrad;"
+                          value="/mozilla.org/20050126_1/Europe/Kaliningrad"/>
+                <menuitem label="&pref.timezone.Europe.Kiev;"
+                          value="/mozilla.org/20050126_1/Europe/Kiev"/>
+                <menuitem label="&pref.timezone.Europe.Lisbon;"
+                          value="/mozilla.org/20050126_1/Europe/Lisbon"/>
+                <menuitem label="&pref.timezone.Europe.Ljubljana;"
+                          value="/mozilla.org/20050126_1/Europe/Ljubljana"/>
+                <menuitem label="&pref.timezone.Europe.London;"
+                          value="/mozilla.org/20050126_1/Europe/London"/>
+                <menuitem label="&pref.timezone.Europe.Luxembourg;"
+                          value="/mozilla.org/20050126_1/Europe/Luxembourg"/>
+                <menuitem label="&pref.timezone.Europe.Madrid;"
+                          value="/mozilla.org/20050126_1/Europe/Madrid"/>
+                <menuitem label="&pref.timezone.Europe.Malta;"
+                          value="/mozilla.org/20050126_1/Europe/Malta"/>
+                <menuitem label="&pref.timezone.Europe.Minsk;"
+                          value="/mozilla.org/20050126_1/Europe/Minsk"/>
+                <menuitem label="&pref.timezone.Europe.Monaco;"
+                          value="/mozilla.org/20050126_1/Europe/Monaco"/>
+                <menuitem label="&pref.timezone.Europe.Moscow;"
+                          value="/mozilla.org/20050126_1/Europe/Moscow"/>
+                <menuitem label="&pref.timezone.Europe.Nicosia;"
+                          value="/mozilla.org/20050126_1/Europe/Nicosia"/>
+                <menuitem label="&pref.timezone.Europe.Oslo;"
+                          value="/mozilla.org/20050126_1/Europe/Oslo"/>
+                <menuitem label="&pref.timezone.Europe.Paris;"
+                          value="/mozilla.org/20050126_1/Europe/Paris"/>
+                <menuitem label="&pref.timezone.Europe.Prague;"
+                          value="/mozilla.org/20050126_1/Europe/Prague"/>
+                <menuitem label="&pref.timezone.Europe.Riga;"
+                          value="/mozilla.org/20050126_1/Europe/Riga"/>
+                <menuitem label="&pref.timezone.Europe.Rome;"
+                          value="/mozilla.org/20050126_1/Europe/Rome"/>
+                <menuitem label="&pref.timezone.Europe.Samara;"
+                          value="/mozilla.org/20050126_1/Europe/Samara"/>
+                <menuitem label="&pref.timezone.Europe.San_Marino;"
+                          value="/mozilla.org/20050126_1/Europe/San_Marino"/>
+                <menuitem label="&pref.timezone.Europe.Sarajevo;"
+                          value="/mozilla.org/20050126_1/Europe/Sarajevo"/>
+                <menuitem label="&pref.timezone.Europe.Simferopol;"
+                          value="/mozilla.org/20050126_1/Europe/Simferopol"/>
+                <menuitem label="&pref.timezone.Europe.Skopje;"
+                          value="/mozilla.org/20050126_1/Europe/Skopje"/>
+                <menuitem label="&pref.timezone.Europe.Sofia;"
+                          value="/mozilla.org/20050126_1/Europe/Sofia"/>
+                <menuitem label="&pref.timezone.Europe.Stockholm;"
+                          value="/mozilla.org/20050126_1/Europe/Stockholm"/>
+                <menuitem label="&pref.timezone.Europe.Tallinn;"
+                          value="/mozilla.org/20050126_1/Europe/Tallinn"/>
+                <menuitem label="&pref.timezone.Europe.Tirane;"
+                          value="/mozilla.org/20050126_1/Europe/Tirane"/>
+                <menuitem label="&pref.timezone.Europe.Uzhgorod;"
+                          value="/mozilla.org/20050126_1/Europe/Uzhgorod"/>
+                <menuitem label="&pref.timezone.Europe.Vaduz;"
+                          value="/mozilla.org/20050126_1/Europe/Vaduz"/>
+                <menuitem label="&pref.timezone.Europe.Vatican;"
+                          value="/mozilla.org/20050126_1/Europe/Vatican"/>
+                <menuitem label="&pref.timezone.Europe.Vienna;"
+                          value="/mozilla.org/20050126_1/Europe/Vienna"/>
+                <menuitem label="&pref.timezone.Europe.Vilnius;"
+                          value="/mozilla.org/20050126_1/Europe/Vilnius"/>
+                <menuitem label="&pref.timezone.Europe.Warsaw;"
+                          value="/mozilla.org/20050126_1/Europe/Warsaw"/>
+                <menuitem label="&pref.timezone.Europe.Zagreb;"
+                          value="/mozilla.org/20050126_1/Europe/Zagreb"/>
+                <menuitem label="&pref.timezone.Europe.Zaporozhye;"
+                          value="/mozilla.org/20050126_1/Europe/Zaporozhye"/>
+                <menuitem label="&pref.timezone.Europe.Zurich;"
+                          value="/mozilla.org/20050126_1/Europe/Zurich"/>
+                <menuitem label="&pref.timezone.Indian.Antananarivo;"
+                          value="/mozilla.org/20050126_1/Indian/Antananarivo"/>
+                <menuitem label="&pref.timezone.Indian.Chagos;"
+                          value="/mozilla.org/20050126_1/Indian/Chagos"/>
+                <menuitem label="&pref.timezone.Indian.Christmas;"
+                          value="/mozilla.org/20050126_1/Indian/Christmas"/>
+                <menuitem label="&pref.timezone.Indian.Cocos;"
+                          value="/mozilla.org/20050126_1/Indian/Cocos"/>
+                <menuitem label="&pref.timezone.Indian.Comoro;"
+                          value="/mozilla.org/20050126_1/Indian/Comoro"/>
+                <menuitem label="&pref.timezone.Indian.Kerguelen;"
+                          value="/mozilla.org/20050126_1/Indian/Kerguelen"/>
+                <menuitem label="&pref.timezone.Indian.Mahe;"
+                          value="/mozilla.org/20050126_1/Indian/Mahe"/>
+                <menuitem label="&pref.timezone.Indian.Maldives;"
+                          value="/mozilla.org/20050126_1/Indian/Maldives"/>
+                <menuitem label="&pref.timezone.Indian.Mauritius;"
+                          value="/mozilla.org/20050126_1/Indian/Mauritius"/>
+                <menuitem label="&pref.timezone.Indian.Mayotte;"
+                          value="/mozilla.org/20050126_1/Indian/Mayotte"/>
+                <menuitem label="&pref.timezone.Indian.Reunion;"
+                          value="/mozilla.org/20050126_1/Indian/Reunion"/>
+                <menuitem label="&pref.timezone.Pacific.Apia;"
+                          value="/mozilla.org/20050126_1/Pacific/Apia"/>
+                <menuitem label="&pref.timezone.Pacific.Auckland;"
+                          value="/mozilla.org/20050126_1/Pacific/Auckland"/>
+                <menuitem label="&pref.timezone.Pacific.Chatham;"
+                          value="/mozilla.org/20050126_1/Pacific/Chatham"/>
+                <menuitem label="&pref.timezone.Pacific.Easter;"
+                          value="/mozilla.org/20050126_1/Pacific/Easter"/>
+                <menuitem label="&pref.timezone.Pacific.Efate;"
+                          value="/mozilla.org/20050126_1/Pacific/Efate"/>
+                <menuitem label="&pref.timezone.Pacific.Enderbury;"
+                          value="/mozilla.org/20050126_1/Pacific/Enderbury"/>
+                <menuitem label="&pref.timezone.Pacific.Fakaofo;"
+                          value="/mozilla.org/20050126_1/Pacific/Fakaofo"/>
+                <menuitem label="&pref.timezone.Pacific.Fiji;"
+                          value="/mozilla.org/20050126_1/Pacific/Fiji"/>
+                <menuitem label="&pref.timezone.Pacific.Funafuti;"
+                          value="/mozilla.org/20050126_1/Pacific/Funafuti"/>
+                <menuitem label="&pref.timezone.Pacific.Galapagos;"
+                          value="/mozilla.org/20050126_1/Pacific/Galapagos"/>
+                <menuitem label="&pref.timezone.Pacific.Gambier;"
+                          value="/mozilla.org/20050126_1/Pacific/Gambier"/>
+                <menuitem label="&pref.timezone.Pacific.Guadalcanal;"
+                          value="/mozilla.org/20050126_1/Pacific/Guadalcanal"/>
+                <menuitem label="&pref.timezone.Pacific.Guam;"
+                          value="/mozilla.org/20050126_1/Pacific/Guam"/>
+                <menuitem label="&pref.timezone.Pacific.Honolulu;"
+                          value="/mozilla.org/20050126_1/Pacific/Honolulu"/>
+                <menuitem label="&pref.timezone.Pacific.Johnston;"
+                          value="/mozilla.org/20050126_1/Pacific/Johnston"/>
+                <menuitem label="&pref.timezone.Pacific.Kiritimati;"
+                          value="/mozilla.org/20050126_1/Pacific/Kiritimati"/>
+                <menuitem label="&pref.timezone.Pacific.Kosrae;"
+                          value="/mozilla.org/20050126_1/Pacific/Kosrae"/>
+                <menuitem label="&pref.timezone.Pacific.Kwajalein;"
+                          value="/mozilla.org/20050126_1/Pacific/Kwajalein"/>
+                <menuitem label="&pref.timezone.Pacific.Majuro;"
+                          value="/mozilla.org/20050126_1/Pacific/Majuro"/>
+                <menuitem label="&pref.timezone.Pacific.Marquesas;"
+                          value="/mozilla.org/20050126_1/Pacific/Marquesas"/>
+                <menuitem label="&pref.timezone.Pacific.Midway;"
+                          value="/mozilla.org/20050126_1/Pacific/Midway"/>
+                <menuitem label="&pref.timezone.Pacific.Nauru;"
+                          value="/mozilla.org/20050126_1/Pacific/Nauru"/>
+                <menuitem label="&pref.timezone.Pacific.Niue;"
+                          value="/mozilla.org/20050126_1/Pacific/Niue"/>
+                <menuitem label="&pref.timezone.Pacific.Norfolk;"
+                          value="/mozilla.org/20050126_1/Pacific/Norfolk"/>
+                <menuitem label="&pref.timezone.Pacific.Noumea;"
+                          value="/mozilla.org/20050126_1/Pacific/Noumea"/>
+                <menuitem label="&pref.timezone.Pacific.Pago_Pago;"
+                          value="/mozilla.org/20050126_1/Pacific/Pago_Pago"/>
+                <menuitem label="&pref.timezone.Pacific.Palau;"
+                          value="/mozilla.org/20050126_1/Pacific/Palau"/>
+                <menuitem label="&pref.timezone.Pacific.Pitcairn;"
+                          value="/mozilla.org/20050126_1/Pacific/Pitcairn"/>
+                <menuitem label="&pref.timezone.Pacific.Ponape;"
+                          value="/mozilla.org/20050126_1/Pacific/Ponape"/>
+                <menuitem label="&pref.timezone.Pacific.Port_Moresby;"
+                          value="/mozilla.org/20050126_1/Pacific/Port_Moresby"/>
+                <menuitem label="&pref.timezone.Pacific.Rarotonga;"
+                          value="/mozilla.org/20050126_1/Pacific/Rarotonga"/>
+                <menuitem label="&pref.timezone.Pacific.Saipan;"
+                          value="/mozilla.org/20050126_1/Pacific/Saipan"/>
+                <menuitem label="&pref.timezone.Pacific.Tahiti;"
+                          value="/mozilla.org/20050126_1/Pacific/Tahiti"/>
+                <menuitem label="&pref.timezone.Pacific.Tarawa;"
+                          value="/mozilla.org/20050126_1/Pacific/Tarawa"/>
+                <menuitem label="&pref.timezone.Pacific.Tongatapu;"
+                          value="/mozilla.org/20050126_1/Pacific/Tongatapu"/>
+                <menuitem label="&pref.timezone.Pacific.Truk;"
+                          value="/mozilla.org/20050126_1/Pacific/Truk"/>
+                <menuitem label="&pref.timezone.Pacific.Wake;"
+                          value="/mozilla.org/20050126_1/Pacific/Wake"/>
+                <menuitem label="&pref.timezone.Pacific.Wallis;"
+                          value="/mozilla.org/20050126_1/Pacific/Wallis"/>
+                <menuitem label="&pref.timezone.Pacific.Yap;"
+                          value="/mozilla.org/20050126_1/Pacific/Yap"/>
+            </menupopup>
+        </menulist>
+
+        <separator/>
+
+    </prefpane>
+</overlay>
diff --git a/calendar/base/content/preferences/views.xul b/calendar/base/content/preferences/views.xul
new file mode 100644
index 000000000000..9666cd1da420
--- /dev/null
+++ b/calendar/base/content/preferences/views.xul
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is Mozilla Calendar Preferences
+   -
+   - The Initial Developer of the Original Code is
+   - Mike Potter
+   - Portions created by the Initial Developer are Copyright (C) 2002
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Mike Potter <mikep@oeone.com>
+   -   ArentJan Banck <ajbanck@planet.nl>
+   -   Eric Belhaire <belhaire@ief.u-psud.fr>
+   -   Matthew Willis <mattwillis@gmail.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!DOCTYPE overlay [
+    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+    <!ENTITY % viewsDTD SYSTEM "chrome://calendar/locale/preferences/views.dtd">
+    <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+    <!ENTITY % preferencesDTD SYSTEM "chrome://calendar/locale/preferences/preferences.dtd">
+    %brandDTD;
+    %viewsDTD;
+    %globalDTD;
+    %preferencesDTD;
+]>
+
+<overlay id="ViewsPaneOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+    <prefpane id="paneViews">
+
+        <preferences>
+            <preference id="calendar.week.start"
+                        name="calendar.week.start"
+                        type="int"/>
+            <preference id="calendar.week.d0sundaysoff"
+                        name="calendar.week.d0sundaysoff"
+                        type="bool"
+                        inverted="true"/>
+            <preference id="calendar.week.d1mondaysoff"
+                        name="calendar.week.d1mondaysoff"
+                        type="bool"
+                        inverted="true"/>
+            <preference id="calendar.week.d2tuesdaysoff"
+                        name="calendar.week.d2tuesdaysoff"
+                        type="bool"
+                        inverted="true"/>
+            <preference id="calendar.week.d3wednesdaysoff"
+                        name="calendar.week.d3wednesdaysoff"
+                        type="bool"
+                        inverted="true"/>
+            <preference id="calendar.week.d4thursdaysoff"
+                        name="calendar.week.d4thursdaysoff"
+                        type="bool"
+                        inverted="true"/>
+            <preference id="calendar.week.d5fridaysoff"
+                        name="calendar.week.d5fridaysoff"
+                        type="bool"
+                        inverted="true"/>
+            <preference id="calendar.week.d6saturdaysoff"
+                        name="calendar.week.d6saturdaysoff"
+                        type="bool"
+                        inverted="true"/>
+            <preference id="calendar.view.defaultstarthour"
+                        name="calendar.view.defaultstarthour"
+                        type="int"/>
+            <preference id="calendar.view.defaultendhour"
+                        name="calendar.view.defaultendhour"
+                        type="int"/>
+            <preference id="calendar.weeks.inview"
+                        name="calendar.weeks.inview"
+                        type="int"/>
+            <preference id="calendar.previousweeks.inview"
+                        name="calendar.previousweeks.inview"
+                        type="int"/>
+        </preferences>
+
+        <groupbox>
+            <caption label="&pref.calendar.view.allview.caption;"/>
+            <hbox align="center">
+                <caption label="&pref.weekstarts.label;"/>
+                <menulist id="weekstarts" preference="calendar.week.start">
+                    <menupopup id="weekstarts">
+                        <menuitem label="&day.1.name;" value="0"/>
+                        <menuitem label="&day.2.name;" value="1"/>
+                        <menuitem label="&day.3.name;" value="2"/>
+                        <menuitem label="&day.4.name;" value="3"/>
+                        <menuitem label="&day.5.name;" value="4"/>
+                        <menuitem label="&day.6.name;" value="5"/>
+                        <menuitem label="&day.7.name;" value="6"/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+        </groupbox>
+
+        <groupbox>
+            <caption label="&pref.calendar.view.workweek.caption;"/>
+            <hbox>
+                <caption label="&pref.daysoff.label;"/>
+                <checkbox class="dayOffCheckbox"
+                          label="&day.1.Ddd;"
+                          orient="vertical"
+                          preference="calendar.week.d0sundaysoff"/>
+                <checkbox class="dayOffCheckbox"
+                          label="&day.2.Ddd;"
+                          orient="vertical"
+                          preference="calendar.week.d1mondaysoff"/>
+                <checkbox class="dayOffCheckbox"
+                          label="&day.3.Ddd;"
+                          orient="vertical"
+                          preference="calendar.week.d2tuesdaysoff"/>
+                <checkbox class="dayOffCheckbox"
+                          label="&day.4.Ddd;"
+                          orient="vertical"
+                          preference="calendar.week.d3wednesdaysoff"/>
+                <checkbox class="dayOffCheckbox"
+                          label="&day.5.Ddd;"
+                          orient="vertical"
+                          preference="calendar.week.d4thursdaysoff"/>
+                <checkbox class="dayOffCheckbox"
+                          label="&day.6.Ddd;"
+                          orient="vertical"
+                          preference="calendar.week.d5fridaysoff"/>
+                <checkbox class="dayOffCheckbox"
+                          label="&day.7.Ddd;"
+                          orient="vertical"
+                          preference="calendar.week.d6saturdaysoff"/>
+            </hbox>
+        </groupbox>
+
+        <groupbox>
+            <caption label="&pref.calendar.view.weekanddayview.caption;"/>
+            <hbox align="center">
+                <caption label="&pref.calendar.view.restrict.label;"/>
+                <menulist id="daystarthour"
+                          preference="calendar.view.defaultstarthour">
+                    <menupopup id="daystarthour">
+                        <menuitem label="&time.midnight;" value="0"/>
+                        <menuitem label="&time.1;"        value="1"/>
+                        <menuitem label="&time.2;"        value="2"/>
+                        <menuitem label="&time.3;"        value="3"/>
+                        <menuitem label="&time.4;"        value="4"/>
+                        <menuitem label="&time.5;"        value="5"/>
+                        <menuitem label="&time.6;"        value="6"/>
+                        <menuitem label="&time.7;"        value="7"/>
+                        <menuitem label="&time.8;"        value="8"/>
+                        <menuitem label="&time.9;"        value="9"/>
+                        <menuitem label="&time.10;"       value="10"/>
+                        <menuitem label="&time.11;"       value="11"/>
+                        <menuitem label="&time.noon;"     value="12"/>
+                        <menuitem label="&time.13;"       value="13"/>
+                        <menuitem label="&time.14;"       value="14"/>
+                        <menuitem label="&time.15;"       value="15"/>
+                        <menuitem label="&time.16;"       value="16"/>
+                        <menuitem label="&time.17;"       value="17"/>
+                        <menuitem label="&time.18;"       value="18"/>
+                        <menuitem label="&time.19;"       value="19"/>
+                        <menuitem label="&time.20;"       value="20"/>
+                        <menuitem label="&time.21;"       value="21"/>
+                        <menuitem label="&time.22;"       value="22"/>
+                        <menuitem label="&time.23;"       value="23"/>
+                    </menupopup>
+                </menulist>
+                <caption label="&pref.calendar.view.endtime.label;"/>
+                <menulist id="dayendhour"
+                          preference="calendar.view.defaultendhour">
+                    <menupopup id="dayendhour">
+                        <menuitem label="&time.midnight;" value="0"/>
+                        <menuitem label="&time.1;"        value="1"/>
+                        <menuitem label="&time.2;"        value="2"/>
+                        <menuitem label="&time.3;"        value="3"/>
+                        <menuitem label="&time.4;"        value="4"/>
+                        <menuitem label="&time.5;"        value="5"/>
+                        <menuitem label="&time.6;"        value="6"/>
+                        <menuitem label="&time.7;"        value="7"/>
+                        <menuitem label="&time.8;"        value="8"/>
+                        <menuitem label="&time.9;"        value="9"/>
+                        <menuitem label="&time.10;"       value="10"/>
+                        <menuitem label="&time.11;"       value="11"/>
+                        <menuitem label="&time.noon;"     value="12"/>
+                        <menuitem label="&time.13;"       value="13"/>
+                        <menuitem label="&time.14;"       value="14"/>
+                        <menuitem label="&time.15;"       value="15"/>
+                        <menuitem label="&time.16;"       value="16"/>
+                        <menuitem label="&time.17;"       value="17"/>
+                        <menuitem label="&time.18;"       value="18"/>
+                        <menuitem label="&time.19;"       value="19"/>
+                        <menuitem label="&time.20;"       value="20"/>
+                        <menuitem label="&time.21;"       value="21"/>
+                        <menuitem label="&time.22;"       value="22"/>
+                        <menuitem label="&time.23;"       value="23"/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+            <hbox class="indent">
+                <description>&pref.hour.help.description;</description>
+            </hbox>
+        </groupbox>
+
+        <groupbox>
+            <caption label="&pref.calendar.view.multiweekview.caption;"/>
+            <hbox>
+                <caption label="&pref.numberofweeks.label;"/>
+                <menulist id="viewsMultiweekTotalWeeks"
+                          preference="calendar.weeks.inview">
+                    <menupopup>
+                        <menuitem label="&pref.numberofweeks.1;" value="1"/>
+                        <menuitem label="&pref.numberofweeks.2;" value="2"/>
+                        <menuitem label="&pref.numberofweeks.3;" value="3"/>
+                        <menuitem label="&pref.numberofweeks.4;" value="4"/>
+                        <menuitem label="&pref.numberofweeks.5;" value="5"/>
+                        <menuitem label="&pref.numberofweeks.6;" value="6"/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+            <hbox id="previousWeeksBox">
+                <caption label="&pref.numberofpreviousweeks.label;"/>
+                <menulist id="viewsMultiweekPreviousWeeks"
+                          preference="calendar.previousweeks.inview">
+                    <menupopup>
+                        <menuitem label="&pref.numberofweeks.0;" value="0"/>
+                        <menuitem label="&pref.numberofweeks.1;" value="1"/>
+                        <menuitem label="&pref.numberofweeks.2;" value="2"/>
+                    </menupopup>
+                </menulist>
+            </hbox>
+        </groupbox>
+
+        <separator/>
+
+    </prefpane>
+</overlay>
diff --git a/calendar/locales/en-US/chrome/calendar/global.dtd b/calendar/locales/en-US/chrome/calendar/global.dtd
index 7be7a8b9503c..08573de92143 100644
--- a/calendar/locales/en-US/chrome/calendar/global.dtd
+++ b/calendar/locales/en-US/chrome/calendar/global.dtd
@@ -109,3 +109,19 @@
 <!ENTITY add.label     "Add">
 <!ENTITY edit.label    "Edit">
 <!ENTITY remove.label  "Remove">
+
+<!-- Units -->
+<!ENTITY calendar.global.units.second   "second">
+<!ENTITY calendar.global.units.seconds  "seconds">
+<!ENTITY calendar.global.units.minute   "minute">
+<!ENTITY calendar.global.units.minutes  "minutes">
+<!ENTITY calendar.global.units.hour     "hour">
+<!ENTITY calendar.global.units.hours    "hours">
+<!ENTITY calendar.global.units.day      "day">
+<!ENTITY calendar.global.units.days     "days">
+<!ENTITY calendar.global.units.week     "week">
+<!ENTITY calendar.global.units.weeks    "weeks">
+<!ENTITY calendar.global.units.month    "month">
+<!ENTITY calendar.global.units.months   "months">
+<!ENTITY calendar.global.units.year     "year">
+<!ENTITY calendar.global.units.years    "years">
diff --git a/calendar/locales/jar.mn b/calendar/locales/jar.mn
index 44fa28d1bf16..799a92e49812 100644
--- a/calendar/locales/jar.mn
+++ b/calendar/locales/jar.mn
@@ -24,6 +24,13 @@ calendar-@AB_CD@.jar:
     locale/@AB_CD@/calendar/menuOverlay.dtd      (%chrome/calendar/menuOverlay.dtd)
     locale/@AB_CD@/calendar/overlay.dtd          (%chrome/calendar/overlay.dtd)
 *   locale/@AB_CD@/calendar/prefs.dtd            (%chrome/calendar/prefs.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)
 # NOTE:
 # These three files are only used by Sunbird but are included for all so that
 # calendar-ab-CD.jar is the same for all Calendar products.
diff --git a/calendar/resources/content/calendar.js b/calendar/resources/content/calendar.js
index 78ac20edb06a..7fc92d4f31b3 100644
--- a/calendar/resources/content/calendar.js
+++ b/calendar/resources/content/calendar.js
@@ -483,10 +483,20 @@ function openAboutDialog()
   window.openDialog("chrome://calendar/content/aboutDialog.xul", "About", "modal,centerscreen,chrome,resizable=no");
 }
 
-function openPreferences()
-{
-  openDialog("chrome://calendar/content/pref/pref.xul","PrefWindow",
-             "chrome,titlebar,resizable,modal");
+function openPreferences() {
+    // Check to see if the prefwindow is already open
+    var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                       .getService(Components.interfaces.nsIWindowMediator);
+
+    var win = wm.getMostRecentWindow("Calendar:Preferences");
+    var url = "chrome://calendar/content/preferences/preferences.xul";
+    var features = "chrome,titlebar,toolbar,centerscreen,dialog=no";
+
+    if (win) {
+        win.focus();
+    } else {
+        openDialog(url, "Preferences", features);
+    }
 }
 
 /**
diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn
index 362c6408767c..4787dc96008a 100644
--- a/calendar/resources/jar.mn
+++ b/calendar/resources/jar.mn
@@ -82,16 +82,19 @@ calendar.jar:
     content/calendar/datetimepickers/datetimepickers.xml (content/datetimepickers/datetimepickers.xml)
     content/calendar/datetimepickers/minimonth.css (content/datetimepickers/minimonth.css)
     content/calendar/datetimepickers/minimonth.xml (content/datetimepickers/minimonth.xml)
-    content/calendar/pref/pref.xul (content/pref/pref.xul)
-    content/calendar/pref/alarmPrefs.xul (content/pref/alarmPrefs.xul)
-*   content/calendar/pref/calendarPref.xul (content/pref/calendarPref.xul)
-    content/calendar/pref/prefOverlay.xul (content/pref/prefOverlay.xul)
-    content/calendar/pref/alarmPrefs.js (content/pref/alarmPrefs.js)
-    content/calendar/pref/viewPrefs.xul (content/pref/viewPrefs.xul)
-    content/calendar/pref/timezonePrefs.xul (content/pref/timezonePrefs.xul)
-    content/calendar/pref/editCategory.xul (content/pref/editCategory.xul)
-    content/calendar/pref/wsm.js (content/pref/wsm.js)
-*   content/calendar/pref/nsPrefWindow.js (content/pref/nsPrefWindow.js)
+    content/calendar/preferences/alarms.xul       (/calendar/base/content/preferences/alarms.xul)
+    content/calendar/preferences/alarms.js        (/calendar/base/content/preferences/alarms.js)
+    content/calendar/preferences/categories.xul   (/calendar/base/content/preferences/categories.xul)
+    content/calendar/preferences/categories.js    (/calendar/base/content/preferences/categories.js)
+*   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/editCategory.xul (/calendar/base/content/preferences/editCategory.xul)
+    content/calendar/preferences/general.js       (/calendar/base/content/preferences/general.js)
+*   content/calendar/preferences/general.xul      (/calendar/base/content/preferences/general.xul)
+*   content/calendar/preferences/preferences.xul  (/calendar/base/content/preferences/preferences.xul)
+    content/calendar/preferences/timezones.js     (/calendar/base/content/preferences/timezones.js)
+    content/calendar/preferences/timezones.xul    (/calendar/base/content/preferences/timezones.xul)
+    content/calendar/preferences/views.xul        (/calendar/base/content/preferences/views.xul)
 #ifndef MOZ_SUNBIRD
     content/calendar/about.html (content/about.html)
     content/calendar/about.xul (content/about.xul)
@@ -99,19 +102,24 @@ calendar.jar:
     content/calendar/calExtOverlay.js (content/calExtOverlay.js)
     content/calendar/calExtOverlay.xul (content/calExtOverlay.xul)
     content/calendar/menuOverlay.xul (content/menuOverlay.xul)
-    content/calendar/pref/prefBird.xul (content/pref/prefBird.xul)
-    content/calendar/pref/prefBirdOverlay.xul (content/pref/prefBirdOverlay.xul)
     skin/classic/calendar/calendar.css (skin/classic/calendar.css)
     skin/classic/calendar/prevnextarrow.png (skin/classic/prevnextarrow.png)
     skin/classic/calendar/datetimepickers/minimonth.css (skin/classic/datetimepickers/minimonth.css)
 #endif
-    skin/classic/calendar/calendar-views.css	(/calendar/base/themes/winstripe/calendar-views.css)
+#ifdef XP_MACOSX
+    skin/classic/calendar/calendar-views.css  (/calendar/base/themes/pinstripe/calendar-views.css)
+    skin/classic/calendar/preferences/Options.png  (/calendar/base/themes/pinstripe/preferences/Options.png)
+    skin/classic/calendar/preferences/preferences.css  (/calendar/base/themes/pinstripe/preferences/preferences.css)
+#else
+    skin/classic/calendar/calendar-views.css  (/calendar/base/themes/winstripe/calendar-views.css)
+    skin/classic/calendar/preferences/Options.png  (/calendar/base/themes/winstripe/preferences/Options.png)
+    skin/classic/calendar/preferences/preferences.css  (/calendar/base/themes/winstripe/preferences/preferences.css)
+#endif
     skin/classic/calendar/calendar-button.css (skin/classic/calendar-button.css)
     skin/classic/calendar/calendartoolbar.png (skin/classic/calendartoolbar.png)
     skin/classic/calendar/calendartoolbar_small.png (skin/classic/calendartoolbar_small.png)
     skin/classic/calendar/dialogOverlay.css (skin/classic/dialogOverlay.css)
     skin/classic/calendar/overlay.css (skin/classic/overlay.css)
-    skin/classic/calendar/prefs.css (skin/classic/prefs.css)
     skin/classic/calendar/synch_animated.gif (skin/classic/synch_animated.gif)
     skin/classic/calendar/datetimepickers/datetimepickers.css (skin/classic/datetimepickers/datetimepickers.css)
     skin/classic/calendar/datetimepickers/left-arrow-hover.gif (skin/classic/datetimepickers/left-arrow-hover.gif)
@@ -139,7 +147,6 @@ calendar.jar:
     skin/modern/calendar/calendartoolbar_small.png (skin/modern/calendartoolbar_small.png)
     skin/modern/calendar/dialogOverlay.css (skin/modern/dialogOverlay.css)
     skin/modern/calendar/overlay.css (skin/modern/overlay.css)
-    skin/modern/calendar/prefs.css (skin/modern/prefs.css)
     skin/modern/calendar/prevnextarrow.png (skin/modern/prevnextarrow.png)
     skin/modern/calendar/synch_animated.gif (skin/modern/synch_animated.gif)
     skin/modern/calendar/taskbar-cal.gif (skin/modern/taskbar-cal.gif)
diff --git a/calendar/sunbird/app/profile/sunbird.js b/calendar/sunbird/app/profile/sunbird.js
index c00fbc16c02e..d4d2d6f3df31 100644
--- a/calendar/sunbird/app/profile/sunbird.js
+++ b/calendar/sunbird/app/profile/sunbird.js
@@ -179,3 +179,15 @@ pref("security.warn_leaving_secure.show_once", true);
 pref("security.warn_viewing_mixed.show_once", true);
 pref("security.warn_submit_insecure.show_once", true);
 
+// Preference viewer
+#ifdef XP_WIN
+pref("browser.preferences.instantApply", false);
+#else
+pref("browser.preferences.instantApply", true);
+#endif
+#ifdef XP_MACOSX
+pref("browser.preferences.animateFadeIn", true);
+#else
+pref("browser.preferences.animateFadeIn", false);
+#endif
+
diff --git a/calendar/sunbird/base/jar.mn b/calendar/sunbird/base/jar.mn
index 31625aee4c27..074f5d9d0c5a 100644
--- a/calendar/sunbird/base/jar.mn
+++ b/calendar/sunbird/base/jar.mn
@@ -11,5 +11,3 @@ calendar.jar:
 *  content/calendar/customizeToolbar.xul         (content/customizeToolbar.xul)
 *  content/calendar/hiddenWindow.xul             (content/hiddenWindow.xul)
 *  content/calendar/hiddenWindow.js              (content/hiddenWindow.js)
-*  content/calendar/pref/connectionPrefs.xul     (content/pref/connectionPrefs.xul)
-*  content/calendar/pref/connectionPrefs.js      (content/pref/connectionPrefs.js)
diff --git a/calendar/sunbird/themes/pinstripe/sunbird/jar.mn b/calendar/sunbird/themes/pinstripe/sunbird/jar.mn
index 78a561041924..133e566f2665 100644
--- a/calendar/sunbird/themes/pinstripe/sunbird/jar.mn
+++ b/calendar/sunbird/themes/pinstripe/sunbird/jar.mn
@@ -4,13 +4,12 @@ calendar.jar:
    skin/classic/calendar/toolbar-small.png
    skin/classic/calendar/prevnextarrow.png
 +  skin/classic/calendar/synch_animated.gif
-   skin/classic/calendar/pref/Options.png                           (pref/Options.png)
-   skin/classic/calendar/pref/pref.css                              (pref/pref.css)
    skin/classic/calendar/datetimepickers/left-arrow.png             (datetimepickers/left-arrow.png)
    skin/classic/calendar/datetimepickers/left-arrow-hover.png       (datetimepickers/left-arrow-hover.png)
    skin/classic/calendar/datetimepickers/right-arrow.png            (datetimepickers/right-arrow.png)
    skin/classic/calendar/datetimepickers/right-arrow-hover.png      (datetimepickers/right-arrow.png)
 +  skin/classic/calendar/datetimepickers/minimonth.css              (datetimepickers/minimonth.css)
+
 classic.jar:
    icon.png
    preview.png
diff --git a/calendar/sunbird/themes/winstripe/sunbird/jar.mn b/calendar/sunbird/themes/winstripe/sunbird/jar.mn
index b7e0163608ab..da2c0d01b7eb 100644
--- a/calendar/sunbird/themes/winstripe/sunbird/jar.mn
+++ b/calendar/sunbird/themes/winstripe/sunbird/jar.mn
@@ -5,8 +5,6 @@ calendar.jar:
         skin/classic/calendar/prevnextarrow.png
         skin/classic/calendar/Throbber.png
         skin/classic/calendar/Throbber.gif
-        skin/classic/calendar/pref/Options.png                      (pref/Options.png)
-        skin/classic/calendar/pref/pref.css                         (pref/pref.css)
 +       skin/classic/calendar/datetimepickers/minimonth.css         (datetimepickers/minimonth.css)
         skin/classic/calendar/calendartoolbar.png
         skin/classic/calendar/calendartoolbar_small.png