From ebfdc206e64152fdb411d54420181408dfd2fe99 Mon Sep 17 00:00:00 2001
From: "michael.buettner%sun.com"
 <michael.buettner%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 7 May 2007 13:45:16 +0000
Subject: [PATCH] bug #379462 changing timezone of event in various timezones
 isn't possible r=dbo

git-svn-id: svn://10.0.0.236/trunk@226041 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/content/preferences/timezones.xul    | 66 ++++++++++++++-----
 .../chrome/calendar/preferences/timezones.dtd | 33 +++++++---
 .../sun-calendar-event-dialog-timezone.xul    | 66 ++++++++++++++-----
 3 files changed, 120 insertions(+), 45 deletions(-)

diff --git a/mozilla/calendar/base/content/preferences/timezones.xul b/mozilla/calendar/base/content/preferences/timezones.xul
index 2f1c0ac2202..3751390236c 100644
--- a/mozilla/calendar/base/content/preferences/timezones.xul
+++ b/mozilla/calendar/base/content/preferences/timezones.xul
@@ -179,12 +179,34 @@
                           value="/mozilla.org/20070129_1/America/Antigua"/>
                 <menuitem label="&pref.timezone.America.Araguaina;"
                           value="/mozilla.org/20070129_1/America/Araguaina"/>
+                <menuitem label="&pref.timezone.America.Argentina.Buenos_Aires;"
+                          value="/mozilla.org/20070129_1/America/Argentina/Buenos_Aires"/>
+                <menuitem label="&pref.timezone.America.Argentina.Catamarca;"
+                          value="/mozilla.org/20070129_1/America/Argentina/Catamarca"/>
+                <menuitem label="&pref.timezone.America.Argentina.Cordoba;"
+                          value="/mozilla.org/20070129_1/America/Argentina/Cordoba"/>
+                <menuitem label="&pref.timezone.America.Argentina.Jujuy;"
+                          value="/mozilla.org/20070129_1/America/Argentina/Jujuy"/>
+                <menuitem label="&pref.timezone.America.Argentina.La_Rioja;"
+                          value="/mozilla.org/20070129_1/America/Argentina/La_Rioja"/>
+                <menuitem label="&pref.timezone.America.Argentina.Mendoza;"
+                          value="/mozilla.org/20070129_1/America/Argentina/Mendoza"/>
+                <menuitem label="&pref.timezone.America.Argentina.Rio_Gallegos;"
+                          value="/mozilla.org/20070129_1/America/Argentina/Rio_Gallegos"/>
+                <menuitem label="&pref.timezone.America.Argentina.San_Juan;"
+                          value="/mozilla.org/20070129_1/America/Argentina/San_Juan"/>
+                <menuitem label="&pref.timezone.America.Argentina.Tucuman;"
+                          value="/mozilla.org/20070129_1/America/Argentina/Tucuman"/>
+                <menuitem label="&pref.timezone.America.Argentina.Ushuaia;"
+                          value="/mozilla.org/20070129_1/America/Argentina/Ushuaia"/>
                 <menuitem label="&pref.timezone.America.Aruba;"
                           value="/mozilla.org/20070129_1/America/Aruba"/>
                 <menuitem label="&pref.timezone.America.Asuncion;"
                           value="/mozilla.org/20070129_1/America/Asuncion"/>
                 <menuitem label="&pref.timezone.America.Atikokan;"
                           value="/mozilla.org/20070129_1/America/Atikokan"/>
+                <menuitem label="&pref.timezone.America.Bahia;"
+                          value="/mozilla.org/20070129_1/America/Bahia"/>
                 <menuitem label="&pref.timezone.America.Barbados;"
                           value="/mozilla.org/20070129_1/America/Barbados"/>
                 <menuitem label="&pref.timezone.America.Belem;"
@@ -199,16 +221,14 @@
                           value="/mozilla.org/20070129_1/America/Bogota"/>
                 <menuitem label="&pref.timezone.America.Boise;"
                           value="/mozilla.org/20070129_1/America/Boise"/>
-                <menuitem label="&pref.timezone.America.Buenos_Aires;"
-                          value="/mozilla.org/20070129_1/America/Buenos_Aires"/>
                 <menuitem label="&pref.timezone.America.Cambridge_Bay;"
                           value="/mozilla.org/20070129_1/America/Cambridge_Bay"/>
+                <menuitem label="&pref.timezone.America.Campo_Grande;"
+                          value="/mozilla.org/20070129_1/America/Campo_Grande"/>
                 <menuitem label="&pref.timezone.America.Cancun;"
                           value="/mozilla.org/20070129_1/America/Cancun"/>
                 <menuitem label="&pref.timezone.America.Caracas;"
                           value="/mozilla.org/20070129_1/America/Caracas"/>
-                <menuitem label="&pref.timezone.America.Catamarca;"
-                          value="/mozilla.org/20070129_1/America/Catamarca"/>
                 <menuitem label="&pref.timezone.America.Cayenne;"
                           value="/mozilla.org/20070129_1/America/Cayenne"/>
                 <menuitem label="&pref.timezone.America.Cayman;"
@@ -217,14 +237,14 @@
                           value="/mozilla.org/20070129_1/America/Chicago"/>
                 <menuitem label="&pref.timezone.America.Chihuahua;"
                           value="/mozilla.org/20070129_1/America/Chihuahua"/>
