Merging debian version 2024a-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

48 files changed, 156 insertions, 362 deletions

diff --git a/debian/changelog b/debian/changelog
index 20aadf8..ac6cf6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+tzdata (2024a-2) unstable; urgency=medium
+
+  * Update Italian debconf translation.
+    Thanks to Ceppo <ceppo@oziosi.org> (Closes: #1063490)
+  * Replace America/Godthab by America/Nuuk
+  * Do not replace CET, CST6CDT, EET, EST*, HST, MET, MST*, PST8PDT, WET.
+    The replacements differed in using daylight saving. (LP: #2055718)
+  * Fix updating US/Indiana-Starke to America/Indiana/Knox
+  * Allow ziguard.awk to generate timezone symlink that point to symlinks
+    to fix (at least) the timezone symlinks Africa/Asmera,
+    Antarctica/South_Pole, Iceland, Pacific/Ponape, and Pacific/Truk.
+  * test_timezone_conversions: Check symlink targets
+
+ -- Benjamin Drung <bdrung@debian.org>  Fri, 05 Apr 2024 22:24:29 +0200
+
 tzdata (2024a-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/control b/debian/control
index 70a6368..c4d916e 100644
--- a/debian/control
+++ b/debian/control
@@ -42,9 +42,9 @@ Architecture: all
 Multi-Arch: foreign
 Priority: optional
 Depends: tzdata, ${misc:Depends}
-Breaks: tzdata (<< 2023c-8~)
+Breaks: tzdata (<< 2024a-2~)
 Conflicts: tzdata-bookworm, tzdata-bullseye
-Replaces: tzdata (<< 2023c-8~), tzdata-bookworm, tzdata-bullseye
+Replaces: tzdata (<< 2024a-2~), tzdata-bookworm, tzdata-bullseye
 Description: time zone data for TAI minus ten seconds
  This package contains data required for the implementation of
  standard local time for many representative locations around the
diff --git a/debian/generate_debconf_templates b/debian/generate_debconf_templates
index 333c2b1..e1e1c90 100755
--- a/debian/generate_debconf_templates
+++ b/debian/generate_debconf_templates
@@ -37,6 +37,7 @@ EXCLUDE_SYMLINKS = {
     "America/Catamarca",
     "America/Cordoba",
     "America/Fort_Wayne",
+    "America/Godthab",
     "America/Indianapolis",
     "America/Jujuy",
     "America/Knox_IN",
@@ -91,7 +92,6 @@ INCLUDE_SYMLINKS = {
     "America/Atka",
     "America/Coral_Harbour",
     "America/Ensenada",
-    "America/Godthab",
     "America/Kralendijk",
     "America/Lower_Princes",
     "America/Marigot",
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c9692cd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ziguard.awk-Move-link-to-link-feature-from-vanguard-to-ma.patch
diff --git a/debian/patches/ziguard.awk-Move-link-to-link-feature-from-vanguard-to-ma.patch b/debian/patches/ziguard.awk-Move-link-to-link-feature-from-vanguard-to-ma.patch
new file mode 100644
index 0000000..e788c38
--- /dev/null
+++ b/debian/patches/ziguard.awk-Move-link-to-link-feature-from-vanguard-to-ma.patch
@@ -0,0 +1,39 @@
+From: Benjamin Drung <benjamin.drung@canonical.com>
+Date: Wed, 3 Apr 2024 15:14:50 +0200
+Subject: ziguard.awk: Move link to link feature from vanguard to main
+ dataform
+
+When using BACKWARD=backward PACKRATDATA=backzone the symlinks might
+point to the incorrect file (e.g. Africa/Asmera points to Africa/Nairobi
+instead of Africa/Asmara).
+
+Move the link to link feature from vanguard to main dataform to produce
+correct symlink (e.g. Africa/Asmera -> Africa/Asmara) in this case.
+
+Forwarded: https://mm.icann.org/pipermail/tz/2024-April/058853.html
+---
+ ziguard.awk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ziguard.awk b/ziguard.awk
+index 7a3404f..f6b8d24 100644
+--- a/ziguard.awk
++++ b/ziguard.awk
+@@ -340,7 +340,7 @@ function make_linkline(oldline, target, linkname, oldtarget, comment, \
+   return "Link\t" target "\t" replsuffix comment
+ }
+ 
+-/^Link/ && $4 == "#=" && DATAFORM == "vanguard" {
++/^Link/ && $4 == "#=" && (DATAFORM != "rearguard") {
+   $0 = make_linkline($0, $5, $3, $2)
+ }
+ 
+@@ -378,7 +378,7 @@ function cut_link_chains_short( \
+ }
+ 
+ END {
+-  if (DATAFORM != "vanguard") {
++  if (DATAFORM == "rearguard") {
+     cut_link_chains_short()
+   }
+   for (i = 1; i <= NR; i++)
diff --git a/debian/po/be.po b/debian/po/be.po
index ed2fc23..3fa4f90 100644
--- a/debian/po/be.po
+++ b/debian/po/be.po
@@ -1096,14 +1096,6 @@ msgstr "Глэйс-Бэй"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Готаб"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Гус-Бэй"
 
diff --git a/debian/po/bg.po b/debian/po/bg.po
index 985716c..0f90588 100644
--- a/debian/po/bg.po
+++ b/debian/po/bg.po
@@ -1089,14 +1089,6 @@ msgstr "Глейс Бей"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Готаб"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Гуус Бей"
 
diff --git a/debian/po/ca.po b/debian/po/ca.po
index a24c524..ee37342 100644
--- a/debian/po/ca.po
+++ b/debian/po/ca.po
@@ -1123,14 +1123,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 74e04f1..704d508 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -1079,14 +1079,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/da.po b/debian/po/da.po
index f995553..04f574c 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1074,14 +1074,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthåb"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/de.po b/debian/po/de.po
index 3129478..a8c3b54 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -1077,14 +1077,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthåb"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/en.po b/debian/po/en.po
index 8a1321b..f7aa70d 100644
--- a/debian/po/en.po
+++ b/debian/po/en.po
@@ -1074,14 +1074,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/es.po b/debian/po/es.po
index 2c261f0..99cd541 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -1109,14 +1109,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/eu.po b/debian/po/eu.po
index 3c4d923..10abd88 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -1084,14 +1084,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/fi.po b/debian/po/fi.po
index 270a38b..d308dd7 100644
--- a/debian/po/fi.po
+++ b/debian/po/fi.po
@@ -1077,14 +1077,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Nuuk"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/fr.po b/debian/po/fr.po
index d7f3552..bac7366 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -1085,14 +1085,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/gl.po b/debian/po/gl.po
index 77652b8..2658f9c 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -1078,14 +1078,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/gu.po b/debian/po/gu.po
index e0d7010..8259bfb 100644
--- a/debian/po/gu.po
+++ b/debian/po/gu.po
@@ -1082,14 +1082,6 @@ msgstr "ગ્લેસ બે"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "ગોડથાબ"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "ગૂસ અખાત"
 
diff --git a/debian/po/he.po b/debian/po/he.po
index 22757d6..bd93ce3 100644
--- a/debian/po/he.po
+++ b/debian/po/he.po
@@ -1084,14 +1084,6 @@ msgstr "גלייס באי"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "נאוק"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "גוז באי"
 
diff --git a/debian/po/hr.po b/debian/po/hr.po
index 1f2b827..e5d19d7 100644
--- a/debian/po/hr.po
+++ b/debian/po/hr.po
@@ -1082,14 +1082,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/hu.po b/debian/po/hu.po
index 77ed73a..48adc7b 100644
--- a/debian/po/hu.po
+++ b/debian/po/hu.po
@@ -1082,14 +1082,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/id.po b/debian/po/id.po
index 4984284..f3c6c49 100644
--- a/debian/po/id.po
+++ b/debian/po/id.po
@@ -1092,14 +1092,6 @@ msgstr "Pantai Glace"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Pantai Goose"
 
diff --git a/debian/po/it.po b/debian/po/it.po
index 4aa8338..bd56f0b 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the tzdata package.
 # David Paleino <dapal@debian.org>, 2011.
 # Francesca Ciceri <madamezou@zouish.org>, 2012, 2013
+# Ceppo <ceppo@oziosi.org>, 2024.
+
 msgid ""
 msgstr ""
 "Project-Id-Version: tzdata\n"
 "Report-Msgid-Bugs-To: tzdata@packages.debian.org\n"
 "POT-Creation-Date: 2023-08-07 14:48+0200\n"
-"PO-Revision-Date: 2013-12-24 23:13+0100\n"
-"Last-Translator: Francesca Ciceri <madamezou@zouish.org>\n"
+"PO-Revision-Date: 2024-01-08 00:00+0000\n"
+"Last-Translator: Ceppo <ceppo@oziosi.org>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: Italian\n"
 "MIME-Version: 1.0\n"
@@ -924,7 +926,7 @@ msgstr "Chihuahua"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
 msgid "Ciudad_Juarez"
-msgstr ""
+msgstr "Ciudad Juarez"
 
 #. Type: select
 #. Choices
@@ -1052,7 +1054,7 @@ msgstr "Ensenada"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
 msgid "Fort_Nelson"
-msgstr ""
+msgstr "Fort Nelson"
 
 #. Type: select
 #. Choices
@@ -1075,14 +1077,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Nuuk"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
@@ -1516,7 +1510,7 @@ msgstr "Nord Dakota/New Salem"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
 msgid "Nuuk"
-msgstr ""
+msgstr "Nuuk"
 
 #. Type: select
 #. Choices
@@ -1604,7 +1598,7 @@ msgstr "Porto Rico"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
 msgid "Punta_Arenas"
-msgstr ""
+msgstr "Punta Arenas"
 
 #. Type: select
 #. Choices
@@ -1948,7 +1942,7 @@ msgstr "Syowa"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:4001
 msgid "Troll"
-msgstr ""
+msgstr "Troll"
 
 #. Type: select
 #. Choices
@@ -2028,7 +2022,7 @@ msgstr "Ashgabat"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:6001
 msgid "Atyrau"
-msgstr ""
+msgstr "Atyrau"
 
 #. Type: select
 #. Choices
@@ -2068,7 +2062,7 @@ msgstr "Bangkok"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:6001
 msgid "Barnaul"
-msgstr ""
+msgstr "Barnaul"
 
 #. Type: select
 #. Choices
@@ -2100,7 +2094,7 @@ msgstr "Brunei"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:6001
 msgid "Chita"
-msgstr ""
+msgstr "Chita"
 
 #. Type: select
 #. Choices
@@ -2172,7 +2166,7 @@ msgstr "Dušanbe"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:6001
 msgid "Famagusta"
-msgstr ""
+msgstr "Famagusta"
 
 #. Type: select
 #. Choices
@@ -2476,7 +2470,7 @@ msgstr "Qatar"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:6001
 msgid "Qostanay"
-msgstr ""
+msgstr "Qostanay"
 
 #. Type: select
 #. Choices
@@ -2540,7 +2534,7 @@ msgstr "Singapore"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:6001
 msgid "Srednekolymsk"
-msgstr ""
+msgstr "Srednekolymsk"
 
 #. Type: select
 #. Choices
@@ -2604,7 +2598,7 @@ msgstr "Tokyo"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:6001
 msgid "Tomsk"
-msgstr ""
+msgstr "Tomsk"
 
 #. Type: select
 #. Choices
@@ -2900,7 +2894,7 @@ msgstr "Andorra"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Astrakhan"
-msgstr ""
+msgstr "Astrakhan"
 
 #. Type: select
 #. Choices
@@ -3052,7 +3046,7 @@ msgstr "Kaliningrad"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Kirov"
-msgstr ""
+msgstr "Kirov"
 
 #. Type: select
 #. Choices
@@ -3220,7 +3214,7 @@ msgstr "Sarajevo"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Saratov"
-msgstr ""
+msgstr "Saratov"
 
 #. Type: select
 #. Choices
@@ -3284,7 +3278,7 @@ msgstr "Tiraspol"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Ulyanovsk"
-msgstr ""
+msgstr "Ulyanovsk"
 
 #. Type: select
 #. Choices
@@ -3460,7 +3454,7 @@ msgstr "Auckland"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:11001
 msgid "Bougainville"
-msgstr ""
+msgstr "Bougainville"
 
 #. Type: select
 #. Choices
@@ -3572,7 +3566,7 @@ msgstr "Atollo Johnston"
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:11001
 msgid "Kanton"
-msgstr ""
+msgstr "Kanton"
 
 #. Type: select
 #. Choices
@@ -3775,3 +3769,8 @@ msgid ""
 "negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
 "hours west of Greenwich, commonly called 'UTC-6')."
 msgstr ""
+"Selezionare il proprio fuso orario. Contrariamente alle convenzioni moderne, "
+"queste zone compatibili con POSIX usano valori positivi per indicare aree a "
+"ovest di Greenwich e valori negativi per quelle a est di Greenwich (per "
+"esempio, \"Etc/GMT+6\" indica sei ore a ovest di Greenwich, comunemente "
+"chiamato \"UTC-6\")."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index 274676d..5366baf 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -1074,14 +1074,6 @@ msgstr "グラッセ湾"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "ゴッドホープ"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "グース湾"
 
diff --git a/debian/po/ko.po b/debian/po/ko.po
index d1af246..3467ec7 100644
--- a/debian/po/ko.po
+++ b/debian/po/ko.po
@@ -1073,14 +1073,6 @@ msgstr "글레이스 베이"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "고트호프"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "구스 베이"
 
diff --git a/debian/po/ku.po b/debian/po/ku.po
index 713ef68..a549f61 100644
--- a/debian/po/ku.po
+++ b/debian/po/ku.po
@@ -1091,14 +1091,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/lt.po b/debian/po/lt.po
index ce566b5..9edb5ef 100644
--- a/debian/po/lt.po
+++ b/debian/po/lt.po
@@ -1086,14 +1086,6 @@ msgstr "Gleis Bėjus"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Gūs Bėjus"
 
diff --git a/debian/po/ml.po b/debian/po/ml.po
index c47ebc9..74f6754 100644
--- a/debian/po/ml.po
+++ b/debian/po/ml.po
@@ -1092,14 +1092,6 @@ msgstr "ഗ്ലേസ് ഉള്‍ക്കടല്‍"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "ഗോഡ്താബ്"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "ഗൂസ് ഉള്‍ക്കടല്‍"
 
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 436b5dd..8f0f468 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -1078,14 +1078,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/pl.po b/debian/po/pl.po
index e45119a..34d985f 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -1079,14 +1079,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Nuuk (duń. Godthåb)"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 05a20fa..a12ca5c 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -1079,14 +1079,6 @@ msgstr "Baía Glace"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Baía de Goose"
 
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index ab1c65e..50854af 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -1080,14 +1080,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/ro.po b/debian/po/ro.po
index a8cc146..7b83f23 100644
--- a/debian/po/ro.po
+++ b/debian/po/ro.po
@@ -1086,14 +1086,6 @@ msgstr "Golful Glace"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Golful Goose"
 
diff --git a/debian/po/ru.po b/debian/po/ru.po
index c9f2864..929fefd 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -1082,14 +1082,6 @@ msgstr "Глейс-Бей"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Готхоб"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Гус-Бей"
 
diff --git a/debian/po/sk.po b/debian/po/sk.po
index 63a960e..aacca30 100644
--- a/debian/po/sk.po
+++ b/debian/po/sk.po
@@ -1078,14 +1078,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/sq.po b/debian/po/sq.po
index 95f743c..159244a 100644
--- a/debian/po/sq.po
+++ b/debian/po/sq.po
@@ -1091,14 +1091,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 09821be..6c5bc78 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -1076,14 +1076,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthåb"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 4b7d282..7909a3a 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1072,14 +1072,6 @@ msgstr ""
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr ""
 
diff --git a/debian/po/th.po b/debian/po/th.po
index 2fe1c37..5b37baa 100644
--- a/debian/po/th.po
+++ b/debian/po/th.po
@@ -1074,14 +1074,6 @@ msgstr ""
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "กอตฮอบ"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "กูสเบย์"
 
diff --git a/debian/po/tr.po b/debian/po/tr.po
index ec98135..03b289d 100644
--- a/debian/po/tr.po
+++ b/debian/po/tr.po
@@ -1077,14 +1077,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Koyu"
 
diff --git a/debian/po/vi.po b/debian/po/vi.po
index fbfd6a4..7368128 100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@ -1091,14 +1091,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/po/wo.po b/debian/po/wo.po
index 3bc2829..ef14404 100644
--- a/debian/po/wo.po
+++ b/debian/po/wo.po
@@ -1085,14 +1085,6 @@ msgstr "Glace Bay"
 #. Translators: This is a city name.
 #. Do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:3001
-msgid "Godthab"
-msgstr "Godthab (cas général)"
-
-#. Type: select
-#. Choices
-#. Translators: This is a city name.
-#. Do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
 msgid "Goose_Bay"
 msgstr "Goose Bay"
 
diff --git a/debian/rules b/debian/rules
index 793422d..06ceafc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,15 +8,12 @@ TZGEN := $(CURDIR)/tzgen
 	dh $@
 
 override_dh_auto_build-indep:
-	# Generate a tzdata.zi file
-	$(MAKE) AWK=gawk BACKWARD="backward" PACKRATDATA=backzone PACKRATLIST=zone.tab VERSION_DEPS= tzdata.zi
-
-	# Generate the leapseconds file
-	$(MAKE) AWK=gawk PACKRATDATA=backzone PACKRATLIST=zone.tab leapseconds
+	# Generate a tzdata.zi and leapseconds file
+	$(MAKE) AWK=gawk BACKWARD="backward" PACKRATDATA=backzone PACKRATLIST=zone.tab VERSION_DEPS= tzdata.zi leapseconds
 
 	# Build the timezone data
-	/usr/sbin/zic -d $(TZGEN) -L /dev/null tzdata.zi ; \
-	/usr/sbin/zic -d $(TZGEN)/right -L leapseconds tzdata.zi ; \
+	/usr/sbin/zic -d $(TZGEN) -L /dev/null tzdata.zi
+	/usr/sbin/zic -d $(TZGEN)/right -L leapseconds tzdata.zi
 
 	# Replace hardlinks by symlinks
 	grep '^L ' $(CURDIR)/tzdata.zi | while read L target name ; do \
diff --git a/debian/test_timezone_conversions b/debian/test_timezone_conversions
index 768e6fd..ac009a8 100755
--- a/debian/test_timezone_conversions
+++ b/debian/test_timezone_conversions
@@ -5,6 +5,7 @@
 """Check convert_timezone from tzdata.config for consistency."""
 
 import argparse
+import functools
 import logging
 import pathlib
 import re
@@ -40,13 +41,14 @@ EXCLUDE_UNSELECTABLE = {
 class ConvertTimezone:
     """Wrap convert_timezone from tzdata.config."""
 
-    def __init__(self, tzdata_config: pathlib.Path):
+    def __init__(self, tzdata_config: pathlib.Path) -> None:
         self.tzdata_config = tzdata_config
         content = tzdata_config.read_text(encoding="utf-8")
         match = re.search(r"convert_timezone\(\).*\n}", content, flags=re.DOTALL)
         assert match, f"convert_timezone function not found in {tzdata_config}"
         self.convert_timezone = match.group(0)
 
+    @functools.lru_cache(maxsize=8192)
     def __call__(self, timezone: str) -> str:
         shell_script = f"{self.convert_timezone}\nconvert_timezone '{timezone}'\n"
         shell = subprocess.run(
@@ -57,17 +59,18 @@ class ConvertTimezone:
         )
         return shell.stdout.strip()
 
-    def filter_converted_timezones(self, timezones: set[str]) -> set[str]:
-        """Return set of timezones that will be converted by convert_timezone."""
-        converted = set()
+    def filter_converted_timezones(self, timezones: set[str]) -> dict[str, str]:
+        """Return dict of timezones that will be converted by convert_timezone."""
+        converted = {}
         for timezone in timezones:
-            if self(timezone) != timezone:
-                converted.add(timezone)
+            conversion = self(timezone)
+            if conversion != timezone:
+                converted[timezone] = conversion
         return converted
 
     def filter_unconverted_timezones(self, timezones: set[str]) -> set[str]:
         """Return set of timezones that will not be converted by convert_timezone."""
-        return timezones - self.filter_converted_timezones(timezones)
+        return timezones - set(self.filter_converted_timezones(timezones))
 
     def get_targets(self) -> set[str]:
         """Return set of conversion targets."""
@@ -115,6 +118,27 @@ def get_debconf_choices(template_filename: pathlib.Path) -> set[str]:
     return debconf_choices
 
 
+def _check_symlink(source: str, target: str) -> bool:
+    """Check if the given timezone source symlinks to the given target."""
+    for tzpath in zoneinfo.TZPATH:
+        timezone = pathlib.Path(tzpath) / source
+        if timezone.exists():
+            expected_target = pathlib.Path(tzpath) / target
+            return timezone.resolve() == expected_target.resolve()
+    return True
+
+
+def check_symlinks(timezones: dict[str, str]) -> set[str]:
+    """Check timezone replacements are identical to the symlinks on disk."""
+    mismatch = set()
+    for source, target in timezones.items():
+        if source.startswith("right/"):
+            continue
+        if not _check_symlink(source, target):
+            mismatch.add(source)
+    return mismatch
+
+
 def existing_dir_path(string: str) -> pathlib.Path:
     """Convert string to existing dir path or raise ArgumentTypeError."""
     path = pathlib.Path(string)
@@ -160,7 +184,7 @@ def main() -> int:
     conversion_targets = convert_timezone.get_targets()
     failures = 0
 
-    converted = convert_timezone.filter_converted_timezones(selectable)
+    converted = set(convert_timezone.filter_converted_timezones(selectable))
     if converted:
         logger.error(
             "Following %i timezones can be selected, but will be converted:\n%s",
@@ -206,6 +230,16 @@ def main() -> int:
         )
         failures += 1
 
+    mismatch = check_symlinks(convert_timezone.filter_converted_timezones(available))
+    if mismatch:
+        logger.error(
+            "Following %i timezones are converted,"
+            " but they do not match their symlink targets:\n%s",
+            len(mismatch),
+            "\n".join(sorted(mismatch)),
+        )
+        failures += 1
+
     return failures
 
 
diff --git a/debian/tzdata-legacy.install b/debian/tzdata-legacy.install
index 91fccf0..912d08a 100644
--- a/debian/tzdata-legacy.install
+++ b/debian/tzdata-legacy.install
@@ -4,6 +4,7 @@ usr/share/zoneinfo/America/Buenos_Aires
 usr/share/zoneinfo/America/Catamarca
 usr/share/zoneinfo/America/Cordoba
 usr/share/zoneinfo/America/Fort_Wayne
+usr/share/zoneinfo/America/Godthab
 usr/share/zoneinfo/America/Indianapolis
 usr/share/zoneinfo/America/Jujuy
 usr/share/zoneinfo/America/Knox_IN
diff --git a/debian/tzdata.config b/debian/tzdata.config
index 494e725..31b31eb 100644
--- a/debian/tzdata.config
+++ b/debian/tzdata.config
@@ -23,13 +23,16 @@ convert_timezone()
 		"America/Cordoba" | "America/Rosario")
 			echo "America/Argentina/Cordoba"
 			;;
-		"America/Fort_Wayne" | "America/Indianapolis" | "EST" | "SystemV/EST5" | "US/East-Indiana" | "US/Indiana-Starke")
+		"America/Fort_Wayne" | "America/Indianapolis" | "SystemV/EST5" | "US/East-Indiana")
 			echo "America/Indiana/Indianapolis"
 			;;
+		"America/Godthab")
+			echo "America/Nuuk"
+			;;
 		"America/Jujuy")
 			echo "America/Argentina/Jujuy"
 			;;
-		"America/Knox_IN")
+		"America/Knox_IN" | "US/Indiana-Starke")
 			echo "America/Indiana/Knox"
 			;;
 		"America/Louisville")
@@ -140,33 +143,21 @@ convert_timezone()
 		"Canada/Yukon")
 			echo "America/Whitehorse"
 			;;
