Bug 458368 - Move and integrate calendar/prototypes to calendar/base. r=dbo r=philipp
authorMartin Schroeder <mschroeder@mozilla.x-home.org>
Wed, 15 Oct 2008 18:12:01 +0200
changeset 617 62876a69cb3540cdacc60667480dd56e4faedfc6
parent 616 d2c5e2f9c443a5fa5e203e26e34429f514502d54
child 618 1f6bcd26cf4565d29a00c67ca08eedab20a04ce3
push idunknown
push userunknown
push dateunknown
reviewersdbo, philipp
bugs458368
Bug 458368 - Move and integrate calendar/prototypes to calendar/base. r=dbo r=philipp
calendar/base/content/calendar-dialog-utils.js
calendar/base/content/calendar-invitations-manager.js
calendar/base/content/calendar-item-editing.js
calendar/base/content/calendar-summary-dialog.js
calendar/base/content/calendar-summary-dialog.xul
calendar/base/content/calendar-task-view.js
calendar/base/content/calendar-task-view.xul
calendar/base/content/dialogs/calendar-event-dialog-attendees.js
calendar/base/content/dialogs/calendar-event-dialog-attendees.xml
calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
calendar/base/content/dialogs/calendar-event-dialog-freebusy.xml
calendar/base/content/dialogs/calendar-event-dialog-recurrence-preview.xml
calendar/base/content/dialogs/calendar-event-dialog-recurrence.js
calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
calendar/base/content/dialogs/calendar-event-dialog-reminder.js
calendar/base/content/dialogs/calendar-event-dialog-reminder.xul
calendar/base/content/dialogs/calendar-event-dialog-timezone.js
calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
calendar/base/content/dialogs/calendar-event-dialog.css
calendar/base/content/dialogs/calendar-event-dialog.js
calendar/base/content/dialogs/calendar-event-dialog.xul
calendar/base/content/dialogs/calendar-invitations-dialog.css
calendar/base/content/dialogs/calendar-invitations-dialog.js
calendar/base/content/dialogs/calendar-invitations-dialog.xul
calendar/base/content/dialogs/calendar-invitations-list.xml
calendar/base/jar.mn
calendar/base/themes/pinstripe/calendar-event-dialog.css
calendar/base/themes/pinstripe/dialogs/calendar-event-dialog-attendees.png
calendar/base/themes/pinstripe/dialogs/calendar-event-dialog-toolbar.png
calendar/base/themes/pinstripe/dialogs/calendar-event-dialog.png
calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog-button-images.png
calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog-list-images.png
calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog.css
calendar/base/themes/pinstripe/dialogs/timezone_-10h.png
calendar/base/themes/pinstripe/dialogs/timezone_-11h.png
calendar/base/themes/pinstripe/dialogs/timezone_-12h.png
calendar/base/themes/pinstripe/dialogs/timezone_-12h45.png
calendar/base/themes/pinstripe/dialogs/timezone_-1h.png
calendar/base/themes/pinstripe/dialogs/timezone_-2h.png
calendar/base/themes/pinstripe/dialogs/timezone_-3h.png
calendar/base/themes/pinstripe/dialogs/timezone_-3h30.png
calendar/base/themes/pinstripe/dialogs/timezone_-4h.png
calendar/base/themes/pinstripe/dialogs/timezone_-5h.png
calendar/base/themes/pinstripe/dialogs/timezone_-6h.png
calendar/base/themes/pinstripe/dialogs/timezone_-7h.png
calendar/base/themes/pinstripe/dialogs/timezone_-8h.png
calendar/base/themes/pinstripe/dialogs/timezone_-8h30.png
calendar/base/themes/pinstripe/dialogs/timezone_-9h.png
calendar/base/themes/pinstripe/dialogs/timezone_-9h30.png
calendar/base/themes/pinstripe/dialogs/timezone_0h.png
calendar/base/themes/pinstripe/dialogs/timezone_10h.png
calendar/base/themes/pinstripe/dialogs/timezone_10h30.png
calendar/base/themes/pinstripe/dialogs/timezone_11h.png
calendar/base/themes/pinstripe/dialogs/timezone_11h30.png
calendar/base/themes/pinstripe/dialogs/timezone_12h.png
calendar/base/themes/pinstripe/dialogs/timezone_12h45.png
calendar/base/themes/pinstripe/dialogs/timezone_13h.png
calendar/base/themes/pinstripe/dialogs/timezone_14h.png
calendar/base/themes/pinstripe/dialogs/timezone_1h.png
calendar/base/themes/pinstripe/dialogs/timezone_2h.png
calendar/base/themes/pinstripe/dialogs/timezone_3h.png
calendar/base/themes/pinstripe/dialogs/timezone_3h30.png
calendar/base/themes/pinstripe/dialogs/timezone_4h.png
calendar/base/themes/pinstripe/dialogs/timezone_4h30.png
calendar/base/themes/pinstripe/dialogs/timezone_5h.png
calendar/base/themes/pinstripe/dialogs/timezone_5h30.png
calendar/base/themes/pinstripe/dialogs/timezone_5h45.png
calendar/base/themes/pinstripe/dialogs/timezone_6h.png
calendar/base/themes/pinstripe/dialogs/timezone_6h30.png
calendar/base/themes/pinstripe/dialogs/timezone_7h.png
calendar/base/themes/pinstripe/dialogs/timezone_8h.png
calendar/base/themes/pinstripe/dialogs/timezone_9h.png
calendar/base/themes/pinstripe/dialogs/timezone_9h30.png
calendar/base/themes/pinstripe/dialogs/timezone_map.png
calendar/base/themes/winstripe/calendar-event-dialog.css
calendar/base/themes/winstripe/dialogs/calendar-event-dialog-attendees.png
calendar/base/themes/winstripe/dialogs/calendar-event-dialog-toolbar.png
calendar/base/themes/winstripe/dialogs/calendar-event-dialog.png
calendar/base/themes/winstripe/dialogs/calendar-invitations-dialog-button-images.png
calendar/base/themes/winstripe/dialogs/calendar-invitations-dialog-list-images.png
calendar/base/themes/winstripe/dialogs/calendar-invitations-dialog.css
calendar/base/themes/winstripe/dialogs/timezone_-10h.png
calendar/base/themes/winstripe/dialogs/timezone_-11h.png
calendar/base/themes/winstripe/dialogs/timezone_-12h.png
calendar/base/themes/winstripe/dialogs/timezone_-12h45.png
calendar/base/themes/winstripe/dialogs/timezone_-1h.png
calendar/base/themes/winstripe/dialogs/timezone_-2h.png
calendar/base/themes/winstripe/dialogs/timezone_-3h.png
calendar/base/themes/winstripe/dialogs/timezone_-3h30.png
calendar/base/themes/winstripe/dialogs/timezone_-4h.png
calendar/base/themes/winstripe/dialogs/timezone_-5h.png
calendar/base/themes/winstripe/dialogs/timezone_-6h.png
calendar/base/themes/winstripe/dialogs/timezone_-7h.png
calendar/base/themes/winstripe/dialogs/timezone_-8h.png
calendar/base/themes/winstripe/dialogs/timezone_-8h30.png
calendar/base/themes/winstripe/dialogs/timezone_-9h.png
calendar/base/themes/winstripe/dialogs/timezone_-9h30.png
calendar/base/themes/winstripe/dialogs/timezone_0h.png
calendar/base/themes/winstripe/dialogs/timezone_10h.png
calendar/base/themes/winstripe/dialogs/timezone_10h30.png
calendar/base/themes/winstripe/dialogs/timezone_11h.png
calendar/base/themes/winstripe/dialogs/timezone_11h30.png
calendar/base/themes/winstripe/dialogs/timezone_12h.png
calendar/base/themes/winstripe/dialogs/timezone_12h45.png
calendar/base/themes/winstripe/dialogs/timezone_13h.png
calendar/base/themes/winstripe/dialogs/timezone_14h.png
calendar/base/themes/winstripe/dialogs/timezone_1h.png
calendar/base/themes/winstripe/dialogs/timezone_2h.png
calendar/base/themes/winstripe/dialogs/timezone_3h.png
calendar/base/themes/winstripe/dialogs/timezone_3h30.png
calendar/base/themes/winstripe/dialogs/timezone_4h.png
calendar/base/themes/winstripe/dialogs/timezone_4h30.png
calendar/base/themes/winstripe/dialogs/timezone_5h.png
calendar/base/themes/winstripe/dialogs/timezone_5h30.png
calendar/base/themes/winstripe/dialogs/timezone_5h45.png
calendar/base/themes/winstripe/dialogs/timezone_6h.png
calendar/base/themes/winstripe/dialogs/timezone_6h30.png
calendar/base/themes/winstripe/dialogs/timezone_7h.png
calendar/base/themes/winstripe/dialogs/timezone_8h.png
calendar/base/themes/winstripe/dialogs/timezone_9h.png
calendar/base/themes/winstripe/dialogs/timezone_9h30.png
calendar/base/themes/winstripe/dialogs/timezone_map.png
calendar/lightning/content/toolkit-overlay-custombar.xul
calendar/lightning/jar.mn
calendar/locales/en-US/chrome/calendar/calendar-event-dialog.dtd
calendar/locales/en-US/chrome/calendar/calendar-event-dialog.properties
calendar/locales/en-US/chrome/calendar/calendar-invitations-dialog.dtd
calendar/locales/en-US/chrome/prototypes/calendar-invitations-dialog.dtd
calendar/locales/en-US/chrome/prototypes/sun-calendar-event-dialog.dtd
calendar/locales/en-US/chrome/prototypes/sun-calendar-event-dialog.properties
calendar/locales/jar.mn
calendar/prototypes/themes/pinstripe/calendar-invitations-dialog-button-images.png
calendar/prototypes/themes/pinstripe/calendar-invitations-dialog-list-images.png
calendar/prototypes/themes/pinstripe/calendar-invitations-dialog.css
calendar/prototypes/themes/pinstripe/sun-calendar-event-dialog-attendees.png
calendar/prototypes/themes/pinstripe/sun-calendar-event-dialog-toolbar.png
calendar/prototypes/themes/pinstripe/sun-calendar-event-dialog.css
calendar/prototypes/themes/pinstripe/sun-calendar-event-dialog.png
calendar/prototypes/themes/pinstripe/timezone_-10h.png
calendar/prototypes/themes/pinstripe/timezone_-11h.png
calendar/prototypes/themes/pinstripe/timezone_-12h.png
calendar/prototypes/themes/pinstripe/timezone_-12h45.png
calendar/prototypes/themes/pinstripe/timezone_-1h.png
calendar/prototypes/themes/pinstripe/timezone_-2h.png
calendar/prototypes/themes/pinstripe/timezone_-3h.png
calendar/prototypes/themes/pinstripe/timezone_-3h30.png
calendar/prototypes/themes/pinstripe/timezone_-4h.png
calendar/prototypes/themes/pinstripe/timezone_-5h.png
calendar/prototypes/themes/pinstripe/timezone_-6h.png
calendar/prototypes/themes/pinstripe/timezone_-7h.png
calendar/prototypes/themes/pinstripe/timezone_-8h.png
calendar/prototypes/themes/pinstripe/timezone_-8h30.png
calendar/prototypes/themes/pinstripe/timezone_-9h.png
calendar/prototypes/themes/pinstripe/timezone_-9h30.png
calendar/prototypes/themes/pinstripe/timezone_0h.png
calendar/prototypes/themes/pinstripe/timezone_10h.png
calendar/prototypes/themes/pinstripe/timezone_10h30.png
calendar/prototypes/themes/pinstripe/timezone_11h.png
calendar/prototypes/themes/pinstripe/timezone_11h30.png
calendar/prototypes/themes/pinstripe/timezone_12h.png
calendar/prototypes/themes/pinstripe/timezone_12h45.png
calendar/prototypes/themes/pinstripe/timezone_13h.png
calendar/prototypes/themes/pinstripe/timezone_14h.png
calendar/prototypes/themes/pinstripe/timezone_1h.png
calendar/prototypes/themes/pinstripe/timezone_2h.png
calendar/prototypes/themes/pinstripe/timezone_3h.png
calendar/prototypes/themes/pinstripe/timezone_3h30.png
calendar/prototypes/themes/pinstripe/timezone_4h.png
calendar/prototypes/themes/pinstripe/timezone_4h30.png
calendar/prototypes/themes/pinstripe/timezone_5h.png
calendar/prototypes/themes/pinstripe/timezone_5h30.png
calendar/prototypes/themes/pinstripe/timezone_5h45.png
calendar/prototypes/themes/pinstripe/timezone_6h.png
calendar/prototypes/themes/pinstripe/timezone_6h30.png
calendar/prototypes/themes/pinstripe/timezone_7h.png
calendar/prototypes/themes/pinstripe/timezone_8h.png
calendar/prototypes/themes/pinstripe/timezone_9h.png
calendar/prototypes/themes/pinstripe/timezone_9h30.png
calendar/prototypes/themes/pinstripe/timezone_map.png
calendar/prototypes/themes/winstripe/calendar-invitations-dialog-button-images.png
calendar/prototypes/themes/winstripe/calendar-invitations-dialog-list-images.png
calendar/prototypes/themes/winstripe/calendar-invitations-dialog.css
calendar/prototypes/themes/winstripe/sun-calendar-event-dialog-attendees.png
calendar/prototypes/themes/winstripe/sun-calendar-event-dialog-toolbar.png
calendar/prototypes/themes/winstripe/sun-calendar-event-dialog.css
calendar/prototypes/themes/winstripe/sun-calendar-event-dialog.png
calendar/prototypes/themes/winstripe/timezone_-10h.png
calendar/prototypes/themes/winstripe/timezone_-11h.png
calendar/prototypes/themes/winstripe/timezone_-12h.png
calendar/prototypes/themes/winstripe/timezone_-12h45.png
calendar/prototypes/themes/winstripe/timezone_-1h.png
calendar/prototypes/themes/winstripe/timezone_-2h.png
calendar/prototypes/themes/winstripe/timezone_-3h.png
calendar/prototypes/themes/winstripe/timezone_-3h30.png
calendar/prototypes/themes/winstripe/timezone_-4h.png
calendar/prototypes/themes/winstripe/timezone_-5h.png
calendar/prototypes/themes/winstripe/timezone_-6h.png
calendar/prototypes/themes/winstripe/timezone_-7h.png
calendar/prototypes/themes/winstripe/timezone_-8h.png
calendar/prototypes/themes/winstripe/timezone_-8h30.png
calendar/prototypes/themes/winstripe/timezone_-9h.png
calendar/prototypes/themes/winstripe/timezone_-9h30.png
calendar/prototypes/themes/winstripe/timezone_0h.png
calendar/prototypes/themes/winstripe/timezone_10h.png
calendar/prototypes/themes/winstripe/timezone_10h30.png
calendar/prototypes/themes/winstripe/timezone_11h.png
calendar/prototypes/themes/winstripe/timezone_11h30.png
calendar/prototypes/themes/winstripe/timezone_12h.png
calendar/prototypes/themes/winstripe/timezone_12h45.png
calendar/prototypes/themes/winstripe/timezone_13h.png
calendar/prototypes/themes/winstripe/timezone_14h.png
calendar/prototypes/themes/winstripe/timezone_1h.png
calendar/prototypes/themes/winstripe/timezone_2h.png
calendar/prototypes/themes/winstripe/timezone_3h.png
calendar/prototypes/themes/winstripe/timezone_3h30.png
calendar/prototypes/themes/winstripe/timezone_4h.png
calendar/prototypes/themes/winstripe/timezone_4h30.png
calendar/prototypes/themes/winstripe/timezone_5h.png
calendar/prototypes/themes/winstripe/timezone_5h30.png
calendar/prototypes/themes/winstripe/timezone_5h45.png
calendar/prototypes/themes/winstripe/timezone_6h.png
calendar/prototypes/themes/winstripe/timezone_6h30.png
calendar/prototypes/themes/winstripe/timezone_7h.png
calendar/prototypes/themes/winstripe/timezone_8h.png
calendar/prototypes/themes/winstripe/timezone_9h.png
calendar/prototypes/themes/winstripe/timezone_9h30.png
calendar/prototypes/themes/winstripe/timezone_map.png
calendar/prototypes/wcap/calendar-invitations-dialog.css
calendar/prototypes/wcap/calendar-invitations-dialog.js
calendar/prototypes/wcap/calendar-invitations-dialog.xul
calendar/prototypes/wcap/calendar-invitations-list.xml
calendar/prototypes/wcap/calendar-invitations-manager.js
calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.js
calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xml
calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xul
calendar/prototypes/wcap/sun-calendar-event-dialog-freebusy.xml
calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence-preview.xml
calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.js
calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.xul
calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.js
calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.xul
calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.js
calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
calendar/prototypes/wcap/sun-calendar-event-dialog.css
calendar/prototypes/wcap/sun-calendar-event-dialog.js
calendar/prototypes/wcap/sun-calendar-event-dialog.xul
calendar/providers/gdata/jar.mn
calendar/resources/content/mouseoverPreviews.js
--- a/calendar/base/content/calendar-dialog-utils.js
+++ b/calendar/base/content/calendar-dialog-utils.js
@@ -77,114 +77,114 @@ function recurrenceRule2String(recurrenc
                     if (weekdays.length == days.length) {
                         for (var i = 0; i < weekdays.length; i++) {
                             if (weekdays[i] != days[i]) {
                                 break;
                             }
                         }
                         if (i == weekdays.length) {
                             ruleString = calGetString(
-                                "sun-calendar-event-dialog",
+                                "calendar-event-dialog",
                                 "repeatDetailsRuleDaily4");
                         }
                     }
                 } else {
                     if (rule.interval == 1) {
                         ruleString = calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsRuleDaily1");
                     } else if (rule.interval == 2) {
                         ruleString = calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsRuleDaily2");
                     } else {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleDaily3",
                           [ rule.interval ]);
                     }
                 }
             } else if (rule.type == 'WEEKLY') {
                 // weekly recurrence, currently we
                 // support a single 'BYDAY'-rule only.
                 if (checkRecurrenceRule(rule, ['BYDAY'])) {
                     // create a string like 'Monday, Tuesday and
                     // Wednesday'
                     var days = rule.getComponent("BYDAY", {});
                     var weekdays = "";
                     for (var i = 0; i < days.length; i++) {
                         weekdays += calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsDay" + days[i]);
                         if (days.length > 1 && i == (days.length - 2)) {
                             weekdays += ' ' + calGetString(
-                                "sun-calendar-event-dialog",
+                                "calendar-event-dialog",
                                 "repeatDetailsAnd") + ' ';
                         } else if (i < days.length - 1) {
                             weekdays += ', ';
                         }
                     }
 
                     // now decorate this with 'every other week, etc'.
                     if (rule.interval == 1) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleWeekly1", [ weekdays ]);
                     } else if (rule.interval == 2) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleWeekly2", [ weekdays ]);
                     } else {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleWeekly3",
                           [ rule.interval, weekdays ]);
                     }
                 } else {
                     if (rule.interval == 1) {
                         ruleString = calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsRuleWeekly4");
                     } else if (rule.interval == 2) {
                         ruleString = calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsRuleWeekly5");
                     } else {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleWeekly6",
                           [ rule.interval ]);
                     }
                 }
             } else if (rule.type == 'MONTHLY') {
                 if (checkRecurrenceRule(rule, ['BYDAY'])) {
                     var component = rule.getComponent("BYDAY", {});
                     var byday = component[0];
                     var ordinal_string =
                         calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsOrdinal" + day_position(byday));
                     var day_string =
                         calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsDay" + day_of_week(byday));
 
                     if (rule.interval == 1) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly1",
                           [ ordinal_string, day_string ]);
                     } else if (rule.interval == 2) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly2",
                           [ ordinal_string, day_string ]);
                     } else {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly3",
                           [ ordinal_string, day_string, rule.interval ]);
                     }
                 } else if (checkRecurrenceRule(rule, ['BYMONTHDAY'])) {
                     var component = rule.getComponent("BYMONTHDAY", {});
 
                     var day_string = "";
                     for (var i = 0; i < component.length; i++) {
@@ -194,146 +194,146 @@ function recurrenceRule2String(recurrenc
                         // pieces.
                         if (component[i] < 0) {
                             return null;
                         }
                         day_string += component[i];
                         if (component.length > 1 &&
                             i == (component.length - 2)) {
                             day_string += ' ' +calGetString(
-                                "sun-calendar-event-dialog",
+                                "calendar-event-dialog",
                                 "repeatDetailsAnd") + ' ';
                         } else if (i < component.length-1) {
                             day_string += ', ';
                         }
                     }
 
                     if (rule.interval == 1) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly4",
                           [ day_string ]);
                     } else if (rule.interval == 2) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly5",
                           [ day_string ]);
                     } else {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly6",
                           [ day_string, rule.interval ]);
                     }
                 } else {
                     if (rule.interval == 1) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly4",
                           [ startDate.day ]);
                     } else if (rule.interval == 2) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly5",
                           [ startDate.day ]);
                     } else {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleMonthly6",
                           [ startDate.day, rule.interval ]);
                     }
                 }
             } else if (rule.type == 'YEARLY') {
                 if (checkRecurrenceRule(rule, ['BYMONTH']) &&
                     checkRecurrenceRule(rule, ['BYMONTHDAY'])) {
                     bymonth = rule.getComponent("BYMONTH", {});
                     bymonthday = rule.getComponent("BYMONTHDAY", {});
 
                     if (bymonth.length == 1 && bymonthday.length == 1) {
                         var month_string =
                             calGetString(
-                                "sun-calendar-event-dialog",
+                                "calendar-event-dialog",
                                 "repeatDetailsMonth" + bymonth[0]);
 
                         if (rule.interval == 1) {
                             ruleString = calGetString(
-                              "sun-calendar-event-dialog",
+                              "calendar-event-dialog",
                               "repeatDetailsRuleYearly1",
                               [ month_string, bymonthday[0] ]);
                         } else if (rule.interval == 2) {
                             ruleString = calGetString(
-                              "sun-calendar-event-dialog",
+                              "calendar-event-dialog",
                               "repeatDetailsRuleYearly2",
                               [ month_string, bymonthday[0] ]);
                         } else {
                             ruleString = calGetString(
-                              "sun-calendar-event-dialog",
+                              "calendar-event-dialog",
                               "repeatDetailsRuleYearly3",
                               [ month_string,
                                 bymonthday[0],
                                 rule.interval ]);
                         }
                     }
                 } else if (checkRecurrenceRule(rule, ['BYMONTH']) &&
                            checkRecurrenceRule(rule, ['BYDAY'])) {
                     bymonth = rule.getComponent("BYMONTH", {});
                     byday = rule.getComponent("BYDAY", {});
 
                     if (bymonth.length == 1 && byday.length == 1) {
                         var month_string =
                             calGetString(
-                                "sun-calendar-event-dialog",
+                                "calendar-event-dialog",
                                 "repeatDetailsMonth" + bymonth[0]);
                         var ordinal_string =
                             calGetString(
-                                "sun-calendar-event-dialog",
+                                "calendar-event-dialog",
                                 "repeatDetailsOrdinal" +
                                     day_position(byday[0]));
                         var day_string =
                             calGetString(
-                                "sun-calendar-event-dialog",
+                                "calendar-event-dialog",
                                 "repeatDetailsDay" + day_of_week(byday[0]));
 
                         if (rule.interval == 1) {
                             ruleString = calGetString(
-                              "sun-calendar-event-dialog",
+                              "calendar-event-dialog",
                               "repeatDetailsRuleYearly4",
                               [ ordinal_string, day_string, month_string ]);
                         } else if (rule.interval == 2) {
                             ruleString = calGetString(
-                              "sun-calendar-event-dialog",
+                              "calendar-event-dialog",
                               "repeatDetailsRuleYearly5",
                               [ ordinal_string, day_string, month_string ]);
                         } else {
                             ruleString = calGetString(
-                              "sun-calendar-event-dialog",
+                              "calendar-event-dialog",
                               "repeatDetailsRuleYearly6",
                               [ ordinal_string,
                                 day_string,
                                 month_string,
                                 rule.interval ]);
                         }
                     }
                 } else {
                     var month_string =
                         calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsMonth" + (startDate.month+1));
                     if (rule.interval == 1) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleYearly1",
                           [ month_string, startDate.day ]);
                     } else if (rule.interval == 2) {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleYearly2",
                           [ month_string, startDate.day ]);
                     } else {
                         ruleString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsRuleYearly3",
                           [ month_string,
                             startDate.day,
                             rule.interval ]);
                     }
                 }
             }
 
