Fix step 2 of bug 290747 - use sunbird.jar for sunbird specific files. r=berend,mschroeder
authorPhilipp Kewisch <mozilla@kewis.ch>
Tue, 21 Oct 2008 13:14:47 +0200
changeset 662 fdea86912f931a21b24abab15f502fb9f8d3178d
parent 661 afd7891715ee048926979c99643c97c1d94a434b
child 663 1051db3a259591724e7093e0421106b6a84bb3db
push id590
push usermozilla@kewis.ch
push dateTue, 21 Oct 2008 11:15:11 +0000
treeherdercomm-central@fdea86912f93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersberend, mschroeder
bugs290747
Fix step 2 of bug 290747 - use sunbird.jar for sunbird specific files. r=berend,mschroeder
calendar/base/themes/pinstripe/calendar-toolbar.css
calendar/base/themes/winstripe/calendar-toolbar.css
calendar/locales/en-US/chrome/calendar/calendar.dtd
calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
calendar/locales/en-US/chrome/sunbird/menuOverlay.dtd
calendar/locales/en-US/chrome/sunbird/sunbird.dtd
calendar/sunbird/base/content/calendar-doctype.inc
calendar/sunbird/base/content/calendar-gotodate-dialog.xul
calendar/sunbird/base/content/calendar-menubar.inc
calendar/sunbird/base/content/calendar-sets.inc
calendar/sunbird/base/content/calendar.xul
calendar/sunbird/base/content/sunbird-toolbar.inc
calendar/sunbird/base/jar.mn
calendar/sunbird/base/themes/pinstripe/toolbar.css
calendar/sunbird/base/themes/winstripe/toolbar.css
calendar/sunbird/locales/jar.mn
--- a/calendar/base/themes/pinstripe/calendar-toolbar.css
+++ b/calendar/base/themes/pinstripe/calendar-toolbar.css
@@ -205,40 +205,16 @@ toolbar[iconsize="small"] #calendar-unif
 toolbar[iconsize="small"] #calendar-unifinder-button:active {
         -moz-image-region: rect(24px 528px 48px 504px);
 }
 toolbar[iconsize="small"] #calendar-unifinder-button[disabled="true"] {
         -moz-image-region: rect(48px 528px 72px 504px);
 }
 
 /*--------------------------------------------------------------------
- *   Button: "Choose Date"
- *-------------------------------------------------------------------*/
-
-#calendar-choose-date-button {
-        -moz-image-region: rect(0px 576px 32px 544px);
-}
-#calendar-choose-date-button:active {
-        -moz-image-region: rect(32px 576px 64px 544px);
-}
-#calendar-choose-date-button[disabled="true"] {
-        -moz-image-region: rect(64px 576px 96px 544px);
-}
-
-toolbar[iconsize="small"] #calendar-choose-date-button {
-        -moz-image-region: rect(0px 432px 24px 408px);
-}
-toolbar[iconsize="small"] #calendar-choose-date-button:active {
-        -moz-image-region: rect(24px 432px 48px 408px);
-}
-toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"] {
-        -moz-image-region: rect(48px 432px 72px 408px);
-}
-
-/*--------------------------------------------------------------------
  *   Button: "Multiweek"
  *-------------------------------------------------------------------*/
 
 #calendar-multiweek-view-button {
     -moz-image-region: rect(0px 192px 32px 160px);
 }
 #calendar-multiweek-view-button:active {
     -moz-image-region: rect(32px 192px 64px 160px);
@@ -335,88 +311,16 @@ toolbar[iconsize="small"] #calendar-day-
     -moz-image-region: rect(24px 96px 48px 72px);
 }
 toolbar[iconsize="small"] #calendar-day-view-button:hover:active,
 toolbar[iconsize="small"] #calendar-day-view-button[checked="true"] {
     -moz-image-region: rect(72px 96px 96px 72px);
 }
 
 /*--------------------------------------------------------------------
- *   Button: "Cut"
- *-------------------------------------------------------------------*/
-
-#calendar-cut-button {
-        -moz-image-region: rect(0px 256px 32px 224px);
-}
-#calendar-cut-button:active {
-        -moz-image-region: rect(32px 256px 64px 224px);
-}
-#calendar-cut-button[disabled="true"] {
-        -moz-image-region: rect(64px 256px 96px 224px);
-}
-
-toolbar[iconsize="small"] #calendar-cut-button {
-        -moz-image-region: rect(0px 192px 24px 168px);
-}
-toolbar[iconsize="small"] #calendar-cut-button:active {
-        -moz-image-region: rect(24px 192px 48px 168px);
-}
-toolbar[iconsize="small"] #calendar-cut-button[disabled="true"] {
-        -moz-image-region: rect(48px 192px 72px 168px);
-}
-
-/*--------------------------------------------------------------------
- *   Button: "Copy"
- *-------------------------------------------------------------------*/
-
-#calendar-copy-button {
-        -moz-image-region: rect(0px 288px 32px 256px);
-}
-#calendar-copy-button:active {
-        -moz-image-region: rect(32px 288px 64px 256px);
-}
-#calendar-copy-button[disabled="true"] {
-        -moz-image-region: rect(64px 288px 96px 256px);
-}
-
-toolbar[iconsize="small"] #calendar-copy-button {
-        -moz-image-region: rect(0px 216px 24px 192px);
-}
-toolbar[iconsize="small"] #calendar-copy-button:active {
-        -moz-image-region: rect(24px 216px 48px 192px);
-}
-toolbar[iconsize="small"] #calendar-copy-button[disabled="true"] {
-        -moz-image-region: rect(48px 216px 72px 192px);
-}
-
-/*--------------------------------------------------------------------
- *   Button: "Paste"
- *-------------------------------------------------------------------*/
-
-#calendar-paste-button {
-        -moz-image-region: rect(0px 320px 32px 288px);
-}
-#calendar-paste-button:active {
-        -moz-image-region: rect(32px 320px 64px 288px);
-}
-#calendar-paste-button[disabled="true"] {
-        -moz-image-region: rect(64px 320px 96px 288px);
-}
-
-toolbar[iconsize="small"] #calendar-paste-button {
-        -moz-image-region: rect(0px 240px 24px 216px);
-}
-toolbar[iconsize="small"] #calendar-paste-button:active {
-        -moz-image-region: rect(24px 240px 48px 216px);
-}
-toolbar[iconsize="small"] #calendar-paste-button[disabled="true"] {
-        -moz-image-region: rect(48px 240px 72px 216px);
-}
-
-/*--------------------------------------------------------------------
  *   Button: "Import"
  *-------------------------------------------------------------------*/
 
 #calendar-import-button {
         -moz-image-region: rect(0px 352px 32px 320px);
 }
 #calendar-import-button:active {
         -moz-image-region: rect(32px 352px 64px 320px);
--- a/calendar/base/themes/winstripe/calendar-toolbar.css
+++ b/calendar/base/themes/winstripe/calendar-toolbar.css
@@ -320,52 +320,16 @@ toolbar[iconsize="small"] #calendar-unif
 }
 toolbar[iconsize="small"] #calendar-unifinder-button:hover {
         -moz-image-region: rect(16px 352px 32px 336px);
 }
 toolbar[iconsize="small"] #calendar-unifinder-button:hover:active {
 }
 
 /*--------------------------------------------------------------------
- *   Choose date button
- *-------------------------------------------------------------------*/
-
-#calendar-choose-date-button {
-        -moz-image-region: rect(0px 432px 24px 408px);
-}
-#calendar-choose-date-button[disabled="true"],
-#calendar-choose-date-button[disabled="true"]:hover,
-#calendar-choose-date-button[disabled="true"]:hover:active {
-        -moz-image-region: rect(48px 432px 72px 408px);
-}
-#calendar-choose-date-button:hover {
-        -moz-image-region: rect(24px 432px 48px 408px);
-}
-#calendar-choose-date-button:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   Choose date button - small
- *-------------------------------------------------------------------*/
-
-toolbar[iconsize="small"] #calendar-choose-date-button {
-        -moz-image-region: rect(0px 288px 16px 272px);
-}
-toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"],
-toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"]:hover,
-toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"]:hover:active {
-        -moz-image-region: rect(32px 288px 48px 272px);
-}
-toolbar[iconsize="small"] #calendar-choose-date-button:hover {
-        -moz-image-region: rect(16px 288px 32px 272px);
-}
-toolbar[iconsize="small"] #calendar-choose-date-button:hover:active {
-}
-
-/*--------------------------------------------------------------------
  *   Multiweek view button
  *-------------------------------------------------------------------*/
 #calendar-multiweek-view-button {
     -moz-image-region: rect(0px 144px 24px 120px);
 }
 #calendar-multiweek-view-button:hover {
     -moz-image-region: rect(24px 144px 48px 120px);
 }
