diff --git a/calendar/base/content/calendar-alarm-dialog.xul b/calendar/base/content/calendar-alarm-dialog.xul
index 20fe5ff648e8..0aced200584c 100644
--- a/calendar/base/content/calendar-alarm-dialog.xul
+++ b/calendar/base/content/calendar-alarm-dialog.xul
@@ -1,5 +1,43 @@
 <?xml version="1.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):
+   -   Stuart Parmenter <stuart.parmenter@oracle.com>
+   -   Robin Edrenius <robin.edrenius@gmail.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 ***** -->
+
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-alarm-widget.css" type="text/css"?>
 
@@ -17,7 +55,7 @@
         windowtype="calendarAlarmWindow"
         persist="screenX screenY"
         buttons="accept"
-        buttonlabelaccept="Dismiss All"
+        buttonlabelaccept="&calendar.alarm.dismissall.label;"
         ondialogaccept="return onDismissAll();"
         width="400"
         height="200">
diff --git a/calendar/base/content/calendar-alarm-widget.xml b/calendar/base/content/calendar-alarm-widget.xml
index 91d9605e6db3..ca2c4818f72a 100644
--- a/calendar/base/content/calendar-alarm-widget.xml
+++ b/calendar/base/content/calendar-alarm-widget.xml
@@ -1,4 +1,43 @@
 <?xml version="1.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):
+   -   Stuart Parmenter <stuart.parmenter@oracle.com>
+   -   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 ***** -->
+
+<!-- DOCTYPE overlay SYSTEM "chrome://calendar/locale/calendar.dtd" -->
 
 <bindings id="calendar-alarms"
    xmlns="http://www.mozilla.org/xbl"
@@ -17,8 +56,8 @@
           <xul:label xbl:inherits="value=time"/>
         </xul:vbox>
         <xul:vbox pack="start">
-          <xul:button label="snooze" oncommand="var event = document.createEvent('Events'); event.initEvent('snooze', false, false); this.dispatchEvent(event);"/>
-          <xul:button label="dismiss" oncommand="var event = document.createEvent('Events'); event.initEvent('dismiss', false, false); this.dispatchEvent(event);"/>
+          <xul:button label="&calendar.alarm.snooze.label;" oncommand="var event = document.createEvent('Events'); event.initEvent('snooze', false, false); this.dispatchEvent(event);"/>
+          <xul:button label="&calendar.alarm.dismiss.label;" oncommand="var event = document.createEvent('Events'); event.initEvent('dismiss', false, false); this.dispatchEvent(event);"/>
         </xul:vbox>
       </xul:hbox>
     </content>
diff --git a/calendar/base/content/calendar-event-dialog.xul b/calendar/base/content/calendar-event-dialog.xul
index 2ecb270acf42..01e4baae4ef5 100644
--- a/calendar/base/content/calendar-event-dialog.xul
+++ b/calendar/base/content/calendar-event-dialog.xul
@@ -22,6 +22,7 @@
    -
    - Contributor(s):
    -   Stuart Parmenter <stuart.parmenter@oracle.com>
+   -   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
@@ -35,21 +36,20 @@
    - 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 *****
--->
+   - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-event-dialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/datetimepickers/datetimepickers.css" ?>
 
-<!DOCTYPE dialog 
+<!DOCTYPE dialog
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
-]>
+]>     
 
 <dialog
   id="calendar-event-dialog"
-  title="Edit Item"
+  title="&event.title.label;"
   buttons="accept,cancel"
   ondialogaccept="return onAccept();"
   ondialogcancel="return onCancel();"
@@ -76,26 +76,26 @@
       <rows>
         <rows equalsize="always">
           <row align="center">
-            <label value="Title" class="label"/>
+            <label value="&newevent.title.label;" class="label"/>
             <textbox id="item-title" oninput="updateAccept();"/>
           </row>
           <row align="center">
-            <label value="Location" class="label"/>
+            <label value="&newevent.location.label;" class="label"/>
             <textbox id="item-location"/>
           </row>
 
           <row align="center">
-            <label value="URL" class="label"/>
+            <label value="&newevent.uri.label;" class="label"/>
             <textbox id="item-url"/>
           </row>
 
           <row align="center">
-            <label value="Attendees" class="label"/>
+            <label value="&newevent.attendees.label;" class="label"/>
             <textbox id="item-attendees"/>
           </row>
 
           <row align="center" class="event-only">
-            <label value="All day" class="label"/>
+            <label value="&newevent.alldayevent.label;" class="label"/>
             <hbox>
               <checkbox id="event-all-day" oncommand="updateAllDay();"/>
               <spacer flex="1"/>
@@ -103,17 +103,17 @@
           </row>
 
           <row align="center" class="event-only">
-            <label value="From" class="label"/>
+            <label value="&newevent.from.label;" class="label"/>
             <datetimepicker id="event-starttime" onchange="updateAccept();"/>
           </row>
 
           <row align="center" class="event-only">