@@ -343,62 +343,62 @@ function recurrenceRule2String(recurrenc
                 Components.classes["@mozilla.org/calendar/datetime-formatter;1"]
                 .getService(Components.interfaces.calIDateTimeFormatter);
 
             var detailsString;
             if (!endDate || allDay) {
                 if (rule.isFinite) {
                     if (rule.isByCount) {
                         detailsString = calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsCountAllDay",
                             [ ruleString,
                               dateFormatter.formatDateShort(startDate),
                               rule.count ]);
                     } else {
                         var untilDate = rule.endDate.getInTimezone(kDefaultTimezone);
                         detailsString = calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsUntilAllDay",
                             [ ruleString,
                               dateFormatter.formatDateShort(startDate),
                               dateFormatter.formatDateShort(untilDate) ]);
                     }
                   } else {
                       detailsString = calGetString(
-                          "sun-calendar-event-dialog",
+                          "calendar-event-dialog",
                           "repeatDetailsInfiniteAllDay",
                           [ ruleString,
                             dateFormatter.formatDateShort(startDate) ]);
                   }
               } else {
                 if (rule.isFinite) {
                     if (rule.isByCount) {
                         detailsString = calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsCount",
                             [ ruleString,
                               dateFormatter.formatDateShort(startDate),
                               rule.count,
                               dateFormatter.formatTime(startDate),
                               dateFormatter.formatTime(endDate) ]);
                     } else {
                         var untilDate = rule.endDate.getInTimezone(kDefaultTimezone);
                         detailsString = calGetString(
-                            "sun-calendar-event-dialog",
+                            "calendar-event-dialog",
                             "repeatDetailsUntil",
                             [ ruleString,
                               dateFormatter.formatDateShort(startDate),
                               dateFormatter.formatDateShort(untilDate),
                               dateFormatter.formatTime(startDate),
                               dateFormatter.formatTime(endDate) ]);
                     }
                 } else {
                     detailsString = calGetString(
-                        "sun-calendar-event-dialog",
+                        "calendar-event-dialog",
                         "repeatDetailsInfinite",
                         [ ruleString,
                           dateFormatter.formatDateShort(startDate),
                           dateFormatter.formatTime(startDate),
                           dateFormatter.formatTime(endDate) ]);
                 }
             }
             return detailsString;