-                <menuitem label="&pref.timezone.America.Cordoba;"
-                          value="/mozilla.org/20070129_1/America/Cordoba"/>
                 <menuitem label="&pref.timezone.America.Costa_Rica;"
                           value="/mozilla.org/20070129_1/America/Costa_Rica"/>
                 <menuitem label="&pref.timezone.America.Cuiaba;"
                           value="/mozilla.org/20070129_1/America/Cuiaba"/>
                 <menuitem label="&pref.timezone.America.Curacao;"
                           value="/mozilla.org/20070129_1/America/Curacao"/>
+                <menuitem label="&pref.timezone.America.Danmarkshavn;"
+                          value="/mozilla.org/20070129_1/America/Danmarkshavn"/>
                 <menuitem label="&pref.timezone.America.Dawson;"
                           value="/mozilla.org/20070129_1/America/Dawson"/>
                 <menuitem label="&pref.timezone.America.Dawson_Creek;"
@@ -285,8 +305,6 @@
                           value="/mozilla.org/20070129_1/America/Iqaluit"/>
                 <menuitem label="&pref.timezone.America.Jamaica;"
                           value="/mozilla.org/20070129_1/America/Jamaica"/>
-                <menuitem label="&pref.timezone.America.Jujuy;"
-                          value="/mozilla.org/20070129_1/America/Jujuy"/>
                 <menuitem label="&pref.timezone.America.Juneau;"
                           value="/mozilla.org/20070129_1/America/Juneau"/>
                 <menuitem label="&pref.timezone.America.Kentucky.Louisville;"
@@ -309,8 +327,6 @@
                           value="/mozilla.org/20070129_1/America/Martinique"/>
                 <menuitem label="&pref.timezone.America.Mazatlan;"
                           value="/mozilla.org/20070129_1/America/Mazatlan"/>
-                <menuitem label="&pref.timezone.America.Mendoza;"
-                          value="/mozilla.org/20070129_1/America/Mendoza"/>
                 <menuitem label="&pref.timezone.America.Menominee;"
                           value="/mozilla.org/20070129_1/America/Menominee"/>
                 <menuitem label="&pref.timezone.America.Merida;"
@@ -339,6 +355,8 @@
                           value="/mozilla.org/20070129_1/America/Nome"/>
                 <menuitem label="&pref.timezone.America.Noronha;"
                           value="/mozilla.org/20070129_1/America/Noronha"/>
+                <menuitem label="&pref.timezone.America.North_Dakota.Center;"
+                          value="/mozilla.org/20070129_1/America/North_Dakota/Center"/>
                 <menuitem label="&pref.timezone.America.North_Dakota.New_Salem;"
                           value="/mozilla.org/20070129_1/America/North_Dakota/New_Salem"/>
                 <menuitem label="&pref.timezone.America.Panama;"
@@ -367,8 +385,6 @@
                           value="/mozilla.org/20070129_1/America/Regina"/>
                 <menuitem label="&pref.timezone.America.Rio_Branco;"
                           value="/mozilla.org/20070129_1/America/Rio_Branco"/>
-                <menuitem label="&pref.timezone.America.Rosario;"
-                          value="/mozilla.org/20070129_1/America/Rosario"/>
                 <menuitem label="&pref.timezone.America.Santiago;"
                           value="/mozilla.org/20070129_1/America/Santiago"/>
                 <menuitem label="&pref.timezone.America.Santo_Domingo;"
@@ -399,6 +415,8 @@
                           value="/mozilla.org/20070129_1/America/Thunder_Bay"/>
                 <menuitem label="&pref.timezone.America.Tijuana;"
                           value="/mozilla.org/20070129_1/America/Tijuana"/>
+                <menuitem label="&pref.timezone.America.Toronto;"
+                          value="/mozilla.org/20070129_1/America/Toronto"/>
                 <menuitem label="&pref.timezone.America.Tortola;"
                           value="/mozilla.org/20070129_1/America/Tortola"/>
                 <menuitem label="&pref.timezone.America.Vancouver;"
@@ -423,6 +441,8 @@
                           value="/mozilla.org/20070129_1/Antarctica/McMurdo"/>
                 <menuitem label="&pref.timezone.Antarctica.Palmer;"
                           value="/mozilla.org/20070129_1/Antarctica/Palmer"/>
+                <menuitem label="&pref.timezone.Antarctica.Rothera;"
+                          value="/mozilla.org/20070129_1/Antarctica/Rothera"/>
                 <menuitem label="&pref.timezone.Antarctica.South_Pole;"
                           value="/mozilla.org/20070129_1/Antarctica/South_Pole"/>
                 <menuitem label="&pref.timezone.Antarctica.Syowa;"
@@ -461,8 +481,10 @@
                           value="/mozilla.org/20070129_1/Asia/Brunei"/>
                 <menuitem label="&pref.timezone.Asia.Calcutta;"
                           value="/mozilla.org/20070129_1/Asia/Calcutta"/>
