diff --git a/mozilla/calendar/resources/locale/cs-CZ/calendar.dtd b/mozilla/calendar/resources/locale/cs-CZ/calendar.dtd
index b86bc5de5e1..a6ef2bcb784 100644
--- a/mozilla/calendar/resources/locale/cs-CZ/calendar.dtd
+++ b/mozilla/calendar/resources/locale/cs-CZ/calendar.dtd
@@ -448,3 +448,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Tisknout pouze položky tohoto stavu:">
 <!ENTITY calendar.print.onlyitemscategory.label "Tisknout pouze položky této kategorie:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/cs-CZ/menuOverlay.dtd b/mozilla/calendar/resources/locale/cs-CZ/menuOverlay.dtd
index dc24554fa74..8a8fe494481 100644
--- a/mozilla/calendar/resources/locale/cs-CZ/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/cs-CZ/menuOverlay.dtd
@@ -136,7 +136,25 @@
 <!ENTITY addressBookCmd.label     "Databáze kontaktů">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/cy-GB/calendar.dtd b/mozilla/calendar/resources/locale/cy-GB/calendar.dtd
index 64212525d71..53e1e20eb60 100644
--- a/mozilla/calendar/resources/locale/cy-GB/calendar.dtd
+++ b/mozilla/calendar/resources/locale/cy-GB/calendar.dtd
@@ -447,3 +447,11 @@
 <!ENTITY calendar.print.listselected.label "Rhestri Digwyddiadau Penodol">
 <!ENTITY calendar.print.onlyitemsstatus.label "Argraffu eitemau gyda'r statws hwn, yn unig:">
 <!ENTITY calendar.print.onlyitemscategory.label "Argraffu eitemau yn y categori hwn, yn unig:">
+
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/cy-GB/menuOverlay.dtd b/mozilla/calendar/resources/locale/cy-GB/menuOverlay.dtd
index 8e853d37c1c..2014f29056a 100644
--- a/mozilla/calendar/resources/locale/cy-GB/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/cy-GB/menuOverlay.dtd
@@ -136,7 +136,25 @@
 <!ENTITY addressBookCmd.label     "Address Book">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/de-AT/calendar.dtd b/mozilla/calendar/resources/locale/de-AT/calendar.dtd
index 8b87d55bdf0..a79a6f4ff5a 100644
--- a/mozilla/calendar/resources/locale/de-AT/calendar.dtd
+++ b/mozilla/calendar/resources/locale/de-AT/calendar.dtd
@@ -444,3 +444,11 @@
 <!ENTITY calendar.print.listselected.label "Gewählte Ereignisse auflisten">
 <!ENTITY calendar.print.onlyitemsstatus.label "Nur Elemente mit folgendem Status drucken:">
 <!ENTITY calendar.print.onlyitemscategory.label "Nur Elemente mit folgender Kategorie drucken:">
+
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/de-AT/menuOverlay.dtd b/mozilla/calendar/resources/locale/de-AT/menuOverlay.dtd
index e71b40d4a58..01ee34bf897 100644
--- a/mozilla/calendar/resources/locale/de-AT/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/de-AT/menuOverlay.dtd
@@ -132,7 +132,25 @@
 <!ENTITY addressBookCmd.label     "Adressbuch">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/es-ES/calendar.dtd b/mozilla/calendar/resources/locale/es-ES/calendar.dtd
index 6aed0d6691a..55d4181cba1 100644
--- a/mozilla/calendar/resources/locale/es-ES/calendar.dtd
+++ b/mozilla/calendar/resources/locale/es-ES/calendar.dtd
@@ -444,3 +444,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Imprimir sólo eventos con este estado:">
 <!ENTITY calendar.print.onlyitemscategory.label "Imprimir sólo los elementos de esta categoría:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/es-ES/menuOverlay.dtd b/mozilla/calendar/resources/locale/es-ES/menuOverlay.dtd
