--- a/calendar/chrome/calendar/calendar-event-dialog.dtd
+++ b/calendar/chrome/calendar/calendar-event-dialog.dtd
@@ -143,18 +143,18 @@
 <!ENTITY  event.menu.options.attendees.label                  "Invite Attendees…">
 <!ENTITY  event.menu.options.attendees.accesskey              "I">
 <!ENTITY  event.menu.options.spellcheck.label                 "Check Spelling…">
 <!ENTITY  event.menu.options.spellcheck.accesskey             "h">
 <!ENTITY  event.menu.options.inline.spellcheck.label          "Spell Check As You Type">
 <!ENTITY  event.menu.options.inline.spellcheck.accesskey      "S">
 <!ENTITY  event.menu.options.link.label                       "Add Link…">
 <!ENTITY  event.menu.options.link.accesskey                   "L">
-<!ENTITY  event.menu.options.timezone.label                   "Timezone">
-<!ENTITY  event.menu.options.timezone.accesskey               "z">
+<!ENTITY  event.menu.options.timezone2.label                  "Show Timezones">
+<!ENTITY  event.menu.options.timezone2.accesskey              "z">
 <!ENTITY  event.menu.options.priority2.label                  "Priority">
 <!ENTITY  event.menu.options.priority2.accesskey              "y">
 <!ENTITY  event.menu.options.priority.notspecified.label      "Not specified">
 <!ENTITY  event.menu.options.priority.notspecified.accesskey  "o">
 <!ENTITY  event.menu.options.priority.low.label               "Low">
 <!ENTITY  event.menu.options.priority.low.accesskey           "L">
 <!ENTITY  event.menu.options.priority.normal.label            "Normal">
 <!ENTITY  event.menu.options.priority.normal.accesskey        "N">
@@ -367,16 +367,17 @@
 <!ENTITY event.freebusy.legend.unknown          "No Information" >
 <!ENTITY event.attendee.role.required           "Required Attendee">
 <!ENTITY event.attendee.role.optional           "Optional Attendee">
 <!ENTITY event.attendee.role.chair              "Chair">
 <!ENTITY event.attendee.role.nonparticipant     "Non Participant">
 
 <!-- Timezone dialog -->
 <!ENTITY timezone.title.label            "Please Specify the Timezone">
+<!ENTITY event.timezone.custom.label     "More Timezones…">
 
 <!-- Read-Only dialog -->
 <!ENTITY read.only.general.label         "General">
 <!ENTITY read.only.title.label           "Title:">
 <!ENTITY read.only.event.start.label     "Start Date:">
 <!ENTITY read.only.task.start.label      "Start Date:">
 <!ENTITY read.only.event.end.label       "End Date:">
 <!ENTITY read.only.task.due.label        "Due Date:">

--- a/calendar/chrome/calendar/calendar.dtd
+++ b/calendar/chrome/calendar/calendar.dtd
@@ -59,17 +59,17 @@
 <!ENTITY calendar.today.button.label       "Today">
 <!ENTITY calendar.tomorrow.button.label       "Tomorrow">
 <!ENTITY calendar.soon.button.label           "Soon">
 
 <!ENTITY calendar.events.filter.all.label "All Events">
 <!ENTITY calendar.events.filter.today.label "Today's Events">
 <!ENTITY calendar.events.filter.future.label "All Future Events">
 <!ENTITY calendar.events.filter.current.label "Currently Selected Day">
-<!ENTITY calender.events.filter.currentview.label "Events in Current View">
+<!ENTITY calendar.events.filter.currentview.label "Events in Current View">
 <!ENTITY calendar.events.filter.next7Days.label "Events in the Next 7 Days">
 <!ENTITY calendar.events.filter.next14Days.label "Events in the Next 14 Days">
 <!ENTITY calendar.events.filter.next31Days.label "Events in the Next 31 Days">
 <!ENTITY calendar.events.filter.thisCalendarMonth.label "Events in this Calendar Month">
 
 <!ENTITY calendar.unifinder.tree.done.label          "Done">
 <!ENTITY calendar.unifinder.tree.priority.label      "Priority">
 <!ENTITY calendar.unifinder.tree.title.label         "Title">
@@ -248,16 +248,19 @@
 
 <!ENTITY calendar.context.postpone.1hour.label      "1 Hour">
 <!ENTITY calendar.context.postpone.1hour.accesskey  "H">
 <!ENTITY calendar.context.postpone.1day.label       "1 Day">
 <!ENTITY calendar.context.postpone.1day.accesskey   "D">
 <!ENTITY calendar.context.postpone.1week.label      "1 Week">
 <!ENTITY calendar.context.postpone.1week.accesskey  "W">
 
+<!ENTITY calendar.copylink.label       "Copy Link Location">
+<!ENTITY calendar.copylink.accesskey   "C">
+
 <!-- Task View -->
 <!-- Note that the above *.context.* strings are currently used for the other
      task action buttons -->
 <!ENTITY calendar.taskview.delete.label     "Delete">
 <!ENTITY calendar.taskview.delete.accesskey "l">
 
 <!-- Server Context Menu -->
 <!ENTITY calendar.context.newserver.label              "New Calendar…">

--- a/calendar/chrome/calendar/calendar.properties
+++ b/calendar/chrome/calendar/calendar.properties
@@ -168,16 +168,18 @@ tooltipLocation=Location:
 # event date, usually an interval, such as
 #  Date: 7:00--8:00 Thu 9 Oct 2011
 #  Date: Thu 9 Oct 2000 -- Fri 10 Oct 2000
 tooltipDate=Date:
 # event calendar name
 tooltipCalName=Calendar Name:
 # event status: tentative, confirmed, cancelled
 tooltipStatus=Status:
+# event organizer
+tooltipOrganizer=Organiser:
 # task/todo fields
 # start date time, due date time, task priority number, completed date time
 tooltipStart=Start:
 tooltipDue=Due:
 tooltipPriority=Priority:
 tooltipPercent=% Complete:
 tooltipCompleted=Completed:
 

--- a/calendar/chrome/lightning/lightning.dtd
+++ b/calendar/chrome/lightning/lightning.dtd
@@ -70,18 +70,16 @@
 <!ENTITY lightning.menu.view.tasks.label               "Tasks">
 <!ENTITY lightning.menu.view.tasks.accesskey           "k">
 
 <!-- Events and Tasks menu -->
 <!ENTITY lightning.menu.eventtask.label                "Events and Tasks">
 <!ENTITY lightning.menu.eventtask.accesskey            "n">
 
 <!-- properties dialog, calendar creation wizard -->
-<!ENTITY lightning.calendarproperties.showevents.inagenda.label "Show Events in Today Pane">
-<!ENTITY lightning.calendarproperties.showtasks.label           "Show Tasks in Today Pane and Task Mode">
 <!ENTITY lightning.calendarproperties.email.label               "Email:">
 
 <!-- iMIP Bar (meeting support) -->
 <!ENTITY lightning.imipbar.description "This message contains an invitation to an event.">
 
 <!-- Lightning specific keybindings -->
 <!ENTITY lightning.keys.event.showCalendar.key "C">
 <!ENTITY lightning.keys.event.showTasks.key "D">