@@ -490,124 +454,16 @@ toolbar[iconsize="small"] #calendar-day-
 }
 toolbar[iconsize="small"] #calendar-day-view-button:hover:active,
 toolbar[iconsize="small"] #calendar-day-view-button[checked="true"],
 toolbar[iconsize="small"] #calendar-day-view-button[checked="true"]:hover {
     -moz-image-region: rect(48px 64px 64px 48px);
 }
 
 /*--------------------------------------------------------------------
- *   Cut button
- *-------------------------------------------------------------------*/
-
-#calendar-cut-button {
-        -moz-image-region: rect(0px 192px 24px 168px);
-}
-#calendar-cut-button[disabled="true"],
-#calendar-cut-button[disabled="true"]:hover,
-#calendar-cut-button[disabled="true"]:hover:active {
-        -moz-image-region: rect(48px 192px 72px 168px);
-}
-#calendar-cut-button:hover {
-        -moz-image-region: rect(24px 192px 48px 168px);
-}
-#calendar-cut-button:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   Cut button - small
- *-------------------------------------------------------------------*/
-
-toolbar[iconsize="small"] #calendar-cut-button {
-        -moz-image-region: rect(0px 128px 16px 112px);
-}
-toolbar[iconsize="small"] #calendar-cut-button[disabled="true"],
-toolbar[iconsize="small"] #calendar-cut-button[disabled="true"]:hover,
-toolbar[iconsize="small"] #calendar-cut-button[disabled="true"]:hover:active {
-        -moz-image-region: rect(32px 128px 48px 112px);
-}
-toolbar[iconsize="small"] #calendar-cut-button:hover {
-        -moz-image-region: rect(16px 128px 32px 112px);
-}
-toolbar[iconsize="small"] #calendar-cut-button:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   Copy button
- *-------------------------------------------------------------------*/
-
-#calendar-copy-button {
-        -moz-image-region: rect(0px 216px 24px 192px);
-}
-#calendar-copy-button[disabled="true"],
-#calendar-copy-button[disabled="true"]:hover,
-#calendar-copy-button[disabled="true"]:hover:active {
-        -moz-image-region: rect(48px 216px 72px 192px);
-}
-#calendar-copy-button:hover {
-        -moz-image-region: rect(24px 216px 48px 192px);
-}
-#calendar-copy-button:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   Copy button - small
- *-------------------------------------------------------------------*/
-
-toolbar[iconsize="small"] #calendar-copy-button {
-        -moz-image-region: rect(0px 144px 16px 128px);
-}
-toolbar[iconsize="small"] #calendar-copy-button[disabled="true"],
-toolbar[iconsize="small"] #calendar-copy-button[disabled="true"]:hover,
-toolbar[iconsize="small"] #calendar-copy-button[disabled="true"]:hover:active {
-        -moz-image-region: rect(32px 144px 48px 128px);
-}
-toolbar[iconsize="small"] #calendar-copy-button:hover {
-        -moz-image-region: rect(16px 144px 32px 128px);
-}
-toolbar[iconsize="small"] #calendar-copy-button:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   Paste button
- *-------------------------------------------------------------------*/
-
-#calendar-paste-button {
-        -moz-image-region: rect(0px 240px 24px 216px);
-}
-#calendar-paste-button[disabled="true"],
-#calendar-paste-button[disabled="true"]:hover,
-#calendar-paste-button[disabled="true"]:hover:active {
-        -moz-image-region: rect(48px 240px 72px 216px);
-}
-#calendar-paste-button:hover {
-        -moz-image-region: rect(24px 240px 48px 216px);
-}
-#calendar-paste-button:hover:active {
-}
-
-/*--------------------------------------------------------------------
- *   Paste button - small
- *-------------------------------------------------------------------*/
-
-toolbar[iconsize="small"] #calendar-paste-button {
-        -moz-image-region: rect(0px 160px 16px 144px);
-}
-toolbar[iconsize="small"] #calendar-paste-button[disabled="true"],
-toolbar[iconsize="small"] #calendar-paste-button[disabled="true"]:hover,
-toolbar[iconsize="small"] #calendar-paste-button[disabled="true"]:hover:active {
-        -moz-image-region: rect(32px 160px 48px 144px);
-}
-toolbar[iconsize="small"] #calendar-paste-button:hover {
-        -moz-image-region: rect(16px 160px 32px 144px);
-}
-toolbar[iconsize="small"] #calendar-paste-button:hover:active {
-}
-
-/*--------------------------------------------------------------------
  *   Import button
  *-------------------------------------------------------------------*/
 
 #calendar-import-button {
         -moz-image-region: rect(0px 264px 24px 240px);
 }
 #calendar-import-button[disabled="true"],
 #calendar-import-button[disabled="true"]:hover,
--- a/calendar/locales/en-US/chrome/calendar/calendar.dtd
+++ b/calendar/locales/en-US/chrome/calendar/calendar.dtd
@@ -41,40 +41,29 @@
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- General -->
 <!ENTITY calendar.calendar.label     "Calendar">
 <!ENTITY calendar.calendar.accesskey "C">
 
-<!ENTITY calendar.flat.topbar.choosedate       "Go to Date" >
-<!ENTITY calendar.flat.topbar.dayview          "Day View" >
-<!ENTITY calendar.dayview.accesskey            "D" >
-<!ENTITY calendar.flat.topbar.weekview         "Week View" >
-<!ENTITY calendar.weekview.accesskey           "W" >
-<!ENTITY calendar.flat.topbar.monthview        "Month View" >
-<!ENTITY calendar.monthview.accesskey          "M" >
-<!ENTITY calendar.flat.topbar.multiweekview    "Multiweek View" >
-<!ENTITY calendar.multiweekview.accesskey      "u" >
 <!ENTITY calendar.dayView.key                  "1" >
 <!ENTITY calendar.weekView.key                 "2" >
 <!ENTITY calendar.multiweekView.key            "3" >
 <!ENTITY calendar.monthView.key                "4" >
 
 <!ENTITY calendar.newtask.button.tooltip          "Create a new task" >
 <!ENTITY calendar.newevent.button.tooltip         "Create a new event" >
 <!ENTITY calendar.delete.button.tooltip           "Delete selected event" >
 <!ENTITY calendar.edit.button.tooltip             "Edit selected event" >
 
 <!ENTITY calendar.unifinder.todoitems.label       "Tasks" >
 <!ENTITY calendar.unifinder.showcompletedtodos.label "Show completed Tasks">
 
-<!ENTITY calendar.calendartab.label "Date">
-<!ENTITY calendar.listofcalendarstab.label "Calendars">
 <!ENTITY calendar.today.button.label       "Today">
 <!ENTITY calendar.tomorrow.button.label       "Tomorrow">
 <!ENTITY calendar.soon.button.label           "Soon">
 
 <!ENTITY calendar.events.filter.all.label "All Events">
 <!ENTITY calendar.events.filter.today.label "Today's Events">
 <!ENTITY calendar.events.filter.future.label "All Future Events">
 <!ENTITY calendar.events.filter.current.label "Currently Selected Day">
@@ -92,21 +81,19 @@
 <!ENTITY calendar.unifinder.tree.duedate.label       "Due">
 <!ENTITY calendar.unifinder.tree.completeddate.label "Completed">
 <!ENTITY calendar.unifinder.tree.categories.label    "Category">
 <!ENTITY calendar.unifinder.tree.location.label      "Location">
 <!ENTITY calendar.unifinder.tree.status.label        "Status">
 <!ENTITY calendar.unifinder.tree.calendarname.label  "Calendar Name">
 <!ENTITY calendar.unifinder.tree.duration.label      "Due in">
 <!ENTITY calendar.unifinder.close.tooltip            "Close event search and event list">
-<!ENTITY calendar.find.key  "F">
 
 <!ENTITY calendar.today.button.tooltip            "Go to today" >
 <!ENTITY calendar.todaypane.button.tooltip        "Show Today pane" >
-<!ENTITY calendar.choosedate.button.tooltip       "Choose date to go to" >
 <!ENTITY calendar.unifinder.button.tooltip        "Find and list events" >
 
 <!ENTITY calendar.day.button.tooltip            "Switch to day view" >
 <!ENTITY calendar.week.button.tooltip           "Switch to week view" >
 <!ENTITY calendar.month.button.tooltip          "Switch to month view" >
 <!ENTITY calendar.multiweek.button.tooltip      "Switch to multiweek view" >
 
 <!ENTITY calendar.nextday.button.tooltip        "Next Day" >
@@ -116,26 +103,19 @@
 <!ENTITY calendar.nextmonth.button.tooltip      "Next Month" >
 <!ENTITY calendar.prevmonth.button.tooltip      "Previous Month" >
 
 <!ENTITY calendar.newtask.button.label          "New Task" >
 <!ENTITY calendar.newevent.button.label         "New Event" >
 <!ENTITY calendar.delete.button.label           "Delete" >
 <!ENTITY calendar.edit.button.label             "Edit" >
 
-<!ENTITY calendar.choosedate.button.label       "Choose Date" >
 
-<!ENTITY calendar.cut.button.tooltip            "Cut" >
-<!ENTITY calendar.copy.button.tooltip           "Copy" >
-<!ENTITY calendar.paste.button.tooltip          "Paste" >
 <!ENTITY calendar.print.button.tooltip          "Print calendar" >
 