-		"CET" | "MET")
-			echo "Europe/Paris"
-			;;
 		"Chile/Continental")
 			echo "America/Santiago"
 			;;
 		"Chile/EasterIsland")
 			echo "Pacific/Easter"
 			;;
-		"CST6CDT" | "SystemV/CST6CDT" | "US/Central")
-			echo "America/Chicago"
-			;;
 		"Cuba")
 			echo "America/Havana"
 			;;
-		"EET")
-			echo "Europe/Helsinki"
-			;;
 		"Egypt")
 			echo "Africa/Cairo"
 			;;
 		"Eire")
 			echo "Europe/Dublin"
 			;;
-		"EST5EDT" | "SystemV/EST5EDT" | "US/Eastern")
-			echo "America/New_York"
-			;;
 		"Europe/Kiev")
 			echo "Europe/Kyiv"
 			;;
@@ -197,9 +188,6 @@ convert_timezone()
 		"Hongkong")
 			echo "Asia/Hong_Kong"
 			;;
-		"HST" | "SystemV/HST10" | "US/Hawaii")
-			echo "Pacific/Honolulu"
-			;;
 		"Iceland")
 			echo "Atlantic/Reykjavik"
 			;;
@@ -230,10 +218,7 @@ convert_timezone()
 		"Mexico/General")
 			echo "America/Mexico_City"
 			;;
