diff --git a/mozilla/calendar/resources/locale/cs-CZ/calendar.dtd b/mozilla/calendar/resources/locale/cs-CZ/calendar.dtd
index 7df1566fe8b..cef463e8ba2 100644
--- a/mozilla/calendar/resources/locale/cs-CZ/calendar.dtd
+++ b/mozilla/calendar/resources/locale/cs-CZ/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Zvolit datum" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Denní" >
 <!ENTITY calendar.weekview.button.label         "Týdenní" >
 <!ENTITY calendar.monthview.button.label        "Měsíční" >
diff --git a/mozilla/calendar/resources/locale/cy-GB/calendar.dtd b/mozilla/calendar/resources/locale/cy-GB/calendar.dtd
index 9bf9e8dc73d..426c21f2195 100644
--- a/mozilla/calendar/resources/locale/cy-GB/calendar.dtd
+++ b/mozilla/calendar/resources/locale/cy-GB/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Dewis Dyddiad" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Golwg Diwrnod" >
 <!ENTITY calendar.weekview.button.label         "Golwg Wythnos" >
 <!ENTITY calendar.monthview.button.label        "Golwg Mis" >
diff --git a/mozilla/calendar/resources/locale/de-AT/calendar.dtd b/mozilla/calendar/resources/locale/de-AT/calendar.dtd
index 34fe5a2471f..156f9a646cd 100644
--- a/mozilla/calendar/resources/locale/de-AT/calendar.dtd
+++ b/mozilla/calendar/resources/locale/de-AT/calendar.dtd
@@ -249,6 +249,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Datum wählen" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Tagesansicht" >
 <!ENTITY calendar.weekview.button.label         "Wochenansicht" >
 <!ENTITY calendar.monthview.button.label        "Monatsansicht" >
diff --git a/mozilla/calendar/resources/locale/en-US/calendar.dtd b/mozilla/calendar/resources/locale/en-US/calendar.dtd
index 2b126c61ba5..346a8d36a01 100644
--- a/mozilla/calendar/resources/locale/en-US/calendar.dtd
+++ b/mozilla/calendar/resources/locale/en-US/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Day View" >
 <!ENTITY calendar.weekview.button.label         "Week View" >
 <!ENTITY calendar.monthview.button.label        "Month View" >
diff --git a/mozilla/calendar/resources/locale/es-ES/calendar.dtd b/mozilla/calendar/resources/locale/es-ES/calendar.dtd
index fa6ac62889c..7a4f97ff6fc 100644
--- a/mozilla/calendar/resources/locale/es-ES/calendar.dtd
+++ b/mozilla/calendar/resources/locale/es-ES/calendar.dtd
@@ -248,6 +248,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Elegir fecha" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Ver día" >
 <!ENTITY calendar.weekview.button.label         "Ver semana" >
 <!ENTITY calendar.monthview.button.label        "Ver mes" >
diff --git a/mozilla/calendar/resources/locale/fr-FR/calendar.dtd b/mozilla/calendar/resources/locale/fr-FR/calendar.dtd
index 3eaecaae691..eca70390f62 100644
--- a/mozilla/calendar/resources/locale/fr-FR/calendar.dtd
+++ b/mozilla/calendar/resources/locale/fr-FR/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Choisir une 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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "1 jour par vue" >
 <!ENTITY calendar.weekview.button.label         "1 semaine par vue" >
 <!ENTITY calendar.monthview.button.label        "1 mois par vue" >
diff --git a/mozilla/calendar/resources/locale/hu-HU/calendar.dtd b/mozilla/calendar/resources/locale/hu-HU/calendar.dtd
index e1217dc18a3..67aea9facf6 100644
--- a/mozilla/calendar/resources/locale/hu-HU/calendar.dtd
+++ b/mozilla/calendar/resources/locale/hu-HU/calendar.dtd
@@ -254,6 +254,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Dátumválasztás" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Napi nézet" >
 <!ENTITY calendar.weekview.button.label         "Heti nézet" >
 <!ENTITY calendar.monthview.button.label        "Havi nézet" >
diff --git a/mozilla/calendar/resources/locale/ja-JP/calendar.dtd b/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
index 58bc6b3a34b..262da1fcd6e 100644
--- a/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
+++ b/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
@@ -255,6 +255,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "日付を選択" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "デー" >
 <!ENTITY calendar.weekview.button.label         "ウィーク" >
 <!ENTITY calendar.monthview.button.label        "マンス" >