@@ -447,17 +447,17 @@ function editReminder() {
     args.onOk = function(reminder) {
         customReminder.reminder = reminder;
     };
 
     window.setCursor("wait");
 
     // open the dialog modally
     openDialog(
-        "chrome://calendar/content/sun-calendar-event-dialog-reminder.xul",
+        "chrome://calendar/content/calendar-event-dialog-reminder.xul",
         "_blank",
         "chrome,titlebar,modal,resizable",
         args);
 }
 
 function updateReminderDetails() {
     // find relevant elements in the document
     var reminderPopup = document.getElementById("item-alarm");
@@ -471,69 +471,69 @@ function updateReminderDetails() {
     // don't try to show the details text
     // for anything but a custom recurrence rule.
     if (reminderPopup.value == "custom" && reminder) {
         var unitString;
         switch (reminder.unit) {
             case 'minutes':
                 unitString = Number(reminder.length) <= 1 ?
                     calGetString(
-                        "sun-calendar-event-dialog",
+                        "calendar-event-dialog",
                         "reminderCustomUnitMinute") :
                     calGetString(
-                        "sun-calendar-event-dialog",
+                        "calendar-event-dialog",
                         "reminderCustomUnitMinutes");
                 break;
             case 'hours':
                 unitString = Number(reminder.length) <= 1 ?
                     calGetString(
-                        "sun-calendar-event-dialog",
+                        "calendar-event-dialog",
                         "reminderCustomUnitHour") :
                     calGetString(
-                        "sun-calendar-event-dialog",
+                        "calendar-event-dialog",
                         "reminderCustomUnitHours");
                 break;
             case 'days':
                 unitString = Number(reminder.length) <= 1 ?
                     calGetString(
-                        "sun-calendar-event-dialog",
+                        "calendar-event-dialog",
                         "reminderCustomUnitDay") :
                     calGetString(
-                        "sun-calendar-event-dialog",
+                        "calendar-event-dialog",
                         "reminderCustomUnitDays");
                 break;
         }
 
         var relationString;
         switch (reminder.relation) {
             case 'START':
                 relationString = calGetString(
-                    "sun-calendar-event-dialog",
+                    "calendar-event-dialog",
                     "reminderCustomRelationBefore");
                 break;
             case 'END':
                 relationString = calGetString(
-                    "sun-calendar-event-dialog",
+                    "calendar-event-dialog",
                     "reminderCustomRelationAfter");
                 break;
         }
 
         var originString;
         if (reminder.origin && reminder.origin < 0) {
             originString = calGetString(
-                "sun-calendar-event-dialog",
+                "calendar-event-dialog",
                 "reminderCustomOriginEndEvent");
         } else {
             originString = calGetString(
-                "sun-calendar-event-dialog",
+                "calendar-event-dialog",
                 "reminderCustomOriginBeginEvent");
         }
 
         var detailsString = calGetString(
-          "sun-calendar-event-dialog",
+          "calendar-event-dialog",
           "reminderCustomTitle",
           [ reminder.length,
             unitString,
             relationString,
             originString]);
 
         var lines = detailsString.split("\n");
         reminderDetails.removeAttribute("collapsed");
rename from calendar/prototypes/wcap/calendar-invitations-manager.js
rename to calendar/base/content/calendar-invitations-manager.js
--- a/calendar/base/content/calendar-item-editing.js
+++ b/calendar/base/content/calendar-item-editing.js
@@ -278,17 +278,17 @@ function openEventDialog(calendarItem, c
     // we'll open the summary dialog since the user is not allowed to change
     // the details of the item.
     var isInvitation = false;
     if (calInstanceOf(calendar, Components.interfaces.calISchedulingSupport)) {
         isInvitation = calendar.isInvitation(calendarItem);
     }
 
     // open the dialog modeless
-    var url = "chrome://calendar/content/sun-calendar-event-dialog.xul";
+    var url = "chrome://calendar/content/calendar-event-dialog.xul";
     if ((mode != "new" && isInvitation) || !isCalendarWritable(calendar)) {
         url = "chrome://calendar/content/calendar-summary-dialog.xul";
     }
     openDialog(url, "_blank", "chrome,titlebar,resizable", args);
 }
 
 /**
  * Prompts the user how the passed item should be modified. If the item is an
--- a/calendar/base/content/calendar-summary-dialog.js
+++ b/calendar/base/content/calendar-summary-dialog.js
@@ -323,16 +323,16 @@ function sendMailToOrganizer() {
     var item = args.calendarEvent;
 
     var organizer = item.organizer;
     if (organizer) {
         if (organizer.id && organizer.id.length) {
             var email = organizer.id.replace(/^mailto:/i, "");
 
             // Set up the subject
-            var emailSubject = calGetString("sun-calendar-event-dialog",
+            var emailSubject = calGetString("calendar-event-dialog",
                                             "emailSubjectReply",
                                             [item.title]);
 
             sendMailTo(email, emailSubject);
         }
     }
 }
--- a/calendar/base/content/calendar-summary-dialog.xul
+++ b/calendar/base/content/calendar-summary-dialog.xul
@@ -42,22 +42,20 @@
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-bindings.css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd" >
   <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" >
-  <!ENTITY % sunDialogDTD SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" >
   <!ENTITY % dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" >
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %globalDTD;
   %calendarDTD;
-  %sunDialogDTD;
   %dialogDTD;
   %brandDTD;
 ]>     
 
 <dialog id="calendar-summary-dialog"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
--- a/calendar/base/content/calendar-task-view.js
+++ b/calendar/base/content/calendar-task-view.js
@@ -188,17 +188,17 @@ function sendMailToOrganizer() {
                     if (re.test(email)) {
                         email = RegExp.$1;
                     } else {
                         email = email;
                     }
                 }
 
                 // Set up the subject
-                var emailSubject = calGetString("sun-calendar-event-dialog",
+                var emailSubject = calGetString("calendar-event-dialog",
                                                 "emailSubjectReply",
                                                 [item.title]);
 
                 sendMailTo(email, emailSubject);
             }
         }
     }
 }
--- a/calendar/base/content/calendar-task-view.xul
+++ b/calendar/base/content/calendar-task-view.xul
@@ -38,17 +38,17 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-bindings.css"?>
 
 <!DOCTYPE overlay [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
-  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" > %dtd2;
+  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd2;
 ]>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript" src="chrome://calendar/content/calendar-task-tree.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-task-view.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calApplicationUtils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calFilter.js"/>
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.js
rename to calendar/base/content/dialogs/calendar-event-dialog-attendees.js
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.js
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.js
@@ -66,17 +66,17 @@ function onLoad() {
     var calendar = args.calendar;
 
     gDisplayTimezone = args.displayTimezone;
 
     onChangeCalendar(calendar);
 
     // we need to enforce several layout constraints which can't be modelled
     // with plain xul and css, at least as far as i know.
-    const kStylesheet = "chrome://calendar/content/sun-calendar-event-dialog.css";
+    const kStylesheet = "chrome://calendar/content/calendar-event-dialog.css";
     for each (var stylesheet in document.styleSheets) {
         if (stylesheet.href == kStylesheet) {
             // make the dummy-spacer #1 [top] the same height as the timebar
             var timebar = document.getElementById("timebar");
             stylesheet.insertRule(
                 ".attendee-spacer-top { height: "
                     + timebar.boxObject.height+"px; }", 0);
             // make the dummy-spacer #2 [bottom] the same height as the scrollbar
@@ -435,17 +435,17 @@ function editStartTimezone() {
         if (equalTimezones) {
             gEndTimezone = datetime.timezone;
         }
         self.propagateDateTime();
     };
 
     // Open the dialog modally
     openDialog(
-        "chrome://calendar/content/sun-calendar-event-dialog-timezone.xul",
+        "chrome://calendar/content/calendar-event-dialog-timezone.xul",
         "_blank",
         "chrome,titlebar,modal,resizable",
         args);
 }
 
 function editEndTimezone() {
     var tzStart = document.getElementById("timezone-endtime");
     if (tzStart.hasAttribute("disabled")) {
@@ -461,17 +461,17 @@ function editEndTimezone() {
             gStartTimezone = datetime.timezone;
         }
         gEndTimezone = datetime.timezone;
         self.propagateDateTime();
     };
 
     // Open the dialog modally
     openDialog(
-        "chrome://calendar/content/sun-calendar-event-dialog-timezone.xul",
+        "chrome://calendar/content/calendar-event-dialog-timezone.xul",
         "_blank",
         "chrome,titlebar,modal,resizable",
         args);
 }
 
 function updateAllDay() {
     if (gIgnoreUpdate) {
         return;
@@ -875,17 +875,17 @@ function onTimeChange(event) {
     grid.startDate = gStartDate;
     grid.endDate = gEndDate;
     if (refresh) {
         grid.forceRefresh();
     }
 }
 
 /**
- * This listener is used in sun-calendar-event-dialog-freebusy.xml inside the
+ * This listener is used in calendar-event-dialog-freebusy.xml inside the
  * binding. It has been taken out of the binding to prevent leaks.
  */
 function calFreeBusyListener(aFbElement, aBinding) {
     this.mFbElement = aFbElement;
     this.mBinding = aBinding;
 }
 
 calFreeBusyListener.prototype = {
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xml
rename to calendar/base/content/dialogs/calendar-event-dialog-attendees.xml
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xml
@@ -35,18 +35,17 @@
    - 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 dialog [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" > %dtd3;
-  <!ENTITY % calendar-event-dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %calendar-event-dialogDTD;
+  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd3;
 ]>
 
 <bindings xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <binding id="attendees-list">
     <content>
       <xul:listbox anonid="listbox"
@@ -153,17 +152,17 @@
               document.getAnonymousElementByAttribute(
                   this, "anonid", "listbox");
           var template =
               document.getAnonymousElementByAttribute(
                   this, "anonid", "item");
 
           // we need to enforce several layout constraints which can't be modelled
           // with plain xul and css, at least as far as i know.
-          const kStylesheet = "chrome://calendar/content/sun-calendar-event-dialog.css";
+          const kStylesheet = "chrome://calendar/content/calendar-event-dialog.css";
           for each (var stylesheet in document.styleSheets) {
               if (stylesheet.href == kStylesheet) {
                   // the height of the text blocks contained in the grid items needs
                   // to have the same height as the items of the attendee-list.
                   var height = template.boxObject.height - 1;
                   stylesheet.insertRule(".freebusy-grid { min-height: " + height + "px; }", 0);
                   break;
               }
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xul
rename to calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
@@ -31,37 +31,36 @@
    - 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 ***** -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/sun-calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/content/sun-calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
-  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" > %dtd2;
-  <!ENTITY % calendar-event-dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %calendar-event-dialogDTD;
+  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd2;
 ]>
 
-<dialog id="sun-calendar-event-dialog-attendees"
+<dialog id="calendar-event-dialog-attendees"
         title="&invite.title.label;"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
         persist="screenX screenY"
         style="padding-top: 8px; padding-bottom: 10px; -moz-padding-start: 8px; -moz-padding-end: 10px;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/sun-calendar-event-dialog-attendees.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-attendees.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
 
   <box orient="vertical" flex="1">
     <box orient="horizontal" align="center" pack="end">
       <spacer flex="1"/>
       <label value="&event.freebusy.suggest.slot;"/>
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-freebusy.xml
rename to calendar/base/content/dialogs/calendar-event-dialog-freebusy.xml
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-freebusy.xml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-freebusy.xml
@@ -34,17 +34,17 @@
    - 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 dialog [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" > %dtd3;
+  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd3;
 ]>
 
 <bindings xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!--
   ########################################################################
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence-preview.xml
rename to calendar/base/content/dialogs/calendar-event-dialog-recurrence-preview.xml
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.js
rename to calendar/base/content/dialogs/calendar-event-dialog-recurrence.js
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.js
+++ b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.js
@@ -588,23 +588,23 @@ function changeOrderForElements(aPropKey
 
     for (var key in aPropParams) {
         // Save original parents so that the nodes to reorder get appended to
         // the correct parent nodes.
         parents[key] = document.getElementById(aPropParams[key]).parentNode;
     }
 
     try {
-        localeOrder = calGetString("sun-calendar-event-dialog",
+        localeOrder = calGetString("calendar-event-dialog",
                                    aPropKey,
                                    aPropParams);
 
         localeOrder = localeOrder.split(" ");
     } catch (ex) {
-        var s = "The key " + aPropKey + " in sun-calendar-event-dialog.prop" +
+        var s = "The key " + aPropKey + " in calendar-event-dialog.prop" +
                 "erties has incorrect number of params. Expected " +
                 aPropParams.length + " params.";
         Components.utils.reportError(s + " " + ex);
         return;
     }
 
     // Add elements in the right order, removing them from their old parent
     for (var i = 0; i < aPropParams.length; i++) {
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.xul
rename to calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
@@ -33,37 +33,35 @@
    - 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 ***** -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/sun-calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/content/sun-calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 
 <!DOCTYPE dialog [
-  <!ENTITY % sunDialogDTD SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd">
   <!ENTITY % dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
-  %sunDialogDTD;
   %dialogDTD;
 ]>
 
-<dialog id="sun-calendar-event-dialog-recurrence"
+<dialog id="calendar-event-dialog-recurrence"
         title="&recurrence.title.label;"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return true;"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/sun-calendar-event-dialog-recurrence.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-recurrence.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
 
   <!-- recurrence pattern -->
   <groupbox id="recurrence-pattern-groupbox">
     <caption id="recurrence-pattern-caption"
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.js
rename to calendar/base/content/dialogs/calendar-event-dialog-reminder.js
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.js
+++ b/calendar/base/content/dialogs/calendar-event-dialog-reminder.js
@@ -95,17 +95,17 @@ function onLoad() {
 }
 
 function stringFromReminderObject(reminder) {
     var sbs = Components.classes["@mozilla.org/intl/stringbundle;1"]
               .getService(Components.interfaces.nsIStringBundleService);
 
     var props =
         sbs.createBundle(
-            "chrome://calendar/locale/sun-calendar-event-dialog.properties");
+            "chrome://calendar/locale/calendar-event-dialog.properties");
 
     var unitString;
     switch (reminder.unit) {
         case 'minutes':
             unitString = Number(reminder.length) <= 1 ?
                 props.GetStringFromName('reminderCustomUnitMinute') :
                 props.GetStringFromName('reminderCustomUnitMinutes');
             break;
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.xul
rename to calendar/base/content/dialogs/calendar-event-dialog-reminder.xul
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-reminder.xul
@@ -31,36 +31,35 @@
    - 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 ***** -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/sun-calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" > %dtd3;
-  <!ENTITY % calendar-event-dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %calendar-event-dialogDTD;
+  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd3;
 ]>
 
-<dialog id="sun-calendar-event-dialog-reminder"
+<dialog id="calendar-event-dialog-reminder"
         title="&reminder.title.label;"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/sun-calendar-event-dialog-reminder.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-reminder.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <!-- Listbox with custom reminders -->
   <grid flex="1">
     <rows>
       <row/>
       <row/>
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.js
rename to calendar/base/content/dialogs/calendar-event-dialog-timezone.js
rename from calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
rename to calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
@@ -33,36 +33,36 @@
    - 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 ***** -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/sun-calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd" > %dtd3;
+  <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd3;
   <!ENTITY % dtd4 SYSTEM "chrome://calendar/locale/preferences/timezones.dtd" > %dtd4;
 ]>
 
-<dialog id="sun-calendar-event-dialog-timezone"
+<dialog id="calendar-event-dialog-timezone"
         title="&timezone.title.label;"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/sun-calendar-event-dialog-timezone.js"/>
+  <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-timezone.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
 
   <hbox align="center">
     <spacer flex="1"/>
     <datetimepicker id="timezone-time" disabled="true"/>
   </hbox>
rename from calendar/prototypes/wcap/sun-calendar-event-dialog.css
rename to calendar/base/content/dialogs/calendar-event-dialog.css
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog.css
+++ b/calendar/base/content/dialogs/calendar-event-dialog.css
@@ -30,17 +30,17 @@
  * 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 ***** */
 
-#sun-calendar-event-dialog {
+#calendar-event-dialog {
     padding: 0px;
 }
 
 #yearly-period-of-label,
 label.label {
     text-align: right;
 }
 
@@ -62,63 +62,63 @@ daypicker-weekday {
 
 daypicker-monthday {
     -moz-binding: url(chrome://calendar/content/calendar-daypicker.xml#daypicker-monthday);
     -moz-user-focus: normal;
     margin-top: 2px;
 }
 
 recurrence-preview {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-recurrence-preview.xml#recurrence-preview);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-recurrence-preview.xml#recurrence-preview);
     -moz-user-focus: normal;
 }
 
 /****************************************************************************************/
 
 attendees-list {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-attendees.xml#attendees-list);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-attendees.xml#attendees-list);
     -moz-user-focus: normal;
 }
 
 selection-bar {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-attendees.xml#selection-bar);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-attendees.xml#selection-bar);
     -moz-user-focus: normal;
 }
 
 /****************************************************************************************/
 
 scroll-container {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-freebusy.xml#scroll-container);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-freebusy.xml#scroll-container);
     -moz-user-focus: normal;
 }
 
 freebusy-day {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-freebusy.xml#freebusy-day);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-freebusy.xml#freebusy-day);
     -moz-user-focus: normal;
 }
 
 freebusy-timebar {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-freebusy.xml#freebusy-timebar);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-freebusy.xml#freebusy-timebar);
     -moz-user-focus: normal;
 }
 
 freebusy-row {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-freebusy.xml#freebusy-row);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-freebusy.xml#freebusy-row);
     -moz-user-focus: normal;
 }
 
 freebusy-grid {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-freebusy.xml#freebusy-grid);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-freebusy.xml#freebusy-grid);
     -moz-user-focus: normal;
 }
 
 /****************************************************************************************/
 
 timezone-page {
-    -moz-binding: url(chrome://calendar/content/sun-calendar-event-dialog-timezone.xml#timezone-page);
+    -moz-binding: url(chrome://calendar/content/calendar-event-dialog-timezone.xml#timezone-page);
     -moz-user-focus: normal;
 }
 
 /****************************************************************************************/
 
 .listbox-noborder {
     margin: 0px 0px;
     border-style: none;
@@ -225,128 +225,128 @@ timezone-page {
 
 .person-icon {
     margin: 0 3px;
     list-style-image: url(chrome://calendar/skin/abcard.png);
 }
 
 .status-icon[status="ACCEPTED"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 12px 14px 0px);
 }
 .status-icon[status="ACCEPTED"][disabled="true"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(14px 12px 28px 0px);
 }
 
 .status-icon[status="DECLINED"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 24px 14px 12px);
 }
 .status-icon[status="DECLINED"][disabled="true"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(14px 24px 28px 12px);
 }
 
 .status-icon[status="NEEDS-ACTION"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 36px 14px 24px);
 }
 .status-icon[status="NEEDS-ACTION"][disabled="true"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(14px 36px 28px 24px);
 }
 
 .status-icon[status="TENTATIVE"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 48px 14px 36px);
 }
 .status-icon[status="TENTATIVE"][disabled="true"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(14px 48px 28px 36px);
 }
 
 .role-icon[role="REQ-PARTICIPANT"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 159px 16px 138px);
 }
 .role-icon[role="REQ-PARTICIPANT"][disabled="true"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 159px 16px 138px);
 }
 
 .role-icon[role="OPT-PARTICIPANT"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 180px 16px 159px);
 }
 .role-icon[role="OPT-PARTICIPANT"][disabled="true"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 180px 16px 159px);
 }
 
 .role-icon[role="CHAIR"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 201px 16px 180px);
 }
 .role-icon[role="CHAIR"][disabled="true"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 201px 16px 180px);
 }
 
 .role-icon[role="CHAIR"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 201px 16px 180px);
 }
 
 .zoom-in-icon {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 97px 14px 84px);
 }
 
 .zoom-out-icon {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 110px 14px 97px);
 }
 
 .left-icon {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 124px 14px 110px);
 }
 .left-icon[disabled="true"] {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(14px 124px 28px 110px);
 }
 
 .right-icon {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 138px 14px 124px);
 }
 .right-icon[disabled="true"] {
     margin: 3px 3px;
-    list-style-image: url(chrome://calendar/skin/sun-calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(14px 138px 28px 124px);
 }
 
 .legend {
     width: 3em;
     height: 1em;
     border-top: 1px solid #A1A1A1;
     border-right: 1px solid #C3C3C3;
rename from calendar/prototypes/wcap/sun-calendar-event-dialog.js
rename to calendar/base/content/dialogs/calendar-event-dialog.js
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog.js
+++ b/calendar/base/content/dialogs/calendar-event-dialog.js
@@ -127,17 +127,17 @@ function onLoad() {
     window.fbWrapper = args.fbWrapper;
 
     // the most important attribute we expect from the
     // arguments is the item we'll edit in the dialog.
     var item = args.calendarEvent;
 
     // new items should have a non-empty title.
     if (item.isMutable && (!item.title || item.title.length <= 0)) {
-        item.title = calGetString("sun-calendar-event-dialog",
+        item.title = calGetString("calendar-event-dialog",
                                   isEvent(item) ? "newEvent" : "newTask");
     }
 
     window.onAcceptCallback = args.onOk;
 
     // we store the item in the window to be able
     // to access this from any location. please note
     // that the item is either an occurrence [proxy]
@@ -169,21 +169,21 @@ function onLoad() {
     // info is a property of the parent item we need to check
     // whether or not this item is a proxy or a parent.
     var parentItem = item;
     if (parentItem.parentItem != parentItem) {
         parentItem = parentItem.parentItem;
     }
     window.recurrenceInfo = parentItem.recurrenceInfo;
 
-    document.getElementById("sun-calendar-event-dialog").getButton("accept")
+    document.getElementById("calendar-event-dialog").getButton("accept")
             .setAttribute("collapsed", "true");
-    document.getElementById("sun-calendar-event-dialog").getButton("cancel")
+    document.getElementById("calendar-event-dialog").getButton("cancel")
             .setAttribute("collapsed", "true");
-    document.getElementById("sun-calendar-event-dialog").getButton("cancel")
+    document.getElementById("calendar-event-dialog").getButton("cancel")
             .parentNode.setAttribute("collapsed", "true");
 
     loadDialog(window.calendarItem);
 
     opener.setCursor("auto");
 
     document.getElementById("item-title").focus();
     document.getElementById("item-title").select();
@@ -829,17 +829,17 @@ function updateTitle() {
         }
     }
     title += ': ';
     title += getElementValue("item-title");
     document.title = title;
 }
 
 function updateStyle() {
-    const kDialogStylesheet = "chrome://calendar/content/sun-calendar-event-dialog.css";
+    const kDialogStylesheet = "chrome://calendar/content/calendar-event-dialog.css";
 
     for each (var stylesheet in document.styleSheets) {
         if (stylesheet.href == kDialogStylesheet) {
             if (isSunbird()) {
                 stylesheet.insertRule(".lightning-only { display: none; }", 0);
             }
             if (isEvent(window.calendarItem)) {
                 stylesheet.insertRule(".todo-only { display: none; }", 0);
@@ -1087,17 +1087,17 @@ function editAttendees() {
     args.organizer = window.organizer && window.organizer.clone();
     args.calendar = calendar;
     args.item = window.calendarItem;
     args.onOk = callback;
     args.fbWrapper = window.fbWrapper;
 
     // open the dialog modally
     openDialog(
-        "chrome://calendar/content/sun-calendar-event-dialog-attendees.xul",
+        "chrome://calendar/content/calendar-event-dialog-attendees.xul",
         "_blank",
         "chrome,titlebar,modal,resizable",
         args);
 }
 
 function editPrivacy(target) {
     gPrivacy = target.getAttribute("privacy");
 
@@ -1322,19 +1322,19 @@ function updateShowTimeAs() {
 
 function attachURL() {
     var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                        .getService(Components.interfaces.nsIPromptService);
     if (promptService) {
         // ghost in an example...
         var result = { value: "http://" };
         if (promptService.prompt(window,
-                                 calGetString("sun-calendar-event-dialog",
+                                 calGetString("calendar-event-dialog",
                                               "specifyLinkLocation"),
-                                 calGetString("sun-calendar-event-dialog",
+                                 calGetString("calendar-event-dialog",
                                               "enterLinkLocation"),
                                  result,
                                  null,
                                  { value: 0 })) {
             
             try {
                 // If something bogus was entered, makeURL may fail.
                 var attachment = createAttachment();
@@ -1355,17 +1355,17 @@ function attachURL() {
  */
 function attachFile() {
     var files;
     try {
         const nsIFilePicker = Components.interfaces.nsIFilePicker;
         var fp = Components.classes["@mozilla.org/filepicker;1"]
                            .createInstance(nsIFilePicker);
         fp.init(window,
-                calGetString("sun-calendar-event-dialog", "selectAFile"),
+                calGetString("calendar-event-dialog", "selectAFile"),
                 nsIFilePicker.modeOpenMultiple);
   
         // Check for the last directory 
         var lastDir = lastDirectory();
         if (lastDir) {
             fp.displayDirectory = lastDir;
         }
  
@@ -1467,19 +1467,19 @@ function deleteAllAttachments() {
     var documentLink = document.getElementById("attachment-link");
     var itemCount = documentLink.getRowCount();
     var ok = (itemCount < 2);
 
     if (itemCount > 1) {
         var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                                       .getService(Components.interfaces.nsIPromptService);
         ok = promptService.confirm(window,
-                                       calGetString("sun-calendar-event-dialog",
+                                       calGetString("calendar-event-dialog",
                                                     "removeCalendarsTitle"),
-                                       calGetString("sun-calendar-event-dialog",
+                                       calGetString("calendar-event-dialog",
                                                     "removeCalendarsText",
                                                     [itemCount]),
                                        {});
     }
 
     if (ok) {
         var child;  
         var documentLink = document.getElementById("attachment-link");
@@ -1641,17 +1641,17 @@ function editRepeat() {
     args.onOk = function(recurrenceInfo) {
         savedWindow.recurrenceInfo = recurrenceInfo;
     };
 
     window.setCursor("wait");
 
     // open the dialog modally
     openDialog(
-        "chrome://calendar/content/sun-calendar-event-dialog-recurrence.xul",
+        "chrome://calendar/content/calendar-event-dialog-recurrence.xul",
         "_blank",
         "chrome,titlebar,modal,resizable",
         args);
 }
 
 /**
  * This function is responsilble for propagating UI state to controls
  * depending on the repeat setting of an item. This functionality is used
@@ -2069,17 +2069,17 @@ function editTimezone(aElementId,aDateTi
     // prepare the arguments that will be passed to the dialog
     var args = new Object();
     args.time = aDateTime;
     args.calendar = document.getElementById("item-calendar").selectedItem.calendar;
     args.onOk = aCallback;
 
     // open the dialog modally
     openDialog(
-        "chrome://calendar/content/sun-calendar-event-dialog-timezone.xul",
+        "chrome://calendar/content/calendar-event-dialog-timezone.xul",
         "_blank",
         "chrome,titlebar,modal,resizable",
         args);
 }
 
 // this function initializes the following controls:
 // - 'event-starttime'
 // - 'event-endtime'
@@ -2560,17 +2560,17 @@ function sendMailToAttendees(aAttendees)
                 toList += ",";
             }
             // Add this recipient id to the list.
             toList += email;
         }
     }
 
     // Set up the subject
-    var emailSubject = calGetString("sun-calendar-event-dialog",
+    var emailSubject = calGetString("calendar-event-dialog",
                                     "emailSubjectReply",
                                     [item.title]);
 
     sendMailTo(toList, emailSubject);
 }
 
 /**
  * Make sure all fields that may have calendar specific capabilities are updated
rename from calendar/prototypes/wcap/sun-calendar-event-dialog.xul
rename to calendar/base/content/dialogs/calendar-event-dialog.xul
--- a/calendar/prototypes/wcap/sun-calendar-event-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog.xul
@@ -34,62 +34,60 @@
    - 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 ***** -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/sun-calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/content/sun-calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 
 <!DOCTYPE dialog [
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
     <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
-    <!ENTITY % sunDialogDTD SYSTEM "chrome://calendar/locale/sun-calendar-event-dialog.dtd">
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %brandDTD;
     %globalDTD;
     %calendarDTD;
-    %sunDialogDTD;
     %eventDialogDTD;
 ]>
 
-<dialog id="sun-calendar-event-dialog"
+<dialog id="calendar-event-dialog"
         title="&event.title.label;"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <stringbundleset id="stringbundleset">
       <stringbundle id="languageBundle"
                     src="chrome://global/locale/languageNames.properties"/>
     </stringbundleset>
 
     <!-- Javascript includes -->
     <script type="application/javascript"
-            src="chrome://calendar/content/sun-calendar-event-dialog.js"/>
+            src="chrome://calendar/content/calendar-event-dialog.js"/>
     <script type="application/javascript"
             src="chrome://calendar/content/calendar-dialog-utils.js"/>
     <script type="application/javascript"
             src="chrome://calendar/content/calendar-ui-utils.js"/>
     <script type="application/javascript"
             src="chrome://calendar/content/calUtils.js"/>
     <script type="application/javascript"
             src="chrome://calendar/content/calApplicationUtils.js"/>
     <script type="application/javascript"
             src="chrome://global/content/globalOverlay.js"/>
     <script type="application/javascript"
             src="chrome://global/content/printUtils.js"/>
-    <script type="application/x-javascript" 
+    <script type="application/javascript" 
             src="chrome://calendar/content/calendar-statusbar.js"/>
 
     <!-- Command updater -->
     <commandset id="globalEditMenuItems"
                 commandupdater="true"
                 events="focus"
                 oncommandupdate="goUpdateGlobalEditMenuItems()"/>
     <commandset id="selectEditMenuItems"
rename from calendar/prototypes/wcap/calendar-invitations-dialog.css
rename to calendar/base/content/dialogs/calendar-invitations-dialog.css
rename from calendar/prototypes/wcap/calendar-invitations-dialog.js
rename to calendar/base/content/dialogs/calendar-invitations-dialog.js
rename from calendar/prototypes/wcap/calendar-invitations-dialog.xul
rename to calendar/base/content/dialogs/calendar-invitations-dialog.xul
rename from calendar/prototypes/wcap/calendar-invitations-list.xml
rename to calendar/base/content/dialogs/calendar-invitations-list.xml
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -1,186 +1,188 @@
 #filter substitution
-
 calendar.jar:
 % content calendar %content/calendar/
-    content/calendar/agenda-listbox.js           (content/agenda-listbox.js)
-    content/calendar/agenda-listbox.xml          (content/agenda-listbox.xml)
-    content/calendar/calendar-alarm-dialog.js    (content/calendar-alarm-dialog.js)
-    content/calendar/calendar-alarm-dialog.xul   (content/calendar-alarm-dialog.xul)
-    content/calendar/calendar-alarm-snooze-popup.xul   (content/calendar-alarm-snooze-popup.xul)
-    content/calendar/calendar-alarm-snooze-popup.js   (content/calendar-alarm-snooze-popup.js)
-    content/calendar/calendar-alarm-widget.xml   (content/calendar-alarm-widget.xml)
-    content/calendar/calendar-bindings.css       (content/calendar-bindings.css)
-    content/calendar/calendar-calendars-list.xul (content/calendar-calendars-list.xul)
-    content/calendar/calendar-chrome-startup.js  (content/calendar-chrome-startup.js)
-    content/calendar/calendar-common-sets.xul    (content/calendar-common-sets.xul)
-    content/calendar/calendar-common-sets.js     (content/calendar-common-sets.js)
-    content/calendar/calendar-creation.js        (content/calendar-creation.js)
-    content/calendar/calendar-daypicker.xml      (content/calendar-daypicker.xml)
-    content/calendar/calendar-decorated-base.xml  (content/calendar-decorated-base.xml)
-    content/calendar/calendar-decorated-multiday-base-view.xml  (content/calendar-decorated-multiday-base-view.xml)
-    content/calendar/calendar-decorated-day-view.xml  (content/calendar-decorated-day-view.xml)
-    content/calendar/calendar-decorated-week-view.xml  (content/calendar-decorated-week-view.xml)
-    content/calendar/calendar-decorated-multiweek-view.xml  (content/calendar-decorated-multiweek-view.xml)
-    content/calendar/calendar-decorated-month-view.xml  (content/calendar-decorated-month-view.xml)
-    content/calendar/calendar-dialog-utils.js    (content/calendar-dialog-utils.js)
-*   content/calendar/calendar-dnd-listener.js    (content/calendar-dnd-listener.js)
-    content/calendar/calendar-item-editing.js    (content/calendar-item-editing.js)
-    content/calendar/calendar-item-bindings.xml  (content/calendar-item-bindings.xml)
-    content/calendar/calendar-menus.xml          (content/calendar-menus.xml)
-*   content/calendar/calendar-month-view.xml     (content/calendar-month-view.xml)
-    content/calendar/calendar-multiday-view.xml  (content/calendar-multiday-view.xml)
-    content/calendar/calendar-occurrence-prompt.xul (content/calendar-occurrence-prompt.xul)
-    content/calendar/calendar-properties-dialog.xul (content/calendar-properties-dialog.xul)
-    content/calendar/calendar-properties-dialog.js (content/calendar-properties-dialog.js)
-    content/calendar/calendar-task-editing.js (content/calendar-task-editing.js)
-    content/calendar/calendar-task-tree.xml      (content/calendar-task-tree.xml)
-    content/calendar/calendar-task-tree.js       (content/calendar-task-tree.js)
-    content/calendar/calendar-task-view.xul      (content/calendar-task-view.xul)
-    content/calendar/calendar-task-view.js       (content/calendar-task-view.js)
-    content/calendar/calendar-ui-utils.js        (content/calendar-ui-utils.js)
-    content/calendar/calendar-unifinder.xul      (content/calendar-unifinder.xul)
-    content/calendar/calendar-unifinder.js       (content/calendar-unifinder.js)
-    content/calendar/calendar-unifinder-todo.xul (content/calendar-unifinder-todo.xul)
-    content/calendar/calendar-unifinder-todo.js  (content/calendar-unifinder-todo.js)
-    content/calendar/calendar-statusbar.js       (content/calendar-statusbar.js)
-    content/calendar/calendar-summary-dialog.js  (content/calendar-summary-dialog.js)
-    content/calendar/calendar-summary-dialog.xul (content/calendar-summary-dialog.xul)
-    content/calendar/today-pane.xul              (content/today-pane.xul)
-    content/calendar/today-pane.js               (content/today-pane.js)
-    content/calendar/calendar-management.js      (content/calendar-management.js)
-    content/calendar/calendar-subscriptions-dialog.css  (content/calendar-subscriptions-dialog.css)
-    content/calendar/calendar-subscriptions-dialog.js   (content/calendar-subscriptions-dialog.js)
-    content/calendar/calendar-subscriptions-dialog.xul  (content/calendar-subscriptions-dialog.xul)
-    content/calendar/calendar-subscriptions-list.xml    (content/calendar-subscriptions-list.xml)
-    content/calendar/widgets/minimonth.xml     (content/widgets/minimonth.xml)
-    content/calendar/widgets/calendar-widget-bindings.css    (content/widgets/calendar-widget-bindings.css)
-    content/calendar/calendar-view-bindings.css  (content/calendar-view-bindings.css)
-    content/calendar/calendar-view-core.xml      (content/calendar-view-core.xml)
-    content/calendar/calendar-views.js           (content/calendar-views.js)
-*   content/calendar/calApplicationUtils.js      (src/calApplicationUtils.js)
-    content/calendar/calUtils.js                 (src/calUtils.js)
-    content/calendar/calFilter.js                 (src/calFilter.js)
-    content/calendar/Windows98ToZoneInfoTZId.properties (src/Windows98ToZoneInfoTZId.properties)
-    content/calendar/WindowsNTToZoneInfoTZId.properties (src/WindowsNTToZoneInfoTZId.properties)
-    content/calendar/calErrorPrompt.xul          (content/calErrorPrompt.xul)
-    content/calendar/chooseCalendarDialog.xul    (content/chooseCalendarDialog.xul)
-    content/calendar/import-export.js            (content/import-export.js)
-*   content/calendar/migration.js                (content/migration.js)
-    content/calendar/migration.xul               (content/migration.xul)
-    content/calendar/widgets/calendar-widgets.xml  (content/widgets/calendar-widgets.xml)
-    content/calendar/widgets/calendar-widget-bindings.css       (content/widgets/calendar-widget-bindings.css)
-    content/calendar/preferences/alarms.xul      (content/preferences/alarms.xul)
-    content/calendar/preferences/alarms.js       (content/preferences/alarms.js)
-    content/calendar/preferences/categories.xul  (content/preferences/categories.xul)
-    content/calendar/preferences/categories.js   (content/preferences/categories.js)
-    content/calendar/preferences/editCategory.xul  (content/preferences/editCategory.xul)
-    content/calendar/preferences/general.js      (content/preferences/general.js)
-    content/calendar/preferences/general.xul     (content/preferences/general.xul)
-    content/calendar/preferences/timezones.js    (content/preferences/timezones.js)
-    content/calendar/preferences/timezones.xul   (content/preferences/timezones.xul)
-    content/calendar/preferences/views.js        (content/preferences/views.js)
-    content/calendar/preferences/views.xul       (content/preferences/views.xul)
-    content/calendar/sun-calendar-event-dialog.css  (/calendar/prototypes/wcap/sun-calendar-event-dialog.css)
-    content/calendar/sun-calendar-event-dialog.js  (/calendar/prototypes/wcap/sun-calendar-event-dialog.js)
-    content/calendar/sun-calendar-event-dialog.xul  (/calendar/prototypes/wcap/sun-calendar-event-dialog.xul)
-    content/calendar/sun-calendar-event-dialog-attendees.xml  (/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xml)
-    content/calendar/sun-calendar-event-dialog-freebusy.xml  (/calendar/prototypes/wcap/sun-calendar-event-dialog-freebusy.xml)
-    content/calendar/sun-calendar-event-dialog-recurrence.xul  (/calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.xul)
-    content/calendar/sun-calendar-event-dialog-recurrence.js  (/calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence.js)
-    content/calendar/sun-calendar-event-dialog-recurrence-preview.xml  (/calendar/prototypes/wcap/sun-calendar-event-dialog-recurrence-preview.xml)
-    content/calendar/sun-calendar-event-dialog-reminder.js  (/calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.js)
-    content/calendar/sun-calendar-event-dialog-reminder.xul  (/calendar/prototypes/wcap/sun-calendar-event-dialog-reminder.xul)
-    content/calendar/sun-calendar-event-dialog-timezone.js  (/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.js)
-    content/calendar/sun-calendar-event-dialog-timezone.xul  (/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul)
-    content/calendar/sun-calendar-event-dialog-attendees.xul  (/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.xul)
-    content/calendar/sun-calendar-event-dialog-attendees.js  (/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.js)
+    content/calendar/agenda-listbox.js                     (content/agenda-listbox.js)
+    content/calendar/agenda-listbox.xml                    (content/agenda-listbox.xml)
+    content/calendar/calendar-alarm-dialog.js              (content/calendar-alarm-dialog.js)
+    content/calendar/calendar-alarm-dialog.xul             (content/calendar-alarm-dialog.xul)
+    content/calendar/calendar-alarm-snooze-popup.xul       (content/calendar-alarm-snooze-popup.xul)
+    content/calendar/calendar-alarm-snooze-popup.js        (content/calendar-alarm-snooze-popup.js)
+    content/calendar/calendar-alarm-widget.xml             (content/calendar-alarm-widget.xml)
+    content/calendar/calendar-bindings.css                 (content/calendar-bindings.css)
+    content/calendar/calendar-calendars-list.xul           (content/calendar-calendars-list.xul)
+    content/calendar/calendar-chrome-startup.js            (content/calendar-chrome-startup.js)
+    content/calendar/calendar-common-sets.xul              (content/calendar-common-sets.xul)
+    content/calendar/calendar-common-sets.js               (content/calendar-common-sets.js)
+    content/calendar/calendar-creation.js                  (content/calendar-creation.js)
+    content/calendar/calendar-daypicker.xml                (content/calendar-daypicker.xml)
+    content/calendar/calendar-decorated-base.xml           (content/calendar-decorated-base.xml)
+    content/calendar/calendar-decorated-multiday-base-view.xml (content/calendar-decorated-multiday-base-view.xml)
+    content/calendar/calendar-decorated-day-view.xml       (content/calendar-decorated-day-view.xml)
+    content/calendar/calendar-decorated-week-view.xml      (content/calendar-decorated-week-view.xml)
+    content/calendar/calendar-decorated-multiweek-view.xml (content/calendar-decorated-multiweek-view.xml)
+    content/calendar/calendar-decorated-month-view.xml     (content/calendar-decorated-month-view.xml)
+    content/calendar/calendar-dialog-utils.js              (content/calendar-dialog-utils.js)
+*   content/calendar/calendar-dnd-listener.js              (content/calendar-dnd-listener.js)
+    content/calendar/calendar-item-editing.js              (content/calendar-item-editing.js)
+    content/calendar/calendar-item-bindings.xml            (content/calendar-item-bindings.xml)
+    content/calendar/calendar-menus.xml                    (content/calendar-menus.xml)
+*   content/calendar/calendar-month-view.xml               (content/calendar-month-view.xml)
+    content/calendar/calendar-multiday-view.xml            (content/calendar-multiday-view.xml)
+    content/calendar/calendar-occurrence-prompt.xul        (content/calendar-occurrence-prompt.xul)
+    content/calendar/calendar-properties-dialog.xul        (content/calendar-properties-dialog.xul)
+    content/calendar/calendar-properties-dialog.js         (content/calendar-properties-dialog.js)
+    content/calendar/calendar-task-editing.js              (content/calendar-task-editing.js)
+    content/calendar/calendar-task-tree.xml                (content/calendar-task-tree.xml)
+    content/calendar/calendar-task-tree.js                 (content/calendar-task-tree.js)
+    content/calendar/calendar-task-view.xul                (content/calendar-task-view.xul)
+    content/calendar/calendar-task-view.js                 (content/calendar-task-view.js)
+    content/calendar/calendar-ui-utils.js                  (content/calendar-ui-utils.js)
+    content/calendar/calendar-unifinder.xul                (content/calendar-unifinder.xul)
+    content/calendar/calendar-unifinder.js                 (content/calendar-unifinder.js)
+    content/calendar/calendar-unifinder-todo.xul           (content/calendar-unifinder-todo.xul)
+    content/calendar/calendar-unifinder-todo.js            (content/calendar-unifinder-todo.js)
+    content/calendar/calendar-statusbar.js                 (content/calendar-statusbar.js)
+    content/calendar/calendar-summary-dialog.js            (content/calendar-summary-dialog.js)
+    content/calendar/calendar-summary-dialog.xul           (content/calendar-summary-dialog.xul)
+    content/calendar/today-pane.xul                        (content/today-pane.xul)
+    content/calendar/today-pane.js                         (content/today-pane.js)
+    content/calendar/calendar-management.js                (content/calendar-management.js)
+    content/calendar/calendar-subscriptions-dialog.css     (content/calendar-subscriptions-dialog.css)
+    content/calendar/calendar-subscriptions-dialog.js      (content/calendar-subscriptions-dialog.js)
+    content/calendar/calendar-subscriptions-dialog.xul     (content/calendar-subscriptions-dialog.xul)
+    content/calendar/calendar-subscriptions-list.xml       (content/calendar-subscriptions-list.xml)
+    content/calendar/calendar-invitations-manager.js       (content/calendar-invitations-manager.js)
+    content/calendar/calendar-invitations-dialog.css       (content/dialogs/calendar-invitations-dialog.css)
+    content/calendar/calendar-invitations-dialog.js        (content/dialogs/calendar-invitations-dialog.js)
+    content/calendar/calendar-invitations-dialog.xul       (content/dialogs/calendar-invitations-dialog.xul)
+    content/calendar/calendar-invitations-list.xml         (content/dialogs/calendar-invitations-list.xml)
+    content/calendar/widgets/minimonth.xml                 (content/widgets/minimonth.xml)
+    content/calendar/calendar-view-bindings.css            (content/calendar-view-bindings.css)
+    content/calendar/calendar-view-core.xml                (content/calendar-view-core.xml)
+    content/calendar/calendar-views.js                     (content/calendar-views.js)
+*   content/calendar/calApplicationUtils.js                (src/calApplicationUtils.js)
+    content/calendar/calUtils.js                           (src/calUtils.js)
+    content/calendar/calFilter.js                          (src/calFilter.js)
+    content/calendar/Windows98ToZoneInfoTZId.properties    (src/Windows98ToZoneInfoTZId.properties)
+    content/calendar/WindowsNTToZoneInfoTZId.properties    (src/WindowsNTToZoneInfoTZId.properties)
+    content/calendar/calErrorPrompt.xul                    (content/calErrorPrompt.xul)
+    content/calendar/chooseCalendarDialog.xul              (content/chooseCalendarDialog.xul)
+    content/calendar/import-export.js                      (content/import-export.js)
+*   content/calendar/migration.js                          (content/migration.js)
+    content/calendar/migration.xul                         (content/migration.xul)
+    content/calendar/widgets/calendar-widgets.xml          (content/widgets/calendar-widgets.xml)
+    content/calendar/widgets/calendar-widget-bindings.css  (content/widgets/calendar-widget-bindings.css)
+    content/calendar/preferences/alarms.xul                (content/preferences/alarms.xul)
+    content/calendar/preferences/alarms.js                 (content/preferences/alarms.js)
+    content/calendar/preferences/categories.xul            (content/preferences/categories.xul)
+    content/calendar/preferences/categories.js             (content/preferences/categories.js)
+    content/calendar/preferences/editCategory.xul          (content/preferences/editCategory.xul)
+    content/calendar/preferences/general.js                (content/preferences/general.js)
+    content/calendar/preferences/general.xul               (content/preferences/general.xul)
+    content/calendar/preferences/timezones.js              (content/preferences/timezones.js)
+    content/calendar/preferences/timezones.xul             (content/preferences/timezones.xul)
+    content/calendar/preferences/views.js                  (content/preferences/views.js)
+    content/calendar/preferences/views.xul                 (content/preferences/views.xul)
+    content/calendar/calendar-event-dialog.css             (content/dialogs/calendar-event-dialog.css)
+    content/calendar/calendar-event-dialog.js              (content/dialogs/calendar-event-dialog.js)
+    content/calendar/calendar-event-dialog.xul             (content/dialogs/calendar-event-dialog.xul)
+    content/calendar/calendar-event-dialog-attendees.xml   (content/dialogs/calendar-event-dialog-attendees.xml)
+    content/calendar/calendar-event-dialog-freebusy.xml    (content/dialogs/calendar-event-dialog-freebusy.xml)
+    content/calendar/calendar-event-dialog-recurrence.xul  (content/dialogs/calendar-event-dialog-recurrence.xul)
+    content/calendar/calendar-event-dialog-recurrence.js   (content/dialogs/calendar-event-dialog-recurrence.js)
+    content/calendar/calendar-event-dialog-recurrence-preview.xml (content/dialogs/calendar-event-dialog-recurrence-preview.xml)
+    content/calendar/calendar-event-dialog-reminder.js     (content/dialogs/calendar-event-dialog-reminder.js)
+    content/calendar/calendar-event-dialog-reminder.xul    (content/dialogs/calendar-event-dialog-reminder.xul)
+    content/calendar/calendar-event-dialog-timezone.js     (content/dialogs/calendar-event-dialog-timezone.js)
+    content/calendar/calendar-event-dialog-timezone.xul    (content/dialogs/calendar-event-dialog-timezone.xul)
+    content/calendar/calendar-event-dialog-attendees.xul   (content/dialogs/calendar-event-dialog-attendees.xul)
+    content/calendar/calendar-event-dialog-attendees.js    (content/dialogs/calendar-event-dialog-attendees.js)
 % skin calendar classic/1.0 %skin/classic/calendar/
-    skin/classic/calendar/abcard.png             (themes/common/abcard.png)
-    skin/classic/calendar/alarm-suppressed.png   (themes/common/alarm-suppressed.png)
-    skin/classic/calendar/alarm-flashing.png     (themes/common/alarm-flashing.png)
-    skin/classic/calendar/alarm.png              (themes/common/alarm.png)
-#expand    skin/classic/calendar/cal-icon32.png         (themes/__THEME__/cal-icon32.png)
-#expand    skin/classic/calendar/daypicker-background.png  (/calendar/base/themes/common/daypicker-background.png)
-#expand    skin/classic/calendar/calendar-alarm-dialog.css   (themes/__THEME__/calendar-alarm-dialog.css)
-#expand    skin/classic/calendar/calendar-toolbar.css   (themes/__THEME__/calendar-toolbar.css)
-#expand    skin/classic/calendar/today-pane.css         (themes/__THEME__/today-pane.css)
-#expand    skin/classic/calendar/widgets/calendar-widgets.css   (themes/__THEME__/widgets/calendar-widgets.css)
-#expand    skin/classic/calendar/calendar-creation-wizard.css (themes/__THEME__/calendar-creation-wizard.css)
-#expand    skin/classic/calendar/calendar-event-dialog.css (themes/__THEME__/calendar-event-dialog.css)
-#expand    skin/classic/calendar/calendar-occurrence-prompt.css (themes/__THEME__/calendar-occurrence-prompt.css)
-#expand    skin/classic/calendar/calendar-occurrence-prompt.png (themes/__THEME__/calendar-occurrence-prompt.png)
-#expand    skin/classic/calendar/calendar-properties-dialog.css (themes/__THEME__/calendar-properties-dialog.css)
-#expand    skin/classic/calendar/calendar-unifinder.css (themes/__THEME__/calendar-unifinder.css)
-#expand    skin/classic/calendar/calendar-views.css     (themes/__THEME__/calendar-views.css)
-#expand    skin/classic/calendar/toolbar-large.png      (themes/__THEME__/toolbar-large.png)
-#expand    skin/classic/calendar/toolbar-small.png      (themes/__THEME__/toolbar-small.png)
-#expand    skin/classic/calendar/mode-switch-icons.png  (themes/__THEME__/mode-switch-icons.png)
-#expand    skin/classic/calendar/ok-cancel.png          (themes/__THEME__/ok-cancel.png)
-#expand    skin/classic/calendar/calendar-management.css  (themes/__THEME__/calendar-management.css)
-#expand    skin/classic/calendar/calendar-daypicker.css  (themes/__THEME__/calendar-daypicker.css)
-#expand    skin/classic/calendar/calendar-task-tree.css  (themes/__THEME__/calendar-task-tree.css)
-#expand    skin/classic/calendar/calendar-task-view.css  (themes/__THEME__/calendar-task-view.css)
-#expand    skin/classic/calendar/widgets/minimonth.css      (themes/__THEME__/widgets/minimonth.css)
-    skin/classic/calendar/calendar-status.png  (themes/common/calendar-status.png)
-    skin/classic/calendar/event-grippy-bottom.png  (themes/common/event-grippy-bottom.png)
-    skin/classic/calendar/event-grippy-left.png  (themes/common/event-grippy-left.png)
-    skin/classic/calendar/event-grippy-right.png (themes/common/event-grippy-right.png)
-    skin/classic/calendar/event-grippy-top.png   (themes/common/event-grippy-top.png)
-    skin/classic/calendar/gradient-overlay.png   (themes/common/gradient-overlay.png)
-    skin/classic/calendar/calendar-overlay.png   (themes/common/calendar-overlay.png)
-    skin/classic/calendar/category-overlay.png   (themes/common/category-overlay.png)
-    skin/classic/calendar/unifinder-images.png   (themes/common/unifinder-images.png)
-    skin/classic/calendar/day-box-item-image.png (themes/common/day-box-item-image.png)
-    skin/classic/calendar/widgets/nav-buttons.png (themes/common/widgets/nav-buttons.png)
-    skin/classic/calendar/calendar-day-label-back.png (themes/common/calendar-day-label-back.png)
-    skin/classic/calendar/widgets/view-navigation.png (themes/common/widgets/view-navigation.png)
-    skin/classic/calendar/mini-day-background.png (themes/common/mini-day-background.png)
-#expand    skin/classic/calendar/sun-calendar-event-dialog.css  (/calendar/prototypes/themes/__THEME__/sun-calendar-event-dialog.css)
-#expand    skin/classic/calendar/sun-calendar-event-dialog-attendees.png  (/calendar/prototypes/themes/__THEME__/sun-calendar-event-dialog-attendees.png)
-#expand    skin/classic/calendar/sun-calendar-event-dialog-toolbar.png  (/calendar/prototypes/themes/__THEME__/sun-calendar-event-dialog-toolbar.png)
-#expand    skin/classic/calendar/sun-calendar-event-dialog.png  (/calendar/prototypes/themes/__THEME__/sun-calendar-event-dialog.png)
-#expand    skin/classic/calendar/timezone_0h.png  (/calendar/prototypes/themes/__THEME__/timezone_0h.png)
-#expand    skin/classic/calendar/timezone_1h.png  (/calendar/prototypes/themes/__THEME__/timezone_1h.png)
-#expand    skin/classic/calendar/timezone_2h.png  (/calendar/prototypes/themes/__THEME__/timezone_2h.png)
-#expand    skin/classic/calendar/timezone_3h30.png  (/calendar/prototypes/themes/__THEME__/timezone_3h30.png)
-#expand    skin/classic/calendar/timezone_3h.png  (/calendar/prototypes/themes/__THEME__/timezone_3h.png)
-#expand    skin/classic/calendar/timezone_4h30.png  (/calendar/prototypes/themes/__THEME__/timezone_4h30.png)
-#expand    skin/classic/calendar/timezone_4h.png  (/calendar/prototypes/themes/__THEME__/timezone_4h.png)
-#expand    skin/classic/calendar/timezone_5h30.png  (/calendar/prototypes/themes/__THEME__/timezone_5h30.png)
-#expand    skin/classic/calendar/timezone_5h45.png  (/calendar/prototypes/themes/__THEME__/timezone_5h45.png)
-#expand    skin/classic/calendar/timezone_5h.png  (/calendar/prototypes/themes/__THEME__/timezone_5h.png)
-#expand    skin/classic/calendar/timezone_6h30.png  (/calendar/prototypes/themes/__THEME__/timezone_6h30.png)
-#expand    skin/classic/calendar/timezone_6h.png  (/calendar/prototypes/themes/__THEME__/timezone_6h.png)
-#expand    skin/classic/calendar/timezone_7h.png  (/calendar/prototypes/themes/__THEME__/timezone_7h.png)
-#expand    skin/classic/calendar/timezone_8h.png  (/calendar/prototypes/themes/__THEME__/timezone_8h.png)
-#expand    skin/classic/calendar/timezone_9h30.png  (/calendar/prototypes/themes/__THEME__/timezone_9h30.png)
-#expand    skin/classic/calendar/timezone_9h.png  (/calendar/prototypes/themes/__THEME__/timezone_9h.png)
-#expand    skin/classic/calendar/timezone_10h30.png  (/calendar/prototypes/themes/__THEME__/timezone_10h.png)
-#expand    skin/classic/calendar/timezone_10h.png  (/calendar/prototypes/themes/__THEME__/timezone_10h.png)
-#expand    skin/classic/calendar/timezone_11h30.png  (/calendar/prototypes/themes/__THEME__/timezone_11h.png)
-#expand    skin/classic/calendar/timezone_11h.png  (/calendar/prototypes/themes/__THEME__/timezone_11h.png)
-#expand    skin/classic/calendar/timezone_12h45.png  (/calendar/prototypes/themes/__THEME__/timezone_12h.png)
-#expand    skin/classic/calendar/timezone_12h.png  (/calendar/prototypes/themes/__THEME__/timezone_12h.png)
-#expand    skin/classic/calendar/timezone_13h.png  (/calendar/prototypes/themes/__THEME__/timezone_13h.png)
-#expand    skin/classic/calendar/timezone_14h.png  (/calendar/prototypes/themes/__THEME__/timezone_13h.png)
-#expand    skin/classic/calendar/timezone_-1h.png  (/calendar/prototypes/themes/__THEME__/timezone_-1h.png)
-#expand    skin/classic/calendar/timezone_-2h.png  (/calendar/prototypes/themes/__THEME__/timezone_-2h.png)
-#expand    skin/classic/calendar/timezone_-3h30.png  (/calendar/prototypes/themes/__THEME__/timezone_-3h30.png)
-#expand    skin/classic/calendar/timezone_-3h.png  (/calendar/prototypes/themes/__THEME__/timezone_-3h.png)
-#expand    skin/classic/calendar/timezone_-4h.png  (/calendar/prototypes/themes/__THEME__/timezone_-4h.png)
-#expand    skin/classic/calendar/timezone_-5h.png  (/calendar/prototypes/themes/__THEME__/timezone_-5h.png)
-#expand    skin/classic/calendar/timezone_-6h.png  (/calendar/prototypes/themes/__THEME__/timezone_-6h.png)
-#expand    skin/classic/calendar/timezone_-7h.png  (/calendar/prototypes/themes/__THEME__/timezone_-7h.png)
-#expand    skin/classic/calendar/timezone_-8h30.png  (/calendar/prototypes/themes/__THEME__/timezone_-8h30.png)
-#expand    skin/classic/calendar/timezone_-8h.png  (/calendar/prototypes/themes/__THEME__/timezone_-8h.png)
-#expand    skin/classic/calendar/timezone_-9h30.png  (/calendar/prototypes/themes/__THEME__/timezone_-9h30.png)
-#expand    skin/classic/calendar/timezone_-9h.png  (/calendar/prototypes/themes/__THEME__/timezone_-9h.png)
-#expand    skin/classic/calendar/timezone_-10h.png  (/calendar/prototypes/themes/__THEME__/timezone_-10h.png)
-#expand    skin/classic/calendar/timezone_-11h.png  (/calendar/prototypes/themes/__THEME__/timezone_-11h.png)
-#expand    skin/classic/calendar/timezone_-12h45.png  (/calendar/prototypes/themes/__THEME__/timezone_-12h45.png)
-#expand    skin/classic/calendar/timezone_-12h.png  (/calendar/prototypes/themes/__THEME__/timezone_-12h.png)
-#expand    skin/classic/calendar/timezone_map.png  (/calendar/prototypes/themes/__THEME__/timezone_map.png)
-#expand    skin/classic/calendar/calendar-invitations-dialog.css  (/calendar/prototypes/themes/__THEME__/calendar-invitations-dialog.css)
-#expand    skin/classic/calendar/calendar-invitations-dialog-button-images.png  (/calendar/prototypes/themes/__THEME__/calendar-invitations-dialog-button-images.png)
-#expand    skin/classic/calendar/calendar-invitations-dialog-list-images.png  (/calendar/prototypes/themes/__THEME__/calendar-invitations-dialog-list-images.png)
-#expand    skin/classic/calendar/calendar-subscriptions-dialog.css  (themes/__THEME__/calendar-subscriptions-dialog.css)
+    skin/classic/calendar/abcard.png                       (themes/common/abcard.png)
+    skin/classic/calendar/alarm-suppressed.png             (themes/common/alarm-suppressed.png)
+    skin/classic/calendar/alarm-flashing.png               (themes/common/alarm-flashing.png)
+    skin/classic/calendar/alarm.png                        (themes/common/alarm.png)
+    skin/classic/calendar/daypicker-background.png         (themes/common/daypicker-background.png)
+    skin/classic/calendar/cal-icon32.png                   (themes/@THEME@/cal-icon32.png)
+    skin/classic/calendar/calendar-alarm-dialog.css        (themes/@THEME@/calendar-alarm-dialog.css)
+    skin/classic/calendar/calendar-toolbar.css             (themes/@THEME@/calendar-toolbar.css)
+    skin/classic/calendar/today-pane.css                   (themes/@THEME@/today-pane.css)
+    skin/classic/calendar/widgets/calendar-widgets.css     (themes/@THEME@/widgets/calendar-widgets.css)
+    skin/classic/calendar/calendar-creation-wizard.css     (themes/@THEME@/calendar-creation-wizard.css)
+    skin/classic/calendar/calendar-event-dialog.css        (themes/@THEME@/calendar-event-dialog.css)
+    skin/classic/calendar/calendar-occurrence-prompt.css   (themes/@THEME@/calendar-occurrence-prompt.css)
+    skin/classic/calendar/calendar-occurrence-prompt.png   (themes/@THEME@/calendar-occurrence-prompt.png)
+    skin/classic/calendar/calendar-properties-dialog.css   (themes/@THEME@/calendar-properties-dialog.css)
+    skin/classic/calendar/calendar-unifinder.css           (themes/@THEME@/calendar-unifinder.css)
+    skin/classic/calendar/calendar-views.css               (themes/@THEME@/calendar-views.css)
+    skin/classic/calendar/toolbar-large.png                (themes/@THEME@/toolbar-large.png)
+    skin/classic/calendar/toolbar-small.png                (themes/@THEME@/toolbar-small.png)
+    skin/classic/calendar/mode-switch-icons.png            (themes/@THEME@/mode-switch-icons.png)
+    skin/classic/calendar/ok-cancel.png                    (themes/@THEME@/ok-cancel.png)
+    skin/classic/calendar/calendar-management.css          (themes/@THEME@/calendar-management.css)
+    skin/classic/calendar/calendar-daypicker.css           (themes/@THEME@/calendar-daypicker.css)
+    skin/classic/calendar/calendar-task-tree.css           (themes/@THEME@/calendar-task-tree.css)
+    skin/classic/calendar/calendar-task-view.css           (themes/@THEME@/calendar-task-view.css)
+    skin/classic/calendar/widgets/minimonth.css            (themes/@THEME@/widgets/minimonth.css)
+    skin/classic/calendar/calendar-status.png              (themes/common/calendar-status.png)
+    skin/classic/calendar/event-grippy-bottom.png          (themes/common/event-grippy-bottom.png)
+    skin/classic/calendar/event-grippy-left.png            (themes/common/event-grippy-left.png)
+    skin/classic/calendar/event-grippy-right.png           (themes/common/event-grippy-right.png)
+    skin/classic/calendar/event-grippy-top.png             (themes/common/event-grippy-top.png)
+    skin/classic/calendar/gradient-overlay.png             (themes/common/gradient-overlay.png)
+    skin/classic/calendar/calendar-overlay.png             (themes/common/calendar-overlay.png)
+    skin/classic/calendar/category-overlay.png             (themes/common/category-overlay.png)
+    skin/classic/calendar/unifinder-images.png             (themes/common/unifinder-images.png)
+    skin/classic/calendar/day-box-item-image.png           (themes/common/day-box-item-image.png)
+    skin/classic/calendar/widgets/nav-buttons.png          (themes/common/widgets/nav-buttons.png)
+    skin/classic/calendar/calendar-day-label-back.png      (themes/common/calendar-day-label-back.png)
+    skin/classic/calendar/widgets/view-navigation.png      (themes/common/widgets/view-navigation.png)
+    skin/classic/calendar/mini-day-background.png          (themes/common/mini-day-background.png)
+    skin/classic/calendar/calendar-event-dialog-attendees.png (themes/@THEME@/dialogs/calendar-event-dialog-attendees.png)
+    skin/classic/calendar/calendar-event-dialog-toolbar.png (themes/@THEME@/dialogs/calendar-event-dialog-toolbar.png)
+    skin/classic/calendar/calendar-event-dialog.png        (themes/@THEME@/dialogs/calendar-event-dialog.png)
+    skin/classic/calendar/timezone_0h.png                  (themes/@THEME@/dialogs/timezone_0h.png)
+    skin/classic/calendar/timezone_1h.png                  (themes/@THEME@/dialogs/timezone_1h.png)
+    skin/classic/calendar/timezone_2h.png                  (themes/@THEME@/dialogs/timezone_2h.png)
+    skin/classic/calendar/timezone_3h30.png                (themes/@THEME@/dialogs/timezone_3h30.png)
+    skin/classic/calendar/timezone_3h.png                  (themes/@THEME@/dialogs/timezone_3h.png)
+    skin/classic/calendar/timezone_4h30.png                (themes/@THEME@/dialogs/timezone_4h30.png)
+    skin/classic/calendar/timezone_4h.png                  (themes/@THEME@/dialogs/timezone_4h.png)
+    skin/classic/calendar/timezone_5h30.png                (themes/@THEME@/dialogs/timezone_5h30.png)
+    skin/classic/calendar/timezone_5h45.png                (themes/@THEME@/dialogs/timezone_5h45.png)
+    skin/classic/calendar/timezone_5h.png                  (themes/@THEME@/dialogs/timezone_5h.png)
+    skin/classic/calendar/timezone_6h30.png                (themes/@THEME@/dialogs/timezone_6h30.png)
+    skin/classic/calendar/timezone_6h.png                  (themes/@THEME@/dialogs/timezone_6h.png)
+    skin/classic/calendar/timezone_7h.png                  (themes/@THEME@/dialogs/timezone_7h.png)
+    skin/classic/calendar/timezone_8h.png                  (themes/@THEME@/dialogs/timezone_8h.png)
+    skin/classic/calendar/timezone_9h30.png                (themes/@THEME@/dialogs/timezone_9h30.png)
+    skin/classic/calendar/timezone_9h.png                  (themes/@THEME@/dialogs/timezone_9h.png)
+    skin/classic/calendar/timezone_10h30.png               (themes/@THEME@/dialogs/timezone_10h.png)
+    skin/classic/calendar/timezone_10h.png                 (themes/@THEME@/dialogs/timezone_10h.png)
+    skin/classic/calendar/timezone_11h30.png               (themes/@THEME@/dialogs/timezone_11h.png)
+    skin/classic/calendar/timezone_11h.png                 (themes/@THEME@/dialogs/timezone_11h.png)
+    skin/classic/calendar/timezone_12h45.png               (themes/@THEME@/dialogs/timezone_12h.png)
+    skin/classic/calendar/timezone_12h.png                 (themes/@THEME@/dialogs/timezone_12h.png)
+    skin/classic/calendar/timezone_13h.png                 (themes/@THEME@/dialogs/timezone_13h.png)
+    skin/classic/calendar/timezone_14h.png                 (themes/@THEME@/dialogs/timezone_13h.png)
+    skin/classic/calendar/timezone_-1h.png                 (themes/@THEME@/dialogs/timezone_-1h.png)
+    skin/classic/calendar/timezone_-2h.png                 (themes/@THEME@/dialogs/timezone_-2h.png)
+    skin/classic/calendar/timezone_-3h30.png               (themes/@THEME@/dialogs/timezone_-3h30.png)
+    skin/classic/calendar/timezone_-3h.png                 (themes/@THEME@/dialogs/timezone_-3h.png)
+    skin/classic/calendar/timezone_-4h.png                 (themes/@THEME@/dialogs/timezone_-4h.png)
+    skin/classic/calendar/timezone_-5h.png                 (themes/@THEME@/dialogs/timezone_-5h.png)
+    skin/classic/calendar/timezone_-6h.png                 (themes/@THEME@/dialogs/timezone_-6h.png)
+    skin/classic/calendar/timezone_-7h.png                 (themes/@THEME@/dialogs/timezone_-7h.png)
+    skin/classic/calendar/timezone_-8h30.png               (themes/@THEME@/dialogs/timezone_-8h30.png)
+    skin/classic/calendar/timezone_-8h.png                 (themes/@THEME@/dialogs/timezone_-8h.png)
+    skin/classic/calendar/timezone_-9h30.png               (themes/@THEME@/dialogs/timezone_-9h30.png)
+    skin/classic/calendar/timezone_-9h.png                 (themes/@THEME@/dialogs/timezone_-9h.png)
+    skin/classic/calendar/timezone_-10h.png                (themes/@THEME@/dialogs/timezone_-10h.png)
+    skin/classic/calendar/timezone_-11h.png                (themes/@THEME@/dialogs/timezone_-11h.png)
+    skin/classic/calendar/timezone_-12h45.png              (themes/@THEME@/dialogs/timezone_-12h45.png)
+    skin/classic/calendar/timezone_-12h.png                (themes/@THEME@/dialogs/timezone_-12h.png)
+    skin/classic/calendar/timezone_map.png                 (themes/@THEME@/dialogs/timezone_map.png)
+    skin/classic/calendar/calendar-invitations-dialog.css  (themes/@THEME@/dialogs/calendar-invitations-dialog.css)
+    skin/classic/calendar/calendar-invitations-dialog-button-images.png (themes/@THEME@/dialogs/calendar-invitations-dialog-button-images.png)
+    skin/classic/calendar/calendar-invitations-dialog-list-images.png (themes/@THEME@/dialogs/calendar-invitations-dialog-list-images.png)
+    skin/classic/calendar/calendar-subscriptions-dialog.css (themes/@THEME@/calendar-subscriptions-dialog.css)
--- a/calendar/base/themes/pinstripe/calendar-event-dialog.css
+++ b/calendar/base/themes/pinstripe/calendar-event-dialog.css
@@ -29,46 +29,287 @@
  * 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 ***** */
 
+/*--------------------------------------------------------------------
+ *   Event dialog toolbar buttons
+ *-------------------------------------------------------------------*/
+
+.cal-toolbarbutton-2 {
+    -moz-box-orient: vertical;
+    min-width: 0px;
+    list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar.png");
+}
+
+toolbar[mode="full"] .cal-toolbarbutton-2 {
+    min-width: 55px;
+}
+
+/*--------------------------------------------------------------------
+ *   Event dialog toolbar buttons - small
+ *-------------------------------------------------------------------*/
+
+toolbar[iconsize="small"] .cal-toolbarbutton-2 {
+    -moz-box-orient: vertical;
+    list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar.png");
+}
+
+/*--------------------------------------------------------------------
+ *   invite attendees button
+ *-------------------------------------------------------------------*/
+
+#button-attendees {
+  -moz-image-region: rect(0px 64px 32px 32px);
+}
+#button-attendees[disabled="true"],
+#button-attendees[disabled="true"]:hover,
+#button-attendees[disabled="true"]:hover:active {
+  -moz-image-region: rect(64px 64px 96px 32px);
+}
+#button-attendees:hover {
+  -moz-image-region: rect(32px 64px 64px 32px);
+}
+#button-attendees:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   spellcheck button
+ *-------------------------------------------------------------------*/
+
+#button-spellcheck {
+  -moz-image-region: rect(0px 96px 32px 64px);
+}
+#button-spellcheck[disabled="true"],
+#button-spellcheck[disabled="true"]:hover,
+#button-spellcheck[disabled="true"]:hover:active {
+  -moz-image-region: rect(64px 96px 96px 64px);
+}
+#button-spellcheck:hover {
+  -moz-image-region: rect(32px 96px 64px 64px);
+}
+#button-spellcheck:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   documents button
+ *-------------------------------------------------------------------*/
+
+#button-url {
+  -moz-image-region: rect(0px 128px 32px 96px);
+}
+#button-url[disabled="true"],
+#button-url[disabled="true"]:hover,
+#button-url[disabled="true"]:hover:active {
+  -moz-image-region: rect(64px 128px 96px 96px);
+}
+#button-url:hover {
+  -moz-image-region: rect(32px 128px 64px 96px);
+}
+#button-url:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   privacy button
+ *-------------------------------------------------------------------*/
+
+#button-privacy {
+  -moz-image-region: rect(0px 160px 32px 128px);
+}
+#button-privacy[disabled="true"],
+#button-privacy[disabled="true"]:hover,
+#button-privacy[disabled="true"]:hover:active {
+  -moz-image-region: rect(64px 160px 96px 128px);
+}
+#button-privacy:hover {
+  -moz-image-region: rect(32px 160px 64px 128px);
+}
+#button-privacy:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   save button
+ *-------------------------------------------------------------------*/
+
+#button-save {
+  -moz-image-region: rect(0px 192px 32px 160px);
+}
+#button-save[disabled="true"],
+#button-save[disabled="true"]:hover,
+#button-save[disabled="true"]:hover:active {
+  -moz-image-region: rect(64px 192px 96px 160px);
+}
+#button-save:hover {
+  -moz-image-region: rect(32px 192px 64px 160px);
+}
+#button-save:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   print button
+ *-------------------------------------------------------------------*/
+
+#button-print {
+  -moz-image-region: rect(0px 608px 32px 576px);
+}
+#button-print[disabled="true"],
+#button-print[disabled="true"]:hover,
+#button-print[disabled="true"]:hover:active {
+  -moz-image-region: rect(64px 608px 96px 576px);
+}
+#button-print:hover {
+  -moz-image-region: rect(32px 608px 64px 576px);
+}
+#button-print:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   help button
+ *-------------------------------------------------------------------*/
+
+#button-question {
+  -moz-image-region: rect(0px 768px 32px 736px);
+}
+#button-question[disabled="true"],
+#button-question[disabled="true"]:hover,
+#button-question[disabled="true"]:hover:active {
+  -moz-image-region: rect(64px 768px 96px 736px);
+}
+#button-question:hover {
+  -moz-image-region: rect(32px 768px 64px 736px);
+}
+#button-question:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Event dialog statusbar images
+ *-------------------------------------------------------------------*/
+
+.cal-statusbar-1 {
+    -moz-box-orient: vertical;
+    min-width: 0px;
+    list-style-image: url("chrome://calendar/skin/calendar-event-dialog.png");
+}
+
+/*--------------------------------------------------------------------
+ *   privacy "public" image
+ *-------------------------------------------------------------------*/
+
+#button-privacy-public {
+  -moz-image-region: rect(0px 28px 16px 0px);
+}
+#button-privacy-public:hover:active {
+  -moz-image-region: rect(0px 28px 16px 0px);
+}
+#button-privacy-public[disabled="true"] {
+  -moz-image-region: rect(0px 28px 16px 0px);
+}
+
+/*--------------------------------------------------------------------
+ *   privacy "private" image
+ *-------------------------------------------------------------------*/
+
+#button-privacy-private {
+  -moz-image-region: rect(0px 56px 16px 28px);
+}
+#button-privacy-private:hover:active {
+}
+#button-privacy-private[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   privacy "confidential" image
+ *-------------------------------------------------------------------*/
+
+#button-privacy-confidential {
+  -moz-image-region: rect(0px 84px 16px 56px);
+}
+#button-privacy-confidential:hover:active {
+}
+#button-privacy-confidential[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   importance "low" image
+ *-------------------------------------------------------------------*/
+
+#button-importance-low {
+  -moz-image-region: rect(0px 100px 16px 84px);
+}
+#button-importance-low:hover:active {
+}
+#button-importance-low[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   importance "medium" image
+ *-------------------------------------------------------------------*/
+
+#button-importance-medium {
+  -moz-image-region: rect(0px 116px 16px 100px);
+}
+#button-importance-medium:hover:active {
+}
+#button-importance-medium[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   importance "high" image
+ *-------------------------------------------------------------------*/
+
+#button-importance-high {
+  -moz-image-region: rect(0px 132px 16px 116px);
+}
+#button-importance-high:hover:active {
+}
+#button-importance-high[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   Recurrence dialog preview border
+ *-------------------------------------------------------------------*/
+#preview-border {
+    border: none;
+    padding: 0px;
+}
+
 #calendar-summary-dialog {
   min-width: 35em;
 }
 
 listbox[disabled="true"] {
   color: -moz-FieldText;
 }
 
 .headline {
   font-weight: bold;
 }
 
 .headline[align=end],
 .headline[align=right]{
-  text-align: right;  
+  text-align: right;
 }
 
 .default-spacer {
   width: 1em;
   height: 1em;
 }
 
 .default-indent {
   -moz-margin-start: 1.5em;
 }
 
 .status-icon {
   margin: 0 3px;
   display: none;
-  list-style-image: url("chrome://calendar/skin/sun-calendar-event-dialog-attendees.png");
+  list-style-image: url("chrome://calendar/skin/calendar-event-dialog-attendees.png");
 }
 
 .status-icon[status="ACCEPTED"] {
   display: inline;
   -moz-image-region: rect(0px 12px 14px 0px);
 }
 
 .status-icon[status="DECLINED"] {
rename from calendar/prototypes/themes/pinstripe/sun-calendar-event-dialog-attendees.png
rename to calendar/base/themes/pinstripe/dialogs/calendar-event-dialog-attendees.png
rename from calendar/prototypes/themes/pinstripe/sun-calendar-event-dialog-toolbar.png
rename to calendar/base/themes/pinstripe/dialogs/calendar-event-dialog-toolbar.png
rename from calendar/prototypes/themes/pinstripe/sun-calendar-event-dialog.png
rename to calendar/base/themes/pinstripe/dialogs/calendar-event-dialog.png
old mode 100755
new mode 100644
rename from calendar/prototypes/themes/pinstripe/calendar-invitations-dialog-button-images.png
rename to calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog-button-images.png
old mode 100755
new mode 100644
rename from calendar/prototypes/themes/pinstripe/calendar-invitations-dialog-list-images.png
rename to calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog-list-images.png
rename from calendar/prototypes/themes/pinstripe/calendar-invitations-dialog.css
rename to calendar/base/themes/pinstripe/dialogs/calendar-invitations-dialog.css
rename from calendar/prototypes/themes/pinstripe/timezone_-10h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-10h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-11h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-11h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-12h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-12h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-12h45.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-12h45.png
rename from calendar/prototypes/themes/pinstripe/timezone_-1h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-1h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-2h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-2h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-3h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-3h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-3h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-3h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_-4h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-4h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-5h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-5h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-6h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-6h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-7h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-7h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-8h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-8h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-8h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-8h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_-9h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-9h.png
rename from calendar/prototypes/themes/pinstripe/timezone_-9h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_-9h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_0h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_0h.png
rename from calendar/prototypes/themes/pinstripe/timezone_10h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_10h.png
rename from calendar/prototypes/themes/pinstripe/timezone_10h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_10h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_11h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_11h.png
rename from calendar/prototypes/themes/pinstripe/timezone_11h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_11h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_12h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_12h.png
rename from calendar/prototypes/themes/pinstripe/timezone_12h45.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_12h45.png
rename from calendar/prototypes/themes/pinstripe/timezone_13h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_13h.png
rename from calendar/prototypes/themes/pinstripe/timezone_14h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_14h.png
rename from calendar/prototypes/themes/pinstripe/timezone_1h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_1h.png
rename from calendar/prototypes/themes/pinstripe/timezone_2h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_2h.png
rename from calendar/prototypes/themes/pinstripe/timezone_3h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_3h.png
rename from calendar/prototypes/themes/pinstripe/timezone_3h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_3h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_4h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_4h.png
rename from calendar/prototypes/themes/pinstripe/timezone_4h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_4h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_5h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_5h.png
rename from calendar/prototypes/themes/pinstripe/timezone_5h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_5h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_5h45.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_5h45.png
rename from calendar/prototypes/themes/pinstripe/timezone_6h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_6h.png
rename from calendar/prototypes/themes/pinstripe/timezone_6h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_6h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_7h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_7h.png
rename from calendar/prototypes/themes/pinstripe/timezone_8h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_8h.png
rename from calendar/prototypes/themes/pinstripe/timezone_9h.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_9h.png
rename from calendar/prototypes/themes/pinstripe/timezone_9h30.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_9h30.png
rename from calendar/prototypes/themes/pinstripe/timezone_map.png
rename to calendar/base/themes/pinstripe/dialogs/timezone_map.png
--- a/calendar/base/themes/winstripe/calendar-event-dialog.css
+++ b/calendar/base/themes/winstripe/calendar-event-dialog.css
@@ -29,46 +29,285 @@
  * 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 ***** */
 
+/*--------------------------------------------------------------------
+ *   Event dialog toolbar buttons
+ *-------------------------------------------------------------------*/
+
+.cal-toolbarbutton-2 {
+    -moz-box-orient: vertical;
+    min-width: 0px;
+    list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar.png");
+}
+
+toolbar[mode="full"] .cal-toolbarbutton-2 {
+    min-width: 55px;
+}
+
+/*--------------------------------------------------------------------
+ *   Event dialog toolbar buttons - small
+ *-------------------------------------------------------------------*/
+
+toolbar[iconsize="small"] .cal-toolbarbutton-2 {
+    -moz-box-orient: vertical;
+    list-style-image: url("chrome://calendar/skin/calendar-event-dialog-toolbar.png");
+}
+
+/*--------------------------------------------------------------------
+ *   invite attendees button
+ *-------------------------------------------------------------------*/
+
+#button-attendees {
+    -moz-image-region: rect(0px 48px 24px 24px);
+}
+#button-attendees[disabled="true"],
+#button-attendees[disabled="true"]:hover,
+#button-attendees[disabled="true"]:hover:active {
+    -moz-image-region: rect(48px 48px 72px 24px);
+}
+#button-attendees:hover {
+    -moz-image-region: rect(24px 48px 48px 24px);
+}
+#button-attendees:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   spellcheck button
+ *-------------------------------------------------------------------*/
+
+#button-spellcheck {
+    -moz-image-region: rect(0px 72px 24px 48px);
+}
+#button-spellcheck[disabled="true"],
+#button-spellcheck[disabled="true"]:hover,
+#button-spellcheck[disabled="true"]:hover:active {
+    -moz-image-region: rect(48px 72px 72px 48px);
+}
+#button-spellcheck:hover {
+    -moz-image-region: rect(24px 72px 48px 48px);
+}
+#button-spellcheck:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   documents button
+ *-------------------------------------------------------------------*/
+
+#button-url {
+    -moz-image-region: rect(0px 96px 24px 72px);
+}
+#button-url[disabled="true"],
+#button-url[disabled="true"]:hover,
+#button-url[disabled="true"]:hover:active {
+    -moz-image-region: rect(48px 96px 72px 72px);
+}
+#button-url:hover {
+    -moz-image-region: rect(24px 96px 48px 72px);
+}
+#button-url:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   privacy button
+ *-------------------------------------------------------------------*/
+
+#button-privacy {
+    -moz-image-region: rect(0px 120px 24px 96px);
+}
+#button-privacy[disabled="true"],
+#button-privacy[disabled="true"]:hover,
+#button-privacy[disabled="true"]:hover:active {
+    -moz-image-region: rect(48px 120px 72px 96px);
+}
+#button-privacy:hover {
+    -moz-image-region: rect(24px 120px 48px 96px);
+}
+#button-privacy:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   save button
+ *-------------------------------------------------------------------*/
+
+#button-save {
+    -moz-image-region: rect(0px 144px 24px 120px);
+}
+#button-save[disabled="true"],
+#button-save[disabled="true"]:hover,
+#button-save[disabled="true"]:hover:active {
+    -moz-image-region: rect(48px 144px 72px 120px);
+}
+#button-save:hover {
+    -moz-image-region: rect(24px 144px 48px 120px);
+}
+#button-save:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   print button
+ *-------------------------------------------------------------------*/
+
+#button-print {
+    -moz-image-region: rect(0px 456px 24px 432px);
+}
+#button-print[disabled="true"],
+#button-print[disabled="true"]:hover,
+#button-print[disabled="true"]:hover:active {
+    -moz-image-region: rect(48px 456px 72px 432px);
+}
+#button-print:hover {
+    -moz-image-region: rect(24px 456px 48px 432px);
+}
+#button-print:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   help button
+ *-------------------------------------------------------------------*/
+
+#button-question {
+    -moz-image-region: rect(0px 576px 24px 552px);
+}
+#button-question[disabled="true"],
+#button-question[disabled="true"]:hover,
+#button-question[disabled="true"]:hover:active {
+    -moz-image-region: rect(48px 576px 72px 552px);
+}
+#button-question:hover {
+    -moz-image-region: rect(24px 576px 48px 552px);
+}
+#button-question:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Event dialog statusbar images
+ *-------------------------------------------------------------------*/
+
+.cal-statusbar-1 {
+    -moz-box-orient: vertical;
+    min-width: 0px;
+    list-style-image: url("chrome://calendar/skin/calendar-event-dialog.png");
+}
+
+/*--------------------------------------------------------------------
+ *   privacy "public" image
+ *-------------------------------------------------------------------*/
+
+#button-privacy-public {
+    -moz-image-region: rect(0px 28px 16px 0px);
+}
+#button-privacy-public:hover:active {
+}
+#button-privacy-public[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   privacy "private" image
+ *-------------------------------------------------------------------*/
+
+#button-privacy-private {
+    -moz-image-region: rect(0px 56px 16px 28px);
+}
+#button-privacy-private:hover:active {
+}
+#button-privacy-private[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   privacy "confidential" image
+ *-------------------------------------------------------------------*/
+
+#button-privacy-confidential {
+    -moz-image-region: rect(0px 84px 16px 56px);
+}
+#button-privacy-confidential:hover:active {
+}
+#button-privacy-confidential[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   importance "low" image
+ *-------------------------------------------------------------------*/
+
+#button-importance-low {
+    -moz-image-region: rect(0px 100px 16px 84px);
+}
+#button-importance-low:hover:active {
+}
+#button-importance-low[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   importance "medium" image
+ *-------------------------------------------------------------------*/
+
+#button-importance-medium {
+    -moz-image-region: rect(0px 116px 16px 100px);
+}
+#button-importance-medium:hover:active {
+}
+#button-importance-medium[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   importance "high" image
+ *-------------------------------------------------------------------*/
+
+#button-importance-high {
+    -moz-image-region: rect(0px 132px 16px 116px);
+}
+#button-importance-high:hover:active {
+}
+#button-importance-high[disabled="true"] {
+}
+
+/*--------------------------------------------------------------------
+ *   Recurrence dialog preview border
+ *-------------------------------------------------------------------*/
+#preview-border {
+    border: none;
+    padding: 0px;
+}
+
 #calendar-summary-dialog {
   min-width: 35em;
 }
 
 listbox[disabled="true"] {
   color: -moz-FieldText;
 }
 
 .headline {
   font-weight: bold;
 }
 
 .headline[align=end],
 .headline[align=right]{
-  text-align: right;  
+  text-align: right;
 }
 
 .default-spacer {
   width: 1em;
   height: 1em;
 }
 
 .default-indent {
   -moz-margin-start: 1.5em;
 }
 
 .status-icon {
   margin: 0 3px;
   display: none;
-  list-style-image: url("chrome://calendar/skin/sun-calendar-event-dialog-attendees.png");
+  list-style-image: url("chrome://calendar/skin/calendar-event-dialog-attendees.png");
 }
 
 .status-icon[status="ACCEPTED"] {
   display: inline;
   -moz-image-region: rect(0px 12px 14px 0px);
 }
 
 .status-icon[status="DECLINED"] {
rename from calendar/prototypes/themes/winstripe/sun-calendar-event-dialog-attendees.png
rename to calendar/base/themes/winstripe/dialogs/calendar-event-dialog-attendees.png
rename from calendar/prototypes/themes/winstripe/sun-calendar-event-dialog-toolbar.png
rename to calendar/base/themes/winstripe/dialogs/calendar-event-dialog-toolbar.png
rename from calendar/prototypes/themes/winstripe/sun-calendar-event-dialog.png
rename to calendar/base/themes/winstripe/dialogs/calendar-event-dialog.png
old mode 100755
new mode 100644
rename from calendar/prototypes/themes/winstripe/calendar-invitations-dialog-button-images.png
rename to calendar/base/themes/winstripe/dialogs/calendar-invitations-dialog-button-images.png
old mode 100755
new mode 100644
rename from calendar/prototypes/themes/winstripe/calendar-invitations-dialog-list-images.png
rename to calendar/base/themes/winstripe/dialogs/calendar-invitations-dialog-list-images.png
rename from calendar/prototypes/themes/winstripe/calendar-invitations-dialog.css
rename to calendar/base/themes/winstripe/dialogs/calendar-invitations-dialog.css
rename from calendar/prototypes/themes/winstripe/timezone_-10h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-10h.png
rename from calendar/prototypes/themes/winstripe/timezone_-11h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-11h.png
rename from calendar/prototypes/themes/winstripe/timezone_-12h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-12h.png
rename from calendar/prototypes/themes/winstripe/timezone_-12h45.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-12h45.png
rename from calendar/prototypes/themes/winstripe/timezone_-1h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-1h.png
rename from calendar/prototypes/themes/winstripe/timezone_-2h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-2h.png
rename from calendar/prototypes/themes/winstripe/timezone_-3h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-3h.png
rename from calendar/prototypes/themes/winstripe/timezone_-3h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-3h30.png
rename from calendar/prototypes/themes/winstripe/timezone_-4h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-4h.png
rename from calendar/prototypes/themes/winstripe/timezone_-5h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-5h.png
rename from calendar/prototypes/themes/winstripe/timezone_-6h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-6h.png
rename from calendar/prototypes/themes/winstripe/timezone_-7h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-7h.png
rename from calendar/prototypes/themes/winstripe/timezone_-8h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-8h.png
rename from calendar/prototypes/themes/winstripe/timezone_-8h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-8h30.png
rename from calendar/prototypes/themes/winstripe/timezone_-9h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-9h.png
rename from calendar/prototypes/themes/winstripe/timezone_-9h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_-9h30.png
rename from calendar/prototypes/themes/winstripe/timezone_0h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_0h.png
rename from calendar/prototypes/themes/winstripe/timezone_10h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_10h.png
rename from calendar/prototypes/themes/winstripe/timezone_10h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_10h30.png
rename from calendar/prototypes/themes/winstripe/timezone_11h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_11h.png
rename from calendar/prototypes/themes/winstripe/timezone_11h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_11h30.png
rename from calendar/prototypes/themes/winstripe/timezone_12h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_12h.png
rename from calendar/prototypes/themes/winstripe/timezone_12h45.png
rename to calendar/base/themes/winstripe/dialogs/timezone_12h45.png
rename from calendar/prototypes/themes/winstripe/timezone_13h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_13h.png
rename from calendar/prototypes/themes/winstripe/timezone_14h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_14h.png
rename from calendar/prototypes/themes/winstripe/timezone_1h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_1h.png
rename from calendar/prototypes/themes/winstripe/timezone_2h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_2h.png
rename from calendar/prototypes/themes/winstripe/timezone_3h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_3h.png
rename from calendar/prototypes/themes/winstripe/timezone_3h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_3h30.png
rename from calendar/prototypes/themes/winstripe/timezone_4h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_4h.png
rename from calendar/prototypes/themes/winstripe/timezone_4h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_4h30.png
rename from calendar/prototypes/themes/winstripe/timezone_5h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_5h.png
rename from calendar/prototypes/themes/winstripe/timezone_5h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_5h30.png
rename from calendar/prototypes/themes/winstripe/timezone_5h45.png
rename to calendar/base/themes/winstripe/dialogs/timezone_5h45.png
rename from calendar/prototypes/themes/winstripe/timezone_6h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_6h.png
rename from calendar/prototypes/themes/winstripe/timezone_6h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_6h30.png
rename from calendar/prototypes/themes/winstripe/timezone_7h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_7h.png
rename from calendar/prototypes/themes/winstripe/timezone_8h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_8h.png
rename from calendar/prototypes/themes/winstripe/timezone_9h.png
rename to calendar/base/themes/winstripe/dialogs/timezone_9h.png
rename from calendar/prototypes/themes/winstripe/timezone_9h30.png
rename to calendar/base/themes/winstripe/dialogs/timezone_9h30.png
rename from calendar/prototypes/themes/winstripe/timezone_map.png
rename to calendar/base/themes/winstripe/dialogs/timezone_map.png
--- a/calendar/lightning/content/toolkit-overlay-custombar.xul
+++ b/calendar/lightning/content/toolkit-overlay-custombar.xul
@@ -32,11 +32,11 @@
    - 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 ***** -->
 
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-toolbar.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/sun-calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" />
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -59,14 +59,9 @@ calendar.jar:
 * content/calendar/datetimepickers/datetimepickers.xml (/calendar/resources/content/datetimepickers/datetimepickers.xml)
 * content/calendar/printDialog.js                (/calendar/resources/content/printDialog.js)
   content/calendar/printDialog.xul               (/calendar/resources/content/printDialog.xul)
   content/calendar/publish.js                   (/calendar/resources/content/publish.js)
   content/calendar/publishDialog.js             (/calendar/resources/content/publishDialog.js)    
   content/calendar/publishDialog.xul            (/calendar/resources/content/publishDialog.xul)
   content/calendar/clipboard.js                 (/calendar/resources/content/clipboard.js)
   content/calendar/sound.wav                    (/calendar/resources/content/sound.wav)
-  content/calendar/calendar-invitations-manager.js	(/calendar/prototypes/wcap/calendar-invitations-manager.js)
-  content/calendar/calendar-invitations-dialog.css	(/calendar/prototypes/wcap/calendar-invitations-dialog.css)
-  content/calendar/calendar-invitations-dialog.js	(/calendar/prototypes/wcap/calendar-invitations-dialog.js)
-  content/calendar/calendar-invitations-dialog.xul	(/calendar/prototypes/wcap/calendar-invitations-dialog.xul)
-  content/calendar/calendar-invitations-list.xml	(/calendar/prototypes/wcap/calendar-invitations-list.xml)
 #expand    skin/classic/calendar/datetimepickers/datetimepickers.css  (/calendar/resources/skin/classic/datetimepickers/datetimepickers.css)
--- a/calendar/locales/en-US/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/locales/en-US/chrome/calendar/calendar-event-dialog.dtd
@@ -1,9 +1,9 @@
- <!-- ***** BEGIN LICENSE BLOCK *****
+<!-- ***** 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,
@@ -15,16 +15,22 @@
    -
    - 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):
    -   Cédric Corazza <cedric.corazza@wanadoo.fr>