-                <menuitem label="&pref.timezone.Asia.Chungking;"
-                          value="/mozilla.org/20070129_1/Asia/Chungking"/>
+                <menuitem label="&pref.timezone.Asia.Choibalsan;"
+                          value="/mozilla.org/20070129_1/Asia/Choibalsan"/>
+                <menuitem label="&pref.timezone.Asia.Chongqing;"
+                          value="/mozilla.org/20070129_1/Asia/Chongqing"/>
                 <menuitem label="&pref.timezone.Asia.Colombo;"
                           value="/mozilla.org/20070129_1/Asia/Colombo"/>
                 <menuitem label="&pref.timezone.Asia.Damascus;"
@@ -511,10 +533,12 @@
                           value="/mozilla.org/20070129_1/Asia/Kuching"/>
                 <menuitem label="&pref.timezone.Asia.Kuwait;"
                           value="/mozilla.org/20070129_1/Asia/Kuwait"/>
-                <menuitem label="&pref.timezone.Asia.Macao;"
-                          value="/mozilla.org/20070129_1/Asia/Macao"/>
+                <menuitem label="&pref.timezone.Asia.Macau;"
+                          value="/mozilla.org/20070129_1/Asia/Macau"/>
                 <menuitem label="&pref.timezone.Asia.Magadan;"
                           value="/mozilla.org/20070129_1/Asia/Magadan"/>
+                <menuitem label="&pref.timezone.Asia.Makassar;"
+                          value="/mozilla.org/20070129_1/Asia/Makassar"/>
                 <menuitem label="&pref.timezone.Asia.Manila;"
                           value="/mozilla.org/20070129_1/Asia/Manila"/>
                 <menuitem label="&pref.timezone.Asia.Muscat;"
@@ -525,6 +549,8 @@
                           value="/mozilla.org/20070129_1/Asia/Novosibirsk"/>
                 <menuitem label="&pref.timezone.Asia.Omsk;"
                           value="/mozilla.org/20070129_1/Asia/Omsk"/>
+                <menuitem label="&pref.timezone.Asia.Oral;"
+                          value="/mozilla.org/20070129_1/Asia/Oral"/>
                 <menuitem label="&pref.timezone.Asia.Phnom_Penh;"
                           value="/mozilla.org/20070129_1/Asia/Phnom_Penh"/>
                 <menuitem label="&pref.timezone.Asia.Pontianak;"
@@ -533,12 +559,16 @@
                           value="/mozilla.org/20070129_1/Asia/Pyongyang"/>
                 <menuitem label="&pref.timezone.Asia.Qatar;"
                           value="/mozilla.org/20070129_1/Asia/Qatar"/>
+                <menuitem label="&pref.timezone.Asia.Qyzylorda;"
+                          value="/mozilla.org/20070129_1/Asia/Qyzylorda"/>
                 <menuitem label="&pref.timezone.Asia.Rangoon;"
                           value="/mozilla.org/20070129_1/Asia/Rangoon"/>
                 <menuitem label="&pref.timezone.Asia.Riyadh;"
                           value="/mozilla.org/20070129_1/Asia/Riyadh"/>
                 <menuitem label="&pref.timezone.Asia.Saigon;"
                           value="/mozilla.org/20070129_1/Asia/Saigon"/>
+                <menuitem label="&pref.timezone.Asia.Sakhalin;"
+                          value="/mozilla.org/20070129_1/Asia/Sakhalin"/>
                 <menuitem label="&pref.timezone.Asia.Samarkand;"
                           value="/mozilla.org/20070129_1/Asia/Samarkand"/>
                 <menuitem label="&pref.timezone.Asia.Seoul;"
@@ -559,8 +589,6 @@
                           value="/mozilla.org/20070129_1/Asia/Thimphu"/>
                 <menuitem label="&pref.timezone.Asia.Tokyo;"
                           value="/mozilla.org/20070129_1/Asia/Tokyo"/>
-                <menuitem label="&pref.timezone.Asia.Ujung_Pandang;"
-                          value="/mozilla.org/20070129_1/Asia/Ujung_Pandang"/>
                 <menuitem label="&pref.timezone.Asia.Ulaanbaatar;"
                           value="/mozilla.org/20070129_1/Asia/Ulaanbaatar"/>
                 <menuitem label="&pref.timezone.Asia.Urumqi;"
@@ -673,6 +701,8 @@
                           value="/mozilla.org/20070129_1/Europe/Madrid"/>
                 <menuitem label="&pref.timezone.Europe.Malta;"
                           value="/mozilla.org/20070129_1/Europe/Malta"/>
+                <menuitem label="&pref.timezone.Europe.Mariehamn;"
+                          value="/mozilla.org/20070129_1/Europe/Mariehamn"/>
                 <menuitem label="&pref.timezone.Europe.Minsk;"
                           value="/mozilla.org/20070129_1/Europe/Minsk"/>
                 <menuitem label="&pref.timezone.Europe.Monaco;"
diff --git a/mozilla/calendar/locales/en-US/chrome/calendar/preferences/timezones.dtd b/mozilla/calendar/locales/en-US/chrome/calendar/preferences/timezones.dtd
index 862d0112a5f..cd6d5f8e5ad 100644
--- a/mozilla/calendar/locales/en-US/chrome/calendar/preferences/timezones.dtd
+++ b/mozilla/calendar/locales/en-US/chrome/calendar/preferences/timezones.dtd
@@ -95,9 +95,20 @@
 <!ENTITY pref.timezone.America.Anguilla "America/Anguilla" >
 <!ENTITY pref.timezone.America.Antigua "America/Antigua" >
 <!ENTITY pref.timezone.America.Araguaina "America/Araguaina" >
