Checked in patch for bug 268666:

Inconsistent use of (s) in Sunbird and xpi menubar, inconsistent use of
unicode ellipse character

calendar/resources/content/calendar.xul

@@ -169,6 +169,7 @@
   <key id="go_forward_key"       keycode="VK_PAGE_DOWN"                  observes="next_command"/>
 
   <key id="import_key"           key="&calendar.import.key;"             observes="import_command"              modifiers="accel"/>
+  <key id="reload_server_key"    key="&calendar.reloadserver.key;"       observes="reload_remote_calendars"     modifiers="accel"/>
 
 #ifdef XP_MACOSX
   <key id="key_minimizeWindow"   key="&minimizeWindow.key;"              command="minimizeWindow"               modifiers="accel"/>

calendar/resources/content/menuOverlay.xul

@@ -129,8 +129,9 @@
                    accesskey="&calendar.subscribe.accesskey;"
                    observes="new_server_command"/>
          <menuitem id="calendar-reloadserver-menu"
-                   label="&calendar.context.reloadserver.label;"
-                   accesskey="&calendar.context.reloadserver.accesskey;"
+                   key="reload_server_key"
+                   label="&calendar.reloadserver.label;"
+                   accesskey="&calendar.reloadserver.accesskey;"
                    observes="reload_remote_calendars"/>
          <menuseparator/>
 

calendar/resources/locale/en-US/calendar.dtd

@@ -23,6 +23,7 @@
    -                 Chris Charabaruk <coldacid@meldstar.com>
    -                 ArentJan Banck <ajbanck@planet.nl>
    -                 Eric Belhaire <belhaire@ief.u-psud.fr>
+   -                 Matthew Willis <mattwillis@gmail.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
@@ -188,7 +189,7 @@
 <!ENTITY calendar.weekview.accesskey           "W" >
 <!ENTITY calendar.flat.topbar.monthview        "Month View" >
 <!ENTITY calendar.monthview.accesskey          "M" >
-<!ENTITY calendar.flat.topbar.multiweekview    "Multiweek" >
+<!ENTITY calendar.flat.topbar.multiweekview    "Multiweek View" >
 <!ENTITY calendar.multiweekview.accesskey      "u" >
 <!ENTITY calendar.dayView.key                  "1" >
 <!ENTITY calendar.weekView.key                 "2" >
@@ -198,8 +199,8 @@
 <!ENTITY calendar.tools.delete.tooltip         "Delete Event" >
 <!ENTITY calendar.tools.modify.tooltip         "Modify Event" >
 
-<!ENTITY calendar.newtask.button.tooltip          "Create A New Task" >
-<!ENTITY calendar.newevent.button.tooltip         "Create a new Calendar event" >
+<!ENTITY calendar.newtask.button.tooltip          "Create a new task" >
+<!ENTITY calendar.newevent.button.tooltip         "Create a new calendar event" >
 <!ENTITY calendar.delete.button.tooltip           "Delete selected event" >
 <!ENTITY calendar.edit.button.tooltip             "Edit selected event" >
 
@@ -331,21 +332,21 @@
 <!ENTITY window.title            "Mozilla Calendar">
 
 <!-- customizable toolbars -->
-<!ENTITY calendar.context.customize.label             "Customize">
+<!ENTITY calendar.context.customize.label             "Customize…">
 <!ENTITY calendar.context.customize.accesskey         "C">
-<!ENTITY calendar.menu.customize.label                "Customize Toolbars">
+<!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.newevent.label              "New Event">
+<!ENTITY calendar.context.newevent.label              "New Event…">
 <!ENTITY calendar.context.newevent.accesskey          "N">
-<!ENTITY calendar.context.newtodo.label               "New Task">
+<!ENTITY calendar.context.newtodo.label               "New Task…">
 <!ENTITY calendar.context.newtodo.accesskey           "k">
-<!ENTITY calendar.context.modifyevent.label           "Edit Selected Event">
+<!ENTITY calendar.context.modifyevent.label           "Edit Selected Event…">
 <!ENTITY calendar.context.modifyevent.accesskey       "E">
-<!ENTITY calendar.context.modifytask.label            "Edit Task">
+<!ENTITY calendar.context.modifytask.label            "Edit Task…">
 <!ENTITY calendar.context.modifytask.accesskey        "E">
 <!ENTITY calendar.context.deleteevent.label           "Delete Selected Event">
 <!ENTITY calendar.context.deleteevent.accesskey       "l">
@@ -371,9 +372,9 @@
 <!ENTITY calendar.context.multiweekview.accesskey     "u">
 <!ENTITY calendar.context.reload.label                "Reload">
 <!ENTITY calendar.context.reload.accesskey            "R">
-<!ENTITY calendar.context.emailevent.label            "Email Selected Event(s)">
+<!ENTITY calendar.context.emailevent.label            "Email Selected Events…">
 <!ENTITY calendar.context.emailevent.accesskey        "i">
-<!ENTITY calendar.context.emailtask.label             "Email Task">
+<!ENTITY calendar.context.emailtask.label             "Email Task…">
 <!ENTITY calendar.context.emailtask.accesskey         "i">
 
 <!-- Task Context Menu -->
@@ -431,7 +432,7 @@
 <!ENTITY calendar.server.dialog.publish.label       "Publish changes automatically? For remote calendars, this will download a new version before you add, edit or delete an event. It will then perform your action, and upload the new file to the server.">
 <!ENTITY calendar.server.dialog.location.label      "Location">
 <!ENTITY calendar.server.dialog.local.location.label "Local File Location">