diff --git a/mozilla/calendar/resources/locale/lt-LT/calendar.dtd b/mozilla/calendar/resources/locale/lt-LT/calendar.dtd
index 23239f2fac8..a66e157529e 100644
--- a/mozilla/calendar/resources/locale/lt-LT/calendar.dtd
+++ b/mozilla/calendar/resources/locale/lt-LT/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Parinkti datą" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Diena" >
 <!ENTITY calendar.weekview.button.label         "Savaitė" >
 <!ENTITY calendar.monthview.button.label        "Mėnuo" >
diff --git a/mozilla/calendar/resources/locale/nl-NL/calendar.dtd b/mozilla/calendar/resources/locale/nl-NL/calendar.dtd
index 83fd2a3d4df..4e962fa98de 100644
--- a/mozilla/calendar/resources/locale/nl-NL/calendar.dtd
+++ b/mozilla/calendar/resources/locale/nl-NL/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Kies datum" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Dagoverzicht" >
 <!ENTITY calendar.weekview.button.label         "Weekoverzicht" >
 <!ENTITY calendar.monthview.button.label        "Maandoverzicht" >
diff --git a/mozilla/calendar/resources/locale/pl-PL/calendar.dtd b/mozilla/calendar/resources/locale/pl-PL/calendar.dtd
index adf3baa00ab..98919b499b3 100644
--- a/mozilla/calendar/resources/locale/pl-PL/calendar.dtd
+++ b/mozilla/calendar/resources/locale/pl-PL/calendar.dtd
@@ -248,6 +248,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Wybierz Dzień" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Dzień" >
 <!ENTITY calendar.weekview.button.label         "Tydzień" >
 <!ENTITY calendar.monthview.button.label        "Miesiąc" >
diff --git a/mozilla/calendar/resources/locale/pt-BR/calendar.dtd b/mozilla/calendar/resources/locale/pt-BR/calendar.dtd
index edcfbbab73a..40b28682560 100644
--- a/mozilla/calendar/resources/locale/pt-BR/calendar.dtd
+++ b/mozilla/calendar/resources/locale/pt-BR/calendar.dtd
@@ -253,6 +253,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Escolher Data" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Dia" >
 <!ENTITY calendar.weekview.button.label         "Semana" >
 <!ENTITY calendar.monthview.button.label        "M&#xEA;s" >
diff --git a/mozilla/calendar/resources/locale/sk-SK/calendar.dtd b/mozilla/calendar/resources/locale/sk-SK/calendar.dtd
index af12d34923d..2c68209ca90 100644
--- a/mozilla/calendar/resources/locale/sk-SK/calendar.dtd
+++ b/mozilla/calendar/resources/locale/sk-SK/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Zvoliť dátum" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Denný" >
 <!ENTITY calendar.weekview.button.label         "Týždenný" >
 <!ENTITY calendar.monthview.button.label        "Mesačný" >
diff --git a/mozilla/calendar/resources/locale/sl-SI/calendar.dtd b/mozilla/calendar/resources/locale/sl-SI/calendar.dtd
index 60c7e05d199..8f1d81be135 100644
--- a/mozilla/calendar/resources/locale/sl-SI/calendar.dtd
+++ b/mozilla/calendar/resources/locale/sl-SI/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Izberite datum">
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Dnevni pogled">
 <!ENTITY calendar.weekview.button.label         "Tedenski pogled">
 <!ENTITY calendar.monthview.button.label        "Mesečni pogled">
diff --git a/mozilla/calendar/resources/locale/sv-SE/calendar.dtd b/mozilla/calendar/resources/locale/sv-SE/calendar.dtd
index f5f5b10370f..56d1fae9abd 100644
--- a/mozilla/calendar/resources/locale/sv-SE/calendar.dtd
+++ b/mozilla/calendar/resources/locale/sv-SE/calendar.dtd
@@ -253,6 +253,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Välj Datum" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Dagsöversikt" >
 <!ENTITY calendar.weekview.button.label         "Veckoöversikt" >
 <!ENTITY calendar.monthview.button.label        "Månadsöversikt" >
diff --git a/mozilla/calendar/resources/locale/wen-DE/calendar.dtd b/mozilla/calendar/resources/locale/wen-DE/calendar.dtd
index a60bf7608c1..8f1e88fe550 100644
--- a/mozilla/calendar/resources/locale/wen-DE/calendar.dtd
+++ b/mozilla/calendar/resources/locale/wen-DE/calendar.dtd
@@ -252,6 +252,26 @@
 
 <!ENTITY calendar.choosedate.button.label       "Datum wubrać" >
 