-<!ENTITY calendar.cut.button.label              "Cut" >
-<!ENTITY calendar.copy.button.label             "Copy" >
-<!ENTITY calendar.paste.button.label            "Paste" >
 <!ENTITY calendar.print.button.label            "Print" >
 
 <!ENTITY calendar.import.button.tooltip            "Import events from a local file" >
 <!ENTITY calendar.export.button.tooltip            "Export events to a local file" >
 <!ENTITY calendar.subscribe.button.tooltip         "Subscribe to a calendar file on a remote machine" >
 <!ENTITY calendar.publish.button.tooltip           "Publish events to a remote machine" >
 
 <!ENTITY calendar.export.calendar                "Export Calendar…" >
@@ -158,28 +138,18 @@
 <!ENTITY calendar.displaytodos.checkbox.label   "Tasks in View" >
 <!ENTITY calendar.displaytodos.checkbox.accesskey "k" >
 <!ENTITY calendar.completedtasks.checkbox.label     "Show completed Tasks" >
 <!ENTITY calendar.completedtasks.checkbox.accesskey "c" >
 
 <!ENTITY calendar.orientation.label "Rotate View" >
 <!ENTITY calendar.orientation.accesskey "o" >
 
-<!ENTITY calendar.menu.options.close.key        "W">
-
 <!ENTITY calendar.search.options.searchfor " contain">
 
-<!ENTITY calendar.menu.numberofweeks.label     "Number of Weeks" >
-<!ENTITY calendar.menu.numberofweeks.accesskey "N" >
-<!ENTITY calendar.menu.numberofweeks.2      "2 Weeks" >
-<!ENTITY calendar.menu.numberofweeks.3      "3 Weeks" >
-<!ENTITY calendar.menu.numberofweeks.4      "4 Weeks" >
-<!ENTITY calendar.menu.numberofweeks.5      "5 Weeks" >
-<!ENTITY calendar.menu.numberofweeks.6      "6 Weeks" >
-
 <!ENTITY calendar.list.header.label                 "Calendar">
 
 <!ENTITY calendar.task.filter.title.label           "Show">
 <!ENTITY calendar.task.filter.all.label             "All">
 <!ENTITY calendar.task.filter.all.accesskey         "A">
 <!ENTITY calendar.task.filter.today.label           "Today">
 <!ENTITY calendar.task.filter.today.accesskey       "T">
 <!ENTITY calendar.task.filter.next7days.label       "Next Seven Days">
@@ -206,24 +176,16 @@
 <!ENTITY calendar.task.category.button.tooltip  "Categorize tasks">
 <!ENTITY calendar.task.complete.button.tooltip  "Mark selected tasks completed">
 <!ENTITY calendar.task.priority.button.tooltip  "Change the priority">
 <!ENTITY calendar.task.delete.button.tooltip    "Delete the selected task">
 
 <!-- Statusbar -->
 <!ENTITY statusText.label            "Document: Done">
 
-<!-- customizable toolbars -->
-<!ENTITY calendar.context.customize.label             "Customize…">
-<!ENTITY calendar.context.customize.accesskey         "C">
-<!ENTITY calendar.menu.customize.label                "Customize Toolbar…">
-<!ENTITY calendar.menu.customize.accesskey            "C">
-<!ENTITY calendar.maintoolbar.name                    "Main Toolbar">
-<!ENTITY calendar.maintoolbar.accesskey               "M">
-
 <!-- Context Menu -->
 <!ENTITY calendar.context.modifyorviewitem.label      "Open">
 <!ENTITY calendar.context.modifyorviewitem.accesskey  "O">
 <!ENTITY calendar.context.modifyorviewtask.label      "Open Task…">
 <!ENTITY calendar.context.modifyorviewtask.accesskey  "O">
 <!ENTITY calendar.context.newevent.label              "New Event…">
 <!ENTITY calendar.context.newevent.accesskey          "N">
 <!ENTITY calendar.context.newtodo.label               "New Task…">
@@ -355,20 +317,16 @@
 <!ENTITY calendarproperties.format.label   "Format:">
 <!ENTITY calendarproperties.location.label "Location:">
 <!ENTITY calendarproperties.name.label     "Name:">
 <!ENTITY calendarproperties.readonly.label "Read Only">
 <!ENTITY calendarproperties.firealarms.label "Show Alarms">
 <!ENTITY calendarproperties.cache.label    "Cache (EXPERIMENTAL, requires restart)">
 <!ENTITY calendarproperties.enabled.label "Switch this calendar on">
 
-<!-- Sunbird Help -->
-<!ENTITY calendar.help.label               "Help Contents">
-<!ENTITY calendar.help.accesskey           "H">
-
 <!-- Calendar Publish Dialog -->
 <!ENTITY calendar.publish.dialog.title              "Publish Calendar">
 <!ENTITY calendar.publish.url.label                 "Publishing URL">
 <!ENTITY calendar.publish.publish.button      "Publish">
 <!ENTITY calendar.publish.close.button      "Close">
 
 <!ENTITY calendar.publish.example.url.description   "Something like http://www.myserver.com/webdav/test.ics">
 
@@ -387,12 +345,8 @@
 <!ENTITY calendar.print.to.label "To:">
 <!ENTITY calendar.print.settingsGroup.label "Print Settings">
 
 <!-- Error reporting -->
 <!ENTITY calendar.error.detail "Details…">
 <!ENTITY calendar.error.number "Error number:">
 <!ENTITY calendar.error.description "Description:">
 <!ENTITY calendar.error.title "An error has occurred">
-
-
-<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
-<!ENTITY mainWindow.title "&brandFullName;">
--- a/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
+++ b/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd
@@ -49,203 +49,68 @@
 <!ENTITY event.new.todo                         "New Task…">
 <!ENTITY event.new.todo.key                     "T">
 <!ENTITY event.new.todo.accesskey               "T">
 
 <!ENTITY calendar.new.server.label              "New Calendar…">
 <!ENTITY calendar.new.server.key                "L">
 <!ENTITY calendar.new.server.accesskey          "l">
 
-<!ENTITY calendar.open.file.label               "Open Calendar File…">
-<!ENTITY calendar.open.file.key                 "O">
-<!ENTITY calendar.open.file.accesskey           "O">
-
-<!ENTITY event.edit.event                       "Edit Selection…">
-<!ENTITY event.edit.event.key                   "E">
-<!ENTITY event.edit.event.accesskey             "E">
-
-<!ENTITY event.delete.event                     "Delete Selected Events">
-<!ENTITY event.delete.event.accesskey           "D">
-
-<!ENTITY event.delete.tasks                     "Delete Selected Tasks">
-<!ENTITY event.delete.tasks.accesskey           "T">
-
 <!ENTITY calendar.print.label                   "Print…">
 <!ENTITY calendar.print.key                     "P">
 <!ENTITY calendar.print.accesskey               "P">
 
-<!ENTITY calendar.pagesetup.label               "Page Setup…">
-<!ENTITY calendar.pagesetup.accesskey           "u">
-
 <!ENTITY calendar.import.label                  "Import…">
 <!ENTITY calendar.import.key                    "I">
 <!ENTITY calendar.import.accesskey              "I">
 
 <!ENTITY calendar.export.calendar.label         "Export Calendar…">
 <!ENTITY calendar.export.calendar.accesskey     "E">
 <!ENTITY calendar.export.selection.label        "Export Selection…">
 <!ENTITY calendar.export.selection.accesskey    "S">
 
-<!ENTITY calendar.subscribe.label               "Subscribe to Remote Calendar…">
-<!ENTITY calendar.subscribe.accesskey           "R">
-
-<!ENTITY calendar.reloadserver.label            "Reload Remote Calendars">
-<!ENTITY calendar.reloadserver.key              "R">
-<!ENTITY calendar.reloadserver.accesskey        "R">
-
 <!ENTITY calendar.publish.label                 "Publish…">
 <!ENTITY calendar.publish.accesskey             "b">
-<!ENTITY calendar.publish.calendar.label        "Publish Calendar…">
-<!ENTITY calendar.publish.calendar.accesskey    "b">
-<!ENTITY calendar.publish.selection.label       "Publish Selection…">
-<!ENTITY calendar.publish.selection.accesskey   "c">
-
-<!ENTITY calendar.quit.label                    "Quit">
-<!ENTITY calendar.quit.accesskey                "Q">
-<!ENTITY calendar.quit.key                      "Q">
-<!ENTITY calendar.quit.label.mac                "Quit &brandShortName;">
-
-<!ENTITY calendar.exit.label                    "Exit">
-<!ENTITY calendar.exit.accesskey                "x">
-
-<!ENTITY calendar.undo.label                    "Undo">
-<!ENTITY calendar.undo.key                      "Z">
-<!ENTITY calendar.undo.accesskey                "u">
-
-<!ENTITY calendar.redo.label                    "Redo">
-<!ENTITY calendar.redo.key                      "Y">
-<!ENTITY calendar.redo.accesskey                "r">
-
-<!ENTITY calendar.cut.label                     "Cut">
-<!ENTITY calendar.cut.key                       "X">
-<!ENTITY calendar.cut.accesskey                 "t">
-
-<!ENTITY calendar.copy.label                    "Copy">
-<!ENTITY calendar.copy.key                      "C">
-<!ENTITY calendar.copy.accesskey                "C">
-
-<!ENTITY calendar.paste.label                   "Paste">
-<!ENTITY calendar.paste.key                     "V">
-<!ENTITY calendar.paste.accesskey               "P">
-
-<!ENTITY calendar.selectall.label               "Select All">
-<!ENTITY calendar.selectall.key                 "A">
-<!ENTITY calendar.selectall.accesskey           "A">
-
-<!ENTITY toolbarsMenu.label                     "Toolbars">
-<!ENTITY toolbarsMenu.accesskey                 "T">
 
 <!ENTITY calendar.toolbar.label                 "Calendar Toolbar">
 <!ENTITY calendar.toolbar.accesskey             "T">
 <!ENTITY task.toolbar.label                     "Task Toolbar">
 <!ENTITY task.toolbar.accesskey                 "b">
 
 <!ENTITY calendar.menu.customize.label          "Customize…">
 <!ENTITY calendar.menu.customize.accesskey      "C">
 