-<!ENTITY calendar.server.dialog.browse.label        "Browse For Local File...">
+<!ENTITY calendar.server.dialog.browse.label        "Browse For Local File…">
 <!ENTITY calendar.local.calendar.dialog.help.label  "You can optionally specify a file location where the calendar should be created.">
 <!ENTITY calendar.server.dialog.help.label          "You can enter a local file path, or a remote file path like http://www.mozilla.org/projects/calendar/caldata/CanadaHolidays.ics">
 

calendar/resources/locale/en-US/menuOverlay.dtd

@@ -61,40 +61,44 @@
 <!ENTITY event.edit.event.key                   "E">
 <!ENTITY event.edit.event.accesskey             "E">
 
-<!ENTITY event.delete.event                     "Delete Selected Event(s)">
+<!ENTITY event.delete.event                     "Delete Selected Events">
 <!ENTITY event.delete.event.accesskey           "D">
 
-<!ENTITY event.delete.tasks                     "Delete Selected Task(s)">
+<!ENTITY event.delete.tasks                     "Delete Selected Tasks">
 <!ENTITY event.delete.tasks.accesskey           "T">
 
-<!ENTITY event.mail.event                       "Mail Selected Event(s)…">
+<!ENTITY event.mail.event                       "Mail Selected Events…">
 <!ENTITY event.mail.event.key                   "M">
 <!ENTITY event.mail.event.accesskey             "M">
 
-<!ENTITY calendar.print.label                   "Print Active Calendars...">
+<!ENTITY calendar.print.label                   "Print Active Calendars…">
 <!ENTITY calendar.print.key                     "P">
 <!ENTITY calendar.print.accesskey               "P">
 
 <!ENTITY calendar.printpreview.label            "Print Preview">
 <!ENTITY calendar.printpreview.accesskey        "v">
 
-<!ENTITY calendar.pagesetup.label               "Page Setup...">
+<!ENTITY calendar.pagesetup.label               "Page Setup…">
 <!ENTITY calendar.pagesetup.accesskey           "u">
 
-<!ENTITY calendar.import.label                  "Import From File...">
+<!ENTITY calendar.import.label                  "Import…">
 <!ENTITY calendar.import.key                    "I">
 <!ENTITY calendar.import.accesskey              "I">
 
-<!ENTITY calendar.wizard.label                  "Launch Wizard">
+<!ENTITY calendar.wizard.label                  "Launch Wizard…">
 <!ENTITY calendar.wizard.accesskey              "W">
 
-<!ENTITY calendar.export.label                  "Export Selected Events...">
+<!ENTITY calendar.export.label                  "Export Selected Events…">
 <!ENTITY calendar.export.accesskey              "E">
 
-<!ENTITY calendar.subscribe.label               "Subscribe to Remote Calendar...">
+<!ENTITY calendar.subscribe.label               "Subscribe to Remote Calendar…">
 <!ENTITY calendar.subscribe.accesskey           "R">
 
-<!ENTITY calendar.publish.label                 "Publish Selected Events...">
+<!ENTITY calendar.reloadserver.label            "Reload Remote Calendars">
+<!ENTITY calendar.reloadserver.key              "R">
+<!ENTITY calendar.reloadserver.accesskey        "R">
+
+<!ENTITY calendar.publish.label                 "Publish Selected Events…">
 <!ENTITY calendar.publish.accesskey             "b">
 
 <!ENTITY calendar.about.label                   "About Calendar">
@@ -116,7 +120,7 @@
 <!ENTITY calendar.selectall.key                 "A">
 <!ENTITY calendar.selectall.accesskey           "A">
 
-<!ENTITY calendar.preferences.label             "Preferences...">
+<!ENTITY calendar.preferences.label             "Preferences…">
 <!ENTITY calendar.preferences.accesskey         "e">
 
 <!ENTITY goMenu.label                           "Go">
@@ -164,7 +168,7 @@
 
 <!ENTITY editMenu.label                         "Edit">
 <!ENTITY editMenu.accesskey                     "E">
-<!ENTITY preferencesCmd.label                   "Options...">
+<!ENTITY preferencesCmd.label                   "Options…">
 <!ENTITY preferencesCmd.accesskey               "O">
 
 <!ENTITY viewMenu.label                         "View">

calendar/sunbird/base/content/calendar-menubar.inc

@@ -82,8 +82,9 @@
                      accesskey="&calendar.subscribe.accesskey;"
                      observes="new_server_command"/>
            <menuitem id="calendar-reloadserver-menu"
-                     label="&calendar.context.reloadserver.label;"
-                     accesskey="&calendar.context.reloadserver.accesskey;"
+                     key="reload_server_key"
+                     label="&calendar.reloadserver.label;"
+                     accesskey="&calendar.reloadserver.accesskey;"
                      observes="reload_remote_calendars"/>
            <menuseparator/>
 

calendar/sunbird/base/content/calendar-sets.inc

@@ -130,6 +130,7 @@
   <key id="go_forward_key"       keycode="VK_PAGE_DOWN"                  observes="next_command"/>
 
   <key id="import_key"           key="&calendar.import.key;"             observes="import_command"              modifiers="accel"/>
+  <key id="reload_server_key"    key="&calendar.reloadserver.key;"       observes="reload_remote_calendars"     modifiers="accel"/>
 
 #ifdef XP_MACOSX
   <key id="key_minimizeWindow"   key="&minimizeWindow.key;"              command="minimizeWindow"               modifiers="accel"/>