Checked in attachments #161878,#161880 and #163491 from bug 260458(with minor tweaks):

Collect file commands in file menu, and separate new/open calendar to avoid warning "already exists. do you want to replace it" Parts that didn't get in will be provided in a separate patch just in case
2004-10-27 15:58:16 +00:00 · 2004-10-27 15:58:16 +00:00 · 40e4684d36
--- a/calendar/resources/content/calendar.xul
+++ b/calendar/resources/content/calendar.xul
@ -100,7 +100,8 @@
  <command id="modify_todo_command" oncommand="modifyToDoCommand( event )"/>
  <command id="delete_todo_command" oncommand="deleteToDoCommand()" disabled="true"/>

-  <command id="new_local_calendar_command" oncommand="gCalendarWindow.calendarManager.launchAddCalendarDialog()"/>
+  <command id="new_local_calendar_command" oncommand="gCalendarWindow.calendarManager.launchNewCalendarFileDialog()"/>
+  <command id="open_local_calendar_command" oncommand="gCalendarWindow.calendarManager.launchOpenCalendarFileDialog()"/>
  <command id="edit_local_calendar_command" oncommand="gCalendarWindow.calendarManager.launchEditCalendarDialog()"/>
  <command id="new_server_command" oncommand="gCalendarWindow.calendarManager.launchAddRemoteCalendarDialog()"/>
  <command id="edit_server_command" oncommand="gCalendarWindow.calendarManager.launchEditRemoteCalendarDialog()"/>
--- a/calendar/resources/content/calendarManager.js
+++ b/calendar/resources/content/calendarManager.js
@ -128,7 +128,23 @@ function calendarManager( CalendarWindow )
 /*
 ** Launch the new calendar file dialog
 */
-calendarManager.prototype.launchAddCalendarDialog = function calMan_launchAddCalendarDialog( aName, aPath )
+calendarManager.prototype.launchNewCalendarFileDialog = function calMan_launchNewCalendarFileDialog( aName, aPath )
+{
+  this.launchNewOrOpenCalendarFileDialog(aName, aPath, "new");
+}
+
+/*
+** Launch the open calendar file dialog
+*/
+calendarManager.prototype.launchOpenCalendarFileDialog = function calMan_launchOpenCalendarFileDialog( aName, aPath )
+{
+  this.launchNewOrOpenCalendarFileDialog(aName, aPath, "open");
+}
+
+/*
+** PRIVATE: Launch the new file dialog or open calendar file dialog
+*/
+calendarManager.prototype.launchNewOrOpenCalendarFileDialog = function calMan_launchNewOrOpenCalendarFileDialog( aName, aPath, aMode )
 {
   // set up a bunch of args to pass to the dialog
   var ThisCalendarObject = new CalendarObject();
@ -140,7 +156,7 @@ calendarManager.prototype.launchAddCalendarDialog = function calMan_launchAddCal
      ThisCalendarObject.path = aPath;

   var args = new Object();
-   args.mode = "new";
+   args.mode = aMode;

   var thisManager = this;

@ -648,7 +664,7 @@ calendarManager.prototype.checkCalendarURL = function calMan_checkCalendarURL( C
               FilePath = profileFile.path;
               saveDataToFile(FilePath, CalendarData, null);
      
-               CalendarManager.launchAddCalendarDialog( CalendarName, FilePath );
+               CalendarManager.launchOpenCalendarFileDialog( CalendarName, FilePath );
            }
         }
         var result = this.getRemoteCalendarText( Channel, onResponse, null );
@ -767,6 +783,11 @@ calendarManager.prototype.getDefaultServer = function calMan_getDefaultServer()
   return( this.rootContainer.getSubNodes()[0].getAttribute( "http://home.netscape.com/NC-rdf#path" ) );
 }

