From c8a01d74b1dc81f77e7f17a5eb52e1d87658fbc2 Mon Sep 17 00:00:00 2001
From: "mostafah%oeone.com"
 <mostafah%oeone.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 9 Sep 2004 14:58:15 +0000
Subject: [PATCH] Checked in patch for bug 258369: Adding city to "my Timezone

git-svn-id: svn://10.0.0.236/trunk@161981 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/calendar/resources/content/pref/timezonePrefs.xul | 1 +
 mozilla/calendar/resources/locale/cs-CZ/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/cy-GB/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/de-AT/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/en-US/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/es-ES/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/fr-FR/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/hu-HU/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/ja-JP/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/lt-LT/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/nl-NL/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/pl-PL/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/pt-BR/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/sk-SK/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/sl-SI/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/sv-SE/prefs.dtd         | 1 +
 mozilla/calendar/resources/locale/wen-DE/prefs.dtd        | 1 +
 17 files changed, 17 insertions(+)

diff --git a/mozilla/calendar/resources/content/pref/timezonePrefs.xul b/mozilla/calendar/resources/content/pref/timezonePrefs.xul
index 3b70a161593..f2f796c8fbc 100644
--- a/mozilla/calendar/resources/content/pref/timezonePrefs.xul
+++ b/mozilla/calendar/resources/content/pref/timezonePrefs.xul
@@ -71,6 +71,7 @@
 <groupbox>
 	<caption label="&pref.calendar.timezone.caption;"/>
 	<description>This doesn't yet do anything.</description>
+        <description>&pref.calendar.timezone.description;</description>
 	<hbox  align="center">
 		<description>&pref.defaultzone.label;</description>
         <menulist id="defaultzone" preftype="string" prefstring="calendar.timezone.default">
diff --git a/mozilla/calendar/resources/locale/cs-CZ/prefs.dtd b/mozilla/calendar/resources/locale/cs-CZ/prefs.dtd
index e976a05470e..5fb0494229b 100644
--- a/mozilla/calendar/resources/locale/cs-CZ/prefs.dtd
+++ b/mozilla/calendar/resources/locale/cs-CZ/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Časová zóna">
 <!ENTITY pref.calendar.timezone.caption "Časová zóna">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Výchozí časová zóna:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrika/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/cy-GB/prefs.dtd b/mozilla/calendar/resources/locale/cy-GB/prefs.dtd
index 0b067490b89..0ce3ec51353 100644
--- a/mozilla/calendar/resources/locale/cy-GB/prefs.dtd
+++ b/mozilla/calendar/resources/locale/cy-GB/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Cylchfa Amser">
 <!ENTITY pref.calendar.timezone.caption "Cylchfa Amser">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Cylchfa Amser Rhagosodedig:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Affrica/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/de-AT/prefs.dtd b/mozilla/calendar/resources/locale/de-AT/prefs.dtd
index 31dc69cb2bd..b08b79dd319 100644
--- a/mozilla/calendar/resources/locale/de-AT/prefs.dtd
+++ b/mozilla/calendar/resources/locale/de-AT/prefs.dtd
@@ -140,6 +140,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Meine Zeitzone">
 <!ENTITY pref.calendar.timezone.caption "Zeitzone">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Standard-Zeitzone:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Africa/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/en-US/prefs.dtd b/mozilla/calendar/resources/locale/en-US/prefs.dtd
index 11b21c5dbdc..1de6dea83a8 100644
--- a/mozilla/calendar/resources/locale/en-US/prefs.dtd
+++ b/mozilla/calendar/resources/locale/en-US/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "My Timezone">
 <!ENTITY pref.calendar.timezone.caption "Timezone">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Default Timezone:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Africa/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/es-ES/prefs.dtd b/mozilla/calendar/resources/locale/es-ES/prefs.dtd
index 6c867580195..2bf4a5afdfc 100644
--- a/mozilla/calendar/resources/locale/es-ES/prefs.dtd
+++ b/mozilla/calendar/resources/locale/es-ES/prefs.dtd
@@ -139,6 +139,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Mi zona horaria">
 <!ENTITY pref.calendar.timezone.caption "Zona horaria">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Zona horaria predeterminada:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Africa/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/fr-FR/prefs.dtd b/mozilla/calendar/resources/locale/fr-FR/prefs.dtd
index baa8f96966a..273ffbee7ec 100644
--- a/mozilla/calendar/resources/locale/fr-FR/prefs.dtd
+++ b/mozilla/calendar/resources/locale/fr-FR/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Mon fuseau horaire">
 <!ENTITY pref.calendar.timezone.caption "Fuseau horaire">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Fuseau horaire par défaut :" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrique/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/hu-HU/prefs.dtd b/mozilla/calendar/resources/locale/hu-HU/prefs.dtd
index a46467414df..9098e77db9a 100644
--- a/mozilla/calendar/resources/locale/hu-HU/prefs.dtd
+++ b/mozilla/calendar/resources/locale/hu-HU/prefs.dtd
@@ -143,6 +143,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Saját időzóna">
 <!ENTITY pref.calendar.timezone.caption "Időzóna">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Alapértelmezett időzóna" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrika/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/ja-JP/prefs.dtd b/mozilla/calendar/resources/locale/ja-JP/prefs.dtd