index 27297c6f9ba..4026f91b28d 100644
--- a/mozilla/calendar/resources/locale/es-ES/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/es-ES/menuOverlay.dtd
@@ -134,7 +134,25 @@
 <!ENTITY addressBookCmd.label     "Libreta de direcciones">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/fr-FR/calendar.dtd b/mozilla/calendar/resources/locale/fr-FR/calendar.dtd
index 4ae168e0bd9..97f07da64ff 100644
--- a/mozilla/calendar/resources/locale/fr-FR/calendar.dtd
+++ b/mozilla/calendar/resources/locale/fr-FR/calendar.dtd
@@ -448,3 +448,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Print only items with this status:">
 <!ENTITY calendar.print.onlyitemscategory.label "Print only items with this category:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/fr-FR/menuOverlay.dtd b/mozilla/calendar/resources/locale/fr-FR/menuOverlay.dtd
index 82757962c6e..8a61704c1e3 100644
--- a/mozilla/calendar/resources/locale/fr-FR/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/fr-FR/menuOverlay.dtd
@@ -136,7 +136,25 @@
 <!ENTITY addressBookCmd.label     "Address Book">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/hu-HU/calendar.dtd b/mozilla/calendar/resources/locale/hu-HU/calendar.dtd
index 7428b4f9f89..4c71ed288eb 100644
--- a/mozilla/calendar/resources/locale/hu-HU/calendar.dtd
+++ b/mozilla/calendar/resources/locale/hu-HU/calendar.dtd
@@ -450,3 +450,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Csak a következő állapotú tételek kerüljenek nyomtatásra">
 <!ENTITY calendar.print.onlyitemscategory.label "Csak a következő kategóriájú tételek kerüljenek nyomtatásra"> 
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/hu-HU/menuOverlay.dtd b/mozilla/calendar/resources/locale/hu-HU/menuOverlay.dtd
index b85beeb93c7..6e1f2284909 100644
--- a/mozilla/calendar/resources/locale/hu-HU/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/hu-HU/menuOverlay.dtd
@@ -138,7 +138,25 @@
 <!ENTITY addressBookCmd.label     "Címjegyzék">
 <!ENTITY addressBookCmd.accesskey "C">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Jelszókezelő">
 <!ENTITY walletPasswordManager.accesskey "J">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/ja-JP/calendar.dtd b/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
index 614a99ea98e..ea0ce4546a8 100644
--- a/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
+++ b/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
@@ -451,3 +451,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "このステータスの項目のみ印刷:">
 <!ENTITY calendar.print.onlyitemscategory.label "このカテゴリの項目のみ印刷:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/ja-JP/menuOverlay.dtd b/mozilla/calendar/resources/locale/ja-JP/menuOverlay.dtd
index ec2cf95f9d7..19630cbfb51 100644
--- a/mozilla/calendar/resources/locale/ja-JP/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/ja-JP/menuOverlay.dtd
@@ -139,7 +139,25 @@
 <!ENTITY addressBookCmd.label     "アドレス帳">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "パスワードマネージャ">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/lt-LT/calendar.dtd b/mozilla/calendar/resources/locale/lt-LT/calendar.dtd
index 2d79788d286..2dc7685c274 100644
--- a/mozilla/calendar/resources/locale/lt-LT/calendar.dtd
+++ b/mozilla/calendar/resources/locale/lt-LT/calendar.dtd
@@ -448,6 +448,13 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Įvykiai, turintys būseną:">
 <!ENTITY calendar.print.onlyitemscategory.label "Priklausantys kategorijai:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
 <!-- Added to match Lithuanian locale (questions to tatjanaj@ktl.mii.lt) -->
 <!ENTITY alarm.units.minutes.t  "minučių">
 <!ENTITY alarm.units.hours.t    "valandų">
diff --git a/mozilla/calendar/resources/locale/lt-LT/menuOverlay.dtd b/mozilla/calendar/resources/locale/lt-LT/menuOverlay.dtd
index 318df70b072..cf923e17a62 100644
--- a/mozilla/calendar/resources/locale/lt-LT/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/lt-LT/menuOverlay.dtd
@@ -136,7 +136,25 @@
 <!ENTITY addressBookCmd.label     "Address Book">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/nl-NL/calendar.dtd b/mozilla/calendar/resources/locale/nl-NL/calendar.dtd