+   -   Michael Buettner <michael.buettner@sun.com>
+   -   Philipp Kewisch <mozilla@kewis.ch>
+   -   Stefan Sitter <ssitter@gmail.com>
+   -   Martin Schroeder <mschroeder@mozilla.x-home.org>
+   -   Hubert Gajewski <hubert@hubertgajewski.com>, Aviary.pl
+   -   Fred Jendrzejewski <fred.jen@web.de>
    -
    - 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
@@ -32,16 +38,19 @@
    - 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 ***** -->
 
 <!ENTITY event.title.label                  "Edit Item" >
 
+<!ENTITY newevent.before.label              "before" >
+<!ENTITY newevent.after.label               "after" >
+
 <!ENTITY newevent.from.label                "From" >
 <!ENTITY newevent.to.label                  "To" >
 <!ENTITY newevent.attendees.sendEmail.label "Send attendees invitations via email">
 
 <!ENTITY newevent.status.label              "Status" >
 <!ENTITY newevent.status.accesskey          "S" >
 <!ENTITY newevent.status.none.label         "Not specified" >
 <!ENTITY newevent.status.cancelled.label    "Cancelled" >
@@ -49,15 +58,336 @@
 <!ENTITY newevent.status.confirmed.label    "Confirmed" >
 <!ENTITY newevent.status.needsaction.label  "Needs Action" >
 <!ENTITY newevent.status.inprogress.label   "In Process" >
 <!ENTITY newevent.status.completed.label    "Completed on" >
 
 <!-- The following entity is for New Task dialog only -->
 <!ENTITY newtodo.percentcomplete.label      "&#37; complete">
 
