Bug 795342 - Toolbars in Task/Calendar tabs missing due to undefined entities in SeaMonkey. r=philipp
authorRichard Marti <richard.marti@gmail.com>
Tue, 02 Oct 2012 19:49:51 +0200
changeset 11206 7440e1d7892a826065360b93b97d9db9302fea75
parent 11205 544cc63da91768a16ba645759644758fc8915b5b
child 11207 9c73c166f56ee833cc60bbee7a38b9dc4d4b160a
push id8405
push userrichard.marti@gmail.com
push dateTue, 02 Oct 2012 17:50:17 +0000
treeherdercomm-central@7440e1d7892a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs795342
Bug 795342 - Toolbars in Task/Calendar tabs missing due to undefined entities in SeaMonkey. r=philipp
calendar/lightning/content/lightning-toolbar.xul
calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd
--- a/calendar/lightning/content/lightning-toolbar.xul
+++ b/calendar/lightning/content/lightning-toolbar.xul
@@ -106,18 +106,18 @@
                      label="&lightning.toolbar.print.label;"
                      observes="cmd_print"/>
       <toolbarbutton id="calendar-unifinder-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&showUnifinderCmd.label;"
                      observes="calendar_show_unifinder_command"/>
       <toolbarbutton id="calendar-appmenu-button"
                      class="toolbarbutton-1 button-appmenu"
-                     label="&appmenuButton.label;"
-                     tooltiptext="&appmenuButton.tooltip;"/>
+                     label="&lightning.toolbar.appmenuButton.label;"
+                     tooltiptext="&lightning.toolbar.appmenuButton.tooltip;"/>
     </toolbarpalette>
 
     <toolbar id="calendar-toolbar2" class="inline-toolbar chromeclass-toolbar"
              toolbarname="&lightning.toolbar.calendar.name;"
              accesskey="&lightning.toolbar.calendar.name.accesskey;"
              fullscreentoolbar="true" mode="full"
              customizable="true"
              context="calendar-toolbar-context"
@@ -160,18 +160,18 @@
                      label="&lightning.toolbar.delete.label;"
                      observes="calendar_delete_focused_item_command"/>
       <toolbarbutton id="task-print-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.print.label;"
                      observes="cmd_print"/>
       <toolbarbutton id="task-appmenu-button"
                      class="toolbarbutton-1 button-appmenu"
-                     label="&appmenuButton.label;"
-                     tooltiptext="&appmenuButton.tooltip;"/>
+                     label="&lightning.toolbar.appmenuButton.label;"
+                     tooltiptext="&lightning.toolbar.appmenuButton.tooltip;"/>
     </toolbarpalette>
 
     <toolbar id="task-toolbar2" class="inline-toolbar chromeclass-toolbar"
              toolbarname="&lightning.toolbar.task.name;"
              accesskey="&lightning.toolbar.task.name.accesskey;"
              fullscreentoolbar="true" mode="full"
              customizable="true"
              context="task-toolbar-context"
--- a/calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd
@@ -29,8 +29,12 @@
 <!ENTITY lightning.toolbar.day.label                 "Day">
 <!ENTITY lightning.toolbar.day.accesskey             "D">
 <!ENTITY lightning.toolbar.week.label                "Week">
 <!ENTITY lightning.toolbar.week.accesskey            "W">
 <!ENTITY lightning.toolbar.multiweek.label           "Multiweek">
 <!ENTITY lightning.toolbar.multiweek.accesskey       "u">
 <!ENTITY lightning.toolbar.month.label               "Month">
 <!ENTITY lightning.toolbar.month.accesskey           "M">
+<!-- LOCALIZATION NOTE: the same as appmenuButton.label and appmenuButton.tooltip
+     from messenger.dtd -->
+<!ENTITY lightning.toolbar.appmenuButton.label       "AppMenu">
+<!ENTITY lightning.toolbar.appmenuButton.tooltip     "Displays the Application Menu">