index d198c507189..6d1963302ac 100644
--- a/mozilla/calendar/resources/locale/nl-NL/calendar.dtd
+++ b/mozilla/calendar/resources/locale/nl-NL/calendar.dtd
@@ -442,3 +442,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Enkel items met deze status afdrukken:">
 <!ENTITY calendar.print.onlyitemscategory.label "Enkel items met deze categorie afdrukken:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/nl-NL/menuOverlay.dtd b/mozilla/calendar/resources/locale/nl-NL/menuOverlay.dtd
index 56cc1aa697f..b54b2c3c01e 100644
--- a/mozilla/calendar/resources/locale/nl-NL/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/nl-NL/menuOverlay.dtd
@@ -136,7 +136,25 @@
 <!ENTITY addressBookCmd.label     "Adressenboek">
 <!ENTITY addressBookCmd.accesskey "@">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "@">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/pl-PL/calendar.dtd b/mozilla/calendar/resources/locale/pl-PL/calendar.dtd
index c79e3fe2a41..c72f75a36c3 100644
--- a/mozilla/calendar/resources/locale/pl-PL/calendar.dtd
+++ b/mozilla/calendar/resources/locale/pl-PL/calendar.dtd
@@ -444,3 +444,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Drukuj tylko pozycje o statusie:">
 <!ENTITY calendar.print.onlyitemscategory.label "Drukuj tylko pozycje o kategorii:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/pl-PL/menuOverlay.dtd b/mozilla/calendar/resources/locale/pl-PL/menuOverlay.dtd
index 9202d99dfe9..1d32e9561d5 100644
--- a/mozilla/calendar/resources/locale/pl-PL/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/pl-PL/menuOverlay.dtd
@@ -134,7 +134,25 @@
 <!ENTITY addressBookCmd.label     "Address Book">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/pt-BR/calendar.dtd b/mozilla/calendar/resources/locale/pt-BR/calendar.dtd
index 74e44ce9855..10c91b32b06 100644
--- a/mozilla/calendar/resources/locale/pt-BR/calendar.dtd
+++ b/mozilla/calendar/resources/locale/pt-BR/calendar.dtd
@@ -449,3 +449,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Imprimir apenas itens com este status:">
 <!ENTITY calendar.print.onlyitemscategory.label "Imprimir apenas itens com esta categoria:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/pt-BR/menuOverlay.dtd b/mozilla/calendar/resources/locale/pt-BR/menuOverlay.dtd
index 194571ac5fb..b39f1efaff4 100644
--- a/mozilla/calendar/resources/locale/pt-BR/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/pt-BR/menuOverlay.dtd
@@ -137,7 +137,25 @@
 <!ENTITY addressBookCmd.label     "Caderno de Endere&#xE7;os">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Gerenciador de Senhas">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/sk-SK/calendar.dtd b/mozilla/calendar/resources/locale/sk-SK/calendar.dtd
index 05ff8502cb9..0fdb8e021c2 100644
--- a/mozilla/calendar/resources/locale/sk-SK/calendar.dtd
+++ b/mozilla/calendar/resources/locale/sk-SK/calendar.dtd
@@ -448,3 +448,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Tlačiť iba položky tohoto stavu:">
 <!ENTITY calendar.print.onlyitemscategory.label "Tlačiť iba položky tejto kategórie:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/sk-SK/menuOverlay.dtd b/mozilla/calendar/resources/locale/sk-SK/menuOverlay.dtd
index 9b499722c1e..08a8d553bb9 100644
--- a/mozilla/calendar/resources/locale/sk-SK/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/sk-SK/menuOverlay.dtd
@@ -136,7 +136,25 @@
 <!ENTITY addressBookCmd.label     "Adresár">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/sl-SI/calendar.dtd b/mozilla/calendar/resources/locale/sl-SI/calendar.dtd