+<!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: Import events from a local file." >
+<!ENTITY calendar.export.button.tooltip            "Export: Export events to a local file." >
+<!ENTITY calendar.subscribe.button.tooltip         "Subscribe: Subscribe to a calendar file on a remote machine." >
+<!ENTITY calendar.publish.button.tooltip            "Publish: Publish events to a remote machine." >
+
+<!ENTITY calendar.import.button.label              "Import" >
+<!ENTITY calendar.export.button.label              "Export" >
+<!ENTITY calendar.subscribe.button.label           "Subscribe" >
+<!ENTITY calendar.publish.button.label             "Publish" >
+
 <!ENTITY calendar.dayview.button.label          "Dnjowy wid" >
 <!ENTITY calendar.weekview.button.label         "Tydźenski wid" >
 <!ENTITY calendar.monthview.button.label        "Měsačny wid" >
diff --git a/mozilla/calendar/sunbird/base/content/calendar.xul b/mozilla/calendar/sunbird/base/content/calendar.xul
index 029a59201bb..592486c0a73 100644
--- a/mozilla/calendar/sunbird/base/content/calendar.xul
+++ b/mozilla/calendar/sunbird/base/content/calendar.xul
@@ -456,6 +456,72 @@
                    tooltiptext="&calendar.monthview.button.tooltip;"
                    observes="month_view_command"/>
 
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-cut-button"
+                   label="&calendar.cut.button.label;"
+                   tooltiptext="&calendar.cut.button.tooltip;"
+                   observes="cut_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-copy-button"
+                   label="&calendar.copy.button.label;"
+                   tooltiptext="&calendar.copy.button.tooltip;"
+                   observes="copy_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-paste-button"
+                   label="&calendar.paste.button.label;"
+                   tooltiptext="&calendar.paste.button.tooltip;"
+                   observes="paste_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-import-button"
+                   label="&calendar.import.button.label;"
+                   tooltiptext="&calendar.import.button.tooltip;"
+                   observes="import_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-export-button"
+                   label="&calendar.export.button.label;"
+                   tooltiptext="&calendar.export.button.tooltip;"
+                   observes="export_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-subscribe-button"
+                   label="&calendar.subscribe.button.label;"
+                   tooltiptext="&calendar.subscribe.button.tooltip;"
+                   observes="new_server_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-publish-button"
+                   label="&calendar.publish.button.label;"
+                   tooltiptext="&calendar.publish.button.tooltip;"
+                   observes="publish_events_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-print-button"
+                   label="&calendar.print.button.label;"
+                   tooltiptext="&calendar.print.button.tooltip;"
+                   observes="print_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-new-task-button"
+                   label="&calendar.newtask.button.label;"
+                   tooltiptext="&calendar.newtask.button.tooltip;"
+                   observes="new_todo_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-go-to-today-button"
+                   label="&calendar.gototoday.button.label;"
+                   tooltiptext="&calendar.gototoday.button.tooltip;"
+                   observes="go_today_command"/>
+
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-choose-date-button"
+                   label="&calendar.choosedate.button.label;"
+                   tooltiptext="&calendar.choosedate.button.tooltip;"
+                   observes="go_date_command"/>
+
     <toolbaritem id="throbber-box" align="center" pack="center">
       <button id="navigator-throbber"
               oncommand="openAboutDialog();"
@@ -464,7 +530,7 @@
   </toolbarpalette>
   <toolbar class="toolbar-primary chromeclass-toolbar" id="calendar-bar"
            iconsize="big"
-           defaultset="calendar-new-event-button,calendar-edit-event-button,calendar-delete-event-button,separator,calendar-day-view-button,calendar-week-view-button,calendar-multiweek-view-button,calendar-month-view-button,spring,throbber-box"
+           defaultset="calendar-new-event-button,calendar-new-task-button,calendar-edit-event-button,calendar-delete-event-button,separator,calendar-day-view-button,calendar-week-view-button,calendar-multiweek-view-button,calendar-month-view-button,spring,throbber-box"
            customizable="true" mode="full"
            toolbarname="&calendar.maintoolbar.name;" accesskey="&calendar.maintoolbar.accesskey;"
            context="toolbar-context-menu"/>