-		"MST" | "SystemV/MST7" | "US/Arizona")
-			echo "America/Phoenix"
-			;;
-		"MST7MDT" | "Navajo" | "SystemV/MST7MDT" | "US/Mountain")
+		"Navajo" | "SystemV/MST7MDT" | "US/Mountain")
 			echo "America/Denver"
 			;;
 		"NZ")
@@ -254,15 +239,12 @@ convert_timezone()
 		"Poland")
 			echo "Europe/Warsaw"
 			;;
-		"Portugal" | "WET")
+		"Portugal")
 			echo "Europe/Lisbon"
 			;;
 		"PRC")
 			echo "Asia/Shanghai"
 			;;
-		"PST8PDT" | "SystemV/PST8PDT" | "US/Pacific")
-			echo "America/Los_Angeles"
-			;;
 		"ROC")
 			echo "Asia/Taipei"
 			;;
@@ -275,9 +257,24 @@ convert_timezone()
 		"SystemV/AST4")
 			echo "America/Puerto_Rico"
 			;;
+		"SystemV/CST6CDT" | "US/Central")
+			echo "America/Chicago"
+			;;
+		"SystemV/EST5EDT" | "US/Eastern")
+			echo "America/New_York"
+			;;
+		"SystemV/HST10" | "US/Hawaii")
+			echo "Pacific/Honolulu"
+			;;
+		"SystemV/MST7" | "US/Arizona")
+			echo "America/Phoenix"
+			;;
 		"SystemV/PST8")
 			echo "Pacific/Pitcairn"
 			;;