+<!ENTITY pref.timezone.America.Argentina.Buenos_Aires "America/Argentina/Buenos_Aires" >
+<!ENTITY pref.timezone.America.Argentina.Catamarca "America/Argentina/Catamarca" >
+<!ENTITY pref.timezone.America.Argentina.Cordoba "America/Argentina/Cordoba" >
+<!ENTITY pref.timezone.America.Argentina.Jujuy "America/Argentina/Jujuy" >
+<!ENTITY pref.timezone.America.Argentina.La_Rioja "America/Argentina/La_Rioja" >
+<!ENTITY pref.timezone.America.Argentina.Mendoza "America/Argentina/Mendoza" >
+<!ENTITY pref.timezone.America.Argentina.Rio_Gallegos "America/Argentina/Rio_Gallegos" >
+<!ENTITY pref.timezone.America.Argentina.San_Juan "America/Argentina/San_Juan" >
+<!ENTITY pref.timezone.America.Argentina.Tucuman "America/Argentina/Tucuman" >
+<!ENTITY pref.timezone.America.Argentina.Ushuaia "America/Argentina/Ushuaia" >
 <!ENTITY pref.timezone.America.Aruba "America/Aruba" >
 <!ENTITY pref.timezone.America.Asuncion "America/Asuncion" >
 <!ENTITY pref.timezone.America.Atikokan "America/Atikokan" >
+<!ENTITY pref.timezone.America.Bahia "America/Bahia" >
 <!ENTITY pref.timezone.America.Barbados "America/Barbados" >
 <!ENTITY pref.timezone.America.Belem "America/Belem" >
 <!ENTITY pref.timezone.America.Belize "America/Belize" >
@@ -105,19 +116,18 @@
 <!ENTITY pref.timezone.America.Boa_Vista "America/Boa_Vista" >
 <!ENTITY pref.timezone.America.Bogota "America/Bogota" >
 <!ENTITY pref.timezone.America.Boise "America/Boise" >
-<!ENTITY pref.timezone.America.Buenos_Aires "America/Buenos_Aires" >
 <!ENTITY pref.timezone.America.Cambridge_Bay "America/Cambridge_Bay" >
+<!ENTITY pref.timezone.America.Campo_Grande "America/Campo_Grande" >
 <!ENTITY pref.timezone.America.Cancun "America/Cancun" >
 <!ENTITY pref.timezone.America.Caracas "America/Caracas" >
-<!ENTITY pref.timezone.America.Catamarca "America/Catamarca" >
 <!ENTITY pref.timezone.America.Cayenne "America/Cayenne" >
 <!ENTITY pref.timezone.America.Cayman "America/Cayman" >
 <!ENTITY pref.timezone.America.Chicago "America/Chicago" >
 <!ENTITY pref.timezone.America.Chihuahua "America/Chihuahua" >
-<!ENTITY pref.timezone.America.Cordoba "America/Cordoba" >
 <!ENTITY pref.timezone.America.Costa_Rica "America/Costa_Rica" >
 <!ENTITY pref.timezone.America.Cuiaba "America/Cuiaba" >
 <!ENTITY pref.timezone.America.Curacao "America/Curacao" >
+<!ENTITY pref.timezone.America.Danmarkshavn "America/Danmarkshavn" >
 <!ENTITY pref.timezone.America.Dawson "America/Dawson" >
 <!ENTITY pref.timezone.America.Dawson_Creek "America/Dawson_Creek" >
 <!ENTITY pref.timezone.America.Denver "America/Denver" >
@@ -148,7 +158,6 @@
 <!ENTITY pref.timezone.America.Inuvik "America/Inuvik" >
 <!ENTITY pref.timezone.America.Iqaluit "America/Iqaluit" >
 <!ENTITY pref.timezone.America.Jamaica "America/Jamaica" >
-<!ENTITY pref.timezone.America.Jujuy "America/Jujuy" >
 <!ENTITY pref.timezone.America.Juneau "America/Juneau" >
 <!ENTITY pref.timezone.America.Kentucky.Louisville "America/Kentucky/Louisville" >
 <!ENTITY pref.timezone.America.Kentucky.Monticello "America/Kentucky/Monticello" >
@@ -160,7 +169,6 @@
 <!ENTITY pref.timezone.America.Manaus "America/Manaus" >
 <!ENTITY pref.timezone.America.Martinique "America/Martinique" >
 <!ENTITY pref.timezone.America.Mazatlan "America/Mazatlan" >
-<!ENTITY pref.timezone.America.Mendoza "America/Mendoza" >
 <!ENTITY pref.timezone.America.Menominee "America/Menominee" >
 <!ENTITY pref.timezone.America.Merida "America/Merida" >
 <!ENTITY pref.timezone.America.Mexico_City "America/Mexico_City" >
@@ -175,6 +183,7 @@
 <!ENTITY pref.timezone.America.Nipigon "America/Nipigon" >
 <!ENTITY pref.timezone.America.Nome "America/Nome" >
 <!ENTITY pref.timezone.America.Noronha "America/Noronha" >
+<!ENTITY pref.timezone.America.North_Dakota.Center "America/North_Dakota/Center" >
 <!ENTITY pref.timezone.America.North_Dakota.New_Salem "America/North_Dakota/New_Salem" >
 <!ENTITY pref.timezone.America.Panama "America/Panama" >
 <!ENTITY pref.timezone.America.Pangnirtung "America/Pangnirtung" >
@@ -189,7 +198,6 @@
 <!ENTITY pref.timezone.America.Recife "America/Recife" >
 <!ENTITY pref.timezone.America.Regina "America/Regina" >
 <!ENTITY pref.timezone.America.Rio_Branco "America/Rio_Branco" >
-<!ENTITY pref.timezone.America.Rosario "America/Rosario" >
 <!ENTITY pref.timezone.America.Santiago "America/Santiago" >
 <!ENTITY pref.timezone.America.Santo_Domingo "America/Santo_Domingo" >
 <!ENTITY pref.timezone.America.Sao_Paulo "America/Sao_Paulo" >
@@ -205,6 +213,7 @@
 <!ENTITY pref.timezone.America.Thule "America/Thule" >
 <!ENTITY pref.timezone.America.Thunder_Bay "America/Thunder_Bay" >
 <!ENTITY pref.timezone.America.Tijuana "America/Tijuana" >
+<!ENTITY pref.timezone.America.Toronto "America/Toronto" >
 <!ENTITY pref.timezone.America.Tortola "America/Tortola" >
 <!ENTITY pref.timezone.America.Vancouver "America/Vancouver" >
 <!ENTITY pref.timezone.America.Whitehorse "America/Whitehorse" >
@@ -217,6 +226,7 @@
 <!ENTITY pref.timezone.Antarctica.Mawson "Antarctica/Mawson" >
 <!ENTITY pref.timezone.Antarctica.McMurdo "Antarctica/McMurdo" >
 <!ENTITY pref.timezone.Antarctica.Palmer "Antarctica/Palmer" >
+<!ENTITY pref.timezone.Antarctica.Rothera "Antarctica/Rothera" >
 <!ENTITY pref.timezone.Antarctica.South_Pole "Antarctica/South_Pole" >
 <!ENTITY pref.timezone.Antarctica.Syowa "Antarctica/Syowa" >
 <!ENTITY pref.timezone.Antarctica.Vostok "Antarctica/Vostok" >
@@ -236,7 +246,8 @@
 <!ENTITY pref.timezone.Asia.Bishkek "Asia/Bishkek" >
 <!ENTITY pref.timezone.Asia.Brunei "Asia/Brunei" >
 <!ENTITY pref.timezone.Asia.Calcutta "Asia/Calcutta" >
-<!ENTITY pref.timezone.Asia.Chungking "Asia/Chungking" >
+<!ENTITY pref.timezone.Asia.Choibalsan "Asia/Choibalsan" >
+<!ENTITY pref.timezone.Asia.Chongqing "Asia/Chongqing" >
 <!ENTITY pref.timezone.Asia.Colombo "Asia/Colombo" >
 <!ENTITY pref.timezone.Asia.Damascus "Asia/Damascus" >
 <!ENTITY pref.timezone.Asia.Dhaka "Asia/Dhaka" >
@@ -261,20 +272,24 @@
 <!ENTITY pref.timezone.Asia.Kuala_Lumpur "Asia/Kuala_Lumpur" >
 <!ENTITY pref.timezone.Asia.Kuching "Asia/Kuching" >
 <!ENTITY pref.timezone.Asia.Kuwait "Asia/Kuwait" >
-<!ENTITY pref.timezone.Asia.Macao "Asia/Macao" >
+<!ENTITY pref.timezone.Asia.Macau "Asia/Macau" >
 <!ENTITY pref.timezone.Asia.Magadan "Asia/Magadan" >
+<!ENTITY pref.timezone.Asia.Makassar "Asia/Makassar" >
 <!ENTITY pref.timezone.Asia.Manila "Asia/Manila" >
 <!ENTITY pref.timezone.Asia.Muscat "Asia/Muscat" >
 <!ENTITY pref.timezone.Asia.Nicosia "Asia/Nicosia" >
 <!ENTITY pref.timezone.Asia.Novosibirsk "Asia/Novosibirsk" >
 <!ENTITY pref.timezone.Asia.Omsk "Asia/Omsk" >
+<!ENTITY pref.timezone.Asia.Oral "Asia/Oral" >
 <!ENTITY pref.timezone.Asia.Phnom_Penh "Asia/Phnom_Penh" >
 <!ENTITY pref.timezone.Asia.Pontianak "Asia/Pontianak" >
 <!ENTITY pref.timezone.Asia.Pyongyang "Asia/Pyongyang" >
 <!ENTITY pref.timezone.Asia.Qatar "Asia/Qatar" >
+<!ENTITY pref.timezone.Asia.Qyzylorda "Asia/Qyzylorda" >
 <!ENTITY pref.timezone.Asia.Rangoon "Asia/Rangoon" >
 <!ENTITY pref.timezone.Asia.Riyadh "Asia/Riyadh" >
 <!ENTITY pref.timezone.Asia.Saigon "Asia/Saigon" >
