Fix bug 765899 - Duplicate entity names for accesskeys in lightning-toolbar.dtd (lightning.toolbar.calendar.accesskey and lightning.toolbar.task.accesskey). r=benoit.leseul
authorPhilipp Kewisch <mozilla@kewis.ch>
Thu, 09 Aug 2012 20:24:32 +0200
changeset 13227 f5543c0aa4e6bc7a63c7e43d042449d6d2034810
parent 13226 27959b5eab053897baf23e1c64f25cbe40785929
child 13228 2e67745910d86294d583d1bf69941e86f3c29a20
push idunknown
push userunknown
push dateunknown
reviewersbenoit
bugs765899
Fix bug 765899 - Duplicate entity names for accesskeys in lightning-toolbar.dtd (lightning.toolbar.calendar.accesskey and lightning.toolbar.task.accesskey). r=benoit.leseul
calendar/lightning/content/lightning-toolbar.xul
calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd
calendar/test/mozmill/eventDialog/testEventDialog.js
calendar/test/mozmill/eventDialog/testEventDialogModificationPrompt.js
calendar/test/mozmill/eventDialog/testUTF8.js
calendar/test/mozmill/recurrence/testAnnualRecurrence.js
calendar/test/mozmill/recurrence/testBiweeklyRecurrence.js
calendar/test/mozmill/recurrence/testDailyRecurrence.js
calendar/test/mozmill/recurrence/testLastDayOfMonthRecurrence.js
calendar/test/mozmill/recurrence/testWeeklyNRecurrence.js
calendar/test/mozmill/recurrence/testWeeklyUntilRecurrence.js
calendar/test/mozmill/recurrence/testWeeklyWithExceptionRecurrence.js
calendar/test/mozmill/recurrenceRotated/testAnnualRecurrence.js
calendar/test/mozmill/recurrenceRotated/testBiweeklyRecurrence.js
calendar/test/mozmill/recurrenceRotated/testDailyRecurrence.js
calendar/test/mozmill/recurrenceRotated/testLastDayOfMonthRecurrence.js
calendar/test/mozmill/recurrenceRotated/testWeeklyNRecurrence.js
calendar/test/mozmill/recurrenceRotated/testWeeklyUntilRecurrence.js
calendar/test/mozmill/recurrenceRotated/testWeeklyWithExceptionRecurrence.js
calendar/test/mozmill/testAlarmDefaultValue.js
calendar/test/mozmill/views/testDayView.js
calendar/test/mozmill/views/testMonthView.js
calendar/test/mozmill/views/testMultiweekView.js
calendar/test/mozmill/views/testTaskView.js
calendar/test/mozmill/views/testWeekView.js
--- a/calendar/lightning/content/lightning-toolbar.xul
+++ b/calendar/lightning/content/lightning-toolbar.xul
@@ -107,17 +107,17 @@
       <toolbarbutton id="calendar-unifinder-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&showUnifinderCmd.label;"
                      observes="calendar_show_unifinder_command"/>
     </toolbarpalette>
 
     <toolbar id="calendar-toolbar2" class="inline-toolbar chromeclass-toolbar"
              toolbarname="&lightning.toolbar.calendar.name;"
-             accesskey="&lightning.toolbar.calendar.accesskey;"
+             accesskey="&lightning.toolbar.calendar.name.accesskey;"
              fullscreentoolbar="true" mode="full"
              customizable="true"
              context="calendar-toolbar-context"
 #ifdef XP_MACOSX
              iconsize="small"
 #endif
              defaultset="calendar-synchronize-button,calendar-newevent-button,calendar-newtask-button,calendar-edit-button,calendar-delete-button,spring"/>
     <toolbarset id="calendarToolbars" context="calendar-toolbar-context"/>
@@ -157,17 +157,17 @@
       <toolbarbutton id="task-print-button"
                      class="toolbarbutton-1 calbar-toolbarbutton-1"
                      label="&lightning.toolbar.print.label;"
                      observes="cmd_print"/>
     </toolbarpalette>
 
     <toolbar id="task-toolbar2" class="inline-toolbar chromeclass-toolbar"
              toolbarname="&lightning.toolbar.task.name;"
-             accesskey="&lightning.toolbar.task.accesskey;"
+             accesskey="&lightning.toolbar.task.name.accesskey;"
              fullscreentoolbar="true" mode="full"
              customizable="true"
              context="task-toolbar-context"
 #ifdef XP_MACOSX
              iconsize="small"
 #endif
              defaultset="task-synchronize-button,task-newevent-button,task-newtask-button,task-edit-button,task-delete-button,spring"/>
     <toolbarset id="taskToolbars" context="task-toolbar-context"/>
--- a/calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd
+++ b/calendar/locales/en-US/chrome/lightning/lightning-toolbar.dtd
@@ -1,26 +1,24 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY lightning.toolbar.calendar.name "Calendar Toolbar">
-<!ENTITY lightning.toolbar.calendar.accesskey "C">
+<!ENTITY lightning.toolbar.calendar.name.accesskey "C">
 <!ENTITY lightning.toolbar.task.name "Task Toolbar">
-<!ENTITY lightning.toolbar.task.accesskey "T">
+<!ENTITY lightning.toolbar.task.name.accesskey "T">
 
 <!ENTITY lightning.toolbar.sync.label "Synchronize">
 <!ENTITY lightning.toolbar.delete.label "Delete">
 <!ENTITY lightning.toolbar.edit.label "Edit">
 <!ENTITY lightning.toolbar.gototoday.label "Go to Today">
 <!ENTITY lightning.toolbar.print.label "Print">
 
 <!-- Mode Toolbar -->
-<!ENTITY lightning.toolbar.mail.label         "Mail">
-<!ENTITY lightning.toolbar.mail.accesskey     "M">
 <!ENTITY lightning.toolbar.calendar.label     "Calendar">
 <!ENTITY lightning.toolbar.calendar.tooltip   "Switch to the calendar tab">
 <!ENTITY lightning.toolbar.calendar.accesskey "C">
 <!ENTITY lightning.toolbar.task.label         "Tasks">
 <!ENTITY lightning.toolbar.task.tooltip       "Switch to the tasks tab">
 <!ENTITY lightning.toolbar.task.accesskey     "T">
 
 <!-- Toolbar write button -->