-<!-- Alarm -->
+<!-- Menubar -->
+<!ENTITY  event.menu.file.label                           "File">
+<!ENTITY  event.menu.file.accesskey                       "F">
+<!ENTITY  event.menu.file.new.label                       "New">
+<!ENTITY  event.menu.file.new.accesskey                   "N">
+<!ENTITY  event.menu.file.new.event.label                 "Event">
+<!ENTITY  event.menu.file.new.event.accesskey             "E">
+<!ENTITY  event.menu.file.new.message.label               "Message">
+<!ENTITY  event.menu.file.new.message.accesskey           "M">
+<!ENTITY  event.menu.file.new.address.label               "Address Book Card">
+<!ENTITY  event.menu.file.new.address.accesskey           "C">
+<!ENTITY  event.menu.file.close.label                     "Close">
+<!ENTITY  event.menu.file.close.accesskey                 "C">
+<!ENTITY  event.menu.file.save.label                      "Save">
+<!ENTITY  event.menu.file.save.accesskey                  "S">
+<!ENTITY  event.menu.file.page.setup.label                "Page Setup">
+<!ENTITY  event.menu.file.page.setup.accesskey            "u">
+<!ENTITY  event.menu.file.print.label                     "Print">
+<!ENTITY  event.menu.file.print.accesskey                 "P">
+<!ENTITY  event.menu.file.exit.label                      "Exit">
+<!ENTITY  event.menu.file.exit.accesskey                  "x">
+
+<!ENTITY  event.menu.edit.label                           "Edit">
+<!ENTITY  event.menu.edit.accesskey                       "E">
+<!ENTITY  event.menu.edit.undo.label                      "Undo">
+<!ENTITY  event.menu.edit.undo.accesskey                  "U">
+<!ENTITY  event.menu.edit.redo.label                      "Redo">
+<!ENTITY  event.menu.edit.redo.accesskey                  "R">
+<!ENTITY  event.menu.edit.cut.label                       "Cut">
+<!ENTITY  event.menu.edit.cut.accesskey                   "t">
+<!ENTITY  event.menu.edit.copy.label                      "Copy">
+<!ENTITY  event.menu.edit.copy.accesskey                  "C">
+<!ENTITY  event.menu.edit.paste.label                     "Paste">
+<!ENTITY  event.menu.edit.paste.accesskey                 "P">
+<!ENTITY  event.menu.edit.select.all.label                "Select All">
+<!ENTITY  event.menu.edit.select.all.accesskey            "A">
+
+<!ENTITY  event.menu.view.label                           "View">
+<!ENTITY  event.menu.view.accesskey                       "V">
+<!ENTITY  event.menu.view.toolbars.label                  "Toolbars">
+<!ENTITY  event.menu.view.toolbars.accesskey              "T">
+<!ENTITY  event.menu.view.toolbars.event.label            "Event Toolbar">
+<!ENTITY  event.menu.view.toolbars.event.accesskey        "E">
+<!ENTITY  event.menu.view.toolbars.customize.label        "Customize…">
+<!ENTITY  event.menu.view.toolbars.customize.accesskey    "C">
+<!ENTITY  event.menu.view.showlink.label                  "Show Related Link">
+<!ENTITY  event.menu.view.showlink.accesskey              "R">
+
+<!ENTITY  event.menu.options.label                            "Options">
+<!ENTITY  event.menu.options.accesskey                        "O">
+<!ENTITY  event.menu.options.attachments.label                "Attach Webpage…">
+<!ENTITY  event.menu.options.attachments.accesskey            "W">
+<!ENTITY  event.menu.options.attendees.label                  "Invite Attendees…">
+<!ENTITY  event.menu.options.attendees.accesskey              "I">
+<!ENTITY  event.menu.options.spellcheck.label                 "Check Spelling…">
+<!ENTITY  event.menu.options.spellcheck.accesskey             "h">
+<!ENTITY  event.menu.options.inline.spellcheck.label          "Spell Check As You Type">
+<!ENTITY  event.menu.options.inline.spellcheck.accesskey      "S">
+<!ENTITY  event.menu.options.link.label                       "Add Link…">
+<!ENTITY  event.menu.options.link.accesskey                   "L">
+<!ENTITY  event.menu.options.timezone.label                   "Timezone">
+<!ENTITY  event.menu.options.timezone.accesskey               "z">
+<!ENTITY  event.menu.options.priority2.label                  "Priority">
+<!ENTITY  event.menu.options.priority2.accesskey              "y">
+<!ENTITY  event.menu.options.priority.notspecified.label      "Not specified">
+<!ENTITY  event.menu.options.priority.notspecified.accesskey  "o">
+<!ENTITY  event.menu.options.priority.low.label               "Low">
+<!ENTITY  event.menu.options.priority.low.accesskey           "L">
+<!ENTITY  event.menu.options.priority.normal.label            "Normal">
+<!ENTITY  event.menu.options.priority.normal.accesskey        "N">
+<!ENTITY  event.menu.options.priority.high.label              "High">
+<!ENTITY  event.menu.options.priority.high.accesskey          "H">
+<!ENTITY  event.menu.options.privacy.label                    "Privacy">
+<!ENTITY  event.menu.options.privacy.accesskey                "P">
+<!ENTITY  event.menu.options.privacy.public.label             "Public Event">
+<!ENTITY  event.menu.options.privacy.public.accesskey         "u">
+<!ENTITY  event.menu.options.privacy.confidential.label       "Show Time and Date Only">
+<!ENTITY  event.menu.options.privacy.confidential.accesskey   "S">
+<!ENTITY  event.menu.options.privacy.private.label            "Private Event">
+<!ENTITY  event.menu.options.privacy.private.accesskey        "r">
+<!ENTITY  event.menu.options.show.time.label                  "Show Time as">
+<!ENTITY  event.menu.options.show.time.accesskey              "T">
+<!ENTITY  event.menu.options.show.time.busy.label             "Busy">
+<!ENTITY  event.menu.options.show.time.busy.accesskey         "B">
+<!ENTITY  event.menu.options.show.time.free.label             "Free">
+<!ENTITY  event.menu.options.show.time.free.accesskey         "F">
+
+<!ENTITY event.help.label                                 "Help">
+<!ENTITY event.help.accesskey                             "H">
+<!ENTITY event.help.release.notes.label                   "Release Notes">
+<!ENTITY event.help.release.notes.accesskey               "R">
+<!ENTITY event.help.help.label                            "&brandShortName; Help">
+<!ENTITY event.help.help.accesskey                        "H">
+<!ENTITY event.help.about.label                           "About &brandShortName;">
+<!ENTITY event.help.about.accesskey                       "A">
+
+<!ENTITY event.invite.attendees.label                     "Invite Attendees…">
+<!ENTITY event.invite.attendees.accesskey                 "I">
+<!ENTITY event.email.attendees.label                      "Compose E-Mail to All Attendees…">
+<!ENTITY event.email.attendees.accesskey                  "A">
+<!ENTITY event.email.tentative.attendees.label            "Compose E-Mail to Undecided Attendees…">
+<!ENTITY event.email.tentative.attendees.accesskey        "U">
+
+<!-- Toolbar -->
+<!ENTITY  event.toolbar.save.label                        "Save and Close">
+<!ENTITY  event.toolbar.attendees.label                   "Invite Attendees">
+<!ENTITY  event.toolbar.spellcheck.label                  "Spellcheck">
+<!ENTITY  event.toolbar.privacy.label                     "Privacy">
+<!ENTITY  event.toolbar.attachments.label                 "Attach">
+
+<!-- Main page -->
+<!ENTITY event.title.textbox.label                        "Title:" >
+<!ENTITY event.title.textbox.accesskey                    "T">
+<!ENTITY event.location.label                             "Location:" >
+<!ENTITY event.location.accesskey                         "L">
+<!ENTITY event.categories.label                           "Category:">
+<!ENTITY event.categories.accesskey                       "y">
+<!ENTITY event.calendar.label                             "Calendar:" >
+<!ENTITY event.calendar.accesskey                         "C">
+<!ENTITY event.attendees.label                            "Attendees:" >
+<!ENTITY event.attendees.accesskey                        "I" >
+<!ENTITY event.alldayevent.label                          "All day Event" >
+<!ENTITY event.alldayevent.accesskey                      "d">
+<!ENTITY event.from.label                                 "Start:" >
+<!ENTITY event.from.accesskey                             "S">
+<!ENTITY task.from.label                                  "Start:" >
+<!ENTITY task.from.accesskey                              "B">
+<!ENTITY event.to.label                                   "End:" >
+<!ENTITY event.to.accesskey                               "n">
+<!ENTITY task.to.label                                    "Due Date:" >
+<!ENTITY task.to.accesskey                                "u">
+<!ENTITY task.status.label                                "Status:" >
+<!ENTITY task.status.accesskey                            "a">
+<!ENTITY event.repeat.label                               "Repeat:" >
+<!ENTITY event.repeat.accesskey                           "R">
+<!ENTITY event.reminder.label                             "Reminder:" >
+<!ENTITY event.reminder.accesskey                         "m">
+<!ENTITY event.description.label                          "Description:" >
+<!ENTITY event.description.accesskey                      "p">
+<!ENTITY event.attachments.label                          "Attachments:" >
+<!ENTITY event.attachments.accesskey                      "h" >
+<!ENTITY event.attachments.popup.remove.label             "Remove" >
+<!ENTITY event.attachments.popup.remove.accesskey         "R" >
+<!ENTITY event.attachments.popup.open.label               "Open" >
+<!ENTITY event.attachments.popup.open.accesskey           "O" >
+<!ENTITY event.attachments.popup.removeAll.label          "Remove All" >
+<!ENTITY event.attachments.popup.removeAll.accesskey      "A" >
+<!ENTITY event.attachments.popup.attachPage.label         "Attach Webpage…" >
+<!ENTITY event.attachments.popup.attachPage.accesskey     "W" >
+<!ENTITY event.url.label                                  "Related Link:" >
+<!ENTITY event.priority2.label                            "Priority:">
+
+<!ENTITY event.reminder.none.label                        "No reminder " >
+<!ENTITY event.reminder.5minutes.before.label             "5 minutes before" >
+<!ENTITY event.reminder.10minutes.before.label            "10 minutes before" >
+<!ENTITY event.reminder.15minutes.before.label            "15 minutes before" >
+<!ENTITY event.reminder.30minutes.before.label            "30 minutes before" >
+<!ENTITY event.reminder.45minutes.before.label            "45 minutes before" >
+<!ENTITY event.reminder.1hour.before.label                "1 hour before" >
+<!ENTITY event.reminder.2hours.before.label               "2 hours before" >
+<!ENTITY event.reminder.5hours.before.label               "5 hours before" >
+<!ENTITY event.reminder.15hours.before.label              "15 hours before" >
+<!ENTITY event.reminder.1day.before.label                 "1 day before" >
+<!ENTITY event.reminder.2days.before.label                "2 days before" >
+<!ENTITY event.reminder.1week.before.label                "1 week before" >
+<!ENTITY event.reminder.custom.label                      "Custom…" >
+
+<!ENTITY event.reminder.multiple.label                    "Multiple Reminders…" >
+
+<!-- Recurrence dialog -->
+<!ENTITY recurrence.title.label                         "Edit Recurrence">
+
+<!ENTITY event.repeat.does.not.repeat.label             "Does not repeat">
+<!ENTITY event.repeat.daily.label                       "Daily">
+<!ENTITY event.repeat.weekly.label                      "Weekly">
+<!ENTITY event.repeat.every.weekday.label               "Every Weekday">
+<!ENTITY event.repeat.bi.weekly.label                   "Bi-weekly">
+<!ENTITY event.repeat.monthly.label                     "Monthly">
+<!ENTITY event.repeat.yearly.label                      "Yearly">
+<!ENTITY event.repeat.custom.label                      "Custom…">
+
+<!ENTITY event.recurrence.pattern.label                 "Recurrence pattern">
+<!ENTITY event.recurrence.occurs.label                  "Repeat" >
+<!ENTITY event.recurrence.day.label                     "daily" >
+<!ENTITY event.recurrence.week.label                    "weekly" >
+<!ENTITY event.recurrence.month.label                   "monthly" >
+<!ENTITY event.recurrence.year.label                    "annually" >
+
+<!ENTITY event.recurrence.pattern.every.label           "Every" >
+<!ENTITY repeat.units.days.both                         "Day(s)" >
+<!ENTITY event.recurrence.pattern.every.weekday.label   "Every weekday" >
+
+<!ENTITY event.recurrence.pattern.weekly.every.label    "Every" >
+<!ENTITY repeat.units.weeks.both                        "Week(s)" >
+<!ENTITY event.recurrence.on.label                      "On:" >
+
+<!ENTITY event.recurrence.pattern.monthly.every.label   "Every" >
+<!ENTITY repeat.units.months.both                       "Month(s)" >
+<!ENTITY event.recurrence.the.label                     "The" >
+<!ENTITY event.recurrence.repeat.first.label            "First">
+<!ENTITY event.recurrence.repeat.second.label           "Second">
+<!ENTITY event.recurrence.repeat.third.label            "Third">
+<!ENTITY event.recurrence.repeat.fourth.label           "Fourth">
+<!ENTITY event.recurrence.repeat.fifth.label            "Fifth">
+<!ENTITY event.recurrence.repeat.last.label             "Last">
+<!ENTITY event.recurrence.pattern.monthly.week.1.label  "Sunday" >
+<!ENTITY event.recurrence.pattern.monthly.week.2.label  "Monday" >
+<!ENTITY event.recurrence.pattern.monthly.week.3.label  "Tuesday" >
+<!ENTITY event.recurrence.pattern.monthly.week.4.label  "Wednesday" >
+<!ENTITY event.recurrence.pattern.monthly.week.5.label  "Thursday" >
+<!ENTITY event.recurrence.pattern.monthly.week.6.label  "Friday" >
+<!ENTITY event.recurrence.pattern.monthly.week.7.label  "Saturday" >
+<!ENTITY event.recurrence.repeat.dayofmonth.label       "Day of the month">
+<!ENTITY event.recurrence.repeat.recur.label            "Recur on day(s)">
+
+<!ENTITY event.recurrence.every.label                        "Every:" >
+<!ENTITY repeat.units.years.both                             "Year(s)" >
+<!ENTITY event.recurrence.pattern.yearly.every.month.label   "Every" >
+<!ENTITY event.recurrence.pattern.yearly.every.weekday.label "Every" >
+
+<!-- LOCALIZATON NOTE
+     Some languages use a preposition when describing dates:
+     Portuguese: 6 de Setembro
+     English: 6 [of] September
+     event.recurrence.pattern.yearly.of.label is "of" in
+     Edit recurrence window -> Recurrence pattern -> Repeat yearly
+-->
+<!ENTITY event.recurrence.pattern.yearly.of.label            "" >
+
+<!ENTITY event.recurrence.pattern.yearly.month.1.label       "January" >
+<!ENTITY event.recurrence.pattern.yearly.month.2.label       "February" >
+<!ENTITY event.recurrence.pattern.yearly.month.3.label       "March" >
+<!ENTITY event.recurrence.pattern.yearly.month.4.label       "April" >
+<!ENTITY event.recurrence.pattern.yearly.month.5.label       "May" >
+<!ENTITY event.recurrence.pattern.yearly.month.6.label       "June" >
+<!ENTITY event.recurrence.pattern.yearly.month.7.label       "July" >
+<!ENTITY event.recurrence.pattern.yearly.month.8.label       "August" >
+<!ENTITY event.recurrence.pattern.yearly.month.9.label       "September" >
+<!ENTITY event.recurrence.pattern.yearly.month.10.label      "October" >
+<!ENTITY event.recurrence.pattern.yearly.month.11.label      "November" >
+<!ENTITY event.recurrence.pattern.yearly.month.12.label      "December" >
+<!ENTITY event.recurrence.pattern.yearly.first.label         "First">
+<!ENTITY event.recurrence.pattern.yearly.second.label        "Second">
+<!ENTITY event.recurrence.pattern.yearly.third.label         "Third">
+<!ENTITY event.recurrence.pattern.yearly.fourth.label        "Fourth">
+<!ENTITY event.recurrence.pattern.yearly.fifth.label         "Fifth">
+<!ENTITY event.recurrence.pattern.yearly.last.label          "Last">
+<!ENTITY event.recurrence.pattern.yearly.week.1.label        "Sunday" >
+<!ENTITY event.recurrence.pattern.yearly.week.2.label        "Monday" >
+<!ENTITY event.recurrence.pattern.yearly.week.3.label        "Tuesday" >
+<!ENTITY event.recurrence.pattern.yearly.week.4.label        "Wednesday" >
+<!ENTITY event.recurrence.pattern.yearly.week.5.label        "Thursday" >
+<!ENTITY event.recurrence.pattern.yearly.week.6.label        "Friday" >
+<!ENTITY event.recurrence.pattern.yearly.week.7.label        "Saturday" >
+<!ENTITY event.recurrence.of.label                           "of" >
+<!ENTITY event.recurrence.pattern.yearly.month2.1.label      "January" >
+<!ENTITY event.recurrence.pattern.yearly.month2.2.label      "February" >
+<!ENTITY event.recurrence.pattern.yearly.month2.3.label      "March" >
+<!ENTITY event.recurrence.pattern.yearly.month2.4.label      "April" >
+<!ENTITY event.recurrence.pattern.yearly.month2.5.label      "May" >
+<!ENTITY event.recurrence.pattern.yearly.month2.6.label      "June" >
+<!ENTITY event.recurrence.pattern.yearly.month2.7.label      "July" >
+<!ENTITY event.recurrence.pattern.yearly.month2.8.label      "August" >
+<!ENTITY event.recurrence.pattern.yearly.month2.9.label      "September" >
+<!ENTITY event.recurrence.pattern.yearly.month2.10.label     "October" >
+<!ENTITY event.recurrence.pattern.yearly.month2.11.label     "November" >
+<!ENTITY event.recurrence.pattern.yearly.month2.12.label     "December" >
+
+<!ENTITY event.recurrence.range.label                   "Range of recurrence">
+<!ENTITY event.recurrence.forever.label                 "No end date" >
+<!ENTITY event.recurrence.repeat.for.label              "Create" >
+<!ENTITY event.recurrence.appointments.label            "Appointment(s)" >
+<!ENTITY event.repeat.until.label                       "Repeat until" >
+<!ENTITY event.recurrence.preview.label                 "Preview">
+
+<!-- Reminder dialog -->
 <!ENTITY alarm.units.minutes                "minutes" >
 <!ENTITY alarm.units.hours                  "hours" >
 <!ENTITY alarm.units.days                   "days" >
 