diff --git a/mozilla/calendar/sunbird/themes/winstripe/sunbird/calendar.css b/mozilla/calendar/sunbird/themes/winstripe/sunbird/calendar.css
index f9001f5dbc0..e32703ea85c 100644
--- a/mozilla/calendar/sunbird/themes/winstripe/sunbird/calendar.css
+++ b/mozilla/calendar/sunbird/themes/winstripe/sunbird/calendar.css
@@ -127,12 +127,15 @@
  *-------------------------------------------------------------------*/
 
 #calendar-go-to-today-button {
+        -moz-image-region: rect(0px 408px 24px 384px);
 }
 #calendar-go-to-today-button[disabled="true"],
 #calendar-go-to-today-button[disabled="true"]:hover,
 #calendar-go-to-today-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 408px 72px 384px);
 }
 #calendar-go-to-today-button:hover {
+        -moz-image-region: rect(24px 408px 48px 384px);
 }
 #calendar-go-to-today-button:hover:active {
 }
@@ -142,12 +145,15 @@
  *-------------------------------------------------------------------*/
 
 #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 {
 }
@@ -223,6 +229,168 @@
 #calendar-day-view-button:hover:active {
 }
 
+/*--------------------------------------------------------------------
+ *   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) !important;
+}
+#calendar-cut-button:hover {
+        -moz-image-region: rect(24px 192px 48px 168px);
+}
+#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) !important;
+}
+#calendar-copy-button:hover {
+        -moz-image-region: rect(24px 216px 48px 192px);
+}
+#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) !important;
+}
+#calendar-paste-button:hover {
+        -moz-image-region: rect(24px 240px 48px 216px);
+}
+#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,
+#calendar-import-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 264px 72px 240px) !important;
+}
+#calendar-import-button:hover {
+        -moz-image-region: rect(24px 264px 48px 240px);
+}
+#calendar-import-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Export button
+ *-------------------------------------------------------------------*/
+
+#calendar-export-button {
+        -moz-image-region: rect(0px 288px 24px 264px);
+}
+#calendar-export-button[disabled="true"],
+#calendar-export-button[disabled="true"]:hover,
+#calendar-export-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 288px 72px 264px) !important;
+}
+#calendar-export-button:hover {
+        -moz-image-region: rect(24px 288px 48px 264px);
+}
+#calendar-export-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Subscribe button
+ *-------------------------------------------------------------------*/
+
+#calendar-subscribe-button {
+        -moz-image-region: rect(0px 312px 24px 288px);
+}
+#calendar-subscribe-button[disabled="true"],
+#calendar-subscribe-button[disabled="true"]:hover,
+#calendar-subscribe-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 312px 72px 288px) !important;
+}
+#calendar-subscribe-button:hover {
+        -moz-image-region: rect(24px 312px 48px 288px);
+}
+#calendar-subscribe-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Publish button
+ *-------------------------------------------------------------------*/
+
+#calendar-publish-button {
+        -moz-image-region: rect(0px 336px 24px 312px);
+}
+#calendar-publish-button[disabled="true"],
+#calendar-publish-button[disabled="true"]:hover,
+#calendar-publish-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 336px 72px 312px) !important;
+}
+#calendar-publish-button:hover {
+        -moz-image-region: rect(24px 336px 48px 312px);
+}
+#calendar-publish-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Print button
+ *-------------------------------------------------------------------*/
+
+#calendar-print-button {
+        -moz-image-region: rect(0px 360px 24px 336px);
+}
+#calendar-print-button[disabled="true"],
+#calendar-print-button[disabled="true"]:hover,
+#calendar-print-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 360px 72px 336px) !important;
+}
+#calendar-print-button:hover {
+        -moz-image-region: rect(24px 360px 48px 336px);
+}
+#calendar-print-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   New Task button
+ *-------------------------------------------------------------------*/
+
+#calendar-new-task-button {
+        -moz-image-region: rect(0px 384px 24px 360px);
+}
+#calendar-new-task-button[disabled="true"],
+#calendar-new-task-button[disabled="true"]:hover,
+#calendar-new-task-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 384px 72px 360px) !important;
+}
+#calendar-new-task-button:hover {
+        -moz-image-region: rect(24px 384px 48px 360px);
+}
+#calendar-new-task-button:hover:active {
+}
+
 /*--------------------------------------------------------------------
  *   Throbber button
  *-------------------------------------------------------------------*/