-<!ENTITY showStatusBarCmd.label                 "Status Bar">
-<!ENTITY showStatusBarCmd.accesskey             "B">
-
-<!ENTITY showTaskBoxCmd.label                   "Task List">
-<!ENTITY showTaskBoxCmd.accesskey               "L">
-
 <!ENTITY showUnifinderCmd.label                 "Find Events">
 <!ENTITY showUnifinderCmd.accesskey             "F">
 
 <!ENTITY calendar.displaytodos.checkbox.label       "Show Tasks in Calendar">
 <!ENTITY calendar.displaytodos.checkbox.accesskey   "T">
 
 <!ENTITY calendar.menu.numberofweeks.label      "Multiweek View Size">
 <!ENTITY calendar.menu.numberofweeks.2          "Two Weeks">
 <!ENTITY calendar.menu.numberofweeks.3          "Three Weeks">
 <!ENTITY calendar.menu.numberofweeks.4          "Four Weeks">
 <!ENTITY calendar.menu.numberofweeks.5          "Five Weeks">
 <!ENTITY calendar.menu.numberofweeks.6          "Six Weeks">
 
-<!ENTITY calendar.fullscreen.label              "Full Screen">
-<!ENTITY calendar.fullscreen.accesskey          "F">
-
-<!ENTITY calendar.addons.label                  "Add-ons">
-<!ENTITY calendar.addons.accesskey              "d">
-
-<!ENTITY goMenu.label                           "Go">
-<!ENTITY goMenu.accesskey                       "G">
-
 <!ENTITY goTodayCmd.label                       "Today">
 <!ENTITY goTodayCmd.accesskey                   "T">
 
-<!ENTITY goDateCmd.label                        "Date…">
-<!ENTITY goDateCmd.accesskey                    "D">
-
 <!ENTITY goPreviousCmd.day.label                "Previous Day">
 <!ENTITY goPreviousCmd.week.label               "Previous Week">
 <!ENTITY goPreviousCmd.month.label              "Previous Month">
 <!ENTITY goPreviousCmd.accesskey                "P">
 
 <!ENTITY goNextCmd.day.label                    "Next Day">
 <!ENTITY goNextCmd.week.label                   "Next Week">
 <!ENTITY goNextCmd.month.label                  "Next Month">
 <!ENTITY goNextCmd.all.accesskey                "e">
 
-<!ENTITY toolsMenu.label                        "Tools">
-<!ENTITY toolsMenu.accesskey                    "T">
-
-<!ENTITY errorConsoleCmd.label                  "Error Console">
-<!ENTITY errorConsoleCmd.accesskey              "C">
-
 <!ENTITY addressBookCmd.label                   "Address Book">
 <!ENTITY addressBookCmd.accesskey               "A">
 
-<!ENTITY helpMenu.label                         "Help">
-<!ENTITY helpMenu.accesskey                     "H">
-<!-- LOCALIZATION NOTE some localizations of Windows use "?"
-           for the help button in the menubar but Gnome does not.   -->
-<!ENTITY helpMenuWin.label                      "Help"> 
-<!ENTITY helpMenuWin.accesskey                  "H">
-
-<!-- Toolbar items -->
-<!ENTITY fileMenu.label                         "File">
-<!ENTITY fileMenu.accesskey                     "F">
-
-<!ENTITY editMenu.label                         "Edit">
-<!ENTITY editMenu.accesskey                     "E">
-<!ENTITY optionsCmd.label                       "Options…">
-<!ENTITY optionsCmd.accesskey                   "O">
-<!ENTITY preferencesCmd.label                   "Preferences">
-<!ENTITY preferencesCmd.accesskey               "n">
-<!ENTITY preferencesCmdMac.label                "Preferences…">
-<!ENTITY preferencesCmdMac.commandkey           ",">
-<!ENTITY preferencesCmdMac.modifiers            "accel">
-
-<!ENTITY viewMenu.label                         "View">
-<!ENTITY viewMenu.accesskey                     "V">
-
-<!ENTITY releaseCmd.label                       "Release Notes">
-<!ENTITY releaseCmd.accesskey                   "R">
-<!ENTITY aboutCmd.label                         "About &brandFullName;">
-<!ENTITY aboutCmd.accesskey                     "A">
-<!ENTITY updateCmd.label                        "Check for Updates…">
-<!ENTITY updateCmd.accesskey                    "o">
-
-<!-- Mac OS X "Window" menu items -->
-<!ENTITY windowMenu.label                       "Window">
-<!ENTITY minimizeWindow.label                   "Minimize">
-<!ENTITY zoomWindow.label                       "Zoom">
-<!ENTITY minimizeWindow.key                     "M">
-<!ENTITY bringAllToFront.label                  "Bring All to Front">
-
-<!-- Mac OS X Application menu items -->
-<!ENTITY servicesMenuMac.label          "Services">
-<!ENTITY hideThisAppCmdMac.label        "Hide &brandShortName;">
-<!ENTITY hideThisAppCmdMac.commandkey   "H">
-<!ENTITY hideThisAppCmdMac.modifiers    "accel">
-<!ENTITY hideOtherAppsCmdMac.label      "Hide Others">
-<!ENTITY hideOtherAppsCmdMac.commandkey "H">
-<!ENTITY hideOtherAppsCmdMac.modifiers  "accel,alt">
-<!ENTITY showAllAppsCmdMac.label        "Show All">
-
 <!ENTITY calendar.importcalendar.label          "Import Calendar…">
 
 <!ENTITY showCurrentView.label                  "Current View">
 <!ENTITY showCurrentView.accesskey              "V">
 
 <!ENTITY calendar.properties.label              "Calendar Properties…">
 <!ENTITY calendar.properties.accesskey          "C">