+calendarManager.prototype.getDefaultCalendarName = function calMan_getDefaultName()
+{
+   return( this.rootContainer.getSubNodes()[0].getAttribute( "http://home.netscape.com/NC-rdf#name" ) );
+}
+

 calendarManager.prototype.getAndConvertAllOldCalendars = function calMan_getAllCalendars()
 {
@ -1099,8 +1120,8 @@ var calendarManagerDNDObserver = {
         // url has spec, fileName, fileBaseName, fileExtension and others
         var url = Components.classes["@mozilla.org/network/standard-url;1"].createInstance();
         url = url.QueryInterface(Components.interfaces.nsIURL);
-	      url.spec = droppedUrl;
-	      gCalendarWindow.calendarManager.launchAddCalendarDialog(url.fileBaseName, url.spec )
+	     url.spec = droppedUrl;
+         gCalendarWindow.calendarManager.launchOpenCalendarFileDialog(url.fileBaseName, url.spec );

         break;

--- a/calendar/resources/content/localCalDialog.js
+++ b/calendar/resources/content/localCalDialog.js
@ -49,18 +49,26 @@
 * NOTES
 *   Code for creating a new local calendar.
 *
-*  Invoke this dialog to create a new event as follows:
+*  Invoke this dialog to create a new calendar file as follows:

   var args = new Object();
-   args.mode = "new";               // "new" or "edit"
+   args.mode = "new";               // "new", "open", or "edit"
   args.onOk = <function>;          // funtion to call when OK is clicked
    
   calendar.openDialog("caNewCalendar", "chrome://calendar/content/localCalDialog.xul", true, args );
 *
-*  Invoke this dialog to edit an existing event as follows:
+*  Invoke this dialog to open an existing local calendar file as follows:
+
+   var args = new Object();
+   args.mode = "open";               // "new", "open", or "edit"
+   args.onOk = <function>;          // funtion to call when OK is clicked
+    
+   calendar.openDialog("caNewCalendar", "chrome://calendar/content/localCalDialog.xul", true, args );
+*
+*  Invoke this dialog to edit a known calendar file as follows:
 *
   var args = new Object();
-   args.mode = "edit";                    // "new" or "edit"
+   args.mode = "edit";                    // "new", "open", or "edit"
   args.onOk = <function>;                // funtion to call when OK is clicked

 * When the user clicks OK the onOk function will be called with a calendar event object.
@ -79,7 +87,7 @@
 var gCalendarObject;          // event being edited
 var gOnOkFunction;   // function to be called when user clicks OK

-var gMode = ''; //what mode are we in? new or edit...
+var gMode = ''; //what mode are we in? new or open or edit...

 /*-----------------------------------------------------------------
 *   W I N D O W      F U N C T I O N S
@ -107,13 +115,17 @@ function loadCalendarServerDialog()
   {
      titleDataItem = document.getElementById( "data-event-title-new" );
   }
+   else if( "open" == args.mode )
+   {
+      titleDataItem = document.getElementById( "data-event-title-open" );
+   }
   else
   {
      titleDataItem = document.getElementById( "data-event-title-edit" );

      document.getElementById( "server-path-textbox" ).setAttribute( "readonly", "true" );
   }
-   
+

   // CofC - calendar coloring change
   document.getElementById("calendar-color").color = gCalendarObject.color;
@ -173,7 +185,14 @@ function launchFilePicker()

   // caller can force disable of sand box, even if ON globally

-   fp.init(window, gCalendarBundle.getString( "Save" ), nsIFilePicker.modeSave);
+   // Note: because all changes are saved immediately,
+   // must save a file name for new calendar files as well.
+   if (gMode == "new")
+     fp.init(window, gCalendarBundle.getString( "New" ), nsIFilePicker.modeSave);
+   else if (gMode == "open")
+     fp.init(window, gCalendarBundle.getString( "Open" ), nsIFilePicker.modeOpen);
+   else /* gMode == "edit" */
+     fp.init(window, gCalendarBundle.getString( "Save" ), nsIFilePicker.modeSave);

   var ServerName = document.getElementById( "server-name-textbox" ).value;

--- a/calendar/resources/content/localCalDialog.xul
+++ b/calendar/resources/content/localCalDialog.xul
@ -72,6 +72,7 @@
   
   <dataset>
       <data id="data-event-title-new"             value="&calendar.server.dialog.title.new;" />
+       <data id="data-event-title-open"            value="&calendar.server.dialog.title.open;" />
       <data id="data-event-title-edit"            value="&calendar.server.dialog.title.edit;" />
   </dataset>

--- a/calendar/resources/content/menuOverlay.xul
+++ b/calendar/resources/content/menuOverlay.xul
@ -95,6 +95,7 @@
         label="&fileMenu.label;"
         accesskey="&fileMenu.accesskey;">
      <menupopup id="menu_FilePopup">
+         <!-- create a new event or task (top of 1st menu, for new users) -->
         <menuitem id="calendar-new-event-menu"
                   key="new_event_key"
                   label="&event.new.event;"
@ -105,32 +106,65 @@
                   label="&event.new.todo;"
                   accesskey="&event.new.todo.accesskey;"
                   observes="new_todo_command"/>
-         <menuitem id="calendar-new-calendar-menu"
-                   key="new_calendar_key"
-                   label="&calendar.new.server.label;"
-                   accesskey="&calendar.new.server.accesskey;"
-                   observes="new_local_calendar_command"/>
         <menuitem id="unifinder-modify-menu"
                   key="modify_event_key"
                   label="&event.edit.event;"
                   accesskey="&event.edit.event.accesskey;"
                   observes="modify_command"/>
-         <menuitem id="calendar-close"
-                   key="key_close"
-                   label="&calendar.menu.options.close;"
-                   accesskey="&calendar.menu.options.close.accesskey;"
-                   observes="close_calendar_command"/>
         <menuseparator/>
+
+         <!-- files -->
+         <menuitem id="calendar-new-calendar-menu"
+                   key="new_calendar_key"
+                   label="&calendar.new.server.label;"
+                   accesskey="&calendar.new.server.accesskey;"
+                   observes="new_local_calendar_command"/>
+         <menuitem id="calendar-open-calendar-menu"
+                   key="open_calendar_key"
+                   label="&calendar.open.file.label;"
+                   accesskey="&calendar.open.file.accesskey;"
+                   observes="open_local_calendar_command"/>
+         <menuitem id="calendar-addserver-menu"
+                   label="&calendar.subscribe.label;"
+                   accesskey="&calendar.subscribe.accesskey;"
+                   observes="new_server_command"/>
+         <menuseparator/>
+
+         <!-- import: pulling data into existing files -->
+         <menuitem id="calendar-import-menu"
+                   key="import_key"
+                   label="&calendar.import.label;"
+                   accesskey="&calendar.import.accesskey;"
+                   observes="import_command"/>
+         <menuseparator/>
+
+         <!-- export: getting data out of existing files -->
+         <menuitem id="calendar-export-menu"
+                   key="export_key"
+                   label="&calendar.export.label;"
+                   accesskey="&calendar.export.accesskey;"
+                   observes="export_command"/>
         <menuitem id="calendar-mail-event"
                   key="send_event_key"
                   label="&event.mail.event;"
                   accesskey="&event.mail.event.accesskey;"
                   observes="send_event_command"/>
-         <menuseparator id="calendar-print-sep"/>
+         <menuitem id="calendar-publish-menu"
+                   label="&calendar.publish.label;"
+                   accesskey="&calendar.publish.accesskey;"
+                   observes="publish_events_command"/>
         <menuitem id="calendar-print-menu"
                   label="&calendar.print.label;"
                   accesskey="&calendar.print.accesskey;"
                   observes="print_command"/>
+         <menuseparator id="calendar-print-sep"/>
+
+         <!-- window/Application -->
+         <menuitem id="calendar-close"
+                   key="key_close"
+                   label="&calendar.menu.options.close;"
+                   accesskey="&calendar.menu.options.close.accesskey;"
+                   observes="close_calendar_command"/>
      </menupopup>
   </menu>

@ -276,33 +310,15 @@
      </menupopup>
   </menu>
   
-    <menu id="tasksMenu"
+   <menu id="menu_Tools"
         label="&toolsMenu.label;"
         accesskey="&toolsMenu.accesskey;">
-      <menupopup id="taskPopup" onpopupshowing="checkWallet()">
+      <menupopup id="toolsPopup" onpopupshowing="checkWallet()">
         <menuitem id="calendar-wizard-menu"
                   key="wizard_key"
                   label="&calendar.wizard.label;"
                   accesskey="&calendar.wizard.accesskey;"
                   observes="wizard_command"/>
-         <menuitem id="calendar-import-menu"
-                   key="import_key"
-                   label="&calendar.import.label;"
-                   accesskey="&calendar.import.accesskey;"
-                   observes="import_command"/>
-         <menuitem id="calendar-export-menu"
-                   key="export_key"
-                   label="&calendar.export.label;"
-                   accesskey="&calendar.export.accesskey;"
-                   observes="export_command"/>
-         <menuitem id="calendar-addserver-menu"
-                   label="&calendar.subscribe.label;"
-                   accesskey="&calendar.subscribe.accesskey;"
-                   observes="new_server_command"/>
-         <menuitem id="calendar-publish-menu"
-                   label="&calendar.publish.label;"
-                   accesskey="&calendar.publish.accesskey;"
-                   observes="publish_events_command"/>
        <menuitem label="&walletPasswordManager.label;" hidden="true"
                  id="password-manager-menu"
                  accesskey="&walletPasswordManager.accesskey;"
--- a/calendar/resources/locale/cs-CZ/calendar.dtd
+++ b/calendar/resources/locale/cs-CZ/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Přidat nový kalendář">
+<!ENTITY calendar.server.dialog.title.new           "Nový kalendář soubory">
+<!ENTITY calendar.server.dialog.title.open          "Otev?ít kalendář soubory">
 <!ENTITY calendar.server.dialog.title.edit          "Upravit kalendář">
 <!ENTITY calendar.server.dialog.name.label          "Název">
 <!ENTITY calendar.server.dialog.publish.label       "Publikovat změny automaticky? Pro vzdálené kalendáře to znamená, že bude stažena jeho aktuální verze před přidáním, editací či vymazáním události. Následně se provede nahrání nového souboru na server.">
--- a/calendar/resources/locale/cs-CZ/calendar.properties
+++ b/calendar/resources/locale/cs-CZ/calendar.properties
@ -140,6 +140,7 @@ tooltipPercent  =% Complete:
 tooltipCompleted=Dokončeno:

 #File commands and dialogs
+New=Nov\u00FD
 Open=Otev\u0159\u00EDt
 Save=Ulo\u017Eit
 SaveAs=Ulo\u017Eit jako
--- a/calendar/resources/locale/cs-CZ/menuOverlay.dtd
+++ b/calendar/resources/locale/cs-CZ/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Událost">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "Nová událost">
+<!ENTITY event.new.event           "Nová událost…">
 <!ENTITY event.new.event.accesskey "u">

-<!ENTITY event.new.todo     "Nový úkol">
+<!ENTITY event.new.todo     "Nový úkol…">
 <!ENTITY event.new.todo.accesskey "k">

-<!ENTITY calendar.new.server.label "Nový kalendář">
+<!ENTITY calendar.new.server.label "Nový kalendář soubory…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Upravit">
+<!ENTITY calendar.open.file.label "Otev?ít kalendář soubory…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "Upravit…">
 <!ENTITY event.edit.event.accesskey "r">

 <!ENTITY event.delete.event "Vymazat vybranou událost">
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks "Vymazat vybraný úkol">
 <!ENTITY event.delete.tasks.accesskey   "b">

-<!ENTITY event.mail.event   "Odeslat vybrané události">
+<!ENTITY event.mail.event   "Odeslat vybrané události…">
 <!ENTITY event.mail.event.accesskey "O">

 <!ENTITY calendar.print.label   "Tisknout aktivní kalendář...">
--- a/calendar/resources/locale/cy-GB/calendar.dtd
+++ b/calendar/resources/locale/cy-GB/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Ychwanegu Calendr Newydd">
+<!ENTITY calendar.server.dialog.title.new           "Ffeil Calendr Newydd">
+<!ENTITY calendar.server.dialog.title.open          "Ffeil Calendr Agor">
 <!ENTITY calendar.server.dialog.title.edit          "Golygu'r Calendr">
 <!ENTITY calendar.server.dialog.name.label          "Enw">
 <!ENTITY calendar.server.dialog.publish.label       "Cyhoeddi newidiadau'n awtomatig? Ar gyfer calendrau pell, bydd hyn yn llwytho fersiwn newydd cyn i chi ychwanegu, golygu neu ddileu digwyddiad. Yna bydd yn cyflawni eich gweithred, a llwytho'r ffeil i fyny i'r gwasanaethwr.">
--- a/calendar/resources/locale/cy-GB/calendar.properties
+++ b/calendar/resources/locale/cy-GB/calendar.properties
@ -141,6 +141,7 @@ tooltipPercent  =Cwblhau %:
 tooltipCompleted=Wedi Gorffen:

 #File commands and dialogs
+New=Newydd
 Open=Agor
 Save=Cadw
 SaveAs=Cadw Fel...
--- a/calendar/resources/locale/cy-GB/menuOverlay.dtd
+++ b/calendar/resources/locale/cy-GB/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Digwyddiad Newydd">
 <!ENTITY eventMenuCmd.accesskey     "D">

-<!ENTITY event.new.event           "Digwyddiad Newydd">
+<!ENTITY event.new.event           "Digwyddiad Newydd…">
 <!ENTITY event.new.event.accesskey "d">

-<!ENTITY event.new.todo     "Tasg Newydd">
+<!ENTITY event.new.todo     "Tasg Newydd…">
 <!ENTITY event.new.todo.accesskey "t">

-<!ENTITY calendar.new.server.label "Calendr Newydd">
+<!ENTITY calendar.new.server.label "Ffeil Calendr Newydd">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Golygu">
+<!ENTITY calendar.open.file.label "Ffeil Calendr Agor">
+<!ENTITY calendar.open.file.accesskey "A">
+
+<!ENTITY event.edit.event   "Golygu…">
 <!ENTITY event.edit.event.accesskey "g">

 <!ENTITY event.delete.event "Dileu">
@ -58,10 +61,10 @@
 <!ENTITY event.delete.tasks "Dileu Tasg(au) Dewisol">
 <!ENTITY event.delete.tasks.accesskey   "D">

-<!ENTITY event.mail.event   "E-bostio Digwyddiad Newydd">
+<!ENTITY event.mail.event   "E-bostio Digwyddiad Newydd…">
 <!ENTITY event.mail.event.accesskey "E">

-<!ENTITY calendar.print.label   "Gosodiad Tudalen......">
+<!ENTITY calendar.print.label   "Gosodiad Tudalen…">
 <!ENTITY calendar.print.accesskey   "o">

 <!ENTITY calendar.printpreview.label    "Rhagolwg Argraffu">
@ -119,10 +122,10 @@
 <!ENTITY goNextCmd.accesskey            "N">

 <!ENTITY taskMenu.label                "Tasks">
-<!ENTITY taskMenu.accesskey            "T">
+<!ENTITY taskMenu.accesskey            "k">

 <!ENTITY toolsMenu.label                "Tools">
-<!ENTITY toolsMenu.accesskey            "o">
+<!ENTITY toolsMenu.accesskey            "T">

 <!ENTITY javaScriptConsoleCmd.label     "JavaScript Console">
 <!ENTITY javaScriptConsoleCmd.accesskey "S">
--- a/calendar/resources/locale/de-AT/calendar.dtd
+++ b/calendar/resources/locale/de-AT/calendar.dtd
@ -407,6 +407,7 @@

 <!-- Calendar Server Dialog -->
 <!ENTITY calendar.server.dialog.title.new           "Neuen Kalender hinzufügen">
+<!ENTITY calendar.server.dialog.title.open          "Öffnen Kalender hinzufügen">
 <!ENTITY calendar.server.dialog.title.edit          "Kalender bearbeiten">
 <!ENTITY calendar.server.dialog.name.label          "Name">
 <!ENTITY calendar.server.dialog.publish.label       "Änderungen automatisch publizieren? Bei entfernten Kalendern lädt dies eine neue Version herunter, bevor Sie ein Ereignis hinzufügen, bearbeiten oder löschen. Dann wird Ihre Aktion ausgeführt und die neue Datei auf den Server geladen.">
--- a/calendar/resources/locale/de-AT/calendar.properties
+++ b/calendar/resources/locale/de-AT/calendar.properties
@ -141,6 +141,7 @@ tooltipPercent  =% fertig:
 tooltipCompleted=Abgeschlossen:

 #File commands and dialogs
+New=Neuen
 Open=\u00D6ffnen
 Save=Speichern
 SaveAs=Speichern unter
--- a/calendar/resources/locale/de-AT/menuOverlay.dtd
+++ b/calendar/resources/locale/de-AT/menuOverlay.dtd
@ -39,16 +39,19 @@
 <!ENTITY event.menu.title   "Ereignis">
 <!ENTITY eventMenuCmd.accesskey     "r">

-<!ENTITY event.new.event           "Neues Ereignis">
+<!ENTITY event.new.event           "Neues Ereignis…">
 <!ENTITY event.new.event.accesskey "N">

-<!ENTITY event.new.todo     "Neue Aufgabe">
+<!ENTITY event.new.todo     "Neue Aufgabe…">
 <!ENTITY event.new.todo.accesskey "f">

-<!ENTITY calendar.new.server.label "Neuer Kalender">
+<!ENTITY calendar.new.server.label "Neuer Kalender Datei…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Bearbeiten">
+<!ENTITY calendar.open.file.label "Öffnen Kalender Datei…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "Bearbeiten…">
 <!ENTITY event.edit.event.accesskey "e">

 <!ENTITY event.delete.event "Gewählte(s) Ereignis löschen">
@ -57,7 +60,7 @@
 <!ENTITY event.delete.tasks "Gewählte Aufgabe(n) löschen">
 <!ENTITY event.delete.tasks.accesskey   "A">

-<!ENTITY event.mail.event   "Ausgewählte(s) Ereignis(se) per E-Mail senden">
+<!ENTITY event.mail.event   "Ausgewählte(s) Ereignis(se) per E-Mail senden…">
 <!ENTITY event.mail.event.accesskey "M">

 <!ENTITY calendar.print.label   "Aktive Kalender drucken...">
--- a/calendar/resources/locale/en-US/calendar.dtd
+++ b/calendar/resources/locale/en-US/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Add New Calendar">
+<!ENTITY calendar.server.dialog.title.new           "New Calendar File">
+<!ENTITY calendar.server.dialog.title.open          "Open Calendar File">
 <!ENTITY calendar.server.dialog.title.edit          "Edit Calendar">
 <!ENTITY calendar.server.dialog.name.label          "Name">
 <!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.">
--- a/calendar/resources/locale/en-US/calendar.properties
+++ b/calendar/resources/locale/en-US/calendar.properties
@ -141,6 +141,7 @@ tooltipPercent  =% Complete:
 tooltipCompleted=Completed:

 #File commands and dialogs
+New=New
 Open=Open
 Save=Save
 SaveAs=Save As
--- a/calendar/resources/locale/en-US/menuOverlay.dtd
+++ b/calendar/resources/locale/en-US/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Event">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "New Event">
+<!ENTITY event.new.event           "New Event…">
 <!ENTITY event.new.event.accesskey "N">

-<!ENTITY event.new.todo     "New Task">
+<!ENTITY event.new.todo     "New Task…">
 <!ENTITY event.new.todo.accesskey "T">

-<!ENTITY calendar.new.server.label "New Calendar">
+<!ENTITY calendar.new.server.label "New Calendar File…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Edit">
+<!ENTITY calendar.open.file.label "Open Calendar File…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "Edit…">
 <!ENTITY event.edit.event.accesskey "E">

 <!ENTITY event.delete.event "Delete Selected Event(s)">
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks "Delete Selected Task(s)">
 <!ENTITY event.delete.tasks.accesskey   "T">

-<!ENTITY event.mail.event   "Mail Selected Event(s)">
+<!ENTITY event.mail.event   "Mail Selected Event(s)…">
 <!ENTITY event.mail.event.accesskey "M">

 <!ENTITY calendar.print.label   "Print Active Calendars...">
@ -83,7 +86,7 @@
 <!ENTITY calendar.subscribe.accesskey "R">

 <!ENTITY calendar.publish.label "Publish Selected Events...">
-<!ENTITY calendar.publish.accesskey "S">
+<!ENTITY calendar.publish.accesskey "b">

 <!ENTITY calendar.about.label   "About Calendar">
 <!ENTITY calendar.about.accesskey   "C">
@ -118,11 +121,11 @@
 <!ENTITY goNextCmd.label                "Next">
 <!ENTITY goNextCmd.accesskey            "N">

-<!ENTITY taskMenu.label                "Tasks">
-<!ENTITY taskMenu.accesskey            "T">
+<!ENTITY taskMenu.label                 "Tasks">
+<!ENTITY taskMenu.accesskey             "k">

 <!ENTITY toolsMenu.label                "Tools">
-<!ENTITY toolsMenu.accesskey            "o">
+<!ENTITY toolsMenu.accesskey            "T">

 <!ENTITY javaScriptConsoleCmd.label     "JavaScript Console">
 <!ENTITY javaScriptConsoleCmd.accesskey "S">
--- a/calendar/resources/locale/es-ES/calendar.dtd
+++ b/calendar/resources/locale/es-ES/calendar.dtd
@ -405,7 +405,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Añadir nuevo calendario">
+<!ENTITY calendar.server.dialog.title.new           "Nuevo archivo del calendario">
+<!ENTITY calendar.server.dialog.title.open          "Abrir archivo del calendario">
 <!ENTITY calendar.server.dialog.title.edit          "Editar calendario">
 <!ENTITY calendar.server.dialog.name.label          "Nombre">
 <!ENTITY calendar.server.dialog.publish.label       "¿Publicar cambios automáticamente? Para calendarios remotos, esto descargará una nueva versión antes de que añada, edite o borre un evento. Se realizará la acción, y se descargará al servidor el nuevo archivo.">
--- a/calendar/resources/locale/es-ES/calendar.properties
+++ b/calendar/resources/locale/es-ES/calendar.properties
@ -140,6 +140,7 @@ tooltipPercent  =% Completo:
 tooltipCompleted=Completado:

 #File commands and dialogs
+New=Nuevo
 Open=Abrir
 Save=Guardar
 SaveAs=Guardar como
--- a/calendar/resources/locale/es-ES/menuOverlay.dtd
+++ b/calendar/resources/locale/es-ES/menuOverlay.dtd
@ -38,16 +38,19 @@
 <!ENTITY event.menu.title   "Evento">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "Nuevo evento">
+<!ENTITY event.new.event           "Nuevo evento…">
 <!ENTITY event.new.event.accesskey "N">

-<!ENTITY event.new.todo     "Nueva tarea">
+<!ENTITY event.new.todo     "Nueva tarea…">
 <!ENTITY event.new.todo.accesskey "T">

-<!ENTITY calendar.new.server.label "Nuevo calendario">
+<!ENTITY calendar.new.server.label "Nuevo archivo del calendario…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Editar">
+<!ENTITY calendar.open.file.label "Abrir archivo del calendario…">
+<!ENTITY calendar.open.file.accesskey "N">
+
+<!ENTITY event.edit.event   "Editar…">
 <!ENTITY event.edit.event.accesskey "E">

 <!ENTITY event.delete.event "Borrar eventos seleccionados">
@ -56,7 +59,7 @@
 <!ENTITY event.delete.tasks "Borrar tareas seleccionadas">
 <!ENTITY event.delete.tasks.accesskey   "T">

-<!ENTITY event.mail.event   "Enviar eventos seleccionados">
+<!ENTITY event.mail.event   "Enviar eventos seleccionados…">
 <!ENTITY event.mail.event.accesskey "v">

 <!ENTITY calendar.print.label   "Imprimir calendarios activos...">
--- a/calendar/resources/locale/fr-FR/calendar.dtd
+++ b/calendar/resources/locale/fr-FR/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Ajouter un nouveau calendrier">
+<!ENTITY calendar.server.dialog.title.new           "Nouveau fichier du calendrier">
+<!ENTITY calendar.server.dialog.title.open          "Ouvrez le fichier du calendrier">
 <!ENTITY calendar.server.dialog.title.edit          "Modifier le calendrier">
 <!ENTITY calendar.server.dialog.name.label          "Nom">
 <!ENTITY calendar.server.dialog.publish.label       "Publier automatiquement les modifications ? Pour les calendriers distants, on ira chercher une nouvelle version avant chaque ajout, modification ou suppression d'un événement. Votre action sera effectuée, puis le nouveau fichier sera publié sur le serveur.">
--- a/calendar/resources/locale/fr-FR/calendar.properties
+++ b/calendar/resources/locale/fr-FR/calendar.properties
@ -141,6 +141,7 @@ tooltipPercent  =% d'achèvement\u00a0:
 tooltipCompleted=Achevé\u00a0:

 #File commands and dialogs
+New=Nouveau
 Open=Ouvrir
 Save=Enregistrer
 SaveAs=Enregistrer sous
--- a/calendar/resources/locale/fr-FR/menuOverlay.dtd
+++ b/calendar/resources/locale/fr-FR/menuOverlay.dtd
@ -40,17 +40,20 @@
 <!ENTITY event.menu.title       "Événement">
 <!ENTITY eventMenuCmd.accesskey "v">

-<!ENTITY event.new.event           "Nouvel événement">
+<!ENTITY event.new.event           "Nouvel événement…">
 <!ENTITY event.new.event.accesskey "N">

-<!ENTITY event.new.todo           "Nouvelle tâche">
+<!ENTITY event.new.todo           "Nouvelle tâche…">
 <!ENTITY event.new.todo.accesskey "T">

-<!ENTITY calendar.new.server.label "Nouveau calendrier">
+<!ENTITY calendar.new.server.label     "Nouveau fichier du calendrier…">
 <!ENTITY calendar.new.server.accesskey "a">

-<!ENTITY event.edit.event        "Modifier">
-<!ENTITY event.edit.event.accesskey        "e">
+<!ENTITY calendar.open.file.label     "Ouvrez le fichier du calendrier…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event           "Modifier…">
+<!ENTITY event.edit.event.accesskey "e">

 <!ENTITY event.delete.event        "Supprimer le(s) événement(s) sélectionné(s)">
 <!ENTITY event.delete.event.accesskey        "s">
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks        "Supprimer la ou les tâche(s)">
 <!ENTITY event.delete.tasks.accesskey        "t">

-<!ENTITY event.mail.event        "Envoyer le(s) événement(s) par courriel">
+<!ENTITY event.mail.event        "Envoyer le(s) événement(s) par courriel…">
 <!ENTITY event.mail.event.accesskey        "m">

 <!ENTITY calendar.print.label        "Imprimer le(s) calendrier(s) actif(s)…">
--- a/calendar/resources/locale/hu-HU/calendar.dtd
+++ b/calendar/resources/locale/hu-HU/calendar.dtd
@ -411,7 +411,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Új naptár hozzáadása">
+<!ENTITY calendar.server.dialog.title.new           "Új naptár fájl">
+<!ENTITY calendar.server.dialog.title.open          "Megnyitás naptár fájl">
 <!ENTITY calendar.server.dialog.title.edit          "Naptár szerkesztése">
 <!ENTITY calendar.server.dialog.name.label          "Név">
 <!ENTITY calendar.server.dialog.publish.label       "A változások automatikus közzététele. Ebben az esetben távoli naptárakat előbb letölti, mielőtt hozzáadhat, szerkeszthet, vagy törölhet egy eseményt. Ezek után végrehajtja a változtatásait, majd feltölti az új fájlt a kiszolgálóra.">
--- a/calendar/resources/locale/hu-HU/calendar.properties
+++ b/calendar/resources/locale/hu-HU/calendar.properties
@ -143,6 +143,7 @@ tooltipPercent  =%-ban kész:
 tooltipCompleted=Kész van:

 #File commands and dialogs
+New=\u00DAj
 Open=Megnyit\u00e1s
 Save=Ment\u00e9s
 SaveAs=Ment\u00e9s m\u00e1sk\u00e9nt
--- a/calendar/resources/locale/hu-HU/menuOverlay.dtd
+++ b/calendar/resources/locale/hu-HU/menuOverlay.dtd
@ -42,16 +42,19 @@
 <!ENTITY event.menu.title   "Esemény">
 <!ENTITY eventMenuCmd.accesskey     "s">

-<!ENTITY event.new.event           "Új esemény">
+<!ENTITY event.new.event           "Új esemény…">
 <!ENTITY event.new.event.accesskey "e">

-<!ENTITY event.new.todo     "Új tennivaló">
+<!ENTITY event.new.todo     "Új tennivaló…">
 <!ENTITY event.new.todo.accesskey "t">

-<!ENTITY calendar.new.server.label "Új naptár">
+<!ENTITY calendar.new.server.label "Új naptár fájl…">
 <!ENTITY calendar.new.server.accesskey "p">

-<!ENTITY event.edit.event   "Szerkesztés">
+<!ENTITY calendar.open.file.label "Megnyitás naptár fajl…">
+<!ENTITY calendar.open.file.accesskey "M">
+
+<!ENTITY event.edit.event   "Szerkesztés…">
 <!ENTITY event.edit.event.accesskey "z">

 <!ENTITY event.delete.event "Kiválasztott események törlése">
@ -60,7 +63,7 @@
 <!ENTITY event.delete.tasks "Kiválasztott tennivalók törlése">
 <!ENTITY event.delete.tasks.accesskey   "t">

-<!ENTITY event.mail.event   "Kiválasztott események elküldése">
+<!ENTITY event.mail.event   "Kiválasztott események elküldése…">
 <!ENTITY event.mail.event.accesskey "e">

 <!ENTITY calendar.print.label   "Az aktív naptár nyomtatása...">
--- a/calendar/resources/locale/it-IT/calendar.properties
+++ b/calendar/resources/locale/it-IT/calendar.properties
@ -141,6 +141,7 @@ tooltipPercent  =% Completato:
 tooltipCompleted=Completato:

 #File commands and dialogs
+New=Nuovo
 Open=Apri
 Save=Salva
 SaveAs=Salva Come
--- a/calendar/resources/locale/it-IT/menuOverlay.dtd
+++ b/calendar/resources/locale/it-IT/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Evento">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "Nuovo Evento">
+<!ENTITY event.new.event           "Nuovo Evento…">
 <!ENTITY event.new.event.accesskey "E">

-<!ENTITY event.new.todo     "Nuovo Impegno">
+<!ENTITY event.new.todo     "Nuovo Impegno…">
 <!ENTITY event.new.todo.accesskey "I">

-<!ENTITY calendar.new.server.label "Nuovo Calendario">
+<!ENTITY calendar.new.server.label "Nuovo Calendario…">
 <!ENTITY calendar.new.server.accesskey "C">

-<!ENTITY event.edit.event   "Modifica">
+<!ENTITY calendar.open.file.label "Apri File Calendario…">
+<!ENTITY calendar.open.file.accesskey "A">
+
+<!ENTITY event.edit.event   "Modifica…">
 <!ENTITY event.edit.event.accesskey "M">

 <!ENTITY event.delete.event "Elimina Evento(i) Selezionato(i)">
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks "Elimina Impegno(i) Selezionato(i)">
 <!ENTITY event.delete.tasks.accesskey   "I">

-<!ENTITY event.mail.event   "Invia Evento Selezionato via E-mail">
+<!ENTITY event.mail.event   "Invia Evento Selezionato via E-mail…">
 <!ENTITY event.mail.event.accesskey "m">

 <!ENTITY calendar.print.label   "Stampa Calendari Attivi...">
--- a/calendar/resources/locale/ja-JP/calendar.dtd
+++ b/calendar/resources/locale/ja-JP/calendar.dtd
@ -412,7 +412,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "新しいカレンダーを追加">
+<!ENTITY calendar.server.dialog.title.new           "New Calendar File">
+<!ENTITY calendar.server.dialog.title.open          "Open Calendar File">
 <!ENTITY calendar.server.dialog.title.edit          "カレンダーを編集">
 <!ENTITY calendar.server.dialog.name.label          "名前">
 <!ENTITY calendar.server.dialog.publish.label       "自動的に変更を公開しますか？サーバにある新しいカレンダーをダウンロードして、追加や編集、イベント削除を行い、その新しいファイルをアップロードします。">
--- a/calendar/resources/locale/ja-JP/calendar.properties
+++ b/calendar/resources/locale/ja-JP/calendar.properties
@ -144,6 +144,7 @@ tooltipPercent  =% Complete:
 tooltipCompleted=Completed:

 #File commands and dialogs
+New=New
 Open=\u958b\u304f
 Save=\u4fdd\u5b58
 SaveAs=\u540d\u524d\u3092\u4ed8\u3051\u3066\u4fdd\u5b58
--- a/calendar/resources/locale/ja-JP/menuOverlay.dtd
+++ b/calendar/resources/locale/ja-JP/menuOverlay.dtd
@ -43,16 +43,19 @@
 <!ENTITY event.menu.title   "イベント">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "新しいイベント">
+<!ENTITY event.new.event           "新しいイベント…">
 <!ENTITY event.new.event.accesskey "N">

-<!ENTITY event.new.todo     "新しい ToDo">
+<!ENTITY event.new.todo     "新しい ToDo…">
 <!ENTITY event.new.todo.accesskey "T">

-<!ENTITY calendar.new.server.label "新しいカレンダー">
+<!ENTITY calendar.new.server.label "新しいカレンダー…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "編集">
+<!ENTITY calendar.open.file.label "Open Calendar File…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "編集…">
 <!ENTITY event.edit.event.accesskey "E">

 <!ENTITY event.delete.event "選択イベントを削除)">
@ -61,7 +64,7 @@
 <!ENTITY event.delete.tasks "選択 ToDo を削除)">
 <!ENTITY event.delete.tasks.accesskey   "T">

-<!ENTITY event.mail.event   "選択イベントを送信">
+<!ENTITY event.mail.event   "選択イベントを送信…">
 <!ENTITY event.mail.event.accesskey "M">

 <!ENTITY calendar.print.label   "アクティブなカレンダーを印刷...">
--- a/calendar/resources/locale/lt-LT/calendar.dtd
+++ b/calendar/resources/locale/lt-LT/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Naujas kalendorius">
+<!ENTITY calendar.server.dialog.title.new           "Naujas kalendorius byla">
+<!ENTITY calendar.server.dialog.title.open          "Atverti kalendorius byla">
 <!ENTITY calendar.server.dialog.title.edit          "Kalendoriaus aprašo taisa">
 <!ENTITY calendar.server.dialog.name.label          "Vardas:">
 <!ENTITY calendar.server.dialog.publish.label       "Automatiškai publikuoti pakeitimus. (Tai reiškia, kad dirbant su nuotoliniais kalendoriais, prieš pridedant, taisant arba šalinant įvykį, pirma bus atsiųsta jo naujausia versija, po to atliktas Jūsų veiksmas su įvykiais ir tik tada kalendoriaus byla bus išsiųsta į žiniatinklį.)">
--- a/calendar/resources/locale/lt-LT/calendar.properties
+++ b/calendar/resources/locale/lt-LT/calendar.properties
@ -141,6 +141,7 @@ tooltipPercent  =% Baigtas:
 tooltipCompleted=Baigtas:

 #File commands and dialogs
+New=Naujas
 Open=Atverti
 Save=\u012era\u0161yti
 SaveAs=\u012era\u0161yti kitaip
--- a/calendar/resources/locale/lt-LT/menuOverlay.dtd
+++ b/calendar/resources/locale/lt-LT/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Įvykis">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "Naujas įvykis">
+<!ENTITY event.new.event           "Naujas įvykis…">
 <!ENTITY event.new.event.accesskey "N">

-<!ENTITY event.new.todo     "Naujas darbas">
+<!ENTITY event.new.todo     "Naujas darbas…">
 <!ENTITY event.new.todo.accesskey "d">

-<!ENTITY calendar.new.server.label "Naujas kalendorius">
+<!ENTITY calendar.new.server.label "Naujas kalendorius byla…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Taisyti įvykio aprašą">
+<!ENTITY calendar.open.file.label "Atverti kalendorius byla…">
+<!ENTITY calendar.open.file.accesskey "A">
+
+<!ENTITY event.edit.event   "Taisyti įvykio aprašą…">
 <!ENTITY event.edit.event.accesskey "T">

 <!ENTITY event.delete.event "Pašalinti pažymėtus įvykius">
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks "Pašalinti pažymėtus darbus">
 <!ENTITY event.delete.tasks.accesskey   "d">

-<!ENTITY event.mail.event   "Išsiųsti pažymėtus įvykius el. paštu">
+<!ENTITY event.mail.event   "Išsiųsti pažymėtus įvykius el. paštu…">
 <!ENTITY event.mail.event.accesskey "p">

 <!ENTITY calendar.print.label   "Spausdinti...">
@ -119,10 +122,10 @@
 <!ENTITY goNextCmd.accesskey            "P">

 <!ENTITY taskMenu.label                "Tasks">
-<!ENTITY taskMenu.accesskey            "T">
+<!ENTITY taskMenu.accesskey            "k">

 <!ENTITY toolsMenu.label                "Tools">
-<!ENTITY toolsMenu.accesskey            "o">
+<!ENTITY toolsMenu.accesskey            "T">

 <!ENTITY javaScriptConsoleCmd.label     "JavaScript Console">
 <!ENTITY javaScriptConsoleCmd.accesskey "S">
--- a/calendar/resources/locale/nl-NL/calendar.dtd
+++ b/calendar/resources/locale/nl-NL/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Nieuwe kalender toevoegen">
+<!ENTITY calendar.server.dialog.title.new           "Nieuwe kalenderbestand">
+<!ENTITY calendar.server.dialog.title.open          "Openen kalenderbestand">
 <!ENTITY calendar.server.dialog.title.edit          "Bewerk kalender">
 <!ENTITY calendar.server.dialog.name.label          "Naam">
 <!ENTITY calendar.server.dialog.publish.label       "Veranderingen automatisch publiceren? Voor kalenders op andere computers zal dit een nieuwe versie ophalen voordat u een gebeurtenis toevoegd, berwerkt of verwijdert. Vervolgens zal het uw handeling uitvoeren en het nieuwe bestand naar de server uploaden.">
--- a/calendar/resources/locale/nl-NL/calendar.properties
+++ b/calendar/resources/locale/nl-NL/calendar.properties
@ -141,6 +141,7 @@ tooltipPercent  =% voltooid:
 tooltipCompleted=Voltooid:

 #File commands and dialogs
+New=Nieuwe
 Open=Openen
 Save=Opslaan
 SaveAs=Opslaan als
--- a/calendar/resources/locale/nl-NL/menuOverlay.dtd
+++ b/calendar/resources/locale/nl-NL/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Gebeurtenis">
 <!ENTITY eventMenuCmd.accesskey     "@">

-<!ENTITY event.new.event           "Nieuwe gebeurtenis">
+<!ENTITY event.new.event           "Nieuwe gebeurtenis…">
 <!ENTITY event.new.event.accesskey "G">

-<!ENTITY event.new.todo     "Nieuwe taak">
+<!ENTITY event.new.todo     "Nieuwe taak…">
 <!ENTITY event.new.todo.accesskey "T">

-<!ENTITY calendar.new.server.label "Nieuwe kalender">
+<!ENTITY calendar.new.server.label "Nieuwe kalenderbestand…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Bewerken">
+<!ENTITY calendar.open.file.label "Openen kalenderbestand…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "Bewerken…">
 <!ENTITY event.edit.event.accesskey "E">

 <!ENTITY event.delete.event "Verwijder geselecteerd(e) gebeurtenis(sen)">
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks "Verwijder geselecteerd(e) ta(a)k(en)">
 <!ENTITY event.delete.tasks.accesskey   "T">

-<!ENTITY event.mail.event   "Mail geselecteerd(e) gebeurtenis(sen)">
+<!ENTITY event.mail.event   "Mail geselecteerd(e) gebeurtenis(sen)…">
 <!ENTITY event.mail.event.accesskey "M">

 <!ENTITY calendar.print.label   "Gebeurtenissen afdrukken...">
--- a/calendar/resources/locale/pl-PL/calendar.dtd
+++ b/calendar/resources/locale/pl-PL/calendar.dtd
@ -405,7 +405,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Dodaj nowy kalendarz">
+<!ENTITY calendar.server.dialog.title.new           "Nowy plik kalendarza">
+<!ENTITY calendar.server.dialog.title.open          "Otwórz plik kalendarza">
 <!ENTITY calendar.server.dialog.title.edit          "Edytuj kalendarz">
 <!ENTITY calendar.server.dialog.name.label          "Nazwa">
 <!ENTITY calendar.server.dialog.publish.label       "Czy publikować zmiany automatycznie? W przypadku zdalnych kalendarzy opcja ta najpierw pobierze nową wersję zanim dodasz, edytujesz lub usuniesz wydarzenie. Dopiero wtedy nowy kalendarz zostanie przesłany na serwer.">
--- a/calendar/resources/locale/pl-PL/calendar.properties
+++ b/calendar/resources/locale/pl-PL/calendar.properties
@ -131,6 +131,7 @@ tooltipLocation =Miejsce:
 tooltipDate     =Data:
 # event status: tentative, confirmed, cancelled
 tooltipStatus   =Status:
+New=Nowy
 # task/todo fields
 # start date time, due date time, task priority number, completed date time
 tooltipStart    =Początek:
--- a/calendar/resources/locale/pl-PL/menuOverlay.dtd
+++ b/calendar/resources/locale/pl-PL/menuOverlay.dtd
@ -38,16 +38,19 @@
 <!ENTITY event.menu.title   "Wydarzenie">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "Nowe wydarzenie">
+<!ENTITY event.new.event           "Nowe wydarzenie…">
 <!ENTITY event.new.event.accesskey "n">

-<!ENTITY event.new.todo     "Nowe zadanie">
+<!ENTITY event.new.todo     "Nowe zadanie…">
 <!ENTITY event.new.todo.accesskey "t">

-<!ENTITY calendar.new.server.label "Nowy kalendarz">
+<!ENTITY calendar.new.server.label "Nowy plik kalendarza…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Edytuj">
+<!ENTITY calendar.open.file.label "Otwórz plik kalendarza…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "Edytuj…">
 <!ENTITY event.edit.event.accesskey "e">

 <!ENTITY event.delete.event "Usuń zaznaczone wydarzenie(a)">
@ -56,7 +59,7 @@
 <!ENTITY event.delete.tasks "Usuń zaznaczone zadanie(a)">
 <!ENTITY event.delete.tasks.accesskey   "t">

-<!ENTITY event.mail.event   "Wyślij zaznaczone wydarzenie(a)">
+<!ENTITY event.mail.event   "Wyślij zaznaczone wydarzenie(a)…">
 <!ENTITY event.mail.event.accesskey "m">

 <!ENTITY calendar.print.label   "Drukuj aktywny kalendarz...">
@ -117,10 +120,10 @@
 <!ENTITY goNextCmd.accesskey            "n">

 <!ENTITY taskMenu.label                "Tasks">
-<!ENTITY taskMenu.accesskey            "T">
+<!ENTITY taskMenu.accesskey            "k">

 <!ENTITY toolsMenu.label                "Tools">
-<!ENTITY toolsMenu.accesskey            "o">
+<!ENTITY toolsMenu.accesskey            "T">

 <!ENTITY javaScriptConsoleCmd.label     "JavaScript Console">
 <!ENTITY javaScriptConsoleCmd.accesskey "S">
--- a/calendar/resources/locale/pt-BR/calendar.dtd
+++ b/calendar/resources/locale/pt-BR/calendar.dtd
@ -410,7 +410,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Acrescentar Novo Calend&#xE1;rio">
+<!ENTITY calendar.server.dialog.title.new           "Novo Arquivo de Calend&#xE1;rio">
+<!ENTITY calendar.server.dialog.title.open          "Abrir Arquivo de Calend&#xE1;rio">
 <!ENTITY calendar.server.dialog.title.edit          "Editar Calend&#xE1;rio">
 <!ENTITY calendar.server.dialog.name.label          "Nome">
 <!ENTITY calendar.server.dialog.publish.label       "Publicar mudan&#xE7;as automaticamente? Para calend&#xE1;rios remotos, isto ir&#xE1; baixar uma nova vers&#xE3;o antes de voc&#xEA; acrescentar, editar ou apagar um evento. S&#xF3; ent&#xE3;o a sua a&#xE7;&#xE3;o ser&#xE1; executada, e o novo arquivo ser&#xE1; enviado para o servidor.">
--- a/calendar/resources/locale/pt-BR/calendar.properties
+++ b/calendar/resources/locale/pt-BR/calendar.properties
@ -142,6 +142,7 @@ tooltipPercent  =% Completo:
 tooltipCompleted=Completo:

 #File commands and dialogs
+New=Novo
 Open=Abrir
 Save=Salvar
 SaveAs=Salvar Como
--- a/calendar/resources/locale/pt-BR/menuOverlay.dtd
+++ b/calendar/resources/locale/pt-BR/menuOverlay.dtd
@ -41,16 +41,19 @@
 <!ENTITY event.menu.title   "Evento">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "Novo Evento">
+<!ENTITY event.new.event           "Novo Evento…">
 <!ENTITY event.new.event.accesskey "n">

-<!ENTITY event.new.todo     "Nova Tarefa">
+<!ENTITY event.new.todo     "Nova Tarefa…">
 <!ENTITY event.new.todo.accesskey "t">

-<!ENTITY calendar.new.server.label "Novo Calend&#xE1;rio">
+<!ENTITY calendar.new.server.label "Novo Arquivo de Calend&#xE1;rio…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Editar">
+<!ENTITY calendar.open.file.label "Abrir Arquivo de Calend&#xE1;rio…">
+<!ENTITY calendar.open.file.accesskey "A">
+
+<!ENTITY event.edit.event   "Editar…">
 <!ENTITY event.edit.event.accesskey "e">

 <!ENTITY event.delete.event "Apagar Evento(s) Selecionado(s)">
@ -59,7 +62,7 @@
 <!ENTITY event.delete.tasks "Apagar Tarefa(s) Selecionada(s)">
 <!ENTITY event.delete.tasks.accesskey   "t">

-<!ENTITY event.mail.event   "Enviar Evento(s) Selecionado(s)">
+<!ENTITY event.mail.event   "Enviar Evento(s) Selecionado(s)…">
 <!ENTITY event.mail.event.accesskey "m">

 <!ENTITY calendar.print.label   "Imprimir Calend&#xE1;rios Ativos...">
--- a/calendar/resources/locale/sk-SK/calendar.dtd
+++ b/calendar/resources/locale/sk-SK/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Pridať nový kalendár">
+<!ENTITY calendar.server.dialog.title.new           "Nový kalendár súbor">
+<!ENTITY calendar.server.dialog.title.open          "Otvoriť kalendár súbor">
 <!ENTITY calendar.server.dialog.title.edit          "Upraviť kalendár">
 <!ENTITY calendar.server.dialog.name.label          "Názov">
 <!ENTITY calendar.server.dialog.publish.label       "Publikovať zmeny automaticky? Pre vzdialené kalendáre to znamená, že bude stiahnutá jeho aktuálna verzia pred pridaním, editáciou alebo odstránením udalosti. Až potom sa uskutoční nahranie nového súboru na server.">
--- a/calendar/resources/locale/sk-SK/calendar.properties
+++ b/calendar/resources/locale/sk-SK/calendar.properties
@ -132,6 +132,7 @@ tooltipLocation =Miesto:
 tooltipDate     =Dátum:
 # event status: tentative, confirmed, cancelled
 tooltipStatus   =Stav:
+New=Nov\u00FD
 # task/todo fields
 # start date time, due date time, task priority number, completed date time
 tooltipStart    =Začiatok:
--- a/calendar/resources/locale/sk-SK/menuOverlay.dtd
+++ b/calendar/resources/locale/sk-SK/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Udalosť">
 <!ENTITY eventMenuCmd.accesskey     "v">

-<!ENTITY event.new.event           "Nová udalosť">
+<!ENTITY event.new.event           "Nová udalosť…">
 <!ENTITY event.new.event.accesskey "u">

-<!ENTITY event.new.todo     "Nová úloha">
+<!ENTITY event.new.todo     "Nová úloha…">
 <!ENTITY event.new.todo.accesskey "a">

-<!ENTITY calendar.new.server.label "Nový Kalendár">
+<!ENTITY calendar.new.server.label "Nový Kalendár Súbor…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Upraviť">
+<!ENTITY calendar.open.file.label "Otvoriť Kalendár Súbor…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "Upraviť…">
 <!ENTITY event.edit.event.accesskey "r">

 <!ENTITY event.delete.event "Odstrániť vybranú udalosť(i)">
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks "Odstrániť vybranú úlohu(y)">
 <!ENTITY event.delete.tasks.accesskey   "b">

-<!ENTITY event.mail.event   "Odoslať vybranú udalosť(i)">
+<!ENTITY event.mail.event   "Odoslať vybranú udalosť(i)…">
 <!ENTITY event.mail.event.accesskey "O">

 <!ENTITY calendar.print.label   "Tlačiť aktívny kalendár...">
--- a/calendar/resources/locale/sl-SI/calendar.dtd
+++ b/calendar/resources/locale/sl-SI/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Dialog strežnikov koledarja-->
-<!ENTITY calendar.server.dialog.title.new           "Vnos novega koledarja">
+<!ENTITY calendar.server.dialog.title.new           "Novega Datoteka Koledarja">
+<!ENTITY calendar.server.dialog.title.open          "Odpri Datoteka Koledarja">
 <!ENTITY calendar.server.dialog.title.edit          "Uredi koledar">
 <!ENTITY calendar.server.dialog.name.label          "Ime">
 <!ENTITY calendar.server.dialog.publish.label       "Samodejna objava sprememb? Pri oddaljenih koledarjih se bo s strežnika najprej prenesla najnovejša različica, preden dodate, uredite ali izbrišete kak dogodek. Nato se bo izvedla vaša želena akcija in spremenjena datoteka se bo naložila nazaj na strežnik.">
--- a/calendar/resources/locale/sl-SI/calendar.properties
+++ b/calendar/resources/locale/sl-SI/calendar.properties
@ -141,6 +141,7 @@ tooltipPercent  =% dokončan:
 tooltipCompleted=Dokončan:

 #Ukazi in dialogi za datoteke
+New=Nov
 Open=Odpri
 Save=Shrani
 SaveAs=Shrani kot...
--- a/calendar/resources/locale/sl-SI/menuOverlay.dtd
+++ b/calendar/resources/locale/sl-SI/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Dogodek">
 <!ENTITY eventMenuCmd.accesskey     "k">

-<!ENTITY event.new.event           "Nov dogodek">
+<!ENTITY event.new.event           "Nov dogodek…">
 <!ENTITY event.new.event.accesskey "g">

-<!ENTITY event.new.todo     "Nov opravek">
+<!ENTITY event.new.todo     "Nov opravek…">
 <!ENTITY event.new.todo.accesskey "o">

-<!ENTITY calendar.new.server.label "Nov koledar">
+<!ENTITY calendar.new.server.label "Nov Datoteka Koledar…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Uredi">
+<!ENTITY calendar.open.file.label "Odpri Datoteka Koledar…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "Uredi…">
 <!ENTITY event.edit.event.accesskey "d">

 <!ENTITY event.delete.event "Izbriši izbrane dogodke">
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks "Izbriši izbrane opravke">
 <!ENTITY event.delete.tasks.accesskey   "v">

-<!ENTITY event.mail.event   "Pošlji izbrane dogodke po e-pošti">
+<!ENTITY event.mail.event   "Pošlji izbrane dogodke po e-pošti…">
 <!ENTITY event.mail.event.accesskey "t">

 <!ENTITY calendar.print.label   "Natisni aktivne koledarje ...">
--- a/calendar/resources/locale/sv-SE/calendar.dtd
+++ b/calendar/resources/locale/sv-SE/calendar.dtd
@ -410,7 +410,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Lägg Till Ny Kalender">
+<!ENTITY calendar.server.dialog.title.new           "Ny Kalender Fil">
+<!ENTITY calendar.server.dialog.title.open          "Öppna Kalender Fil">
 <!ENTITY calendar.server.dialog.title.edit          "Redigera Kalender">
 <!ENTITY calendar.server.dialog.name.label          "Namn">
 <!ENTITY calendar.server.dialog.publish.label       "Publicera ändringar automatiskt? För länkade kalendrar betyder detta att en ny version kommer att laddas ner innan du skapar, redigerar eller raderar en händelse. Den kommer sedan att utföra dina förändringar och ladda upp den nya filen till servern.">
--- a/calendar/resources/locale/sv-SE/calendar.properties
+++ b/calendar/resources/locale/sv-SE/calendar.properties
@ -142,6 +142,7 @@ tooltipPercent  =% Färdigt:
 tooltipCompleted=Färdig:

 #File commands and dialogs
+New=Ny
 Open=Öppna
 Save=Spara
 SaveAs=Spara Som
--- a/calendar/resources/locale/sv-SE/menuOverlay.dtd
+++ b/calendar/resources/locale/sv-SE/menuOverlay.dtd
@ -41,16 +41,19 @@
 <!ENTITY event.menu.title   "Händelse">
 <!ENTITY eventMenuCmd.accesskey     "h">

-<!ENTITY event.new.event           "Ny Händelse">
+<!ENTITY event.new.event           "Ny Händelse…">
 <!ENTITY event.new.event.accesskey "n">

-<!ENTITY event.new.todo     "Ny Uppgift">
+<!ENTITY event.new.todo     "Ny Uppgift…">
 <!ENTITY event.new.todo.accesskey "u">

-<!ENTITY calendar.new.server.label "Ny Kalender">
+<!ENTITY calendar.new.server.label "Ny Kalender Fil…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Redigera">
+<!ENTITY calendar.open.file.label "Oppna Kalender Fil…">
+<!ENTITY calendar.open.file.accesskey "O">
+
+<!ENTITY event.edit.event   "Redigera…">
 <!ENTITY event.edit.event.accesskey "e">

 <!ENTITY event.delete.event "Radera Vald(a) Händelse(r)">
@ -59,7 +62,7 @@
 <!ENTITY event.delete.tasks "Radera Vald(a) Uppgifte(r)">
 <!ENTITY event.delete.tasks.accesskey   "r">

-<!ENTITY event.mail.event   "Maila Vald(a) Händelse(r)">
+<!ENTITY event.mail.event   "Maila Vald(a) Händelse(r)…">
 <!ENTITY event.mail.event.accesskey "m">

 <!ENTITY calendar.print.label   "Skriv Ut Aktiva Kalendrar...">
@ -120,10 +123,10 @@
 <!ENTITY goNextCmd.accesskey            "ä">

 <!ENTITY taskMenu.label                "Tasks">
-<!ENTITY taskMenu.accesskey            "T">
+<!ENTITY taskMenu.accesskey            "k">

 <!ENTITY toolsMenu.label                "Tools">
-<!ENTITY toolsMenu.accesskey            "o">
+<!ENTITY toolsMenu.accesskey            "T">

 <!ENTITY javaScriptConsoleCmd.label     "JavaScript Console">
 <!ENTITY javaScriptConsoleCmd.accesskey "S">
--- a/calendar/resources/locale/wen-DE/calendar.dtd
+++ b/calendar/resources/locale/wen-DE/calendar.dtd
@ -409,7 +409,8 @@


 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "Nowu protyku přidać">
+<!ENTITY calendar.server.dialog.title.new           "Nowu protyku dataju">
+<!ENTITY calendar.server.dialog.title.open          "Wočinić protyku dataju">
 <!ENTITY calendar.server.dialog.title.edit          "Protyku wobdźěłać">
 <!ENTITY calendar.server.dialog.name.label          "Mjeno">
 <!ENTITY calendar.server.dialog.publish.label       "Změny awtomatisce publikować? Za nazdalne protyki budźe to nowu wersiju sćahnyć, prjedy hač podawk přidaće, wobdźěłaće abo wotstroniće. Budźe so potom waša akcija wuwjesć a nowa dataja na server pósłać.">
--- a/calendar/resources/locale/wen-DE/calendar.properties
+++ b/calendar/resources/locale/wen-DE/calendar.properties
@ -132,6 +132,7 @@ tooltipLocation =M\u011bstno:
 tooltipDate     =Datum:
 # event status: tentative, confirmed, cancelled
 tooltipStatus   =Status:
+New=Nowy
 # task/todo fields
 # start date time, due date time, task priority number, completed date time
 tooltipStart    =Start:
--- a/calendar/resources/locale/wen-DE/menuOverlay.dtd
+++ b/calendar/resources/locale/wen-DE/menuOverlay.dtd
@ -40,16 +40,19 @@
 <!ENTITY event.menu.title   "Podawk" >
 <!ENTITY eventMenuCmd.accesskey     "P" >

-<!ENTITY event.new.event           "Nowy podawk" >
+<!ENTITY event.new.event           "Nowy podawk…" >
 <!ENTITY event.new.event.accesskey "o" >

-<!ENTITY event.new.todo     "Nowy nadawk" >
+<!ENTITY event.new.todo     "Nowy nadawk…" >
 <!ENTITY event.new.todo.accesskey "a" >

-<!ENTITY calendar.new.server.label "Nowa protyka">
+<!ENTITY calendar.new.server.label "Nowa protyka dataju…">
 <!ENTITY calendar.new.server.accesskey "l">

-<!ENTITY event.edit.event   "Wobdźěłać" >
+<!ENTITY calendar.open.file.label "Wočinić protyka dataju…">
+<!ENTITY calendar.open.file.accesskey "o">
+
+<!ENTITY event.edit.event   "Wobdźěłać…" >
 <!ENTITY event.edit.event.accesskey "b" >

 <!ENTITY event.delete.event "Wotstronić" >
@ -58,7 +61,7 @@
 <!ENTITY event.delete.tasks "Wubrany(e) nadawk(i) wotstronić">
 <!ENTITY event.delete.tasks.accesskey   "t">

-<!ENTITY event.mail.event   "Wubrany(e) podawk(i) emailować" >
+<!ENTITY event.mail.event   "Wubrany(e) podawk(i) emailować…" >
 <!ENTITY event.mail.event.accesskey "m" >

 <!ENTITY calendar.print.label   "Podawki ćišćeć..." >
@ -119,10 +122,10 @@
 <!ENTITY goNextCmd.accesskey            "h" >

 <!ENTITY taskMenu.label                "Tasks">
-<!ENTITY taskMenu.accesskey            "T">
+<!ENTITY taskMenu.accesskey            "k">

 <!ENTITY toolsMenu.label                "Tools">
-<!ENTITY toolsMenu.accesskey            "o">
+<!ENTITY toolsMenu.accesskey            "T">

 <!ENTITY javaScriptConsoleCmd.label     "JavaScript Console">
 <!ENTITY javaScriptConsoleCmd.accesskey "S">
--- a/calendar/sunbird/base/content/calendar.xul
+++ b/calendar/sunbird/base/content/calendar.xul
@ -100,7 +100,8 @@
  <command id="modify_todo_command" oncommand="modifyToDoCommand( event )"/>
  <command id="delete_todo_command" oncommand="deleteToDoCommand()" disabled="true"/>

-  <command id="new_local_calendar_command" oncommand="gCalendarWindow.calendarManager.launchAddCalendarDialog()"/>
+  <command id="new_local_calendar_command" oncommand="gCalendarWindow.calendarManager.launchNewCalendarFileDialog()"/>
+  <command id="open_local_calendar_command" oncommand="gCalendarWindow.calendarManager.launchOpenCalendarFileDialog()"/>
  <command id="edit_local_calendar_command" oncommand="gCalendarWindow.calendarManager.launchEditCalendarDialog()"/>
  <command id="new_server_command" oncommand="gCalendarWindow.calendarManager.launchAddRemoteCalendarDialog()"/>
  <command id="edit_server_command" oncommand="gCalendarWindow.calendarManager.launchEditRemoteCalendarDialog()"/>
--- a/calendar/sunbird/base/content/menuOverlay.xul
+++ b/calendar/sunbird/base/content/menuOverlay.xul
@ -95,6 +95,8 @@
           label="&fileMenu.label;"
           accesskey="&fileMenu.accesskey;">
       <menupopup id="menu_FilePopup">
+
+         <!-- create new event or task (top of 1st menu, for new users) -->
         <menuitem id="calendar-new-event-menu"
                   key="new_event_key"
                   label="&event.new.event;"
@ -105,32 +107,65 @@
                   label="&event.new.todo;"
                   accesskey="&event.new.todo.accesskey;"
                   observes="new_todo_command"/>
-         <menuitem id="calendar-new-calendar-menu"
-                   key="new_calendar_key"
-                   label="&calendar.new.server.label;"
-                   accesskey="&calendar.new.server.accesskey;"
-                   observes="new_local_calendar_command"/>
         <menuitem id="unifinder-modify-menu"
                   key="modify_event_key"
                   label="&event.edit.event;"
                   accesskey="&event.edit.event.accesskey;"
                   observes="modify_command"/>
-         <menuitem id="calendar-close"
-                   key="key_close"
-                   label="&calendar.menu.options.close;"
-                   accesskey="&calendar.menu.options.close.accesskey;"
-                   observes="close_calendar_command"/>
         <menuseparator/>
+
+         <!-- files -->
+         <menuitem id="calendar-new-calendar-menu"
+                   key="new_calendar_key"
+                   label="&calendar.new.server.label;"
+                   accesskey="&calendar.new.server.accesskey;"
+                   observes="new_local_calendar_command"/>
+         <menuitem id="calendar-open-calendar-menu"
+                   key="open_calendar_key"
+                   label="&calendar.open.file.label;"
+                   accesskey="&calendar.open.file.accesskey;"
+                   observes="open_local_calendar_command"/>
+         <menuitem id="calendar-addserver-menu"
+                   label="&calendar.subscribe.label;"
+                   accesskey="&calendar.subscribe.accesskey;"
+                   observes="new_server_command"/>
+         <menuseparator/>
+
+         <!-- import: pulling data into existing files -->
+         <menuitem id="calendar-import-menu"
+                   key="import_key"
+                   label="&calendar.import.label;"
+                   accesskey="&calendar.import.accesskey;"
+                   observes="import_command"/>
+         <menuseparator/>
+
+         <!-- export: getting data out of existing files -->
+         <menuitem id="calendar-export-menu"
+                   key="export_key"
+                   label="&calendar.export.label;"
+                   accesskey="&calendar.export.accesskey;"
+                   observes="export_command"/>
         <menuitem id="calendar-mail-event"
                   key="send_event_key"
                   label="&event.mail.event;"
                   accesskey="&event.mail.event.accesskey;"
                   observes="send_event_command"/>
-         <menuseparator id="calendar-print-sep"/>
+         <menuitem id="calendar-publish-menu"
+                   label="&calendar.publish.label;"
+                   accesskey="&calendar.publish.accesskey;"
+                   observes="publish_events_command"/>
         <menuitem id="calendar-print-menu"
                   label="&calendar.print.label;"
                   accesskey="&calendar.print.accesskey;"
                   observes="print_command"/>
+         <menuseparator id="calendar-print-sep"/>
+
+         <!-- window/Application -->
+         <menuitem id="calendar-close"
+                   key="key_close"
+                   label="&calendar.menu.options.close;"
+                   accesskey="&calendar.menu.options.close.accesskey;"
+                   observes="close_calendar_command"/>
       </menupopup>
     </menu>

@ -276,33 +311,15 @@
       </menupopup>
     </menu>
   
-     <menu id="tasksMenu"
+     <menu id="menu_Tools"
           label="&toolsMenu.label;"
           accesskey="&toolsMenu.accesskey;">
-       <menupopup id="taskPopup">
+       <menupopup id="toolsPopup">
         <menuitem id="calendar-wizard-menu"
                   key="wizard_key"
                   label="&calendar.wizard.label;"
                   accesskey="&calendar.wizard.accesskey;"
                   observes="wizard_command"/>
-         <menuitem id="calendar-import-menu"
-                   key="import_key"
-                   label="&calendar.import.label;"
-                   accesskey="&calendar.import.accesskey;"
-                   observes="import_command"/>
-         <menuitem id="calendar-export-menu"
-                   key="export_key"
-                   label="&calendar.export.label;"
-                   accesskey="&calendar.export.accesskey;"
-                   observes="export_command"/>
-         <menuitem id="calendar-addserver-menu"
-                   label="&calendar.subscribe.label;"
-                   accesskey="&calendar.subscribe.accesskey;"
-                   observes="new_server_command"/>
-         <menuitem id="calendar-publish-menu"
-                   label="&calendar.publish.label;"
-                   accesskey="&calendar.publish.accesskey;"
-                   observes="publish_events_command"/>
         <menuseparator/>
             <menuitem id="javascriptConsole"
                       label="&javaScriptConsoleCmd.label;"