-            <label value="To" class="label"/>
+            <label value="&newevent.to.label;" class="label"/>
             <datetimepicker id="event-endtime" onchange="updateAccept();"/>
           </row>
 
           <row align="center" class="todo-only">
-            <label value="Completed" class="label"/>
+            <label value="&newevent.status.completed.label;" class="label"/>
             <hbox>
               <checkbox id="todo-completed"/>
               <spacer flex="1"/>
@@ -121,7 +121,7 @@
           </row>
 
           <row align="center" class="todo-only">
-            <label value="Due date" class="label"/>
+            <label value="&newtodo.duedate.label;" class="label"/>
             <hbox>
               <checkbox id="todo-has-duedate" oncommand="updateDuedate();"/>
               <datetimepicker id="todo-duedate"/>
@@ -129,35 +129,35 @@
           </row>
 
           <row align="center">
-            <label value="Repeat" class="label"/>
+            <label value="&newevent.repeat.label2;" class="label"/>
             <hbox align="center">
               <checkbox id="item-recurrence" oncommand="updateRecurrence();"/>
               <spacer flex="1"/>
-              <button id="set-recurrence" label="set..." oncommand="editRecurrence();"/>
+              <button id="set-recurrence" label="&newevent.set.label;" oncommand="editRecurrence();"/>
             </hbox>
           </row>
 
           <row align="center">
-            <label value="Calendar" class="label"/>
+            <label value="&newevent.server.label;" class="label"/>
             <hbox>
-              <menulist id="item-calendar" oncommand="updateAccept()"/>
-              <label id="read-only-cal" 
-                     value="&newevent.readonly.cal.warning;" 
+              <menulist id="item-calendar"/>
+              <label id="read-only-cal"
+                     value="&newevent.readonly.cal.warning;"
                      class="warning-text-class" hidden="true"/>
             </hbox>
           </row>
 
           <row align="center">
-            <label value="Alarm" class="label"/>
+            <label value="&newevent.alarm.label;" class="label"/>
             <hbox>
               <menulist id="item-alarm" oncommand="updateAlarm()">
                 <menupopup>
-                  <menuitem label="none" value="none" selected="true"/>
+                  <menuitem label="&newevent.none.label;" value="none" selected="true"/>
                   <menuseparator/>
-                  <menuitem label="15 minutes before" length="15" unit="minutes" relation="START"/>
-                  <menuitem label="30 minutes before" length="30" unit="minutes" relation="START"/>
+                  <menuitem label="&newevent.15minutes.before.label;" length="15" unit="minutes" relation="START"/>
+                  <menuitem label="&newevent.30minutes.before.label;" length="30" unit="minutes" relation="START"/>
                   <menuseparator/>
-                  <menuitem id="alarm-custom-menuitem" label="Custom..." value="custom"/>
+                  <menuitem id="alarm-custom-menuitem" label="&newevent.custom.label;" value="custom"/>
                 </menupopup>
               </menulist>
               <spacer flex="1"/>
@@ -170,15 +170,15 @@
               <textbox id="alarm-length-field" size="1" oninput="validateIntegers(event);"/>
               <menulist id="alarm-length-units">
                 <menupopup>
-                  <menuitem label="minutes" value="minutes" selected="true"/>
-                  <menuitem label="hours" value="hours"/>
-                  <menuitem label="days" value="days"/>
+                  <menuitem label="&alarm.units.minutes;" value="minutes" selected="true"/>
+                  <menuitem label="&alarm.units.hours;" value="hours"/>
+                  <menuitem label="&alarm.units.days;" value="days"/>
                 </menupopup>
               </menulist>
               <menulist id="alarm-trigger-relation">
                 <menupopup>
-                  <menuitem label="before" value="START" selected="true"/>
-                  <menuitem label="after" value="END"/>
+                  <menuitem label="&newevent.before.label;" value="START" selected="true"/>
+                  <menuitem label="&newevent.after.label;" value="END"/>
                 </menupopup>
               </menulist>
             </hbox>
diff --git a/calendar/base/content/calendar-recurrence-dialog.xul b/calendar/base/content/calendar-recurrence-dialog.xul
index 5a6a57f49e34..83d6f8b3f878 100644
--- a/calendar/base/content/calendar-recurrence-dialog.xul
+++ b/calendar/base/content/calendar-recurrence-dialog.xul
@@ -22,6 +22,7 @@
    -
    - Contributor(s):
    -   Stuart Parmenter <stuart.parmenter@oracle.com>
+   -   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
@@ -35,15 +36,20 @@
    - 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 *****
--->
+   - ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/datetimepickers/datetimepickers.css" ?>
 
+<!DOCTYPE dialog
+[
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
+]>
+
 <dialog
   id="calendar-recurrence-dialog"
-  title="Edit Recurrence"
+  title="&newevent.recurrence.title;"
   buttons="accept,cancel"
   ondialogaccept="return onAccept();"
   ondialogcancel="return onCancel();"
@@ -65,13 +71,13 @@
 
       <rows>
         <row align="center">
-          <label value="Occurs"/>
+          <label value="&newevent.recurrence.occurs.label;"/>
           <menulist id="period-list" oncommand="updateDeck();">
             <menupopup>