+<!ENTITY pref.timezone.Asia.Sakhalin "Asia/Sakhalin" >
 <!ENTITY pref.timezone.Asia.Samarkand "Asia/Samarkand" >
 <!ENTITY pref.timezone.Asia.Seoul "Asia/Seoul" >
 <!ENTITY pref.timezone.Asia.Shanghai "Asia/Shanghai" >
@@ -285,7 +300,6 @@
 <!ENTITY pref.timezone.Asia.Tehran "Asia/Tehran" >
 <!ENTITY pref.timezone.Asia.Thimphu "Asia/Thimphu" >
 <!ENTITY pref.timezone.Asia.Tokyo "Asia/Tokyo" >
-<!ENTITY pref.timezone.Asia.Ujung_Pandang "Asia/Ujung_Pandang" >
 <!ENTITY pref.timezone.Asia.Ulaanbaatar "Asia/Ulaanbaatar" >
 <!ENTITY pref.timezone.Asia.Urumqi "Asia/Urumqi" >
 <!ENTITY pref.timezone.Asia.Vientiane "Asia/Vientiane" >
@@ -342,6 +356,7 @@
 <!ENTITY pref.timezone.Europe.Luxembourg "Europe/Luxembourg" >
 <!ENTITY pref.timezone.Europe.Madrid "Europe/Madrid" >
 <!ENTITY pref.timezone.Europe.Malta "Europe/Malta" >
+<!ENTITY pref.timezone.Europe.Mariehamn "Europe/Mariehamn" >
 <!ENTITY pref.timezone.Europe.Minsk "Europe/Minsk" >
 <!ENTITY pref.timezone.Europe.Monaco "Europe/Monaco" >
 <!ENTITY pref.timezone.Europe.Moscow "Europe/Moscow" >
diff --git a/mozilla/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul b/mozilla/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
index fc3d719bd32..d71aac655fc 100644
--- a/mozilla/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
+++ b/mozilla/calendar/prototypes/wcap/sun-calendar-event-dialog-timezone.xul
@@ -183,12 +183,34 @@
                 value="/mozilla.org/20070129_1/America/Antigua"/>
       <menuitem label="&pref.timezone.America.Araguaina;"
                 value="/mozilla.org/20070129_1/America/Araguaina"/>
+      <menuitem label="&pref.timezone.America.Argentina.Buenos_Aires;"
+                value="/mozilla.org/20070129_1/America/Argentina/Buenos_Aires"/>
+      <menuitem label="&pref.timezone.America.Argentina.Catamarca;"
+                value="/mozilla.org/20070129_1/America/Argentina/Catamarca"/>
+      <menuitem label="&pref.timezone.America.Argentina.Cordoba;"
+                value="/mozilla.org/20070129_1/America/Argentina/Cordoba"/>
+      <menuitem label="&pref.timezone.America.Argentina.Jujuy;"
+                value="/mozilla.org/20070129_1/America/Argentina/Jujuy"/>
+      <menuitem label="&pref.timezone.America.Argentina.La_Rioja;"
+                value="/mozilla.org/20070129_1/America/Argentina/La_Rioja"/>
+      <menuitem label="&pref.timezone.America.Argentina.Mendoza;"
+                value="/mozilla.org/20070129_1/America/Argentina/Mendoza"/>
+      <menuitem label="&pref.timezone.America.Argentina.Rio_Gallegos;"
+                value="/mozilla.org/20070129_1/America/Argentina/Rio_Gallegos"/>
+      <menuitem label="&pref.timezone.America.Argentina.San_Juan;"
+                value="/mozilla.org/20070129_1/America/Argentina/San_Juan"/>
+      <menuitem label="&pref.timezone.America.Argentina.Tucuman;"
+                value="/mozilla.org/20070129_1/America/Argentina/Tucuman"/>
+      <menuitem label="&pref.timezone.America.Argentina.Ushuaia;"
+                value="/mozilla.org/20070129_1/America/Argentina/Ushuaia"/>
       <menuitem label="&pref.timezone.America.Aruba;"
                 value="/mozilla.org/20070129_1/America/Aruba"/>
       <menuitem label="&pref.timezone.America.Asuncion;"
                 value="/mozilla.org/20070129_1/America/Asuncion"/>
       <menuitem label="&pref.timezone.America.Atikokan;"
                 value="/mozilla.org/20070129_1/America/Atikokan"/>
+      <menuitem label="&pref.timezone.America.Bahia;"
+                value="/mozilla.org/20070129_1/America/Bahia"/>
       <menuitem label="&pref.timezone.America.Barbados;"
                 value="/mozilla.org/20070129_1/America/Barbados"/>
       <menuitem label="&pref.timezone.America.Belem;"
@@ -203,16 +225,14 @@
                 value="/mozilla.org/20070129_1/America/Bogota"/>
       <menuitem label="&pref.timezone.America.Boise;"
                 value="/mozilla.org/20070129_1/America/Boise"/>
-      <menuitem label="&pref.timezone.America.Buenos_Aires;"
-                value="/mozilla.org/20070129_1/America/Buenos_Aires"/>
       <menuitem label="&pref.timezone.America.Cambridge_Bay;"
                 value="/mozilla.org/20070129_1/America/Cambridge_Bay"/>
