From 83dfb0b3bf2b16f9c323f8f6c612fd6eb2c93686 Mon Sep 17 00:00:00 2001
From: "dmose%mozilla.org" <dmose%mozilla.org>
Date: Tue, 31 Jan 2006 00:06:29 +0000
Subject: [PATCH] Clean up New submenu in Lightning (bug 324669); patch by
 Stefan Sitter <ssitter@googlemail.com>, r=<dmose@mozilla.org

---
 .../content/messenger-overlay-toolbar.xul     |  9 ++-
 calendar/lightning/locale/lightning.dtd       | 70 -------------------
 2 files changed, 7 insertions(+), 72 deletions(-)

diff --git a/calendar/lightning/content/messenger-overlay-toolbar.xul b/calendar/lightning/content/messenger-overlay-toolbar.xul
index afde3cec232..f4b3ce7780f 100644
--- a/calendar/lightning/content/messenger-overlay-toolbar.xul
+++ b/calendar/lightning/content/messenger-overlay-toolbar.xul
@@ -51,12 +51,17 @@
 
   <script type="application/x-javascript" 
           src="chrome://calendar/content/calendar-item-editing.js"/>
+  <script type="application/x-javascript" 
+          src="chrome://lightning/content/calendar-management.js"/>
 
   <menupopup id="menu_NewPopup">
-    <menuitem id="ltnNewEvent" label="&event.title.new;" 
+    <menuseparator />
+    <menuitem id="ltnNewEvent" label="&lightning.menupopup.new.event.label;" 
               oncommand="createEventWithDialog(ltnSelectedCalendar());"/>
-    <menuitem id="ltnNewTask" label="&todo.title.new;" 
+    <menuitem id="ltnNewTask" label="&lightning.menupopup.new.task.label;" 
               oncommand="createTodoWithDialog(ltnSelectedCalendar());"/>
+    <menuitem id="ltnNewCalendar" label="&lightning.menupopup.new.calendar.label;" 
+              oncommand="ltnNewCalendar();"/>
   </menupopup>
 
   <menubar id="mail-menubar">
diff --git a/calendar/lightning/locale/lightning.dtd b/calendar/lightning/locale/lightning.dtd
index 0dfc4c7139a..e69de29bb2d 100644
--- a/calendar/lightning/locale/lightning.dtd
+++ b/calendar/lightning/locale/lightning.dtd
@@ -1,70 +0,0 @@
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is calendar views.
-   -
-   - The Initial Developer of the Original Code is Oracle Corporation
-   - Portions created by the Initial Developer are Copyright (C) 2005
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Mike Shaver       <shaver@mozilla.org>
-   -   Simon Paquet      <bugzilla@babylonsounds.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
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the GPL or the LGPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK *****
--->
-   
-<!-- Tools menu -->
-<!ENTITY lightning.taskLabel "Lightning">
-
-<!-- Agenda Tree View -->
-<!ENTITY agenda.treeview.label           "View:">
-<!ENTITY agenda.treeview.menu.label      "View">
-<!ENTITY agenda.treeview.all.label       "All">
-<!ENTITY agenda.treeview.events.label    "Events">
-<!ENTITY agenda.treeview.tasks.label     "Tasks">
-<!ENTITY agenda.treeview.reminders.label "Reminders">
-<!ENTITY agenda.treeview.customize.label "Customize...">
-<!ENTITY agenda.treeview.item.label      "Item">
-<!ENTITY agenda.treeview.description     "Customize your views">
-
-<!-- Messenger Sidebar -->
-<!ENTITY lightning.sidebar.agenda.label      "Agenda">
-<!ENTITY lightning.sidebar.todo.label        "Todo">
-<!ENTITY lightning.sidebar.calendars.label   "Calendars">
-<!ENTITY lightning.sidebar.new.label         "New...">
-<!ENTITY lightning.sidebar.edit.label        "Edit...">
-<!ENTITY lightning.sidebar.delete.label      "Delete">
-<!ENTITY lightning.calendar.label            "Calendar">
-
-<!-- Messenger Toolbar -->
-<!ENTITY lightning.toolbar.dayview.label     "Day View">
-<!ENTITY lightning.toolbar.weekview.label    "Week View">
-<!ENTITY lightning.toolbar.monthview.label   "Month View">
-
-<!--Views' context menu-->
-<!ENTITY lightning.context.deleteitem.accesskey  "D">
-<!-- This access key is in the same menu as 'Go to Next' which gets the 'N'-->
-<!ENTITY lightning.context.newevent.accesskey  "E">