-              <menuitem label="Daily" value="0"/>
-              <menuitem label="Weekly" value="1"/>
-              <menuitem label="Monthly" value="2"/>
-              <menuitem label="Annually" value="3"/>
+              <menuitem label="&newevent.recurrence.day.label;" value="0"/>
+              <menuitem label="&newevent.recurrence.week.label;" value="1"/>
+              <menuitem label="&newevent.recurrence.month.label;" value="2"/>
+              <menuitem label="&newevent.recurrence.year.label;" value="3"/>
             </menupopup>
           </menulist>
         </row>
@@ -82,51 +88,51 @@
 
             <!-- Daily -->
             <hbox align="top">
-              <label value="Every"/>
+              <label value="&newevent.recurrence.every.label;"/>
               <textbox id="daily-days" size="3" oninput="validateIntegers(event);"/>
-              <label value="days"/>
+              <label value="&repeat.units.days;"/>
               <spacer flex="1"/>
             </hbox>
 
             <!-- Weekly -->
             <hbox>
-              <label value="On:"/>
+              <label value="&newevent.recurrence.on.label;"/>
               <vbox>
-                <checkbox id="weekly-mon" label="Monday" value="2"/>
-                <checkbox id="weekly-tue" label="Tuesday" value="3"/>
-                <checkbox id="weekly-wed" label="Wednesday" value="4"/>
-                <checkbox id="weekly-thu" label="Thursday" value="5"/>
+                <checkbox id="weekly-mon" label="&day.2.name;" value="2"/>
+                <checkbox id="weekly-tue" label="&day.3.name;" value="3"/>
+                <checkbox id="weekly-wed" label="&day.4.name;" value="4"/>
+                <checkbox id="weekly-thu" label="&day.5.name;" value="5"/>
               </vbox>
               <vbox>
-                <checkbox id="weekly-fri" label="Friday" value="6"/>
-                <checkbox id="weekly-sat" label="Saturday" value="7"/>
-                <checkbox id="weekly-sun" label="Sunday" value="1"/>
+                <checkbox id="weekly-fri" label="&day.6.name;" value="6"/>
+                <checkbox id="weekly-sat" label="&day.7.name;" value="7"/>
+                <checkbox id="weekly-sun" label="&day.1.name;" value="1"/>
               </vbox>
             </hbox>
 
             <vbox align="center">
               <menulist>
                 <menupopup>
-                  <menuitem label="every"/>
-                  <menuitem label="every first"/>
-                  <menuitem label="every second"/>
-                  <menuitem label="every third"/>
-                  <menuitem label="every fourth"/>
-                  <menuitem label="every fifth"/>
-                  <menuitem label="every last"/>
+                  <menuitem label="&newevent.recurrence.every.label;"/>
+                  <menuitem label="&newevent.repeat.first.label;"/>
+                  <menuitem label="&newevent.repeat.second.label;"/>
+                  <menuitem label="&newevent.repeat.third.label;"/>
+                  <menuitem label="&newevent.repeat.fourth.label;"/>
+                  <menuitem label="&newevent.repeat.fifth.label;"/>
+                  <menuitem label="&newevent.repeat.last.label;"/>
                 </menupopup>
               </menulist>
 
               <hbox>
-                <label value="Repeat on the"/>
+                <label value="&newevent.repeat.onthe.label;"/>
                 <textbox value="10,23,29" size="3"/>
               </hbox>
             </vbox>
 
             <hbox align="top">
-              <label value="Every"/>
+              <label value="&newevent.recurrence.every.label;"/>
               <textbox id="yearly-years" size="3" oninput="validateIntegers(event);"/>
-              <label value="years"/>
+              <label value="&repeat.units.years;"/>
               <spacer flex="1"/>
             </hbox>
 
@@ -148,27 +154,27 @@
 
         <rows equalsize="always">
           <row align="center">
-            <radio label="Repeat forever" value="forever" selected="true"/>
+            <radio label="&newevent.repeat.forever.label;" value="forever" selected="true"/>
             <spacer/>
           </row>
           <row>
-            <radio label="Repeat for" value="ntimes"/>
+            <radio label="&newevent.repeat.for.label;" value="ntimes"/>
             <hbox>
               <textbox id="repeat-ntimes-count" size="3" oninput="validateIntegers(event);"/>
               <spacer flex="0.5"/>
               <menulist id="repeat-ntimes-units">
                 <menupopup>
-                  <menuitem label="day(s)"/>
-                  <menuitem label="week(s)"/>
-                  <menuitem label="month(s)"/>
-                  <menuitem label="year(s)"/>
+                  <menuitem label="&repeat.units.days.both;"/>
+                  <menuitem label="&repeat.units.weeks.both;"/>
+                  <menuitem label="&repeat.units.months.both;"/>
+                  <menuitem label="&repeat.units.years.both;"/>
                 </menupopup>
               </menulist>
               <spacer flex="1"/>
             </hbox>
           </row>
           <row>
