From 0671fc7be0586d46679d8fc4987ada94b2bd1c6d 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

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

diff --git a/calendar/lightning/content/messenger-overlay-toolbar.xul b/calendar/lightning/content/messenger-overlay-toolbar.xul
index afde3cec232c..f4b3ce7780fd 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 0dfc4c7139ab..965d3cd75d05 100644
--- a/calendar/lightning/locale/lightning.dtd
+++ b/calendar/lightning/locale/lightning.dtd
@@ -39,6 +39,11 @@
 <!-- Tools menu -->
 <!ENTITY lightning.taskLabel "Lightning">
 
+<!-- New menu popup in File menu -->
+<!ENTITY lightning.menupopup.new.event.label    "Event...">
+<!ENTITY lightning.menupopup.new.task.label     "Task...">
+<!ENTITY lightning.menupopup.new.calendar.label "Calendar...">
+
 <!-- Agenda Tree View -->
 <!ENTITY agenda.treeview.label           "View:">
 <!ENTITY agenda.treeview.menu.label      "View">