+		"SystemV/PST8PDT" | "US/Pacific")
+			echo "America/Los_Angeles"
+			;;
 		"SystemV/YST9")
 			echo "Pacific/Gambier"
 			;;
@@ -381,7 +378,7 @@ while [ "$STATE" -ge 0 ]; do
 	2)
 		# Ask the user of the Zone
 		db_get tzdata/Areas || RET=Etc
-		db_input high tzdata/Zones/$RET || true
+		db_input high "tzdata/Zones/$RET" || true
 		;;
 	*)
 		break
diff --git a/debian/tzdata.install b/debian/tzdata.install
index f6d471f..db0b0f8 100644
--- a/debian/tzdata.install
+++ b/debian/tzdata.install
@@ -112,7 +112,6 @@ usr/share/zoneinfo/America/Ensenada
 usr/share/zoneinfo/America/Fort_Nelson
 usr/share/zoneinfo/America/Fortaleza
 usr/share/zoneinfo/America/Glace_Bay
-usr/share/zoneinfo/America/Godthab
 usr/share/zoneinfo/America/Goose_Bay
 usr/share/zoneinfo/America/Grand_Turk
 usr/share/zoneinfo/America/Grenada
diff --git a/debian/tzdata.templates b/debian/tzdata.templates
index 159c050..fae4c4c 100644
--- a/debian/tzdata.templates
+++ b/debian/tzdata.templates
@@ -25,7 +25,7 @@ Type: select
 # Translators: This is a city name.
 # Do not translate underscores. You can use spaces instead.
 #flag:partial
-__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, Ciudad_Juarez, Coral_Harbour, Costa_Rica, Creston, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fort_Nelson, 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, 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, Nuuk, Ojinaga, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Punta_Arenas, 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
+__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, Ciudad_Juarez, Coral_Harbour, Costa_Rica, Creston, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fort_Nelson, Fortaleza, Glace_Bay, 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, 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, Nuuk, Ojinaga, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Punta_Arenas, 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 city or region corresponding to your time zone.