From bd89da6c14d5f093fd4a04036a7b26458ece8b6d Mon Sep 17 00:00:00 2001
From: "mikep%oeone.com" <mikep%oeone.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 30 May 2002 13:31:05 +0000
Subject: [PATCH] Fixing bug 148071 and updating the date / time stamp.

git-svn-id: svn://10.0.0.236/trunk@122319 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/calendar/createXPI.sh                      |  2 +-
 mozilla/calendar/resources/content/about.html      |  2 +-
 .../resources/content/calendarMenuOverlay.xul      | 14 +++++++-------
 mozilla/calendar/resources/content/menuOverlay.xul | 14 +++++++-------
 .../resources/locale/en-US/calendarMenuOverlay.dtd |  9 +++++++++
 .../resources/locale/en-US/menuOverlay.dtd         |  9 +++++++++
 6 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/mozilla/calendar/createXPI.sh b/mozilla/calendar/createXPI.sh
index cb028288db6..291cbb29296 100755
--- a/mozilla/calendar/createXPI.sh
+++ b/mozilla/calendar/createXPI.sh
@@ -1 +1 @@
-./createBuildId.pl resources/content/calendar.js; cd linux; zip -r calendar_linux.xpi components/ install.js resources/; mv calendar_linux.xpi ../; cd ../windows; zip -r calendar_windows.xpi components/ bin/ install.js resources/; mv calendar_windows.xpi ../; cd ..
+./createBuildId.pl resources/content/about.html; cd linux; zip -r calendar_linux.xpi components/ install.js resources/; mv calendar_linux.xpi ../; cd ../windows; zip -r calendar_windows.xpi components/ bin/ install.js resources/; mv calendar_windows.xpi ../; cd ..
diff --git a/mozilla/calendar/resources/content/about.html b/mozilla/calendar/resources/content/about.html
index 315189f09e1..10500d75a2b 100644
--- a/mozilla/calendar/resources/content/about.html
+++ b/mozilla/calendar/resources/content/about.html
@@ -78,7 +78,7 @@ h1 {
 
 <td id="mozver">
 <h1>
-<a id="mozlink" href="http://www.mozilla.org/projects/calendar/">Mozilla Calendar XX_DATE_XX</a>
+<a id="mozlink" href="http://www.mozilla.org/projects/calendar/">Mozilla Calendar 2002052813-cal</a>
 </h1>
 <script type="application/x-javascript">
   // using try..catch to handle empty useragents and other cases where the regex fails to apply
diff --git a/mozilla/calendar/resources/content/calendarMenuOverlay.xul b/mozilla/calendar/resources/content/calendarMenuOverlay.xul
index 9e53f6b77db..7c59bcf9dc0 100644
--- a/mozilla/calendar/resources/content/calendarMenuOverlay.xul
+++ b/mozilla/calendar/resources/content/calendarMenuOverlay.xul
@@ -98,21 +98,21 @@
   <menubar id="main-menubar" class="chromeclass-menubar">
    <menu id="menu_File">
       <menupopup id="menu_FilePopup">
-         <menuitem id="calendar-import-menu" label="Import ..." oncommand="loadEventsFromFile()"/>
-         <menuitem id="calendar-export-menu" label="Export ..." oncommand="saveEventsToFile()"/>
+         <menuitem id="calendar-import-menu" label="&calendar.import.label;" oncommand="loadEventsFromFile()"/>
+         <menuitem id="calendar-export-menu" label="&calendar.export.label;" oncommand="saveEventsToFile()"/>
          <menuseparator/>
-         <menuitem id="calendar-about-menu-item" label="About Calendar" oncommand="alertCalendarVersion()"/>
+         <menuitem id="calendar-about-menu-item" label="&calendar.about.label;" oncommand="alertCalendarVersion()"/>
       </menupopup>
    </menu>
 
    <menu id="menu_Edit">
       <menupopup id="mppEdit">
-         <menuitem id="calendar-copy-menu" observes="copy_command" label="Copy" accesskey="c" oncommand="copyToClipboard()"/>
-         <menuitem id="calendar-paste-menu" label="Paste" accesskey="p" oncommand="pasteFromClipboard()"/>
+         <menuitem id="calendar-copy-menu" observes="copy_command" label="&calendar.copy.label;" accesskey="c" oncommand="copyToClipboard()"/>
+         <menuitem id="calendar-paste-menu" label="&calendar.paste.label;" accesskey="p" oncommand="pasteFromClipboard()"/>
          <menuseparator/>
-         <menuitem id="calendar-selectall-menu" label="Select All" accesskey="a" oncommand="selectAllEvents()"/>
+         <menuitem id="calendar-selectall-menu" label="&calendar.selectall.label;" accesskey="a" oncommand="selectAllEvents()"/>
          <menuseparator/>
-         <menuitem id="calendar-edit-preferences" label="Preferences..." oncommand="launchPreferences()"/>
+         <menuitem id="calendar-edit-preferences" label="&calendar.preferences.label;" oncommand="launchPreferences()"/>
       </menupopup>
    </menu>
    
diff --git a/mozilla/calendar/resources/content/menuOverlay.xul b/mozilla/calendar/resources/content/menuOverlay.xul
index 9e53f6b77db..7c59bcf9dc0 100644
--- a/mozilla/calendar/resources/content/menuOverlay.xul
+++ b/mozilla/calendar/resources/content/menuOverlay.xul
@@ -98,21 +98,21 @@
   <menubar id="main-menubar" class="chromeclass-menubar">
    <menu id="menu_File">
       <menupopup id="menu_FilePopup">
-         <menuitem id="calendar-import-menu" label="Import ..." oncommand="loadEventsFromFile()"/>
-         <menuitem id="calendar-export-menu" label="Export ..." oncommand="saveEventsToFile()"/>
+         <menuitem id="calendar-import-menu" label="&calendar.import.label;" oncommand="loadEventsFromFile()"/>
+         <menuitem id="calendar-export-menu" label="&calendar.export.label;" oncommand="saveEventsToFile()"/>
          <menuseparator/>
-         <menuitem id="calendar-about-menu-item" label="About Calendar" oncommand="alertCalendarVersion()"/>
+         <menuitem id="calendar-about-menu-item" label="&calendar.about.label;" oncommand="alertCalendarVersion()"/>
       </menupopup>
    </menu>
 
    <menu id="menu_Edit">
       <menupopup id="mppEdit">
-         <menuitem id="calendar-copy-menu" observes="copy_command" label="Copy" accesskey="c" oncommand="copyToClipboard()"/>
-         <menuitem id="calendar-paste-menu" label="Paste" accesskey="p" oncommand="pasteFromClipboard()"/>
+         <menuitem id="calendar-copy-menu" observes="copy_command" label="&calendar.copy.label;" accesskey="c" oncommand="copyToClipboard()"/>
+         <menuitem id="calendar-paste-menu" label="&calendar.paste.label;" accesskey="p" oncommand="pasteFromClipboard()"/>
          <menuseparator/>
-         <menuitem id="calendar-selectall-menu" label="Select All" accesskey="a" oncommand="selectAllEvents()"/>
+         <menuitem id="calendar-selectall-menu" label="&calendar.selectall.label;" accesskey="a" oncommand="selectAllEvents()"/>
          <menuseparator/>
-         <menuitem id="calendar-edit-preferences" label="Preferences..." oncommand="launchPreferences()"/>
+         <menuitem id="calendar-edit-preferences" label="&calendar.preferences.label;" oncommand="launchPreferences()"/>
       </menupopup>
    </menu>
    
diff --git a/mozilla/calendar/resources/locale/en-US/calendarMenuOverlay.dtd b/mozilla/calendar/resources/locale/en-US/calendarMenuOverlay.dtd
index 7755b91c9ce..f8629f8a46a 100644
--- a/mozilla/calendar/resources/locale/en-US/calendarMenuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/en-US/calendarMenuOverlay.dtd
@@ -44,3 +44,12 @@
 <!ENTITY event.edit.event	"Edit Event">
 <!ENTITY event.delete.event	"Delete Event">
 <!ENTITY event.mail.event	"Mail Calendar Event">
+
+<!ENTITY calendar.import.label	"Import...">
+<!ENTITY calendar.export.label	"Export...">
+<!ENTITY calendar.about.label	"About Calendar">
+
+<!ENTITY calendar.copy.label	"Copy">
+<!ENTITY calendar.paste.label	"Paste">
+<!ENTITY calendar.selectall.label	"Select All">
+<!ENTITY calendar.preferences.label	"Preferences...">
diff --git a/mozilla/calendar/resources/locale/en-US/menuOverlay.dtd b/mozilla/calendar/resources/locale/en-US/menuOverlay.dtd
index 7755b91c9ce..f8629f8a46a 100644
--- a/mozilla/calendar/resources/locale/en-US/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/en-US/menuOverlay.dtd
@@ -44,3 +44,12 @@
 <!ENTITY event.edit.event	"Edit Event">
 <!ENTITY event.delete.event	"Delete Event">
 <!ENTITY event.mail.event	"Mail Calendar Event">
+
+<!ENTITY calendar.import.label	"Import...">
+<!ENTITY calendar.export.label	"Export...">
+<!ENTITY calendar.about.label	"About Calendar">
+
+<!ENTITY calendar.copy.label	"Copy">
+<!ENTITY calendar.paste.label	"Paste">
+<!ENTITY calendar.selectall.label	"Select All">
+<!ENTITY calendar.preferences.label	"Preferences...">