new file mode 100644
--- /dev/null
+++ b/calendar/locales/en-US/chrome/sunbird/menuOverlay.dtd
@@ -0,0 +1,182 @@
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla Public License Version
+   - 1.1 (the "License"); you may not use this file except in compliance with
+   - the License. You may obtain a copy of the License at
+   - http://www.mozilla.org/MPL/
+   -
+   - Software distributed under the License is distributed on an "AS IS" basis,
+   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+   - for the specific language governing rights and limitations under the
+   - License.
+   -
+   - The Original Code is OEone Calendar Code, released October 31st, 2001.   -
+   -
+   - The Initial Developer of the Original Code is
+   -   OEone Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Garth Smedley <garths@oeone.com>
+   -   Mike Potter <mikep@oeone.com>
+   -   Chris Charabaruk <coldacid@meldstar.com>
+   -   Matthew Willis <mattwillis@gmail.com>
+   -   Stefan Sitter <ssitter@googlemail.com>
+   -   Berend Cornelius <berend.cornelius@sun.com>
+   -   Philipp Kewisch <mozilla@kewis.ch>
+   -   Simon Paquet <bugzilla@babylonsounds.com>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the 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 calendar.open.file.label                          "Open Calendar File…">
+<!ENTITY calendar.open.file.key                            "O">
+<!ENTITY calendar.open.file.accesskey                      "O">
+
+<!ENTITY event.edit.event                                  "Edit Selection…">
+<!ENTITY event.edit.event.key                              "E">
+<!ENTITY event.edit.event.accesskey                        "E">
+
+<!ENTITY event.delete.event                                "Delete Selected Events">
+<!ENTITY event.delete.event.accesskey                      "D">
+
+<!ENTITY event.delete.tasks                                "Delete Selected Tasks">
+<!ENTITY event.delete.tasks.accesskey                      "T">
+
+<!ENTITY calendar.pagesetup.label                          "Page Setup…">
+<!ENTITY calendar.pagesetup.accesskey                      "u">
+
+<!ENTITY calendar.subscribe.label                          "Subscribe to Remote Calendar…">
+<!ENTITY calendar.subscribe.accesskey                      "R">
+
+<!ENTITY calendar.reloadserver.label                       "Reload Remote Calendars">
+<!ENTITY calendar.reloadserver.key                         "R">
+<!ENTITY calendar.reloadserver.accesskey                   "R">
+
+<!ENTITY calendar.publish.calendar.label                   "Publish Calendar…">
+<!ENTITY calendar.publish.calendar.accesskey               "b">
+<!ENTITY calendar.publish.selection.label                  "Publish Selection…">
+<!ENTITY calendar.publish.selection.accesskey              "c">
+
+<!ENTITY calendar.quit.label                               "Quit">
+<!ENTITY calendar.quit.accesskey                           "Q">
+<!ENTITY calendar.quit.key                                 "Q">
+<!ENTITY calendar.quit.label.mac                           "Quit &brandShortName;">
+
+<!ENTITY calendar.exit.label                               "Exit">
+<!ENTITY calendar.exit.accesskey                           "x">
+
+<!ENTITY calendar.undo.label                               "Undo">
+<!ENTITY calendar.undo.key                                 "Z">
+<!ENTITY calendar.undo.accesskey                           "u">
+
+<!ENTITY calendar.redo.label                               "Redo">
+<!ENTITY calendar.redo.key                                 "Y">
+<!ENTITY calendar.redo.accesskey                           "r">
+
+<!ENTITY calendar.cut.label                                "Cut">
+<!ENTITY calendar.cut.key                                  "X">
+<!ENTITY calendar.cut.accesskey                            "t">
+
+<!ENTITY calendar.copy.label                               "Copy">
+<!ENTITY calendar.copy.key                                 "C">
+<!ENTITY calendar.copy.accesskey                           "C">
+
+<!ENTITY calendar.paste.label                              "Paste">
+<!ENTITY calendar.paste.key                                "V">
+<!ENTITY calendar.paste.accesskey                          "P">
+
+<!ENTITY calendar.selectall.label                          "Select All">
+<!ENTITY calendar.selectall.key                            "A">
+<!ENTITY calendar.selectall.accesskey                      "A">
+
+<!ENTITY toolbarsMenu.label                                "Toolbars">
+<!ENTITY toolbarsMenu.accesskey                            "T">
+
+<!ENTITY showStatusBarCmd.label                            "Status Bar">
+<!ENTITY showStatusBarCmd.accesskey                        "B">
+
+<!ENTITY showTaskBoxCmd.label                              "Task List">
+<!ENTITY showTaskBoxCmd.accesskey                          "L">
+
+<!ENTITY calendar.fullscreen.label                         "Full Screen">
+<!ENTITY calendar.fullscreen.accesskey                     "F">
+
+<!ENTITY calendar.addons.label                             "Add-ons">
+<!ENTITY calendar.addons.accesskey                         "d">
+
+<!ENTITY goMenu.label                                      "Go">
+<!ENTITY goMenu.accesskey                                  "G">
+
+<!ENTITY goDateCmd.label                                   "Date…">
+<!ENTITY goDateCmd.accesskey                               "D">
+
+<!ENTITY toolsMenu.label                                   "Tools">
+<!ENTITY toolsMenu.accesskey                               "T">
+
+<!ENTITY errorConsoleCmd.label                             "Error Console">
+<!ENTITY errorConsoleCmd.accesskey                         "C">
+
+<!ENTITY helpMenu.label                                    "Help">
+<!ENTITY helpMenu.accesskey                                "H">
+<!-- LOCALIZATION NOTE some localizations of Windows use "?"
+           for the help button in the menubar but Gnome does not.   -->
+<!ENTITY helpMenuWin.label                                 "Help">
+<!ENTITY helpMenuWin.accesskey                             "H">
+
+<!ENTITY fileMenu.label                                    "File">
+<!ENTITY fileMenu.accesskey                                "F">
+
+<!ENTITY editMenu.label                                    "Edit">
+<!ENTITY editMenu.accesskey                                "E">
+
+<!ENTITY optionsCmd.label                                  "Options…">
+<!ENTITY optionsCmd.accesskey                              "O">
+
+<!ENTITY preferencesCmd.label                              "Preferences">
+<!ENTITY preferencesCmd.accesskey                          "n">
+<!ENTITY preferencesCmdMac.label                           "Preferences…">
+<!ENTITY preferencesCmdMac.commandkey                      ",">
+<!ENTITY preferencesCmdMac.modifiers                       "accel">
+
+<!ENTITY viewMenu.label                                    "View">
+<!ENTITY viewMenu.accesskey                                "V">
+
+<!ENTITY releaseCmd.label                                  "Release Notes">
+<!ENTITY releaseCmd.accesskey                              "R">
+
+<!ENTITY aboutCmd.label                                    "About &brandFullName;">
+<!ENTITY aboutCmd.accesskey                                "A">
+
+<!ENTITY updateCmd.label                                   "Check for Updates…">
+<!ENTITY updateCmd.accesskey                               "o">
+
+<!-- Mac OS X "Window" menu items -->
+<!ENTITY windowMenu.label                                  "Window">
+<!ENTITY minimizeWindow.label                              "Minimize">
+<!ENTITY zoomWindow.label                                  "Zoom">
+<!ENTITY minimizeWindow.key                                "M">
+<!ENTITY bringAllToFront.label                             "Bring All to Front">
+
+<!-- Mac OS X Application menu items -->
+<!ENTITY servicesMenuMac.label                             "Services">
+<!ENTITY hideThisAppCmdMac.label                           "Hide &brandShortName;">
+<!ENTITY hideThisAppCmdMac.commandkey                      "H">
+<!ENTITY hideThisAppCmdMac.modifiers                       "accel">
+<!ENTITY hideOtherAppsCmdMac.label                         "Hide Others">
+<!ENTITY hideOtherAppsCmdMac.commandkey                    "H">
+<!ENTITY hideOtherAppsCmdMac.modifiers                     "accel,alt">
+<!ENTITY showAllAppsCmdMac.label                           "Show All">
new file mode 100644
--- /dev/null
+++ b/calendar/locales/en-US/chrome/sunbird/sunbird.dtd
@@ -0,0 +1,86 @@
+<!-- ***** 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
+   -   Philipp Kewisch <mozilla@kewis.ch>
+   - Portions created by the Initial Developer are Copyright (C) 2008
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the LGPL or the GPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<!ENTITY sunbird.cut.button.tooltip                        "Cut" >
+<!ENTITY sunbird.copy.button.tooltip                       "Copy" >
+<!ENTITY sunbird.paste.button.tooltip                      "Paste" >
+
+<!ENTITY sunbird.choosedate.button.label                   "Choose Date" >
+<!ENTITY sunbird.choosedate.button.tooltip                 "Choose date to go to" >
+<!ENTITY sunbird.cut.button.label                          "Cut" >
+<!ENTITY sunbird.copy.button.label                         "Copy" >
+<!ENTITY sunbird.paste.button.label                        "Paste" >
+
+<!ENTITY sunbird.flat.topbar.choosedate                    "Go to Date" >
+<!ENTITY sunbird.flat.topbar.dayview                       "Day View" >
+<!ENTITY sunbird.flat.topbar.weekview                      "Week View" >
+<!ENTITY sunbird.flat.topbar.monthview                     "Month View" >
+<!ENTITY sunbird.flat.topbar.multiweekview                 "Multiweek View" >
+
+<!ENTITY sunbird.dayview.accesskey                         "D" >
+<!ENTITY sunbird.weekview.accesskey                        "W" >
+<!ENTITY sunbird.monthview.accesskey                       "M" >
+<!ENTITY sunbird.multiweekview.accesskey                   "u" >
+
+
+<!ENTITY sunbird.calendartab.label                         "Date">
+<!ENTITY sunbird.listofcalendarstab.label                  "Calendars">
+
+<!ENTITY sunbird.find.key                                  "F">
+<!ENTITY sunbird.close.key                                 "W">
+
+<!ENTITY sunbird.menu.numberofweeks.label                  "Number of Weeks" >
+<!ENTITY sunbird.menu.numberofweeks.accesskey              "N" >
+<!ENTITY sunbird.menu.numberofweeks.2                      "2 Weeks" >
+<!ENTITY sunbird.menu.numberofweeks.3                      "3 Weeks" >
+<!ENTITY sunbird.menu.numberofweeks.4                      "4 Weeks" >
+<!ENTITY sunbird.menu.numberofweeks.5                      "5 Weeks" >
+<!ENTITY sunbird.menu.numberofweeks.6                      "6 Weeks" >
+
+<!-- customizable toolbars -->
+<!ENTITY sunbird.context.customize.label                   "Customize…">
+<!ENTITY sunbird.context.customize.accesskey               "C">
+<!ENTITY sunbird.menu.customize.label                      "Customize Toolbar…">
+<!ENTITY sunbird.menu.customize.accesskey                  "C">
+<!ENTITY sunbird.maintoolbar.name                          "Main Toolbar">
+<!ENTITY sunbird.maintoolbar.accesskey                     "M">
+
+<!-- Sunbird Help -->
+<!ENTITY sunbird.help.label                                "Help Contents">
+<!ENTITY sunbird.help.accesskey                            "H">
+
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title                                  "&brandFullName;">
--- a/calendar/sunbird/base/content/calendar-doctype.inc
+++ b/calendar/sunbird/base/content/calendar-doctype.inc
@@ -41,14 +41,16 @@
 #
 # ***** END LICENSE BLOCK *****
 
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window
 [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
+  <!ENTITY % sunbirdDTD SYSTEM "chrome://sunbird/locale/sunbird.dtd" > %sunbirdDTD;
   <!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %calendarMenuOverlayDTD;
+  <!ENTITY % sunbirdMenuOverlayDTD SYSTEM "chrome://sunbird/locale/menuOverlay.dtd" > %sunbirdMenuOverlayDTD;
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
   <!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd"> %globalRegionDTD;
   <!ENTITY % calendar-event-dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
   %calendar-event-dialogDTD;
 ]>