-            <radio label="Repeat until" value="until"/>
+            <radio label="&newevent.repeat.until.label;" value="until"/>
             <hbox>
               <datepicker id="repeat-until-date" value=""/>
               <spacer flex="1"/>
@@ -182,12 +188,12 @@
   <spacer flex="1"/>
 
   <vbox>
-    <label value="Exceptions:"/>
+    <label value="&newevent.recurrence.exceptions.label;"/>
 
     <hbox align="center">
       <listbox id="recurrence-exceptions-listbox" rows="8" flex="1"/>
       <vbox align="top">
-        <button label="Remove" oncommand="removeSelectedException();"/>
+        <button label="&newevent.recurrence.remove.label;" oncommand="removeSelectedException();"/>
       </vbox>
     </hbox>
 
diff --git a/calendar/base/src/calEvent.js b/calendar/base/src/calEvent.js
index 35d0d61cca3e..5421a6bf2452 100644
--- a/calendar/base/src/calEvent.js
+++ b/calendar/base/src/calEvent.js
@@ -185,8 +185,8 @@ calEvent.prototype = {
                     icalcomp.addProperty(icalprop);
                 }
             } catch (e) {
-                // dump("failed to set " + iprop.name + " to " + iprop.value +
-                // ": " + e + "\n");
+                dump("XXX failed to set " + iprop.name + " to " + iprop.value +
+                ": " + e + "\n");
             }
         }
         return icalcomp;
diff --git a/calendar/lightning/content/agenda-tree-overlay.xul b/calendar/lightning/content/agenda-tree-overlay.xul
index dcfcf09dc968..a36b1e2da1f4 100644
--- a/calendar/lightning/content/agenda-tree-overlay.xul
+++ b/calendar/lightning/content/agenda-tree-overlay.xul
@@ -1,6 +1,44 @@
 <?xml version="1.0"?>
 
-<!-- DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd" -->
+<!-- ***** 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>
+   -   Joey Minta        <jminta@gmail.com>
+   -   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 ***** -->
+
+<!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd" >
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
@@ -9,16 +47,16 @@
 <vbox id="agenda-tab-panel">
   <hbox>
     <spacer flex="1"/>
-    <label value="View:"/>
-    <menulist label="View" oncommand="agendaTreeView.updateFilter(this);">
+    <label value="&agenda.treeview.label;"/>
+    <menulist label="&agenda.treeview.menu.label;" oncommand="agendaTreeView.updateFilter(this);">
       <menupopup>
-        <menuitem label="All" value="all"/>
-        <menuitem label="Events" value="events"/>
-        <menuitem label="Tasks" value="tasks"/>
-        <!-- menuitem label="Reminders"/ -->
+        <menuitem label="&agenda.treeview.all.label;" value="all"/>
+        <menuitem label="&agenda.treeview.events.label;" value="events"/>
+        <menuitem label="&agenda.treeview.tasks.label;" value="tasks"/>
+        <!-- menuitem label="&agenda.treeview.reminders.label;"/ -->
         <menuseparator id="calendar-list-start"/>
         <!--menuseparator id="calendar-list-end"/>
-        <menuitem value="customize" label="Customize..."/ -->
+        <menuitem value="customize" label="&agenda.treeview.customize.label;"/ -->
       </menupopup>
     </menulist>
     <spacer/>
@@ -26,12 +64,12 @@
   <deck id="agenda-viewcustomize-deck" selectedIndex="0" flex="1">
     <tree id="agenda-tree" hidecolumnpicker="true" flex="1">
       <treecols>
-        <treecol id="col-agenda-item" primary="true" label="Item" flex="3"/>
+        <treecol id="col-agenda-item" primary="true" label="&agenda.treeview.item.label;" flex="3"/>
         <treecol id="col-agenda-when" label="" flex="1"/>
       </treecols>
       <treechildren/>
     </tree>
-    <label value="Customize yer views!"/>
+    <label value="&agenda.treeview.description;"/>
   </deck>
 </vbox>
 </overlay>
diff --git a/calendar/lightning/content/lightning-preferences.xul b/calendar/lightning/content/lightning-preferences.xul
index cb62133f316e..36973468260f 100644
--- a/calendar/lightning/content/lightning-preferences.xul
+++ b/calendar/lightning/content/lightning-preferences.xul
@@ -1,5 +1,46 @@
 <?xml version="1.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):
+   -  Stuart Parmenter   <stuart.parmenter@oracle.com>
+   -  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 ***** -->
+
+<!DOCTYPE prefwindow SYSTEM "chrome://calendar/locale/prefs.dtd">
+
+
+
 <overlay id="LightningPaneOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
@@ -18,9 +59,9 @@
 
     <tabbox id="privacyPrefs" flex="1" onselect="">
       <tabs>
-        <tab label="Alarms"/>
-        <tab label="Week View"/>
-        <tab label="Timezone"/>
+        <tab label="&calendar.alarms.label;"/>
+        <tab label="&pref.calendar.view.weekview.caption;"/>
+        <tab label="&calendar.timezone.label;"/>
       </tabs>
       <tabpanels flex="1">
 