-<!ENTITY newevent.before.label              "before" >
-<!ENTITY newevent.after.label               "after" >
+<!ENTITY reminder.title.label                           "Custom Reminder">
+<!ENTITY reminder.dialogtitle.label                     "Set up reminders">
+<!ENTITY reminder.reminderDetails.label                 "Reminder Details">
+<!ENTITY reminder.action.label                          "Choose a Reminder Action">
+<!ENTITY reminder.action.alert.label                    "Show an Alert">
+<!ENTITY reminder.action.email.label                    "Send an E-mail">
+<!ENTITY reminder.new.label                             "New">
+<!ENTITY reminder.delete.label                          "Delete">
+<!ENTITY reminder.relation.start.label                  "the event starts">
+<!ENTITY reminder.relation.end.label                    "the event ends">
+<!ENTITY reminder.add.label                             "Add">
+<!ENTITY reminder.add.accesskey                         "A">
+<!ENTITY reminder.remove.label                          "Remove">
+<!ENTITY reminder.remove.accesskey                      "R">
+
+
+<!-- Attendees dialog -->
+<!ENTITY invite.title.label              "Invite Attendees">
+<!ENTITY event.organizer.label           "Organizer">
+<!ENTITY event.freebusy.suggest.slot     "Suggest time slot:">
+<!ENTITY event.freebusy.next.slot        "Next slot " >
+<!ENTITY event.freebusy.previous.slot    " Previous slot" >
+<!ENTITY event.freebusy.zoom             "Zoom:">
+<!ENTITY event.freebusy.plus             "Next hour" >
+<!ENTITY event.freebusy.minus            "Previous hour" >
+<!ENTITY event.freebusy.legend.free      "Free" >
+<!ENTITY event.freebusy.legend.busy      "Busy" >
+<!ENTITY event.freebusy.legend.unknown   "No information" >
+
+<!-- Timezone dialog -->
+<!ENTITY timezone.title.label            "Please Specify the Timezone">
+
+<!-- Read-Only dialog -->
+<!ENTITY read.only.general.label         "General">
+<!ENTITY read.only.title.label           "Title:">
+<!ENTITY read.only.repeat.label          "Repeat:">
+<!ENTITY read.only.location.label        "Location:">
+<!ENTITY read.only.category.label        "Category:">
+<!ENTITY read.only.organizer.label       "Organizer:">
+<!ENTITY read.only.reply.label           "Reply:">
+<!ENTITY read.only.accept.label          "I will attend">
+<!ENTITY read.only.decline.label         "I will not attend">
+<!ENTITY read.only.needs.action.label    "I will confirm later">
+<!ENTITY read.only.reminder.label        "Reminder:">
+<!ENTITY read.only.attendees.label       "Attendees">
+<!ENTITY read.only.description.label     "Description">
+<!ENTITY read.only.documents.label       "Documents">
+<!ENTITY read.only.link.label            "Related Link">
rename from calendar/locales/en-US/chrome/prototypes/sun-calendar-event-dialog.properties
rename to calendar/locales/en-US/chrome/calendar/calendar-event-dialog.properties
rename from calendar/locales/en-US/chrome/prototypes/calendar-invitations-dialog.dtd
rename to calendar/locales/en-US/chrome/calendar/calendar-invitations-dialog.dtd
deleted file mode 100644
--- a/calendar/locales/en-US/chrome/prototypes/sun-calendar-event-dialog.dtd
+++ /dev/null
@@ -1,371 +0,0 @@
-<!-- ***** 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 Sun Microsystems code.
-   -
-   - The Initial Developer of the Original Code is Sun Microsystems.
-   - Portions created by the Initial Developer are Copyright (C) 2006
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Michael Büttner <michael.buettner@sun.com>
-   -   Philipp Kewisch <mozilla@kewis.ch>
-   -   Stefan Sitter <ssitter@gmail.com>
-   -   Martin Schroeder <mschroeder@mozilla.x-home.org>
-   -   Hubert Gajewski <hubert@hubertgajewski.com>, Aviary.pl
-   -   Fred Jendrzejewski <fred.jen@web.de>
-   -
-   - 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 ***** -->
-
-<!-- Menubar -->
-<!ENTITY  event.menu.file.label                           "File">
-<!ENTITY  event.menu.file.accesskey                       "F">
-<!ENTITY  event.menu.file.new.label                       "New">
-<!ENTITY  event.menu.file.new.accesskey                   "N">
-<!ENTITY  event.menu.file.new.event.label                 "Event">
-<!ENTITY  event.menu.file.new.event.accesskey             "E">
-<!ENTITY  event.menu.file.new.message.label               "Message">
-<!ENTITY  event.menu.file.new.message.accesskey           "M">
-<!ENTITY  event.menu.file.new.address.label               "Address Book Card">
-<!ENTITY  event.menu.file.new.address.accesskey           "C">
-<!ENTITY  event.menu.file.close.label                     "Close">
-<!ENTITY  event.menu.file.close.accesskey                 "C">
-<!ENTITY  event.menu.file.save.label                      "Save">
-<!ENTITY  event.menu.file.save.accesskey                  "S">
-<!ENTITY  event.menu.file.page.setup.label                "Page Setup">
-<!ENTITY  event.menu.file.page.setup.accesskey            "u">
-<!ENTITY  event.menu.file.print.label                     "Print">
-<!ENTITY  event.menu.file.print.accesskey                 "P">
-<!ENTITY  event.menu.file.exit.label                      "Exit">
-<!ENTITY  event.menu.file.exit.accesskey                  "x">
-
-<!ENTITY  event.menu.edit.label                           "Edit">
-<!ENTITY  event.menu.edit.accesskey                       "E">
-<!ENTITY  event.menu.edit.undo.label                      "Undo">
-<!ENTITY  event.menu.edit.undo.accesskey                  "U">
-<!ENTITY  event.menu.edit.redo.label                      "Redo">
-<!ENTITY  event.menu.edit.redo.accesskey                  "R">
-<!ENTITY  event.menu.edit.cut.label                       "Cut">
-<!ENTITY  event.menu.edit.cut.accesskey                   "t">
-<!ENTITY  event.menu.edit.copy.label                      "Copy">
-<!ENTITY  event.menu.edit.copy.accesskey                  "C">
-<!ENTITY  event.menu.edit.paste.label                     "Paste">
-<!ENTITY  event.menu.edit.paste.accesskey                 "P">
-<!ENTITY  event.menu.edit.select.all.label                "Select All">
-<!ENTITY  event.menu.edit.select.all.accesskey            "A">
-
-<!ENTITY  event.menu.view.label                           "View">
-<!ENTITY  event.menu.view.accesskey                       "V">
-<!ENTITY  event.menu.view.toolbars.label                  "Toolbars">
-<!ENTITY  event.menu.view.toolbars.accesskey              "T">
-<!ENTITY  event.menu.view.toolbars.event.label            "Event Toolbar">
-<!ENTITY  event.menu.view.toolbars.event.accesskey        "E">
-<!ENTITY  event.menu.view.toolbars.customize.label        "Customize…">
-<!ENTITY  event.menu.view.toolbars.customize.accesskey    "C">
-<!ENTITY  event.menu.view.showlink.label                  "Show Related Link">
-<!ENTITY  event.menu.view.showlink.accesskey              "R">
-
-<!ENTITY  event.menu.options.label                            "Options">
-<!ENTITY  event.menu.options.accesskey                        "O">
-<!ENTITY  event.menu.options.attachments.label                "Attach Webpage…">
-<!ENTITY  event.menu.options.attachments.accesskey            "W">
-<!ENTITY  event.menu.options.attendees.label                  "Invite Attendees…">
-<!ENTITY  event.menu.options.attendees.accesskey              "I">
-<!ENTITY  event.menu.options.spellcheck.label                 "Check Spelling…">
-<!ENTITY  event.menu.options.spellcheck.accesskey             "h">
-<!ENTITY  event.menu.options.inline.spellcheck.label          "Spell Check As You Type">
-<!ENTITY  event.menu.options.inline.spellcheck.accesskey      "S">
-<!ENTITY  event.menu.options.link.label                       "Add Link…">
-<!ENTITY  event.menu.options.link.accesskey                   "L">
-<!ENTITY  event.menu.options.timezone.label                   "Timezone">
-<!ENTITY  event.menu.options.timezone.accesskey               "z">
-<!ENTITY  event.menu.options.priority2.label                  "Priority">
-<!ENTITY  event.menu.options.priority2.accesskey              "y">
-<!ENTITY  event.menu.options.priority.notspecified.label      "Not specified">
-<!ENTITY  event.menu.options.priority.notspecified.accesskey  "o">
-<!ENTITY  event.menu.options.priority.low.label               "Low">
-<!ENTITY  event.menu.options.priority.low.accesskey           "L">
-<!ENTITY  event.menu.options.priority.normal.label            "Normal">
-<!ENTITY  event.menu.options.priority.normal.accesskey        "N">
-<!ENTITY  event.menu.options.priority.high.label              "High">
-<!ENTITY  event.menu.options.priority.high.accesskey          "H">
-<!ENTITY  event.menu.options.privacy.label                    "Privacy">
-<!ENTITY  event.menu.options.privacy.accesskey                "P">
-<!ENTITY  event.menu.options.privacy.public.label             "Public Event">
-<!ENTITY  event.menu.options.privacy.public.accesskey         "u">
-<!ENTITY  event.menu.options.privacy.confidential.label       "Show Time and Date Only">
-<!ENTITY  event.menu.options.privacy.confidential.accesskey   "S">
-<!ENTITY  event.menu.options.privacy.private.label            "Private Event">
-<!ENTITY  event.menu.options.privacy.private.accesskey        "r">
-<!ENTITY  event.menu.options.show.time.label                  "Show Time as">
-<!ENTITY  event.menu.options.show.time.accesskey              "T">
-<!ENTITY  event.menu.options.show.time.busy.label             "Busy">
-<!ENTITY  event.menu.options.show.time.busy.accesskey         "B">
-<!ENTITY  event.menu.options.show.time.free.label             "Free">
-<!ENTITY  event.menu.options.show.time.free.accesskey         "F">
-
-<!ENTITY event.help.label                                 "Help">
-<!ENTITY event.help.accesskey                             "H">
-<!ENTITY event.help.release.notes.label                   "Release Notes">
-<!ENTITY event.help.release.notes.accesskey               "R">
-<!ENTITY event.help.help.label                            "&brandShortName; Help">
-<!ENTITY event.help.help.accesskey                        "H">
-<!ENTITY event.help.about.label                           "About &brandShortName;">
-<!ENTITY event.help.about.accesskey                       "A">
-
-<!ENTITY event.invite.attendees.label                     "Invite Attendees…">
-<!ENTITY event.invite.attendees.accesskey                 "I">
-<!ENTITY event.email.attendees.label                      "Compose E-Mail to All Attendees…">
-<!ENTITY event.email.attendees.accesskey                  "A">
-<!ENTITY event.email.tentative.attendees.label            "Compose E-Mail to Undecided Attendees…">
-<!ENTITY event.email.tentative.attendees.accesskey        "U">
-
-<!-- Toolbar -->
-<!ENTITY  event.toolbar.save.label                        "Save and Close">
-<!ENTITY  event.toolbar.attendees.label                   "Invite Attendees">
-<!ENTITY  event.toolbar.spellcheck.label                  "Spellcheck">
-<!ENTITY  event.toolbar.privacy.label                     "Privacy">
-<!ENTITY  event.toolbar.attachments.label                 "Attach">
-
-<!-- Main page -->
-<!ENTITY event.title.textbox.label                        "Title:" >
-<!ENTITY event.title.textbox.accesskey                    "T">
-<!ENTITY event.location.label                             "Location:" >
-<!ENTITY event.location.accesskey                         "L">
-<!ENTITY event.categories.label                           "Category:">
-<!ENTITY event.categories.accesskey                       "y">
-<!ENTITY event.calendar.label                             "Calendar:" >
-<!ENTITY event.calendar.accesskey                         "C">
-<!ENTITY event.attendees.label                            "Attendees:" >
-<!ENTITY event.attendees.accesskey                        "I" >
-<!ENTITY event.alldayevent.label                          "All day Event" >
-<!ENTITY event.alldayevent.accesskey                      "d">
-<!ENTITY event.from.label                                 "Start:" >
-<!ENTITY event.from.accesskey                             "S">
-<!ENTITY task.from.label                                  "Start:" >
-<!ENTITY task.from.accesskey                              "B">
-<!ENTITY event.to.label                                   "End:" >
-<!ENTITY event.to.accesskey                               "n">
-<!ENTITY task.to.label                                    "Due Date:" >
-<!ENTITY task.to.accesskey                                "u">
-<!ENTITY task.status.label                                "Status:" >
-<!ENTITY task.status.accesskey                            "a">
-<!ENTITY event.repeat.label                               "Repeat:" >
-<!ENTITY event.repeat.accesskey                           "R">
-<!ENTITY event.reminder.label                             "Reminder:" >
-<!ENTITY event.reminder.accesskey                         "m">
-<!ENTITY event.description.label                          "Description:" >
-<!ENTITY event.description.accesskey                      "p">
-<!ENTITY event.attachments.label                          "Attachments:" >
-<!ENTITY event.attachments.accesskey                      "h" >
-<!ENTITY event.attachments.popup.remove.label             "Remove" >
-<!ENTITY event.attachments.popup.remove.accesskey         "R" >
-<!ENTITY event.attachments.popup.open.label               "Open" >
-<!ENTITY event.attachments.popup.open.accesskey           "O" >
-<!ENTITY event.attachments.popup.removeAll.label          "Remove All" >
-<!ENTITY event.attachments.popup.removeAll.accesskey      "A" >
-<!ENTITY event.attachments.popup.attachPage.label         "Attach Webpage…" >
-<!ENTITY event.attachments.popup.attachPage.accesskey     "W" >
-<!ENTITY event.url.label                                  "Related Link:" >
-<!ENTITY event.priority2.label                            "Priority:">
-
-<!ENTITY event.reminder.none.label                        "No reminder " >
-<!ENTITY event.reminder.5minutes.before.label             "5 minutes before" >
-<!ENTITY event.reminder.10minutes.before.label            "10 minutes before" >
-<!ENTITY event.reminder.15minutes.before.label            "15 minutes before" >
-<!ENTITY event.reminder.30minutes.before.label            "30 minutes before" >
-<!ENTITY event.reminder.45minutes.before.label            "45 minutes before" >
-<!ENTITY event.reminder.1hour.before.label                "1 hour before" >
-<!ENTITY event.reminder.2hours.before.label               "2 hours before" >
-<!ENTITY event.reminder.5hours.before.label               "5 hours before" >
-<!ENTITY event.reminder.15hours.before.label              "15 hours before" >
-<!ENTITY event.reminder.1day.before.label                 "1 day before" >
-<!ENTITY event.reminder.2days.before.label                "2 days before" >
-<!ENTITY event.reminder.1week.before.label                "1 week before" >
-<!ENTITY event.reminder.custom.label                      "Custom…" >
-
-<!ENTITY event.reminder.multiple.label                    "Multiple Reminders…" >
-
-<!-- Recurrence dialog -->
-
-<!ENTITY recurrence.title.label                         "Edit Recurrence">
-
-<!ENTITY event.repeat.does.not.repeat.label             "Does not repeat">
-<!ENTITY event.repeat.daily.label                       "Daily">
-<!ENTITY event.repeat.weekly.label                      "Weekly">
-<!ENTITY event.repeat.every.weekday.label               "Every Weekday">
-<!ENTITY event.repeat.bi.weekly.label                   "Bi-weekly">
-<!ENTITY event.repeat.monthly.label                     "Monthly">
-<!ENTITY event.repeat.yearly.label                      "Yearly">
-<!ENTITY event.repeat.custom.label                      "Custom…">
-
-<!ENTITY event.recurrence.pattern.label                 "Recurrence pattern">
-<!ENTITY event.recurrence.occurs.label                  "Repeat" >
-<!ENTITY event.recurrence.day.label                     "daily" >
-<!ENTITY event.recurrence.week.label                    "weekly" >
-<!ENTITY event.recurrence.month.label                   "monthly" >
-<!ENTITY event.recurrence.year.label                    "annually" >
-
-<!ENTITY event.recurrence.pattern.every.label           "Every" >
-<!ENTITY repeat.units.days.both                         "Day(s)" >
-<!ENTITY event.recurrence.pattern.every.weekday.label   "Every weekday" >
-
-<!ENTITY event.recurrence.pattern.weekly.every.label    "Every" >
-<!ENTITY repeat.units.weeks.both                        "Week(s)" >
-<!ENTITY event.recurrence.on.label                      "On:" >
-
-<!ENTITY event.recurrence.pattern.monthly.every.label   "Every" >
-<!ENTITY repeat.units.months.both                       "Month(s)" >
-<!ENTITY event.recurrence.the.label                     "The" >
-<!ENTITY event.recurrence.repeat.first.label            "First">
-<!ENTITY event.recurrence.repeat.second.label           "Second">
-<!ENTITY event.recurrence.repeat.third.label            "Third">
-<!ENTITY event.recurrence.repeat.fourth.label           "Fourth">
-<!ENTITY event.recurrence.repeat.fifth.label            "Fifth">
-<!ENTITY event.recurrence.repeat.last.label             "Last">
-<!ENTITY event.recurrence.pattern.monthly.week.1.label  "Sunday" >
-<!ENTITY event.recurrence.pattern.monthly.week.2.label  "Monday" >
-<!ENTITY event.recurrence.pattern.monthly.week.3.label  "Tuesday" >
-<!ENTITY event.recurrence.pattern.monthly.week.4.label  "Wednesday" >
-<!ENTITY event.recurrence.pattern.monthly.week.5.label  "Thursday" >
-<!ENTITY event.recurrence.pattern.monthly.week.6.label  "Friday" >
-<!ENTITY event.recurrence.pattern.monthly.week.7.label  "Saturday" >
-<!ENTITY event.recurrence.repeat.dayofmonth.label       "Day of the month">
-<!ENTITY event.recurrence.repeat.recur.label            "Recur on day(s)">
-
-<!ENTITY event.recurrence.every.label                        "Every:" >
-<!ENTITY repeat.units.years.both                             "Year(s)" >
-<!ENTITY event.recurrence.pattern.yearly.every.month.label   "Every" >
-<!ENTITY event.recurrence.pattern.yearly.every.weekday.label "Every" >
-
-<!-- LOCALIZATON NOTE
-     Some languages use a preposition when describing dates:
-     Portuguese: 6 de Setembro
-     English: 6 [of] September
-     event.recurrence.pattern.yearly.of.label is "of" in
-     Edit recurrence window -> Recurrence pattern -> Repeat yearly
--->
-<!ENTITY event.recurrence.pattern.yearly.of.label            "" >
-
-<!ENTITY event.recurrence.pattern.yearly.month.1.label       "January" >
-<!ENTITY event.recurrence.pattern.yearly.month.2.label       "February" >
-<!ENTITY event.recurrence.pattern.yearly.month.3.label       "March" >
-<!ENTITY event.recurrence.pattern.yearly.month.4.label       "April" >
-<!ENTITY event.recurrence.pattern.yearly.month.5.label       "May" >
-<!ENTITY event.recurrence.pattern.yearly.month.6.label       "June" >
-<!ENTITY event.recurrence.pattern.yearly.month.7.label       "July" >
-<!ENTITY event.recurrence.pattern.yearly.month.8.label       "August" >
-<!ENTITY event.recurrence.pattern.yearly.month.9.label       "September" >
-<!ENTITY event.recurrence.pattern.yearly.month.10.label      "October" >
-<!ENTITY event.recurrence.pattern.yearly.month.11.label      "November" >
-<!ENTITY event.recurrence.pattern.yearly.month.12.label      "December" >
-<!ENTITY event.recurrence.pattern.yearly.first.label         "First">
-<!ENTITY event.recurrence.pattern.yearly.second.label        "Second">
-<!ENTITY event.recurrence.pattern.yearly.third.label         "Third">
-<!ENTITY event.recurrence.pattern.yearly.fourth.label        "Fourth">
-<!ENTITY event.recurrence.pattern.yearly.fifth.label         "Fifth">
-<!ENTITY event.recurrence.pattern.yearly.last.label          "Last">
-<!ENTITY event.recurrence.pattern.yearly.week.1.label        "Sunday" >
-<!ENTITY event.recurrence.pattern.yearly.week.2.label        "Monday" >
-<!ENTITY event.recurrence.pattern.yearly.week.3.label        "Tuesday" >
-<!ENTITY event.recurrence.pattern.yearly.week.4.label        "Wednesday" >
-<!ENTITY event.recurrence.pattern.yearly.week.5.label        "Thursday" >
-<!ENTITY event.recurrence.pattern.yearly.week.6.label        "Friday" >
-<!ENTITY event.recurrence.pattern.yearly.week.7.label        "Saturday" >
-<!ENTITY event.recurrence.of.label                           "of" >
-<!ENTITY event.recurrence.pattern.yearly.month2.1.label      "January" >
-<!ENTITY event.recurrence.pattern.yearly.month2.2.label      "February" >
-<!ENTITY event.recurrence.pattern.yearly.month2.3.label      "March" >
-<!ENTITY event.recurrence.pattern.yearly.month2.4.label      "April" >
-<!ENTITY event.recurrence.pattern.yearly.month2.5.label      "May" >
-<!ENTITY event.recurrence.pattern.yearly.month2.6.label      "June" >
-<!ENTITY event.recurrence.pattern.yearly.month2.7.label      "July" >
-<!ENTITY event.recurrence.pattern.yearly.month2.8.label      "August" >
-<!ENTITY event.recurrence.pattern.yearly.month2.9.label      "September" >
-<!ENTITY event.recurrence.pattern.yearly.month2.10.label     "October" >
-<!ENTITY event.recurrence.pattern.yearly.month2.11.label     "November" >
-<!ENTITY event.recurrence.pattern.yearly.month2.12.label     "December" >
-
-<!ENTITY event.recurrence.range.label                   "Range of recurrence">
-<!ENTITY event.recurrence.forever.label                 "No end date" >
-<!ENTITY event.recurrence.repeat.for.label              "Create" >
-<!ENTITY event.recurrence.appointments.label            "Appointment(s)" >
-<!ENTITY event.repeat.until.label                       "Repeat until" >
-<!ENTITY event.recurrence.preview.label                 "Preview">
-
-<!-- Reminder dialog -->
-
-<!ENTITY reminder.title.label                           "Custom Reminder">
-<!ENTITY reminder.dialogtitle.label                     "Set up reminders">
-<!ENTITY reminder.reminderDetails.label                 "Reminder Details">
-<!ENTITY reminder.action.label                          "Choose a Reminder Action">
-<!ENTITY reminder.action.alert.label                    "Show an Alert">
-<!ENTITY reminder.action.email.label                    "Send an E-mail">
-<!ENTITY reminder.new.label                             "New">
-<!ENTITY reminder.delete.label                          "Delete">
-<!ENTITY reminder.relation.start.label                  "the event starts">
-<!ENTITY reminder.relation.end.label                    "the event ends">
-<!ENTITY reminder.add.label                             "Add">
-<!ENTITY reminder.add.accesskey                         "A">
-<!ENTITY reminder.remove.label                          "Remove">
-<!ENTITY reminder.remove.accesskey                      "R">
-
-
-<!-- Attendees dialog -->
-<!ENTITY invite.title.label              "Invite Attendees">
-<!ENTITY event.organizer.label           "Organizer">
-<!ENTITY event.freebusy.suggest.slot     "Suggest time slot:">
-<!ENTITY event.freebusy.next.slot        "Next slot " >
-<!ENTITY event.freebusy.previous.slot    " Previous slot" >
-<!ENTITY event.freebusy.zoom             "Zoom:">
-<!ENTITY event.freebusy.plus             "Next hour" >
-<!ENTITY event.freebusy.minus            "Previous hour" >
-<!ENTITY event.freebusy.legend.free      "Free" >
-<!ENTITY event.freebusy.legend.busy      "Busy" >
-<!ENTITY event.freebusy.legend.unknown   "No information" >
-
-<!-- Timezone dialog -->
-
-<!ENTITY timezone.title.label            "Please Specify the Timezone">
-
-<!-- Read-Only dialog -->
-
-<!ENTITY read.only.general.label         "General">
-<!ENTITY read.only.title.label           "Title:">
-<!ENTITY read.only.repeat.label          "Repeat:">
-<!ENTITY read.only.location.label        "Location:">
-<!ENTITY read.only.category.label        "Category:">
-<!ENTITY read.only.organizer.label       "Organizer:">
-<!ENTITY read.only.reply.label           "Reply:">
-<!ENTITY read.only.accept.label          "I will attend">
-<!ENTITY read.only.decline.label         "I will not attend">
-<!ENTITY read.only.needs.action.label    "I will confirm later">
-<!ENTITY read.only.reminder.label        "Reminder:">
-<!ENTITY read.only.attendees.label       "Attendees">
-<!ENTITY read.only.description.label     "Description">
-<!ENTITY read.only.documents.label       "Documents">
-<!ENTITY read.only.link.label            "Related Link">
-
-
--- a/calendar/locales/jar.mn
+++ b/calendar/locales/jar.mn
@@ -1,16 +1,15 @@
 #filter substitution
 
 calendar-@AB_CD@.jar:
 % locale calendar @AB_CD@ %locale/@AB_CD@/calendar/
     locale/@AB_CD@/calendar/calendar.dtd         (%chrome/calendar/calendar.dtd)
     locale/@AB_CD@/calendar/calendarCreation.dtd (%chrome/calendar/calendarCreation.dtd)
     locale/@AB_CD@/calendar/calendar.properties  (%chrome/calendar/calendar.properties)