index 464402bc9b7..5560b3edcd8 100644
--- a/mozilla/calendar/resources/locale/sl-SI/calendar.dtd
+++ b/mozilla/calendar/resources/locale/sl-SI/calendar.dtd
@@ -448,3 +448,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Natisni samo elemente s statusom:">
 <!ENTITY calendar.print.onlyitemscategory.label "Natisni samo elemente v kategoriji:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/sl-SI/menuOverlay.dtd b/mozilla/calendar/resources/locale/sl-SI/menuOverlay.dtd
index cdc1f329270..186ae2a0861 100644
--- a/mozilla/calendar/resources/locale/sl-SI/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/sl-SI/menuOverlay.dtd
@@ -136,7 +136,25 @@
 <!ENTITY addressBookCmd.label     "Adresar">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "P">
 
 <!ENTITY walletPasswordManager.label     "Upravljalec gesel">
 <!ENTITY walletPasswordManager.accesskey "g">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/sv-SE/calendar.dtd b/mozilla/calendar/resources/locale/sv-SE/calendar.dtd
index 366f70830da..b125b87f0aa 100644
--- a/mozilla/calendar/resources/locale/sv-SE/calendar.dtd
+++ b/mozilla/calendar/resources/locale/sv-SE/calendar.dtd
@@ -449,3 +449,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Skriv enbart ut saker med statusen:">
 <!ENTITY calendar.print.onlyitemscategory.label "Skriv enbart ut saker inom kategorin:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/sv-SE/menuOverlay.dtd b/mozilla/calendar/resources/locale/sv-SE/menuOverlay.dtd
index e2f832a1719..5721d617c91 100644
--- a/mozilla/calendar/resources/locale/sv-SE/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/sv-SE/menuOverlay.dtd
@@ -137,7 +137,25 @@
 <!ENTITY addressBookCmd.label     "Address Book">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">
diff --git a/mozilla/calendar/resources/locale/wen-DE/calendar.dtd b/mozilla/calendar/resources/locale/wen-DE/calendar.dtd
index efca47369e8..5c8a20fac02 100644
--- a/mozilla/calendar/resources/locale/wen-DE/calendar.dtd
+++ b/mozilla/calendar/resources/locale/wen-DE/calendar.dtd
@@ -448,3 +448,10 @@
 <!ENTITY calendar.print.onlyitemsstatus.label "Jenož pozicije z tutym statusom ćišćeć:">
 <!ENTITY calendar.print.onlyitemscategory.label "Jenož pozicije z tutej kategoriju ćišćeć:">
 
+<!-- LOCALIZATION NOTE (mainWindow.title): DONT_TRANSLATE -->
+<!ENTITY mainWindow.title "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifier) : DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifier "&brandFullName;">
+<!-- LOCALIZATION NOTE (mainWindow.titlemodifiermenuseparator): DONT_TRANSLATE -->
+<!ENTITY mainWindow.titlemodifiermenuseparator " - ">
+
diff --git a/mozilla/calendar/resources/locale/wen-DE/menuOverlay.dtd b/mozilla/calendar/resources/locale/wen-DE/menuOverlay.dtd
index 8f297c6beec..408a0769b7f 100644
--- a/mozilla/calendar/resources/locale/wen-DE/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/wen-DE/menuOverlay.dtd
@@ -136,7 +136,25 @@
 <!ENTITY addressBookCmd.label     "Address Book">
 <!ENTITY addressBookCmd.accesskey "A">
 
+<!ENTITY helpMenu.label         "Help"> 
 <!ENTITY helpMenu.accesskey            "H">
 
 <!ENTITY walletPasswordManager.label     "Password Manager">
 <!ENTITY walletPasswordManager.accesskey "p">
+
+<!-- Toolbar items -->
+<!ENTITY fileMenu.label         "File"> 
+<!ENTITY fileMenu.accesskey       "F">
+
+<!ENTITY editMenu.label         "Edit"> 
+<!ENTITY editMenu.accesskey       "E"> 
+<!ENTITY preferencesCmd.label       "Options...">
+<!ENTITY preferencesCmd.accesskey     "O"> 
+
+<!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">