@@ -34,13 +75,17 @@
 
             <rows>
               <row align="center">
-                <checkbox label="Play sound" preference="calendar.alarms.playsound"/>
+                <checkbox label="&pref.playasound;" preference="calendar.alarms.playsound"/>
 <!--                <filewidget flex="1" preference="calendar.alarms.playfile" preference-editable="true"/> -->
                 <spacer/>
               </row>
               <row align="center">
-                <label value="Default snooze time"/>
-                <hbox><textbox preference="calendar.alarms.defaultsnoozelength"/><label value="minutes"/><spacer flex="1"/></hbox>
+                <label value="&pref.defaultsnoozelength.label;"/>
+                <hbox>
+                  <textbox preference="calendar.alarms.defaultsnoozelength"/>
+                  <label value="&pref.minutes.label;"/>
+                  <spacer flex="1"/>
+                </hbox>
               </row>
             </rows>
           </grid>
@@ -56,11 +101,11 @@
 
             <rows>
               <row align="center">
-                <label value="Start Hour"/>
+                <label value="&pref.calendar.view.starttime.label;"/>
                 <textbox preference="calendar.event.defaultstarthour"/>
               </row>
               <row align="center">
-                <label value="End Hour"/>
+                <label value="&pref.calendar.view.endtime.label;"/>
                 <textbox preference="calendar.event.defaultendhour"/>
               </row>
             </rows>
@@ -69,7 +114,7 @@
 
         <!-- timezones -->
         <tabpanel orient="vertical">
-          <label value="Default timezone"/>
+          <label value="&pref.calendar.timezone.label;"/>
           <listbox id="timezone-listbox" preference="calendar.timezone.local"
                    onselect="document.getElementById('paneLightning').userChangedValue(event.target);"
                    onsynctopreference="return gLightningPane.getTimezoneResult();"
diff --git a/calendar/lightning/content/lightning-standalone.xul b/calendar/lightning/content/lightning-standalone.xul
index 88760b9d2b33..49a8076e421d 100644
--- a/calendar/lightning/content/lightning-standalone.xul
+++ b/calendar/lightning/content/lightning-standalone.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- DOCTYPE window SYSTEM "chrome://lightning/locale/lightning.dtd" -->
+<!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd" >
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
diff --git a/calendar/lightning/content/messenger-overlay-preferences.xul b/calendar/lightning/content/messenger-overlay-preferences.xul
index 886ea381e8f0..e79c6df01bc9 100644
--- a/calendar/lightning/content/messenger-overlay-preferences.xul
+++ b/calendar/lightning/content/messenger-overlay-preferences.xul
@@ -1,9 +1,48 @@
 <?xml version="1.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):
+   -  Stuart Parmenter   <stuart.parmenter@oracle.com>
+   -  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 ***** -->
+
+<!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd" >
+
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <prefwindow id="MailPreferences">
-  <prefpane id="paneLightning" label="Lightning"
+  <prefpane id="paneLightning" label="&lightning.taskLabel;"
             src="chrome://lightning/content/lightning-preferences.xul"/>
 </prefwindow>
 
diff --git a/calendar/lightning/content/messenger-overlay-sidebar.xul b/calendar/lightning/content/messenger-overlay-sidebar.xul
index 7ada145b85d9..813e54ba6ac4 100644
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -1,6 +1,51 @@
 <?xml version="1.0"?>
 
-<!-- DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd" -->
+<!-- ***** 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>
+   - Stuart Parmenter   <stuart.parmenter@oracle.com>
+   - Vladimir Vukicevic <vladimir@pobox.com>
+   - Joey Minta         <jminta@gmail.com>
+   - 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 ***** -->
+
+<!DOCTYPE overlay 
+[
+  <!ENTITY % dtd1 SYSTEM "chrome://lightning/locale/lightning.dtd" > %dtd1;
+  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %dtd2;
+]>
+
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
@@ -23,7 +68,7 @@
   </commandset>
   <popupset>
     <popup id="calendartree-context-menu" onpopupshowing="return true;">
-      <menuitem label="Publish" observes="publish_calendar"/>
+      <menuitem label="&calendar.publish.label;" observes="publish_calendar"/>
     </popup>
   </popupset>
 </window>
@@ -40,26 +85,28 @@
   
     <tabbox flex="1">
       <tabs>
-        <tab label="Agenda"/>
-        <tab label="Todo"/>
-        <tab label="Calendars"/>
+        <tab label="&lightning.sidebar.agenda.label;"/>
+        <tab label="&lightning.sidebar.todo.label;"/>
+        <tab label="&lightning.sidebar.calendars.label;"/>
       </tabs>
       <tabpanels flex="1">
         <vbox id="agenda-tab-panel"/>    
         <vbox id="todo-tab-panel"/>
         <vbox flex="1">
           <hbox>
-            <button label="New..." oncommand="ltnNewCalendar();"/>
-            <button id="cal-sidebar-edit-calendar" label="Edit..." oncommand="ltnEditSelectedCalendar();"/>
+            <button label="&lightning.sidebar.new.label;" oncommand="ltnNewCalendar();"/>
+            <button id="cal-sidebar-edit-calendar" label="&lightning.sidebar.edit.label;" 
+                    oncommand="ltnEditSelectedCalendar();"/>
             <spacer orient="horizontal" flex="5"/>
-            <button id="cal-sidebar-delete-calendar" label="Delete" oncommand="ltnDeleteSelectedCalendar();"/>
+            <button id="cal-sidebar-delete-calendar" label="&lightning.sidebar.delete.label;" 
+                    oncommand="ltnDeleteSelectedCalendar();"/>
           </hbox>
           <tree id="calendarTree" hidecolumnpicker="true" seltype="single" onfocus="selectedCalendarPane(event)" flex="1" onselect="ltnSidebarCalendarSelected(this);" context="calendartree-context-menu">
             <treecols>
               <treecol id="col-calendar-Checkbox" cycler="true" fixed="true" width="18" >
                 <image />
               </treecol>
-              <treecol id="col-calendar-Calendar" label="Calendar" flex="1"/>
+              <treecol id="col-calendar-Calendar" label="&lightning.calendar.label;" flex="1"/>
             </treecols>
             <treechildren>
             </treechildren>
diff --git a/calendar/lightning/content/messenger-overlay-toolbar.xul b/calendar/lightning/content/messenger-overlay-toolbar.xul
index 51d98daec9c4..c0e62ca26003 100644
--- a/calendar/lightning/content/messenger-overlay-toolbar.xul
+++ b/calendar/lightning/content/messenger-overlay-toolbar.xul
@@ -1,35 +1,77 @@
 <?xml version="1.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>
+   - Stuart Parmenter   <stuart.parmenter@oracle.com>
+   - Vladimir Vukicevic <vladimir@pobox.com>
+   - 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 ***** -->
+
 <?xml-stylesheet href="chrome://calendar/skin/calendar-toolbar.css" type="text/css"?>
 
+<!DOCTYPE overlay 
+[
+  <!ENTITY % dtd1 SYSTEM "chrome://lightning/locale/lightning.dtd" > %dtd1;
+  <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
+]>
+
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/x-javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
 
   <menupopup id="menu_NewPopup">
-    <menuitem id="ltnNewEvent" label="New Calendar Event"
-              oncommand="createEventWithDialog();"/>
-    <menuitem id="ltnNewTask" label="New Calendar Task"
-              oncommand="createTodoWithDialog();"/>
+    <menuitem id="ltnNewEvent" label="&event.title.new;" oncommand="createEventWithDialog();"/>
+    <menuitem id="ltnNewTask" label="&todo.title.new;" oncommand="createTodoWithDialog();"/>
   </menupopup>
 
   <menubar id="mail-menubar">
-    <menu id="ltnCalendarMenu" label="Calendar" insertbefore="tasksMenu">
+    <menu id="ltnCalendarMenu" label="&lightning.calendar.label;" insertbefore="tasksMenu">
       <menupopup id="ltncalendarMenuPopup">
-        <menuitem id="ltnChangeViewDay" label="Day View" oncommand="switchView('day')"/>
-        <menuitem id="ltnChangeViewWeek" label="Week View" oncommand="switchView('week')"/>
-        <menuitem id="ltnChangeViewMonth" label="Month View" oncommand="switchView('month')"/>
+        <menuitem id="ltnChangeViewDay" label="&lightning.toolbar.dayview.label;" oncommand="switchView('day')"/>
+        <menuitem id="ltnChangeViewWeek" label="&lightning.toolbar.weekview.label;" oncommand="switchView('week')"/>
+        <menuitem id="ltnChangeViewMonth" label="&lightning.toolbar.monthview.label;" oncommand="switchView('month')"/>
       </menupopup>
     </menu>
   </menubar>
 
   <toolbarpalette id="MailToolbarPalette">
-
-    <toolbarbutton id="calendar-new-event-button" class="cal-toolbarbutton-1" label="New Event" tooltiptext="New Event" oncommand="createEventWithDialog()"/>
-    <toolbarbutton id="calendar-new-task-button" class="cal-toolbarbutton-1" label="New Task" tooltiptext="New Task" oncommand="createTodoWithDialog()"/>
-    <toolbarbutton id="calendar-week-view-button" class="cal-toolbarbutton-1" label="Week View" tooltiptext="Month View" oncommand="switchView('week')"/>
-    <toolbarbutton id="calendar-month-view-button" class="cal-toolbarbutton-1" label="Month View" tooltiptext="Month View" oncommand="switchView('month')"/>
-    <toolbarbutton id="calendar-day-view-button" class="cal-toolbarbutton-1" label="Day View" tooltiptext="Day View" oncommand="switchView('day')"/>
-
+    <toolbarbutton id="calendar-new-event-button" class="cal-toolbarbutton-1" label="&calendar.newevent.button.label;" tooltiptext="&calendar.newevent.button.tooltip;" oncommand="createEventWithDialog()"/>
+    <toolbarbutton id="calendar-new-task-button" class="cal-toolbarbutton-1" label="&calendar.newtask.button.label;" tooltiptext="&calendar.newtask.button.tooltip;" oncommand="createTodoWithDialog()"/>
+    <toolbarbutton id="calendar-week-view-button" class="cal-toolbarbutton-1" label="&calendar.weekview.button.label;" tooltiptext="&calendar.weekview.button.tooltip;" oncommand="switchView('week')"/>
+    <toolbarbutton id="calendar-month-view-button" class="cal-toolbarbutton-1" label="&calendar.monthview.button.label;" tooltiptext="&calendar.monthview.button.tooltip;" oncommand="switchView('month')"/>
+    <toolbarbutton id="calendar-day-view-button" class="cal-toolbarbutton-1" label="&calendar.dayview.button.label;" tooltiptext="&calendar.dayview.button.tooltip;" oncommand="switchView('day')"/>
   </toolbarpalette>
 
 </overlay>