-    locale/@AB_CD@/calendar/calendar-event-dialog.dtd  (%chrome/calendar/calendar-event-dialog.dtd)
     locale/@AB_CD@/calendar/calendar-occurrence-prompt.dtd  (%chrome/calendar/calendar-occurrence-prompt.dtd)
     locale/@AB_CD@/calendar/calendar-occurrence-prompt.properties  (%chrome/calendar/calendar-occurrence-prompt.properties)
     locale/@AB_CD@/calendar/categories.properties  (%chrome/calendar/categories.properties)
     locale/@AB_CD@/calendar/wcap.properties      (%chrome/calendar/providers/wcap/wcap.properties)
     locale/@AB_CD@/calendar/dateFormat.properties  (%chrome/calendar/dateFormat.properties)
     locale/@AB_CD@/calendar/global.dtd           (%chrome/calendar/global.dtd)
     locale/@AB_CD@/calendar/menuOverlay.dtd      (%chrome/calendar/menuOverlay.dtd)
     locale/@AB_CD@/calendar/migration.dtd        (%chrome/calendar/migration.dtd)
@@ -18,12 +17,12 @@ calendar-@AB_CD@.jar:
     locale/@AB_CD@/calendar/preferences/advanced.dtd  (%chrome/calendar/preferences/advanced.dtd)
     locale/@AB_CD@/calendar/preferences/alarms.dtd  (%chrome/calendar/preferences/alarms.dtd)
     locale/@AB_CD@/calendar/preferences/categories.dtd  (%chrome/calendar/preferences/categories.dtd)
 *   locale/@AB_CD@/calendar/preferences/connection.dtd  (%chrome/calendar/preferences/connection.dtd)
     locale/@AB_CD@/calendar/preferences/general.dtd  (%chrome/calendar/preferences/general.dtd)
     locale/@AB_CD@/calendar/preferences/preferences.dtd  (%chrome/calendar/preferences/preferences.dtd)
     locale/@AB_CD@/calendar/preferences/timezones.dtd  (%chrome/calendar/preferences/timezones.dtd)
     locale/@AB_CD@/calendar/preferences/views.dtd  (%chrome/calendar/preferences/views.dtd)
