Bug 327912 Clean up Sunbird context menu. patch by ssitter, r=jminta, ui-r=mvl/dmose

calendar/locales/en-US/chrome/calendar/calendar.dtd

@@ -25,6 +25,7 @@
    -                 Eric Belhaire <belhaire@ief.u-psud.fr>
    -                 Matthew Willis <mattwillis@gmail.com>
    -                 Simon Paquet <bugzilla@babylonsounds.com>
+   -                 Stefan Sitter <ssitter@googlemail.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
@@ -454,16 +455,20 @@
 <!ENTITY progress.level.100.accesskey  "1">
                                                                  
 <!-- Server Context Menu -->
-<!ENTITY calendar.context.newserver.label              "New Calendar">
+<!ENTITY calendar.context.newserver.label              "New Calendar…">
 <!ENTITY calendar.context.newserver.accesskey          "N">
-<!ENTITY calendar.context.editserver.label             "Edit Calendar">
+<!ENTITY calendar.context.editserver.label             "Edit Calendar…">
 <!ENTITY calendar.context.editserver.accesskey         "E">
 <!ENTITY calendar.context.deleteserver.label           "Delete Calendar">
 <!ENTITY calendar.context.deleteserver.accesskey       "D">
 <!ENTITY calendar.context.reloadserver.label           "Reload Remote Calendars">
 <!ENTITY calendar.context.reloadserver.accesskey       "R">
-<!ENTITY calendar.context.publish.label                "Publish Entire Calendar">
-<!ENTITY calendar.context.publish.accesskey            "P">
+<!ENTITY calendar.context.publish.label                "Publish Calendar…">
+<!ENTITY calendar.context.publish.accesskey            "b">
+<!ENTITY calendar.context.export.label                 "Export Calendar…">
+<!ENTITY calendar.context.export.accesskey             "E">
+<!ENTITY calendar.context.properties.label             "Properties">
+<!ENTITY calendar.context.properties.accesskey         "P">
 
 <!-- About Dialog -->
 <!ENTITY calendar.about.title "About Mozilla Calendar">

calendar/sunbird/base/content/calendar.xul

@@ -27,6 +27,7 @@
    -                 Dan Parent <danp@oeone.com> 
    -                 ArentJan Banck <ajbanck@planet.nl> 
    -                 Eric Belhaire <belhaire@ief.u-psud.fr>
+   -                 Stefan Sitter <ssitter@googlemail.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
@@ -227,28 +228,29 @@
             id="calpopup-new"
             accesskey="&calendar.context.newserver.accesskey;"
             observes="new_calendar_command"/>
-  <menuitem label="&calendar.context.editserver.label;"
-            id="calpopup-edit"
-            accesskey="&calendar.context.editserver.accesskey;"
-            observes="edit_calendar_command"/>
   <menuitem label="&calendar.context.deleteserver.label;"
             id="calpopup-delete"
             accesskey="&calendar.context.deleteserver.accesskey;"
             observes="delete_calendar_command"/>
-  <menuitem label="&calendar.context.reloadserver.label;"
-            id="calpopup-reload"
-            accesskey="&calendar.context.reloadserver.accesskey;"
-            observes="reload_remote_calendars"/>
+  <menuseparator/>
+  <menuitem label="&calendar.context.export.label;"
+            id="calpopup-export"
+            accesskey="&calendar.context.export.accesskey;"
+            oncommand="exportEntireCalendar(getSelectedCalendarOrNull())"/>
   <menuitem label="&calendar.context.publish.label;"
             id="calpopup-publish"
             accesskey="&calendar.context.publish.accesskey;"
             observes="publish_calendar"/>
-  <menuitem label="&calendar.import.into.label;"
-            id="calpopup-import"
-            oncommand="loadEventsFromFile(getSelectedCalendarOrNull())"/>
-  <menuitem label="&calendar.export.specific.calendar;"
-            id="calpopup-export"
-            oncommand="exportEntireCalendar(getSelectedCalendarOrNull())"/>
+  <menuseparator/>
+  <menuitem label="&calendar.context.reloadserver.label;"
+            id="calpopup-reload"
+            accesskey="&calendar.context.reloadserver.accesskey;"
+            observes="reload_remote_calendars"/>
+  <menuseparator/>
+  <menuitem label="&calendar.context.properties.label;"
+            id="calpopup-edit"
+            accesskey="&calendar.context.properties.accesskey;"
+            observes="edit_calendar_command"/>
 </popup>
 
 <popup id="toolbar-context-menu">