diff -Nru tzdata-2023c/debian/changelog tzdata-2023c/debian/changelog --- tzdata-2023c/debian/changelog 2023-04-13 15:17:25.000000000 +0200 +++ tzdata-2023c/debian/changelog 2023-04-26 19:55:21.000000000 +0200 @@ -1,3 +1,18 @@ +tzdata (2023c-0ubuntu0.20.04.2) focal; urgency=medium + + * Do not update US/* timezones to their America/* counterparts. + Drop Asia/Rangoon from debconf options (was renamed to Asia/Yangon). + (Closes: #688318, LP: #772024) + * Fix inconsistencies introduced by building timezones that differ pre-1970 + (LP: #2003797): + - Do not replace Europe/Uzhgorod and Europe/Zaporozhye by Europe/Kyiv + - Add America/Argentina/ComodRivadavia and America/Rosario back + to debconf options + * Test convert_timezone for consistency + * Update Mideast/Riyadh8[789] conversion target to Asia/Riyadh + + -- Benjamin Drung Wed, 26 Apr 2023 19:55:21 +0200 + tzdata (2023c-0ubuntu0.20.04.1) focal; urgency=medium * Build timezones that differ pre-1970 (LP: #2003797) diff -Nru tzdata-2023c/debian/control tzdata-2023c/debian/control --- tzdata-2023c/debian/control 2023-04-13 15:05:21.000000000 +0200 +++ tzdata-2023c/debian/control 2023-04-26 19:51:54.000000000 +0200 @@ -2,7 +2,7 @@ Section: localization Priority: required Build-Depends: debhelper-compat (= 12) -Build-Depends-Indep: gawk, po-debconf, python3, python3-tz, symlinks, icu-devtools +Build-Depends-Indep: gawk, po-debconf, python3, python3-debian, python3-tz, symlinks, icu-devtools Rules-Requires-Root: no Maintainer: Ubuntu Developers XSBC-Original-Maintainer: GNU Libc Maintainers diff -Nru tzdata-2023c/debian/po/be.po tzdata-2023c/debian/po/be.po --- tzdata-2023c/debian/po/be.po 2023-04-13 15:06:14.000000000 +0200 +++ tzdata-2023c/debian/po/be.po 2023-04-26 19:54:50.000000000 +0200 @@ -694,6 +694,13 @@ #. 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 "Аргенціна/Кардоба" @@ -1559,6 +1566,13 @@ #. 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 #, fuzzy #| msgid "Santarem" msgid "Santa_Isabel" @@ -2391,13 +2405,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Рангун" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/bg.po tzdata-2023c/debian/po/bg.po --- tzdata-2023c/debian/po/bg.po 2023-04-13 15:06:22.000000000 +0200 +++ tzdata-2023c/debian/po/bg.po 2023-04-26 19:54:50.000000000 +0200 @@ -687,6 +687,13 @@ #. 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 "Аржентина/Кордоба" @@ -1552,6 +1559,13 @@ #. 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 #, fuzzy #| msgid "Santarem" msgid "Santa_Isabel" @@ -2384,13 +2398,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Рангун" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/ca.po tzdata-2023c/debian/po/ca.po --- tzdata-2023c/debian/po/ca.po 2023-04-13 15:06:27.000000000 +0200 +++ tzdata-2023c/debian/po/ca.po 2023-04-26 19:54:50.000000000 +0200 @@ -705,6 +705,13 @@ #. 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" @@ -1611,6 +1618,13 @@ #. 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" @@ -2488,13 +2502,6 @@ msgid "Qyzylorda" msgstr "Qyzylorda" -#. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - # Gnome_2.16_Desktop [gnome-applets-locations.HEAD.ca.po] #. Type: select #. Choices diff -Nru tzdata-2023c/debian/po/cs.po tzdata-2023c/debian/po/cs.po --- tzdata-2023c/debian/po/cs.po 2023-04-13 15:06:46.000000000 +0200 +++ tzdata-2023c/debian/po/cs.po 2023-04-26 19:54:50.000000000 +0200 @@ -676,6 +676,13 @@ #. 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" @@ -1537,6 +1544,13 @@ #. 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" @@ -2367,13 +2381,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/da.po tzdata-2023c/debian/po/da.po --- tzdata-2023c/debian/po/da.po 2023-04-13 15:06:55.000000000 +0200 +++ tzdata-2023c/debian/po/da.po 2023-04-26 19:54:50.000000000 +0200 @@ -672,6 +672,13 @@ #. 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" @@ -1533,6 +1540,13 @@ #. 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" @@ -2363,13 +2377,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/de.po tzdata-2023c/debian/po/de.po --- tzdata-2023c/debian/po/de.po 2023-04-13 15:07:03.000000000 +0200 +++ tzdata-2023c/debian/po/de.po 2023-04-26 19:54:50.000000000 +0200 @@ -675,6 +675,13 @@ #. 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" @@ -1536,6 +1543,13 @@ #. 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" @@ -2366,13 +2380,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangun" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/en.po tzdata-2023c/debian/po/en.po --- tzdata-2023c/debian/po/en.po 2023-04-13 15:07:28.000000000 +0200 +++ tzdata-2023c/debian/po/en.po 2023-04-26 19:54:50.000000000 +0200 @@ -672,6 +672,13 @@ #. 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)" @@ -1533,6 +1540,13 @@ #. 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" @@ -2363,13 +2377,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/es.po tzdata-2023c/debian/po/es.po --- tzdata-2023c/debian/po/es.po 2023-04-13 15:07:35.000000000 +0200 +++ tzdata-2023c/debian/po/es.po 2023-04-26 19:54:50.000000000 +0200 @@ -706,6 +706,13 @@ #. 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" @@ -1567,6 +1574,13 @@ #. 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" @@ -2397,13 +2411,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/eu.po tzdata-2023c/debian/po/eu.po --- tzdata-2023c/debian/po/eu.po 2023-04-13 15:07:42.000000000 +0200 +++ tzdata-2023c/debian/po/eu.po 2023-04-26 19:54:50.000000000 +0200 @@ -682,6 +682,13 @@ #. 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" @@ -1543,6 +1550,13 @@ #. 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" @@ -2373,13 +2387,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/fi.po tzdata-2023c/debian/po/fi.po --- tzdata-2023c/debian/po/fi.po 2023-04-13 15:07:49.000000000 +0200 +++ tzdata-2023c/debian/po/fi.po 2023-04-26 19:54:50.000000000 +0200 @@ -675,6 +675,13 @@ #. 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" @@ -1540,6 +1547,13 @@ #. 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 #, fuzzy #| msgid "Santarem" msgid "Santa_Isabel" @@ -2372,13 +2386,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangôn" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/fr.po tzdata-2023c/debian/po/fr.po --- tzdata-2023c/debian/po/fr.po 2023-04-13 15:07:54.000000000 +0200 +++ tzdata-2023c/debian/po/fr.po 2023-04-26 19:54:50.000000000 +0200 @@ -683,6 +683,13 @@ #. 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" @@ -1544,6 +1551,13 @@ #. 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" @@ -2374,13 +2388,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoun" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/gl.po tzdata-2023c/debian/po/gl.po --- tzdata-2023c/debian/po/gl.po 2023-04-13 15:07:59.000000000 +0200 +++ tzdata-2023c/debian/po/gl.po 2023-04-26 19:54:50.000000000 +0200 @@ -677,6 +677,13 @@ #. 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" @@ -1538,6 +1545,13 @@ #. 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" @@ -2368,13 +2382,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/gu.po tzdata-2023c/debian/po/gu.po --- tzdata-2023c/debian/po/gu.po 2023-04-13 15:08:05.000000000 +0200 +++ tzdata-2023c/debian/po/gu.po 2023-04-26 19:54:50.000000000 +0200 @@ -680,6 +680,13 @@ #. 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 "આર્જેન્ટિના/કોર્ડોબા" @@ -1541,6 +1548,13 @@ #. 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 "સાન્ટા ઈઝાબેલ" @@ -2371,13 +2385,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "રંગૂન" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/he.po tzdata-2023c/debian/po/he.po --- tzdata-2023c/debian/po/he.po 2023-04-13 15:08:10.000000000 +0200 +++ tzdata-2023c/debian/po/he.po 2023-04-26 19:54:50.000000000 +0200 @@ -682,6 +682,13 @@ #. 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 "ארגנטינה/קורדובה" @@ -1543,6 +1550,13 @@ #. 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 "סנטה איזבל" @@ -2373,13 +2387,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ראנגון" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/hr.po tzdata-2023c/debian/po/hr.po --- tzdata-2023c/debian/po/hr.po 2023-04-13 15:08:15.000000000 +0200 +++ tzdata-2023c/debian/po/hr.po 2023-04-26 19:54:50.000000000 +0200 @@ -686,6 +686,13 @@ #. 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 "" @@ -1558,6 +1565,13 @@ #. 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 #, fuzzy msgid "Santa_Isabel" msgstr "Blantyre" @@ -2391,13 +2405,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/hu.po tzdata-2023c/debian/po/hu.po --- tzdata-2023c/debian/po/hu.po 2023-04-13 15:08:21.000000000 +0200 +++ tzdata-2023c/debian/po/hu.po 2023-04-26 19:54:50.000000000 +0200 @@ -680,6 +680,13 @@ #. 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" @@ -1541,6 +1548,13 @@ #. 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" @@ -2371,13 +2385,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/id.po tzdata-2023c/debian/po/id.po --- tzdata-2023c/debian/po/id.po 2023-04-13 15:08:26.000000000 +0200 +++ tzdata-2023c/debian/po/id.po 2023-04-26 19:54:50.000000000 +0200 @@ -689,6 +689,13 @@ #. 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" @@ -1558,6 +1565,13 @@ #. 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" @@ -2389,13 +2403,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/it.po tzdata-2023c/debian/po/it.po --- tzdata-2023c/debian/po/it.po 2023-04-13 15:08:33.000000000 +0200 +++ tzdata-2023c/debian/po/it.po 2023-04-26 19:54:50.000000000 +0200 @@ -673,6 +673,13 @@ #. 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" @@ -1534,6 +1541,13 @@ #. 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" @@ -2364,13 +2378,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/ja.po tzdata-2023c/debian/po/ja.po --- tzdata-2023c/debian/po/ja.po 2023-04-13 15:08:38.000000000 +0200 +++ tzdata-2023c/debian/po/ja.po 2023-04-26 19:54:50.000000000 +0200 @@ -672,6 +672,13 @@ #. 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 "アルゼンチン/コルドバ" @@ -1533,6 +1540,13 @@ #. 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 "サンタイサベル" @@ -2363,13 +2377,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ラングーン" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/ku.po tzdata-2023c/debian/po/ku.po --- tzdata-2023c/debian/po/ku.po 2023-04-13 15:08:43.000000000 +0200 +++ tzdata-2023c/debian/po/ku.po 2023-04-26 19:54:50.000000000 +0200 @@ -689,6 +689,13 @@ #. 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" @@ -1554,6 +1561,13 @@ #. 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 #, fuzzy #| msgid "Santarem" msgid "Santa_Isabel" @@ -2386,13 +2400,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/lt.po tzdata-2023c/debian/po/lt.po --- tzdata-2023c/debian/po/lt.po 2023-04-13 15:08:49.000000000 +0200 +++ tzdata-2023c/debian/po/lt.po 2023-04-26 19:54:50.000000000 +0200 @@ -684,6 +684,13 @@ #. 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" @@ -1549,6 +1556,13 @@ #. 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 #, fuzzy #| msgid "Santarem" msgid "Santa_Isabel" @@ -2381,13 +2395,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangūnas" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/ml.po tzdata-2023c/debian/po/ml.po --- tzdata-2023c/debian/po/ml.po 2023-04-13 15:08:53.000000000 +0200 +++ tzdata-2023c/debian/po/ml.po 2023-04-26 19:54:50.000000000 +0200 @@ -690,6 +690,13 @@ #. 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 "അര്‍ജ്ജന്റീന/കോര്‍ഡോബ" @@ -1556,6 +1563,13 @@ #. 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 #, fuzzy #| msgid "Santarem" msgid "Santa_Isabel" @@ -2388,13 +2402,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "റംഗൂണ്‍" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/nl.po tzdata-2023c/debian/po/nl.po --- tzdata-2023c/debian/po/nl.po 2023-04-13 15:08:59.000000000 +0200 +++ tzdata-2023c/debian/po/nl.po 2023-04-26 19:54:50.000000000 +0200 @@ -676,6 +676,13 @@ #. 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" @@ -1537,6 +1544,13 @@ #. 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" @@ -2367,13 +2381,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/pl.po tzdata-2023c/debian/po/pl.po --- tzdata-2023c/debian/po/pl.po 2023-04-13 15:09:04.000000000 +0200 +++ tzdata-2023c/debian/po/pl.po 2023-04-26 19:54:50.000000000 +0200 @@ -676,6 +676,13 @@ #. 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" @@ -1537,6 +1544,13 @@ #. 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" @@ -2367,13 +2381,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangun" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/pt_BR.po tzdata-2023c/debian/po/pt_BR.po --- tzdata-2023c/debian/po/pt_BR.po 2023-04-13 15:09:09.000000000 +0200 +++ tzdata-2023c/debian/po/pt_BR.po 2023-04-26 19:54:50.000000000 +0200 @@ -677,6 +677,13 @@ #. 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" @@ -1538,6 +1545,13 @@ #. 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" @@ -2368,13 +2382,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/pt.po tzdata-2023c/debian/po/pt.po --- tzdata-2023c/debian/po/pt.po 2023-04-13 15:09:15.000000000 +0200 +++ tzdata-2023c/debian/po/pt.po 2023-04-26 19:54:50.000000000 +0200 @@ -676,6 +676,13 @@ #. 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" @@ -1537,6 +1544,13 @@ #. 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" @@ -2367,13 +2381,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/ru.po tzdata-2023c/debian/po/ru.po --- tzdata-2023c/debian/po/ru.po 2023-04-13 15:09:21.000000000 +0200 +++ tzdata-2023c/debian/po/ru.po 2023-04-26 19:54:50.000000000 +0200 @@ -680,6 +680,13 @@ #. 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 "Аргентина/Кордова" @@ -1541,6 +1548,13 @@ #. 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 "Санта-Исабель" @@ -2371,13 +2385,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Янгон" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/sk.po tzdata-2023c/debian/po/sk.po --- tzdata-2023c/debian/po/sk.po 2023-04-13 15:09:26.000000000 +0200 +++ tzdata-2023c/debian/po/sk.po 2023-04-26 19:54:50.000000000 +0200 @@ -676,6 +676,13 @@ #. 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" @@ -1537,6 +1544,13 @@ #. 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" @@ -2367,13 +2381,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangún" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/sq.po tzdata-2023c/debian/po/sq.po --- tzdata-2023c/debian/po/sq.po 2023-04-13 15:09:31.000000000 +0200 +++ tzdata-2023c/debian/po/sq.po 2023-04-26 19:54:50.000000000 +0200 @@ -689,6 +689,13 @@ #. 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" @@ -1555,6 +1562,13 @@ #. 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 #, fuzzy msgid "Santa_Isabel" msgstr "Blantyre" @@ -2387,13 +2401,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/sv.po tzdata-2023c/debian/po/sv.po --- tzdata-2023c/debian/po/sv.po 2023-04-13 15:09:37.000000000 +0200 +++ tzdata-2023c/debian/po/sv.po 2023-04-26 19:54:50.000000000 +0200 @@ -676,6 +676,13 @@ #. 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)" @@ -1537,6 +1544,13 @@ #. 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" @@ -2368,13 +2382,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/templates.pot tzdata-2023c/debian/po/templates.pot --- tzdata-2023c/debian/po/templates.pot 2023-04-13 15:09:41.000000000 +0200 +++ tzdata-2023c/debian/po/templates.pot 2023-04-26 19:54:50.000000000 +0200 @@ -670,6 +670,13 @@ #. 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 "" @@ -1531,6 +1538,13 @@ #. 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 "" @@ -2360,13 +2374,6 @@ msgstr "" #. Type: select -#. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "" - -#. Type: select #. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 diff -Nru tzdata-2023c/debian/po/th.po tzdata-2023c/debian/po/th.po --- tzdata-2023c/debian/po/th.po 2023-04-13 15:09:46.000000000 +0200 +++ tzdata-2023c/debian/po/th.po 2023-04-26 19:54:50.000000000 +0200 @@ -672,6 +672,13 @@ #. 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" @@ -1533,6 +1540,13 @@ #. 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 "" @@ -2363,13 +2377,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "ย่างกุ้ง" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/tr.po tzdata-2023c/debian/po/tr.po --- tzdata-2023c/debian/po/tr.po 2023-04-13 15:09:52.000000000 +0200 +++ tzdata-2023c/debian/po/tr.po 2023-04-26 19:54:50.000000000 +0200 @@ -674,6 +674,13 @@ #. 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" @@ -1535,6 +1542,13 @@ #. 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" @@ -2365,13 +2379,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Yangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/vi.po tzdata-2023c/debian/po/vi.po --- tzdata-2023c/debian/po/vi.po 2023-04-13 15:09:56.000000000 +0200 +++ tzdata-2023c/debian/po/vi.po 2023-04-26 19:54:50.000000000 +0200 @@ -689,6 +689,13 @@ #. 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" @@ -1555,6 +1562,13 @@ #. 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 #, fuzzy #| msgid "Santarem" msgid "Santa_Isabel" @@ -2387,13 +2401,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Rangoon" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/po/wo.po tzdata-2023c/debian/po/wo.po --- tzdata-2023c/debian/po/wo.po 2023-04-13 15:10:02.000000000 +0200 +++ tzdata-2023c/debian/po/wo.po 2023-04-26 19:54:50.000000000 +0200 @@ -683,6 +683,13 @@ #. 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" @@ -1548,6 +1555,13 @@ #. 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 #, fuzzy #| msgid "Santarem" msgid "Santa_Isabel" @@ -2380,13 +2394,6 @@ #. Type: select #. Choices -#. Translators: do not translate underscores. You can use spaces instead. -#: ../tzdata.templates:7001 -msgid "Rangoon" -msgstr "Raŋguun" - -#. Type: select -#. Choices #. Translators: do not translate underscores. You can use spaces instead. #: ../tzdata.templates:7001 msgid "Riyadh" diff -Nru tzdata-2023c/debian/rules tzdata-2023c/debian/rules --- tzdata-2023c/debian/rules 2023-04-13 15:05:37.000000000 +0200 +++ tzdata-2023c/debian/rules 2023-04-26 19:54:50.000000000 +0200 @@ -76,7 +76,7 @@ fi ; \ cd $(CURDIR)/tzgen/$$i ; \ find . -maxdepth 2 -type f -o -type l | sed -e 's#^\./##' | \ - egrep -v '^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Argentina/ComodRivadavia|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Rosario|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke|Asmera|South_Pole|Saigon|Calcutta|Katmandu|Pacific-New|Kiev)$$' | \ + egrep -v '^(Ashkhabad|Chungking|Dacca|Macao|Thimbu|Ulan_Bator|Faeroe|ACT|LHI|NSW|North|Queensland|South|Tasmania|Victoria|West|Buenos_Aires|Catamarca|Cordoba|Jujuy|Mendoza|Louisville|Fort_Wayne|Indianapolis|Knox_IN|East-Indiana|East-Starke|Asmera|South_Pole|Saigon|Calcutta|Katmandu|Pacific-New|Kiev|Rangoon)$$' | \ sort -n | tr '\n' ',' | sed -e 's#,#, #g' -e 's#, $$#\n#' ; \ echo "_Description: Time zone:" ; \ echo " Please select the city or region corresponding to your time zone." ; \ @@ -93,6 +93,7 @@ # The upstream tests are related to the sources. Just skip it. override_dh_auto_test: + debian/test_timezone_conversions -z "$(TZGEN)" PYTZ_TZDATADIR="$(TZGEN)" debian/tests/python override_dh_auto_install: diff -Nru tzdata-2023c/debian/tests/control tzdata-2023c/debian/tests/control --- tzdata-2023c/debian/tests/control 2023-04-13 15:05:21.000000000 +0200 +++ tzdata-2023c/debian/tests/control 2023-04-26 19:51:54.000000000 +0200 @@ -5,3 +5,8 @@ Tests: python-icu Depends: python3, python3-icu, tzdata Restrictions: allow-stderr + +Test-command: debian/test_timezone_conversions -d /var/lib/dpkg/info/ +Depends: python3, python3-debian, tzdata +Restrictions: allow-stderr superficial +Features: test-name=test_timezone_conversions diff -Nru tzdata-2023c/debian/test_timezone_conversions tzdata-2023c/debian/test_timezone_conversions --- tzdata-2023c/debian/test_timezone_conversions 1970-01-01 01:00:00.000000000 +0100 +++ tzdata-2023c/debian/test_timezone_conversions 2023-04-26 19:53:41.000000000 +0200 @@ -0,0 +1,242 @@ +#!/usr/bin/python3 + +# Author: Benjamin Drung + +"""Check convert_timezone from tzdata.config for consistency.""" + +import argparse +import logging +import os +import pathlib +import re +import subprocess +import sys +import typing + +import debian.deb822 + +LOG_FORMAT = "%(levelname)s: %(message)s" +# Special timezones that should not be selectable in debconf +SPECIAL = {"Factory", "localtime", "posixrules"} +# Normal files (not symlinks) that are allowed to be converted +ALLOWED_NON_SYMLINK_CONVERSIONS = { + "CET", + "CST6CDT", + "EET", + "EST", + "EST5EDT", + "HST", + "MET", + "MST", + "MST7MDT", + "PST8PDT", + "WET", +} + + +class ConvertTimezone: + """Wrap convert_timezone from tzdata.config.""" + + def __init__(self, tzdata_config: pathlib.Path): + self.tzdata_config = tzdata_config + content = tzdata_config.read_text(encoding="utf-8") + match = re.search(r"convert_timezone\(\).*\n}", content, flags=re.DOTALL) + assert match, f"convert_timezone function not found in {tzdata_config}" + self.convert_timezone = match.group(0) + + def __call__(self, timezone: str) -> str: + shell_script = f"{self.convert_timezone}\nconvert_timezone '{timezone}'\n" + shell = subprocess.run( + ["/bin/sh", "-c", shell_script], + capture_output=True, + check=True, + encoding="utf-8", + ) + return shell.stdout.strip() + + def filter_converted_timezones(self, timezones): + """Return set of timezones that will be converted by convert_timezone.""" + converted = set() + for timezone in timezones: + if self(timezone) != timezone: + converted.add(timezone) + return converted + + def filter_unconverted_timezones(self, timezones): + """Return set of timezones that will not be converted by convert_timezone.""" + return timezones - self.filter_converted_timezones(timezones) + + def get_targets(self): + """Return set of conversion targets.""" + targets = set(re.findall('echo "([^"$]+)"', self.convert_timezone)) + logging.getLogger(__name__).info( + "Available conversion targets in %s: %i", self.tzdata_config, len(targets) + ) + return targets + + +def _is_tzif_file(fpath): + with open(fpath, "rb") as tz_file: + return tz_file.read(4) == b"TZif" + + +def get_available_timezones(directory: typing.Optional[pathlib.Path]): + """Return a set of available timezones in the directory. + + If directory is not set, use the sytem's default. + """ + logger = logging.getLogger(__name__) + + available = set() + tz_root = str(directory or "/usr/share/zoneinfo") + for root, dirnames, files in os.walk(tz_root): + if root == tz_root: + # right/ and posix/ are special directories and shouldn't be + # included in the output of available zones + if "right" in dirnames: + dirnames.remove("right") + if "posix" in dirnames: + dirnames.remove("posix") + + for file in files: + fpath = os.path.join(root, file) + key = os.path.relpath(fpath, start=tz_root) + if _is_tzif_file(fpath): + available.add(key) + + if not available: + logger.error("Found no timezones in %s.", tz_root) + sys.exit(1) + logger.info("Available timezones in %s: %i", directory or "system", len(available)) + return available + + +def filter_symlinks(timezones, directory: typing.Optional[pathlib.Path]): + """Filter out the timezone that are symlinks. + + If directory is not set, use the sytem's default timezone directory. + """ + logger = logging.getLogger(__name__) + if not directory: + directory = pathlib.Path("/usr/share/zoneinfo") + non_symlinks = {tz for tz in timezones if not (directory / tz).is_symlink()} + if not non_symlinks: + logger.error("Found no non-symlink timezones in %s.", directory) + sys.exit(1) + logger.info("Non-symlink timezones in %s: %i", directory, len(non_symlinks)) + return non_symlinks + + +def get_debconf_choices(template_filename: pathlib.Path): + """Extract the timezone choices from the debconf template.""" + logger = logging.getLogger(__name__) + debconf_choices = set() + with template_filename.open(encoding="utf-8") as template_file: + for paragraph in debian.deb822.Deb822.iter_paragraphs(template_file): + area_match = re.match("tzdata/Zones/(.*)", paragraph["Template"]) + if not area_match: + continue + area = area_match.group(1) + choices = paragraph.get("Choices", paragraph.get("__Choices", "")) + debconf_choices.update([f"{area}/{c}" for c in choices.split(", ")]) + if not debconf_choices: + logger.error("Found no selectable timezones in %s.", template_filename) + sys.exit(1) + logger.info( + "Selectable timezones in %s: %i", template_filename, len(debconf_choices) + ) + return debconf_choices + + +def existing_dir_path(string: str) -> pathlib.Path: + """Convert string to existing dir path or raise ArgumentTypeError.""" + path = pathlib.Path(string) + if not path.is_dir(): + raise argparse.ArgumentTypeError(f"Directory {string} does not exist") + return path + + +def parse_args() -> argparse.Namespace: + """Parse command line arguments and return namespace.""" + parser = argparse.ArgumentParser() + parser.add_argument( + "-z", + "--zoneinfo-directory", + type=existing_dir_path, + help="Directory containing the generated zoneinfo files (default: system)", + ) + parser.add_argument( + "-d", + "--debian-directory", + default=pathlib.Path("debian"), + type=existing_dir_path, + help="Path to debian directory containing tzdata.config" + " and tzdata.templates (default: %(default)s)", + ) + return parser.parse_args() + + +def main() -> int: + """Check convert_timezone from tzdata.config for consistency.""" + args = parse_args() + logging.basicConfig(format=LOG_FORMAT, level=logging.INFO) + logger = logging.getLogger(__name__) + + selectable = get_debconf_choices(args.debian_directory / "tzdata.templates") + available = get_available_timezones(args.zoneinfo_directory) + non_symlinks = filter_symlinks(available, args.zoneinfo_directory) + convert_timezone = ConvertTimezone(args.debian_directory / "tzdata.config") + conversion_targets = convert_timezone.get_targets() + failures = 0 + + converted = convert_timezone.filter_converted_timezones(selectable) + if converted: + logger.error( + "Following %i timezones can be selected, but will be converted:\n%s", + len(converted), + "\n".join(sorted(converted)), + ) + failures += 1 + + converted = convert_timezone.filter_converted_timezones(non_symlinks) + converted -= ALLOWED_NON_SYMLINK_CONVERSIONS + converted = {tz for tz in converted if not re.match("^(posix|right)/", tz)} + if converted: + logger.error( + "Following %i timezones are not symlinks, but will be converted:\n%s", + len(converted), + "\n".join(sorted(converted)), + ) + failures += 1 + + unselectable = available - selectable + missing = convert_timezone.filter_unconverted_timezones(unselectable) - SPECIAL + if missing: + logger.warning( + "Following %i timezones cannot be selected, but are not converted:\n%s", + len(missing), + "\n".join(sorted(missing)), + ) + + targets = conversion_targets - available + if targets: + logger.error( + "Following %i timezones are conversion targets, but are not available:\n%s", + len(targets), + "\n".join(sorted(targets)), + ) + failures += 1 + + targets = conversion_targets - selectable + if targets: + logger.warning( + "Following %i timezones are conversion targets, but are not selectable:\n%s", + len(targets), + "\n".join(sorted(targets)), + ) + + return failures + + +if __name__ == "__main__": + sys.exit(main()) diff -Nru tzdata-2023c/debian/tzdata.config tzdata-2023c/debian/tzdata.config --- tzdata-2023c/debian/tzdata.config 2023-04-13 15:05:21.000000000 +0200 +++ tzdata-2023c/debian/tzdata.config 2023-04-26 19:54:50.000000000 +0200 @@ -14,13 +14,13 @@ ("Africa/Asmera") echo "Africa/Asmara" ;; - ("America/Argentina/ComodRivadavia"|"America/Catamarca") + "America/Catamarca") echo "America/Argentina/Catamarca" ;; ("America/Buenos_Aires") echo "America/Argentina/Buenos_Aires" ;; - ("America/Cordoba"|"America/Rosario") + "America/Cordoba") echo "America/Argentina/Cordoba" ;; ("America/Jujuy") @@ -164,12 +164,6 @@ "Europe/Kiev") echo "Europe/Kyiv" ;; - "Europe/Uzhgorod") - echo "Europe/Kyiv" - ;; - "Europe/Zaporozhye") - echo "Europe/Kyiv" - ;; "GB") echo "Europe/London" ;; @@ -231,13 +225,13 @@ echo "America/Mexico_City" ;; "Mideast/Riyadh87") - echo "Asia/Riyadh87" + echo "Asia/Riyadh" ;; "Mideast/Riyadh88") - echo "Asia/Riyadh88" + echo "Asia/Riyadh" ;; "Mideast/Riyadh89") - echo "Asia/Riyadh89" + echo "Asia/Riyadh" ;; "MST") echo "SystemV/MST7" @@ -284,42 +278,9 @@ "Universal") echo "Etc/UTC" ;; - "US/Alaska") - echo "America/Anchorage" - ;; - "US/Aleutian") - echo "America/Adak" - ;; - "US/Arizona") - echo "America/Phoenix" - ;; - "US/Central") - echo "America/Chicago" - ;; "US/East-Indiana") echo "America/Indianapolis" ;; - "US/Eastern") - echo "America/New_York" - ;; - "US/Hawaii") - echo "Pacific/Honolulu" - ;; - "US/Indiana-Starke") - echo "America/Indianapolis" - ;; - "US/Michigan") - echo "America/Detroit" - ;; - "US/Mountain") - echo "America/Denver" - ;; - "US/Pacific") - echo "America/Los_Angeles" - ;; - "US/Samoa") - echo "Pacific/Pago_Pago" - ;; "UTC") echo "Etc/UTC" ;; diff -Nru tzdata-2023c/debian/tzdata.templates tzdata-2023c/debian/tzdata.templates --- tzdata-2023c/debian/tzdata.templates 2023-04-13 15:16:13.000000000 +0200 +++ tzdata-2023c/debian/tzdata.templates 2023-04-26 19:54:50.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/Cordoba, Argentina/Jujuy, Argentina/La_Rioja, Argentina/Mendoza, Argentina/Rio_Gallegos, Argentina/Salta, Argentina/San_Juan, Argentina/San_Luis, Argentina/Tucuman, Argentina/Ushuaia, Aruba, Asuncion, Atikokan, Atka, Bahia, Bahia_Banderas, Barbados, Belem, Belize, Blanc-Sablon, Boa_Vista, Bogota, Boise, Cambridge_Bay, Campo_Grande, Cancun, Caracas, Cayenne, Cayman, Chicago, Chihuahua, Ciudad_Juarez, Coral_Harbour, Costa_Rica, Creston, Cuiaba, Curacao, Danmarkshavn, Dawson, Dawson_Creek, Denver, Detroit, Dominica, Edmonton, Eirunepe, El_Salvador, Ensenada, Fort_Nelson, Fortaleza, Glace_Bay, Godthab, Goose_Bay, Grand_Turk, Grenada, Guadeloupe, Guatemala, Guayaquil, Guyana, Halifax, Havana, Hermosillo, Indiana/Indianapolis, Indiana/Knox, Indiana/Marengo, Indiana/Petersburg, Indiana/Tell_City, Indiana/Vevay, Indiana/Vincennes, Indiana/Winamac, Inuvik, Iqaluit, Jamaica, Juneau, Kentucky/Louisville, Kentucky/Monticello, Kralendijk, La_Paz, Lima, Los_Angeles, Lower_Princes, Maceio, Managua, Manaus, Marigot, Martinique, Matamoros, Mazatlan, Menominee, Merida, Metlakatla, Mexico_City, Miquelon, Moncton, Monterrey, Montevideo, Montreal, Montserrat, Nassau, New_York, Nipigon, Nome, Noronha, North_Dakota/Beulah, North_Dakota/Center, North_Dakota/New_Salem, Nuuk, Ojinaga, Panama, Pangnirtung, Paramaribo, Phoenix, Port-au-Prince, Port_of_Spain, Porto_Acre, Porto_Velho, Puerto_Rico, Punta_Arenas, Rainy_River, Rankin_Inlet, Recife, Regina, Resolute, Rio_Branco, Santa_Isabel, Santarem, Santiago, Santo_Domingo, Sao_Paulo, Scoresbysund, Shiprock, Sitka, St_Barthelemy, St_Johns, St_Kitts, St_Lucia, St_Thomas, St_Vincent, Swift_Current, Tegucigalpa, Thule, Thunder_Bay, Tijuana, Toronto, Tortola, Vancouver, Virgin, Whitehorse, Winnipeg, Yakutat, Yellowknife +__Choices: Adak, Anchorage, Anguilla, Antigua, Araguaina, Argentina/Buenos_Aires, Argentina/Catamarca, Argentina/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 _Description: Time zone: Please select the city or region corresponding to your time zone. @@ -55,7 +55,7 @@ Type: select # Translators: do not translate underscores. You can use spaces instead. #flag:partial -__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, Hanoi, Harbin, Hebron, Ho_Chi_Minh, Hong_Kong, Hovd, Irkutsk, Istanbul, Jakarta, Jayapura, Jerusalem, Kabul, Kamchatka, Karachi, Kashgar, Kathmandu, Khandyga, Kolkata, Krasnoyarsk, Kuala_Lumpur, Kuching, Kuwait, Macau, Magadan, Makassar, Manila, Muscat, Nicosia, Novokuznetsk, Novosibirsk, Omsk, Oral, Phnom_Penh, Pontianak, Pyongyang, Qatar, Qostanay, Qyzylorda, Rangoon, Riyadh, Sakhalin, Samarkand, Seoul, Shanghai, Singapore, Srednekolymsk, Taipei, Tashkent, Tbilisi, Tehran, Tel_Aviv, Thimphu, Tokyo, Tomsk, Ujung_Pandang, Ulaanbaatar, Urumqi, Ust-Nera, Vientiane, Vladivostok, Yakutsk, Yangon, Yekaterinburg, Yerevan +__Choices: Aden, Almaty, Amman, Anadyr, Aqtau, Aqtobe, Ashgabat, Atyrau, Baghdad, Bahrain, Baku, Bangkok, Barnaul, Beirut, Bishkek, Brunei, Chita, Choibalsan, Chongqing, Colombo, Damascus, Dhaka, Dili, Dubai, Dushanbe, Famagusta, Gaza, 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 _Description: Time zone: Please select the city or region corresponding to your time zone.