--- a/calendar/sunbird/base/content/calendar-gotodate-dialog.xul
+++ b/calendar/sunbird/base/content/calendar-gotodate-dialog.xul
@@ -35,31 +35,28 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/datetimepickers/datetimepickers.css" type="text/css"?>
 
-<!DOCTYPE dialog [
-  <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
-  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-]>
+<!DOCTYPE dialog SYSTEM "chrome://sunbird/locale/sunbird.dtd" >
 
 <!-- When opening calendar-gotodate-dialog.xul, you can supply an object argument
      that contains following named keys:
      * callback - function that should be called with datepicker value as argument
                   when clicking OK button
      * date (optional) - initially selected date in datepicker -->
 <dialog id="calendar-gotodate-dialog"
-        title="&calendar.flat.topbar.choosedate;"
+        title="&sunbird.flat.topbar.choosedate;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="document.getElementById('datepicker').value = window.arguments[0].date || new Date();"
         buttons="accept,cancel"
         ondialogaccept="window.arguments[0].callback(document.getElementById('datepicker').value);"
         ondialogcancel="return true;">
   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
   <hbox align="center">
-    <label control="datepicker">&calendar.flat.topbar.choosedate;</label>
+    <label control="datepicker">&sunbird.flat.topbar.choosedate;</label>
     <datepicker id="datepicker"/>
   </hbox>
 </dialog>
--- a/calendar/sunbird/base/content/calendar-menubar.inc
+++ b/calendar/sunbird/base/content/calendar-menubar.inc
@@ -217,18 +217,18 @@
            <menu id="menu_Toolbars"
                  label="&toolbarsMenu.label;"
                  accesskey="&toolbarsMenu.accesskey;"
                  onpopupshowing="sbOnViewToolbarsPopupShowing(event);">
              <menupopup>
                <menuseparator/>
                <menuitem id="calendar-view-menu-customize"
                          observes="cmd_CustomizeToolbars"
-                         label="&calendar.menu.customize.label;"
-                         accesskey="&calendar.menu.customize.accesskey;"/>
+                         label="&sunbird.menu.customize.label;"
+                         accesskey="&sunbird.menu.customize.accesskey;"/>
              </menupopup>
            </menu>
            <menuitem id="menu_showStatusBar"
                      type="checkbox"
                      label="&showStatusBarCmd.label;"
                      command="cmd_showStatusBar"
                      accesskey="&showStatusBarCmd.accesskey;"
                      checked="true"/>
@@ -238,39 +238,39 @@
                      command="cmd_showTaskBox"
                      accesskey="&showTaskBoxCmd.accesskey;"
                      checked="true"/>
            <menuseparator/>
            <menuitem id="calendar-view-menu-day"
                      type="radio"
                      name="calendarMenuViews"
                      key="calendar-day-view-key"
-                     label="&calendar.flat.topbar.dayview;"
-                     accesskey="&calendar.dayview.accesskey;"
+                     label="&sunbird.flat.topbar.dayview;"
+                     accesskey="&sunbird.dayview.accesskey;"
                      observes="calendar_day-view_command"/>
            <menuitem id="calendar-view-menu-week"
                      type="radio"
                      name="calendarMenuViews"
                      key="calendar-week-view-key"
-                     label="&calendar.flat.topbar.weekview;"
-                     accesskey="&calendar.weekview.accesskey;"
+                     label="&sunbird.flat.topbar.weekview;"
+                     accesskey="&sunbird.weekview.accesskey;"
                      observes="calendar_week-view_command"/>
            <menuitem id="calendar-view-menu-multiweek"
                      type="radio"
                      name="calendarMenuViews"
                      key="calendar-multiweek-view-key"
-                     label="&calendar.flat.topbar.multiweekview;"
-                     accesskey="&calendar.multiweekview.accesskey;"
+                     label="&sunbird.flat.topbar.multiweekview;"
+                     accesskey="&sunbird.multiweekview.accesskey;"
                      observes="calendar_multiweek-view_command"/>
            <menuitem id="calendar-view-menu-month"
                      type="radio"
                      name="calendarMenuViews"
                      key="calendar-month-view-key"
-                     label="&calendar.flat.topbar.monthview;"
-                     accesskey="&calendar.monthview.accesskey;"
+                     label="&sunbird.flat.topbar.monthview;"
+                     accesskey="&sunbird.monthview.accesskey;"
                      observes="calendar_month-view_command"/>
            <menuseparator/>
            <menuitem id="calendar_view_orientation"
                      type="checkbox"
                      label="&calendar.orientation.label;"
                      accesskey="&calendar.orientation.accesskey;"
                      observes="calendar_toggle_orientation_command"/>
            <menuitem id="only-workday-checkbox-1"
@@ -284,41 +284,41 @@
                      accesskey="&calendar.displaytodos.checkbox.accesskey;"
                      observes="calendar_toggle_tasks_in_view_command"/>
            <menuitem id="completed-tasks-inview-checkbox-1"
                      type="checkbox"
                      label="&calendar.completedtasks.checkbox.label;"
                      accesskey="&calendar.completedtasks.checkbox.accesskey;"
                      observes="calendar_toggle_show_completed_in_view_command"/>
            <menu id="menu-numberofweeks-inview"
-                 label="&calendar.menu.numberofweeks.label;"
-                 accesskey="&calendar.menu.numberofweeks.accesskey;"
+                 label="&sunbird.menu.numberofweeks.label;"
+                 accesskey="&sunbird.menu.numberofweeks.accesskey;"
                  oncommand="gCalendarWindow.currentView.changeNumberOfWeeks(event.target)"
                  disabled="true">
            <menupopup>
              <menuitem type="radio"
                        value="2"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.2;"/>
+                       label="&sunbird.menu.numberofweeks.2;"/>
              <menuitem type="radio"
                        value="3"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.3;"/>
+                       label="&sunbird.menu.numberofweeks.3;"/>
              <menuitem type="radio"
                        value="4"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.4;"/>
+                       label="&sunbird.menu.numberofweeks.4;"/>
              <menuitem type="radio"
                        value="5"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.5;"/>
+                       label="&sunbird.menu.numberofweeks.5;"/>
              <menuitem type="radio"
                        value="6"
                        name="menunbofweeks"
-                       label="&calendar.menu.numberofweeks.6;"/>
+                       label="&sunbird.menu.numberofweeks.6;"/>
            </menupopup>
            </menu>
            <menuseparator/>
            <!-- XXX lilmatt: Finish this! -->
            <menuitem id="calendar-fullscreen-menu"
                      label="&calendar.fullscreen.label;"
                      accesskey="&calendar.fullscreen.accesskey;"
                      disabled="true"/>
@@ -454,18 +454,18 @@
          accesskey="&helpMenuWin.accesskey;">
 #else
    <menu id="menu_Help"
          label="&helpMenu.label;"
          accesskey="&helpMenu.accesskey;">
 #endif
          <menupopup id="menu_HelpPopup" onpopupshowing="sbUpdateItem();">
            <!-- XXX lilmatt: Finish this!  oncommand="openTopWin('&helpURL;');" -->
-           <menuitem label="&calendar.help.label;"
-                     accesskey="&calendar.help.accesskey;"
+           <menuitem label="&sunbird.help.label;"
+                     accesskey="&sunbird.help.accesskey;"
                      disabled="true"/>
            <menuitem accesskey="&releaseCmd.accesskey;"
                      label="&releaseCmd.label;"
                      oncommand="openReleaseNotes();"/>
            <menuseparator id="menu_HelpUpdatesSeparator"/>
            <menuitem id="checkForUpdates"
                      class="menuitem-iconic"
                      label="&updateCmd.label;"
--- a/calendar/sunbird/base/content/calendar-sets.inc
+++ b/calendar/sunbird/base/content/calendar-sets.inc
@@ -79,17 +79,17 @@
 </commandset>
 
 <keyset id="calendar-keys">
   <key id="calendar-new-event-key" key="&event.new.event.key;"             observes="calendar_new_event_command"  modifiers="accel"/>
   <key id="calendar-new-todo-key" key="&event.new.todo.key;"              observes="calendar_new_todo_command"   modifiers="accel"/>
   <key id="modify_event_key"     key="&event.edit.event.key;"            observes="calendar_modify_event_command"  modifiers="accel"/>
   <key id="new_calendar_key"     key="&calendar.new.server.key;"         observes="calendar_new_calendar_command"  modifiers="accel"/>
   <key id="open_calendar_key"    key="&calendar.open.file.key;"          observes="open_local_calendar_command" modifiers="accel"/>