-    locale/@AB_CD@/calendar/sun-calendar-event-dialog.dtd	(%chrome/prototypes/sun-calendar-event-dialog.dtd)
-    locale/@AB_CD@/calendar/sun-calendar-event-dialog.properties  (%chrome/prototypes/sun-calendar-event-dialog.properties)
-    locale/@AB_CD@/calendar/calendar-invitations-dialog.dtd (%chrome/prototypes/calendar-invitations-dialog.dtd)
-    locale/@AB_CD@/calendar/calendar-subscriptions-dialog.dtd  (%chrome/calendar/calendar-subscriptions-dialog.dtd)
+    locale/@AB_CD@/calendar/calendar-event-dialog.dtd (%chrome/calendar/calendar-event-dialog.dtd)
+    locale/@AB_CD@/calendar/calendar-event-dialog.properties (%chrome/calendar/calendar-event-dialog.properties)
+    locale/@AB_CD@/calendar/calendar-invitations-dialog.dtd (%chrome/calendar/calendar-invitations-dialog.dtd)
+    locale/@AB_CD@/calendar/calendar-subscriptions-dialog.dtd (%chrome/calendar/calendar-subscriptions-dialog.dtd)
deleted file mode 100644
--- a/calendar/prototypes/themes/pinstripe/sun-calendar-event-dialog.css
+++ /dev/null
@@ -1,276 +0,0 @@
-/* ***** 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 Sun Microsystems code.
- *
- * The Initial Developer of the Original Code is Sun Microsystems.
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Michael Buettner <michael.buettner@sun.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 ***** */
-
-/*--------------------------------------------------------------------
- *   Event dialog toolbar buttons
- *-------------------------------------------------------------------*/
-
-.cal-toolbarbutton-2 {
-    -moz-box-orient: vertical;
-    min-width: 0px;
-    list-style-image: url("chrome://calendar/skin/sun-calendar-event-dialog-toolbar.png");
-}
-
-toolbar[mode="full"] .cal-toolbarbutton-2 {
-    min-width: 55px;
-}
-
-/*--------------------------------------------------------------------
- *   Event dialog toolbar buttons - small
- *-------------------------------------------------------------------*/
-
-toolbar[iconsize="small"] .cal-toolbarbutton-2 {
-    -moz-box-orient: vertical;
-    list-style-image: url("chrome://calendar/skin/sun-calendar-event-dialog-toolbar.png");
-}
-
-/*--------------------------------------------------------------------
- *   invite attendees button
- *-------------------------------------------------------------------*/
-
-#button-attendees {
-  -moz-image-region: rect(0px 64px 32px 32px);
-}
-#button-attendees[disabled="true"],
-#button-attendees[disabled="true"]:hover,
-#button-attendees[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 64px 96px 32px);
-}
-#button-attendees:hover {
-  -moz-image-region: rect(32px 64px 64px 32px);
-}
-#button-attendees:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   spellcheck button
- *-------------------------------------------------------------------*/
-
-#button-spellcheck {
-  -moz-image-region: rect(0px 96px 32px 64px);
-}
-#button-spellcheck[disabled="true"],
-#button-spellcheck[disabled="true"]:hover,
-#button-spellcheck[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 96px 96px 64px);
-}
-#button-spellcheck:hover {
-  -moz-image-region: rect(32px 96px 64px 64px);
-}
-#button-spellcheck:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   documents button
- *-------------------------------------------------------------------*/
-
-#button-url {
-  -moz-image-region: rect(0px 128px 32px 96px);
-}
-#button-url[disabled="true"],
-#button-url[disabled="true"]:hover,
-#button-url[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 128px 96px 96px);
-}
-#button-url:hover {
-  -moz-image-region: rect(32px 128px 64px 96px);
-}
-#button-url:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   privacy button
- *-------------------------------------------------------------------*/
-
-#button-privacy {
-  -moz-image-region: rect(0px 160px 32px 128px);
-}
-#button-privacy[disabled="true"],
-#button-privacy[disabled="true"]:hover,
-#button-privacy[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 160px 96px 128px);
-}
-#button-privacy:hover {
-  -moz-image-region: rect(32px 160px 64px 128px);
-}
-#button-privacy:hover:active {
-}
- 
-/*--------------------------------------------------------------------
- *   save button
- *-------------------------------------------------------------------*/
-
-#button-save {
-  -moz-image-region: rect(0px 192px 32px 160px);
-}
-#button-save[disabled="true"],
-#button-save[disabled="true"]:hover,
-#button-save[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 192px 96px 160px);
-}
-#button-save:hover {
-  -moz-image-region: rect(32px 192px 64px 160px);
-}
-#button-save:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   print button
- *-------------------------------------------------------------------*/
-
-#button-print {
-  -moz-image-region: rect(0px 608px 32px 576px);
-}
-#button-print[disabled="true"],
-#button-print[disabled="true"]:hover,
-#button-print[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 608px 96px 576px);
-}
-#button-print:hover {
-  -moz-image-region: rect(32px 608px 64px 576px);
-}
-#button-print:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   help button
- *-------------------------------------------------------------------*/
-
-#button-question {
-  -moz-image-region: rect(0px 768px 32px 736px);
-}
-#button-question[disabled="true"],
-#button-question[disabled="true"]:hover,
-#button-question[disabled="true"]:hover:active {
-  -moz-image-region: rect(64px 768px 96px 736px);
-}
-#button-question:hover {
-  -moz-image-region: rect(32px 768px 64px 736px);
-}
-#button-question:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   Event dialog statusbar images
- *-------------------------------------------------------------------*/
-
-.cal-statusbar-1 {
-    -moz-box-orient: vertical;
-    min-width: 0px;
-    list-style-image: url("chrome://calendar/skin/sun-calendar-event-dialog.png");
-}
-
-/*--------------------------------------------------------------------
- *   privacy "public" image
- *-------------------------------------------------------------------*/
-
-#button-privacy-public {
-  -moz-image-region: rect(0px 28px 16px 0px);
-}
-#button-privacy-public:hover:active {
-  -moz-image-region: rect(0px 28px 16px 0px);
-}
-#button-privacy-public[disabled="true"] {
-  -moz-image-region: rect(0px 28px 16px 0px);
-}
-
-/*--------------------------------------------------------------------
- *   privacy "private" image
- *-------------------------------------------------------------------*/
-
-#button-privacy-private {
-  -moz-image-region: rect(0px 56px 16px 28px);
-}
-#button-privacy-private:hover:active {
-}
-#button-privacy-private[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   privacy "confidential" image
- *-------------------------------------------------------------------*/
-
-#button-privacy-confidential {
-  -moz-image-region: rect(0px 84px 16px 56px);
-}
-#button-privacy-confidential:hover:active {
-}
-#button-privacy-confidential[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   importance "low" image
- *-------------------------------------------------------------------*/
-
-#button-importance-low {
-  -moz-image-region: rect(0px 100px 16px 84px);
-}
-#button-importance-low:hover:active {
-}
-#button-importance-low[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   importance "medium" image
- *-------------------------------------------------------------------*/
-
-#button-importance-medium {
-  -moz-image-region: rect(0px 116px 16px 100px);
-}
-#button-importance-medium:hover:active {
-}
-#button-importance-medium[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   importance "high" image
- *-------------------------------------------------------------------*/
-
-#button-importance-high {
-  -moz-image-region: rect(0px 132px 16px 116px);
-}
-#button-importance-high:hover:active {
-}
-#button-importance-high[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   Recurrence dialog preview border
- *-------------------------------------------------------------------*/
-#preview-border {
-    border: none;
-    padding: 0px;
-}
deleted file mode 100644
--- a/calendar/prototypes/themes/winstripe/sun-calendar-event-dialog.css
+++ /dev/null
@@ -1,274 +0,0 @@
-/* ***** 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 Sun Microsystems code.
- *
- * The Initial Developer of the Original Code is Sun Microsystems.
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Michael Buettner <michael.buettner@sun.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 ***** */
-
-/*--------------------------------------------------------------------
- *   Event dialog toolbar buttons
- *-------------------------------------------------------------------*/
-
-.cal-toolbarbutton-2 {
-    -moz-box-orient: vertical;
-    min-width: 0px;
-    list-style-image: url("chrome://calendar/skin/sun-calendar-event-dialog-toolbar.png");
-}
-
-toolbar[mode="full"] .cal-toolbarbutton-2 {
-    min-width: 55px;
-}
-
-/*--------------------------------------------------------------------
- *   Event dialog toolbar buttons - small
- *-------------------------------------------------------------------*/
-
-toolbar[iconsize="small"] .cal-toolbarbutton-2 {
-    -moz-box-orient: vertical;
-    list-style-image: url("chrome://calendar/skin/sun-calendar-event-dialog-toolbar.png");
-}
-
-/*--------------------------------------------------------------------
- *   invite attendees button
- *-------------------------------------------------------------------*/
-
-#button-attendees {
-    -moz-image-region: rect(0px 48px 24px 24px);
-}
-#button-attendees[disabled="true"],
-#button-attendees[disabled="true"]:hover,
-#button-attendees[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 48px 72px 24px);
-}
-#button-attendees:hover {
-    -moz-image-region: rect(24px 48px 48px 24px);
-}
-#button-attendees:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   spellcheck button
- *-------------------------------------------------------------------*/
-
-#button-spellcheck {
-    -moz-image-region: rect(0px 72px 24px 48px);
-}
-#button-spellcheck[disabled="true"],
-#button-spellcheck[disabled="true"]:hover,
-#button-spellcheck[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 72px 72px 48px);
-}
-#button-spellcheck:hover {
-    -moz-image-region: rect(24px 72px 48px 48px);
-}
-#button-spellcheck:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   documents button
- *-------------------------------------------------------------------*/
-
-#button-url {
-    -moz-image-region: rect(0px 96px 24px 72px);
-}
-#button-url[disabled="true"],
-#button-url[disabled="true"]:hover,
-#button-url[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 96px 72px 72px);
-}
-#button-url:hover {
-    -moz-image-region: rect(24px 96px 48px 72px);
-}
-#button-url:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   privacy button
- *-------------------------------------------------------------------*/
-
-#button-privacy {
-    -moz-image-region: rect(0px 120px 24px 96px);
-}
-#button-privacy[disabled="true"],
-#button-privacy[disabled="true"]:hover,
-#button-privacy[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 120px 72px 96px);
-}
-#button-privacy:hover {
-    -moz-image-region: rect(24px 120px 48px 96px);
-}
-#button-privacy:hover:active {
-}
- 
-/*--------------------------------------------------------------------
- *   save button
- *-------------------------------------------------------------------*/
-
-#button-save {
-    -moz-image-region: rect(0px 144px 24px 120px);
-}
-#button-save[disabled="true"],
-#button-save[disabled="true"]:hover,
-#button-save[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 144px 72px 120px);
-}
-#button-save:hover {
-    -moz-image-region: rect(24px 144px 48px 120px);
-}
-#button-save:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   print button
- *-------------------------------------------------------------------*/
-
-#button-print {
-    -moz-image-region: rect(0px 456px 24px 432px);
-}
-#button-print[disabled="true"],
-#button-print[disabled="true"]:hover,
-#button-print[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 456px 72px 432px);
-}
-#button-print:hover {
-    -moz-image-region: rect(24px 456px 48px 432px);
-}
-#button-print:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   help button
- *-------------------------------------------------------------------*/
-
-#button-question {
-    -moz-image-region: rect(0px 576px 24px 552px);
-}
-#button-question[disabled="true"],
-#button-question[disabled="true"]:hover,
-#button-question[disabled="true"]:hover:active {
-    -moz-image-region: rect(48px 576px 72px 552px);
-}
-#button-question:hover {
-    -moz-image-region: rect(24px 576px 48px 552px);
-}
-#button-question:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   Event dialog statusbar images
- *-------------------------------------------------------------------*/
-
-.cal-statusbar-1 {
-    -moz-box-orient: vertical;
-    min-width: 0px;
-    list-style-image: url("chrome://calendar/skin/sun-calendar-event-dialog.png");
-}
-
-/*--------------------------------------------------------------------
- *   privacy "public" image
- *-------------------------------------------------------------------*/
-
-#button-privacy-public {
-    -moz-image-region: rect(0px 28px 16px 0px);
-}
-#button-privacy-public:hover:active {
-}
-#button-privacy-public[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   privacy "private" image
- *-------------------------------------------------------------------*/
-
-#button-privacy-private {
-    -moz-image-region: rect(0px 56px 16px 28px);
-}
-#button-privacy-private:hover:active {
-}
-#button-privacy-private[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   privacy "confidential" image
- *-------------------------------------------------------------------*/
-
-#button-privacy-confidential {
-    -moz-image-region: rect(0px 84px 16px 56px);
-}
-#button-privacy-confidential:hover:active {
-}
-#button-privacy-confidential[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   importance "low" image
- *-------------------------------------------------------------------*/
-
-#button-importance-low {
-    -moz-image-region: rect(0px 100px 16px 84px);
-}
-#button-importance-low:hover:active {
-}
-#button-importance-low[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   importance "medium" image
- *-------------------------------------------------------------------*/
-
-#button-importance-medium {
-    -moz-image-region: rect(0px 116px 16px 100px);
-}
-#button-importance-medium:hover:active {
-}
-#button-importance-medium[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   importance "high" image
- *-------------------------------------------------------------------*/
-
-#button-importance-high {
-    -moz-image-region: rect(0px 132px 16px 116px);
-}
-#button-importance-high:hover:active {
-}
-#button-importance-high[disabled="true"] {
-}
-
-/*--------------------------------------------------------------------
- *   Recurrence dialog preview border
- *-------------------------------------------------------------------*/
-#preview-border {
-    border: none;
-    padding: 0px;
-}
--- a/calendar/providers/gdata/jar.mn
+++ b/calendar/providers/gdata/jar.mn
@@ -1,15 +1,15 @@
 #filter substitution
 
 gdata-provider.jar:
 % content gdata-provider %content/
 % skin gdata-provider classic/1.0 %skin/
 % overlay chrome://calendar/content/calendarCreation.xul chrome://gdata-provider/content/calendarCreation.xul
 % overlay chrome://calendar/content/calendar.xul chrome://gdata-provider/content/gdata-migration-overlay.xul    application={718e30fb-e89b-41dd-9da7-e25a45638b28}
 % overlay chrome://messenger/content/messenger.xul chrome://gdata-provider/content/gdata-migration-overlay.xul  application={3550f703-e582-4d05-9a08-453d09bdfdc6}
-% overlay chrome://calendar/content/sun-calendar-event-dialog.xul chrome://gdata-provider/content/gdata-calendar-event-dialog.xul
+% overlay chrome://calendar/content/calendar-event-dialog.xul chrome://gdata-provider/content/gdata-calendar-event-dialog.xul
     content/calendarCreation.xul                 (content/calendarCreation.xul)
     content/gdata-calendar-event-dialog.xul      (content/gdata-calendar-event-dialog.xul)
     content/gdata-migration.js                   (content/gdata-migration.js)
     content/gdata-migration-overlay.xul          (content/gdata-migration-overlay.xul)
     content/gdata-migration-wizard.xul           (content/gdata-migration-wizard.xul)
     content/gcal.png                             (content/gcal.png)
--- a/calendar/resources/content/mouseoverPreviews.js
+++ b/calendar/resources/content/mouseoverPreviews.js
@@ -159,17 +159,17 @@ function getPreviewForTask( toDoItem )
       hasHeader = true;
     }
 
     if (toDoItem.priority && toDoItem.priority != 0)
     {
       var priorityInteger = parseInt(toDoItem.priority);
       var priorityString;
 
-      // These cut-offs should match sun-calendar-event-dialog.js
+      // These cut-offs should match calendar-event-dialog.js
       if (priorityInteger >= 1 && priorityInteger <= 4) {
            priorityString = calGetString('calendar', 'highPriority'); // high priority
       } else if (priorityInteger == 5) {
           priorityString = calGetString('calendar', 'mediumPriority'); // medium priority
       } else {
           priorityString = calGetString('calendar', 'lowPriority'); // low priority
       }
       boxAppendLabeledText(vbox, "tooltipPriority", priorityString);