index a800fa834d5..36d1458959b 100644
--- a/mozilla/calendar/resources/locale/ja-JP/prefs.dtd
+++ b/mozilla/calendar/resources/locale/ja-JP/prefs.dtd
@@ -144,6 +144,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "タイムゾーン">
 <!ENTITY pref.calendar.timezone.caption "タイムゾーン">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "標準のタイムゾーン:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "アフリカ/アビジャン" >
diff --git a/mozilla/calendar/resources/locale/lt-LT/prefs.dtd b/mozilla/calendar/resources/locale/lt-LT/prefs.dtd
index f8c544c2946..d04794485b9 100644
--- a/mozilla/calendar/resources/locale/lt-LT/prefs.dtd
+++ b/mozilla/calendar/resources/locale/lt-LT/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Laiko juosta">
 <!ENTITY pref.calendar.timezone.caption "Laiko juosta">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Numatytoji laiko juosta:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrika/Abidžanas" >
diff --git a/mozilla/calendar/resources/locale/nl-NL/prefs.dtd b/mozilla/calendar/resources/locale/nl-NL/prefs.dtd
index 0a936e57769..7044aa62275 100644
--- a/mozilla/calendar/resources/locale/nl-NL/prefs.dtd
+++ b/mozilla/calendar/resources/locale/nl-NL/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Mijn tijdzone">
 <!ENTITY pref.calendar.timezone.caption "Tijdzone">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Standaard tijdzone:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrika/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/pl-PL/prefs.dtd b/mozilla/calendar/resources/locale/pl-PL/prefs.dtd
index e2b7f1c0e70..0ea7accf074 100644
--- a/mozilla/calendar/resources/locale/pl-PL/prefs.dtd
+++ b/mozilla/calendar/resources/locale/pl-PL/prefs.dtd
@@ -139,6 +139,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Moja strefa czasowa">
 <!ENTITY pref.calendar.timezone.caption "Strefa czasowa">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Domyślna strefa czasowa:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afryka/Abidżan" >
diff --git a/mozilla/calendar/resources/locale/pt-BR/prefs.dtd b/mozilla/calendar/resources/locale/pt-BR/prefs.dtd
index 1b3e8ab83c7..62f448eecc1 100644
--- a/mozilla/calendar/resources/locale/pt-BR/prefs.dtd
+++ b/mozilla/calendar/resources/locale/pt-BR/prefs.dtd
@@ -142,6 +142,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Fuso Hor&#xE1;rio">
 <!ENTITY pref.calendar.timezone.caption "Fuso Hor&#xE1;rio">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Fuso Hor&#xE1;rio Padr&#xE3;o:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Africa/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/sk-SK/prefs.dtd b/mozilla/calendar/resources/locale/sk-SK/prefs.dtd
index 5d5d23cc7c9..0bbc78f14d1 100644
--- a/mozilla/calendar/resources/locale/sk-SK/prefs.dtd
+++ b/mozilla/calendar/resources/locale/sk-SK/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Časová zóna">
 <!ENTITY pref.calendar.timezone.caption "Časová zóna">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Východzia časová zóna:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrika/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/sl-SI/prefs.dtd b/mozilla/calendar/resources/locale/sl-SI/prefs.dtd
index 6aa07991c4d..c7924798c2a 100644
--- a/mozilla/calendar/resources/locale/sl-SI/prefs.dtd
+++ b/mozilla/calendar/resources/locale/sl-SI/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Moj časovni pas">
 <!ENTITY pref.calendar.timezone.caption "Časovni pas">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label "Privzet časovni pas:">
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrika/Abidžan">
diff --git a/mozilla/calendar/resources/locale/sv-SE/prefs.dtd b/mozilla/calendar/resources/locale/sv-SE/prefs.dtd
index f6d1ac443c7..f6a3d0b19a7 100644
--- a/mozilla/calendar/resources/locale/sv-SE/prefs.dtd
+++ b/mozilla/calendar/resources/locale/sv-SE/prefs.dtd
@@ -142,6 +142,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Min Tidszon">
 <!ENTITY pref.calendar.timezone.caption "Tidszon">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Standard Tidszon:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrika/Abidjan" >
diff --git a/mozilla/calendar/resources/locale/wen-DE/prefs.dtd b/mozilla/calendar/resources/locale/wen-DE/prefs.dtd
index da8314dcfde..17d25ec0889 100644
--- a/mozilla/calendar/resources/locale/wen-DE/prefs.dtd
+++ b/mozilla/calendar/resources/locale/wen-DE/prefs.dtd
@@ -141,6 +141,7 @@
 <!-- Calendar Timezone preferences information -->
 <!ENTITY pref.calendar.timezone.label "Moje časowe pasmo">
 <!ENTITY pref.calendar.timezone.caption "Časowe pasmo">
+<!ENTITY pref.calendar.timezone.description "Timezone ID is (continent or ocean)/(largest city in legal timezone region).">
 <!ENTITY pref.defaultzone.label     "Standardne časowe pasmo:" >
 
 <!ENTITY pref.timezone.Africa.Abidjan "Afrika/Abidjan" >