-  <key id="key_close"            key="&calendar.menu.options.close.key;" observes="close_calendar_command"      modifiers="accel"/>
+  <key id="key_close"            key="&sunbird.close.key;"               observes="close_calendar_command"      modifiers="accel"/>
   <key id="print_key"            key="&calendar.print.key;"              observes="cmd_print"                   modifiers="accel"/>
 
   <key id="undo_key"             key="&calendar.undo.key;"               observes="cmd_undo"                    modifiers="accel"/>
 #ifdef XP_UNIX
   <key id="redo_key"             key="&calendar.undo.key;"               observes="cmd_redo"                    modifiers="shift, accel"/>
 #else
   <key id="redo_key"             key="&calendar.redo.key;"               observes="cmd_redo"                    modifiers="accel"/>
 #endif
@@ -100,17 +100,17 @@
   <key id="key_selectAll"        key="&calendar.selectall.key;"          observes="cmd_selectAll"               modifiers="accel"/>
 
   <key id="go_to_date_key"       keycode="VK_UP"                         observes="go_date_command"             modifiers="accel"/>
 
   <key id="import_key"           key="&calendar.import.key;"             observes="calendar_import_command"              modifiers="accel"/>
   <key id="reload_server_key"    key="&calendar.reloadserver.key;"       observes="calendar_reload_remote_calendars"     modifiers="accel"/>
 
   <key id="find_key"
-       key="&calendar.find.key;"
+       key="&sunbird.find.key;"
        modifiers="accel"
        oncommand="focusSearch();"/>
 
 #ifdef XP_MACOSX
   <key id="key_minimizeWindow"   key="&minimizeWindow.key;"              command="minimizeWindow"               modifiers="accel"/>
   <key id="key_preferencesCmdMac" key="&preferencesCmdMac.commandkey;" modifiers="&preferencesCmdMac.modifiers;"/>
   <key id="key_hideThisAppCmdMac" key="&hideThisAppCmdMac.commandkey;" modifiers="&hideThisAppCmdMac.modifiers;"/>
   <key id="key_hideOtherAppsCmdMac" key="&hideOtherAppsCmdMac.commandkey;" modifiers="&hideOtherAppsCmdMac.modifiers;"/>
--- a/calendar/sunbird/base/content/calendar.xul
+++ b/calendar/sunbird/base/content/calendar.xul
@@ -46,16 +46,17 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- Style sheets -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://sunbird/skin/calendar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-toolbar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://sunbird/skin/toolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/minimonth.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-view-bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
 
 <!-- Overlays -->
@@ -98,18 +99,18 @@
   <script type="application/javascript" src="chrome://calendar/content/calendar-unifinder.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-unifinder-todo.js"/>
 
 <!-- GENERAL CONTEXT MENU -->
 <popupset id="calendar-popupset">
   <popup id="toolbar-context-menu">
     <menuitem command="cmd_CustomizeToolbars"
               id="toolbar-context-menu-customize"
-              label="&calendar.context.customize.label;"
-              accesskey="&calendar.context.customize.accesskey;"/>
+              label="&sunbird.context.customize.label;"
+              accesskey="&sunbird.context.customize.accesskey;"/>
   </popup>
 </popupset>
 
 <commandset id="commands"/>
 
 <toolbox id="calendar-toolbox" class="toolbox-top" mode="full"
          defaultmode="full">
   <!-- Menu -->
@@ -135,17 +136,17 @@
               oncommand="openAboutDialog();"
               tooltiptext="&aboutCmd.label;"/>
     </toolbaritem>
   </toolbarpalette>
   <toolbar class="toolbar-primary chromeclass-toolbar" id="calendar-bar"
            iconsize="large"
            defaultset="calendar-new-event-button,calendar-new-task-button,calendar-edit-button,calendar-delete-button,separator,calendar-go-to-today-button,separator,calendar-day-view-button,calendar-week-view-button,calendar-multiweek-view-button,calendar-month-view-button,separator,calendar-unifinder-button,spring,throbber-box"
            customizable="true" mode="full"
-           toolbarname="&calendar.maintoolbar.name;" accesskey="&calendar.maintoolbar.accesskey;"
+           toolbarname="&sunbird.maintoolbar.name;" accesskey="&sunbird.maintoolbar.accesskey;"
            context="toolbar-context-menu"/>
   <toolbarset id="customToolbars" context="toolbar-context-menu"/>
 </toolbox>
 
 
 <!-- V I S I B L E  C O N T E N T  -->
 
 <vbox id="calendar-top-box"
@@ -156,18 +157,18 @@
 
   <!-- Calendar Controls-->
  
   <hbox id="calendar-content-box" flex="1">
 
     <vbox id="left-hand-content" persist="width">
       <tabbox id="tablist" persist="selectedIndex" flex="1">
         <tabs>
-          <tab label="&calendar.calendartab.label;"/>
-          <tab label="&calendar.listofcalendarstab.label;"/>
+          <tab label="&sunbird.calendartab.label;"/>
+          <tab label="&sunbird.listofcalendarstab.label;"/>
         </tabs>
         <tabpanels flex="1">
           <tabpanel>
             <vbox flex="1" align="center">
               <spacer id="spaceaboveleftminimonth" flex="1" orient="vertical"/>
               <minimonth id="calMinimonth"
                          maxheight="300"
                          freebusy="true"
--- a/calendar/sunbird/base/content/sunbird-toolbar.inc
+++ b/calendar/sunbird/base/content/sunbird-toolbar.inc
@@ -51,26 +51,26 @@
                observes="calendar_modify_event_command"/>
 <toolbarbutton class="cal-toolbarbutton-1"
                id="calendar-delete-button"
                label="&calendar.delete.button.label;"
                tooltiptext="&calendar.delete.button.tooltip;"
                observes="calendar_delete_event_command"/>
 <toolbarbutton class="cal-toolbarbutton-1"
                id="calendar-cut-button"
-               label="&calendar.cut.button.label;"
-               tooltiptext="&calendar.cut.button.tooltip;"
+               label="&sunbird.cut.button.label;"
+               tooltiptext="&sunbird.cut.button.tooltip;"
                observes="cmd_cut"/>
 <toolbarbutton class="cal-toolbarbutton-1"
                id="calendar-copy-button"
-               label="&calendar.copy.button.label;"
-               tooltiptext="&calendar.copy.button.tooltip;"
+               label="&sunbird.copy.button.label;"
+               tooltiptext="&sunbird.copy.button.tooltip;"
                observes="cmd_copy"/>
 <toolbarbutton class="cal-toolbarbutton-1"
                id="calendar-paste-button"
-               label="&calendar.paste.button.label;"
-               tooltiptext="&calendar.paste.button.tooltip;"
+               label="&sunbird.paste.button.label;"
+               tooltiptext="&sunbird.paste.button.tooltip;"
                observes="cmd_paste"/>
 <toolbarbutton class="cal-toolbarbutton-1"
                id="calendar-choose-date-button"
-               label="&calendar.choosedate.button.label;"
-               tooltiptext="&calendar.choosedate.button.tooltip;"
+               label="&sunbird.choosedate.button.label;"
+               tooltiptext="&sunbird.choosedate.button.tooltip;"
                observes="go_date_command"/>
--- a/calendar/sunbird/base/jar.mn
+++ b/calendar/sunbird/base/jar.mn
@@ -10,16 +10,17 @@ sunbird.jar:
 *   content/sunbird/calendar.xul                           (content/calendar.xul)
     content/sunbird/calendar-gotodate-dialog.xul           (content/calendar-gotodate-dialog.xul)
     content/sunbird/calendar-offline.js                    (content/calendar-offline.js)
     content/sunbird/credits.xhtml                          (content/credits.xhtml)
 *   content/sunbird/hiddenWindow.xul                       (content/hiddenWindow.xul)
 *   content/sunbird/hiddenWindow.js                        (content/hiddenWindow.js)
 % skin sunbird classic/1.0 %skin/sunbird/
     skin/sunbird/calendar.css                              (themes/@THEME@/calendar.css)
+    skin/sunbird/toolbar.css                               (themes/@THEME@/toolbar.css)
     skin/sunbird/offline-online.png                        (themes/@THEME@/offline-online.png)
 #ifdef MOZ_USE_GENERIC_BRANDING
 % content branding %content/branding/
     content/branding/about.png                             (branding/about.png)
     content/branding/aboutCredits.png                      (branding/aboutCredits.png)
     content/branding/aboutFooter.png                       (branding/aboutFooter.png)
     content/branding/icon64.png                            (branding/icon64.png)
     content/branding/icon48.png                            (branding/icon48.png)