+      <menuitem label="&pref.timezone.America.Campo_Grande;"
+                value="/mozilla.org/20070129_1/America/Campo_Grande"/>
       <menuitem label="&pref.timezone.America.Cancun;"
                 value="/mozilla.org/20070129_1/America/Cancun"/>
       <menuitem label="&pref.timezone.America.Caracas;"
                 value="/mozilla.org/20070129_1/America/Caracas"/>
-      <menuitem label="&pref.timezone.America.Catamarca;"
-                value="/mozilla.org/20070129_1/America/Catamarca"/>
       <menuitem label="&pref.timezone.America.Cayenne;"
                 value="/mozilla.org/20070129_1/America/Cayenne"/>
       <menuitem label="&pref.timezone.America.Cayman;"
@@ -221,14 +241,14 @@
                 value="/mozilla.org/20070129_1/America/Chicago"/>
       <menuitem label="&pref.timezone.America.Chihuahua;"
                 value="/mozilla.org/20070129_1/America/Chihuahua"/>
-      <menuitem label="&pref.timezone.America.Cordoba;"
-                value="/mozilla.org/20070129_1/America/Cordoba"/>
       <menuitem label="&pref.timezone.America.Costa_Rica;"
                 value="/mozilla.org/20070129_1/America/Costa_Rica"/>
       <menuitem label="&pref.timezone.America.Cuiaba;"
                 value="/mozilla.org/20070129_1/America/Cuiaba"/>
       <menuitem label="&pref.timezone.America.Curacao;"
                 value="/mozilla.org/20070129_1/America/Curacao"/>
+      <menuitem label="&pref.timezone.America.Danmarkshavn;"
+                value="/mozilla.org/20070129_1/America/Danmarkshavn"/>
       <menuitem label="&pref.timezone.America.Dawson;"
                 value="/mozilla.org/20070129_1/America/Dawson"/>
       <menuitem label="&pref.timezone.America.Dawson_Creek;"
@@ -289,8 +309,6 @@
                 value="/mozilla.org/20070129_1/America/Iqaluit"/>
       <menuitem label="&pref.timezone.America.Jamaica;"
                 value="/mozilla.org/20070129_1/America/Jamaica"/>
-      <menuitem label="&pref.timezone.America.Jujuy;"
-                value="/mozilla.org/20070129_1/America/Jujuy"/>
       <menuitem label="&pref.timezone.America.Juneau;"
                 value="/mozilla.org/20070129_1/America/Juneau"/>
       <menuitem label="&pref.timezone.America.Kentucky.Louisville;"
@@ -313,8 +331,6 @@
                 value="/mozilla.org/20070129_1/America/Martinique"/>
       <menuitem label="&pref.timezone.America.Mazatlan;"
                 value="/mozilla.org/20070129_1/America/Mazatlan"/>
-      <menuitem label="&pref.timezone.America.Mendoza;"
-                value="/mozilla.org/20070129_1/America/Mendoza"/>
       <menuitem label="&pref.timezone.America.Menominee;"
                 value="/mozilla.org/20070129_1/America/Menominee"/>
       <menuitem label="&pref.timezone.America.Merida;"
@@ -343,6 +359,8 @@
                 value="/mozilla.org/20070129_1/America/Nome"/>
       <menuitem label="&pref.timezone.America.Noronha;"
                 value="/mozilla.org/20070129_1/America/Noronha"/>
+      <menuitem label="&pref.timezone.America.North_Dakota.Center;"
+                value="/mozilla.org/20070129_1/America/North_Dakota/Center"/>
       <menuitem label="&pref.timezone.America.North_Dakota.New_Salem;"
                 value="/mozilla.org/20070129_1/America/North_Dakota/New_Salem"/>
       <menuitem label="&pref.timezone.America.Panama;"
@@ -371,8 +389,6 @@
                 value="/mozilla.org/20070129_1/America/Regina"/>
       <menuitem label="&pref.timezone.America.Rio_Branco;"
                 value="/mozilla.org/20070129_1/America/Rio_Branco"/>
-      <menuitem label="&pref.timezone.America.Rosario;"
-                value="/mozilla.org/20070129_1/America/Rosario"/>
       <menuitem label="&pref.timezone.America.Santiago;"
                 value="/mozilla.org/20070129_1/America/Santiago"/>
       <menuitem label="&pref.timezone.America.Santo_Domingo;"
@@ -403,6 +419,8 @@
                 value="/mozilla.org/20070129_1/America/Thunder_Bay"/>
       <menuitem label="&pref.timezone.America.Tijuana;"
                 value="/mozilla.org/20070129_1/America/Tijuana"/>
+      <menuitem label="&pref.timezone.America.Toronto;"
+                value="/mozilla.org/20070129_1/America/Toronto"/>
       <menuitem label="&pref.timezone.America.Tortola;"
                 value="/mozilla.org/20070129_1/America/Tortola"/>
       <menuitem label="&pref.timezone.America.Vancouver;"
@@ -427,6 +445,8 @@
                 value="/mozilla.org/20070129_1/Antarctica/McMurdo"/>
       <menuitem label="&pref.timezone.Antarctica.Palmer;"
                 value="/mozilla.org/20070129_1/Antarctica/Palmer"/>
+      <menuitem label="&pref.timezone.Antarctica.Rothera;"
+                value="/mozilla.org/20070129_1/Antarctica/Rothera"/>
       <menuitem label="&pref.timezone.Antarctica.South_Pole;"
                 value="/mozilla.org/20070129_1/Antarctica/South_Pole"/>
       <menuitem label="&pref.timezone.Antarctica.Syowa;"
@@ -465,8 +485,10 @@
                 value="/mozilla.org/20070129_1/Asia/Brunei"/>
       <menuitem label="&pref.timezone.Asia.Calcutta;"
                 value="/mozilla.org/20070129_1/Asia/Calcutta"/>
-      <menuitem label="&pref.timezone.Asia.Chungking;"
-                value="/mozilla.org/20070129_1/Asia/Chungking"/>
+      <menuitem label="&pref.timezone.Asia.Choibalsan;"
+                value="/mozilla.org/20070129_1/Asia/Choibalsan"/>
+      <menuitem label="&pref.timezone.Asia.Chongqing;"
+                value="/mozilla.org/20070129_1/Asia/Chongqing"/>
       <menuitem label="&pref.timezone.Asia.Colombo;"
                 value="/mozilla.org/20070129_1/Asia/Colombo"/>
       <menuitem label="&pref.timezone.Asia.Damascus;"
@@ -515,10 +537,12 @@
                 value="/mozilla.org/20070129_1/Asia/Kuching"/>
       <menuitem label="&pref.timezone.Asia.Kuwait;"
                 value="/mozilla.org/20070129_1/Asia/Kuwait"/>
-      <menuitem label="&pref.timezone.Asia.Macao;"
-                value="/mozilla.org/20070129_1/Asia/Macao"/>
+      <menuitem label="&pref.timezone.Asia.Macau;"
+                value="/mozilla.org/20070129_1/Asia/Macau"/>
       <menuitem label="&pref.timezone.Asia.Magadan;"
                 value="/mozilla.org/20070129_1/Asia/Magadan"/>
+      <menuitem label="&pref.timezone.Asia.Makassar;"
+                value="/mozilla.org/20070129_1/Asia/Makassar"/>
       <menuitem label="&pref.timezone.Asia.Manila;"
                 value="/mozilla.org/20070129_1/Asia/Manila"/>
       <menuitem label="&pref.timezone.Asia.Muscat;"
@@ -529,6 +553,8 @@
                 value="/mozilla.org/20070129_1/Asia/Novosibirsk"/>
       <menuitem label="&pref.timezone.Asia.Omsk;"
                 value="/mozilla.org/20070129_1/Asia/Omsk"/>
+      <menuitem label="&pref.timezone.Asia.Oral;"
+                value="/mozilla.org/20070129_1/Asia/Oral"/>
       <menuitem label="&pref.timezone.Asia.Phnom_Penh;"
                 value="/mozilla.org/20070129_1/Asia/Phnom_Penh"/>
       <menuitem label="&pref.timezone.Asia.Pontianak;"
@@ -537,12 +563,16 @@
                 value="/mozilla.org/20070129_1/Asia/Pyongyang"/>
       <menuitem label="&pref.timezone.Asia.Qatar;"
                 value="/mozilla.org/20070129_1/Asia/Qatar"/>
+      <menuitem label="&pref.timezone.Asia.Qyzylorda;"
+                value="/mozilla.org/20070129_1/Asia/Qyzylorda"/>
       <menuitem label="&pref.timezone.Asia.Rangoon;"
                 value="/mozilla.org/20070129_1/Asia/Rangoon"/>
       <menuitem label="&pref.timezone.Asia.Riyadh;"
                 value="/mozilla.org/20070129_1/Asia/Riyadh"/>
       <menuitem label="&pref.timezone.Asia.Saigon;"
                 value="/mozilla.org/20070129_1/Asia/Saigon"/>
+      <menuitem label="&pref.timezone.Asia.Sakhalin;"
+                value="/mozilla.org/20070129_1/Asia/Sakhalin"/>
       <menuitem label="&pref.timezone.Asia.Samarkand;"
                 value="/mozilla.org/20070129_1/Asia/Samarkand"/>
       <menuitem label="&pref.timezone.Asia.Seoul;"
@@ -563,8 +593,6 @@
                 value="/mozilla.org/20070129_1/Asia/Thimphu"/>
       <menuitem label="&pref.timezone.Asia.Tokyo;"
                 value="/mozilla.org/20070129_1/Asia/Tokyo"/>
-      <menuitem label="&pref.timezone.Asia.Ujung_Pandang;"
-                value="/mozilla.org/20070129_1/Asia/Ujung_Pandang"/>
       <menuitem label="&pref.timezone.Asia.Ulaanbaatar;"
                 value="/mozilla.org/20070129_1/Asia/Ulaanbaatar"/>
       <menuitem label="&pref.timezone.Asia.Urumqi;"
@@ -677,6 +705,8 @@
                 value="/mozilla.org/20070129_1/Europe/Madrid"/>
       <menuitem label="&pref.timezone.Europe.Malta;"
                 value="/mozilla.org/20070129_1/Europe/Malta"/>
+      <menuitem label="&pref.timezone.Europe.Mariehamn;"
+                value="/mozilla.org/20070129_1/Europe/Mariehamn"/>
       <menuitem label="&pref.timezone.Europe.Minsk;"
                 value="/mozilla.org/20070129_1/Europe/Minsk"/>
       <menuitem label="&pref.timezone.Europe.Monaco;"