Bug#1036686: unblock: tzdata/2023c-4
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: tzdata@packages.debian.org, bdrung@debian.org
Control: affects -1 + src:tzdata
Please unblock package tzdata
[ Reason ]
2022g-3 has been using `PACKRATDATA=backzone` in order to add all
out-of-scope lower-quality pre-1970 data back that existed in earlier
tzadata releases. However it also leads to time zones like
America/Ensenada, Atlantic/Jan_Mayen, Europe/Tiraspol, and
Pacific/Enderbury to change:
compared to 2022g-2:
- America/Ensenada->only dst changes until 2022 are shown
- Atlantic/Jan_Mayen->now valid data is shown
- Europe/Tiraspol->only dst changes until 2010 are shown
[ Impact ]
Users in those affected timezones will complain about wrong zones. So
far only users in Ubuntu reported the problem (see
https://launchpad.net/bugs/2017999 and
https://mm.icann.org/pipermail/tz/2023-May/032965.html), but that is
only a matter of time.
[ Tests ]
I added a test case in debian/tests/python to check that there is no
difference in the timezones today (compared to not building with the
pre-1970 data). The tzdata package has several autopkgtest test to check
that timezones are working in Python, debconf selection are sane, etc.
[ Risks ]
tzdata provides the timezone data and is a key package. The test cases
check the generated timezone data files are usable.
The change influences how the timezones are generated. There could be
hidden upstream bugs with that options.
[ Checklist ]
[*] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
* The changelog entry is not as verbose as it should:
Build tzdata with PACKRATLIST=zone.tab converts some timezones to
symlinks again. Following time zones are removed from debconf and
updated 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
This retores just the previous behaviour from 2022g-2.
[ Other info ]
Since this change removes Asia/Hanoi again, the number of timezones
reduces by one and lets the python-tz autopkgtest fail. So please also
unblock the test fix for python-tz.
unblock tzdata/2023c-4
unblock python-tz/2022.7.1-4
--
Benjamin Drung
Debian & Ubuntu Developer
diff -Nru tzdata-2023c/debian/changelog tzdata-2023c/debian/changelog
--- tzdata-2023c/debian/changelog 2023-04-13 13:54:30.000000000 +0200
+++ tzdata-2023c/debian/changelog 2023-05-10 00:00:40.000000000 +0200
@@ -1,3 +1,16 @@
+tzdata (2023c-4) unstable; urgency=medium
+
+ * Sort timezones naturally in debconf
+ * Add explanation for plus/minus used by Etc/GMT timezones
+ (Closes: #540305, LP: #1325949)
+ * 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. This also removes Asia/Hanoi again. (LP: #2017999)
+ * Update Croatian debconf translation. Thanks to Tomislav Krznar.
+
+ -- Benjamin Drung <bdrung@debian.org> Wed, 10 May 2023 00:00:40 +0200
+
tzdata (2023c-3) unstable; urgency=medium
* test_timezone_conversions: Print all failures before failing
diff -Nru tzdata-2023c/debian/control tzdata-2023c/debian/control
--- tzdata-2023c/debian/control 2023-04-13 13:43:10.000000000 +0200
+++ tzdata-2023c/debian/control 2023-05-09 23:27:44.000000000 +0200
@@ -6,6 +6,7 @@
po-debconf,
python3 (>= 3.9),
python3-debian,
+ python3-natsort,
python3-polib
Rules-Requires-Root: no
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
diff -Nru tzdata-2023c/debian/generate_debconf_templates tzdata-2023c/debian/generate_debconf_templates
--- tzdata-2023c/debian/generate_debconf_templates 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/generate_debconf_templates 2023-05-09 23:27:44.000000000 +0200
@@ -10,6 +10,8 @@
import pathlib
import sys
+import natsort
+
LOG_FORMAT = "%(name)s %(levelname)s: %(message)s"
__script_name__ = os.path.basename(sys.argv[0]) if __name__ == "__main__" else __name__
@@ -31,6 +33,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 +43,7 @@
"America/Knox_IN",
"America/Louisville",
"America/Mendoza",
+ "America/Rosario",
"Antarctica/South_Pole",
"Asia/Ashkhabad",
"Asia/Calcutta",
@@ -63,6 +67,9 @@
"Australia/Victoria",
"Australia/West",
"Europe/Kiev",
+ "Europe/Uzhgorod",
+ "Europe/Zaporozhye",
+ "Pacific/Enderbury",
"Pacific/Ponape",
"Pacific/Truk",
"US/East-Indiana",
@@ -70,27 +77,45 @@
# 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/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/Samoa",
"Pacific/Yap",
"US/Alaska",
@@ -117,7 +142,7 @@
def get_timezones(base_dir: pathlib.Path, subdir: pathlib.Path) -> list[str]:
"""Return list of timezone files relative to the base_dir."""
timezones = []
- for path in sorted(subdir.iterdir()):
+ for path in natsort.natsorted(subdir.iterdir(), key=str):
if path.is_dir():
timezones += get_timezones(base_dir, path)
continue
@@ -143,8 +168,16 @@
choices = [timezone.split("/", maxsplit=1)[1] for timezone in timezones]
if area == "Etc":
choices_key = "Choices"
+ description = (
+ "Please select your time zone. Contrary to modern conventions, these"
+ " POSIX-compatible zones use positive values to refer to zones west of"
+ " Greenwich and negative values for those east of Greenwich"
+ " (e.g., 'Etc/GMT+6' refers to 6 hours west of Greenwich,"
+ " commonly called 'UTC-6')."
+ )
else:
choices_key = "__Choices"
+ description = "Please select the city or region corresponding to your time zone."
return f"""\
Template: tzdata/Zones/{area}
Type: select
@@ -152,7 +185,7 @@
#flag:partial
{choices_key}: {", ".join(choices)}
_Description: Time zone:
- Please select the city or region corresponding to your time zone.
+ {description}
"""
diff -Nru tzdata-2023c/debian/po/be.po tzdata-2023c/debian/po/be.po
--- tzdata-2023c/debian/po/be.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/be.po 2023-05-06 13:15:17.000000000 +0200
@@ -590,13 +590,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -655,13 +652,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 +1513,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 +1975,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 +2940,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 +2989,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 "Цюрых"
@@ -3160,13 +3122,6 @@
#. 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"
msgstr "Факаёфа"
@@ -3466,3 +3421,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/bg.po tzdata-2023c/debian/po/bg.po
--- tzdata-2023c/debian/po/bg.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/bg.po 2023-05-06 13:15:17.000000000 +0200
@@ -583,13 +583,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -648,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 "Аржентина/Кордоба"
@@ -1516,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 ""
@@ -1985,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 "Харбин"
@@ -2957,13 +2933,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Ужгород"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Вадуц"
@@ -3013,13 +2982,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 +3115,6 @@
#. 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"
msgstr "Факаофо"
@@ -3459,3 +3414,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/ca.po tzdata-2023c/debian/po/ca.po
--- tzdata-2023c/debian/po/ca.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/ca.po 2023-05-06 13:15:17.000000000 +0200
@@ -599,13 +599,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Si us plau, seleccioneu la ciutat o regió corresponent al vostre fus horari."
@@ -667,13 +664,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 +1570,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 +2054,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
@@ -3122,13 +3098,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3179,13 +3148,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
@@ -3331,13 +3293,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3654,3 +3609,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Muntanya"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/cs.po tzdata-2023c/debian/po/cs.po
--- tzdata-2023c/debian/po/cs.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/cs.po 2023-05-06 13:15:17.000000000 +0200
@@ -575,13 +575,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Zvolte prosím město nebo oblast odpovídající vašemu časovému pásmu."
@@ -638,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 "Argentina/Córdoba"
@@ -1506,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"
@@ -1975,13 +1958,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"
@@ -2947,13 +2923,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Užhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3003,13 +2972,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"
@@ -3143,13 +3105,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3449,3 +3404,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Horské"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/da.po tzdata-2023c/debian/po/da.po
--- tzdata-2023c/debian/po/da.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/da.po 2023-05-06 13:15:17.000000000 +0200
@@ -570,13 +570,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Vælg venligst den by eller region der svarer til din tidszone."
@@ -633,13 +630,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 +1491,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 +1953,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"
@@ -2939,14 +2915,6 @@
msgid "Ulyanovsk"
msgstr "Ulyanovsk"
-# http://da.wikipedia.org/wiki/Uzjgorod
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzjgorod"
-
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
@@ -2996,14 +2964,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.
@@ -3141,13 +3101,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3447,3 +3400,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/de.po tzdata-2023c/debian/po/de.po
--- tzdata-2023c/debian/po/de.po 2023-04-13 13:54:28.000000000 +0200
+++ tzdata-2023c/debian/po/de.po 2023-05-06 13:15:17.000000000 +0200
@@ -572,13 +572,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Bitte wählen Sie die Stadt oder Region aus, die zu Ihrer Zeitzone passt."
@@ -636,13 +633,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 +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"
@@ -1973,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"
@@ -2945,13 +2921,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"
@@ -3001,13 +2970,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"
@@ -3141,13 +3103,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3447,3 +3402,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Gebirge (Mountain)"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/en.po tzdata-2023c/debian/po/en.po
--- tzdata-2023c/debian/po/en.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/en.po 2023-05-09 23:59:06.000000000 +0200
@@ -570,13 +570,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Please select the city or region corresponding to your time zone."
@@ -633,13 +630,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 +1491,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 +1953,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"
@@ -2942,13 +2918,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -2998,13 +2967,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"
@@ -3138,13 +3100,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3444,3 +3399,17 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
diff -Nru tzdata-2023c/debian/po/es.po tzdata-2023c/debian/po/es.po
--- tzdata-2023c/debian/po/es.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/es.po 2023-05-06 13:15:17.000000000 +0200
@@ -605,13 +605,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Por favor, elija la ciudad o región correspondiente a su zona horaria."
@@ -668,13 +665,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 +1526,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 +1988,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"
@@ -2977,13 +2953,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"
@@ -3033,13 +3002,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"
@@ -3173,13 +3135,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3479,3 +3434,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Montaña"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/eu.po tzdata-2023c/debian/po/eu.po
--- tzdata-2023c/debian/po/eu.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/eu.po 2023-05-06 13:15:17.000000000 +0200
@@ -580,13 +580,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Hautatu zure ordu-zonari dagokion herri edo estatua."
@@ -643,13 +640,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 +1501,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 +1963,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 +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"
@@ -3008,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"
@@ -3148,13 +3110,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3454,3 +3409,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mendia"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/fi.po tzdata-2023c/debian/po/fi.po
--- tzdata-2023c/debian/po/fi.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/fi.po 2023-05-06 13:15:17.000000000 +0200
@@ -571,13 +571,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -636,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 "Argentiina/Córdoba"
@@ -1504,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 ""
@@ -1973,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"
@@ -2945,13 +2921,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Užhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3001,13 +2970,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"
@@ -3141,13 +3103,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3447,3 +3402,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Vuori"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/fr.po tzdata-2023c/debian/po/fr.po
--- tzdata-2023c/debian/po/fr.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/fr.po 2023-05-06 13:15:17.000000000 +0200
@@ -580,13 +580,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Veuillez choisir la ville ou la région correspondant à votre fuseau horaire."
@@ -644,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 "Córdoba"
@@ -1512,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"
@@ -1981,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"
@@ -2953,13 +2929,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"
@@ -3009,13 +2978,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"
@@ -3149,13 +3111,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3455,3 +3410,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Rocheuses (Mountain)"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/gl.po tzdata-2023c/debian/po/gl.po
--- tzdata-2023c/debian/po/gl.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/gl.po 2023-05-06 13:15:17.000000000 +0200
@@ -574,13 +574,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Escolla a cidade ou rexión que corresoponda ao seu fuso horario."
@@ -637,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 "Arxentina/Córdoba"
@@ -1505,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"
@@ -1974,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"
@@ -2946,13 +2922,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3002,13 +2971,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"
@@ -3142,13 +3104,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3448,3 +3403,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Montañas"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/gu.po tzdata-2023c/debian/po/gu.po
--- tzdata-2023c/debian/po/gu.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/gu.po 2023-05-06 13:15:17.000000000 +0200
@@ -578,13 +578,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "મહેરબાની કરી તમારા સમય વિસ્તારને અનુરુપ શહેર અથવા વિસ્તાર પસંદ કરો."
@@ -641,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 "આર્જેન્ટિના/કોર્ડોબા"
@@ -1509,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 "સાન્ટા ઈઝાબેલ"
@@ -1978,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 "હાર્બિન"
@@ -2950,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 "વાડુઝ"
@@ -3006,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 "ઝ્યુરિચ"
@@ -3146,13 +3108,6 @@
#. 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"
msgstr "ફાકાઓફો"
@@ -3452,3 +3407,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "માઉન્ટેન"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/he.po tzdata-2023c/debian/po/he.po
--- tzdata-2023c/debian/po/he.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/he.po 2023-05-06 13:15:17.000000000 +0200
@@ -580,13 +580,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "בחר בבקשה את העיר או האזור שמתאימים לאזור הזמן שלך."
@@ -643,13 +640,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 +1501,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 +1963,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 "חרבין"
@@ -2952,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 "ואדוץ"
@@ -3008,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 "ציריך"
@@ -3148,13 +3110,6 @@
#. 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"
msgstr "קפאופו"
@@ -3454,3 +3409,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "אזור ההרים"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/hr.po tzdata-2023c/debian/po/hr.po
--- tzdata-2023c/debian/po/hr.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/hr.po 2023-05-09 23:32:31.000000000 +0200
@@ -13,13 +13,16 @@
"Project-Id-Version: Debian-installer 1st-stage master file HR\n"
"Report-Msgid-Bugs-To: tzdata@packages.debian.org\n"
"POT-Creation-Date: 2023-02-06 11:44+0100\n"
-"PO-Revision-Date: 2013-12-24 23:13+0100\n"
-"Last-Translator: Josip Rodin <joy+ditrans@linux.hr>\n"
+"PO-Revision-Date: 2023-05-09 10:18+0200\n"
+"Last-Translator: Tomislav Krznar <tomislav.krznar@gmail.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.3.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
#. Type: select
#. Choices
@@ -73,7 +76,7 @@
#. of "GMT+xx" or "GMT-xx" timezones
#: ../tzdata.templates:1001
msgid "Atlantic"
-msgstr "Atlantic"
+msgstr "Atlantski ocean"
#. Type: select
#. Choices
@@ -100,7 +103,7 @@
#. of "GMT+xx" or "GMT-xx" timezones
#: ../tzdata.templates:1001
msgid "Indian"
-msgstr "Indijski"
+msgstr "Indijski ocean"
#. Type: select
#. Choices
@@ -112,7 +115,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:1001 ../tzdata.templates:12001
msgid "Pacific"
-msgstr "Pacific"
+msgstr "Tihi ocean"
#. Type: select
#. Choices
@@ -121,7 +124,7 @@
#. of "GMT+xx" or "GMT-xx" timezones
#: ../tzdata.templates:1001
msgid "US"
-msgstr ""
+msgstr "SAD"
#. Type: select
#. Choices
@@ -130,30 +133,25 @@
#. of "GMT+xx" or "GMT-xx" timezones
#: ../tzdata.templates:1001
msgid "Etc"
-msgstr "Itd"
+msgstr "Ostalo"
#. Type: select
#. Description
#: ../tzdata.templates:1002
msgid "Geographic area:"
-msgstr "Geografsko podruĂ„Âje:"
+msgstr "Geografsko područje:"
#. Type: select
#. Description
#: ../tzdata.templates:1002
-#, fuzzy
-#| msgid ""
-#| "Please select the geographic area you live in. Subsequent configuration "
-#| "questions will narrow this down by presenting a list of cities, "
-#| "representing the time zones in which they are located."
msgid ""
-"Please select the geographic area in which you live. Subsequent "
-"configuration questions will narrow this down by presenting a list of "
-"cities, representing the time zones in which they are located."
-msgstr ""
-"Molim odaberite geografsko podruĂ„Âje gdje vi ĚŞivite. Daljnja pitanja će "
-"suziti odabir tako ̡to ćete dobiti popis gradova koji predstavljaju "
-"vremenske zone u kojima se oni nalaze."
+"Please select the geographic area in which you live. Subsequent configuration "
+"questions will narrow this down by presenting a list of cities, representing "
+"the time zones in which they are located."
+msgstr ""
+"Molim odaberite geografsko područje gdje živite. Daljnja pitanja će suziti "
+"odabir tako što ćete dobiti popis gradova koji predstavljaju vremenske zone u "
+"kojima se oni nalaze."
#. Type: select
#. Choices
@@ -181,7 +179,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:2001
msgid "Algiers"
-msgstr "AlĚŞir"
+msgstr "Alžir"
#. Type: select
#. Choices
@@ -335,7 +333,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:2001
msgid "Juba"
-msgstr ""
+msgstr "Juba"
#. Type: select
#. Choices
@@ -553,8 +551,7 @@
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
-#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
+#: ../tzdata.templates:11002 ../tzdata.templates:12002 ../tzdata.templates:13001
msgid "Time zone:"
msgstr "Vremenska zona:"
@@ -580,17 +577,12 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
-#, fuzzy
-#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
-msgstr "Molim odaberite vremensku zonu koja odgovara vaĚĄoj lokaciji."
+msgstr "Molim odaberite grad ili regiju koja odgovara vašoj vremenskoj zoni."
#. Type: select
#. Choices
@@ -631,94 +623,85 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
-#, fuzzy
msgid "Argentina/Buenos_Aires"
-msgstr "Buenos Aires"
+msgstr "Argentina/Buenos Aires"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
-#, fuzzy
msgid "Argentina/Catamarca"
-msgstr "Catamarca"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
-msgid "Argentina/ComodRivadavia"
-msgstr ""
+msgstr "Argentina/Catamarca"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/Cordoba"
-msgstr ""
+msgstr "Argentina/Cordoba"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/Jujuy"
-msgstr ""
+msgstr "Argentina/Jujuy"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/La_Rioja"
-msgstr ""
+msgstr "Argentina/La Rioja"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/Mendoza"
-msgstr ""
+msgstr "Argentina/Mendoza"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/Rio_Gallegos"
-msgstr ""
+msgstr "Argentina/Rio Gallegos"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/Salta"
-msgstr ""
+msgstr "Argentina/Salta"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/San_Juan"
-msgstr ""
+msgstr "Argentina/San Juan"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/San_Luis"
-msgstr ""
+msgstr "Argentina/San Luis"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/Tucuman"
-msgstr ""
+msgstr "Argentina/Tucuman"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Argentina/Ushuaia"
-msgstr ""
+msgstr "Argentina/Ushuaia"
#. Type: select
#. Choices
@@ -760,7 +743,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Bahia_Banderas"
-msgstr ""
+msgstr "Bahia Banderas"
#. Type: select
#. Choices
@@ -872,7 +855,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Ciudad_Juarez"
-msgstr ""
+msgstr "Ciudad Juarez"
#. Type: select
#. Choices
@@ -893,7 +876,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Creston"
-msgstr ""
+msgstr "Creston"
#. Type: select
#. Choices
@@ -984,7 +967,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Fort_Nelson"
-msgstr ""
+msgstr "Fort Nelson"
#. Type: select
#. Choices
@@ -1081,58 +1064,57 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
-#, fuzzy
msgid "Indiana/Indianapolis"
-msgstr "Indianapolis"
+msgstr "Indiana/Indianapolis"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Indiana/Knox"
-msgstr ""
+msgstr "Indiana/Knox"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Indiana/Marengo"
-msgstr ""
+msgstr "Indiana/Marengo"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Indiana/Petersburg"
-msgstr ""
+msgstr "Indiana/Petersburg"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Indiana/Tell_City"
-msgstr ""
+msgstr "Indiana/Tell City"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Indiana/Vevay"
-msgstr ""
+msgstr "Indiana/Vevay"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Indiana/Vincennes"
-msgstr ""
+msgstr "Indiana/Vincennes"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Indiana/Winamac"
-msgstr ""
+msgstr "Indiana/Winamac"
#. Type: select
#. Choices
@@ -1166,23 +1148,22 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
-#, fuzzy
msgid "Kentucky/Louisville"
-msgstr "Louisville"
+msgstr "Kentucky/Louisville"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Kentucky/Monticello"
-msgstr ""
+msgstr "Kentucky/Monticello"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Kralendijk"
-msgstr ""
+msgstr "Kralendijk"
#. Type: select
#. Choices
@@ -1210,7 +1191,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Lower_Princes"
-msgstr ""
+msgstr "Lower Princes"
#. Type: select
#. Choices
@@ -1238,7 +1219,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Marigot"
-msgstr ""
+msgstr "Marigot"
#. Type: select
#. Choices
@@ -1252,7 +1233,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Matamoros"
-msgstr ""
+msgstr "Matamoros"
#. Type: select
#. Choices
@@ -1280,7 +1261,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Metlakatla"
-msgstr ""
+msgstr "Metlakatla"
#. Type: select
#. Choices
@@ -1371,35 +1352,35 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "North_Dakota/Beulah"
-msgstr ""
+msgstr "North Dakota/Beulah"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "North_Dakota/Center"
-msgstr ""
+msgstr "North Dakota/Center"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "North_Dakota/New_Salem"
-msgstr ""
+msgstr "North Dakota/New Salem"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Nuuk"
-msgstr ""
+msgstr "Nuuk"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Ojinaga"
-msgstr ""
+msgstr "Ojinaga"
#. Type: select
#. Choices
@@ -1469,7 +1450,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Punta_Arenas"
-msgstr ""
+msgstr "Punta Arenas"
#. Type: select
#. Choices
@@ -1517,22 +1498,15 @@
#. 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 ""
+msgstr "Santa Isabel"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Santarem"
-msgstr ""
+msgstr "Santarem"
#. Type: select
#. Choices
@@ -1574,14 +1548,14 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "Sitka"
-msgstr ""
+msgstr "Sitka"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
msgid "St_Barthelemy"
-msgstr ""
+msgstr "St Barthelemy"
#. Type: select
#. Choices
@@ -1735,7 +1709,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:4001
msgid "Macquarie"
-msgstr ""
+msgstr "Macquarie"
#. Type: select
#. Choices
@@ -1777,7 +1751,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:4001
msgid "Troll"
-msgstr ""
+msgstr "Troll"
#. Type: select
#. Choices
@@ -1840,14 +1814,14 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Ashgabat"
-msgstr "AĹĄgabat"
+msgstr "Ashgabat"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Atyrau"
-msgstr ""
+msgstr "Atyrau"
#. Type: select
#. Choices
@@ -1882,7 +1856,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Barnaul"
-msgstr ""
+msgstr "Barnaul"
#. Type: select
#. Choices
@@ -1896,7 +1870,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Bishkek"
-msgstr "BiĹĄkek"
+msgstr "Bishkek"
#. Type: select
#. Choices
@@ -1910,7 +1884,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Chita"
-msgstr ""
+msgstr "Chita"
#. Type: select
#. Choices
@@ -1966,14 +1940,14 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Dushanbe"
-msgstr "DuĹĄanbe"
+msgstr "Dushanbe"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Famagusta"
-msgstr ""
+msgstr "Famagusta"
#. Type: select
#. Choices
@@ -1986,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"
@@ -2001,14 +1968,14 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Hebron"
-msgstr ""
+msgstr "Hebron"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Ho_Chi_Minh"
-msgstr ""
+msgstr "Ho Chi Minh"
#. Type: select
#. Choices
@@ -2074,7 +2041,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Kamchatka"
-msgstr "KamÄatka"
+msgstr "Kamčatka"
#. Type: select
#. Choices
@@ -2102,14 +2069,14 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Khandyga"
-msgstr ""
+msgstr "Khandyga"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Kolkata"
-msgstr ""
+msgstr "Kolkata"
#. Type: select
#. Choices
@@ -2189,7 +2156,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Novokuznetsk"
-msgstr ""
+msgstr "Novokuznetsk"
#. Type: select
#. Choices
@@ -2245,7 +2212,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Qostanay"
-msgstr ""
+msgstr "Qostanay"
#. Type: select
#. Choices
@@ -2287,7 +2254,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Shanghai"
-msgstr "Ě angaj"
+msgstr "Šangaj"
#. Type: select
#. Choices
@@ -2301,7 +2268,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Srednekolymsk"
-msgstr ""
+msgstr "Srednekolymsk"
#. Type: select
#. Choices
@@ -2315,7 +2282,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Tashkent"
-msgstr "TaĹĄkent"
+msgstr "Tashkent"
#. Type: select
#. Choices
@@ -2357,7 +2324,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Tomsk"
-msgstr ""
+msgstr "Tomsk"
#. Type: select
#. Choices
@@ -2378,7 +2345,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:6001
msgid "Ust-Nera"
-msgstr ""
+msgstr "Ust-Nera"
#. Type: select
#. Choices
@@ -2616,7 +2583,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Astrakhan"
-msgstr ""
+msgstr "Astrakhan"
#. Type: select
#. Choices
@@ -2665,28 +2632,28 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Bucharest"
-msgstr "BukureĹĄt"
+msgstr "Bukurešt"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Budapest"
-msgstr "BudimpeĹĄta"
+msgstr "Budimpešta"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Busingen"
-msgstr ""
+msgstr "Busingen"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Chisinau"
-msgstr "KiĹĄinjev"
+msgstr "Kišinjev"
#. Type: select
#. Choices
@@ -2749,7 +2716,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Kirov"
-msgstr ""
+msgstr "Kirov"
#. Type: select
#. Choices
@@ -2896,7 +2863,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Saratov"
-msgstr ""
+msgstr "Saratov"
#. Type: select
#. Choices
@@ -2952,14 +2919,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Ulyanovsk"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "UĹžhorod"
+msgstr "Ulyanovsk"
#. Type: select
#. Choices
@@ -2980,7 +2940,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Vienna"
-msgstr "BeÄ"
+msgstr "Beč"
#. Type: select
#. Choices
@@ -3001,7 +2961,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
msgid "Warsaw"
-msgstr "VarĚĄava"
+msgstr "Varšava"
#. Type: select
#. Choices
@@ -3014,15 +2974,8 @@
#. 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"
+msgstr "Zürich"
#. Type: select
#. Choices
@@ -3120,7 +3073,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:11001
msgid "Bougainville"
-msgstr ""
+msgstr "Bougainville"
#. Type: select
#. Choices
@@ -3134,7 +3087,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:11001
msgid "Chuuk"
-msgstr ""
+msgstr "Chuuk"
#. Type: select
#. Choices
@@ -3154,13 +3107,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3225,7 +3171,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:11001
msgid "Kanton"
-msgstr ""
+msgstr "Kanton"
#. Type: select
#. Choices
@@ -3323,7 +3269,7 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:11001
msgid "Pohnpei"
-msgstr ""
+msgstr "Pohnpei"
#. Type: select
#. Choices
@@ -3403,60 +3349,74 @@
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Alaska"
-msgstr ""
+msgstr "Alaska"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Aleutian"
-msgstr ""
+msgstr "Aleutian"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Arizona"
-msgstr ""
+msgstr "Arizona"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Central"
-msgstr ""
+msgstr "Central"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Eastern"
-msgstr ""
+msgstr "Eastern"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Hawaii"
-msgstr ""
+msgstr "Hawaii"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Indiana-Starke"
-msgstr ""
+msgstr "Indiana-Starke"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Michigan"
-msgstr ""
+msgstr "Michigan"
#. Type: select
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:12001
msgid "Mountain"
-msgstr ""
+msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
+"Molim odaberite vremensku zonu. Suprotno modernim konvencijama, ove POSIX-"
+"kompatibilne zone koriste pozitivne vrijednosti za zone zapadno od Greenwicha, "
+"a negativne vrijednosti za one istočno od Greenwicha (npr., 'Ostalo/GMT+6' se "
+"odnosi na zonu 6 sati zapadno od Greenwicha, uobičajenog naziva 'UTC-6')."
diff -Nru tzdata-2023c/debian/po/hu.po tzdata-2023c/debian/po/hu.po
--- tzdata-2023c/debian/po/hu.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/hu.po 2023-05-06 13:15:17.000000000 +0200
@@ -578,13 +578,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Kérlek, válaszd ki a városnak/régiónak megfelelő időzónát:"
@@ -641,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 "Argentína/Cordoba"
@@ -1509,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"
@@ -1978,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"
@@ -2950,13 +2926,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"
@@ -3006,13 +2975,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"
@@ -3146,13 +3108,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3452,3 +3407,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/id.po tzdata-2023c/debian/po/id.po
--- tzdata-2023c/debian/po/id.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/id.po 2023-05-06 13:15:17.000000000 +0200
@@ -583,13 +583,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Silakan pilih kota atau daerah waktu yang bersesuaian dengan daerah waktu "
@@ -650,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 "Argentina/Kordoba"
@@ -1526,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 "Santa Isabel"
@@ -1996,13 +1979,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"
@@ -2968,13 +2944,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"
@@ -3024,13 +2993,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"
@@ -3164,13 +3126,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3470,3 +3425,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/it.po tzdata-2023c/debian/po/it.po
--- tzdata-2023c/debian/po/it.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/it.po 2023-05-06 13:15:17.000000000 +0200
@@ -570,13 +570,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Selezionare la città o la regione corrispondente al proprio fuso orario."
@@ -634,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 "Argentina/Córdoba"
@@ -1502,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 "Santa Isabel"
@@ -1971,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 "Harbin"
@@ -2943,13 +2919,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"
@@ -2999,13 +2968,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"
@@ -3139,13 +3101,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3445,3 +3400,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/ja.po tzdata-2023c/debian/po/ja.po
--- tzdata-2023c/debian/po/ja.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/ja.po 2023-05-06 13:15:17.000000000 +0200
@@ -570,13 +570,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "あなたの時間帯に一致する都市または地域を選択してください。"
@@ -633,13 +630,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 +1491,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 +1953,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 "ハルビン"
@@ -2942,13 +2918,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 "ファドーツ"
@@ -2998,13 +2967,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 "チューリヒ"
@@ -3138,13 +3100,6 @@
#. 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"
msgstr "ファカオフォ"
@@ -3444,3 +3399,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "マウンテン"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/ko.po tzdata-2023c/debian/po/ko.po
--- tzdata-2023c/debian/po/ko.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/ko.po 2023-05-06 13:15:17.000000000 +0200
@@ -569,13 +569,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "자기 표준 시간대에 해당하는 도시 또는 지역을 선택하십시오."
@@ -632,13 +629,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 +1490,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 +1952,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 "하얼빈"
@@ -2941,13 +2917,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 "바두츠"
@@ -2997,13 +2966,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 "취리히"
@@ -3137,13 +3099,6 @@
#. 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"
msgstr "파카오포"
@@ -3443,3 +3398,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "산악 지역"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/ku.po tzdata-2023c/debian/po/ku.po
--- tzdata-2023c/debian/po/ku.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/ku.po 2023-05-06 13:15:17.000000000 +0200
@@ -585,13 +585,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -650,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 "Arjantîn/Kordoba"
@@ -1518,13 +1508,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 +1970,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 +2935,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3015,13 +2984,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"
@@ -3155,13 +3117,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3461,3 +3416,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/lt.po tzdata-2023c/debian/po/lt.po
--- tzdata-2023c/debian/po/lt.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/lt.po 2023-05-06 13:15:17.000000000 +0200
@@ -580,13 +580,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -645,13 +642,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 +1503,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 +1965,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"
@@ -2954,13 +2930,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"
@@ -3010,13 +2979,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"
@@ -3150,13 +3112,6 @@
#. 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"
msgstr "Fakaofo sala"
@@ -3456,3 +3411,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/ml.po tzdata-2023c/debian/po/ml.po
--- tzdata-2023c/debian/po/ml.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/ml.po 2023-05-06 13:15:17.000000000 +0200
@@ -586,13 +586,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -651,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 "അര്ജ്ജന്റീന/കോര്ഡോബ"
@@ -1519,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 ""
@@ -1988,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 "ഹാര്ബിന്"
@@ -2960,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 "വാഡുസ്"
@@ -3016,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 "സൂറിച്ച്"
@@ -3156,13 +3118,6 @@
#. 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"
msgstr "ഫകവോഫോ"
@@ -3462,3 +3417,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/nl.po tzdata-2023c/debian/po/nl.po
--- tzdata-2023c/debian/po/nl.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/nl.po 2023-05-06 13:15:17.000000000 +0200
@@ -574,13 +574,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Wat is de stad of regio die overeenkomt met uw tijdzone?"
@@ -637,13 +634,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 +1495,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 +1957,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"
@@ -2946,13 +2922,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3002,13 +2971,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"
@@ -3142,13 +3104,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3448,3 +3403,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/pl.po tzdata-2023c/debian/po/pl.po
--- tzdata-2023c/debian/po/pl.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/pl.po 2023-05-06 13:15:17.000000000 +0200
@@ -574,13 +574,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Proszę wybrać miasto lub region odpowiadający właściwej strefie czasowej."
@@ -638,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 "Argentyna/Cordoba"
@@ -1506,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"
@@ -1975,13 +1958,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"
@@ -2947,13 +2923,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Użhorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3003,13 +2972,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"
@@ -3143,13 +3105,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3449,3 +3404,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Czas górski"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
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 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/pt_BR.po 2023-05-06 13:15:17.000000000 +0200
@@ -575,13 +575,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Por favor, selecione a cidade ou região correspondente ao seu fuso horário."
@@ -639,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 "Argentina/Córdova"
@@ -1507,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 "Santa Isabel"
@@ -1976,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"
@@ -2948,13 +2924,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"
@@ -3004,13 +2973,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"
@@ -3144,13 +3106,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3450,3 +3405,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Moutain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/pt.po tzdata-2023c/debian/po/pt.po
--- tzdata-2023c/debian/po/pt.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/pt.po 2023-05-06 13:15:17.000000000 +0200
@@ -574,13 +574,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Por favor escolha a cidade ou região correspondente ao seu fuso horário."
@@ -638,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 "Argentina/Córdova"
@@ -1506,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"
@@ -1975,13 +1958,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"
@@ -2947,13 +2923,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"
@@ -3003,13 +2972,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"
@@ -3143,13 +3105,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3449,3 +3404,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Montanha"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/ro.po tzdata-2023c/debian/po/ro.po
--- tzdata-2023c/debian/po/ro.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/ro.po 2023-05-06 13:15:17.000000000 +0200
@@ -580,13 +580,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
"Vă rugăm să selectați orașul sau regiunea care corespunde fusului dvs. orar."
@@ -644,13 +641,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:3001
-msgid "Argentina/ComodRivadavia"
-msgstr "Argentina / ComodRivadavia"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:3001
msgid "Argentina/Cordoba"
msgstr "Argentina / Cordoba"
@@ -1512,13 +1502,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"
@@ -1981,13 +1964,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 +2929,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Ujgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3009,13 +2978,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Zaporozhye"
-msgstr "Zaporojie"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Zurich"
msgstr "Zurich"
@@ -3149,13 +3111,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3455,3 +3410,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Munte"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/ru.po tzdata-2023c/debian/po/ru.po
--- tzdata-2023c/debian/po/ru.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/ru.po 2023-05-06 13:15:17.000000000 +0200
@@ -578,13 +578,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Выберите город или область, соответствующие вашему часовому поясу."
@@ -641,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 "Аргентина/Кордова"
@@ -1509,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 "Санта-Исабель"
@@ -1978,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 "Харбин"
@@ -2950,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 "Вадуц"
@@ -3006,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 "Цюрих"
@@ -3146,13 +3108,6 @@
#. 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"
msgstr "Факаофо"
@@ -3452,3 +3407,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Горное"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/sk.po tzdata-2023c/debian/po/sk.po
--- tzdata-2023c/debian/po/sk.po 2023-04-13 13:43:08.000000000 +0200
+++ tzdata-2023c/debian/po/sk.po 2023-05-06 13:15:17.000000000 +0200
@@ -574,13 +574,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Prosím, vyberte mesto alebo oblasť zodpovedajúce vášmu časovému pásmu."
@@ -637,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 "Argentína/Córdoba"
@@ -1505,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"
@@ -1974,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 "Charbin"
@@ -2946,13 +2922,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"
@@ -3002,13 +2971,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"
@@ -3142,13 +3104,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3448,3 +3403,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Americké horské"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/sq.po tzdata-2023c/debian/po/sq.po
--- tzdata-2023c/debian/po/sq.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/sq.po 2023-05-06 13:15:17.000000000 +0200
@@ -585,13 +585,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -650,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 "Argjentina/Cordoba"
@@ -1518,13 +1508,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 +1970,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 +2935,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3015,13 +2984,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"
@@ -3155,13 +3117,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3461,3 +3416,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mal"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/sv.po tzdata-2023c/debian/po/sv.po
--- tzdata-2023c/debian/po/sv.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/sv.po 2023-05-06 13:15:17.000000000 +0200
@@ -572,13 +572,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Välj den stad eller region som motsvarar din tidszon."
@@ -635,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 "Córdoba (Argentina)"
@@ -1503,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 "Santa Isabel"
@@ -1973,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"
@@ -2949,13 +2925,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"
@@ -3005,13 +2974,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"
@@ -3148,13 +3110,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3458,3 +3413,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/templates.pot tzdata-2023c/debian/po/templates.pot
--- tzdata-2023c/debian/po/templates.pot 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/templates.pot 2023-05-06 13:15:17.000000000 +0200
@@ -568,13 +568,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr ""
@@ -631,13 +628,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 +1489,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 +1951,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 ""
@@ -2940,13 +2916,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr ""
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr ""
@@ -2996,13 +2965,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 ""
@@ -3136,13 +3098,6 @@
#. 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"
msgstr ""
@@ -3442,3 +3397,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/th.po tzdata-2023c/debian/po/th.po
--- tzdata-2023c/debian/po/th.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/th.po 2023-05-06 13:15:17.000000000 +0200
@@ -570,13 +570,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "โปรดระบุเมืองหรือภูมิภาคที่ตรงกับเขตเวลาของคุณ"
@@ -633,13 +630,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 +1491,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 +1953,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 "ฮาร์บิน"
@@ -2942,13 +2918,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 "วาดุซ"
@@ -2998,13 +2967,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 "ซูริก"
@@ -3138,13 +3100,6 @@
#. 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"
msgstr ""
@@ -3444,3 +3399,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "ภูเขา"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/tr.po tzdata-2023c/debian/po/tr.po
--- tzdata-2023c/debian/po/tr.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/tr.po 2023-05-06 13:15:17.000000000 +0200
@@ -573,13 +573,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
msgid "Please select the city or region corresponding to your time zone."
msgstr "Saat diliminize karşılık gelen şehir ya da bölgeyi seçin."
@@ -636,13 +633,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 +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 İsabel"
@@ -1973,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"
@@ -2945,13 +2921,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3001,13 +2970,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"
@@ -3141,13 +3103,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3447,3 +3402,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr "Mountain"
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/vi.po tzdata-2023c/debian/po/vi.po
--- tzdata-2023c/debian/po/vi.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/vi.po 2023-05-06 13:15:17.000000000 +0200
@@ -585,13 +585,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -650,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 "Ă-gienh-ti-nạ/Cordoba"
@@ -1518,13 +1508,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 +1970,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 +2935,6 @@
#. Choices
#. Translators: do not translate underscores. You can use spaces instead.
#: ../tzdata.templates:9001
-msgid "Uzhgorod"
-msgstr "Uzhgorod"
-
-#. Type: select
-#. Choices
-#. Translators: do not translate underscores. You can use spaces instead.
-#: ../tzdata.templates:9001
msgid "Vaduz"
msgstr "Vaduz"
@@ -3015,13 +2984,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"
@@ -3155,13 +3117,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3461,3 +3416,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/po/wo.po tzdata-2023c/debian/po/wo.po
--- tzdata-2023c/debian/po/wo.po 2023-04-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/po/wo.po 2023-05-06 13:15:17.000000000 +0200
@@ -579,13 +579,10 @@
#. Description
#. Type: select
#. Description
-#. Type: select
-#. Description
#: ../tzdata.templates:2002 ../tzdata.templates:3002 ../tzdata.templates:4002
#: ../tzdata.templates:5002 ../tzdata.templates:6002 ../tzdata.templates:7002
#: ../tzdata.templates:8002 ../tzdata.templates:9002 ../tzdata.templates:10002
#: ../tzdata.templates:11002 ../tzdata.templates:12002
-#: ../tzdata.templates:13001
#, fuzzy
#| msgid "Please select the time zone corresponding to your location."
msgid "Please select the city or region corresponding to your time zone."
@@ -644,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 "Arsantiin/Kordoba"
@@ -1512,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 ""
@@ -1981,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"
@@ -2953,13 +2929,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 +2978,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"
@@ -3149,13 +3111,6 @@
#. 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"
msgstr "Fakaofo"
@@ -3455,3 +3410,13 @@
#: ../tzdata.templates:12001
msgid "Mountain"
msgstr ""
+
+#. Type: select
+#. Description
+#: ../tzdata.templates:13001
+msgid ""
+"Please select your time zone. Contrary to modern conventions, these POSIX-"
+"compatible zones use positive values to refer to zones west of Greenwich and "
+"negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 "
+"hours west of Greenwich, commonly called 'UTC-6')."
+msgstr ""
diff -Nru tzdata-2023c/debian/rules tzdata-2023c/debian/rules
--- tzdata-2023c/debian/rules 2023-04-13 13:43:10.000000000 +0200
+++ tzdata-2023c/debian/rules 2023-05-09 23:27:44.000000000 +0200
@@ -9,10 +9,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-12 14:14:07.000000000 +0200
+++ tzdata-2023c/debian/tests/python 2023-05-09 23:59:27.000000000 +0200
@@ -7,11 +7,25 @@
import datetime
import os
import pathlib
+import re
import sys
import typing
import unittest
import zoneinfo
+ROOT_DIR = pathlib.Path(__file__).parent.parent.parent
+
+
+def read_backwards_links(backwards_file: pathlib.Path) -> dict[str, str]:
+ """Read backwards compatibility links from the upstream backwards file."""
+ backwards_links = {}
+ for line in backwards_file.read_text(encoding="utf-8").splitlines():
+ match = re.match(r"^Link\t(?P<target>\S+)\t+(?P<link_name>\S+)", line)
+ if not match:
+ continue
+ backwards_links[match.group("link_name")] = match.group("target")
+ return backwards_links
+
class TestZoneinfo(unittest.TestCase):
"""Test timezones using Python's zoneinfo module."""
@@ -25,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-13 13:28:30.000000000 +0200
+++ tzdata-2023c/debian/tzdata.config 2023-05-06 13:15:17.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")
@@ -170,6 +170,12 @@
"Europe/Kiev")
echo "Europe/Kyiv"
;;
+ "Europe/Uzhgorod")
+ echo "Europe/Kyiv"
+ ;;
+ "Europe/Zaporozhye")
+ echo "Europe/Kyiv"
+ ;;
"GB" | "GB-Eire")
echo "Europe/London"
;;
@@ -233,6 +239,9 @@
"NZ")
echo "Pacific/Auckland"
;;
+ "Pacific/Enderbury")
+ echo "Pacific/Kanton"
+ ;;
"Pacific/Ponape")
echo "Pacific/Pohnpei"
;;
diff -Nru tzdata-2023c/debian/tzdata.templates tzdata-2023c/debian/tzdata.templates
--- tzdata-2023c/debian/tzdata.templates 2023-04-13 13:49:33.000000000 +0200
+++ tzdata-2023c/debian/tzdata.templates 2023-05-09 23:53:45.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, 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, 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, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, 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, Port_Moresby, Rarotonga, Saipan, Samoa, Tahiti, Tarawa, Tongatapu, Wake, Wallis, Yap
_Description: Time zone:
Please select the city or region corresponding to your time zone.
@@ -103,6 +103,6 @@
Type: select
# Translators: do not translate underscores. You can use spaces instead.
#flag:partial
-Choices: GMT, GMT+0, GMT+1, GMT+10, GMT+11, GMT+12, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT-0, GMT-1, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT0, Greenwich, UCT, UTC, Universal, Zulu
+Choices: GMT, GMT0, GMT+0, GMT+1, GMT+2, GMT+3, GMT+4, GMT+5, GMT+6, GMT+7, GMT+8, GMT+9, GMT+10, GMT+11, GMT+12, GMT-0, GMT-1, GMT-2, GMT-3, GMT-4, GMT-5, GMT-6, GMT-7, GMT-8, GMT-9, GMT-10, GMT-11, GMT-12, GMT-13, GMT-14, Greenwich, UCT, UTC, Universal, Zulu
_Description: Time zone:
- Please select the city or region corresponding to your time zone.
+ Please select your time zone. Contrary to modern conventions, these POSIX-compatible zones use positive values to refer to zones west of Greenwich and negative values for those east of Greenwich (e.g., 'Etc/GMT+6' refers to 6 hours west of Greenwich, commonly called 'UTC-6').
diff -Nru python-tz-2022.7.1/debian/changelog python-tz-2022.7.1/debian/changelog
--- python-tz-2022.7.1/debian/changelog 2023-03-27 17:17:53.000000000 +0200
+++ python-tz-2022.7.1/debian/changelog 2023-05-10 11:35:44.000000000 +0200
@@ -1,3 +1,10 @@
+python-tz (2022.7.1-4) unstable; urgency=medium
+
+ * Update test_all_timezones_count for tzdata 2023c-4, which removed
+ Asia/Hanoi again.
+
+ -- Benjamin Drung <bdrung@debian.org> Wed, 10 May 2023 11:35:44 +0200
+
python-tz (2022.7.1-3) unstable; urgency=medium
* Team upload.
diff -Nru python-tz-2022.7.1/debian/tests/regression python-tz-2022.7.1/debian/tests/regression
--- python-tz-2022.7.1/debian/tests/regression 2023-03-27 17:12:30.000000000 +0200
+++ python-tz-2022.7.1/debian/tests/regression 2023-05-10 11:35:44.000000000 +0200
@@ -75,8 +75,8 @@
def test_all_timezones_count(self) -> None:
"""Test all_timezones count to be reasonable."""
zones = len(pytz.all_timezones)
- self.assertGreaterEqual(zones, 597, "less zones than 2022g-3")
- self.assertLess(zones, round(597 * 1.1), ">10% more zones than 2022g-3")
+ self.assertGreaterEqual(zones, 596, "less zones than 2022g-2")
+ self.assertLess(zones, round(596 * 1.1), ">10% more zones than 2022g-2")
self.assertEqual(len(pytz.all_timezones_set), zones)
def test_common_timezones_count(self) -> None:
Reply to: