r4929 - in tzdata/trunk/debian: . po

To: debian-glibc@lists.debian.org
Subject: r4929 - in tzdata/trunk/debian: . po
From: Aurelien Jarno <aurel32@alioth.debian.org>
Date: Wed, 31 Aug 2011 20:37:45 +0000
Message-id: <[🔎] E1QyrXd-00089B-Ed@vasks.debian.org>
Author: aurel32
Date: 2011-08-31 20:37:45 +0000 (Wed, 31 Aug 2011)
New Revision: 4929

Modified:
   tzdata/trunk/debian/changelog
   tzdata/trunk/debian/po/templates.pot
   tzdata/trunk/debian/tzdata.templates
Log:
  * New upstream version.



Modified: tzdata/trunk/debian/changelog
===================================================================
--- tzdata/trunk/debian/changelog	2011-08-30 18:12:00 UTC (rev 4928)
+++ tzdata/trunk/debian/changelog	2011-08-31 20:37:45 UTC (rev 4929)
@@ -1,3 +1,9 @@
+tzdata (2011i-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 31 Aug 2011 22:27:16 +0200
+
 tzdata (2011h-4) unstable; urgency=low
 
   * Add build-arch and build-indep targets. 

Modified: tzdata/trunk/debian/po/templates.pot
===================================================================
--- tzdata/trunk/debian/po/templates.pot	2011-08-30 18:12:00 UTC (rev 4928)
+++ tzdata/trunk/debian/po/templates.pot	2011-08-31 20:37:45 UTC (rev 4929)
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n"
-"POT-Creation-Date: 2008-10-27 22:33-0400\n"
+"POT-Creation-Date: 2011-08-31 22:27+0200\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,7 +24,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "Africa"
 msgstr ""
 
@@ -34,7 +35,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "America"
 msgstr ""
 
@@ -45,7 +46,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "Antarctica"
 msgstr ""
 
@@ -56,7 +57,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "Australia"
 msgstr ""
 
@@ -67,7 +68,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "Arctic"
 msgstr ""
 
@@ -78,7 +79,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "Asia"
 msgstr ""
 
@@ -89,7 +90,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "Atlantic"
 msgstr ""
 
@@ -100,7 +101,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "Europe"
 msgstr ""
 
@@ -111,7 +112,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "Indian"
 msgstr ""
 
@@ -122,7 +123,10 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:1001 ../tzdata.templates:13001
 msgid "Pacific"
 msgstr ""
 
@@ -133,7 +137,7 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
 msgid "SystemV"
 msgstr ""
 
@@ -144,386 +148,404 @@
 #. of "GMT+xx" or "GMT-xx" timezones
 #. - SystemV will give the choice between zone named as per SystemV conventions:
 #. EST5, MST7, etc.
-#: ../templates:1001
+#: ../tzdata.templates:1001
+msgid "US"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Note to translators:
+#. - "Etc" will present users with a list
+#. of "GMT+xx" or "GMT-xx" timezones
+#. - SystemV will give the choice between zone named as per SystemV conventions:
+#. EST5, MST7, etc.
+#: ../tzdata.templates:1001
 msgid "Etc"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:1002
+#: ../tzdata.templates:1002
 msgid "Geographic area:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:1002
+#: ../tzdata.templates:1002
 msgid ""
-"Please select the geographic area you live in. Subsequent configuration "
-"questions will narrow this down by presenting a list of cities, representing "
-"the time zones in which they are located."
+"Please select the geographic area in which you live. Subsequent "
+"configuration questions will narrow this down by presenting a list of "
+"cities, representing the time zones in which they are located."
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Abidjan"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Accra"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Addis_Ababa"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Algiers"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Asmara"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Bamako"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Bangui"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Banjul"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Bissau"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Blantyre"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Brazzaville"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Bujumbura"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Cairo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Casablanca"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Ceuta"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Conakry"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Dakar"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Dar_es_Salaam"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Djibouti"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Douala"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "El_Aaiun"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Freetown"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Gaborone"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Harare"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Johannesburg"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
+msgid "Juba"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:2001
 msgid "Kampala"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Khartoum"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Kigali"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Kinshasa"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Lagos"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Libreville"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Lome"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Luanda"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Lubumbashi"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Lusaka"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Malabo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Maputo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Maseru"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Mbabane"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Mogadishu"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Monrovia"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Nairobi"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Ndjamena"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Niamey"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Nouakchott"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Ouagadougou"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Porto-Novo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Sao_Tome"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Timbuktu"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Tripoli"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Tunis"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:2001
+#: ../tzdata.templates:2001
 msgid "Windhoek"
 msgstr ""
 
@@ -551,9 +573,13 @@
 #. Description
 #. Type: select
 #. Description
-#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
-#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12001 ../templates:13001
+#. Type: select
+#. Description
+#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
+#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
+#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
+#: ../tzdata.templates:11002 ../tzdata.templates:12001
+#: ../tzdata.templates:13002 ../tzdata.templates:14001
 msgid "Time zone:"
 msgstr ""
 
@@ -581,1374 +607,1448 @@
 #. Description
 #. Type: select
 #. Description
-#: ../templates:2002 ../templates:3002 ../templates:4002 ../templates:5002
-#: ../templates:6002 ../templates:7002 ../templates:8002 ../templates:9002
-#: ../templates:10002 ../templates:11002 ../templates:12001 ../templates:13001
-msgid "Please select the time zone corresponding to your location."
+#. Type: select
+#. Description
+#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
+#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
+#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
+#: ../tzdata.templates:11002 ../tzdata.templates:12001
+#: ../tzdata.templates:13002 ../tzdata.templates:14001
+msgid "Please select the city or region corresponding to your time zone."
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Adak"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Anchorage"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Anguilla"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Antigua"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Araguaina"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Buenos_Aires"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Catamarca"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Cordoba"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Jujuy"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/La_Rioja"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Mendoza"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Rio_Gallegos"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Salta"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/San_Juan"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/San_Luis"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Tucuman"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Argentina/Ushuaia"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Aruba"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Asuncion"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Atikokan"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Atka"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Bahia"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "Bahia_Banderas"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "Barbados"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Belem"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Belize"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Blanc-Sablon"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Boa_Vista"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Bogota"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Boise"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Cambridge_Bay"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Campo_Grande"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Cancun"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Caracas"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Cayenne"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Cayman"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Chicago"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Chihuahua"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Coral_Harbour"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Costa_Rica"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Cuiaba"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Curacao"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Danmarkshavn"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Dawson"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Dawson_Creek"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Denver"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Detroit"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Dominica"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Edmonton"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Eirunepe"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "El_Salvador"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Ensenada"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Fortaleza"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Glace_Bay"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Godthab"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Grand_Turk"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Grenada"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Guadeloupe"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Guatemala"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Guayaquil"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Guyana"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Halifax"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Havana"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Hermosillo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Indiana/Indianapolis"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Indiana/Knox"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Indiana/Marengo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Indiana/Petersburg"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Indiana/Tell_City"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Indiana/Vevay"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Indiana/Vincennes"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Indiana/Winamac"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Inuvik"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Iqaluit"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Jamaica"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Juneau"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Kentucky/Louisville"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Kentucky/Monticello"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "Kralendijk"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "La_Paz"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Lima"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Los_Angeles"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "Lower_Princes"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "Maceio"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Managua"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Manaus"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Marigot"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Martinique"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "Matamoros"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "Mazatlan"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Menominee"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Merida"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "Metlakatla"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "Mexico_City"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Miquelon"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Moncton"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Monterrey"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Montevideo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Montreal"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Montserrat"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Nassau"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "New_York"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Nipigon"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Nome"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Noronha"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "North_Dakota/Beulah"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "North_Dakota/Center"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "North_Dakota/New_Salem"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "Ojinaga"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "Panama"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Pangnirtung"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Paramaribo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Phoenix"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Port-au-Prince"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Port_of_Spain"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Porto_Acre"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Porto_Velho"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Puerto_Rico"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Rainy_River"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Rankin_Inlet"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Recife"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Regina"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Resolute"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Rio_Branco"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "Santa_Isabel"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "Santarem"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Santiago"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Santo_Domingo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Sao_Paulo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Scoresbysund"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Shiprock"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
+msgid "Sitka"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:3001
 msgid "St_Barthelemy"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "St_Johns"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "St_Kitts"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "St_Lucia"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "St_Thomas"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "St_Vincent"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Swift_Current"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Tegucigalpa"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Thule"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Thunder_Bay"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Tijuana"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Toronto"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Tortola"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Vancouver"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Virgin"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Whitehorse"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Winnipeg"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Yakutat"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:3001
+#: ../tzdata.templates:3001
 msgid "Yellowknife"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
 msgid "Casey"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
 msgid "Davis"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
 msgid "DumontDUrville"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
+msgid "Macquarie"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:4001
 msgid "Mawson"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
 msgid "McMurdo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
 msgid "Palmer"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
 msgid "Rothera"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
 msgid "Syowa"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:4001
+#: ../tzdata.templates:4001
 msgid "Vostok"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Adelaide"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Brisbane"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Broken_Hill"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Canberra"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Currie"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Darwin"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Eucla"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Hobart"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Lindeman"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Lord_Howe"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Melbourne"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Perth"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Sydney"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:5001
+#: ../tzdata.templates:5001
 msgid "Yancowinna"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:6001
+#: ../tzdata.templates:6001
 msgid "Longyearbyen"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Aden"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Almaty"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Amman"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Anadyr"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Aqtau"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Aqtobe"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Ashgabat"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Baghdad"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Bahrain"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Baku"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Bangkok"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Beirut"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Bishkek"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Brunei"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Choibalsan"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Chongqing"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Colombo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Damascus"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Dhaka"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Dili"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Dubai"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Dushanbe"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Gaza"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Ho_Chi_Minh"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Hong_Kong"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Hovd"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Irkutsk"
 msgstr ""
 
@@ -1958,133 +2058,133 @@
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001 ../templates:9001
+#: ../tzdata.templates:7001 ../tzdata.templates:9001
 msgid "Istanbul"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Jakarta"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Jayapura"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Jerusalem"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Kabul"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Kamchatka"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Karachi"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Kashgar"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Kathmandu"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Kolkata"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Krasnoyarsk"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Kuala_Lumpur"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Kuching"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Kuwait"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Macau"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Magadan"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Makassar"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Manila"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Muscat"
 msgstr ""
 
@@ -2094,1063 +2194,1157 @@
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001 ../templates:9001
+#: ../tzdata.templates:7001 ../tzdata.templates:9001
 msgid "Nicosia"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
+msgid "Novokuznetsk"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:7001
 msgid "Novosibirsk"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Omsk"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Oral"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Phnom_Penh"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Pontianak"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Pyongyang"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Qatar"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Qyzylorda"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Rangoon"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Riyadh"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Riyadh87"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Riyadh88"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Riyadh89"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Sakhalin"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Samarkand"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Seoul"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Shanghai"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Singapore"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Taipei"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Tashkent"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Tbilisi"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Tehran"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Tel_Aviv"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Thimphu"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Tokyo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Ujung_Pandang"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Ulaanbaatar"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Urumqi"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Vientiane"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Vladivostok"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Yakutsk"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Yekaterinburg"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:7001
+#: ../tzdata.templates:7001
 msgid "Yerevan"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Azores"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Bermuda"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Canary"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Cape_Verde"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Faroe"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Jan_Mayen"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Madeira"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Reykjavik"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "South_Georgia"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "St_Helena"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:8001
+#: ../tzdata.templates:8001
 msgid "Stanley"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Amsterdam"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Andorra"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Athens"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Belfast"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Belgrade"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Berlin"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Bratislava"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Brussels"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Bucharest"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Budapest"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Chisinau"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Copenhagen"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Dublin"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Gibraltar"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Guernsey"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Helsinki"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Isle_of_Man"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Jersey"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Kaliningrad"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Kiev"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Lisbon"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Ljubljana"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "London"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Luxembourg"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Madrid"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Malta"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Mariehamn"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Minsk"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Monaco"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Moscow"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Oslo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Paris"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Podgorica"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Prague"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Riga"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Rome"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Samara"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "San_Marino"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Sarajevo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Simferopol"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Skopje"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Sofia"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Stockholm"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Tallinn"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Tirane"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Tiraspol"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Uzhgorod"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Vatican"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Vienna"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Vilnius"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Volgograd"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Warsaw"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Zagreb"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Zaporozhye"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:9001
+#: ../tzdata.templates:9001
 msgid "Zurich"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Antananarivo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Chagos"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Christmas"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Cocos"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Comoro"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Kerguelen"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Mahe"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Maldives"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Mauritius"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Mayotte"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:10001
+#: ../tzdata.templates:10001
 msgid "Reunion"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Apia"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Auckland"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Chatham"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
+msgid "Chuuk"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:11001
 msgid "Easter"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Efate"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Enderbury"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Fakaofo"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Fiji"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Funafuti"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Galapagos"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Gambier"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Guadalcanal"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Guam"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Honolulu"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Johnston"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Kiritimati"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Kosrae"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Kwajalein"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Majuro"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Marquesas"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Midway"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Nauru"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Niue"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Norfolk"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Noumea"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Pago_Pago"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Palau"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Pitcairn"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
+msgid "Pohnpei"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:11001
 msgid "Ponape"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Port_Moresby"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Rarotonga"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Saipan"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:11001 ../tzdata.templates:13001
 msgid "Samoa"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Tahiti"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Tarawa"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Tongatapu"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Truk"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Wake"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Wallis"
 msgstr ""
 
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
-#: ../templates:11001
+#: ../tzdata.templates:11001
 msgid "Yap"
 msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Alaska"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Aleutian"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Arizona"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Central"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Eastern"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Hawaii"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Indiana-Starke"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Michigan"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Mountain"
+msgstr ""
+
+#. Type: select
+#. Choices
+#. Translators: do not translate underscores. You can use spaces instead.
+#: ../tzdata.templates:13001
+msgid "Pacific-New"
+msgstr ""

Modified: tzdata/trunk/debian/tzdata.templates
===================================================================
--- tzdata/trunk/debian/tzdata.templates	2011-08-30 18:12:00 UTC (rev 4928)
+++ tzdata/trunk/debian/tzdata.templates	2011-08-31 20:37:45 UTC (rev 4929)
@@ -5,93 +5,100 @@
 #    of "GMT+xx" or "GMT-xx" timezones
 # - SystemV will give the choice between zone named as per SystemV conventions:
 #   EST5, MST7, etc.
-__Choices: Africa, America, Antarctica, Australia, Arctic, Asia, Atlantic, Europe, Indian, Pacific, SystemV, Etc
+__Choices: Africa, America, Antarctica, Australia, Arctic, Asia, Atlantic, Europe, Indian, Pacific, SystemV, US, Etc
 _Description: Geographic area:
- Please select the geographic area you live in. Subsequent
+ Please select the geographic area in which you live. Subsequent
  configuration questions will narrow this down by presenting a list of
  cities, representing the time zones in which they are located.
 
 Template: tzdata/Zones/Africa
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
-__Choices: Abidjan, Accra, Addis_Ababa, Algiers, Asmara, Bamako, Bangui, Banjul, Bissau, Blantyre, Brazzaville, Bujumbura, Cairo, Casablanca, Ceuta, Conakry, Dakar, Dar_es_Salaam, Djibouti, Douala, El_Aaiun, Freetown, Gaborone, Harare, Johannesburg, Kampala, Khartoum, Kigali, Kinshasa, Lagos, Libreville, Lome, Luanda, Lubumbashi, Lusaka, Malabo, Maputo, Maseru, Mbabane, Mogadishu, Monrovia, Nairobi, Ndjamena, Niamey, Nouakchott, Ouagadougou, Porto-Novo, Sao_Tome, Timbuktu, Tripoli, Tunis, Windhoek
+__Choices: Abidjan, Accra, Addis_Ababa, Algiers, Asmara, Bamako, Bangui, Banjul, Bissau, Blantyre, Brazzaville, Bujumbura, Cairo, Casablanca, Ceuta, Conakry, Dakar, Dar_es_Salaam, Djibouti, Douala, El_Aaiun, Freetown, Gaborone, Harare, Johannesburg, Juba, Kampala, Khartoum, Kigali, Kinshasa, Lagos, Libreville, Lome, Luanda, Lubumbashi, Lusaka, Malabo, Maputo, Maseru, Mbabane, Mogadishu, Monrovia, Nairobi, Ndjamena, Niamey, Nouakchott, Ouagadougou, Porto-Novo, Sao_Tome, Timbuktu, Tripoli, Tunis, Windhoek
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/America
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
-__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Chihuahua, Coral_Harbour, Costa_Rica, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fortaleza, Glace_Bay, Godthab, Goose_Bay, Grand_Turk, Grenada, Guadeloupe, Guatemala, Guayaquil, Guyana, Halifax, Havana, Hermosillo, Indiana/Indianapolis, Indiana/Knox, Indiana/Marengo, Indiana/Petersburg, Indiana/Tell_City, Indiana/Vevay, Indiana/Vincennes, Indiana/Winamac, Inuvik, Iqaluit, Jamaica, Juneau, Kentucky/Louisville, Kentucky/Monticello, L
 a_Paz, Lima, Los_Angeles, Maceio, Managua, Manaus, Marigot, Martinique, Mazatlan, Menominee, Merida, Mexico_City, Miquelon, Moncton, Monterrey, Montevideo, Montreal, Montserrat, Nassau, New_York, Nipigon, Nome, Noronha, North_Dakota/Center, North_Dakota/New_Salem, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Rainy_River, Rankin_Inlet, Recife, Regina, Resolute, Rio_Branco, Santarem, Santiago, Santo_Domingo, Sao_Paulo, Scoresbysund, Shiprock, St_Barthelemy, St_Johns, St_Kitts, St_Lucia, St_Thomas, St_Vincent, Swift_Current, Tegucigalpa, Thule, Thunder_Bay, Tijuana, Toronto, Tortola, Vancouver, Virgin, Whitehorse, Winnipeg, Yakutat, Yellowknife
+__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Bahia_Banderas, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Chihuahua, Coral_Harbour, Costa_Rica, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fortaleza, Glace_Bay, Godthab, Goose_Bay, Grand_Turk, Grenada, Guadeloupe, Guatemala, Guayaquil, Guyana, Halifax, Havana, Hermosillo, Indiana/Indianapolis, Indiana/Knox, Indiana/Marengo, Indiana/Petersburg, Indiana/Tell_City, Indiana/Vevay, Indiana/Vincennes, Indiana/Winamac, Inuvik, Iqaluit, Jamaica, Juneau, Kentucky/Louisville, Kentuc
 ky/Monticello, Kralendijk, La_Paz, Lima, Los_Angeles, Lower_Princes, Maceio, Managua, Manaus, Marigot, Martinique, Matamoros, Mazatlan, Menominee, Merida, Metlakatla, Mexico_City, Miquelon, Moncton, Monterrey, Montevideo, Montreal, Montserrat, Nassau, New_York, Nipigon, Nome, Noronha, North_Dakota/Beulah, North_Dakota/Center, North_Dakota/New_Salem, Ojinaga, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Rainy_River, Rankin_Inlet, Recife, Regina, Resolute, Rio_Branco, Santa_Isabel, Santarem, Santiago, Santo_Domingo, Sao_Paulo, Scoresbysund, Shiprock, Sitka, St_Barthelemy, St_Johns, St_Kitts, St_Lucia, St_Thomas, St_Vincent, Swift_Current, Tegucigalpa, Thule, Thunder_Bay, Tijuana, Toronto, Tortola, Vancouver, Virgin, Whitehorse, Winnipeg, Yakutat, Yellowknife
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/Antarctica
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
-__Choices: Casey, Davis, DumontDUrville, Mawson, McMurdo, Palmer, Rothera, Syowa, Vostok
+__Choices: Casey, Davis, DumontDUrville, Macquarie, Mawson, McMurdo, Palmer, Rothera, Syowa, Vostok
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/Australia
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 __Choices: Adelaide, Brisbane, Broken_Hill, Canberra, Currie, Darwin, Eucla, Hobart, Lindeman, Lord_Howe, Melbourne, Perth, Sydney, Yancowinna
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/Arctic
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 __Choices: Longyearbyen
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/Asia
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
-__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Baghdad, Bahrain, Baku, Bangkok, Beirut, Bishkek, Brunei, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Gaza, Harbin, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qyzylorda, Rangoon, Riyadh, Riyadh87, Riyadh88, Riyadh89, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Ujung_Pandang, Ulaanbaatar, Urumqi, Vientiane, Vladivostok, Yakutsk, Yekaterinburg, Yerevan
+__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Baghdad, Bahrain, Baku, Bangkok, Beirut, Bishkek, Brunei, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Gaza, Harbin, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qyzylorda, Rangoon, Riyadh, Riyadh87, Riyadh88, Riyadh89, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Ujung_Pandang, Ulaanbaatar, Urumqi, Vientiane, Vladivostok, Yakutsk, Yekaterinburg, Yerevan
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/Atlantic
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 __Choices: Azores, Bermuda, Canary, Cape_Verde, Faroe, Jan_Mayen, Madeira, Reykjavik, South_Georgia, St_Helena, Stanley
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/Europe
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 __Choices: Amsterdam, Andorra, Athens, Belfast, Belgrade, Berlin, Bratislava, Brussels, Bucharest, Budapest, Chisinau, Copenhagen, Dublin, Gibraltar, Guernsey, Helsinki, Isle_of_Man, Istanbul, Jersey, Kaliningrad, Kiev, Lisbon, Ljubljana, London, Luxembourg, Madrid, Malta, Mariehamn, Minsk, Monaco, Moscow, Nicosia, Oslo, Paris, Podgorica, Prague, Riga, Rome, Samara, San_Marino, Sarajevo, Simferopol, Skopje, Sofia, Stockholm, Tallinn, Tirane, Tiraspol, Uzhgorod, Vaduz, Vatican, Vienna, Vilnius, Volgograd, Warsaw, Zagreb, Zaporozhye, Zurich
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/Indian
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 __Choices: Antananarivo, Chagos, Christmas, Cocos, Comoro, Kerguelen, Mahe, Maldives, Mauritius, Mayotte, Reunion
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/Pacific
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
-__Choices: Apia, Auckland, Chatham, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap
+__Choices: Apia, Auckland, Chatham, Chuuk, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Pohnpei, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
 Template: tzdata/Zones/SystemV
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 Choices: AST4, AST4ADT, CST6, CST6CDT, EST5, EST5EDT, HST10, MST7, MST7MDT, PST8, PST8PDT, YST9, YST9YDT
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
 
+Template: tzdata/Zones/US
+Type: select
+# Translators: do not translate underscores. You can use spaces instead.
+__Choices: Alaska, Aleutian, Arizona, Central, Eastern, Hawaii, Indiana-Starke, Michigan, Mountain, Pacific, Pacific-New, Samoa
+_Description: Time zone:
+ Please select the city or region corresponding to your time zone.
+
 Template: tzdata/Zones/Etc
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu
 _Description: Time zone:
- Please select the time zone corresponding to your location.
+ Please select the city or region corresponding to your time zone.
Reply to:
Prev by Date: Bug#636686: partial upgrade from squeeze to wheezy fails
Next by Date: r4930 - in tzdata/tags: . 2011i-1/debian 2011i-1/debian/po 2011i-1/debian/source
Previous by thread: tzdata
Next by thread: r4930 - in tzdata/tags: . 2011i-1/debian 2011i-1/debian/po 2011i-1/debian/source
Index(es):
- Date
- Thread