diff -Nru tzdata-2023c/debian/changelog tzdata-2023c/debian/changelog
--- tzdata-2023c/debian/changelog	2023-04-13 14:53:12.000000000 +0200
+++ tzdata-2023c/debian/changelog	2023-05-10 14:54:08.000000000 +0200
@@ -1,3 +1,17 @@
+tzdata (2023c-0ubuntu0.22.10.2) kinetic; urgency=medium
+
+  * Build tzdata with PACKRATLIST=zone.tab. In combination with
+    PACKRATDATA=backzone (which is used since 2023c-0ubuntu0.22.10.1), time
+    zones that differ pre-1970 and had been resurrected will not incur changes
+    to data from 1970 on. This also removes Asia/Hanoi again. Drop
+    Europe/Uzhgorod and Europe/Zaporozhye from debconf (will be upgraded to
+    Europe/Kyiv). Upgrade Pacific/Enderbury to Pacific/Kanton again.
+    (LP: #2017999)
+  * Add an autopkgtest test case for post-1970 symlink consistency
+  * Update debconf template and translations
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Wed, 10 May 2023 14:54:08 +0200
+
 tzdata (2023c-0ubuntu0.22.10.1) kinetic; urgency=medium
 
   * Build timezones that differ pre-1970 (LP: #2003797)
diff -Nru tzdata-2023c/debian/po/be.po tzdata-2023c/debian/po/be.po
--- tzdata-2023c/debian/po/be.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/be.po	2023-05-10 14:54:08.000000000 +0200
@@ -2082,13 +2082,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Харбін"
 
@@ -2976,13 +2969,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Вужгарад"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Вадуц"
 
@@ -3030,13 +3016,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Запарожжа"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/bg.po tzdata-2023c/debian/po/bg.po
--- tzdata-2023c/debian/po/bg.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/bg.po	2023-05-10 14:54:08.000000000 +0200
@@ -2075,13 +2075,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Харбин"
 
@@ -2969,13 +2962,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Ужгород"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Вадуц"
 
@@ -3023,13 +3009,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Запорожие"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/ca.po tzdata-2023c/debian/po/ca.po
--- tzdata-2023c/debian/po/ca.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/ca.po	2023-05-10 14:54:08.000000000 +0200
@@ -2163,13 +2163,6 @@
 msgid "Gaza"
 msgstr "Gaza"
 
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
 # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po]
 #. Type: select
 #. Choices
@@ -3122,13 +3115,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3179,13 +3165,6 @@
 msgid "Zagreb"
 msgstr "Zagreb"
 
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
 # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po]
 #. Type: select
 #. Choices
diff -Nru tzdata-2023c/debian/po/cs.po tzdata-2023c/debian/po/cs.po
--- tzdata-2023c/debian/po/cs.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/cs.po	2023-05-10 14:54:08.000000000 +0200
@@ -2059,13 +2059,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2947,13 +2940,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Užhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3001,13 +2987,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporoží"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/da.po tzdata-2023c/debian/po/da.po
--- tzdata-2023c/debian/po/da.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/da.po	2023-05-10 14:54:08.000000000 +0200
@@ -2054,13 +2054,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2939,14 +2932,6 @@
 msgid "Ulyanovsk"
 msgstr "Ulyanovsk"
 
-# http://da.wikipedia.org/wiki/Uzjgorod
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzjgorod"
-
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
@@ -2996,14 +2981,6 @@
 msgid "Zagreb"
 msgstr "Zagreb"
 
-# http://da.wikipedia.org/wiki/Zaporizjzja
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporizjzja"
-
 #. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
diff -Nru tzdata-2023c/debian/po/de.po tzdata-2023c/debian/po/de.po
--- tzdata-2023c/debian/po/de.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/de.po	2023-05-10 14:54:08.000000000 +0200
@@ -2057,13 +2057,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2945,13 +2938,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uschhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -2999,13 +2985,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Saporischschja"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/en.po tzdata-2023c/debian/po/en.po
--- tzdata-2023c/debian/po/en.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/en.po	2023-05-10 14:54:08.000000000 +0200
@@ -2054,13 +2054,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2942,13 +2935,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -2996,13 +2982,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/es.po tzdata-2023c/debian/po/es.po
--- tzdata-2023c/debian/po/es.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/es.po	2023-05-10 14:54:08.000000000 +0200
@@ -2089,13 +2089,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2977,13 +2970,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3031,13 +3017,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/eu.po tzdata-2023c/debian/po/eu.po
--- tzdata-2023c/debian/po/eu.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/eu.po	2023-05-10 14:54:08.000000000 +0200
@@ -2064,13 +2064,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2958,13 +2951,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3012,13 +2998,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/fi.po tzdata-2023c/debian/po/fi.po
--- tzdata-2023c/debian/po/fi.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/fi.po	2023-05-10 14:54:08.000000000 +0200
@@ -2063,13 +2063,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2957,13 +2950,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Užhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3011,13 +2997,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporizhia"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/fr.po tzdata-2023c/debian/po/fr.po
--- tzdata-2023c/debian/po/fr.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/fr.po	2023-05-10 14:54:08.000000000 +0200
@@ -2065,13 +2065,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2953,13 +2946,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Oujhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3007,13 +2993,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporijia"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/gl.po tzdata-2023c/debian/po/gl.po
--- tzdata-2023c/debian/po/gl.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/gl.po	2023-05-10 14:54:08.000000000 +0200
@@ -2058,13 +2058,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2946,13 +2939,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3000,13 +2986,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/gu.po tzdata-2023c/debian/po/gu.po
--- tzdata-2023c/debian/po/gu.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/gu.po	2023-05-10 14:54:08.000000000 +0200
@@ -2062,13 +2062,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "હાર્બિન"
 
@@ -2956,13 +2949,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "ઉઝગોરોડ"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "વાડુઝ"
 
@@ -3010,13 +2996,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "ઝાપારોઝયે"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/he.po tzdata-2023c/debian/po/he.po
--- tzdata-2023c/debian/po/he.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/he.po	2023-05-10 14:54:08.000000000 +0200
@@ -2064,13 +2064,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "חרבין"
 
@@ -2958,13 +2951,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "אוז'הורוד"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "ואדוץ"
 
@@ -3012,13 +2998,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "זפורוז'יה"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/hr.po tzdata-2023c/debian/po/hr.po
--- tzdata-2023c/debian/po/hr.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/hr.po	2023-05-10 14:54:08.000000000 +0200
@@ -2082,13 +2082,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2976,13 +2969,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "UĹžhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3030,13 +3016,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "ZaporoĹžje"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/hu.po tzdata-2023c/debian/po/hu.po
--- tzdata-2023c/debian/po/hu.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/hu.po	2023-05-10 14:54:08.000000000 +0200
@@ -2062,13 +2062,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2956,13 +2949,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzsgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3010,13 +2996,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/id.po tzdata-2023c/debian/po/id.po
--- tzdata-2023c/debian/po/id.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/id.po	2023-05-10 14:54:08.000000000 +0200
@@ -2080,13 +2080,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2974,13 +2967,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3028,13 +3014,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/it.po tzdata-2023c/debian/po/it.po
--- tzdata-2023c/debian/po/it.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/it.po	2023-05-10 14:54:08.000000000 +0200
@@ -2055,13 +2055,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2949,13 +2942,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Užhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3003,13 +2989,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporižžja"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/ja.po tzdata-2023c/debian/po/ja.po
--- tzdata-2023c/debian/po/ja.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/ja.po	2023-05-10 14:54:08.000000000 +0200
@@ -2054,13 +2054,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "ハルビン"
 
@@ -2942,13 +2935,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "ウジゴロド"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "ファドーツ"
 
@@ -2996,13 +2982,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "ザポロージェ"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/ko.po tzdata-2023c/debian/po/ko.po
--- tzdata-2023c/debian/po/ko.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/ko.po	2023-05-10 14:54:08.000000000 +0200
@@ -2053,13 +2053,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "하얼빈"
 
@@ -2941,13 +2934,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "우즈호로드"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "바두츠"
 
@@ -2995,13 +2981,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "자포리자"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/ku.po tzdata-2023c/debian/po/ku.po
--- tzdata-2023c/debian/po/ku.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/ku.po	2023-05-10 14:54:08.000000000 +0200
@@ -2077,13 +2077,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2971,13 +2964,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3025,13 +3011,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/lt.po tzdata-2023c/debian/po/lt.po
--- tzdata-2023c/debian/po/lt.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/lt.po	2023-05-10 14:54:08.000000000 +0200
@@ -2072,13 +2072,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbinas"
 
@@ -2966,13 +2959,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Užgorodas"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaducas"
 
@@ -3020,13 +3006,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporožė"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/ml.po tzdata-2023c/debian/po/ml.po
--- tzdata-2023c/debian/po/ml.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/ml.po	2023-05-10 14:54:08.000000000 +0200
@@ -2079,13 +2079,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "ഹാര്‍ബിന്‍"
 
@@ -2973,13 +2966,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "ഉഴ്ഗോരോദ്"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "വാഡുസ്"
 
@@ -3027,13 +3013,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "സപ്പോറോഴി"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/nl.po tzdata-2023c/debian/po/nl.po
--- tzdata-2023c/debian/po/nl.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/nl.po	2023-05-10 14:54:08.000000000 +0200
@@ -2058,13 +2058,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2946,13 +2939,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3000,13 +2986,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/pl.po tzdata-2023c/debian/po/pl.po
--- tzdata-2023c/debian/po/pl.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/pl.po	2023-05-10 14:54:08.000000000 +0200
@@ -2059,13 +2059,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2947,13 +2940,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Użhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3001,13 +2987,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporoże"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/pt_BR.po tzdata-2023c/debian/po/pt_BR.po
--- tzdata-2023c/debian/po/pt_BR.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/pt_BR.po	2023-05-10 14:54:08.000000000 +0200
@@ -2060,13 +2060,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2948,13 +2941,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3002,13 +2988,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/pt.po tzdata-2023c/debian/po/pt.po
--- tzdata-2023c/debian/po/pt.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/pt.po	2023-05-10 14:54:08.000000000 +0200
@@ -2059,13 +2059,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2947,13 +2940,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3001,13 +2987,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/ru.po tzdata-2023c/debian/po/ru.po
--- tzdata-2023c/debian/po/ru.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/ru.po	2023-05-10 14:54:08.000000000 +0200
@@ -2062,13 +2062,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Харбин"
 
@@ -2950,13 +2943,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Ужгород"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Вадуц"
 
@@ -3004,13 +2990,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Запорожье"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/sk.po tzdata-2023c/debian/po/sk.po
--- tzdata-2023c/debian/po/sk.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/sk.po	2023-05-10 14:54:08.000000000 +0200
@@ -2058,13 +2058,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Charbin"
 
@@ -2952,13 +2945,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Užhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3006,13 +2992,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Záporožie"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/sq.po tzdata-2023c/debian/po/sq.po
--- tzdata-2023c/debian/po/sq.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/sq.po	2023-05-10 14:54:08.000000000 +0200
@@ -2078,13 +2078,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2972,13 +2965,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3026,13 +3012,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/sv.po tzdata-2023c/debian/po/sv.po
--- tzdata-2023c/debian/po/sv.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/sv.po	2023-05-10 14:54:08.000000000 +0200
@@ -2056,13 +2056,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2949,13 +2942,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzjhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3003,13 +2989,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/templates.pot tzdata-2023c/debian/po/templates.pot
--- tzdata-2023c/debian/po/templates.pot	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/templates.pot	2023-05-10 14:54:08.000000000 +0200
@@ -2052,13 +2052,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr ""
 
@@ -2940,13 +2933,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr ""
 
@@ -2993,13 +2979,6 @@
 msgstr ""
 
 #. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr ""
-
-#. Type: select
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
diff -Nru tzdata-2023c/debian/po/th.po tzdata-2023c/debian/po/th.po
--- tzdata-2023c/debian/po/th.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/th.po	2023-05-10 14:54:08.000000000 +0200
@@ -2054,13 +2054,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "ฮาร์บิน"
 
@@ -2948,13 +2941,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "วาดุซ"
 
@@ -3002,13 +2988,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr ""
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/tr.po tzdata-2023c/debian/po/tr.po
--- tzdata-2023c/debian/po/tr.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/tr.po	2023-05-10 14:54:08.000000000 +0200
@@ -2056,13 +2056,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2944,13 +2937,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -2998,13 +2984,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporosya"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/vi.po tzdata-2023c/debian/po/vi.po
--- tzdata-2023c/debian/po/vi.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/vi.po	2023-05-10 14:54:08.000000000 +0200
@@ -2078,13 +2078,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2972,13 +2965,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3026,13 +3012,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/po/wo.po tzdata-2023c/debian/po/wo.po
--- tzdata-2023c/debian/po/wo.po	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/po/wo.po	2023-05-10 14:54:08.000000000 +0200
@@ -2071,13 +2071,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:7001
-msgid "Hanoi"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:7001
 msgid "Harbin"
 msgstr "Harbin"
 
@@ -2965,13 +2958,6 @@
 #. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
 msgid "Vaduz"
 msgstr "Vaduz"
 
@@ -3019,13 +3005,6 @@
 
 #. Type: select
 #. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporozhye"
-
-#. Type: select
-#. Choices
 #. Translators: do not translate underscores. You can use spaces instead.
 #: ../tzdata.templates:9001
 msgid "Zurich"
diff -Nru tzdata-2023c/debian/rules tzdata-2023c/debian/rules
--- tzdata-2023c/debian/rules	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/rules	2023-05-10 14:54:08.000000000 +0200
@@ -27,10 +27,10 @@
 
 override_dh_auto_build-indep:
 	# Generate a tzdata.zi file
-	$(MAKE) AWK=gawk BACKWARD="backward" PACKRATDATA=backzone VERSION_DEPS= tzdata.zi
+	$(MAKE) AWK=gawk BACKWARD="backward" PACKRATDATA=backzone PACKRATLIST=zone.tab VERSION_DEPS= tzdata.zi
 
 	# Generate the leapseconds file
-	$(MAKE) AWK=gawk PACKRATDATA=backzone leapseconds
+	$(MAKE) AWK=gawk PACKRATDATA=backzone PACKRATLIST=zone.tab leapseconds
 
 	# Build the timezone data
 	/usr/sbin/zic -d $(TZGEN) -L /dev/null tzdata.zi ; \
@@ -73,7 +73,7 @@
 	    fi ; \
 	    cd $(CURDIR)/tzgen/$$i ; \
 	    find . -maxdepth 2 -type f -o -type l | sed -e 's#^\./##' | \
-		egrep -v '^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Argentina/ComodRivadavia|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Rosario|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke|Asmera|South_Pole|Saigon|Calcutta|Katmandu|Pacific-New|Enderbury|Kiev)$$' | \
+		egrep -v '^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Argentina/ComodRivadavia|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Rosario|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke|Asmera|South_Pole|Saigon|Calcutta|Katmandu|Pacific-New|Enderbury|Kiev|Uzhgorod|Zaporozhye)$$' | \
 		sort -n | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $$#\n#' ; \
 	    echo "_Description: Time zone:" ; \
 	    echo " Please select the city or region corresponding to your time zone." ; \
diff -Nru tzdata-2023c/debian/tests/python tzdata-2023c/debian/tests/python
--- tzdata-2023c/debian/tests/python	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/tests/python	2023-05-10 14:54:08.000000000 +0200
@@ -7,11 +7,25 @@
 import datetime
 import os
 import pathlib
+import re
 import sys
 import typing
 import unittest
 import zoneinfo
 
+ROOT_DIR = pathlib.Path(__file__).parent.parent.parent
+
+
+def read_backwards_links(backwards_file: pathlib.Path) -> dict[str, str]:
+    """Read backwards compatibility links from the upstream backwards file."""
+    backwards_links = {}
+    for line in backwards_file.read_text(encoding="utf-8").splitlines():
+        match = re.match(r"^Link\t(?P<target>\S+)\t+(?P<link_name>\S+)", line)
+        if not match:
+            continue
+        backwards_links[match.group("link_name")] = match.group("target")
+    return backwards_links
+
 
 class TestZoneinfo(unittest.TestCase):
     """Test timezones using Python's zoneinfo module."""
@@ -25,10 +39,8 @@
     def test_available_timezones_count(self) -> None:
         """Test available_timezones() count to be reasonable."""
         zones = len(zoneinfo.available_timezones())
-        self.assertGreaterEqual(zones, 597, "less zones than 2022g-0ubuntu0.22.10.1")
-        self.assertLess(
-            zones, round(597 * 1.1), ">10% more zones than 2022g-0ubuntu0.22.10.1"
-        )
+        self.assertGreaterEqual(zones, 597, "less zones than 2022g-2")
+        self.assertLess(zones, round(597 * 1.1), ">10% more zones than 2022g-2")
 
     def test_daylight_saving_transition(self) -> None:
         """Test daylight saving time transition from Python documentation."""
@@ -38,19 +50,25 @@
         next_day = date + datetime.timedelta(days=1)
         self.assertEqual(next_day.tzname(), "PST")
 
-    def _test_equal_zones(
-        self, tzinfo1: zoneinfo.ZoneInfo, tzinfo2: zoneinfo.ZoneInfo
+    def _assert_equal_zones_at_date(
+        self,
+        date: datetime.datetime,
+        timezone1: zoneinfo.ZoneInfo,
+        timezone2: zoneinfo.ZoneInfo,
     ) -> None:
-        """Test timezones to be heuristically equal regardless of the name."""
-        date1 = datetime.datetime(2020, 10, 31, 12, tzinfo=tzinfo1)
-        date2 = date1.replace(tzinfo=tzinfo2)
-        self.assertEqual(date1.tzname(), date2.tzname())
+        date1 = date.replace(tzinfo=timezone1)
+        date2 = date.replace(tzinfo=timezone2)
         self.assertEqual(date1 - date2, datetime.timedelta(seconds=0))
-
-        date1 = datetime.datetime(2021, 7, 3, 12, tzinfo=tzinfo1)
-        date2 = date1.replace(tzinfo=tzinfo2)
         self.assertEqual(date1.tzname(), date2.tzname())
-        self.assertEqual(date1 - date2, datetime.timedelta(seconds=0))
+
+    def _assert_equal_zones(
+        self, timezone1: zoneinfo.ZoneInfo, timezone2: zoneinfo.ZoneInfo
+    ) -> None:
+        """Test timezones to be heuristically equal regardless of the name."""
+        october_2020 = datetime.datetime(2020, 10, 31, 12)
+        self._assert_equal_zones_at_date(october_2020, timezone1, timezone2)
+        july_2021 = datetime.datetime(2021, 7, 3, 12)
+        self._assert_equal_zones_at_date(july_2021, timezone1, timezone2)
 
     @unittest.skipIf(os.environ.get("PYTHONTZPATH"), "requires installed tzdata")
     def test_localtime(self) -> None:
@@ -58,7 +76,7 @@
         localtime = pathlib.Path("/etc/localtime")
         zone = str(localtime.resolve().relative_to("/usr/share/zoneinfo"))
         tzinfo = zoneinfo.ZoneInfo("localtime")
-        self._test_equal_zones(tzinfo, zoneinfo.ZoneInfo(zone))
+        self._assert_equal_zones(tzinfo, zoneinfo.ZoneInfo(zone))
 
     def _test_timezone(self, zone: str) -> None:
         """Test zone to load, have a name, and have a reasonable offset."""
@@ -84,6 +102,25 @@
         oslo = zoneinfo.ZoneInfo("Europe/Oslo")
         self.assertEqual(self._hours(date.replace(tzinfo=oslo).utcoffset()), 2)
 
+    def test_post_1970_symlinks_consistency(self) -> None:
+        """Test that post-1970 symlinks are consistent with pre-1970 timezones.
+
+        Building tzdata with PACKRATDATA=backzone will result in separate
+        time zones for time zones that differ only before 1970. These time
+        zones should behave identical after 1970. Building tzdata without
+        PACKRATDATA=backzone will result in one of the time zones become a
+        symlink to the other time zone.
+        """
+        links = read_backwards_links(ROOT_DIR / "backward")
+        for link_name, target in links.items():
+            with self.subTest(f"{link_name} -> {target}"):
+                tz_link = zoneinfo.ZoneInfo(link_name)
+                tz_target = zoneinfo.ZoneInfo(target)
+                now = datetime.datetime.now()
+                self._assert_equal_zones_at_date(now, tz_link, tz_target)
+                future = now + datetime.timedelta(days=30 * 6)
+                self._assert_equal_zones_at_date(future, tz_link, tz_target)
+
     def test_timezones(self) -> None:
         """Test all zones to load, have a name, and have a reasonable offset."""
         for zone in zoneinfo.available_timezones():
diff -Nru tzdata-2023c/debian/tzdata.config tzdata-2023c/debian/tzdata.config
--- tzdata-2023c/debian/tzdata.config	2023-04-13 14:50:18.000000000 +0200
+++ tzdata-2023c/debian/tzdata.config	2023-05-10 14:54:08.000000000 +0200
@@ -257,6 +257,9 @@
         "NZ-CHAT")
             echo "Pacific/Chatham"
             ;;
+        "Pacific/Enderbury")
+            echo "Pacific/Kanton"
+            ;;
         "Poland")
             echo "Europe/Warsaw"
             ;;
diff -Nru tzdata-2023c/debian/tzdata.templates tzdata-2023c/debian/tzdata.templates
--- tzdata-2023c/debian/tzdata.templates	2023-04-13 14:51:03.000000000 +0200
+++ tzdata-2023c/debian/tzdata.templates	2023-05-10 14:54:08.000000000 +0200
@@ -53,7 +53,7 @@
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 #flag:partial
-__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, Hanoi, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qostanay, Qyzylorda, Rangoon, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan
+__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qostanay, Qyzylorda, Rangoon, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan
 _Description: Time zone:
  Please select the city or region corresponding to your time zone.
 
@@ -69,7 +69,7 @@
 Type: select
 # Translators: do not translate underscores. You can use spaces instead.
 #flag:partial
-__Choices: Amsterdam, Andorra, Astrakhan, Athens, Belfast, Belgrade, Berlin, Bratislava, Brussels, Bucharest, Budapest, Busingen, Chisinau, Copenhagen, Dublin, Gibraltar, Guernsey, Helsinki, Isle_of_Man, Istanbul, Jersey, Kaliningrad, Kirov, Kyiv, Lisbon, Ljubljana, London, Luxembourg, Madrid, Malta, Mariehamn, Minsk, Monaco, Moscow, Nicosia, Oslo, Paris, Podgorica, Prague, Riga, Rome, Samara, San_Marino, Sarajevo, Saratov, Simferopol, Skopje, Sofia, Stockholm, Tallinn, Tirane, Tiraspol, Ulyanovsk, Uzhgorod, Vaduz, Vatican, Vienna, Vilnius, Volgograd, Warsaw, Zagreb, Zaporozhye, Zurich
+__Choices: Amsterdam, Andorra, Astrakhan, Athens, Belfast, Belgrade, Berlin, Bratislava, Brussels, Bucharest, Budapest, Busingen, Chisinau, Copenhagen, Dublin, Gibraltar, Guernsey, Helsinki, Isle_of_Man, Istanbul, Jersey, Kaliningrad, Kirov, Kyiv, Lisbon, Ljubljana, London, Luxembourg, Madrid, Malta, Mariehamn, Minsk, Monaco, Moscow, Nicosia, Oslo, Paris, Podgorica, Prague, Riga, Rome, Samara, San_Marino, Sarajevo, Saratov, Simferopol, Skopje, Sofia, Stockholm, Tallinn, Tirane, Tiraspol, Ulyanovsk, Vaduz, Vatican, Vienna, Vilnius, Volgograd, Warsaw, Zagreb, Zurich
 _Description: Time zone:
  Please select the city or region corresponding to your time zone.