diff --git a/calendar/lightning/content/todo-list-overlay.xul b/calendar/lightning/content/todo-list-overlay.xul
index d5402f647120..f97cc445be5d 100644
--- a/calendar/lightning/content/todo-list-overlay.xul
+++ b/calendar/lightning/content/todo-list-overlay.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!-- DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd" -->
+<!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd" >
 
 <?xml-stylesheet href="chrome://lightning/content/calendar-todo-list.css" type="text/css"?>
 
diff --git a/calendar/lightning/jar.mn b/calendar/lightning/jar.mn
index 11a55a8e267c..bf0468187019 100644
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -56,6 +56,8 @@ calendar-en-US.jar:
   locale/en-US/calendar/selectAddresses.dtd	(/calendar/resources/locale/en-US/selectAddresses.dtd)
   locale/en-US/calendar/calendar.properties	(/calendar/resources/locale/en-US/calendar.properties)
   locale/en-US/calendar/dateFormat.properties	(/calendar/resources/locale/en-US/dateFormat.properties)
+  locale/en-US/calendar/menuOverlay.dtd	(/calendar/resources/locale/en-US/menuOverlay.dtd)
+* locale/en-US/calendar/prefs.dtd	(/calendar/resources/locale/en-US/prefs.dtd)
 
 classic.jar:
 #expand  skin/classic/lightning/lightning.css	(themes/__THEME__/lightning.css)
diff --git a/calendar/lightning/locale/lightning.dtd b/calendar/lightning/locale/lightning.dtd
index 82ca50098048..d6193c5408c3 100644
--- a/calendar/lightning/locale/lightning.dtd
+++ b/calendar/lightning/locale/lightning.dtd
@@ -1,2 +1,65 @@
+<!-- ***** 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">
diff --git a/calendar/resources/locale/en-US/calendar.dtd b/calendar/resources/locale/en-US/calendar.dtd
index a33f49d876b5..041cde1994bf 100644
--- a/calendar/resources/locale/en-US/calendar.dtd
+++ b/calendar/resources/locale/en-US/calendar.dtd
@@ -24,6 +24,7 @@
    -                 ArentJan Banck <ajbanck@planet.nl>
    -                 Eric Belhaire <belhaire@ief.u-psud.fr>
    -                 Matthew Willis <mattwillis@gmail.com>
+   -                 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
@@ -51,6 +52,11 @@
 <!ENTITY alarm.units.hours.singular    "hour " >
 <!ENTITY alarm.units.days.singular     "day " >
 
+<!ENTITY repeat.units.days.both         "Day(s)" >
+<!ENTITY repeat.units.weeks.both        "Week(s)" >
+<!ENTITY repeat.units.months.both       "Month(s)" >
+<!ENTITY repeat.units.years.both        "Year(s)" >
+
 
 <!ENTITY repeat.units.days     "Days" >
 <!ENTITY repeat.units.weeks    "Weeks" >
@@ -80,11 +86,16 @@
 <!ENTITY newevent.to.label           "To" >
 <!ENTITY newevent.enddate.label      "End" >
 <!ENTITY newevent.end.label          "End" >
+<!ENTITY newevent.set.label          "set..." >
 <!ENTITY newevent.settings.label     "General Settings" >
+<!ENTITY newevent.none.label         "none" >
+<!ENTITY newevent.custom.label       "Custom..." >
 <!ENTITY newevent.alldayevent.label  "All Day" >
 <!ENTITY newevent.description.label  "Description" >
 <!ENTITY newevent.uri.label          "URL" >
 <!ENTITY newevent.uri.visit.label    "Visit URL" >
+<!ENTITY newevent.before.label       "before" >
+<!ENTITY newevent.after.label        "after" >
 <!ENTITY newevent.private.label      "Private" >
 <!ENTITY newevent.privacy.label      "Privacy" >
 <!ENTITY newevent.private.note       "This event is private." >
@@ -100,6 +111,7 @@
 <!ENTITY newevent.end.label          "ends" >
 <!ENTITY newevent.isdue.label        "is due" >
 <!ENTITY newevent.repeat.label       "Repeat every" >
