diff -Nru tzdata-2023c/debian/changelog tzdata-2023c/debian/changelog --- tzdata-2023c/debian/changelog 2023-04-03 12:59:10.000000000 +0200 +++ tzdata-2023c/debian/changelog 2023-05-10 14:41:47.000000000 +0200 @@ -1,3 +1,19 @@ +tzdata (2023c-2exp1ubuntu1.1) lunar; urgency=medium + + * Build tzdata with PACKRATLIST=zone.tab. In combination with + PACKRATDATA=backzone (which is used since 2022g-3), time zones that differ + pre-1970 and had been resurrected will not incur changes to data from 1970 + on. (LP: #2017999) This also removes Asia/Hanoi again. It removes following + time zones from debconf and updates them on upgrades again: + - Update America/Argentina/ComodRivadavia to America/Argentina/Catamarca + - Update America/Rosario to America/Argentina/Cordoba + - Update Europe/Uzhgorod and Europe/Zaporozhye to Europe/Kyiv + - Update Pacific/Enderbury to Pacific/Kanton + * Add an autopkgtest test case for post-1970 symlink consistency + * Update debconf template and translations + + -- Benjamin Drung Wed, 10 May 2023 14:41:47 +0200 + tzdata (2023c-2exp1ubuntu1) lunar; urgency=medium * Merge with Debian experimental. Remaining changes: diff -Nru tzdata-2023c/debian/generate_debconf_templates tzdata-2023c/debian/generate_debconf_templates --- tzdata-2023c/debian/generate_debconf_templates 2023-04-03 12:48:53.000000000 +0200 +++ tzdata-2023c/debian/generate_debconf_templates 2023-05-10 14:41:47.000000000 +0200 @@ -31,6 +31,7 @@ # List of backward compatability symlinks that should not be selectable EXCLUDE_SYMLINKS = { "Africa/Asmera", + "America/Argentina/ComodRivadavia", "America/Buenos_Aires", "America/Catamarca", "America/Cordoba", @@ -40,6 +41,7 @@ "America/Knox_IN", "America/Louisville", "America/Mendoza", + "America/Rosario", "Antarctica/South_Pole", "Asia/Ashkhabad", "Asia/Calcutta", @@ -62,33 +64,54 @@ "Australia/Victoria", "Australia/West", "Europe/Kiev", + "Europe/Uzhgorod", + "Europe/Zaporozhye", + "Pacific/Enderbury", "US/East-Indiana", } # List of symlinks that should be selectable INCLUDE_SYMLINKS = { + "Africa/Timbuktu", "America/Atka", + "America/Coral_Harbour", + "America/Ensenada", "America/Godthab", "America/Kralendijk", "America/Lower_Princes", "America/Marigot", + "America/Montreal", + "America/Nipigon", + "America/Pangnirtung", "America/Porto_Acre", + "America/Rainy_River", "America/Santa_Isabel", "America/Shiprock", "America/St_Barthelemy", + "America/Thunder_Bay", "America/Virgin", + "America/Yellowknife", "Arctic/Longyearbyen", + "Asia/Chongqing", + "Asia/Harbin", "Asia/Istanbul", "Asia/Ujung_Pandang", + "Asia/Kashgar", + "Asia/Tel_Aviv", + "Atlantic/Jan_Mayen", "Australia/Canberra", + "Australia/Currie", "Australia/Yancowinna", + "Europe/Belfast", "Europe/Bratislava", "Europe/Busingen", "Europe/Mariehamn", "Europe/Nicosia", "Europe/Podgorica", "Europe/San_Marino", + "Europe/Tiraspol", "Europe/Vatican", + "Pacific/Johnston", "Pacific/Ponape", "Pacific/Samoa", "Pacific/Truk", diff -Nru tzdata-2023c/debian/po/be.po tzdata-2023c/debian/po/be.po --- tzdata-2023c/debian/po/be.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/be.po 2023-05-10 14:41:47.000000000 +0200 @@ -655,13 +655,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Аргенціна/Кардоба" @@ -1523,13 +1516,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1992,13 +1978,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Харбін" @@ -2971,13 +2950,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 +2999,6 @@ #. 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" msgstr "Цюрых" @@ -3165,13 +3130,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Эндарбары" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/bg.po tzdata-2023c/debian/po/bg.po --- tzdata-2023c/debian/po/bg.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/bg.po 2023-05-10 14:41:47.000000000 +0200 @@ -648,13 +648,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Аржентина/Кордоба" @@ -1516,13 +1509,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1985,13 +1971,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Харбин" @@ -2964,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 "Вадуц" @@ -3020,13 +2992,6 @@ #. 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" msgstr "Цюрих" @@ -3158,13 +3123,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Ендербъри" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/ca.po tzdata-2023c/debian/po/ca.po --- tzdata-2023c/debian/po/ca.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ca.po 2023-05-10 14:41:47.000000000 +0200 @@ -667,13 +667,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdoba" @@ -1580,13 +1573,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -2071,13 +2057,6 @@ msgid "Gaza" msgstr "Gaza" -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices @@ -3129,13 +3108,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" @@ -3186,13 +3158,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 @@ -3336,13 +3301,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/cs.po tzdata-2023c/debian/po/cs.po --- tzdata-2023c/debian/po/cs.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/cs.po 2023-05-10 14:41:47.000000000 +0200 @@ -638,13 +638,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdoba" @@ -1506,13 +1499,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1975,13 +1961,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2954,13 +2933,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" @@ -3010,13 +2982,6 @@ #. 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" msgstr "Curych" @@ -3148,13 +3113,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury (Phoenixovy ostrovy)" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/da.po tzdata-2023c/debian/po/da.po --- tzdata-2023c/debian/po/da.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/da.po 2023-05-10 14:41:47.000000000 +0200 @@ -633,13 +633,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Cordoba" @@ -1501,13 +1494,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1970,13 +1956,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2946,14 +2925,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. @@ -3003,14 +2974,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. @@ -3146,13 +3109,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/de.po tzdata-2023c/debian/po/de.po --- tzdata-2023c/debian/po/de.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/de.po 2023-05-10 14:41:47.000000000 +0200 @@ -636,13 +636,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "Argentinien/Comodoro Rivadavia" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentinien/Córdoba" @@ -1504,13 +1497,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "Rosario" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1973,13 +1959,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "Hanoi" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2952,13 +2931,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" @@ -3008,13 +2980,6 @@ #. 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" msgstr "Zürich" @@ -3146,13 +3111,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/en.po tzdata-2023c/debian/po/en.po --- tzdata-2023c/debian/po/en.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/en.po 2023-05-10 14:41:47.000000000 +0200 @@ -633,13 +633,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "Comodoro Rivadavia (Argentina)" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Cordoba (Argentina)" @@ -1501,13 +1494,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "Rosario" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1970,13 +1956,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "Hanoi" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2949,13 +2928,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" @@ -3005,13 +2977,6 @@ #. 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" msgstr "Zurich" @@ -3143,13 +3108,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury Island" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/es.po tzdata-2023c/debian/po/es.po --- tzdata-2023c/debian/po/es.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/es.po 2023-05-10 14:41:47.000000000 +0200 @@ -668,13 +668,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdoba" @@ -1536,13 +1529,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -2005,13 +1991,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2984,13 +2963,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" @@ -3040,13 +3012,6 @@ #. 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" msgstr "Zúrich" @@ -3178,13 +3143,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/eu.po tzdata-2023c/debian/po/eu.po --- tzdata-2023c/debian/po/eu.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/eu.po 2023-05-10 14:41:47.000000000 +0200 @@ -643,13 +643,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Cordoba" @@ -1511,13 +1504,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1980,13 +1966,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2959,13 +2938,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" @@ -3015,13 +2987,6 @@ #. 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" msgstr "Zurich" @@ -3153,13 +3118,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/fi.po tzdata-2023c/debian/po/fi.po --- tzdata-2023c/debian/po/fi.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/fi.po 2023-05-10 14:41:47.000000000 +0200 @@ -636,13 +636,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentiina/Córdoba" @@ -1504,13 +1497,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1973,13 +1959,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2952,13 +2931,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" @@ -3008,13 +2980,6 @@ #. 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" msgstr "Zürich" @@ -3146,13 +3111,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/fr.po tzdata-2023c/debian/po/fr.po --- tzdata-2023c/debian/po/fr.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/fr.po 2023-05-10 14:41:47.000000000 +0200 @@ -644,13 +644,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Córdoba" @@ -1512,13 +1505,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1981,13 +1967,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2960,13 +2939,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" @@ -3016,13 +2988,6 @@ #. 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" msgstr "Zurich" @@ -3154,13 +3119,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury (îles Phoenix)" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/gl.po tzdata-2023c/debian/po/gl.po --- tzdata-2023c/debian/po/gl.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/gl.po 2023-05-10 14:41:47.000000000 +0200 @@ -637,13 +637,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Arxentina/Córdoba" @@ -1505,13 +1498,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1974,13 +1960,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2953,13 +2932,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" @@ -3009,13 +2981,6 @@ #. 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" msgstr "Zurich" @@ -3147,13 +3112,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury (Illas Phoenix)" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/gu.po tzdata-2023c/debian/po/gu.po --- tzdata-2023c/debian/po/gu.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/gu.po 2023-05-10 14:41:47.000000000 +0200 @@ -641,13 +641,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "આર્જેન્ટિના/કોર્ડોબા" @@ -1509,13 +1502,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "સાન્ટા ઈઝાબેલ" @@ -1978,13 +1964,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "હાર્બિન" @@ -2957,13 +2936,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 "વાડુઝ" @@ -3013,13 +2985,6 @@ #. 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" msgstr "ઝ્યુરિચ" @@ -3151,13 +3116,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "એન્ડરબરી" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/he.po tzdata-2023c/debian/po/he.po --- tzdata-2023c/debian/po/he.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/he.po 2023-05-10 14:41:47.000000000 +0200 @@ -643,13 +643,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "ארגנטינה/קורדובה" @@ -1511,13 +1504,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "סנטה איזבל" @@ -1980,13 +1966,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "חרבין" @@ -2959,13 +2938,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 "ואדוץ" @@ -3015,13 +2987,6 @@ #. 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" msgstr "ציריך" @@ -3153,13 +3118,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "אנדרבורי (איי פניקס)" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/hr.po tzdata-2023c/debian/po/hr.po --- tzdata-2023c/debian/po/hr.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/hr.po 2023-05-10 14:41:47.000000000 +0200 @@ -647,13 +647,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "" @@ -1517,13 +1510,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1986,13 +1972,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2965,13 +2944,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" @@ -3021,13 +2993,6 @@ #. 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" msgstr "ZĂźrich" @@ -3159,13 +3124,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/hu.po tzdata-2023c/debian/po/hu.po --- tzdata-2023c/debian/po/hu.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/hu.po 2023-05-10 14:41:47.000000000 +0200 @@ -641,13 +641,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentína/Cordoba" @@ -1509,13 +1502,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1978,13 +1964,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2957,13 +2936,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" @@ -3013,13 +2985,6 @@ #. 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" msgstr "Zürich" @@ -3151,13 +3116,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury (Főnix-szigetek)" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/id.po tzdata-2023c/debian/po/id.po --- tzdata-2023c/debian/po/id.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/id.po 2023-05-10 14:41:47.000000000 +0200 @@ -650,13 +650,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Kordoba" @@ -1526,13 +1519,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1996,13 +1982,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2975,13 +2954,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 +3003,6 @@ #. 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" msgstr "Zurich" @@ -3169,13 +3134,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury (Kep. Phoenix)" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/it.po tzdata-2023c/debian/po/it.po --- tzdata-2023c/debian/po/it.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/it.po 2023-05-10 14:41:47.000000000 +0200 @@ -634,13 +634,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdoba" @@ -1502,13 +1495,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1971,13 +1957,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2950,13 +2929,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 +2978,6 @@ #. 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" msgstr "Zurigo" @@ -3144,13 +3109,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/ja.po tzdata-2023c/debian/po/ja.po --- tzdata-2023c/debian/po/ja.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ja.po 2023-05-10 14:41:47.000000000 +0200 @@ -633,13 +633,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "アルゼンチン/コルドバ" @@ -1501,13 +1494,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "サンタイサベル" @@ -1970,13 +1956,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "ハルビン" @@ -2949,13 +2928,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 "ファドーツ" @@ -3005,13 +2977,6 @@ #. 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" msgstr "チューリヒ" @@ -3143,13 +3108,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "エンダーベリー" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/ko.po tzdata-2023c/debian/po/ko.po --- tzdata-2023c/debian/po/ko.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ko.po 2023-05-10 14:41:47.000000000 +0200 @@ -632,13 +632,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "아르헨티나/코르도바" @@ -1500,13 +1493,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "산타이사벨" @@ -1969,13 +1955,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "하얼빈" @@ -2948,13 +2927,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 +2976,6 @@ #. 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" msgstr "취리히" @@ -3142,13 +3107,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/ku.po tzdata-2023c/debian/po/ku.po --- tzdata-2023c/debian/po/ku.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ku.po 2023-05-10 14:41:47.000000000 +0200 @@ -650,13 +650,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Arjantîn/Kordoba" @@ -1518,13 +1511,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1987,13 +1973,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2966,13 +2945,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" @@ -3022,13 +2994,6 @@ #. 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" msgstr "Zurîx" @@ -3160,13 +3125,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/lt.po tzdata-2023c/debian/po/lt.po --- tzdata-2023c/debian/po/lt.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/lt.po 2023-05-10 14:41:47.000000000 +0200 @@ -645,13 +645,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Kordoba" @@ -1513,13 +1506,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1982,13 +1968,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbinas" @@ -2961,13 +2940,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" @@ -3017,13 +2989,6 @@ #. 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" msgstr "Ciūrichas" @@ -3155,13 +3120,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderberis" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/ml.po tzdata-2023c/debian/po/ml.po --- tzdata-2023c/debian/po/ml.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ml.po 2023-05-10 14:41:47.000000000 +0200 @@ -651,13 +651,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "അര്‍ജ്ജന്റീന/കോര്‍ഡോബ" @@ -1519,13 +1512,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1988,13 +1974,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "ഹാര്‍ബിന്‍" @@ -2967,13 +2946,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 +2995,6 @@ #. 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" msgstr "സൂറിച്ച്" @@ -3161,13 +3126,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "എന്‍ഡെര്‍ബറി" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/nl.po tzdata-2023c/debian/po/nl.po --- tzdata-2023c/debian/po/nl.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/nl.po 2023-05-10 14:41:47.000000000 +0200 @@ -637,13 +637,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "Argentinië/ComodRivadavia" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentinië/Cordoba" @@ -1505,13 +1498,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "Rosario" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1974,13 +1960,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "Hanoi" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2953,13 +2932,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" @@ -3009,13 +2981,6 @@ #. 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" msgstr "Zurich" @@ -3147,13 +3112,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/pl.po tzdata-2023c/debian/po/pl.po --- tzdata-2023c/debian/po/pl.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/pl.po 2023-05-10 14:41:47.000000000 +0200 @@ -638,13 +638,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentyna/Cordoba" @@ -1506,13 +1499,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1975,13 +1961,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2954,13 +2933,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" @@ -3010,13 +2982,6 @@ #. 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" msgstr "Zurych" @@ -3148,13 +3113,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" 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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/pt_BR.po 2023-05-10 14:41:47.000000000 +0200 @@ -639,13 +639,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdova" @@ -1507,13 +1500,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1976,13 +1962,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2955,13 +2934,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" @@ -3011,13 +2983,6 @@ #. 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" msgstr "Zurique" @@ -3149,13 +3114,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/pt.po tzdata-2023c/debian/po/pt.po --- tzdata-2023c/debian/po/pt.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/pt.po 2023-05-10 14:41:47.000000000 +0200 @@ -638,13 +638,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentina/Córdova" @@ -1506,13 +1499,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1975,13 +1961,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2954,13 +2933,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" @@ -3010,13 +2982,6 @@ #. 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" msgstr "Zurique" @@ -3148,13 +3113,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/ru.po tzdata-2023c/debian/po/ru.po --- tzdata-2023c/debian/po/ru.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/ru.po 2023-05-10 14:41:47.000000000 +0200 @@ -641,13 +641,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Аргентина/Кордова" @@ -1509,13 +1502,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Санта-Исабель" @@ -1978,13 +1964,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Харбин" @@ -2957,13 +2936,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 "Вадуц" @@ -3013,13 +2985,6 @@ #. 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" msgstr "Цюрих" @@ -3151,13 +3116,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Эндербери" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/sk.po tzdata-2023c/debian/po/sk.po --- tzdata-2023c/debian/po/sk.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/sk.po 2023-05-10 14:41:47.000000000 +0200 @@ -637,13 +637,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argentína/Córdoba" @@ -1505,13 +1498,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1974,13 +1960,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Charbin" @@ -2953,13 +2932,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" @@ -3009,13 +2981,6 @@ #. 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" msgstr "Zürich" @@ -3147,13 +3112,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/sq.po tzdata-2023c/debian/po/sq.po --- tzdata-2023c/debian/po/sq.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/sq.po 2023-05-10 14:41:47.000000000 +0200 @@ -650,13 +650,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Argjentina/Cordoba" @@ -1518,13 +1511,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1987,13 +1973,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2966,13 +2945,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" @@ -3022,13 +2994,6 @@ #. 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" msgstr "Zurich" @@ -3160,13 +3125,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/sv.po tzdata-2023c/debian/po/sv.po --- tzdata-2023c/debian/po/sv.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/sv.po 2023-05-10 14:41:47.000000000 +0200 @@ -635,13 +635,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Córdoba (Argentina)" @@ -1503,13 +1496,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa Isabel" @@ -1973,13 +1959,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2957,13 +2936,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" @@ -3013,13 +2985,6 @@ #. 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" msgstr "Zürich" @@ -3154,13 +3119,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/templates.pot tzdata-2023c/debian/po/templates.pot --- tzdata-2023c/debian/po/templates.pot 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/templates.pot 2023-05-10 14:41:47.000000000 +0200 @@ -631,13 +631,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "" @@ -1499,13 +1492,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1968,13 +1954,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "" @@ -2947,13 +2926,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 "" @@ -3003,13 +2975,6 @@ #. 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" msgstr "" @@ -3140,13 +3105,6 @@ msgstr "" #. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "" - -#. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 diff -Nru tzdata-2023c/debian/po/th.po tzdata-2023c/debian/po/th.po --- tzdata-2023c/debian/po/th.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/th.po 2023-05-10 14:41:47.000000000 +0200 @@ -633,13 +633,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "อาร์เจนตินา/Cordoba" @@ -1501,13 +1494,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1970,13 +1956,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "ฮาร์บิน" @@ -2949,13 +2928,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 "วาดุซ" @@ -3005,13 +2977,6 @@ #. 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" msgstr "ซูริก" @@ -3142,13 +3107,6 @@ msgstr "" #. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "" - -#. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 diff -Nru tzdata-2023c/debian/po/tr.po tzdata-2023c/debian/po/tr.po --- tzdata-2023c/debian/po/tr.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/tr.po 2023-05-10 14:41:47.000000000 +0200 @@ -636,13 +636,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "Arjantin/ComodRivadavia" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Arjantin/Kordoba" @@ -1504,13 +1497,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "Rosario" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "Santa İsabel" @@ -1973,13 +1959,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "Hanoi" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2952,13 +2931,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" @@ -3008,13 +2980,6 @@ #. 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" msgstr "Zürih" @@ -3146,13 +3111,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/vi.po tzdata-2023c/debian/po/vi.po --- tzdata-2023c/debian/po/vi.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/vi.po 2023-05-10 14:41:47.000000000 +0200 @@ -650,13 +650,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Ă-gienh-ti-nạ/Cordoba" @@ -1518,13 +1511,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1987,13 +1973,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2966,13 +2945,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" @@ -3022,13 +2994,6 @@ #. 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" msgstr "Zurich" @@ -3160,13 +3125,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/po/wo.po tzdata-2023c/debian/po/wo.po --- tzdata-2023c/debian/po/wo.po 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/po/wo.po 2023-05-10 14:41:47.000000000 +0200 @@ -644,13 +644,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Argentina/ComodRivadavia" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Argentina/Cordoba" msgstr "Arsantiin/Kordoba" @@ -1512,13 +1505,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:3001 -msgid "Rosario" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:3001 msgid "Santa_Isabel" msgstr "" @@ -1981,13 +1967,6 @@ #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:6001 -msgid "Hanoi" -msgstr "" - -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:6001 msgid "Harbin" msgstr "Harbin" @@ -2960,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" @@ -3016,13 +2988,6 @@ #. 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" msgstr "Zurik" @@ -3154,13 +3119,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:11001 -msgid "Enderbury" -msgstr "Enderbury (îles Phoenix)" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:11001 msgid "Fakaofo" diff -Nru tzdata-2023c/debian/rules tzdata-2023c/debian/rules --- tzdata-2023c/debian/rules 2023-04-03 12:48:25.000000000 +0200 +++ tzdata-2023c/debian/rules 2023-05-10 14:41:47.000000000 +0200 @@ -13,10 +13,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 ; \ diff -Nru tzdata-2023c/debian/tests/python tzdata-2023c/debian/tests/python --- tzdata-2023c/debian/tests/python 2023-04-03 12:27:44.000000000 +0200 +++ tzdata-2023c/debian/tests/python 2023-05-10 14:41:47.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\S+)\t+(?P\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,8 +39,8 @@ def test_available_timezones_count(self) -> None: """Test available_timezones() count to be reasonable.""" zones = len(zoneinfo.available_timezones()) - self.assertGreaterEqual(zones, 598, "less zones than 2022g-3") - self.assertLess(zones, round(598 * 1.1), ">10% more zones than 2022g-3") + 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.""" @@ -36,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: @@ -56,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.""" @@ -82,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-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/tzdata.config 2023-05-10 14:41:47.000000000 +0200 @@ -17,10 +17,10 @@ "America/Buenos_Aires") echo "America/Argentina/Buenos_Aires" ;; - "America/Catamarca") + "America/Argentina/ComodRivadavia" | "America/Catamarca") echo "America/Argentina/Catamarca" ;; - "America/Cordoba") + "America/Cordoba" | "America/Rosario") echo "America/Argentina/Cordoba" ;; "America/Fort_Wayne" | "America/Indianapolis" | "EST" | "SystemV/EST5" | "US/East-Indiana") @@ -167,6 +167,12 @@ "Europe/Kiev") echo "Europe/Kyiv" ;; + "Europe/Uzhgorod") + echo "Europe/Kyiv" + ;; + "Europe/Zaporozhye") + echo "Europe/Kyiv" + ;; "GB" | "GB-Eire") echo "Europe/London" ;; @@ -230,6 +236,9 @@ "NZ") echo "Pacific/Auckland" ;; + "Pacific/Enderbury") + echo "Pacific/Kanton" + ;; "NZ-CHAT") echo "Pacific/Chatham" ;; diff -Nru tzdata-2023c/debian/tzdata.templates tzdata-2023c/debian/tzdata.templates --- tzdata-2023c/debian/tzdata.templates 2023-04-03 12:12:32.000000000 +0200 +++ tzdata-2023c/debian/tzdata.templates 2023-05-10 14:41:47.000000000 +0200 @@ -23,7 +23,7 @@ Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/ComodRivadavia, 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, Rosario, 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, 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 _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -47,7 +47,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, 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, 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. @@ -71,7 +71,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. @@ -87,7 +87,7 @@ Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Apia, Auckland, Bougainville, Chatham, Chuuk, Easter, Efate, Enderbury, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kanton, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Pohnpei, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap +__Choices: Apia, Auckland, Bougainville, Chatham, Chuuk, Easter, Efate, Fakaofo, Fiji, Funafuti, Galapagos, Gambier, Guadalcanal, Guam, Honolulu, Johnston, Kanton, Kiritimati, Kosrae, Kwajalein, Majuro, Marquesas, Midway, Nauru, Niue, Norfolk, Noumea, Pago_Pago, Palau, Pitcairn, Pohnpei, Ponape, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Truk, Wake, Wallis, Yap _Description: Time zone: Please select the city or region corresponding to your time zone.