[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r2129 - in tzdata/trunk/debian: . po



Author: aurel32
Date: 2007-04-25 13:28:13 +0000 (Wed, 25 Apr 2007)
New Revision: 2129

Modified:
   tzdata/trunk/debian/changelog
   tzdata/trunk/debian/po/en.po
   tzdata/trunk/debian/po/fr.po
   tzdata/trunk/debian/po/templates.pot
   tzdata/trunk/debian/rules
   tzdata/trunk/debian/templates
Log:
  * Remove the US area, all cities are already in America.
  * Add Arctic area.



Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog	2007-04-25 13:27:13 UTC (rev 2128)
+++ tzdata/trunk/debian/changelog	2007-04-25 13:28:13 UTC (rev 2129)
@@ -2,6 +2,8 @@
 
   * Convert old or single-level timezones into two-level timezones 
     (closes: bug#420895).
+  * Remove the US area, all cities are already in America.
+  * Add Arctic area.
 
  -- Aurelien Jarno <aurel32@debian.org>  Wed, 25 Apr 2007 09:25:46 -0400
 

Modified: tzdata/trunk/debian/po/en.po
===================================================================
--- tzdata/trunk/debian/po/en.po	2007-04-25 13:27:13 UTC (rev 2128)
+++ tzdata/trunk/debian/po/en.po	2007-04-25 13:28:13 UTC (rev 2129)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-24 23:12+0200\n"
+"POT-Creation-Date: 2007-04-25 07:21-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,6 +53,14 @@
 #. Translators: "Etc" will present users with a list
 #. of "GMT+xx" or "GMT-xx" timezones
 #: ../templates:1001
+msgid "Arctic"
+msgstr "Arctic Ocean"
+
+#. Type: select
+#. Choices
+#. Translators: "Etc" will present users with a list
+#. of "GMT+xx" or "GMT-xx" timezones
+#: ../templates:1001
 msgid "Asia"
 msgstr "Asia"
 
@@ -62,7 +70,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. Type: select
 #. Choices
-#: ../templates:1001 ../templates:8001
+#: ../templates:1001 ../templates:9001
 msgid "Atlantic"
 msgstr "Atlantic Ocean"
 
@@ -96,9 +104,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:1001 ../templates:8001 ../templates:12001
+#: ../templates:1001 ../templates:9001
 msgid "Pacific"
 msgstr "Pacific Ocean"
 
@@ -107,14 +113,6 @@
 #. Translators: "Etc" will present users with a list
 #. of "GMT+xx" or "GMT-xx" timezones
 #: ../templates:1001
-msgid "US"
-msgstr "United States"
-
-#. Type: select
-#. Choices
-#. Translators: "Etc" will present users with a list
-#. of "GMT+xx" or "GMT-xx" timezones
-#: ../templates:1001
 msgid "SystemV"
 msgstr "System V timezones"
 
@@ -1483,186 +1481,192 @@
 #. Type: select
 #. Choices
 #: ../templates:6001
+msgid "Longyearbyen"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:7001
 msgid "Aden"
 msgstr "Aden"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Almaty"
 msgstr "Almaty"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Amman"
 msgstr "Amman"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Anadyr"
 msgstr "Anadyr"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Aqtau"
 msgstr "Aqtau"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Aqtobe"
 msgstr "Aqtobe"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ashgabat"
 msgstr "Ashgabat"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ashkhabad"
 msgstr "Ashkhabad"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Baghdad"
 msgstr "Baghdad"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bahrain"
 msgstr "Bahrain"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Baku"
 msgstr "Baku"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bangkok"
 msgstr "Bangkok"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Beirut"
 msgstr "Beirut"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bishkek"
 msgstr "Bishkek"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Brunei"
 msgstr "Brunei"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Calcutta"
 msgstr "Calcutta"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Choibalsan"
 msgstr "Choibalsan"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Chongqing"
 msgstr "Chongqing"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Chungking"
 msgstr "Chungking"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Colombo"
 msgstr "Colombo"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dacca"
 msgstr "Dacca"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Damascus"
 msgstr "Damascus"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dhaka"
 msgstr "Dhaka"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dili"
 msgstr "Dili"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dubai"
 msgstr "Dubai"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dushanbe"
 msgstr "Dushanbe"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Gaza"
 msgstr "Gaza"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Hong_Kong"
 msgstr "Hong_Kong"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Hovd"
 msgstr "Hovd"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Irkutsk"
 msgstr "Irkutsk"
 
@@ -1670,115 +1674,115 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../templates:6001 ../templates:9001
+#: ../templates:7001 ../templates:10001
 msgid "Istanbul"
 msgstr "Istanbul"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jakarta"
 msgstr "Jakarta"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jayapura"
 msgstr "Jayapura"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jerusalem"
 msgstr "Jerusalem"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kabul"
 msgstr "Kabul"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kamchatka"
 msgstr "Kamchatka"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Karachi"
 msgstr "Karachi"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kashgar"
 msgstr "Kashgar"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Katmandu"
 msgstr "Katmandu"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Krasnoyarsk"
 msgstr "Krasnoyarsk"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuala_Lumpur"
 msgstr "Kuala_Lumpur"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuching"
 msgstr "Kuching"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuwait"
 msgstr "Kuwait"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Macao"
 msgstr "Macao"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Macau"
 msgstr "Macau"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Magadan"
 msgstr "Magadan"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Makassar"
 msgstr "Makassar"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Manila"
 msgstr "Manila"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Muscat"
 msgstr "Muscat"
 
@@ -1786,1034 +1790,984 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../templates:6001 ../templates:9001
+#: ../templates:7001 ../templates:10001
 msgid "Nicosia"
 msgstr "Nicosia"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Novosibirsk"
 msgstr "Novosibirsk"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Omsk"
 msgstr "Omsk"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Oral"
 msgstr "Oral"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Phnom_Penh"
 msgstr "Phnom Penh"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Pontianak"
 msgstr "Pontianak"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Pyongyang"
 msgstr "Pyongyang"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Qatar"
 msgstr "Qatar"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Qyzylorda"
 msgstr "Qyzylorda"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Rangoon"
 msgstr "Rangoon"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh"
 msgstr "Riyadh"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh87"
 msgstr "Riyadh87"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh88"
 msgstr "Riyadh88"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh89"
 msgstr "Riyadh89"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Saigon"
 msgstr "Saigon"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Sakhalin"
 msgstr "Sakhalin"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Samarkand"
 msgstr "Samarkand"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Seoul"
 msgstr "Seoul"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Shanghai"
 msgstr "Shanghai"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Singapore"
 msgstr "Singapore"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Taipei"
 msgstr "Taipei"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tashkent"
 msgstr "Tashkent"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tbilisi"
 msgstr "Tbilisi"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tehran"
 msgstr "Tehran"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tel_Aviv"
 msgstr "Tel Aviv"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Thimbu"
 msgstr "Thimbu"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Thimphu"
 msgstr "Thimphu"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tokyo"
 msgstr "Tokyo"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ujung_Pandang"
 msgstr "Ujung Pandang"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ulaanbaatar"
 msgstr "Ulaanbaatar"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ulan_Bator"
 msgstr "Ulan Bator"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Urumqi"
 msgstr "Urumqi"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Vientiane"
 msgstr "Vientiane"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Vladivostok"
 msgstr "Vladivostok"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yakutsk"
 msgstr "Yakutsk"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yekaterinburg"
 msgstr "Yekaterinburg"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yerevan"
 msgstr "Yerevan"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Azores"
 msgstr "Azores"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Bermuda"
 msgstr "Bermuda"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Canary"
 msgstr "Canary"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Cape_Verde"
 msgstr "Cape_Verde"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Faeroe"
 msgstr "Faeroe"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Faroe"
 msgstr "Faroe"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Jan_Mayen"
 msgstr "Jan Mayen"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Madeira"
 msgstr "Madeira"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Reykjavik"
 msgstr "Reykjavik"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "South_Georgia"
 msgstr "South_Georgia"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "St_Helena"
 msgstr "St_Helena"
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Stanley"
 msgstr "Stanley"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Central"
 msgstr "Central"
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "East-Saskatchewan"
 msgstr "East-Saskatchewan"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Eastern"
 msgstr "Eastern"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Mountain"
 msgstr "Mountain"
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Newfoundland"
 msgstr "Newfoundland"
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Saskatchewan"
 msgstr "Saskatchewan"
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Yukon"
 msgstr "Yukon"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Andorra"
 msgstr "Andorra"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Athens"
 msgstr "Athens"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Belfast"
 msgstr "Belfast"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Belgrade"
 msgstr "Belgrade"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Berlin"
 msgstr "Berlin"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Bratislava"
 msgstr "Bratislava"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Brussels"
 msgstr "Brussels"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Bucharest"
 msgstr "Bucharest"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Budapest"
 msgstr "Budapest"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Chisinau"
 msgstr "Chisinau"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Copenhagen"
 msgstr "Copenhagen"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Dublin"
 msgstr "Dublin"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Guernsey"
 msgstr "Guernsey"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Helsinki"
 msgstr "Helsinki"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Isle_of_Man"
 msgstr "Isle of Man"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Jersey"
 msgstr "Jersey"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Kaliningrad"
 msgstr "Kaliningrad"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Kiev"
 msgstr "Kiev"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Lisbon"
 msgstr "Lisbon"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "London"
 msgstr "London"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Madrid"
 msgstr "Madrid"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Malta"
 msgstr "Malta"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Mariehamn"
 msgstr "Mariehamn"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Minsk"
 msgstr "Minsk"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Monaco"
 msgstr "Monaco"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Moscow"
 msgstr "Moscow"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Oslo"
 msgstr "Oslo"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Paris"
 msgstr "Paris"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Podgorica"
 msgstr "Podgorica"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Prague"
 msgstr "Prague"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Riga"
 msgstr "Riga"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Rome"
 msgstr "Rome"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Samara"
 msgstr "Samara"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "San_Marino"
 msgstr "San Marino"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Simferopol"
 msgstr "Simferopol"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Skopje"
 msgstr "Skopje"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Sofia"
 msgstr "Sofia"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tallinn"
 msgstr "Tallinn"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tirane"
 msgstr "Tirane"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tiraspol"
 msgstr "Tiraspol"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Uzhgorod"
 msgstr "Uzhgorod"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vaduz"
 msgstr "Vaduz"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vatican"
 msgstr "Vatican"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vienna"
 msgstr "Vienna"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vilnius"
 msgstr "Vilnius"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Volgograd"
 msgstr "Volgograd"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Warsaw"
 msgstr "Warsaw"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zagreb"
 msgstr "Zagreb"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zaporozhye"
 msgstr "Zaporozhye"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zurich"
 msgstr "Zurich"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Antananarivo"
 msgstr "Antananarivo"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Chagos"
 msgstr "Chagos"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Christmas"
 msgstr "Christmas"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Cocos"
 msgstr "Cocos"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Comoro"
 msgstr "Comoro"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Kerguelen"
 msgstr "Kerguelen"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mahe"
 msgstr "Mahe"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Maldives"
 msgstr "Maldives"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mauritius"
 msgstr "Mauritius"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mayotte"
 msgstr "Mayotte"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Reunion"
 msgstr "Reunion"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Apia"
 msgstr "Apia"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Auckland"
 msgstr "Auckland"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Chatham"
 msgstr "Chatham"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Easter"
 msgstr "Easter"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Efate"
 msgstr "Efate"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Enderbury"
 msgstr "Enderbury"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Fakaofo"
 msgstr "Fakaofo"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Fiji"
 msgstr "Fiji"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Funafuti"
 msgstr "Funafuti"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Galapagos"
 msgstr "Galapagos"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Gambier"
 msgstr "Gambier"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Guadalcanal"
 msgstr "Guadalcanal"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Guam"
 msgstr "Guam"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Honolulu"
 msgstr "Honolulu"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Johnston"
 msgstr "Johnston"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kiritimati"
 msgstr "Kiritimati"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kosrae"
 msgstr "Kosrae"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kwajalein"
 msgstr "Kwajalein"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Majuro"
 msgstr "Majuro"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Marquesas"
 msgstr "Marquesas"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Midway"
 msgstr "Midway"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Nauru"
 msgstr "Nauru"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Niue"
 msgstr "Niue"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Norfolk"
 msgstr "Norfolk"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Noumea"
 msgstr "Noumea"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Pago_Pago"
 msgstr "Pago Pago"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Palau"
 msgstr "Palau"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Ponape"
 msgstr "Ponape"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Port_Moresby"
 msgstr "Port Moresby"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Rarotonga"
 msgstr "Rarotonga"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Saipan"
 msgstr "Saipan"
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:11001 ../templates:12001
+#: ../templates:12001
 msgid "Samoa"
 msgstr "Samoa"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tahiti"
 msgstr "Tahiti"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tarawa"
 msgstr "Tarawa"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tongatapu"
 msgstr "Tongatapu"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Truk"
 msgstr "Truk"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Wake"
 msgstr "Wake"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Wallis"
 msgstr "Wallis"
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Yap"
 msgstr "Yap"
 
 #. Type: select
 #. Choices
-#: ../templates:12001
-msgid "Alaska"
-msgstr "Alaska"
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Aleutian"
-msgstr "Aleutian"
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Arizona"
-msgstr "Arizona"
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "East-Indiana"
-msgstr "East-Indiana"
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Hawaii"
-msgstr "Hawaii"
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Indiana-Starke"
-msgstr "Indiana-Starke"
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Michigan"
-msgstr "Michigan"
-
-#. Type: select
-#. Choices
 #: ../templates:13001
 msgid "AST4"
 msgstr "AST4"

Modified: tzdata/trunk/debian/po/fr.po
===================================================================
--- tzdata/trunk/debian/po/fr.po	2007-04-25 13:27:13 UTC (rev 2128)
+++ tzdata/trunk/debian/po/fr.po	2007-04-25 13:28:13 UTC (rev 2129)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-24 23:24+0200\n"
+"POT-Creation-Date: 2007-04-25 07:21-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,6 +53,14 @@
 #. Translators: "Etc" will present users with a list
 #. of "GMT+xx" or "GMT-xx" timezones
 #: ../templates:1001
+msgid "Arctic"
+msgstr "Océan Arctique"
+
+#. Type: select
+#. Choices
+#. Translators: "Etc" will present users with a list
+#. of "GMT+xx" or "GMT-xx" timezones
+#: ../templates:1001
 msgid "Asia"
 msgstr "Asie"
 
@@ -62,7 +70,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. Type: select
 #. Choices
-#: ../templates:1001 ../templates:8001
+#: ../templates:1001 ../templates:9001
 msgid "Atlantic"
 msgstr "Océan Atlantique"
 
@@ -96,9 +104,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:1001 ../templates:8001 ../templates:12001
+#: ../templates:1001 ../templates:9001
 msgid "Pacific"
 msgstr "Océan Pacifique"
 
@@ -107,14 +113,6 @@
 #. Translators: "Etc" will present users with a list
 #. of "GMT+xx" or "GMT-xx" timezones
 #: ../templates:1001
-msgid "US"
-msgstr "États-Unis"
-
-#. Type: select
-#. Choices
-#. Translators: "Etc" will present users with a list
-#. of "GMT+xx" or "GMT-xx" timezones
-#: ../templates:1001
 msgid "SystemV"
 msgstr "Système V"
 
@@ -1481,186 +1479,192 @@
 #. Type: select
 #. Choices
 #: ../templates:6001
+msgid "Longyearbyen"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:7001
 msgid "Aden"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Almaty"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Amman"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Anadyr"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Aqtau"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Aqtobe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ashgabat"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ashkhabad"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Baghdad"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bahrain"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Baku"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bangkok"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Beirut"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bishkek"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Brunei"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Calcutta"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Choibalsan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Chongqing"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Chungking"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Colombo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dacca"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Damascus"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dhaka"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dili"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dubai"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dushanbe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Gaza"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Harbin"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Hong_Kong"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Hovd"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Irkutsk"
 msgstr ""
 
@@ -1668,115 +1672,115 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../templates:6001 ../templates:9001
+#: ../templates:7001 ../templates:10001
 msgid "Istanbul"
 msgstr "Istanbul"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jakarta"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jayapura"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jerusalem"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kabul"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kamchatka"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Karachi"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kashgar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Katmandu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Krasnoyarsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuala_Lumpur"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuching"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuwait"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Macao"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Macau"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Magadan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Makassar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Manila"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Muscat"
 msgstr ""
 
@@ -1784,1034 +1788,984 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../templates:6001 ../templates:9001
+#: ../templates:7001 ../templates:10001
 msgid "Nicosia"
 msgstr "Nicosie"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Novosibirsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Omsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Oral"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Phnom_Penh"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Pontianak"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Pyongyang"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Qatar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Qyzylorda"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Rangoon"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh87"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh88"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh89"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Saigon"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Sakhalin"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Samarkand"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Seoul"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Shanghai"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Singapore"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Taipei"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tashkent"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tbilisi"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tehran"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tel_Aviv"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Thimbu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Thimphu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tokyo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ujung_Pandang"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ulaanbaatar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ulan_Bator"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Urumqi"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Vientiane"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Vladivostok"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yakutsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yekaterinburg"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yerevan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Azores"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Bermuda"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Canary"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Cape_Verde"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Faeroe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Faroe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Jan_Mayen"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Madeira"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Reykjavik"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "South_Georgia"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "St_Helena"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Stanley"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Central"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "East-Saskatchewan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Eastern"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Mountain"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Newfoundland"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Saskatchewan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Yukon"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Amsterdam"
 msgstr "Amsterdam"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Andorra"
 msgstr "Andorre"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Athens"
 msgstr "Athènes"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Belfast"
 msgstr "Belfast"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Belgrade"
 msgstr "Belgrade"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Berlin"
 msgstr "Berlin"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Bratislava"
 msgstr "Brastislava"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Brussels"
 msgstr "Bruxelles"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Bucharest"
 msgstr "Bucarest"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Budapest"
 msgstr "Budapest"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Chisinau"
 msgstr "Chisinau"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Copenhagen"
 msgstr "Copenhague"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Dublin"
 msgstr "Dublin"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Guernsey"
 msgstr "Guernesey"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Helsinki"
 msgstr "Helsinki"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Isle_of_Man"
 msgstr "Île de Man"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Jersey"
 msgstr "Jersey"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Kaliningrad"
 msgstr "Kaliningrad"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Kiev"
 msgstr "Kiev"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Lisbon"
 msgstr "Lisbonne"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Ljubljana"
 msgstr "Ljubljana"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "London"
 msgstr "Londres"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Madrid"
 msgstr "Madrid"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Malta"
 msgstr "Malte"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Mariehamn"
 msgstr "Mariehamn"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Minsk"
 msgstr "Minsk"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Monaco"
 msgstr "Monaco"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Moscow"
 msgstr "Moscou"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Oslo"
 msgstr "Oslo"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Paris"
 msgstr "Paris"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Podgorica"
 msgstr "Podgorica"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Prague"
 msgstr "Prague"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Riga"
 msgstr "Riga"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Rome"
 msgstr "Rome"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Samara"
 msgstr "Samara"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "San_Marino"
 msgstr "Saint-Marin"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Sarajevo"
 msgstr "Sarajevo"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Simferopol"
 msgstr "Simferopol"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Skopje"
 msgstr "Skopje"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Sofia"
 msgstr "Sofia"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Stockholm"
 msgstr "Stockholm"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tallinn"
 msgstr "Tallinn"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tirane"
 msgstr "Tirana"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tiraspol"
 msgstr "Tiraspol"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Uzhgorod"
 msgstr "Oujhorod"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vaduz"
 msgstr "Vaduz"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vatican"
 msgstr "Vatican"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vienna"
 msgstr "Vienne"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vilnius"
 msgstr "Vilnius"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Volgograd"
 msgstr "Volgograd"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Warsaw"
 msgstr "Varsovie"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zagreb"
 msgstr "Zagreb"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zaporozhye"
 msgstr "Zaporijia"
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zurich"
 msgstr "Zurich"
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Antananarivo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Chagos"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Christmas"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Cocos"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Comoro"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Kerguelen"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mahe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Maldives"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mauritius"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mayotte"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Reunion"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Apia"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Auckland"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Chatham"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Easter"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Efate"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Enderbury"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Fakaofo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Fiji"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Funafuti"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Galapagos"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Gambier"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Guadalcanal"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Guam"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Honolulu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Johnston"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kiritimati"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kosrae"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kwajalein"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Majuro"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Marquesas"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Midway"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Nauru"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Niue"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Norfolk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Noumea"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Pago_Pago"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Palau"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Pitcairn"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Ponape"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Port_Moresby"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Rarotonga"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Saipan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:11001 ../templates:12001
+#: ../templates:12001
 msgid "Samoa"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tahiti"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tarawa"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tongatapu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Truk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Wake"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Wallis"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Yap"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:12001
-msgid "Alaska"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Aleutian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Arizona"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "East-Indiana"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Hawaii"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Indiana-Starke"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Michigan"
-msgstr ""
-
-#. Type: select
-#. Choices
 #: ../templates:13001
 msgid "AST4"
 msgstr ""

Modified: tzdata/trunk/debian/po/templates.pot
===================================================================
--- tzdata/trunk/debian/po/templates.pot	2007-04-25 13:27:13 UTC (rev 2128)
+++ tzdata/trunk/debian/po/templates.pot	2007-04-25 13:28:13 UTC (rev 2129)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
-"POT-Creation-Date: 2007-04-24 23:24+0200\n"
+"POT-Creation-Date: 2007-04-25 07:21-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,6 +53,14 @@
 #. Translators: "Etc" will present users with a list
 #. of "GMT+xx" or "GMT-xx" timezones
 #: ../templates:1001
+msgid "Arctic"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: "Etc" will present users with a list
+#. of "GMT+xx" or "GMT-xx" timezones
+#: ../templates:1001
 msgid "Asia"
 msgstr ""
 
@@ -62,7 +70,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. Type: select
 #. Choices
-#: ../templates:1001 ../templates:8001
+#: ../templates:1001 ../templates:9001
 msgid "Atlantic"
 msgstr ""
 
@@ -96,9 +104,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:1001 ../templates:8001 ../templates:12001
+#: ../templates:1001 ../templates:9001
 msgid "Pacific"
 msgstr ""
 
@@ -107,14 +113,6 @@
 #. Translators: "Etc" will present users with a list
 #. of "GMT+xx" or "GMT-xx" timezones
 #: ../templates:1001
-msgid "US"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: "Etc" will present users with a list
-#. of "GMT+xx" or "GMT-xx" timezones
-#: ../templates:1001
 msgid "SystemV"
 msgstr ""
 
@@ -1481,186 +1479,192 @@
 #. Type: select
 #. Choices
 #: ../templates:6001
+msgid "Longyearbyen"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:7001
 msgid "Aden"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Almaty"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Amman"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Anadyr"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Aqtau"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Aqtobe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ashgabat"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ashkhabad"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Baghdad"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bahrain"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Baku"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bangkok"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Beirut"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Bishkek"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Brunei"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Calcutta"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Choibalsan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Chongqing"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Chungking"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Colombo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dacca"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Damascus"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dhaka"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dili"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dubai"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Dushanbe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Gaza"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Harbin"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Hong_Kong"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Hovd"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Irkutsk"
 msgstr ""
 
@@ -1668,115 +1672,115 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../templates:6001 ../templates:9001
+#: ../templates:7001 ../templates:10001
 msgid "Istanbul"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jakarta"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jayapura"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Jerusalem"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kabul"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kamchatka"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Karachi"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kashgar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Katmandu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Krasnoyarsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuala_Lumpur"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuching"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Kuwait"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Macao"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Macau"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Magadan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Makassar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Manila"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Muscat"
 msgstr ""
 
@@ -1784,1034 +1788,984 @@
 #. Choices
 #. Type: select
 #. Choices
-#: ../templates:6001 ../templates:9001
+#: ../templates:7001 ../templates:10001
 msgid "Nicosia"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Novosibirsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Omsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Oral"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Phnom_Penh"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Pontianak"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Pyongyang"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Qatar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Qyzylorda"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Rangoon"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh87"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh88"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Riyadh89"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Saigon"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Sakhalin"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Samarkand"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Seoul"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Shanghai"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Singapore"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Taipei"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tashkent"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tbilisi"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tehran"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tel_Aviv"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Thimbu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Thimphu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Tokyo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ujung_Pandang"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ulaanbaatar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Ulan_Bator"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Urumqi"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Vientiane"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Vladivostok"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yakutsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yekaterinburg"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:7001
 msgid "Yerevan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Azores"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Bermuda"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Canary"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Cape_Verde"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Faeroe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Faroe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Jan_Mayen"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Madeira"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Reykjavik"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "South_Georgia"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "St_Helena"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:7001
+#: ../templates:8001
 msgid "Stanley"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Central"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "East-Saskatchewan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Eastern"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:8001 ../templates:12001
+#: ../templates:9001
 msgid "Mountain"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Newfoundland"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Saskatchewan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:8001
+#: ../templates:9001
 msgid "Yukon"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Amsterdam"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Andorra"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Athens"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Belfast"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Belgrade"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Berlin"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Bratislava"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Brussels"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Bucharest"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Budapest"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Chisinau"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Copenhagen"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Dublin"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Gibraltar"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Guernsey"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Helsinki"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Isle_of_Man"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Jersey"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Kaliningrad"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Kiev"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Lisbon"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Ljubljana"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "London"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Luxembourg"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Madrid"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Malta"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Mariehamn"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Minsk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Monaco"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Moscow"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Oslo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Paris"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Podgorica"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Prague"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Riga"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Rome"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Samara"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "San_Marino"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Sarajevo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Simferopol"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Skopje"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Sofia"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Stockholm"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tallinn"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tirane"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Tiraspol"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Uzhgorod"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vaduz"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vatican"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vienna"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Vilnius"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Volgograd"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Warsaw"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zagreb"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zaporozhye"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:9001
+#: ../templates:10001
 msgid "Zurich"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Antananarivo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Chagos"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Christmas"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Cocos"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Comoro"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Kerguelen"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mahe"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Maldives"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mauritius"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Mayotte"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:10001
+#: ../templates:11001
 msgid "Reunion"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Apia"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Auckland"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Chatham"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Easter"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Efate"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Enderbury"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Fakaofo"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Fiji"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Funafuti"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Galapagos"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Gambier"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Guadalcanal"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Guam"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Honolulu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Johnston"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kiritimati"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kosrae"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Kwajalein"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Majuro"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Marquesas"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Midway"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Nauru"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Niue"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Norfolk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Noumea"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Pago_Pago"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Palau"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Pitcairn"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Ponape"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Port_Moresby"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Rarotonga"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Saipan"
 msgstr ""
 
 #. Type: select
 #. Choices
-#. Type: select
-#. Choices
-#: ../templates:11001 ../templates:12001
+#: ../templates:12001
 msgid "Samoa"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tahiti"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tarawa"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Tongatapu"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Truk"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Wake"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Wallis"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:11001
+#: ../templates:12001
 msgid "Yap"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:12001
-msgid "Alaska"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Aleutian"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Arizona"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "East-Indiana"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Hawaii"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Indiana-Starke"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../templates:12001
-msgid "Michigan"
-msgstr ""
-
-#. Type: select
-#. Choices
 #: ../templates:13001
 msgid "AST4"
 msgstr ""

Modified: tzdata/trunk/debian/rules
===================================================================
--- tzdata/trunk/debian/rules	2007-04-25 13:27:13 UTC (rev 2128)
+++ tzdata/trunk/debian/rules	2007-04-25 13:28:13 UTC (rev 2129)
@@ -26,13 +26,13 @@
                    America \
 		   Antarctica \
 		   Australia \
+		   Arctic \
 		   Asia \
 		   Atlantic \
 		   Canada \
 		   Europe \
 		   Indian \
 		   Pacific \
-		   US \
 		   SystemV \
 		   Etc
 

Modified: tzdata/trunk/debian/templates
===================================================================
--- tzdata/trunk/debian/templates	2007-04-25 13:27:13 UTC (rev 2128)
+++ tzdata/trunk/debian/templates	2007-04-25 13:28:13 UTC (rev 2129)
@@ -2,7 +2,7 @@
 Type: select
 # Translators: "Etc" will present users with a list
 # of "GMT+xx" or "GMT-xx" timezones
-__Choices: Africa, America, Antarctica, Australia, Asia, Atlantic, Canada, Europe, Indian, Pacific, US, SystemV, Etc
+__Choices: Africa, America, Antarctica, Australia, Arctic, Asia, Atlantic, Canada, Europe, Indian, Pacific, SystemV, Etc
 _Description: Geographic area:
  Please select the geographic area in which you live, then you will
  be shown a list of cities which represent the time zone in which they
@@ -32,6 +32,12 @@
 _Description: Time zone:
  Please select the time zone corresponding to your location.
 
+Template: tzdata/Zones/Arctic
+Type: select
+__Choices: Longyearbyen
+_Description: Time zone:
+ Please select the time zone corresponding to your location.
+
 Template: tzdata/Zones/Asia
 Type: select
 __Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Ashkhabad, Baghdad, Bahrain, Baku, Bangkok, Beirut, Bishkek, Brunei, Calcutta, Choibalsan, Chongqing, Chungking, Colombo, Dacca, Damascus, Dhaka, Dili, Dubai, Dushanbe, Gaza, Harbin, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Katmandu, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macao, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qyzylorda, Rangoon, Riyadh, Riyadh87, Riyadh88, Riyadh89, Saigon, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimbu, Thimphu, Tokyo, Ujung_Pandang, Ulaanbaatar, Ulan_Bator, Urumqi, Vientiane, Vladivostok, Yakutsk, Yekaterinburg, Yerevan
@@ -68,12 +74,6 @@
 _Description: Time zone:
  Please select the time zone corresponding to your location.
 
-Template: tzdata/Zones/US
-Type: select
-__Choices: Alaska, Aleutian, Arizona, Central, East-Indiana, Eastern, Hawaii, Indiana-Starke, Michigan, Mountain, Pacific, Samoa
-_Description: Time zone:
- Please select the time zone corresponding to your location.
-
 Template: tzdata/Zones/SystemV
 Type: select
 __Choices: AST4, AST4ADT, CST6, CST6CDT, EST5, EST5EDT, HST10, MST7, MST7MDT, PST8, PST8PDT, YST9, YST9YDT



Reply to: