diff --git a/mozilla/calendar/resources/content/about.html b/mozilla/calendar/resources/content/about.html
index bf9df1740a8..641f49dd649 100644
--- a/mozilla/calendar/resources/content/about.html
+++ b/mozilla/calendar/resources/content/about.html
@@ -79,7 +79,7 @@ h1 {
 
 <td id="mozver">
 <h1>
-<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2003021210-cal</a>
+<a id="mozlink" href="http://www.mozilla.org/projects/calendar/" target="_new">Mozilla Calendar 2003021311-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/eventDialog.xul b/mozilla/calendar/resources/content/eventDialog.xul
index 0ee3a601780..5d6b9126679 100644
--- a/mozilla/calendar/resources/content/eventDialog.xul
+++ b/mozilla/calendar/resources/content/eventDialog.xul
@@ -250,7 +250,7 @@
                      <!-- Calendar Status -->
                      <row align="center">
                         <hbox class="field-label-box-class" pack="end">
-                            <label value="Event Status"/>
+                            <label value="&newevent.status.longlabel;"/>
                         </hbox>
                         <menulist id="status-field" label="&newevent.status.label;">
                             <menupopup id="status-menulist-menupopup">
diff --git a/mozilla/calendar/resources/content/localCalDialog.xul b/mozilla/calendar/resources/content/localCalDialog.xul
index 71fb0a33c4b..2c2d5e494a3 100644
--- a/mozilla/calendar/resources/content/localCalDialog.xul
+++ b/mozilla/calendar/resources/content/localCalDialog.xul
@@ -51,16 +51,16 @@
 
 
 <dialog
-   id="calendar-serverwindow"
+   id="calendar-local-serverwindow"
    title="&calendar.server.dialog.title.new;"
    buttons="accept,cancel"
    ondialogaccept="return onOKCommand();"
    ondialogcancel="return true;"
    onload="loadCalendarServerDialog()"
-   persist="screenX screenY"
+   persist="screenX screenY width height"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    width="600"
-	height="270"
+	height="470"
 	xmlns:nc="http://home.netscape.com/NC-rdf#">
     
    
diff --git a/mozilla/calendar/resources/content/pref/calendarPref.xul b/mozilla/calendar/resources/content/pref/calendarPref.xul
index 5ad1928be00..1c92c833ff1 100644
--- a/mozilla/calendar/resources/content/pref/calendarPref.xul
+++ b/mozilla/calendar/resources/content/pref/calendarPref.xul
@@ -100,13 +100,13 @@
      <hbox align="center">
          <description>&pref.defaultlength.label;</description>
          <textbox flex="1" id="defaultlength" preftype="int" prefstring="calendar.event.defaultlength" maxlength="3" size="3"/>
-         <label value="Minutes"/>
+         <label value="&pref.minutes.label;"/>
       </hbox>
       
       <hbox align="center">
          <description>&pref.defaultsnoozelength.label;</description>
          <textbox flex="1" id="defaultsnoozelength" preftype="int" prefstring="calendar.alarms.defaultsnoozelength" maxlength="3" size="3"/>
-         <label value="Minutes"/>
+         <label value="&pref.minutes.label;"/>
       </hbox>
       
       <checkbox id="reloadonlaunch" preftype="bool" prefstring="calendar.servers.reloadonlaunch" label="&pref.reloadonlaunch;" />
diff --git a/mozilla/calendar/resources/content/serverDialog.xul b/mozilla/calendar/resources/content/serverDialog.xul
index 78822ea53fb..75a11c62228 100644
--- a/mozilla/calendar/resources/content/serverDialog.xul
+++ b/mozilla/calendar/resources/content/serverDialog.xul
@@ -57,7 +57,7 @@
    ondialogaccept="return onOKCommand();"
    ondialogcancel="return true;"
    onload="loadCalendarServerDialog()"
-   persist="screenX screenY"
+   persist="screenX screenY width height"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    width="600"
 	height="270"
diff --git a/mozilla/calendar/resources/locale/en-US/calendar.dtd b/mozilla/calendar/resources/locale/en-US/calendar.dtd
index 2e94847c9ff..b1e3e1171e3 100644
--- a/mozilla/calendar/resources/locale/en-US/calendar.dtd
+++ b/mozilla/calendar/resources/locale/en-US/calendar.dtd
@@ -99,6 +99,7 @@
 <!ENTITY newevent.contacts.tab.label "Contacts" >
 <!ENTITY newevent.files.tab.label "Files" >
 <!ENTITY newevent.status.label "Status" >
+<!ENTITY newevent.status.longlabel "Event Status">
 <!ENTITY newevent.status.needsaction.label "Needs Action" >
 <!ENTITY newevent.status.inprogress.label  "In Progress" >
 <!ENTITY newevent.status.completed.label   "Completed" >
diff --git a/mozilla/calendar/resources/locale/en-US/prefs.dtd b/mozilla/calendar/resources/locale/en-US/prefs.dtd
index c5e1cc8f36a..bf1881c91fb 100644
--- a/mozilla/calendar/resources/locale/en-US/prefs.dtd
+++ b/mozilla/calendar/resources/locale/en-US/prefs.dtd
@@ -110,3 +110,5 @@
 <!ENTITY pref.publish.path.label     "Default Remote Filename">
 <!ENTITY pref.publish.username.label "Username">
 <!ENTITY pref.publish.password.label "Password">
+
+<!ENTITY pref.minutes.label "Minutes">