new file mode 100644
--- /dev/null
+++ b/calendar/sunbird/base/themes/pinstripe/toolbar.css
@@ -0,0 +1,131 @@
+/* ***** 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
+ *   Philipp Kewisch <mozilla@kewis.ch>
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*--------------------------------------------------------------------
+ *   Button: "Cut"
+ *-------------------------------------------------------------------*/
+
+#calendar-cut-button {
+        -moz-image-region: rect(0px 256px 32px 224px);
+}
+#calendar-cut-button:active {
+        -moz-image-region: rect(32px 256px 64px 224px);
+}
+#calendar-cut-button[disabled="true"] {
+        -moz-image-region: rect(64px 256px 96px 224px);
+}
+
+toolbar[iconsize="small"] #calendar-cut-button {
+        -moz-image-region: rect(0px 192px 24px 168px);
+}
+toolbar[iconsize="small"] #calendar-cut-button:active {
+        -moz-image-region: rect(24px 192px 48px 168px);
+}
+toolbar[iconsize="small"] #calendar-cut-button[disabled="true"] {
+        -moz-image-region: rect(48px 192px 72px 168px);
+}
+
+/*--------------------------------------------------------------------
+ *   Button: "Copy"
+ *-------------------------------------------------------------------*/
+
+#calendar-copy-button {
+        -moz-image-region: rect(0px 288px 32px 256px);
+}
+#calendar-copy-button:active {
+        -moz-image-region: rect(32px 288px 64px 256px);
+}
+#calendar-copy-button[disabled="true"] {
+        -moz-image-region: rect(64px 288px 96px 256px);
+}
+
+toolbar[iconsize="small"] #calendar-copy-button {
+        -moz-image-region: rect(0px 216px 24px 192px);
+}
+toolbar[iconsize="small"] #calendar-copy-button:active {
+        -moz-image-region: rect(24px 216px 48px 192px);
+}
+toolbar[iconsize="small"] #calendar-copy-button[disabled="true"] {
+        -moz-image-region: rect(48px 216px 72px 192px);
+}
+
+/*--------------------------------------------------------------------
+ *   Button: "Paste"
+ *-------------------------------------------------------------------*/
+
+#calendar-paste-button {
+        -moz-image-region: rect(0px 320px 32px 288px);
+}
+#calendar-paste-button:active {
+        -moz-image-region: rect(32px 320px 64px 288px);
+}
+#calendar-paste-button[disabled="true"] {
+        -moz-image-region: rect(64px 320px 96px 288px);
+}
+
+toolbar[iconsize="small"] #calendar-paste-button {
+        -moz-image-region: rect(0px 240px 24px 216px);
+}
+toolbar[iconsize="small"] #calendar-paste-button:active {
+        -moz-image-region: rect(24px 240px 48px 216px);
+}
+toolbar[iconsize="small"] #calendar-paste-button[disabled="true"] {
+        -moz-image-region: rect(48px 240px 72px 216px);
+}
+
+/*--------------------------------------------------------------------
+ *   Button: "Choose Date"
+ *-------------------------------------------------------------------*/
+
+#calendar-choose-date-button {
+        -moz-image-region: rect(0px 576px 32px 544px);
+}
+#calendar-choose-date-button:active {
+        -moz-image-region: rect(32px 576px 64px 544px);
+}
+#calendar-choose-date-button[disabled="true"] {
+        -moz-image-region: rect(64px 576px 96px 544px);
+}
+
+toolbar[iconsize="small"] #calendar-choose-date-button {
+        -moz-image-region: rect(0px 432px 24px 408px);
+}
+toolbar[iconsize="small"] #calendar-choose-date-button:active {
+        -moz-image-region: rect(24px 432px 48px 408px);
+}
+toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"] {
+        -moz-image-region: rect(48px 432px 72px 408px);
+}
new file mode 100644
--- /dev/null
+++ b/calendar/sunbird/base/themes/winstripe/toolbar.css
@@ -0,0 +1,179 @@
+/* ***** 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
+ *   Philipp Kewisch <mozilla@kewis.ch>
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*--------------------------------------------------------------------
+ *   Cut button
+ *-------------------------------------------------------------------*/
+
+#calendar-cut-button {
+        -moz-image-region: rect(0px 192px 24px 168px);
+}
+#calendar-cut-button[disabled="true"],
+#calendar-cut-button[disabled="true"]:hover,
+#calendar-cut-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 192px 72px 168px);
+}
+#calendar-cut-button:hover {
+        -moz-image-region: rect(24px 192px 48px 168px);
+}
+#calendar-cut-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Cut button - small
+ *-------------------------------------------------------------------*/
+
+toolbar[iconsize="small"] #calendar-cut-button {
+        -moz-image-region: rect(0px 128px 16px 112px);
+}
+toolbar[iconsize="small"] #calendar-cut-button[disabled="true"],
+toolbar[iconsize="small"] #calendar-cut-button[disabled="true"]:hover,
+toolbar[iconsize="small"] #calendar-cut-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(32px 128px 48px 112px);
+}
+toolbar[iconsize="small"] #calendar-cut-button:hover {
+        -moz-image-region: rect(16px 128px 32px 112px);
+}
+toolbar[iconsize="small"] #calendar-cut-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Copy button
+ *-------------------------------------------------------------------*/
+
+#calendar-copy-button {
+        -moz-image-region: rect(0px 216px 24px 192px);
+}
+#calendar-copy-button[disabled="true"],
+#calendar-copy-button[disabled="true"]:hover,
+#calendar-copy-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 216px 72px 192px);
+}
+#calendar-copy-button:hover {
+        -moz-image-region: rect(24px 216px 48px 192px);
+}
+#calendar-copy-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Copy button - small
+ *-------------------------------------------------------------------*/
+
+toolbar[iconsize="small"] #calendar-copy-button {
+        -moz-image-region: rect(0px 144px 16px 128px);
+}
+toolbar[iconsize="small"] #calendar-copy-button[disabled="true"],
+toolbar[iconsize="small"] #calendar-copy-button[disabled="true"]:hover,
+toolbar[iconsize="small"] #calendar-copy-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(32px 144px 48px 128px);
+}
+toolbar[iconsize="small"] #calendar-copy-button:hover {
+        -moz-image-region: rect(16px 144px 32px 128px);
+}
+toolbar[iconsize="small"] #calendar-copy-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Paste button
+ *-------------------------------------------------------------------*/
+
+#calendar-paste-button {
+        -moz-image-region: rect(0px 240px 24px 216px);
+}
+#calendar-paste-button[disabled="true"],
+#calendar-paste-button[disabled="true"]:hover,
+#calendar-paste-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 240px 72px 216px);
+}
+#calendar-paste-button:hover {
+        -moz-image-region: rect(24px 240px 48px 216px);
+}
+#calendar-paste-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Paste button - small
+ *-------------------------------------------------------------------*/
+
+toolbar[iconsize="small"] #calendar-paste-button {
+        -moz-image-region: rect(0px 160px 16px 144px);
+}
+toolbar[iconsize="small"] #calendar-paste-button[disabled="true"],
+toolbar[iconsize="small"] #calendar-paste-button[disabled="true"]:hover,
+toolbar[iconsize="small"] #calendar-paste-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(32px 160px 48px 144px);
+}
+toolbar[iconsize="small"] #calendar-paste-button:hover {
+        -moz-image-region: rect(16px 160px 32px 144px);
+}
+toolbar[iconsize="small"] #calendar-paste-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Choose date button
+ *-------------------------------------------------------------------*/
+
+#calendar-choose-date-button {
+        -moz-image-region: rect(0px 432px 24px 408px);
+}
+#calendar-choose-date-button[disabled="true"],
+#calendar-choose-date-button[disabled="true"]:hover,
+#calendar-choose-date-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 432px 72px 408px);
+}
+#calendar-choose-date-button:hover {
+        -moz-image-region: rect(24px 432px 48px 408px);
+}
+#calendar-choose-date-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Choose date button - small
+ *-------------------------------------------------------------------*/
+
+toolbar[iconsize="small"] #calendar-choose-date-button {
+        -moz-image-region: rect(0px 288px 16px 272px);
+}
+toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"],
+toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"]:hover,
+toolbar[iconsize="small"] #calendar-choose-date-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(32px 288px 48px 272px);
+}
+toolbar[iconsize="small"] #calendar-choose-date-button:hover {
+        -moz-image-region: rect(16px 288px 32px 272px);
+}
+toolbar[iconsize="small"] #calendar-choose-date-button:hover:active {
+}
--- a/calendar/sunbird/locales/jar.mn
+++ b/calendar/sunbird/locales/jar.mn
@@ -1,15 +1,17 @@
 #filter substitution
 
 #ifdef MOZ_USE_GENERIC_BRANDING
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
-+   locale/branding/brand.dtd                    (%chrome/branding/brand.dtd)
-+   locale/branding/brand.properties             (%chrome/branding/brand.properties)
++   locale/branding/brand.dtd                              (%chrome/branding/brand.dtd)
++   locale/branding/brand.properties                       (%chrome/branding/brand.properties)
 #endif
 
 sunbird-@AB_CD@.jar:
 % locale sunbird @AB_CD@ %locale/@AB_CD@/sunbird/
-    locale/@AB_CD@/sunbird/aboutDialog.dtd       (%chrome/sunbird/aboutDialog.dtd)
+    locale/@AB_CD@/sunbird/aboutDialog.dtd                 (%chrome/sunbird/aboutDialog.dtd)
+    locale/@AB_CD@/sunbird/menuOverlay.dtd                 (%chrome/sunbird/menuOverlay.dtd)
+    locale/@AB_CD@/sunbird/sunbird.dtd                     (%chrome/sunbird/sunbird.dtd)
 
 # Extra l10n files for documentation and such
 #includesubst @LOCALE_SRCDIR@/extra-jar.mn