+<!ENTITY newevent.repeat.label2      "Repeat" >
 <!ENTITY newevent.until.label        "Until" >
 <!ENTITY newevent.forever.label      "Forever" >
 <!ENTITY newevent.numberoftimes.label "Number of times" >
@@ -114,6 +126,8 @@
 <!ENTITY newevent.enddate.warning    "Your start date is after your end date.">
 <!ENTITY newevent.repeatdate.tooltip    "Choose a date to end on" >
 <!ENTITY newevent.recurend.warning    "Your repeat-until time is before your end time.">
+<!ENTITY newevent.15minutes.before.label        "15 minutes before" >
+<!ENTITY newevent.30minutes.before.label        "30 minutes before" >
 <!ENTITY newevent.recurnumberoftimes.warning    "Your must specify the number of times to repeat.">
 <!ENTITY newevent.readonly.item.warning    "This item is in a read-only calendar.  You may not edit it.">
 <!ENTITY newevent.readonly.cal.warning    "This calendar is read-only.">
@@ -122,10 +136,34 @@
 <!ENTITY newevent.starttimeerror.alertmessage "Your event cannot end before it has started. Please fix either the start time or the end time." >
 <!ENTITY newevent.recurendtimeerror.alertmessage "Your event's repeat time cannot be before the event end time. Please fix this, or disable repeating." >
 <!ENTITY newevent.general.tab.label         "General" >
+
 <!ENTITY newevent.recurrence.tab.label      "Recurrence" >
+<!ENTITY newevent.recurrence.title          "Edit Recurrence" >
+<!ENTITY newevent.recurrence.remove.label   "Remove" >
+<!ENTITY newevent.recurrence.occurs.label   "Occurs" >
+<!ENTITY newevent.recurrence.day.label      "daily" >
+<!ENTITY newevent.recurrence.week.label     "weekly" >
+<!ENTITY newevent.recurrence.month.label    "monthly" >
+<!ENTITY newevent.recurrence.year.label     "annually" >
+<!ENTITY newevent.recurrence.on.label       "On:" >
+<!ENTITY newevent.recurrence.every.label    "Every" >
+<!ENTITY newevent.repeat.first.label        "every first" >
+<!ENTITY newevent.repeat.second.label       "every second" >
+<!ENTITY newevent.repeat.third.label        "every third" >
+<!ENTITY newevent.repeat.fourth.label       "every fourth" >
+<!ENTITY newevent.repeat.fifth.label        "every fifth" >
+<!ENTITY newevent.repeat.last.label         "every last" >
+<!ENTITY newevent.repeat.onthe.label        "Repeat on the" >
+<!ENTITY newevent.repeat.forever.label      "Repeat forever" >
+<!ENTITY newevent.repeat.for.label          "Repeat for" >
+<!ENTITY newevent.repeat.until.label        "Repeat until" >
+<!ENTITY newevent.recurrence.exceptions.label    "Exceptions:" >
+
 <!ENTITY newevent.attendees.tab.label       "Attendees" >
+<!ENTITY newevent.attendees.label           "Attendees" >
 <!ENTITY newevent.attachments.tab.label     "Attachments" >
 <!ENTITY newevent.advanced.tab.label        "Advanced" >
+<!ENTITY newevent.completed.label           "Completed" >
 <!ENTITY newevent.status.label "Status" >
 <!ENTITY newevent.status.longlabel "Event Status">
 <!ENTITY newevent.status.needsaction.label "Needs Action" >
@@ -184,6 +222,7 @@
 
 <!ENTITY event.title.alarm         "Alarm" >
 <!ENTITY event.title.new         "New Event" >
+<!ENTITY event.title.label       "Edit Item" >
 <!ENTITY event.title.edit        "Edit Event" >
 
 <!ENTITY onthe-text            "On the ">
@@ -268,6 +307,8 @@
 <!ENTITY calendar.weekview.button.tooltip         "Switch to week view" >
 <!ENTITY calendar.monthview.button.tooltip        "Switch to month view" >
 <!ENTITY calendar.multiweekview.button.tooltip        "Switch to multiweek view" >
+<!ENTITY calendar.newevent.button.tooltip         "Create a new event" >
+<!ENTITY calendar.newtask.button.tooltip          "Create a new task" >
 
 <!ENTITY calendar.nextday.button.tooltip        "Next Day" >
 <!ENTITY calendar.prevday.button.tooltip        "Previous Day" >
@@ -444,6 +485,8 @@
 <!ENTITY calendar.alarm.acknowledgeall.label        "Acknowledge All Alarms" >
 <!ENTITY calendar.alarm.snooze.label                "Snooze" >
 <!ENTITY calendar.alarm.title.label                "Calendar Alarm" >
+<!ENTITY calendar.alarm.dismiss.label               "Dismiss" >
+<!ENTITY calendar.alarm.dismissall.label            "Dismiss All" >
 
 
 <!-- Calendar Server Dialog -->